]> git.ktnx.net Git - mobile-ledger.git/blobdiff - app/src/main/java/net/ktnx/mobileledger/ui/activity/MainActivity.java
add app shortcuts (Android 7.1+) for adding new transaction for top profiles
[mobile-ledger.git] / app / src / main / java / net / ktnx / mobileledger / ui / activity / MainActivity.java
index 1ccdf3cae03ec113ab375a9cd23d0206dfa4960a..a6c29db6a9884c7c395f2ec354c4978a9ba14b8b 100644 (file)
@@ -1,60 +1,91 @@
 /*
  * Copyright © 2019 Damyan Ivanov.
- * This file is part of Mobile-Ledger.
- * Mobile-Ledger is free software: you can distribute it and/or modify it
+ * This file is part of MoLe.
+ * MoLe is free software: you can distribute it and/or modify it
  * under the term of the GNU General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
  * (at your opinion), any later version.
  *
- * Mobile-Ledger is distributed in the hope that it will be useful,
+ * MoLe is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU General Public License terms for details.
  *
  * You should have received a copy of the GNU General Public License
- * along with Mobile-Ledger. If not, see <https://www.gnu.org/licenses/>.
+ * along with MoLe. If not, see <https://www.gnu.org/licenses/>.
  */
 
 package net.ktnx.mobileledger.ui.activity;
 
 import android.content.Intent;
-import android.content.SharedPreferences;
 import android.content.pm.PackageInfo;
+import android.content.pm.ShortcutInfo;
+import android.content.pm.ShortcutManager;
+import android.content.res.ColorStateList;
+import android.content.res.Resources;
+import android.graphics.Color;
+import android.graphics.drawable.Icon;
+import android.os.AsyncTask;
 import android.os.Build;
 import android.os.Bundle;
-import android.support.annotation.ColorInt;
-import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentManager;
-import android.support.v4.app.FragmentPagerAdapter;
-import android.support.v4.view.GravityCompat;
-import android.support.v4.view.ViewPager;
-import android.support.v4.widget.DrawerLayout;
-import android.support.v7.app.ActionBarDrawerToggle;
-import android.support.v7.app.AppCompatActivity;
-import android.support.v7.widget.Toolbar;
 import android.util.Log;
 import android.view.View;
+import android.view.ViewGroup;
+import android.view.ViewPropertyAnimator;
+import android.view.animation.Animation;
+import android.view.animation.AnimationUtils;
 import android.widget.LinearLayout;
 import android.widget.ProgressBar;
 import android.widget.TextView;
 import android.widget.Toast;
 
+import com.google.android.material.floatingactionbutton.FloatingActionButton;
+
 import net.ktnx.mobileledger.R;
+import net.ktnx.mobileledger.async.DbOpQueue;
 import net.ktnx.mobileledger.async.RefreshDescriptionsTask;
 import net.ktnx.mobileledger.async.RetrieveTransactionsTask;
 import net.ktnx.mobileledger.model.Data;
 import net.ktnx.mobileledger.model.LedgerAccount;
 import net.ktnx.mobileledger.model.MobileLedgerProfile;
+import net.ktnx.mobileledger.ui.account_summary.AccountSummaryAdapter;
 import net.ktnx.mobileledger.ui.account_summary.AccountSummaryFragment;
+import net.ktnx.mobileledger.ui.account_summary.AccountSummaryViewModel;
+import net.ktnx.mobileledger.ui.profiles.ProfileDetailFragment;
+import net.ktnx.mobileledger.ui.profiles.ProfilesRecyclerViewAdapter;
 import net.ktnx.mobileledger.ui.transaction_list.TransactionListFragment;
+import net.ktnx.mobileledger.ui.transaction_list.TransactionListViewModel;
+import net.ktnx.mobileledger.utils.Colors;
+import net.ktnx.mobileledger.utils.LockHolder;
 import net.ktnx.mobileledger.utils.MLDB;
 
 import java.lang.ref.WeakReference;
 import java.text.DateFormat;
+import java.util.ArrayList;
 import java.util.Date;
