X-Git-Url: https://git.ktnx.net/?p=mobile-ledger.git;a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fnet%2Fktnx%2Fmobileledger%2Fui%2Factivity%2FMainActivity.java;h=a6c29db6a9884c7c395f2ec354c4978a9ba14b8b;hp=3c9a6798a11110a034c4cb01a2af71bb4d21ff2b;hb=99c3bfb3451ebb1fc55d728d8d1741849cf789db;hpb=541deb95e67eac219de586058419bb89cd6134a1 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 3c9a6798..a6c29db6 100644 --- a/app/src/main/java/net/ktnx/mobileledger/ui/activity/MainActivity.java +++ b/app/src/main/java/net/ktnx/mobileledger/ui/activity/MainActivity.java @@ -19,14 +19,19 @@ package net.ktnx.mobileledger.ui.activity; import android.content.Intent; 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.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; @@ -37,22 +42,28 @@ 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; -import java.util.Observable; +import java.util.List; import java.util.Observer; import androidx.appcompat.app.ActionBarDrawerToggle; @@ -66,12 +77,15 @@ import androidx.recyclerview.widget.LinearLayoutManager; import androidx.recyclerview.widget.RecyclerView; import androidx.viewpager.widget.ViewPager; -public class MainActivity extends CrashReportingActivity { - private static final String STATE_CURRENT_PAGE = "current_page"; - private static final String BUNDLE_SAVED_STATE = "bundle_savedState"; +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; + private View profileListHeadArrow, profileListHeadMore, profileListHeadCancel; + private LinearLayout profileListHeadMoreAndCancel; private FragmentManager fragmentManager; private TextView tvLastUpdate; private RetrieveTransactionsTask retrieveTransactionsTask; @@ -84,39 +98,57 @@ public class MainActivity extends CrashReportingActivity { 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(); - - 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)); + Log.d("flow", "MainActivity.onStart()"); + mViewPager.setCurrentItem(mCurrentPage, false); + if (mAccountFilter != null) showTransactionsFragment(mAccountFilter); + else Data.accountFilter.set(null); - 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); 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); @@ -130,36 +162,21 @@ public class MainActivity extends CrashReportingActivity { if (extra != null && savedInstanceState == null) savedInstanceState = extra; - Toolbar toolbar = findViewById(R.id.toolbar); - setSupportActionBar(toolbar); + mToolbar = findViewById(R.id.toolbar); + setSupportActionBar(mToolbar); - Data.profile.addObserver((o, arg) -> { - MobileLedgerProfile profile = Data.profile.get(); - runOnUiThread(() -> { - if (profile == null) setTitle(R.string.app_name); - else setTitle(profile.getName()); - updateLastUpdateTextFromDB(); - if (profile.isPostingPermitted()) { - toolbar.setSubtitle(null); - fab.show(); - } - else { - toolbar.setSubtitle(R.string.profile_subitlte_read_only); - fab.hide(); - } + if (profileObserver == null) { + profileObserver = (o, arg) -> onProfileChanged(arg); + Data.profile.addObserver(profileObserver); + } - int newProfileTheme = profile.getThemeId(); - if (newProfileTheme != Colors.profileThemeId) { - Log.d("profiles", String.format("profile theme %d → %d", Colors.profileThemeId, - newProfileTheme)); - profileThemeChanged(); - Colors.profileThemeId = newProfileTheme; - } - }); - }); + 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(); @@ -201,27 +218,23 @@ public class MainActivity extends CrashReportingActivity { } }); + mCurrentPage = 0; if (savedInstanceState != null) { int currentPage = savedInstanceState.getInt(STATE_CURRENT_PAGE, -1); if (currentPage != -1) { - mViewPager.setCurrentItem(currentPage, false); + mCurrentPage = currentPage; } + mAccountFilter = savedInstanceState.getString(STATE_ACC_FILTER, null); } + else mAccountFilter = null; - Data.lastUpdateDate.addObserver((o, arg) -> { + 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); - } - else { - final String text = DateFormat.getDateTimeInstance().format(date); - tvLastUpdate.setText(text); - Log.d("despair", String.format("Date formatted: %s", text)); - } - }); - }); + runOnUiThread(this::updateLastUpdateDisplay); + }; + Data.lastUpdateDate.addObserver(lastUpdateDateObserver); + + updateLastUpdateDisplay(); findViewById(R.id.btn_no_profiles_add) .setOnClickListener(v -> startEditProfileActivity(null)); @@ -235,34 +248,177 @@ public class MainActivity extends CrashReportingActivity { if (root == null) throw new RuntimeException("Can't get hold on the transaction value view"); - mProfileListAdapter = new ProfilesRecyclerViewAdapter(); + if (mProfileListAdapter == null) mProfileListAdapter = new ProfilesRecyclerViewAdapter(); root.setAdapter(mProfileListAdapter); - mProfileListAdapter.addEditingProfilesObserver(new Observer() { + 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 update(Observable o, Object arg) { - final View profilesArrow = findViewById(R.id.nav_profiles_arrow); - if (mProfileListAdapter.isEditingProfiles()) { - profilesArrow.clearAnimation(); - profilesArrow.setVisibility(View.GONE); -// findViewById(R.id.nav_profiles_arrow).setAlpha(0f); - findViewById(R.id.nav_profiles_cancel_edit).setVisibility(View.VISIBLE); + 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 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 { - profilesArrow.setVisibility(View.VISIBLE); -// findViewById(R.id.nav_profiles_arrow).setAlpha(1f); - findViewById(R.id.nav_profiles_cancel_edit).setVisibility(View.GONE); + 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; + } - findViewById(R.id.nav_profiles_cancel_edit).setOnClickListener((v) -> { - mProfileListAdapter.stopEditingProfiles(); - }); - LinearLayoutManager llm = new LinearLayoutManager(this); + if (profileObserver != null) { + Data.profile.deleteObserver(profileObserver); + profileObserver = null; + } - llm.setOrientation(RecyclerView.VERTICAL); - root.setLayoutManager(llm); + super.finish(); } private void profileThemeChanged() { setupProfileColors(); @@ -275,11 +431,6 @@ public class MainActivity extends CrashReportingActivity { intent.putExtra(BUNDLE_SAVED_STATE, bundle); startActivity(intent); } - @Override - protected void onResume() { - super.onResume(); - setupProfile(); - } public void startEditProfileActivity(MobileLedgerProfile profile) { Intent intent = new Intent(this, ProfileDetailActivity.class); Bundle args = new Bundle(); @@ -294,9 +445,9 @@ public class MainActivity extends CrashReportingActivity { String profileUUID = MLDB.getOption(MLDB.OPT_PROFILE_UUID, null); MobileLedgerProfile profile; - profile = MobileLedgerProfile.loadAllFromDB(profileUUID); + profile = Data.getProfile(profileUUID); - if (Data.profiles.getList().isEmpty()) { + if (Data.profiles.isEmpty()) { findViewById(R.id.no_profiles_layout).setVisibility(View.VISIBLE); findViewById(R.id.pager_layout).setVisibility(View.GONE); return; @@ -340,7 +491,7 @@ public class MainActivity extends CrashReportingActivity { } 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); @@ -350,14 +501,18 @@ public class MainActivity extends CrashReportingActivity { 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"); @@ -377,6 +532,7 @@ public class MainActivity extends CrashReportingActivity { // currentFragment = transactionListFragment; } public void showAccountTransactions(LedgerAccount account) { + mBackMeansToAccountList = true; showTransactionsFragment(account); } @Override @@ -386,10 +542,17 @@ public class MainActivity extends CrashReportingActivity { 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() { @@ -426,6 +589,7 @@ public class MainActivity extends CrashReportingActivity { updateLastUpdateTextFromDB(); new RefreshDescriptionsTask().executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR); + TransactionListViewModel.scheduleTransactionListReload(); } else Toast.makeText(this, error, Toast.LENGTH_LONG).show(); } @@ -475,6 +639,11 @@ public class MainActivity extends CrashReportingActivity { 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; @@ -494,11 +663,13 @@ public class MainActivity extends CrashReportingActivity { } }); + mProfileListAdapter.stopEditingProfiles(); + profileListContainer.startAnimation(animation); + profileListHeadArrow.setRotation(0f); profileListHeadArrow .startAnimation(AnimationUtils.loadAnimation(this, R.anim.rotate_180_back)); - - mProfileListAdapter.stopEditingProfiles(); + profileListHeadMore.setVisibility(View.GONE); } public void onProfileRowClicked(View v) { Data.setCurrentProfile((MobileLedgerProfile) v.getTag()); @@ -520,11 +691,105 @@ public class MainActivity extends CrashReportingActivity { 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.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 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 { @@ -537,7 +802,8 @@ public class MainActivity extends CrashReportingActivity { 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: @@ -551,5 +817,4 @@ public class MainActivity extends CrashReportingActivity { return 2; } } - }