From 5d12ff78efcccbdf8c2c6bd8c99ef357703c06f0 Mon Sep 17 00:00:00 2001
From: Docile-Alligator <25734209+Docile-Alligator@users.noreply.github.com>
Date: Wed, 4 Sep 2024 12:51:35 -0400
Subject: Show correct title in SubscribedThingListingActivity. Remove
SubredditSelectionActivity.
---
app/src/main/AndroidManifest.xml | 5 -
.../infinityforreddit/AppComponent.java | 3 -
.../activities/SubredditSelectionActivity.java | 285 ---------------------
.../activities/SubscribedThingListingActivity.java | 8 +
.../res/layout/activity_subreddit_selection.xml | 41 ---
5 files changed, 8 insertions(+), 334 deletions(-)
delete mode 100644 app/src/main/java/ml/docilealligator/infinityforreddit/activities/SubredditSelectionActivity.java
delete mode 100644 app/src/main/res/layout/activity_subreddit_selection.xml
(limited to 'app')
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 23da717d..18f9a9d5 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -379,11 +379,6 @@
android:label="@string/subscriptions"
android:parentActivityName=".activities.MainActivity"
android:theme="@style/AppTheme.Slidable" />
-
= Build.VERSION_CODES.M) {
- Window window = getWindow();
-
- if (isChangeStatusBarIconColor()) {
- addOnOffsetChangedListener(binding.appbarLayoutSubredditSelectionActivity);
- }
-
- if (isImmersiveInterface()) {
- if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
- window.setDecorFitsSystemWindows(false);
- } else {
- window.setFlags(WindowManager.LayoutParams.FLAG_LAYOUT_NO_LIMITS, WindowManager.LayoutParams.FLAG_LAYOUT_NO_LIMITS);
- }
- adjustToolbar(binding.toolbarSubredditSelectionActivity);
- }
- }
-
- setSupportActionBar(binding.toolbarSubredditSelectionActivity);
- getSupportActionBar().setDisplayHomeAsUpEnabled(true);
-
- if (getIntent().hasExtra(EXTRA_SPECIFIED_ACCOUNT)) {
- Account specifiedAccount = getIntent().getParcelableExtra(EXTRA_SPECIFIED_ACCOUNT);
- if (specifiedAccount != null) {
- accessToken = specifiedAccount.getAccessToken();
- accountName = specifiedAccount.getAccountName();
- mAccountProfileImageUrl = specifiedAccount.getProfileImageUrl();
-
- mOauthRetrofit = mOauthRetrofit.newBuilder().client(new OkHttpClient.Builder().authenticator(new AnyAccountAccessTokenAuthenticator(mRetrofit, mRedditDataRoomDatabase, specifiedAccount, mCurrentAccountSharedPreferences))
- .connectTimeout(30, TimeUnit.SECONDS)
- .readTimeout(30, TimeUnit.SECONDS)
- .writeTimeout(30, TimeUnit.SECONDS)
- .connectionPool(new ConnectionPool(0, 1, TimeUnit.NANOSECONDS))
- .build())
- .build();
- } else {
- mAccountProfileImageUrl = mCurrentAccountSharedPreferences.getString(SharedPreferencesUtils.ACCOUNT_IMAGE_URL, null);
- }
- } else {
- mAccountProfileImageUrl = mCurrentAccountSharedPreferences.getString(SharedPreferencesUtils.ACCOUNT_IMAGE_URL, null);
- }
-
- if (savedInstanceState == null) {
- bindView(true);
- } else {
- mInsertSuccess = savedInstanceState.getBoolean(INSERT_SUBSCRIBED_SUBREDDIT_STATE);
-
- mFragment = getSupportFragmentManager().getFragment(savedInstanceState, FRAGMENT_OUT_STATE);
- getSupportFragmentManager().beginTransaction().replace(R.id.frame_layout_subreddit_selection_activity, mFragment).commit();
- bindView(false);
- }
- }
-
- @Override
- public SharedPreferences getDefaultSharedPreferences() {
- return mSharedPreferences;
- }
-
- @Override
- public SharedPreferences getCurrentAccountSharedPreferences() {
- return mCurrentAccountSharedPreferences;
- }
-
- @Override
- public CustomThemeWrapper getCustomThemeWrapper() {
- return mCustomThemeWrapper;
- }
-
- @Override
- protected void applyCustomTheme() {
- binding.getRoot().setBackgroundColor(mCustomThemeWrapper.getBackgroundColor());
- applyAppBarLayoutAndCollapsingToolbarLayoutAndToolbarTheme(binding.appbarLayoutSubredditSelectionActivity,
- binding.collapsingToolbarLayoutSubredditSelectionActivity, binding.toolbarSubredditSelectionActivity);
- }
-
- private void bindView(boolean initializeFragment) {
- if (isFinishing() || isDestroyed()) {
- return;
- }
-
- loadSubscriptions();
-
- if (initializeFragment) {
- mFragment = new SubscribedSubredditsListingFragment();
- Bundle bundle = new Bundle();
- bundle.putString(SubscribedSubredditsListingFragment.EXTRA_ACCOUNT_PROFILE_IMAGE_URL, mAccountProfileImageUrl);
- bundle.putBoolean(SubscribedSubredditsListingFragment.EXTRA_IS_SUBREDDIT_SELECTION, true);
- if (getIntent().hasExtra(EXTRA_EXTRA_CLEAR_SELECTION)) {
- bundle.putBoolean(SubscribedSubredditsListingFragment.EXTRA_EXTRA_CLEAR_SELECTION,
- getIntent().getExtras().getBoolean(EXTRA_EXTRA_CLEAR_SELECTION));
- }
- mFragment.setArguments(bundle);
- getSupportFragmentManager().beginTransaction().replace(R.id.frame_layout_subreddit_selection_activity, mFragment).commit();
- }
- }
-
- private void loadSubscriptions() {
- if (!mInsertSuccess) {
- FetchSubscribedThing.fetchSubscribedThing(mOauthRetrofit, accessToken, accountName, null,
- new ArrayList<>(), new ArrayList<>(),
- new ArrayList<>(),
- new FetchSubscribedThing.FetchSubscribedThingListener() {
- @Override
- public void onFetchSubscribedThingSuccess(ArrayList subscribedSubredditData,
- ArrayList subscribedUserData,
- ArrayList subredditData) {
- InsertSubscribedThings.insertSubscribedThings(
- mExecutor,
- new Handler(),
- mRedditDataRoomDatabase,
- accountName,
- subscribedSubredditData,
- subscribedUserData,
- subredditData,
- () -> mInsertSuccess = true);
- }
-
- @Override
- public void onFetchSubscribedThingFail() {
- mInsertSuccess = false;
- }
- });
- }
- }
-
- @Override
- public boolean onCreateOptionsMenu(Menu menu) {
- getMenuInflater().inflate(R.menu.subreddit_selection_activity, menu);
- applyMenuItemTheme(menu);
- return true;
- }
-
- @Override
- public boolean onOptionsItemSelected(@NonNull MenuItem item) {
- int itemId = item.getItemId();
- if (itemId == android.R.id.home) {
- finish();
- return true;
- } else if (itemId == R.id.action_search_subreddit_selection_activity) {
- Intent intent = new Intent(this, SearchActivity.class);
- intent.putExtra(SearchActivity.EXTRA_SEARCH_ONLY_SUBREDDITS, true);
- startActivityForResult(intent, SUBREDDIT_SEARCH_REQUEST_CODE);
- return true;
- }
-
- return false;
- }
-
- @Override
- protected void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) {
- if (requestCode == SUBREDDIT_SEARCH_REQUEST_CODE) {
- if (resultCode == RESULT_OK) {
- Intent returnIntent = new Intent();
- returnIntent.putExtra(SelectThingReturnKey.RETURN_EXTRA_SUBREDDIT_OR_USER_NAME, data.getStringExtra(SelectThingReturnKey.RETURN_EXTRA_SUBREDDIT_OR_USER_NAME));
- returnIntent.putExtra(SelectThingReturnKey.RETURN_EXTRA_SUBREDDIT_OR_USER_ICON, data.getStringExtra(SelectThingReturnKey.RETURN_EXTRA_SUBREDDIT_OR_USER_ICON));
- returnIntent.putExtra(SelectThingReturnKey.RETURN_EXTRA_THING_TYPE, SelectThingReturnKey.THING_TYPE.SUBREDDIT);
- setResult(Activity.RESULT_OK, returnIntent);
- finish();
- }
- }
- super.onActivityResult(requestCode, resultCode, data);
- }
-
- @Override
- protected void onSaveInstanceState(@NonNull Bundle outState) {
- super.onSaveInstanceState(outState);
- getSupportFragmentManager().putFragment(outState, FRAGMENT_OUT_STATE, mFragment);
- outState.putBoolean(INSERT_SUBSCRIBED_SUBREDDIT_STATE, mInsertSuccess);
- }
-
- @Override
- protected void onDestroy() {
- super.onDestroy();
- EventBus.getDefault().unregister(this);
- }
-
- @Subscribe
- public void onAccountSwitchEvent(SwitchAccountEvent event) {
- finish();
- }
-
- @Override
- public void onLongPress() {
- if (mFragment != null) {
- ((SubscribedSubredditsListingFragment) mFragment).goBackToTop();
- }
- }
-}
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/activities/SubscribedThingListingActivity.java b/app/src/main/java/ml/docilealligator/infinityforreddit/activities/SubscribedThingListingActivity.java
index c220195e..f674d09d 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/activities/SubscribedThingListingActivity.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/activities/SubscribedThingListingActivity.java
@@ -191,6 +191,14 @@ public class SubscribedThingListingActivity extends BaseActivity implements Acti
isThingSelectionMode = getIntent().getBooleanExtra(EXTRA_THING_SELECTION_MODE, false);
thingSelectionType = getIntent().getIntExtra(EXTRA_THING_SELECTION_TYPE, EXTRA_THING_SELECTION_TYPE_ALL);
+ if (isThingSelectionMode) {
+ switch (thingSelectionType) {
+ case EXTRA_THING_SELECTION_TYPE_SUBREDDIT:
+ getSupportActionBar().setTitle(R.string.subreddit_selection_activity_label);
+ break;
+ }
+ }
+
if (isThingSelectionMode && thingSelectionType != EXTRA_THING_SELECTION_TYPE_ALL) {
binding.tabLayoutSubscribedThingListingActivity.setVisibility(View.GONE);
}
diff --git a/app/src/main/res/layout/activity_subreddit_selection.xml b/app/src/main/res/layout/activity_subreddit_selection.xml
deleted file mode 100644
index ea677d17..00000000
--- a/app/src/main/res/layout/activity_subreddit_selection.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
--
cgit v1.2.3