-
-public class MainActivity extends AppCompatActivity {
+import java.util.List;
+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;
+
+public class MainActivity extends ProfileThemedActivity {
+    public static final String STATE_CURRENT_PAGE = "current_page";
+    public static final String BUNDLE_SAVED_STATE = "bundle_savedState";
+    public static final String STATE_ACC_FILTER = "account_filter";
+    public AccountSummaryFragment mAccountSummaryFragment;
     DrawerLayout drawer;
+    private LinearLayout profileListContainer;
+    private View profileListHeadArrow, profileListHeadMore, profileListHeadCancel;
+    private LinearLayout profileListHeadMoreAndCancel;
     private FragmentManager fragmentManager;
     private TextView tvLastUpdate;
     private RetrieveTransactionsTask retrieveTransactionsTask;
@@ -63,45 +94,89 @@ public class MainActivity extends AppCompatActivity {
     private LinearLayout progressLayout;
     private SectionsPagerAdapter mSectionsPagerAdapter;
     private ViewPager mViewPager;
-
+    private FloatingActionButton fab;
+    private boolean profileModificationEnabled = false;
+    private boolean profileListExpanded = false;
+    private ProfilesRecyclerViewAdapter mProfileListAdapter;
+    private int mCurrentPage;
+    private String mAccountFilter;
+    private boolean mBackMeansToAccountList = false;
+    private Observer profileObserver;
+    private Observer profilesObserver;
+    private Observer lastUpdateDateObserver;
+    private Toolbar mToolbar;
     @Override
     protected void onStart() {
         super.onStart();
 
-        Data.lastUpdateDate.set(null);
-        updateLastUpdateTextFromDB();
-        Date lastUpdate = Data.lastUpdateDate.get();
+        Log.d("flow", "MainActivity.onStart()");
+        mViewPager.setCurrentItem(mCurrentPage, false);
+        if (mAccountFilter != null) showTransactionsFragment(mAccountFilter);
+        else Data.accountFilter.set(null);
 
-        long now = new Date().getTime();
-        if ((lastUpdate == null) || (now > (lastUpdate.getTime() + (24 * 3600 * 1000)))) {
-            if (lastUpdate == null) Log.d("db::", "WEB data never fetched. scheduling a fetch");
-            else Log.d("db",
-                    String.format("WEB data last fetched at %1.3f and now is %1.3f. re-fetching",
-                            lastUpdate.getTime() / 1000f, now / 1000f));
-
-            scheduleTransactionListRetrieval();
-        }
+    }
+    @Override
+    protected void onSaveInstanceState(Bundle outState) {
+        super.onSaveInstanceState(outState);
+        outState.putInt(STATE_CURRENT_PAGE, mViewPager.getCurrentItem());
+        if (Data.accountFilter.get() != null)
+            outState.putString(STATE_ACC_FILTER, Data.accountFilter.get());
+    }
+    @Override
+    protected void onDestroy() {
+        mSectionsPagerAdapter = null;
+        Data.profile.deleteObserver(profileObserver);
+        profileObserver = null;
+        Data.profiles.deleteObserver(profilesObserver);
+        profilesObserver = null;
+        Data.lastUpdateDate.deleteObserver(lastUpdateDateObserver);
+        RecyclerView root = findViewById(R.id.nav_profile_list);
+        if (root != null) root.setAdapter(null);
+        super.onDestroy();
     }
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
+        Log.d("flow", "MainActivity.onCreate()");
+        int profileColor = Data.retrieveCurrentThemeIdFromDb();
+        Colors.setupTheme(this, profileColor);
+        Colors.profileThemeId = profileColor;
         setContentView(R.layout.activity_main);
-        Toolbar toolbar = findViewById(R.id.toolbar);
-        setSupportActionBar(toolbar);
-
-        Data.profile.addObserver((o, arg) -> {
-            MobileLedgerProfile profile = Data.profile.get();
-            runOnUiThread(() -> {
-                if (profile == null) setTitle(R.string.app_name);
-                else setTitle(profile.getName());
-            });
-        });
-
-        setupProfile();
 
+        fab = findViewById(R.id.btn_add_transaction);
+        profileListContainer = findViewById(R.id.nav_profile_list_container);
+        profileListHeadArrow = findViewById(R.id.nav_profiles_arrow);
+        profileListHeadMore = findViewById(R.id.nav_profiles_start_edit);
+        profileListHeadCancel = findViewById(R.id.nav_profiles_cancel_edit);
+        profileListHeadMoreAndCancel = findViewById(R.id.nav_profile_list_head_buttons);
         drawer = findViewById(R.id.drawer_layout);
+        tvLastUpdate = findViewById(R.id.transactions_last_update);
+        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);
+        mViewPager = findViewById(R.id.root_frame);
+
+        Bundle extra = getIntent().getBundleExtra(BUNDLE_SAVED_STATE);
+        if (extra != null && savedInstanceState == null) savedInstanceState = extra;
+
+
+        mToolbar = findViewById(R.id.toolbar);
+        setSupportActionBar(mToolbar);
+
+        if (profileObserver == null) {
+            profileObserver = (o, arg) -> onProfileChanged(arg);
+            Data.profile.addObserver(profileObserver);
+        }
+
+        if (profilesObserver == null) {
+            profilesObserver = (o, arg) -> onProfileListChanged(arg);
+            Data.profiles.addObserver(profilesObserver);
+        }
+
         ActionBarDrawerToggle toggle =
-                new ActionBarDrawerToggle(this, drawer, toolbar, R.string.navigation_drawer_open,
+                new ActionBarDrawerToggle(this, drawer, mToolbar, R.string.navigation_drawer_open,
                         R.string.navigation_drawer_close);
         drawer.addDrawerListener(toggle);
         toggle.syncState();
@@ -117,20 +192,13 @@ public class MainActivity extends AppCompatActivity {
             e.printStackTrace();
         }
 
-        tvLastUpdate = findViewById(R.id.transactions_last_update);
-
-        bTransactionListCancelDownload = findViewById(R.id.transaction_list_cancel_download);
-        progressBar = findViewById(R.id.transaction_list_progress_bar);
         if (progressBar == null)
             throw new RuntimeException("Can't get hold on the transaction value progress bar");
-        progressLayout = findViewById(R.id.transaction_progress_layout);
         if (progressLayout == null) throw new RuntimeException(
                 "Can't get hold on the transaction value progress bar layout");
 
-        fragmentManager = getSupportFragmentManager();
-        mSectionsPagerAdapter = new SectionsPagerAdapter(fragmentManager);
+        markDrawerItemCurrent(R.id.nav_account_summary);
 
-        mViewPager = findViewById(R.id.root_frame);
         mViewPager.setAdapter(mSectionsPagerAdapter);
         mViewPager.addOnPageChangeListener(new ViewPager.SimpleOnPageChangeListener() {
             @Override
@@ -150,67 +218,249 @@ public class MainActivity extends AppCompatActivity {
             }
         });
 
-        Data.lastUpdateDate.addObserver((o, arg) -> {
+        mCurrentPage = 0;
+        if (savedInstanceState != null) {
+            int currentPage = savedInstanceState.getInt(STATE_CURRENT_PAGE, -1);
+            if (currentPage != -1) {
+                mCurrentPage = currentPage;
+            }
+            mAccountFilter = savedInstanceState.getString(STATE_ACC_FILTER, null);
+        }
+        else mAccountFilter = null;
+
+        lastUpdateDateObserver = (o, arg) -> {
             Log.d("main", "lastUpdateDate changed");
-            runOnUiThread(() -> {
-                Date date = Data.lastUpdateDate.get();
-                if (date == null) {
-                    tvLastUpdate.setText(R.string.transaction_last_update_never);
+            runOnUiThread(this::updateLastUpdateDisplay);
+        };
+        Data.lastUpdateDate.addObserver(lastUpdateDateObserver);
+
+        updateLastUpdateDisplay();
+
+        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));
+
+        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();
+        root.setAdapter(mProfileListAdapter);
+
+        mProfileListAdapter.addEditingProfilesObserver((o, arg) -> {
+            if (mProfileListAdapter.isEditingProfiles()) {
+                profileListHeadArrow.clearAnimation();
+                profileListHeadArrow.setVisibility(View.GONE);
+                profileListHeadMore.setVisibility(View.GONE);
+                profileListHeadCancel.setVisibility(View.VISIBLE);
+            }
+            else {
+                profileListHeadArrow.setRotation(180f);
+                profileListHeadArrow.setVisibility(View.VISIBLE);
+                profileListHeadCancel.setVisibility(View.GONE);
+                profileListHeadMore.setVisibility(View.GONE);
+                profileListHeadMore.setVisibility(profileListExpanded ? View.VISIBLE : View.GONE);
+            }
+        });
+
+        LinearLayoutManager llm = new LinearLayoutManager(this);
+
+        llm.setOrientation(RecyclerView.VERTICAL);
+        root.setLayoutManager(llm);
+
+        profileListHeadMore.setOnClickListener((v) -> mProfileListAdapter.flipEditingProfiles());
+        profileListHeadCancel.setOnClickListener((v) -> mProfileListAdapter.flipEditingProfiles());
+        profileListHeadMoreAndCancel
+                .setOnClickListener((v) -> mProfileListAdapter.flipEditingProfiles());
+
+        drawer.addDrawerListener(new DrawerLayout.SimpleDrawerListener() {
+            @Override
+            public void onDrawerClosed(View drawerView) {
+                super.onDrawerClosed(drawerView);
+                collapseProfileList();
+            }
+        });
+
+        setupProfile();
+        onProfileChanged(null);
+
+        updateLastUpdateTextFromDB();
+        Date lastUpdate = Data.lastUpdateDate.get();
+
+        long now = new Date().getTime();
+        if ((lastUpdate == null) || (now > (lastUpdate.getTime() + (24 * 3600 * 1000)))) {
+            if (lastUpdate == null) Log.d("db::", "WEB data never fetched. scheduling a fetch");
+            else Log.d("db",
+                    String.format("WEB data last fetched at %1.3f and now is %1.3f. re-fetching",
+                            lastUpdate.getTime() / 1000f, now / 1000f));
+
+            scheduleTransactionListRetrieval();
+        }
+    }
+    private void createShortcuts() {
+        Resources rm = getResources();
+        List<ShortcutInfo> shortcuts = new ArrayList<>();
+        try (LockHolder lh = Data.profiles.lockForReading()) {
+            for (int i = 0; i < Data.profiles.size(); i++) {
+                MobileLedgerProfile p = Data.profiles.get(i);
+                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);
+            }
+        }
+        ShortcutManager sm = getSystemService(ShortcutManager.class);
+        sm.setDynamicShortcuts(shortcuts);
+    }
+    private void onProfileListChanged(Object arg) {
+        findViewById(R.id.nav_profile_list).setMinimumHeight(
+                (int) (getResources().getDimension(R.dimen.thumb_row_height) *
+                       Data.profiles.size()));
+
+        Log.d("profiles", "profile list changed");
+        if (arg == null) mProfileListAdapter.notifyDataSetChanged();
+        else mProfileListAdapter.notifyItemChanged((int) arg);
+
+        createShortcuts();
+    }
+    private void onProfileChanged(Object arg) {
+        MobileLedgerProfile profile = Data.profile.get();
+        MainActivity.this.runOnUiThread(() -> {
+
+            Data.transactions.clear();
+            Log.d("transactions", "requesting list reload");
+            TransactionListViewModel.scheduleTransactionListReload();
+
+            Data.accounts.clear();
+            AccountSummaryViewModel.scheduleAccountListReload();
+
+            if (profile == null) MainActivity.this.setTitle(R.string.app_name);
+            else MainActivity.this.setTitle(profile.getName());
+            MainActivity.this.updateLastUpdateTextFromDB();
+            int old_index = -1;
+            int new_index = -1;
+            if (arg != null) {
+                MobileLedgerProfile old = (MobileLedgerProfile) arg;
+                old_index = Data.getProfileIndex(old);
+                new_index = Data.getProfileIndex(profile);
+            }
+
+            if ((old_index != -1) && (new_index != -1)) {
+                mProfileListAdapter.notifyItemChanged(old_index);
+                mProfileListAdapter.notifyItemChanged(new_index);
+            }
+            else mProfileListAdapter.notifyDataSetChanged();
+
+            MainActivity.this.collapseProfileList();
+
+            int newProfileTheme = (profile == null) ? -1 : profile.getThemeId();
+            if (newProfileTheme != Colors.profileThemeId) {
+                Log.d("profiles", String.format("profile theme %d → %d", Colors.profileThemeId,
+                        newProfileTheme));
+                MainActivity.this.profileThemeChanged();
+                Colors.profileThemeId = newProfileTheme;
+                // profileThemeChanged would restart the activity, so no need to reload the
+                // data sets below
+                return;
+            }
+            drawer.closeDrawers();
+
+            if (profile == null) {
+                mToolbar.setSubtitle(null);
+                fab.hide();
+            }
+            else {
+                if (profile.isPostingPermitted()) {
+                    mToolbar.setSubtitle(null);
+                    fab.show();
                 }
                 else {
-                    final String text = DateFormat.getDateTimeInstance().format(date);
-                    tvLastUpdate.setText(text);
-                    Log.d("despair", String.format("Date formatted: %s", text));
+                    mToolbar.setSubtitle(R.string.profile_subitlte_read_only);
+                    fab.hide();
                 }
-            });
+            }
         });
     }
+    private void updateLastUpdateDisplay() {
+        LinearLayout l = findViewById(R.id.transactions_last_update_layout);
+        TextView v = findViewById(R.id.transactions_last_update);
+        Date date = Data.lastUpdateDate.get();
+        if (date == null) {
+            l.setVisibility(View.INVISIBLE);
+            Log.d("main", "no last update date :(");
+        }
+        else {
+            final String text = DateFormat.getDateTimeInstance().format(date);
+            v.setText(text);
+            l.setVisibility(View.VISIBLE);
+            Log.d("main", String.format("Date formatted: %s", text));
+        }
+    }
+    @Override
+    public void finish() {
+        if (profilesObserver != null) {
+            Data.profiles.deleteObserver(profilesObserver);
+            profilesObserver = null;
+        }
+
+        if (profileObserver != null) {
+            Data.profile.deleteObserver(profileObserver);
+            profileObserver = null;
+        }
+
+        super.finish();
+    }
+    private void profileThemeChanged() {
+        setupProfileColors();
+
+        Bundle bundle = new Bundle();
+        onSaveInstanceState(bundle);
+        // restart activity to reflect theme change
+        finish();
+        Intent intent = new Intent(this, this.getClass());
+        intent.putExtra(BUNDLE_SAVED_STATE, bundle);
+        startActivity(intent);
+    }
+    public void startEditProfileActivity(MobileLedgerProfile profile) {
+        Intent intent = new Intent(this, ProfileDetailActivity.class);
+        Bundle args = new Bundle();
+        if (profile != null) {
+            int index = Data.getProfileIndex(profile);
+            if (index != -1) intent.putExtra(ProfileDetailFragment.ARG_ITEM_ID, index);
+        }
+        intent.putExtras(args);
+        startActivity(intent, args);
+    }
     private void setupProfile() {
         String profileUUID = MLDB.getOption(MLDB.OPT_PROFILE_UUID, null);
         MobileLedgerProfile profile;
 
-        if (profileUUID == null) {
-            if (Data.profiles.isEmpty()) {
-                Data.profiles.setList(MobileLedgerProfile.createInitialProfileList());
-                profile = Data.profiles.get(0);
-
-                SharedPreferences backend = getSharedPreferences("backend", MODE_PRIVATE);
-                Log.d("profiles", "Migrating from preferences to profiles");
-                // migration to multiple profiles
-                if (profile.getUrl().isEmpty()) {
-                    // no legacy config
-                    Intent intent = new Intent(this, ProfileListActivity.class);
-                    startActivity(intent);
-                }
-                profile.setUrl(backend.getString("backend_url", ""));
-                profile.setAuthEnabled(backend.getBoolean("backend_use_http_auth", false));
-                profile.setAuthUserName(backend.getString("backend_auth_user", null));
-                profile.setAuthPassword(backend.getString("backend_auth_password", null));
-                profile.storeInDB();
-                SharedPreferences.Editor editor = backend.edit();
-                editor.clear();
-                editor.apply();
-            }
-            else profile = Data.profiles.get(0);
-        }
-        else {
-            profile = MobileLedgerProfile.loadAllFromDB(profileUUID);
+        profile = Data.getProfile(profileUUID);
+
+        if (Data.profiles.isEmpty()) {
+            findViewById(R.id.no_profiles_layout).setVisibility(View.VISIBLE);
+            findViewById(R.id.pager_layout).setVisibility(View.GONE);
+            return;
         }
 
+        findViewById(R.id.pager_layout).setVisibility(View.VISIBLE);
+        findViewById(R.id.no_profiles_layout).setVisibility(View.GONE);
+
         if (profile == null) profile = Data.profiles.get(0);
 
         if (profile == null) throw new AssertionError("profile must have a value");
 
         Data.setCurrentProfile(profile);
-
-        if (profile.getUrl().isEmpty()) {
-            Intent intent = new Intent(this, ProfileListActivity.class);
-            Bundle args = new Bundle();
-            args.putInt(ProfileListActivity.ARG_ACTION, ProfileListActivity.ACTION_EDIT_PROFILE);
-            args.putInt(ProfileListActivity.ARG_PROFILE_INDEX, 0);
-            intent.putExtras(args);
-            startActivity(intent, args);
-        }
     }
     public void fabNewTransactionClicked(View view) {
         Intent intent = new Intent(this, NewTransactionActivity.class);
@@ -224,20 +474,13 @@ public class MainActivity extends AppCompatActivity {
     }
     public void markDrawerItemCurrent(int id) {
         TextView item = drawer.findViewById(id);
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
-            item.setBackgroundColor(getResources().getColor(R.color.table_row_dark_bg, getTheme()));
-        }
-        else {
-            item.setBackgroundColor(getResources().getColor(R.color.table_row_dark_bg));
-        }
-
-        @ColorInt int transparent = getResources().getColor(android.R.color.transparent);
+        item.setBackgroundColor(Colors.tableRowDarkBG);
 
         LinearLayout actions = drawer.findViewById(R.id.nav_actions);
         for (int i = 0; i < actions.getChildCount(); i++) {
             View view = actions.getChildAt(i);
             if (view.getId() != id) {
-                view.setBackgroundColor(transparent);
+                view.setBackgroundColor(Color.TRANSPARENT);
             }
         }
     }
@@ -248,7 +491,7 @@ public class MainActivity extends AppCompatActivity {
     }
     private void showAccountSummaryFragment() {
         mViewPager.setCurrentItem(0, true);
-        TransactionListFragment.accountFilter.set(null);
+        Data.accountFilter.set(null);
 //        FragmentTransaction ft = fragmentManager.beginTransaction();
 //        accountSummaryFragment = new AccountSummaryFragment();
 //        ft.replace(R.id.root_frame, accountSummaryFragment);
@@ -258,14 +501,18 @@ public class MainActivity extends AppCompatActivity {
     public void onLatestTransactionsClicked(View view) {
         drawer.closeDrawers();
 
-        showTransactionsFragment(null);
+        showTransactionsFragment((String) null);
     }
     private void resetFragmentBackStack() {
 //        fragmentManager.popBackStack(0, FragmentManager.POP_BACK_STACK_INCLUSIVE);
     }
-    private void showTransactionsFragment(LedgerAccount account) {
-        if (account != null) TransactionListFragment.accountFilter.set(account.getName());
+    private void showTransactionsFragment(String accName) {
+        Data.accountFilter.set(accName);
+        Data.accountFilter.notifyObservers();
         mViewPager.setCurrentItem(1, true);
+    }
+    private void showTransactionsFragment(LedgerAccount account) {
+        showTransactionsFragment((account == null) ? (String) null : account.getName());
 //        FragmentTransaction ft = fragmentManager.beginTransaction();
 //        if (transactionListFragment == null) {
 //            Log.d("flow", "MainActivity creating TransactionListFragment");
@@ -285,6 +532,7 @@ public class MainActivity extends AppCompatActivity {
 //        currentFragment = transactionListFragment;
     }
     public void showAccountTransactions(LedgerAccount account) {
+        mBackMeansToAccountList = true;
         showTransactionsFragment(account);
     }
     @Override
@@ -294,15 +542,24 @@ public class MainActivity extends AppCompatActivity {
             drawer.closeDrawer(GravityCompat.START);
         }
         else {
-            Log.d("fragments",
-                    String.format("manager stack: %d", fragmentManager.getBackStackEntryCount()));
+            if (mBackMeansToAccountList && (mViewPager.getCurrentItem() == 1)) {
+                Data.accountFilter.set(null);
+                showAccountSummaryFragment();
+                mBackMeansToAccountList = false;
+            }
+            else {
+                Log.d("fragments", String.format("manager stack: %d",
+                        fragmentManager.getBackStackEntryCount()));
 
-            super.onBackPressed();
+                super.onBackPressed();
+            }
         }
     }
     public void updateLastUpdateTextFromDB() {
         {
-            long last_update = Data.profile.get().getLongOption(MLDB.OPT_LAST_SCRAPE, 0L);
+            final MobileLedgerProfile profile = Data.profile.get();
+            long last_update =
+                    (profile != null) ? profile.getLongOption(MLDB.OPT_LAST_SCRAPE, 0L) : 0;
 
             Log.d("transactions", String.format("Last update = %d", last_update));
             if (last_update == 0) {
@@ -314,10 +571,11 @@ public class MainActivity extends AppCompatActivity {
         }
     }
     public void scheduleTransactionListRetrieval() {
+        if (Data.profile.get() == null) return;
+
         retrieveTransactionsTask = new RetrieveTransactionsTask(new WeakReference<>(this));
 
         retrieveTransactionsTask.execute();
-        bTransactionListCancelDownload.setEnabled(true);
     }
     public void onStopTransactionRefreshClick(View view) {
         Log.d("interactive", "Cancelling transactions refresh");
@@ -330,11 +588,15 @@ public class MainActivity extends AppCompatActivity {
         if (error == null) {
             updateLastUpdateTextFromDB();
 
-            new RefreshDescriptionsTask().execute();
+            new RefreshDescriptionsTask().executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
+            TransactionListViewModel.scheduleTransactionListReload();
         }
         else Toast.makeText(this, error, Toast.LENGTH_LONG).show();
     }
     public void onRetrieveStart() {
+        bTransactionListCancelDownload.setEnabled(true);
+        progressBar.setIndeterminateTintList(ColorStateList.valueOf(Colors.primary));
+        progressBar.setProgressTintList(ColorStateList.valueOf(Colors.primary));
         progressBar.setIndeterminate(true);
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) progressBar.setProgress(0, false);
         else progressBar.setProgress(0);
@@ -358,11 +620,177 @@ public class MainActivity extends AppCompatActivity {
             progressBar.setIndeterminate(false);
         }
     }
-    public void navProfilesClicked(View view) {
-        drawer.closeDrawers();
-        Intent intent = new Intent(this, ProfileListActivity.class);
-        startActivity(intent);
+    public void fabShouldShow() {
+        MobileLedgerProfile profile = Data.profile.get();
+        if ((profile != null) && profile.isPostingPermitted()) fab.show();
     }
+    public void navProfilesHeadClicked(View view) {
+        if (profileListExpanded) {
+            collapseProfileList();
+        }
+        else {
+            expandProfileList();
+        }
+    }
+    private void expandProfileList() {
+        profileListExpanded = true;
+
+
+        profileListContainer.setVisibility(View.VISIBLE);
+        profileListContainer.startAnimation(AnimationUtils.loadAnimation(this, R.anim.slide_down));
+        profileListHeadArrow.startAnimation(AnimationUtils.loadAnimation(this, R.anim.rotate_180));
+        profileListHeadMore.setVisibility(View.VISIBLE);
+        profileListHeadMore.startAnimation(AnimationUtils.loadAnimation(this, R.anim.fade_in));
+        findViewById(R.id.nav_profile_list).setMinimumHeight(
+                (int) (getResources().getDimension(R.dimen.thumb_row_height) *
+                       Data.profiles.size()));
+    }
+    private void collapseProfileList() {
+        profileListExpanded = false;
+
+        final Animation animation = AnimationUtils.loadAnimation(this, R.anim.slide_up);
+        animation.setAnimationListener(new Animation.AnimationListener() {
+            @Override
+            public void onAnimationStart(Animation animation) {
+
+            }
+            @Override
+            public void onAnimationEnd(Animation animation) {
+                profileListContainer.setVisibility(View.GONE);
+            }
+            @Override
+            public void onAnimationRepeat(Animation animation) {
+
+            }
+        });
+        mProfileListAdapter.stopEditingProfiles();
+
+        profileListContainer.startAnimation(animation);
+        profileListHeadArrow.setRotation(0f);
+        profileListHeadArrow
+                .startAnimation(AnimationUtils.loadAnimation(this, R.anim.rotate_180_back));
+        profileListHeadMore.setVisibility(View.GONE);
+    }
+    public void onProfileRowClicked(View v) {
+        Data.setCurrentProfile((MobileLedgerProfile) v.getTag());
+    }
+    public void enableProfileModifications() {
+        profileModificationEnabled = true;
+        ViewGroup profileList = findViewById(R.id.nav_profile_list);
+        for (int i = 0; i < profileList.getChildCount(); i++) {
+            View aRow = profileList.getChildAt(i);
+            aRow.findViewById(R.id.profile_list_edit_button).setVisibility(View.VISIBLE);
+            aRow.findViewById(R.id.profile_list_rearrange_handle).setVisibility(View.VISIBLE);
+        }
+        // FIXME enable rearranging
+
+    }
+    public void disableProfileModifications() {
+        profileModificationEnabled = false;
+        ViewGroup profileList = findViewById(R.id.nav_profile_list);
+        for (int i = 0; i < profileList.getChildCount(); i++) {
+            View aRow = profileList.getChildAt(i);
+            aRow.findViewById(R.id.profile_list_edit_button).setVisibility(View.GONE);
+            aRow.findViewById(R.id.profile_list_rearrange_handle).setVisibility(View.INVISIBLE);
+        }
+        // FIXME disable rearranging
+
+    }
+    public void onAccountSummaryRowViewClicked(View view) {
+        ViewGroup row;
+        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()) {
+            case R.id.account_row_acc_name:
+            case R.id.account_expander:
+            case R.id.account_expander_container:
+                Log.d("accounts", "Account expander clicked");
+                if (!acc.hasSubAccounts()) return;
+
+                boolean wasExpanded = acc.isExpanded();
+
+                View arrow = row.findViewById(R.id.account_expander_container);
+
+                arrow.clearAnimation();
+                ViewPropertyAnimator animator = arrow.animate();
+
+                acc.toggleExpanded();
+                DbOpQueue.add("update accounts set expanded=? where name=? and profile=?",
+                        new Object[]{acc.isExpanded(), acc.getName(), Data.profile.get().getUuid()
+                        });
+
+                if (wasExpanded) {
+                    Log.d("accounts", String.format("Collapsing account '%s'", acc.getName()));
+                    arrow.setRotation(0);
+                    animator.rotationBy(180);
+
+                    // removing all child accounts from the view
+                    int start = -1, count = 0;
+                    try (LockHolder lh = Data.accounts.lockForWriting()) {
+                        for (int i = 0; i < Data.accounts.size(); i++) {
+                            if (acc.isParentOf(Data.accounts.get(i))) {
+//                                Log.d("accounts", String.format("Found a child '%s' at position %d",
+//                                        Data.accounts.get(i).getName(), i));
+                                if (start == -1) {
+                                    start = i;
+                                }
+                                count++;
+                            }
+                            else {
+                                if (start != -1) {
+//                                    Log.d("accounts",
+//                                            String.format("Found a non-child '%s' at position %d",
+//                                                    Data.accounts.get(i).getName(), i));
+                                    break;
+                                }
+                            }
+                        }
+
+                        if (start != -1) {
+                            for (int j = 0; j < count; j++) {
+//                                Log.d("accounts", String.format("Removing item %d: %s", start + j,
+//                                        Data.accounts.get(start).getName()));
+                                Data.accounts.removeQuietly(start);
+                            }
+
+                            mAccountSummaryFragment.modelAdapter
+                                    .notifyItemRangeRemoved(start, count);
+                        }
+                    }
+                }
+                else {
+                    Log.d("accounts", String.format("Expanding account '%s'", acc.getName()));
+                    arrow.setRotation(180);
+                    animator.rotationBy(-180);
+                    List<LedgerAccount> children =
+                            Data.profile.get().loadVisibleChildAccountsOf(acc);
+                    try (LockHolder lh = Data.accounts.lockForWriting()) {
+                        int parentPos = Data.accounts.indexOf(acc);
+                        if (parentPos != -1) {
+                            // may have disappeared in a concurrent refresh operation
+                            Data.accounts.addAllQuietly(parentPos + 1, children);
+                            mAccountSummaryFragment.modelAdapter
+                                    .notifyItemRangeInserted(parentPos + 1, children.size());
+                        }
+                    }
+                }
+                break;
+            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(),
+                                                 Data.profile.get().getUuid()
+                                    });
+                    Data.accounts.triggerItemChangedNotification(acc);
+                }
+                break;
+        }
+    }
+
     public class SectionsPagerAdapter extends FragmentPagerAdapter {
 
         public SectionsPagerAdapter(FragmentManager fm) {
@@ -371,10 +799,11 @@ public class MainActivity extends AppCompatActivity {
 
         @Override
         public Fragment getItem(int position) {
-            Log.d("main", String.format("Switching to gragment %d", position));
+            Log.d("main", String.format("Switching to fragment %d", position));
             switch (position) {
                 case 0:
-                    return new AccountSummaryFragment();
+//                    Log.d("flow", "Creating account summary fragment");
+                    return mAccountSummaryFragment = new AccountSummaryFragment();
                 case 1:
                     return new TransactionListFragment();
                 default:
@@ -388,5 +817,4 @@ public class MainActivity extends AppCompatActivity {
             return 2;
         }
     }
-
 }