From 826ef2c336fb66719c35f732446e92bde3523508 Mon Sep 17 00:00:00 2001 From: Damyan Ivanov Date: Wed, 3 Apr 2019 00:13:04 +0300 Subject: [PATCH] streamline handling of account name filter avoids multiple refresh requests, handles phone rotation/activity restart correctly --- .../net/ktnx/mobileledger/model/Data.java | 1 + .../ui/activity/MainActivity.java | 158 +++++++++--------- .../TransactionListAdapter.java | 11 +- .../TransactionListFragment.java | 64 +++---- .../TransactionListViewModel.java | 2 +- 5 files changed, 110 insertions(+), 126 deletions(-) diff --git a/app/src/main/java/net/ktnx/mobileledger/model/Data.java b/app/src/main/java/net/ktnx/mobileledger/model/Data.java index 2559fd86..60fb9239 100644 --- a/app/src/main/java/net/ktnx/mobileledger/model/Data.java +++ b/app/src/main/java/net/ktnx/mobileledger/model/Data.java @@ -38,6 +38,7 @@ public final class Data { public static ObservableList profiles = new ObservableList<>(new ArrayList<>()); public static ObservableValue optShowOnlyStarred = new ObservableValue<>(); + public static ObservableValue accountFilter = new ObservableValue<>(); public static void setCurrentProfile(MobileLedgerProfile newProfile) { MLDB.setOption(MLDB.OPT_PROFILE_UUID, newProfile.getUuid()); profile.set(newProfile); 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 7373d0d8..ffac1ecf 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 @@ -99,6 +99,7 @@ public class MainActivity extends ProfileThemedActivity { private Observer profileObserver; private Observer profilesObserver; private Observer lastUpdateDateObserver; + private Toolbar mToolbar; @Override protected void onStart() { super.onStart(); @@ -106,14 +107,15 @@ public class MainActivity extends ProfileThemedActivity { Log.d("flow", "MainActivity.onStart()"); mViewPager.setCurrentItem(mCurrentPage, false); if (mAccountFilter != null) showTransactionsFragment(mAccountFilter); + else Data.accountFilter.set(null); } @Override protected void onSaveInstanceState(Bundle outState) { super.onSaveInstanceState(outState); outState.putInt(STATE_CURRENT_PAGE, mViewPager.getCurrentItem()); - if (TransactionListFragment.accountFilter.get() != null) - outState.putString(STATE_ACC_FILTER, TransactionListFragment.accountFilter.get()); + if (Data.accountFilter.get() != null) + outState.putString(STATE_ACC_FILTER, Data.accountFilter.get()); } @Override protected void onDestroy() { @@ -155,87 +157,21 @@ public class MainActivity extends ProfileThemedActivity { if (extra != null && savedInstanceState == null) savedInstanceState = extra; - Toolbar toolbar = findViewById(R.id.toolbar); - setSupportActionBar(toolbar); + mToolbar = findViewById(R.id.toolbar); + setSupportActionBar(mToolbar); if (profileObserver == null) { - profileObserver = (o, 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) { - toolbar.setSubtitle(null); - fab.hide(); - } - else { - if (profile.isPostingPermitted()) { - toolbar.setSubtitle(null); - fab.show(); - } - else { - toolbar.setSubtitle(R.string.profile_subitlte_read_only); - fab.hide(); - } - } - }); - }; + profileObserver = (o, arg) -> onProfileChanged(arg); Data.profile.addObserver(profileObserver); } if (profilesObserver == null) { - profilesObserver = (o, 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); - }; + 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(); @@ -285,6 +221,7 @@ public class MainActivity extends ProfileThemedActivity { } mAccountFilter = savedInstanceState.getString(STATE_ACC_FILTER, null); } + else mAccountFilter = null; lastUpdateDateObserver = (o, arg) -> { Log.d("main", "lastUpdateDate changed"); @@ -358,6 +295,73 @@ public class MainActivity extends ProfileThemedActivity { scheduleTransactionListRetrieval(); } } + 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); + } + 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 { + 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); @@ -467,7 +471,7 @@ public class MainActivity extends ProfileThemedActivity { } 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); @@ -483,8 +487,8 @@ public class MainActivity extends ProfileThemedActivity { // fragmentManager.popBackStack(0, FragmentManager.POP_BACK_STACK_INCLUSIVE); } private void showTransactionsFragment(String accName) { - TransactionListFragment.accountFilter.set(accName); - TransactionListFragment.accountFilter.notifyObservers(); + Data.accountFilter.set(accName); + Data.accountFilter.notifyObservers(); mViewPager.setCurrentItem(1, true); } private void showTransactionsFragment(LedgerAccount account) { @@ -519,7 +523,7 @@ public class MainActivity extends ProfileThemedActivity { } else { if (mBackMeansToAccountList && (mViewPager.getCurrentItem() == 1)) { - TransactionListFragment.accountFilter.set(null); + Data.accountFilter.set(null); showAccountSummaryFragment(); mBackMeansToAccountList = false; } diff --git a/app/src/main/java/net/ktnx/mobileledger/ui/transaction_list/TransactionListAdapter.java b/app/src/main/java/net/ktnx/mobileledger/ui/transaction_list/TransactionListAdapter.java index bad849e9..544e3342 100644 --- a/app/src/main/java/net/ktnx/mobileledger/ui/transaction_list/TransactionListAdapter.java +++ b/app/src/main/java/net/ktnx/mobileledger/ui/transaction_list/TransactionListAdapter.java @@ -52,7 +52,6 @@ import androidx.recyclerview.widget.RecyclerView; import static net.ktnx.mobileledger.utils.DimensionUtils.dp2px; public class TransactionListAdapter extends RecyclerView.Adapter { - private String boldAccountName; public void onBindViewHolder(@NonNull TransactionRowHolder holder, int position) { TransactionListItem item = TransactionListViewModel.getTransactionListItem(position); @@ -74,7 +73,7 @@ public class TransactionListAdapter extends RecyclerView.Adapter { @Override diff --git a/app/src/main/java/net/ktnx/mobileledger/ui/transaction_list/TransactionListFragment.java b/app/src/main/java/net/ktnx/mobileledger/ui/transaction_list/TransactionListFragment.java index bb0355ce..d3942852 100644 --- a/app/src/main/java/net/ktnx/mobileledger/ui/transaction_list/TransactionListFragment.java +++ b/app/src/main/java/net/ktnx/mobileledger/ui/transaction_list/TransactionListFragment.java @@ -40,7 +40,6 @@ import net.ktnx.mobileledger.ui.activity.MainActivity; import net.ktnx.mobileledger.utils.Colors; import net.ktnx.mobileledger.utils.Globals; import net.ktnx.mobileledger.utils.MLDB; -import net.ktnx.mobileledger.utils.ObservableValue; import java.util.Observable; import java.util.Observer; @@ -53,9 +52,6 @@ import androidx.recyclerview.widget.RecyclerView; import static android.content.Context.INPUT_METHOD_SERVICE; public class TransactionListFragment extends MobileLedgerListFragment { - public static final String BUNDLE_KEY_FILTER_ACCOUNT_NAME = "filter_account_name"; - public static ObservableValue accountFilter = new ObservableValue<>(); - private String mShowOnlyAccountName; private MenuItem menuTransactionListFilter; private View vAccountFilter; private AutoCompleteTextView accNameFilter; @@ -72,23 +68,6 @@ public class TransactionListFragment extends MobileLedgerListFragment { super.onDestroy(); } public void setShowOnlyAccountName(String mShowOnlyAccountName) { - this.mShowOnlyAccountName = mShowOnlyAccountName; - if (modelAdapter != null) { - modelAdapter.setBoldAccountName(mShowOnlyAccountName); - } - if (accNameFilter != null) { - accNameFilter.setText(mShowOnlyAccountName, false); - } - if (vAccountFilter != null) { - vAccountFilter.setVisibility( - ((mShowOnlyAccountName != null) && !mShowOnlyAccountName.isEmpty()) - ? View.VISIBLE : View.GONE); - } - } - @Override - public void setArguments(@Nullable Bundle args) { - super.setArguments(args); - mShowOnlyAccountName = args.getString(BUNDLE_KEY_FILTER_ACCOUNT_NAME); } @Override public void onCreate(@Nullable Bundle savedInstanceState) { @@ -145,8 +124,6 @@ public class TransactionListFragment extends MobileLedgerListFragment { if (root == null) throw new RuntimeException("Can't get hold on the transaction value view"); modelAdapter = new TransactionListAdapter(); - - modelAdapter.setBoldAccountName(mShowOnlyAccountName); root.setAdapter(modelAdapter); FloatingActionButton fab = mActivity.findViewById(R.id.btn_add_transaction); @@ -181,21 +158,14 @@ public class TransactionListFragment extends MobileLedgerListFragment { MLDB.hookAutocompletionAdapter(mActivity, accNameFilter, "accounts", "name", true); accNameFilter.setOnItemClickListener((parent, view, position, id) -> { // Log.d("tmp", "direct onItemClick"); - TransactionListViewModel.scheduleTransactionListReload(); MatrixCursor mc = (MatrixCursor) parent.getItemAtPosition(position); - accountFilter.set(mc.getString(1)); + Data.accountFilter.set(mc.getString(1)); Globals.hideSoftKeyboard(mActivity); }); if (accountFilterObserver == null) { - accountFilterObserver = (o, arg) -> { - String accountName = accountFilter.get(); - modelAdapter.setBoldAccountName(accountName); - setShowOnlyAccountName(accountName); - TransactionListViewModel.scheduleTransactionListReload(); - if (menuTransactionListFilter != null) menuTransactionListFilter.setVisible(false); - }; - accountFilter.addObserver(accountFilterObserver); + accountFilterObserver = (o, arg) -> onAccountNameFilterChanged(); + Data.accountFilter.addObserver(accountFilterObserver); } TransactionListViewModel.updating.addObserver( @@ -214,13 +184,31 @@ public class TransactionListFragment extends MobileLedgerListFragment { (o, arg) -> mActivity.runOnUiThread(() -> modelAdapter.notifyDataSetChanged())); mActivity.findViewById(R.id.clearAccountNameFilter).setOnClickListener(v -> { + String current = Data.accountFilter.get(); + Data.accountFilter.set(null); vAccountFilter.setVisibility(View.GONE); - if (menuTransactionListFilter != null) menuTransactionListFilter.setVisible(true); - accountFilter.set(null); - accNameFilter.setText(null); - TransactionListViewModel.scheduleTransactionListReload(); + menuTransactionListFilter.setVisible(true); Globals.hideSoftKeyboard(mActivity); }); + + onAccountNameFilterChanged(false); + } + private void onAccountNameFilterChanged() { + onAccountNameFilterChanged(true); + } + private void onAccountNameFilterChanged(boolean reloadTransactions) { + String accName = Data.accountFilter.get(); + if (accNameFilter != null) { + accNameFilter.setText(accName, false); + } + final boolean filterActive = (accName != null) && !accName.isEmpty(); + if (vAccountFilter != null) { + vAccountFilter.setVisibility(filterActive ? View.VISIBLE : View.GONE); + } + if (menuTransactionListFilter != null) menuTransactionListFilter.setVisible(!filterActive); + + if (reloadTransactions) TransactionListViewModel.scheduleTransactionListReload(); + } @Override public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) { @@ -229,7 +217,7 @@ public class TransactionListFragment extends MobileLedgerListFragment { menuTransactionListFilter = menu.findItem(R.id.menu_transaction_list_filter); if ((menuTransactionListFilter == null)) throw new AssertionError(); - if (mShowOnlyAccountName != null) { + if (Data.accountFilter.get() != null) { menuTransactionListFilter.setVisible(false); } diff --git a/app/src/main/java/net/ktnx/mobileledger/ui/transaction_list/TransactionListViewModel.java b/app/src/main/java/net/ktnx/mobileledger/ui/transaction_list/TransactionListViewModel.java index 9e7f77c5..2c049b3a 100644 --- a/app/src/main/java/net/ktnx/mobileledger/ui/transaction_list/TransactionListViewModel.java +++ b/app/src/main/java/net/ktnx/mobileledger/ui/transaction_list/TransactionListViewModel.java @@ -34,7 +34,7 @@ public class TransactionListViewModel extends ViewModel { public static void scheduleTransactionListReload() { if (Data.profile.get() == null) return; - String filter = TransactionListFragment.accountFilter.get(); + String filter = Data.accountFilter.get(); AsyncTask task = new UTT(); task.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR, filter); } -- 2.39.5