replace in-activity copy of account name filter value with the global item in Data

[mobile-ledger.git] / app / src / main / java / net / ktnx / mobileledger / ui / activity / MainActivity.java

diff --git a/app/src/main/java/net/ktnx/mobileledger/ui/activity/MainActivity.java b/app/src/main/java/net/ktnx/mobileledger/ui/activity/MainActivity.java
index d20e63f05ea8a886264598fe52e7e103158447ec..bd28ab299c52f47d62a9025bef5287bfc73f7f56 100644 (file)
--- a/app/src/main/java/net/ktnx/mobileledger/ui/activity/MainActivity.java
+++ b/app/src/main/java/net/ktnx/mobileledger/ui/activity/MainActivity.java
@@ -88,14 +88,12 @@ public class MainActivity extends ProfileThemedActivity {
     public AccountSummaryFragment mAccountSummaryFragment;
     DrawerLayout drawer;
     private View profileListHeadMore, profileListHeadCancel, profileListHeadAddProfile;
-    private FragmentManager fragmentManager;
     private View bTransactionListCancelDownload;
     private SectionsPagerAdapter mSectionsPagerAdapter;
     private ViewPager mViewPager;
     private FloatingActionButton fab;
     private ProfilesRecyclerViewAdapter mProfileListAdapter;
     private int mCurrentPage;
-    private String mAccountFilter;
     private boolean mBackMeansToAccountList = false;
     private Toolbar mToolbar;
     private DrawerLayout.SimpleDrawerListener drawerListener;
@@ -106,19 +104,14 @@ public class MainActivity extends ProfileThemedActivity {
     protected void onStart() {
         super.onStart();
 
-        debug("flow", String.format(Locale.ENGLISH,
-                "MainActivity.onStart(), currentPage is %d, accountFilter is %s", mCurrentPage,
-                (mAccountFilter == null) ? "<NULL>" : mAccountFilter));
         mViewPager.setCurrentItem(mCurrentPage, false);
-        if (mAccountFilter != null) showTransactionsFragment(mAccountFilter);
-        else Data.accountFilter.setValue(null);
-
     }
     @Override
     protected void onSaveInstanceState(@NotNull Bundle outState) {
         super.onSaveInstanceState(outState);
         outState.putInt(STATE_CURRENT_PAGE, mViewPager.getCurrentItem());
-        if (mAccountFilter != null) outState.putString(STATE_ACC_FILTER, mAccountFilter);
+        if (Data.accountFilter.getValue() != null)
+            outState.putString(STATE_ACC_FILTER, Data.accountFilter.getValue());
     }
     @Override
     protected void onDestroy() {
@@ -161,8 +154,7 @@ public class MainActivity extends ProfileThemedActivity {
         profileListHeadAddProfile = findViewById(R.id.nav_new_profile_button);
         drawer = findViewById(R.id.drawer_layout);
         bTransactionListCancelDownload = findViewById(R.id.transaction_list_cancel_download);
-        fragmentManager = getSupportFragmentManager();
-        mSectionsPagerAdapter = new SectionsPagerAdapter(fragmentManager);
+        mSectionsPagerAdapter = new SectionsPagerAdapter(getSupportFragmentManager());
         mViewPager = findViewById(R.id.root_frame);
 
         Bundle extra = getIntent().getBundleExtra(BUNDLE_SAVED_STATE);
@@ -227,9 +219,8 @@ public class MainActivity extends ProfileThemedActivity {
             if (currentPage != -1) {
                 mCurrentPage = currentPage;
             }
-            mAccountFilter = savedInstanceState.getString(STATE_ACC_FILTER, null);
+            Data.accountFilter.setValue(savedInstanceState.getString(STATE_ACC_FILTER, null));
         }
-        else mAccountFilter = null;
 
         Data.lastUpdateDate.observe(this, this::updateLastUpdateDisplay);
 
@@ -540,7 +531,7 @@ public class MainActivity extends ProfileThemedActivity {
             }
             else {
                 debug("fragments", String.format(Locale.ENGLISH, "manager stack: %d",
-                        fragmentManager.getBackStackEntryCount()));
+                        getSupportFragmentManager().getBackStackEntryCount()));
 
                 super.onBackPressed();
             }
@@ -579,8 +570,9 @@ public class MainActivity extends ProfileThemedActivity {
     public void onRetrieveStart() {
         ProgressBar progressBar = findViewById(R.id.transaction_list_progress_bar);
         bTransactionListCancelDownload.setEnabled(true);
-        progressBar.setIndeterminateTintList(ColorStateList.valueOf(Colors.primary));
-        progressBar.setProgressTintList(ColorStateList.valueOf(Colors.primary));
+        ColorStateList csl = Colors.getColorStateList();
+        progressBar.setIndeterminateTintList(csl);
+        progressBar.setProgressTintList(csl);
         progressBar.setIndeterminate(true);
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) progressBar.setProgress(0, false);
         else progressBar.setProgress(0);