]> git.ktnx.net Git - mobile-ledger.git/blobdiff - app/src/main/java/net/ktnx/mobileledger/ui/activity/MainActivity.java
fix (+) fab visible after profile change (activity recreation)
[mobile-ledger.git] / app / src / main / java / net / ktnx / mobileledger / ui / activity / MainActivity.java
index 6a49638fcbb6f79a37640c7b81cf24280ca4444c..3f71e0a4707cf0f19dd5883b372795d9b6cacc96 100644 (file)
@@ -36,9 +36,21 @@ import android.view.animation.AnimationUtils;
 import android.widget.LinearLayout;
 import android.widget.ProgressBar;
 import android.widget.TextView;
-import android.widget.Toast;
+
+import androidx.annotation.NonNull;
+import androidx.appcompat.app.ActionBarDrawerToggle;
+import androidx.appcompat.widget.Toolbar;
+import androidx.core.view.GravityCompat;
+import androidx.drawerlayout.widget.DrawerLayout;
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentManager;
+import androidx.fragment.app.FragmentPagerAdapter;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+import androidx.viewpager.widget.ViewPager;
 
 import com.google.android.material.floatingactionbutton.FloatingActionButton;
+import com.google.android.material.snackbar.Snackbar;
 
 import net.ktnx.mobileledger.R;
 import net.ktnx.mobileledger.async.DbOpQueue;
@@ -66,21 +78,13 @@ import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 import java.util.Locale;
-import java.util.Observer;
-
-import androidx.appcompat.app.ActionBarDrawerToggle;
-import androidx.appcompat.widget.Toolbar;
-import androidx.core.view.GravityCompat;
-import androidx.drawerlayout.widget.DrawerLayout;
-import androidx.fragment.app.Fragment;
-import androidx.fragment.app.FragmentManager;
-import androidx.fragment.app.FragmentPagerAdapter;
-import androidx.recyclerview.widget.LinearLayoutManager;
-import androidx.recyclerview.widget.RecyclerView;
-import androidx.viewpager.widget.ViewPager;
 
 import static net.ktnx.mobileledger.utils.Logger.debug;
 
