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

RPAN and trending available to anonymous mode.

Browse Source
This commit is contained in:
Alex Ning 2021-09-29 19:41:58 +08:00
parent f5f6213733
commit 5b5bc1c5b8
3 changed files with 27 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
app/src/main/java/ml/docilealligator/infinityforreddit/activities/TrendingActivity.java
View File

@ -81,6 +81,9 @@ public class TrendingActivity extends BaseActivity {
@BindView(R.id.fetch_trending_search_text_view_trending_activity) @BindView(R.id.fetch_trending_search_text_view_trending_activity)
TextView errorTextView; TextView errorTextView;
@Inject @Inject
@Named("no_oauth")
Retrofit mRetrofit;
@Inject
@Named("oauth") @Named("oauth")
Retrofit mOauthRetrofit; Retrofit mOauthRetrofit;
@Inject @Inject
@ -178,6 +181,8 @@ public class TrendingActivity extends BaseActivity {
swipeRefreshLayout.setEnabled(mSharedPreferences.getBoolean(SharedPreferencesUtils.PULL_TO_REFRESH, true)); swipeRefreshLayout.setEnabled(mSharedPreferences.getBoolean(SharedPreferencesUtils.PULL_TO_REFRESH, true));
swipeRefreshLayout.setOnRefreshListener(this::fetchTrendingSearches); swipeRefreshLayout.setOnRefreshListener(this::fetchTrendingSearches);
errorLinearLayout.setOnClickListener(view -> fetchTrendingSearches());
if (savedInstanceState != null) { if (savedInstanceState != null) {
trendingSearches = savedInstanceState.getParcelableArrayList(TRENDING_SEARCHES_STATE); trendingSearches = savedInstanceState.getParcelableArrayList(TRENDING_SEARCHES_STATE);
} }
@ -200,7 +205,13 @@ public class TrendingActivity extends BaseActivity {
trendingSearches = null; trendingSearches = null;
adapter.setTrendingSearches(null); adapter.setTrendingSearches(null);
Handler handler = new Handler(); Handler handler = new Handler();
mOauthRetrofit.create(RedditAPI.class).getTrendingSearches(APIUtils.getOAuthHeader(mAccessToken)).enqueue(new Callback<String>() { Call<String> trendingCall;
if (mAccessToken == null) {
trendingCall = mRetrofit.create(RedditAPI.class).getTrendingSearches();
} else {
trendingCall = mOauthRetrofit.create(RedditAPI.class).getTrendingSearchesOauth(APIUtils.getOAuthHeader(mAccessToken));
}
trendingCall.enqueue(new Callback<>() {
@Override @Override
public void onResponse(@NonNull Call<String> call, @NonNull Response<String> response) { public void onResponse(@NonNull Call<String> call, @NonNull Response<String> response) {
if (response.isSuccessful()) { if (response.isSuccessful()) {

14
app/src/main/java/ml/docilealligator/infinityforreddit/adapters/NavigationDrawerRecyclerViewAdapter.java
View File

@ -555,6 +555,14 @@ public class NavigationDrawerRecyclerViewAdapter extends RecyclerView.Adapter<Re
drawableId = R.drawable.ic_subscritptions_bottom_app_bar_24dp; drawableId = R.drawable.ic_subscritptions_bottom_app_bar_24dp;
break; break;
case 2: case 2:
stringId = R.string.rpan;
drawableId = R.drawable.ic_rpan_24dp;
break;
case 3:
stringId = R.string.trending;
drawableId = R.drawable.ic_trending_24dp;
break;
case 4:
if ((resources.getConfiguration().uiMode & Configuration.UI_MODE_NIGHT_MASK) != Configuration.UI_MODE_NIGHT_YES) { if ((resources.getConfiguration().uiMode & Configuration.UI_MODE_NIGHT_MASK) != Configuration.UI_MODE_NIGHT_YES) {
stringId = R.string.dark_theme; stringId = R.string.dark_theme;
drawableId = R.drawable.ic_dark_theme_24dp; drawableId = R.drawable.ic_dark_theme_24dp;
@ -563,7 +571,7 @@ public class NavigationDrawerRecyclerViewAdapter extends RecyclerView.Adapter<Re
drawableId = R.drawable.ic_light_theme_24dp; drawableId = R.drawable.ic_light_theme_24dp;
} }
break; break;
case 3: case 5:
setOnClickListener = false; setOnClickListener = false;
if (isNSFWEnabled) { if (isNSFWEnabled) {
stringId = R.string.disable_nsfw; stringId = R.string.disable_nsfw;
@ -587,7 +595,7 @@ public class NavigationDrawerRecyclerViewAdapter extends RecyclerView.Adapter<Re
} }
}); });
break; break;
case 4: case 6:
stringId = R.string.settings; stringId = R.string.settings;
drawableId = R.drawable.ic_settings_24dp; drawableId = R.drawable.ic_settings_24dp;
} }
@ -761,7 +769,7 @@ public class NavigationDrawerRecyclerViewAdapter extends RecyclerView.Adapter<Re
- (collapsePostSection ? POST_SECTION_ITEMS : 0) - (collapsePostSection ? POST_SECTION_ITEMS : 0)
- (collapsePreferencesSection ? PREFERENCES_SECTION_ITEMS : 0); - (collapsePreferencesSection ? PREFERENCES_SECTION_ITEMS : 0);
} else { } else {
return 5; return 7;
} }
} else { } else {
if (isLoggedIn) { if (isLoggedIn) {

5
app/src/main/java/ml/docilealligator/infinityforreddit/apis/RedditAPI.java
View File

@ -292,7 +292,10 @@ public interface RedditAPI {
Call<String> submitGalleryPost(@HeaderMap Map<String, String> headers, @Body String body); Call<String> submitGalleryPost(@HeaderMap Map<String, String> headers, @Body String body);
@GET("/api/trending_searches_v1.json?withAds=0&raw_json=1&gilding_detail=1") @GET("/api/trending_searches_v1.json?withAds=0&raw_json=1&gilding_detail=1")
Call<String> getTrendingSearches(@HeaderMap Map<String, String> headers); Call<String> getTrendingSearches();
@GET("/api/trending_searches_v1.json?withAds=0&raw_json=1&gilding_detail=1")
Call<String> getTrendingSearchesOauth(@HeaderMap Map<String, String> headers);
default Call<String> getWiki(@Path("subredditName") String subredditName) { default Call<String> getWiki(@Path("subredditName") String subredditName) {
return getWikiPage(subredditName, "index"); return getWikiPage(subredditName, "index");