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=833c038a26ef095e35f8ac397609a25e6b5b2f7a;hp=79f39ff73da793187fccb018ff16c4f2e770a0e4;hb=a1e1420ed00d5ceee82a77d2f7df774fbd933284;hpb=ca13ea74abebbeee4f885917a07c683a9c0fbd4b 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 79f39ff7..833c038a 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 @@ -58,6 +58,8 @@ import net.ktnx.mobileledger.utils.Colors; import net.ktnx.mobileledger.utils.LockHolder; import net.ktnx.mobileledger.utils.MLDB; +import org.jetbrains.annotations.NotNull; + import java.lang.ref.WeakReference; import java.text.DateFormat; import java.util.ArrayList; @@ -102,7 +104,6 @@ public class MainActivity extends ProfileThemedActivity { private boolean mBackMeansToAccountList = false; private Observer profileObserver; private Observer profilesObserver; - private Observer lastUpdateDateObserver; private Toolbar mToolbar; private DrawerLayout.SimpleDrawerListener drawerListener; private ActionBarDrawerToggle barDrawerToggle; @@ -115,15 +116,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); + else Data.accountFilter.setValue(null); } @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()); + if (mAccountFilter != null) + outState.putString(STATE_ACC_FILTER, mAccountFilter); } @Override protected void onDestroy() { @@ -132,8 +133,6 @@ public class MainActivity extends ProfileThemedActivity { profileObserver = null; Data.profiles.deleteObserver(profilesObserver); profilesObserver = null; - Data.lastUpdateDate.deleteObserver(lastUpdateDateObserver); - lastUpdateDateObserver = null; RecyclerView root = findViewById(R.id.nav_profile_list); if (root != null) root.setAdapter(null); if (drawer != null) drawer.removeDrawerListener(drawerListener); @@ -247,15 +246,7 @@ public class MainActivity extends ProfileThemedActivity { } else mAccountFilter = null; - if (lastUpdateDateObserver == null) { - lastUpdateDateObserver = (o, arg) -> { - Log.d("main", "lastUpdateDate changed"); - runOnUiThread(this::updateLastUpdateDisplay); - }; - Data.lastUpdateDate.addObserver(lastUpdateDateObserver); - } - - updateLastUpdateDisplay(); + Data.lastUpdateDate.observe(this, this::updateLastUpdateDisplay); findViewById(R.id.btn_no_profiles_add) .setOnClickListener(v -> startEditProfileActivity(null)); @@ -313,12 +304,15 @@ public class MainActivity extends ProfileThemedActivity { drawer.addDrawerListener(drawerListener); } + findViewById(R.id.nav_profile_list_head_layout) + .setOnClickListener(this::navProfilesHeadClicked); + findViewById(R.id.nav_profiles_label).setOnClickListener(this::navProfilesHeadClicked); setupProfile(); onProfileChanged(null); updateLastUpdateTextFromDB(); - Date lastUpdate = Data.lastUpdateDate.get(); - + } + private void scheduleDataRetrievalIfStale(Date lastUpdate) { 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"); @@ -365,6 +359,12 @@ public class MainActivity extends ProfileThemedActivity { MobileLedgerProfile profile = Data.profile.get(); MainActivity.this.runOnUiThread(() -> { + 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); + Data.transactions.clear(); Log.d("transactions", "requesting list reload"); TransactionListViewModel.scheduleTransactionListReload(); @@ -417,22 +417,25 @@ public class MainActivity extends ProfileThemedActivity { fab.hide(); } } + + updateLastUpdateTextFromDB(); }); } - private void updateLastUpdateDisplay() { + private void updateLastUpdateDisplay(Date newValue) { 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) { + if (newValue == null) { l.setVisibility(View.INVISIBLE); Log.d("main", "no last update date :("); } else { - final String text = DateFormat.getDateTimeInstance().format(date); + final String text = DateFormat.getDateTimeInstance().format(newValue); v.setText(text); l.setVisibility(View.VISIBLE); Log.d("main", String.format("Date formatted: %s", text)); } + + scheduleDataRetrievalIfStale(newValue); } @Override public void finish() { @@ -519,7 +522,7 @@ public class MainActivity extends ProfileThemedActivity { } private void showAccountSummaryFragment() { mViewPager.setCurrentItem(0, true); - Data.accountFilter.set(null); + Data.accountFilter.setValue(null); // FragmentTransaction ft = fragmentManager.beginTransaction(); // accountSummaryFragment = new AccountSummaryFragment(); // ft.replace(R.id.root_frame, accountSummaryFragment); @@ -535,8 +538,7 @@ public class MainActivity extends ProfileThemedActivity { // fragmentManager.popBackStack(0, FragmentManager.POP_BACK_STACK_INCLUSIVE); } private void showTransactionsFragment(String accName) { - Data.accountFilter.set(accName); - Data.accountFilter.notifyObservers(); + Data.accountFilter.setValue(accName); mViewPager.setCurrentItem(1, true); } private void showTransactionsFragment(LedgerAccount account) { @@ -571,7 +573,7 @@ public class MainActivity extends ProfileThemedActivity { } else { if (mBackMeansToAccountList && (mViewPager.getCurrentItem() == 1)) { - Data.accountFilter.set(null); + Data.accountFilter.setValue(null); showAccountSummaryFragment(); mBackMeansToAccountList = false; } @@ -584,18 +586,15 @@ public class MainActivity extends ProfileThemedActivity { } } public void updateLastUpdateTextFromDB() { - { - final MobileLedgerProfile profile = Data.profile.get(); - long last_update = - (profile != null) ? profile.getLongOption(MLDB.OPT_LAST_SCRAPE, 0L) : 0; + 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) { - Data.lastUpdateDate.set(null); - } - else { - Data.lastUpdateDate.set(new Date(last_update)); - } + Log.d("transactions", String.format("Last update = %d", last_update)); + if (last_update == 0) { + Data.lastUpdateDate.postValue(null); + } + else { + Data.lastUpdateDate.postValue(new Date(last_update)); } } public void scheduleTransactionListRetrieval() { @@ -699,31 +698,6 @@ public class MainActivity extends ProfileThemedActivity { .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(); @@ -825,6 +799,7 @@ public class MainActivity extends ProfileThemedActivity { super(fm); } + @NotNull @Override public Fragment getItem(int position) { Log.d("main", String.format("Switching to fragment %d", position));