mirror/Infinity-For-Lemmy
1
0
Fork 0
mirror of https://codeberg.org/Bazsalanszky/Infinity-For-Lemmy.git synced 2024-11-07 11:17:25 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix some issues of searching.

Browse Source
This commit is contained in:
Alex Ning 2020-03-30 14:54:55 +08:00
parent 84d4679aa9
commit 07bca6d635
7 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/src/main/java/ml/docilealligator/infinityforreddit/Activity/MainActivity.java
View File

@ -745,7 +745,6 @@ public class MainActivity extends BaseActivity implements SortTypeSelectionCallb
return true; return true;
case R.id.action_search_main_activity: case R.id.action_search_main_activity:
Intent intent = new Intent(this, SearchActivity.class); Intent intent = new Intent(this, SearchActivity.class);
intent.putExtra(SearchActivity.EXTRA_SEARCH_ONLY_SUBREDDITS, false);
startActivity(intent); startActivity(intent);
return true; return true;
case R.id.action_refresh_main_activity: case R.id.action_refresh_main_activity:

6
app/src/main/java/ml/docilealligator/infinityforreddit/Activity/SearchActivity.java
View File

@ -171,9 +171,9 @@ public class SearchActivity extends BaseActivity {
Intent intent = getIntent(); Intent intent = getIntent();
if (intent.hasExtra(EXTRA_SUBREDDIT_NAME)) { if (intent.hasExtra(EXTRA_SUBREDDIT_NAME)) {
subredditName = intent.getExtras().getString(EXTRA_SUBREDDIT_NAME); subredditName = intent.getStringExtra(EXTRA_SUBREDDIT_NAME);
subredditNameTextView.setText(subredditName); subredditNameTextView.setText(subredditName);
subredditIsUser = intent.getExtras().getBoolean(EXTRA_SUBREDDIT_IS_USER); subredditIsUser = intent.getBooleanExtra(EXTRA_SUBREDDIT_IS_USER, false);
} }
} }
@ -196,7 +196,7 @@ public class SearchActivity extends BaseActivity {
simpleSearchView.setIconsColor(toolbarPrimaryTextAndIconColorColor); simpleSearchView.setIconsColor(toolbarPrimaryTextAndIconColorColor);
simpleSearchView.setTextColor(toolbarPrimaryTextAndIconColorColor); simpleSearchView.setTextColor(toolbarPrimaryTextAndIconColorColor);
simpleSearchView.setBackIconColor(toolbarPrimaryTextAndIconColorColor); simpleSearchView.setBackIconColor(toolbarPrimaryTextAndIconColorColor);
simpleSearchView.setHintTextColor(mCustomThemeWrapper.getSecondaryTextColor()); simpleSearchView.setHintTextColor(mCustomThemeWrapper.getToolbarPrimaryTextAndIconColor());
searchInTextView.setTextColor(mCustomThemeWrapper.getColorAccent()); searchInTextView.setTextColor(mCustomThemeWrapper.getColorAccent());
subredditNameTextView.setTextColor(mCustomThemeWrapper.getPrimaryTextColor()); subredditNameTextView.setTextColor(mCustomThemeWrapper.getPrimaryTextColor());
} }

4
app/src/main/java/ml/docilealligator/infinityforreddit/Activity/SearchResultActivity.java
View File

@ -231,7 +231,9 @@ public class SearchResultActivity extends BaseActivity implements SortTypeSelect
return true; return true;
case R.id.action_search_search_result_activity: case R.id.action_search_search_result_activity:
Intent intent = new Intent(this, SearchActivity.class); Intent intent = new Intent(this, SearchActivity.class);
intent.putExtra(SearchActivity.EXTRA_SEARCH_ONLY_SUBREDDITS, false); if (mSubredditName != null && !mSubredditName.equals("")) {
intent.putExtra(SearchActivity.EXTRA_SUBREDDIT_NAME, mSubredditName);
}
intent.putExtra(SearchActivity.EXTRA_QUERY, mQuery); intent.putExtra(SearchActivity.EXTRA_QUERY, mQuery);
finish(); finish();
startActivity(intent); startActivity(intent);

1
app/src/main/java/ml/docilealligator/infinityforreddit/Activity/ViewMultiRedditDetailActivity.java
View File

@ -215,7 +215,6 @@ public class ViewMultiRedditDetailActivity extends BaseActivity implements SortT
return true; return true;
case R.id.action_search_view_multi_reddit_detail_activity: case R.id.action_search_view_multi_reddit_detail_activity:
Intent intent = new Intent(this, SearchActivity.class); Intent intent = new Intent(this, SearchActivity.class);
intent.putExtra(SearchActivity.EXTRA_SEARCH_ONLY_SUBREDDITS, false);
startActivity(intent); startActivity(intent);
return true; return true;
case R.id.action_refresh_view_multi_reddit_detail_activity: case R.id.action_refresh_view_multi_reddit_detail_activity:

2
app/src/main/java/ml/docilealligator/infinityforreddit/Activity/ViewSubredditDetailActivity.java
View File

@ -662,8 +662,6 @@ public class ViewSubredditDetailActivity extends BaseActivity implements SortTyp
case R.id.action_search_view_subreddit_detail_activity: case R.id.action_search_view_subreddit_detail_activity:
Intent intent = new Intent(this, SearchActivity.class); Intent intent = new Intent(this, SearchActivity.class);
intent.putExtra(SearchActivity.EXTRA_SUBREDDIT_NAME, subredditName); intent.putExtra(SearchActivity.EXTRA_SUBREDDIT_NAME, subredditName);
intent.putExtra(SearchActivity.EXTRA_SUBREDDIT_IS_USER, false);
intent.putExtra(SearchActivity.EXTRA_SEARCH_ONLY_SUBREDDITS, false);
startActivity(intent); startActivity(intent);
return true; return true;
case R.id.action_refresh_view_subreddit_detail_activity: case R.id.action_refresh_view_subreddit_detail_activity:

1
app/src/main/java/ml/docilealligator/infinityforreddit/Activity/ViewUserDetailActivity.java
View File

@ -583,7 +583,6 @@ public class ViewUserDetailActivity extends BaseActivity implements SortTypeSele
Intent intent = new Intent(this, SearchActivity.class); Intent intent = new Intent(this, SearchActivity.class);
intent.putExtra(SearchActivity.EXTRA_SUBREDDIT_NAME, username); intent.putExtra(SearchActivity.EXTRA_SUBREDDIT_NAME, username);
intent.putExtra(SearchActivity.EXTRA_SUBREDDIT_IS_USER, true); intent.putExtra(SearchActivity.EXTRA_SUBREDDIT_IS_USER, true);
intent.putExtra(SearchActivity.EXTRA_SEARCH_ONLY_SUBREDDITS, false);
startActivity(intent); startActivity(intent);
return true; return true;
case R.id.action_refresh_view_user_detail_activity: case R.id.action_refresh_view_user_detail_activity:

2
app/src/main/res/xml/advanced_preferences.xml
View File

@ -28,7 +28,7 @@
<Preference <Preference
android:icon="@drawable/ic_info_preference_24dp" android:icon="@drawable/ic_info_preference_24dp"
app:summary="@string/settings_custom_theme_cannot_apply_to_settings_page_summary" app:summary="@string/settings_advanced_settings_summary"
app:enabled="false" /> app:enabled="false" />
</PreferenceScreen> </PreferenceScreen>