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

Fix clicking a subreddit in subreddit suggestions goes to the subreddit page instead of returning the subreddit name in several activities.

Browse Source
This commit is contained in:
Alex Ning 2021-08-25 20:34:08 +08:00
parent de8df061ed
commit fffc5b9eb4
2 changed files with 20 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
app/src/main/java/ml/docilealligator/infinityforreddit/activities/SearchActivity.java
View File

@ -41,7 +41,6 @@ import ml.docilealligator.infinityforreddit.adapters.SearchActivityRecyclerViewA
import ml.docilealligator.infinityforreddit.adapters.SubredditAutocompleteRecyclerViewAdapter; import ml.docilealligator.infinityforreddit.adapters.SubredditAutocompleteRecyclerViewAdapter;
import ml.docilealligator.infinityforreddit.apis.RedditAPI; import ml.docilealligator.infinityforreddit.apis.RedditAPI;
import ml.docilealligator.infinityforreddit.customtheme.CustomThemeWrapper; import ml.docilealligator.infinityforreddit.customtheme.CustomThemeWrapper;
import ml.docilealligator.infinityforreddit.customviews.LinearLayoutManagerBugFixed;
import ml.docilealligator.infinityforreddit.events.SwitchAccountEvent; import ml.docilealligator.infinityforreddit.events.SwitchAccountEvent;
import ml.docilealligator.infinityforreddit.recentsearchquery.DeleteRecentSearchQuery; import ml.docilealligator.infinityforreddit.recentsearchquery.DeleteRecentSearchQuery;
import ml.docilealligator.infinityforreddit.recentsearchquery.RecentSearchQuery; import ml.docilealligator.infinityforreddit.recentsearchquery.RecentSearchQuery;
@ -183,11 +182,24 @@ public class SearchActivity extends BaseActivity {
subredditAutocompleteRecyclerViewAdapter = new SubredditAutocompleteRecyclerViewAdapter(this, subredditAutocompleteRecyclerViewAdapter = new SubredditAutocompleteRecyclerViewAdapter(this,
mCustomThemeWrapper, subredditData -> { mCustomThemeWrapper, subredditData -> {
Intent intent = new Intent(SearchActivity.this, ViewSubredditDetailActivity.class); if (searchOnlySubreddits) {
intent.putExtra(ViewSubredditDetailActivity.EXTRA_SUBREDDIT_NAME_KEY, subredditData.getName()); Intent returnIntent = new Intent();
startActivity(intent); if (getIntent().getBooleanExtra(EXTRA_IS_MULTI_SELECTION, false)) {
finish(); ArrayList<String> subredditNameList = new ArrayList<>();
}); subredditNameList.add(subredditData.getName());
returnIntent.putStringArrayListExtra(RETURN_EXTRA_SELECTED_SUBREDDIT_NAMES, subredditNameList);
} else {
returnIntent.putExtra(EXTRA_RETURN_SUBREDDIT_NAME, subredditData.getName());
returnIntent.putExtra(EXTRA_RETURN_SUBREDDIT_ICON_URL, subredditData.getIconUrl());
}
setResult(Activity.RESULT_OK, returnIntent);
} else {
Intent intent = new Intent(SearchActivity.this, ViewSubredditDetailActivity.class);
intent.putExtra(ViewSubredditDetailActivity.EXTRA_SUBREDDIT_NAME_KEY, subredditData.getName());
startActivity(intent);
}
finish();
});
simpleSearchView.setOnQueryTextListener(new SimpleSearchView.OnQueryTextListener() { simpleSearchView.setOnQueryTextListener(new SimpleSearchView.OnQueryTextListener() {
@Override @Override
@ -287,7 +299,6 @@ public class SearchActivity extends BaseActivity {
}); });
recyclerView.setVisibility(View.VISIBLE); recyclerView.setVisibility(View.VISIBLE);
recyclerView.setNestedScrollingEnabled(false); recyclerView.setNestedScrollingEnabled(false);
recyclerView.setLayoutManager(new LinearLayoutManagerBugFixed(this));
recyclerView.setAdapter(adapter); recyclerView.setAdapter(adapter);
if (mSharedPreferences.getBoolean(SharedPreferencesUtils.ENABLE_SEARCH_HISTORY, true)) { if (mSharedPreferences.getBoolean(SharedPreferencesUtils.ENABLE_SEARCH_HISTORY, true)) {

3
app/src/main/res/layout/activity_search.xml
View File

@ -95,7 +95,8 @@
android:id="@+id/recycler_view_search_activity" android:id="@+id/recycler_view_search_activity"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:visibility="gone" /> android:visibility="gone"
app:layoutManager=".customviews.LinearLayoutManagerBugFixed" />
</LinearLayout> </LinearLayout>