import android.view.ViewGroup;
import net.ktnx.mobileledger.R;
-import net.ktnx.mobileledger.async.RetrieveAccountsTask;
+import net.ktnx.mobileledger.model.Data;
import net.ktnx.mobileledger.model.LedgerAccount;
import net.ktnx.mobileledger.ui.MobileLedgerListFragment;
import net.ktnx.mobileledger.ui.RecyclerItemListener;
import net.ktnx.mobileledger.ui.activity.MainActivity;
-import net.ktnx.mobileledger.utils.MLDB;
-import java.lang.ref.WeakReference;
-import java.util.Date;
import java.util.List;
+import java.util.Observable;
+import java.util.Observer;
import static net.ktnx.mobileledger.ui.activity.SettingsActivity.PREF_KEY_SHOW_ONLY_STARRED_ACCOUNTS;
public class AccountSummaryFragment extends MobileLedgerListFragment {
- private static long account_list_last_updated;
- private static boolean account_list_needs_update = true;
- MenuItem mShowHiddenAccounts;
- SharedPreferences.OnSharedPreferenceChangeListener sBindPreferenceSummaryToValueListener;
+ MenuItem mShowOnlyStarred;
private AccountSummaryViewModel model;
private AccountSummaryAdapter modelAdapter;
private Menu optMenu;
private FloatingActionButton fab;
+ private Observer backgroundTaskCountObserver;
+ @Override
+ public void onDestroy() {
+ if (backgroundTaskCountObserver != null) {
+ Log.d("acc", "destroying background task count observer");
+ Data.backgroundTaskCount.deleteObserver(backgroundTaskCountObserver);
+ }
+ super.onDestroy();
+ }
@Override
public void onCreate(@Nullable Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setHasOptionsMenu(true);
+
+ if (backgroundTaskCountObserver == null) {
+ Log.d("acc", "creating background task count observer");
+ Data.backgroundTaskCount.addObserver(backgroundTaskCountObserver = (o, arg) -> {
+ if (mActivity == null) return;
+ if (swiper == null) return;
+ mActivity.runOnUiThread(() -> {
+ int cnt = Data.backgroundTaskCount.get();
+ Log.d("acc", String.format("background task count changed to %d", cnt));
+ swiper.setRefreshing(cnt > 0);
+ });
+ });
+ }
}
public void onAttach(Context context) {
super.onAttach(context);
@Override
public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container,
@Nullable Bundle savedInstanceState) {
+ Log.d("flow", "AccountSummaryFragment.onCreateView()");
return inflater.inflate(R.layout.account_summary_fragment, container, false);
}
@Override
+
public void onActivityCreated(@Nullable Bundle savedInstanceState) {
+ Log.d("flow", "AccountSummaryFragment.onActivityCreated()");
super.onActivityCreated(savedInstanceState);
- mActivity.markDrawerItemCurrent(R.id.nav_account_summary);
-
model = ViewModelProviders.of(this).get(AccountSummaryViewModel.class);
- List<LedgerAccount> accounts = model.getAccounts(this.getContext());
- modelAdapter = new AccountSummaryAdapter(accounts);
-
- RecyclerView root = mActivity.findViewById(R.id.account_root);
- root.setAdapter(modelAdapter);
+ modelAdapter = new AccountSummaryAdapter();
+ root = mActivity.findViewById(R.id.account_root);
LinearLayoutManager llm = new LinearLayoutManager(mActivity);
llm.setOrientation(LinearLayoutManager.VERTICAL);
root.setLayoutManager(llm);
+ root.setAdapter(modelAdapter);
fab = mActivity.findViewById(R.id.btn_add_transaction);
modelAdapter.selectItem(position);
}
else {
- List<LedgerAccount> accounts = model.getAccounts(mActivity);
+ List<LedgerAccount> accounts = Data.accounts.get();
if (accounts != null) {
LedgerAccount account = accounts.get(position);
swiper.setColorSchemeResources(R.color.colorPrimary, R.color.colorAccent);
swiper.setOnRefreshListener(() -> {
Log.d("ui", "refreshing accounts via swipe");
- update_accounts(true);
+ mActivity.scheduleTransactionListRetrieval();
});
- prepare_db();
-// update_account_table();
- update_accounts(false);
-
- }
- private void prepare_db() {
- account_list_last_updated = MLDB.get_option_value(MLDB.OPT_LAST_REFRESH, (long) 0);
- }
-
- private void update_accounts(boolean force) {
- long now = new Date().getTime();
- if ((now > (account_list_last_updated + (24 * 3600 * 1000))) || force) {
- Log.d("db",
- "accounts last updated at " + account_list_last_updated + " and now is " + now +
- ". re-fetching");
- update_accounts();
- }
- }
-
- private void update_accounts() {
- RetrieveAccountsTask task = new RetrieveAccountsTask(new WeakReference<>(mActivity));
-
- task.setPref(PreferenceManager.getDefaultSharedPreferences(mActivity));
- task.execute();
+ Data.accounts.addObserver(new Observer() {
+ @Override
+ public void update(Observable o, Object arg) {
+ mActivity.runOnUiThread(() -> modelAdapter.notifyDataSetChanged());
+ }
+ });
+ Data.profile.addObserver(new Observer() {
+ @Override
+ public void update(Observable o, Object arg) {
+ mActivity.runOnUiThread(() -> model.scheduleAccountListReload());
+ }
+ });
+ update_account_table();
}
private void update_account_table() {
if (this.getContext() == null) return;
- model.reloadAccounts(this.getContext());
- modelAdapter.notifyDataSetChanged();
- }
- public void onShowOnlyStarredClicked(MenuItem mi) {
- SharedPreferences pref = PreferenceManager.getDefaultSharedPreferences(mActivity);
- boolean flag = pref.getBoolean(PREF_KEY_SHOW_ONLY_STARRED_ACCOUNTS, false);
-
- SharedPreferences.Editor editor = pref.edit();
- editor.putBoolean(PREF_KEY_SHOW_ONLY_STARRED_ACCOUNTS, !flag);
- Log.d("pref", "Setting show only starred accounts pref to " + (flag ? "false" : "true"));
- editor.apply();
-
- update_account_table();
+ model.scheduleAccountListReload();
}
-
void stopSelection() {
modelAdapter.stopSelection();
if (optMenu != null) {
stopSelection();
}
public void onConfirmAccSelection(MenuItem item) {
- model.commitSelections(mActivity);
+ AccountSummaryViewModel.commitSelections(mActivity);
stopSelection();
}
@Override
inflater.inflate(R.menu.account_summary, menu);
optMenu = menu;
- mShowHiddenAccounts = menu.findItem(R.id.menu_acc_summary_only_starred);
- if (mShowHiddenAccounts == null) throw new AssertionError();
+ mShowOnlyStarred = menu.findItem(R.id.menu_acc_summary_only_starred);
+ if (mShowOnlyStarred == null) throw new AssertionError();
+ MenuItem mCancelSelection = menu.findItem(R.id.menu_acc_summary_cancel_selection);
+ if (mCancelSelection == null) throw new AssertionError();
+ MenuItem mConfirmSelection = menu.findItem(R.id.menu_acc_summary_confirm_selection);
+ if (mConfirmSelection == null) throw new AssertionError();
+
+ Data.optShowOnlyStarred.addObserver((o, arg) -> {
+ boolean newValue = Data.optShowOnlyStarred.get();
+ Log.d("pref", String.format("pref change came (%s)", newValue ? "true" : "false"));
+ mShowOnlyStarred.setChecked(newValue);
+ update_account_table();
+ });
+
+ mShowOnlyStarred.setChecked(Data.optShowOnlyStarred.get());
- sBindPreferenceSummaryToValueListener = (preference, value) -> mShowHiddenAccounts
- .setChecked(preference.getBoolean(PREF_KEY_SHOW_ONLY_STARRED_ACCOUNTS, false));
- SharedPreferences pref = PreferenceManager.getDefaultSharedPreferences(mActivity);
- pref.registerOnSharedPreferenceChangeListener(sBindPreferenceSummaryToValueListener);
+ Log.d("menu", "Accounts: onCreateOptionsMenu called");
- mShowHiddenAccounts.setChecked(pref.getBoolean(PREF_KEY_SHOW_ONLY_STARRED_ACCOUNTS, false));
+ mShowOnlyStarred.setOnMenuItemClickListener(item -> {
+ SharedPreferences pref = PreferenceManager.getDefaultSharedPreferences(mActivity);
+ SharedPreferences.Editor editor = pref.edit();
+ boolean flag = item.isChecked();
+ editor.putBoolean(PREF_KEY_SHOW_ONLY_STARRED_ACCOUNTS, !flag);
+ Log.d("pref",
+ "Setting show only starred accounts pref to " + (flag ? "false" : "true"));
+ editor.apply();
+
+ return true;
+ });
- Log.d("menu", "MainActivity: onCreateOptionsMenu called");
+ mCancelSelection.setOnMenuItemClickListener(item -> {
+ stopSelection();
+ return true;
+ });
+
+ mConfirmSelection.setOnMenuItemClickListener(item -> {
+ AccountSummaryViewModel.commitSelections(mActivity);
+ stopSelection();
+
+ return true;
+ });
}
}
projects / mobile-ledger.git / blobdiff