Start adding support for searching in posts.

This commit is contained in:
Alex Ning 2021-07-08 20:49:38 +08:00
parent 2bf561c31e
commit 1352a8268e
4 changed files with 30 additions and 31 deletions

View File

@ -177,8 +177,6 @@ dependencies {
implementation 'androidx.palette:palette:1.0.0' implementation 'androidx.palette:palette:1.0.0'
implementation 'com.tinder.scarlet:scarlet:0.1.12'
/**** Builds and flavors ****/ /**** Builds and flavors ****/
// debugImplementation because LeakCanary should only run in debug builds. // debugImplementation because LeakCanary should only run in debug builds.

View File

@ -75,14 +75,9 @@ public class RPANActivity extends AppCompatActivity {
@Named("default") @Named("default")
SharedPreferences mSharedPreferences; SharedPreferences mSharedPreferences;
@Inject @Inject
@Named("current_account")
SharedPreferences mCurrentAccountSharedPreferences;
@Inject
CustomThemeWrapper mCustomThemeWrapper; CustomThemeWrapper mCustomThemeWrapper;
@Inject @Inject
Executor mExecutor; Executor mExecutor;
private String mAccessToken;
private String mAccountName;
@State @State
ArrayList<RPANBroadcast> rpanBroadcasts; ArrayList<RPANBroadcast> rpanBroadcasts;
@State @State
@ -119,9 +114,6 @@ public class RPANActivity extends AppCompatActivity {
actionBar.setHomeAsUpIndicator(upArrow); actionBar.setHomeAsUpIndicator(upArrow);
actionBar.setBackgroundDrawable(new ColorDrawable(Color.parseColor("#00000000"))); actionBar.setBackgroundDrawable(new ColorDrawable(Color.parseColor("#00000000")));
mAccessToken = mCurrentAccountSharedPreferences.getString(SharedPreferencesUtils.ACCESS_TOKEN, null);
mAccountName = mCurrentAccountSharedPreferences.getString(SharedPreferencesUtils.ACCOUNT_NAME, null);
if (rpanBroadcasts == null) { if (rpanBroadcasts == null) {
loadRPANVideos(); loadRPANVideos();
} else { } else {

View File

@ -779,7 +779,9 @@ public class ViewPostDetailFragment extends Fragment implements FragmentCommunic
@Override @Override
public boolean onOptionsItemSelected(@NonNull MenuItem item) { public boolean onOptionsItemSelected(@NonNull MenuItem item) {
int itemId = item.getItemId(); int itemId = item.getItemId();
if (itemId == R.id.action_refresh_view_post_detail_fragment) { if (itemId == R.id.action_search_view_post_detail_fragment) {
} else if (itemId == R.id.action_refresh_view_post_detail_fragment) {
refresh(true, true); refresh(true, true);
return true; return true;
} else if (itemId == R.id.action_comment_view_post_detail_fragment) { } else if (itemId == R.id.action_comment_view_post_detail_fragment) {

View File

@ -2,8 +2,15 @@
<menu xmlns:android="http://schemas.android.com/apk/res/android" <menu xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"> xmlns:app="http://schemas.android.com/apk/res-auto">
<item <item
android:id="@+id/action_comment_view_post_detail_fragment" android:id="@+id/action_search_view_post_detail_fragment"
android:orderInCategory="1" android:orderInCategory="1"
android:title="@string/action_search"
android:icon="@drawable/ic_search_toolbar_24dp"
app:showAsAction="ifRoom" />
<item
android:id="@+id/action_comment_view_post_detail_fragment"
android:orderInCategory="2"
android:title="@string/action_add_comment" android:title="@string/action_add_comment"
android:icon="@drawable/ic_comment_toolbar_24dp" android:icon="@drawable/ic_comment_toolbar_24dp"
app:showAsAction="ifRoom" app:showAsAction="ifRoom"
@ -11,98 +18,98 @@
<item <item
android:id="@+id/action_save_view_post_detail_fragment" android:id="@+id/action_save_view_post_detail_fragment"
android:orderInCategory="2" android:orderInCategory="3"
android:title="@string/action_save_post" android:title="@string/action_save_post"
app:showAsAction="ifRoom" app:showAsAction="ifRoom"
android:visible="false" /> android:visible="false" />
<item <item
android:id="@+id/action_sort_view_post_detail_fragment" android:id="@+id/action_sort_view_post_detail_fragment"
android:orderInCategory="3" android:orderInCategory="4"
android:title="@string/action_sort" android:title="@string/action_sort"
app:showAsAction="never" app:showAsAction="never"
android:visible="false" /> android:visible="false" />
<item <item
android:id="@+id/action_refresh_view_post_detail_fragment" android:id="@+id/action_refresh_view_post_detail_fragment"
android:orderInCategory="4" android:orderInCategory="5"
android:title="@string/action_refresh" android:title="@string/action_refresh"
app:showAsAction="never" /> app:showAsAction="never" />
<item <item
android:id="@+id/action_view_crosspost_parent_view_post_detail_fragment" android:id="@+id/action_view_crosspost_parent_view_post_detail_fragment"
android:orderInCategory="5" android:orderInCategory="6"
android:title="@string/action_view_crosspost_parent" android:title="@string/action_view_crosspost_parent"
app:showAsAction="never" app:showAsAction="never"
android:visible="false" /> android:visible="false" />
<item <item
android:id="@+id/action_hide_view_post_detail_fragment" android:id="@+id/action_hide_view_post_detail_fragment"
android:orderInCategory="6" android:orderInCategory="7"
app:showAsAction="never" app:showAsAction="never"
android:visible="false" /> android:visible="false" />
<item <item
android:id="@+id/action_edit_view_post_detail_fragment" android:id="@+id/action_edit_view_post_detail_fragment"
android:orderInCategory="7" android:orderInCategory="8"
android:title="@string/action_edit_post" android:title="@string/action_edit_post"
app:showAsAction="never" app:showAsAction="never"
android:visible="false" /> android:visible="false" />
<item <item
android:id="@+id/action_delete_view_post_detail_fragment" android:id="@+id/action_delete_view_post_detail_fragment"
android:orderInCategory="8" android:orderInCategory="9"
android:title="@string/action_delete_post" android:title="@string/action_delete_post"
app:showAsAction="never" app:showAsAction="never"
android:visible="false" /> android:visible="false" />
<item <item
android:id="@+id/action_nsfw_view_post_detail_fragment" android:id="@+id/action_nsfw_view_post_detail_fragment"
android:orderInCategory="9"
app:showAsAction="never"
android:visible="false" />
<item
android:id="@+id/action_spoiler_view_post_detail_fragment"
android:orderInCategory="10" android:orderInCategory="10"
app:showAsAction="never" app:showAsAction="never"
android:visible="false" /> android:visible="false" />
<item <item
android:id="@+id/action_edit_flair_view_post_detail_fragment" android:id="@+id/action_spoiler_view_post_detail_fragment"
android:orderInCategory="11" android:orderInCategory="11"
app:showAsAction="never"
android:visible="false" />
<item
android:id="@+id/action_edit_flair_view_post_detail_fragment"
android:orderInCategory="12"
android:title="@string/action_edit_flair" android:title="@string/action_edit_flair"
app:showAsAction="never" app:showAsAction="never"
android:visible="false" /> android:visible="false" />
<item <item
android:id="@+id/action_give_award_view_post_detail_fragment" android:id="@+id/action_give_award_view_post_detail_fragment"
android:orderInCategory="12" android:orderInCategory="13"
android:title="@string/action_give_award" android:title="@string/action_give_award"
app:showAsAction="never" /> app:showAsAction="never" />
<item <item
android:id="@+id/action_report_view_post_detail_fragment" android:id="@+id/action_report_view_post_detail_fragment"
android:orderInCategory="13" android:orderInCategory="14"
android:title="@string/action_report" android:title="@string/action_report"
app:showAsAction="never" /> app:showAsAction="never" />
<item <item
android:id="@+id/action_see_removed_view_post_detail_fragment" android:id="@+id/action_see_removed_view_post_detail_fragment"
android:orderInCategory="14" android:orderInCategory="15"
android:title="@string/action_see_removed" android:title="@string/action_see_removed"
app:showAsAction="never" app:showAsAction="never"
android:visible="false" /> android:visible="false" />
<item <item
android:id="@+id/action_crosspost_view_post_detail_fragment" android:id="@+id/action_crosspost_view_post_detail_fragment"
android:orderInCategory="15" android:orderInCategory="16"
android:title="@string/action_crosspost" android:title="@string/action_crosspost"
app:showAsAction="never" /> app:showAsAction="never" />
<item <item
android:id="@+id/action_add_to_post_filter_view_post_detail_fragment" android:id="@+id/action_add_to_post_filter_view_post_detail_fragment"
android:orderInCategory="16" android:orderInCategory="17"
android:title="@string/action_add_to_post_filter" android:title="@string/action_add_to_post_filter"
app:showAsAction="never" /> app:showAsAction="never" />
</menu> </menu>