+/*
+ * TODO: reports
+ *  */
+
 public class MainActivity extends ProfileThemedActivity {
     public static final String STATE_CURRENT_PAGE = "current_page";
     public static final String BUNDLE_SAVED_STATE = "bundle_savedState";
@@ -89,65 +93,64 @@ public class MainActivity extends ProfileThemedActivity {
     public AccountSummaryFragment mAccountSummaryFragment;
     DrawerLayout drawer;
     private View profileListHeadMore, profileListHeadCancel, profileListHeadAddProfile;
-    private FragmentManager fragmentManager;
     private View bTransactionListCancelDownload;
-    private ProgressBar progressBar;
-    private LinearLayout progressLayout;
     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;
     private ActionBarDrawerToggle barDrawerToggle;
     private ViewPager.SimpleOnPageChangeListener pageChangeListener;
-    private Observer editingProfilesObserver;
     private MobileLedgerProfile profile;
     @Override
     protected void onStart() {
         super.onStart();
 
-        debug("flow", "MainActivity.onStart()");
         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() {
         mSectionsPagerAdapter = null;
         RecyclerView root = findViewById(R.id.nav_profile_list);
-        if (root != null) root.setAdapter(null);
-        if (drawer != null) drawer.removeDrawerListener(drawerListener);
+        if (root != null)
+            root.setAdapter(null);
+        if (drawer != null)
+            drawer.removeDrawerListener(drawerListener);
         drawerListener = null;
-        if (drawer != null) drawer.removeDrawerListener(barDrawerToggle);
+        if (drawer != null)
+            drawer.removeDrawerListener(barDrawerToggle);
         barDrawerToggle = null;
-        if (mViewPager != null) mViewPager.removeOnPageChangeListener(pageChangeListener);
+        if (mViewPager != null)
+            mViewPager.removeOnPageChangeListener(pageChangeListener);
         pageChangeListener = null;
-        if (mProfileListAdapter != null)
-            mProfileListAdapter.deleteEditingProfilesObserver(editingProfilesObserver);
-        editingProfilesObserver = null;
         super.onDestroy();
     }
     @Override
     protected void setupProfileColors() {
         SharedPreferences prefs = getPreferences(MODE_PRIVATE);
         int profileColor = prefs.getInt(PREF_THEME_ID, -2);
-        if (profileColor == -2) profileColor = Data.retrieveCurrentThemeIdFromDb();
+        if (profileColor == -2)
+            profileColor = Data.retrieveCurrentThemeIdFromDb();
         Colors.setupTheme(this, profileColor);
         Colors.profileThemeId = profileColor;
         storeThemeIdInPrefs(profileColor);
     }
     @Override
+    protected void onResume() {
+        super.onResume();
+        fabShouldShow();
+    }
+    @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         debug("flow", "MainActivity.onCreate()");
@@ -161,14 +164,12 @@ 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);
-        progressBar = findViewById(R.id.transaction_list_progress_bar);
-        progressLayout = findViewById(R.id.transaction_progress_layout);
-        fragmentManager = getSupportFragmentManager();
-        mSectionsPagerAdapter = new SectionsPagerAdapter(fragmentManager);
+        mSectionsPagerAdapter = new SectionsPagerAdapter(getSupportFragmentManager());
         mViewPager = findViewById(R.id.root_frame);
 
         Bundle extra = getIntent().getBundleExtra(BUNDLE_SAVED_STATE);
-        if (extra != null && savedInstanceState == null) savedInstanceState = extra;
+        if (extra != null && savedInstanceState == null)
+            savedInstanceState = extra;
 
 
         mToolbar = findViewById(R.id.toolbar);
@@ -184,23 +185,37 @@ public class MainActivity extends ProfileThemedActivity {
             drawer.addDrawerListener(barDrawerToggle);
         }
         barDrawerToggle.syncState();
+        drawer.addDrawerListener(new DrawerLayout.DrawerListener() {
+            @Override
+            public void onDrawerSlide(@NonNull View drawerView, float slideOffset) {
+                if (slideOffset > 0.2)
+                    fabHide();
+            }
+            @Override
+            public void onDrawerOpened(@NonNull View drawerView) {
+                fabHide();
+            }
+            @Override
+            public void onDrawerClosed(@NonNull View drawerView) {
+                fabShouldShow();
+            }
+            @Override
+            public void onDrawerStateChanged(int newState) {}
+        });
 
-        TextView ver = drawer.findViewById(R.id.drawer_version_text);
 
         try {
-            PackageInfo pi =
-                    getApplicationContext().getPackageManager().getPackageInfo(getPackageName(), 0);
-            ver.setText(pi.versionName);
+            PackageInfo pi = getApplicationContext().getPackageManager()
+                                                    .getPackageInfo(getPackageName(), 0);
+            ((TextView) findViewById(R.id.nav_upper).findViewById(
+                    R.id.drawer_version_text)).setText(pi.versionName);
+            ((TextView) findViewById(R.id.no_profiles_layout).findViewById(
+                    R.id.drawer_version_text)).setText(pi.versionName);
         }
         catch (Exception e) {
             e.printStackTrace();
         }
 
-        if (progressBar == null)
-            throw new RuntimeException("Can't get hold on the transaction value progress bar");
-        if (progressLayout == null) throw new RuntimeException(
-                "Can't get hold on the transaction value progress bar layout");
-
         markDrawerItemCurrent(R.id.nav_account_summary);
 
         mViewPager.setAdapter(mSectionsPagerAdapter);
@@ -209,6 +224,7 @@ public class MainActivity extends ProfileThemedActivity {
             pageChangeListener = new ViewPager.SimpleOnPageChangeListener() {
                 @Override
                 public void onPageSelected(int position) {
+                    mCurrentPage = position;
                     switch (position) {
                         case 0:
                             markDrawerItemCurrent(R.id.nav_account_summary);
@@ -233,54 +249,57 @@ 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);
 
-        findViewById(R.id.btn_no_profiles_add)
-                .setOnClickListener(v -> startEditProfileActivity(null));
+        findViewById(R.id.btn_no_profiles_add).setOnClickListener(
+                v -> startEditProfileActivity(null));
 
         findViewById(R.id.btn_add_transaction).setOnClickListener(this::fabNewTransactionClicked);
 
-        findViewById(R.id.nav_new_profile_button)
-                .setOnClickListener(v -> startEditProfileActivity(null));
+        findViewById(R.id.nav_new_profile_button).setOnClickListener(
+                v -> startEditProfileActivity(null));
 
         RecyclerView root = findViewById(R.id.nav_profile_list);
         if (root == null)
             throw new RuntimeException("Can't get hold on the transaction value view");
 
-        if (mProfileListAdapter == null) mProfileListAdapter = new ProfilesRecyclerViewAdapter();
+        if (mProfileListAdapter == null)
+            mProfileListAdapter = new ProfilesRecyclerViewAdapter();
         root.setAdapter(mProfileListAdapter);
 
-        if (editingProfilesObserver == null) {
-            editingProfilesObserver = (o, arg) -> {
-                if (mProfileListAdapter.isEditingProfiles()) {
-                    profileListHeadMore.setVisibility(View.GONE);
-                    profileListHeadMore
-                            .startAnimation(AnimationUtils.loadAnimation(this, R.anim.fade_out));
-                    profileListHeadCancel.setVisibility(View.VISIBLE);
-                    profileListHeadCancel
-                            .startAnimation(AnimationUtils.loadAnimation(this, R.anim.fade_in));
-                    profileListHeadAddProfile.setVisibility(View.VISIBLE);
-                    profileListHeadAddProfile
-                            .startAnimation(AnimationUtils.loadAnimation(this, R.anim.fade_in));
+        mProfileListAdapter.editingProfiles.observe(this, newValue -> {
+            if (newValue) {
+                profileListHeadMore.setVisibility(View.GONE);
+                profileListHeadCancel.setVisibility(View.VISIBLE);
+                profileListHeadAddProfile.setVisibility(View.VISIBLE);
+                if (drawer.isDrawerOpen(GravityCompat.START)) {
+                    profileListHeadMore.startAnimation(
+                            AnimationUtils.loadAnimation(MainActivity.this, R.anim.fade_out));
+                    profileListHeadCancel.startAnimation(
+                            AnimationUtils.loadAnimation(MainActivity.this, R.anim.fade_in));
+                    profileListHeadAddProfile.startAnimation(
+                            AnimationUtils.loadAnimation(MainActivity.this, R.anim.fade_in));
                 }
-                else {
-                    profileListHeadCancel.setVisibility(View.GONE);
-                    profileListHeadCancel
-                            .startAnimation(AnimationUtils.loadAnimation(this, R.anim.fade_out));
-                    profileListHeadMore.setVisibility(View.VISIBLE);
-                    profileListHeadMore
-                            .startAnimation(AnimationUtils.loadAnimation(this, R.anim.fade_in));
-                    profileListHeadAddProfile.setVisibility(View.GONE);
-                    profileListHeadAddProfile
-                            .startAnimation(AnimationUtils.loadAnimation(this, R.anim.fade_out));
+            }
+            else {
+                profileListHeadCancel.setVisibility(View.GONE);
+                profileListHeadMore.setVisibility(View.VISIBLE);
+                profileListHeadAddProfile.setVisibility(View.GONE);
+                if (drawer.isDrawerOpen(GravityCompat.START)) {
+                    profileListHeadCancel.startAnimation(
+                            AnimationUtils.loadAnimation(MainActivity.this, R.anim.fade_out));
+                    profileListHeadMore.startAnimation(
+                            AnimationUtils.loadAnimation(MainActivity.this, R.anim.fade_in));
+                    profileListHeadAddProfile.startAnimation(
+                            AnimationUtils.loadAnimation(MainActivity.this, R.anim.fade_out));
                 }
-            };
-            mProfileListAdapter.addEditingProfilesObserver(editingProfilesObserver);
-        }
+            }
+
+            mProfileListAdapter.notifyDataSetChanged();
+        });
 
         LinearLayoutManager llm = new LinearLayoutManager(this);
 
@@ -289,40 +308,72 @@ public class MainActivity extends ProfileThemedActivity {
 
         profileListHeadMore.setOnClickListener((v) -> mProfileListAdapter.flipEditingProfiles());
         profileListHeadCancel.setOnClickListener((v) -> mProfileListAdapter.flipEditingProfiles());
-        profileListHeadMoreAndCancel
-                .setOnClickListener((v) -> mProfileListAdapter.flipEditingProfiles());
-
-        setupProfile();
+        profileListHeadMoreAndCancel.setOnClickListener(
+                (v) -> mProfileListAdapter.flipEditingProfiles());
+        if (drawerListener == null) {
+            drawerListener = new DrawerLayout.SimpleDrawerListener() {
+                @Override
+                public void onDrawerClosed(View drawerView) {
+                    super.onDrawerClosed(drawerView);
+                    mProfileListAdapter.setAnimationsEnabled(false);
+                    mProfileListAdapter.editingProfiles.setValue(false);
+                }
+                @Override
+                public void onDrawerOpened(View drawerView) {
+                    super.onDrawerOpened(drawerView);
+                    mProfileListAdapter.setAnimationsEnabled(true);
+                }
+            };
+            drawer.addDrawerListener(drawerListener);
+        }
     }
     private void scheduleDataRetrievalIfStale(Date lastUpdate) {
         long now = new Date().getTime();
         if ((lastUpdate == null) || (now > (lastUpdate.getTime() + (24 * 3600 * 1000)))) {
-            if (lastUpdate == null) debug("db::", "WEB data never fetched. scheduling a fetch");
-            else debug("db", String.format(Locale.ENGLISH,
-                    "WEB data last fetched at %1.3f and now is %1.3f. re-fetching",
-                    lastUpdate.getTime() / 1000f, now / 1000f));
+            if (lastUpdate == null)
+                debug("db::", "WEB data never fetched. scheduling a fetch");
+            else
+                debug("db", String.format(Locale.ENGLISH,
+                        "WEB data last fetched at %1.3f and now is %1.3f. re-fetching",
+                        lastUpdate.getTime() / 1000f, now / 1000f));
 
             Data.scheduleTransactionListRetrieval(this);
         }
     }
     private void createShortcuts(List<MobileLedgerProfile> list) {
-        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.O) return;
+        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.N_MR1)
+            return;
 
+        ShortcutManager sm = getSystemService(ShortcutManager.class);
         List<ShortcutInfo> shortcuts = new ArrayList<>();
         int i = 0;
         for (MobileLedgerProfile p : list) {
-            if (!p.isPostingPermitted()) continue;
-
-            ShortcutInfo si = new ShortcutInfo.Builder(this, "new_transaction_" + p.getUuid())
-                    .setShortLabel(p.getName())
-                    .setIcon(Icon.createWithResource(this, R.drawable.svg_thick_plus_white))
-                    .setIntent(
-                            new Intent(Intent.ACTION_VIEW, null, this, NewTransactionActivity.class)
-                                    .putExtra("profile_uuid", p.getUuid())).setRank(i).build();
+            if (shortcuts.size() >= sm.getMaxShortcutCountPerActivity())
+                break;
+
+            if (!p.isPostingPermitted())
+                continue;
+
+            ShortcutInfo si =
+                    new ShortcutInfo.Builder(this, "new_transaction_" + p.getUuid()).setShortLabel(
+                            p.getName())
+                                                                                    .setIcon(
+                                                                                            Icon.createWithResource(
+                                                                                                    this,
+                                                                                                    R.drawable.svg_thick_plus_white))
+                                                                                    .setIntent(
+                                                                                            new Intent(
+                                                                                                    Intent.ACTION_VIEW,
+                                                                                                    null,
+                                                                                                    this,
+                                                                                                    NewTransactionActivity.class).putExtra(
+                                                                                                    "profile_uuid",
+                                                                                                    p.getUuid()))
+                                                                                    .setRank(i)
+                                                                                    .build();
             shortcuts.add(si);
             i++;
         }
-        ShortcutManager sm = getSystemService(ShortcutManager.class);
         sm.setDynamicShortcuts(shortcuts);
     }
     private void onProfileListChanged(List<MobileLedgerProfile> newList) {
@@ -330,18 +381,18 @@ public class MainActivity extends ProfileThemedActivity {
             // profiles not yet loaded from DB
             findViewById(R.id.loading_layout).setVisibility(View.VISIBLE);
             findViewById(R.id.no_profiles_layout).setVisibility(View.GONE);
-            findViewById(R.id.pager_layout).setVisibility(View.GONE);
+            findViewById(R.id.main_app_layout).setVisibility(View.GONE);
             return;
         }
 
         if (newList.isEmpty()) {
             findViewById(R.id.no_profiles_layout).setVisibility(View.VISIBLE);
-            findViewById(R.id.pager_layout).setVisibility(View.GONE);
+            findViewById(R.id.main_app_layout).setVisibility(View.GONE);
             findViewById(R.id.loading_layout).setVisibility(View.GONE);
             return;
         }
 
-        findViewById(R.id.pager_layout).setVisibility(View.VISIBLE);
+        findViewById(R.id.main_app_layout).setVisibility(View.VISIBLE);
         findViewById(R.id.no_profiles_layout).setVisibility(View.GONE);
         findViewById(R.id.loading_layout).setVisibility(View.GONE);
 
@@ -358,28 +409,31 @@ public class MainActivity extends ProfileThemedActivity {
      */
     private void onProfileChanged(MobileLedgerProfile profile) {
         boolean haveProfile = profile != null;
-        findViewById(R.id.no_profiles_layout).setVisibility(haveProfile ? View.GONE : View.VISIBLE);
-        findViewById(R.id.pager_layout).setVisibility(haveProfile ? View.VISIBLE : View.VISIBLE);
 
-        if (haveProfile) setTitle(profile.getName());
-        else setTitle(R.string.app_name);
+        if (haveProfile)
+            setTitle(profile.getName());
+        else
+            setTitle(R.string.app_name);
 
         this.profile = profile;
 
-        mProfileListAdapter.notifyDataSetChanged();
-
-        int newProfileTheme = haveProfile ? profile.getThemeId() : -1;
+        int newProfileTheme = haveProfile ? profile.getThemeHue() : -1;
         if (newProfileTheme != Colors.profileThemeId) {
             debug("profiles",
                     String.format(Locale.ENGLISH, "profile theme %d → %d", Colors.profileThemeId,
                             newProfileTheme));
-            MainActivity.this.profileThemeChanged();
             Colors.profileThemeId = newProfileTheme;
+            profileThemeChanged();
             // profileThemeChanged would restart the activity, so no need to reload the
             // data sets below
             return;
         }
 
+        findViewById(R.id.no_profiles_layout).setVisibility(haveProfile ? View.GONE : View.VISIBLE);
+        findViewById(R.id.pager_layout).setVisibility(haveProfile ? View.VISIBLE : View.VISIBLE);
+
+        mProfileListAdapter.notifyDataSetChanged();
+
         drawer.closeDrawers();
 
         Data.transactions.clear();
@@ -395,7 +449,7 @@ public class MainActivity extends ProfileThemedActivity {
                 fab.show();
             }
             else {
-                mToolbar.setSubtitle(R.string.profile_subitlte_read_only);
+                mToolbar.setSubtitle(R.string.profile_subtitle_read_only);
                 fab.hide();
             }
         }
@@ -414,7 +468,8 @@ public class MainActivity extends ProfileThemedActivity {
             debug("main", "no last update date :(");
         }
         else {
-            final String text = DateFormat.getDateTimeInstance().format(newValue);
+            final String text = DateFormat.getDateTimeInstance()
+                                          .format(newValue);
             v.setText(text);
             l.setVisibility(View.VISIBLE);
             debug("main", String.format("Date formatted: %s", text));
@@ -423,21 +478,14 @@ public class MainActivity extends ProfileThemedActivity {
         scheduleDataRetrievalIfStale(newValue);
     }
     private void profileThemeChanged() {
-        Bundle bundle = new Bundle();
-        onSaveInstanceState(bundle);
-
-        storeThemeIdInPrefs(profile.getThemeId());
-
-        // restart activity to reflect theme change
-        finish();
+        storeThemeIdInPrefs(profile.getThemeHue());
 
         // un-hook all observed LiveData
         Data.profile.removeObservers(this);
         Data.profiles.removeObservers(this);
         Data.lastUpdateDate.removeObservers(this);
-        Intent intent = new Intent(this, this.getClass());
-        intent.putExtra(BUNDLE_SAVED_STATE, bundle);
-        startActivity(intent);
+
+        recreate();
     }
     private void storeThemeIdInPrefs(int themeId) {
         // store the new theme id in the preferences
@@ -451,7 +499,8 @@ public class MainActivity extends ProfileThemedActivity {
         Bundle args = new Bundle();
         if (profile != null) {
             int index = Data.getProfileIndex(profile);
-            if (index != -1) intent.putExtra(ProfileDetailFragment.ARG_ITEM_ID, index);
+            if (index != -1)
+                intent.putExtra(ProfileDetailFragment.ARG_ITEM_ID, index);
         }
         intent.putExtras(args);
         startActivity(intent, args);
@@ -470,12 +519,7 @@ public class MainActivity extends ProfileThemedActivity {
     public void fabNewTransactionClicked(View view) {
         Intent intent = new Intent(this, NewTransactionActivity.class);
         startActivity(intent);
-        overridePendingTransition(R.anim.slide_in_right, R.anim.dummy);
-    }
-    public void navSettingsClicked(View view) {
-        Intent intent = new Intent(this, SettingsActivity.class);
-        startActivity(intent);
-        drawer.closeDrawers();
+        overridePendingTransition(R.anim.slide_in_up, R.anim.dummy);
     }
     public void markDrawerItemCurrent(int id) {
         TextView item = drawer.findViewById(id);
@@ -528,14 +572,15 @@ public class MainActivity extends ProfileThemedActivity {
             }
             else {
                 debug("fragments", String.format(Locale.ENGLISH, "manager stack: %d",
-                        fragmentManager.getBackStackEntryCount()));
+                        getSupportFragmentManager().getBackStackEntryCount()));
 
                 super.onBackPressed();
             }
         }
     }
     public void updateLastUpdateTextFromDB() {
-        if (profile == null) return;
+        if (profile == null)
+            return;
 
         long last_update = profile.getLongOption(MLDB.OPT_LAST_SCRAPE, 0L);
 
@@ -554,7 +599,7 @@ public class MainActivity extends ProfileThemedActivity {
     }
     public void onRetrieveDone(String error) {
         Data.transactionRetrievalDone();
-        progressLayout.setVisibility(View.GONE);
+        findViewById(R.id.transaction_progress_layout).setVisibility(View.GONE);
 
         if (error == null) {
             updateLastUpdateTextFromDB();
@@ -562,18 +607,25 @@ public class MainActivity extends ProfileThemedActivity {
             new RefreshDescriptionsTask().executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
             TransactionListViewModel.scheduleTransactionListReload();
         }
-        else Toast.makeText(this, error, Toast.LENGTH_LONG).show();
+        else
+            Snackbar.make(mViewPager, error, Snackbar.LENGTH_LONG)
+                    .show();
     }
     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);
-        progressLayout.setVisibility(View.VISIBLE);
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N)
+            progressBar.setProgress(0, false);
+        else
+            progressBar.setProgress(0);
+        findViewById(R.id.transaction_progress_layout).setVisibility(View.VISIBLE);
     }
     public void onRetrieveProgress(RetrieveTransactionsTask.Progress progress) {
+        ProgressBar progressBar = findViewById(R.id.transaction_list_progress_bar);
         if ((progress.getTotal() == RetrieveTransactionsTask.Progress.INDETERMINATE) ||
             (progress.getTotal() == 0))
         {
@@ -587,20 +639,27 @@ public class MainActivity extends ProfileThemedActivity {
             if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
                 progressBar.setProgress(progress.getProgress(), true);
             }
-            else progressBar.setProgress(progress.getProgress());
+            else
+                progressBar.setProgress(progress.getProgress());
             progressBar.setIndeterminate(false);
         }
     }
     public void fabShouldShow() {
-        if ((profile != null) && profile.isPostingPermitted()) fab.show();
+        if ((profile != null) && profile.isPostingPermitted() && !drawer.isOpen())
+            fab.show();
+        else
+            fabHide();
     }
     public void fabHide() {
         fab.hide();
     }
     public void onAccountSummaryRowViewClicked(View view) {
         ViewGroup row;
-        if (view.getId() == R.id.account_expander) row = (ViewGroup) view.getParent().getParent();
-        else row = (ViewGroup) view.getParent();
+        if (view.getId() == R.id.account_expander)
+            row = (ViewGroup) view.getParent()
+                                  .getParent();
+        else
+            row = (ViewGroup) view.getParent();
 
         LedgerAccount acc = (LedgerAccount) row.getTag();
         switch (view.getId()) {
@@ -608,7 +667,8 @@ public class MainActivity extends ProfileThemedActivity {
             case R.id.account_expander:
             case R.id.account_expander_container:
                 debug("accounts", "Account expander clicked");
-                if (!acc.hasSubAccounts()) return;
+                if (!acc.hasSubAccounts())
+                    return;
 
                 boolean wasExpanded = acc.isExpanded();
 
@@ -632,7 +692,8 @@ public class MainActivity extends ProfileThemedActivity {
                     try (LockHolder ignored = Data.accounts.lockForWriting()) {
                         for (int i = 0; i < Data.accounts.size(); i++) {
                             if (acc.isParentOf(Data.accounts.get(i))) {
-//                                debug("accounts", String.format("Found a child '%s' at position %d",
+//                                debug("accounts", String.format("Found a child '%s' at position
+//                                %d",
 //                                        Data.accounts.get(i).getName(), i));
                                 if (start == -1) {
                                     start = i;
@@ -656,8 +717,8 @@ public class MainActivity extends ProfileThemedActivity {
                                 Data.accounts.removeQuietly(start);
                             }
 
-                            mAccountSummaryFragment.modelAdapter
-                                    .notifyItemRangeRemoved(start, count);
+                            mAccountSummaryFragment.modelAdapter.notifyItemRangeRemoved(start,
+                                    count);
                         }
                     }
                 }
@@ -671,8 +732,8 @@ public class MainActivity extends ProfileThemedActivity {
                         if (parentPos != -1) {
                             // may have disappeared in a concurrent refresh operation
                             Data.accounts.addAllQuietly(parentPos + 1, children);
-                            mAccountSummaryFragment.modelAdapter
-                                    .notifyItemRangeInserted(parentPos + 1, children.size());
+                            mAccountSummaryFragment.modelAdapter.notifyItemRangeInserted(
+                                    parentPos + 1, children.size());
                         }
                     }
                 }
@@ -680,11 +741,10 @@ public class MainActivity extends ProfileThemedActivity {
             case R.id.account_row_acc_amounts:
                 if (acc.getAmountCount() > AccountSummaryAdapter.AMOUNT_LIMIT) {
                     acc.toggleAmountsExpanded();
-                    DbOpQueue
-                            .add("update accounts set amounts_expanded=? where name=? and profile=?",
-                                    new Object[]{acc.amountsExpanded(), acc.getName(),
-                                                 profile.getUuid()
-                                    });
+                    DbOpQueue.add(
+                            "update accounts set amounts_expanded=? where name=? and profile=?",
+                            new Object[]{acc.amountsExpanded(), acc.getName(), profile.getUuid()
+                            });
                     Data.accounts.triggerItemChangedNotification(acc);
                 }
                 break;
@@ -694,7 +754,7 @@ public class MainActivity extends ProfileThemedActivity {
     public class SectionsPagerAdapter extends FragmentPagerAdapter {
 
         SectionsPagerAdapter(FragmentManager fm) {
-            super(fm);
+            super(fm, BEHAVIOR_RESUME_ONLY_CURRENT_FRAGMENT);
         }
 
         @NotNull