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=3f71e0a4707cf0f19dd5883b372795d9b6cacc96;hp=6296828bf87ab8d957e1b0388ddeefabfc20dd36;hb=5a90fe491df28aa545df97278222b4120b56b2a7;hpb=68afaab30e7a6deb073e1c6c52324769912ab542 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 6296828b..3f71e0a4 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 @@ -18,6 +18,7 @@ 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; @@ -31,14 +32,25 @@ 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 androidx.annotation.NonNull; +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; import com.google.android.material.floatingactionbutton.FloatingActionButton; +import com.google.android.material.snackbar.Snackbar; import net.ktnx.mobileledger.R; import net.ktnx.mobileledger.async.DbOpQueue; @@ -55,134 +67,117 @@ 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.GetOptCallback; 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; import java.util.Date; 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; +import java.util.Locale; import static net.ktnx.mobileledger.utils.Logger.debug; +/* + * TODO: reports + * */ + 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"; + private static final String PREF_THEME_ID = "themeId"; public AccountSummaryFragment mAccountSummaryFragment; DrawerLayout drawer; - private LinearLayout profileListContainer; - private View profileListHeadArrow, profileListHeadMore, profileListHeadCancel; - private FragmentManager fragmentManager; - private RetrieveTransactionsTask retrieveTransactionsTask; + private View profileListHeadMore, profileListHeadCancel, profileListHeadAddProfile; private View bTransactionListCancelDownload; - private ProgressBar progressBar; - private LinearLayout progressLayout; private SectionsPagerAdapter mSectionsPagerAdapter; private ViewPager mViewPager; private FloatingActionButton fab; - private boolean profileListExpanded = false; private ProfilesRecyclerViewAdapter mProfileListAdapter; private int mCurrentPage; - private String mAccountFilter; private boolean mBackMeansToAccountList = false; - private Observer profileObserver; - private Observer profilesObserver; private Toolbar mToolbar; private DrawerLayout.SimpleDrawerListener drawerListener; private ActionBarDrawerToggle barDrawerToggle; private ViewPager.SimpleOnPageChangeListener pageChangeListener; - private Observer editingProfilesObserver; + private MobileLedgerProfile profile; @Override protected void onStart() { super.onStart(); - debug("flow", "MainActivity.onStart()"); mViewPager.setCurrentItem(mCurrentPage, false); - if (mAccountFilter != null) showTransactionsFragment(mAccountFilter); - else Data.accountFilter.setValue(null); - } @Override protected void onSaveInstanceState(@NotNull Bundle outState) { super.onSaveInstanceState(outState); outState.putInt(STATE_CURRENT_PAGE, mViewPager.getCurrentItem()); - if (mAccountFilter != null) outState.putString(STATE_ACC_FILTER, mAccountFilter); + if (Data.accountFilter.getValue() != null) + outState.putString(STATE_ACC_FILTER, Data.accountFilter.getValue()); } @Override protected void onDestroy() { mSectionsPagerAdapter = null; - Data.profile.deleteObserver(profileObserver); - profileObserver = null; - Data.profiles.deleteObserver(profilesObserver); - profilesObserver = null; RecyclerView root = findViewById(R.id.nav_profile_list); - if (root != null) root.setAdapter(null); - if (drawer != null) drawer.removeDrawerListener(drawerListener); + if (root != null) + root.setAdapter(null); + if (drawer != null) + drawer.removeDrawerListener(drawerListener); drawerListener = null; - if (drawer != null) drawer.removeDrawerListener(barDrawerToggle); + if (drawer != null) + drawer.removeDrawerListener(barDrawerToggle); barDrawerToggle = null; - if (mViewPager != null) mViewPager.removeOnPageChangeListener(pageChangeListener); + if (mViewPager != null) + mViewPager.removeOnPageChangeListener(pageChangeListener); pageChangeListener = null; - if (mProfileListAdapter != null) - mProfileListAdapter.deleteEditingProfilesObserver(editingProfilesObserver); - editingProfilesObserver = null; super.onDestroy(); } @Override + protected void setupProfileColors() { + SharedPreferences prefs = getPreferences(MODE_PRIVATE); + int profileColor = prefs.getInt(PREF_THEME_ID, -2); + if (profileColor == -2) + profileColor = Data.retrieveCurrentThemeIdFromDb(); + Colors.setupTheme(this, profileColor); + Colors.profileThemeId = profileColor; + storeThemeIdInPrefs(profileColor); + } + @Override + protected void onResume() { + super.onResume(); + fabShouldShow(); + } + @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); debug("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); + LinearLayout profileListHeadMoreAndCancel = + findViewById(R.id.nav_profile_list_head_buttons); + profileListHeadAddProfile = findViewById(R.id.nav_new_profile_button); drawer = findViewById(R.id.drawer_layout); 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); + mSectionsPagerAdapter = new SectionsPagerAdapter(getSupportFragmentManager()); mViewPager = findViewById(R.id.root_frame); Bundle extra = getIntent().getBundleExtra(BUNDLE_SAVED_STATE); - if (extra != null && savedInstanceState == null) savedInstanceState = extra; + 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); - } + Data.profile.observe(this, this::onProfileChanged); - if (profilesObserver == null) { - profilesObserver = (o, arg) -> onProfileListChanged(arg); - Data.profiles.addObserver(profilesObserver); - } + Data.profiles.observe(this, this::onProfileListChanged); if (barDrawerToggle == null) { barDrawerToggle = new ActionBarDrawerToggle(this, drawer, mToolbar, @@ -190,23 +185,37 @@ public class MainActivity extends ProfileThemedActivity { drawer.addDrawerListener(barDrawerToggle); } barDrawerToggle.syncState(); + drawer.addDrawerListener(new DrawerLayout.DrawerListener() { + @Override + public void onDrawerSlide(@NonNull View drawerView, float slideOffset) { + if (slideOffset > 0.2) + fabHide(); + } + @Override + public void onDrawerOpened(@NonNull View drawerView) { + fabHide(); + } + @Override + public void onDrawerClosed(@NonNull View drawerView) { + fabShouldShow(); + } + @Override + public void onDrawerStateChanged(int newState) {} + }); - TextView ver = drawer.findViewById(R.id.drawer_version_text); try { - PackageInfo pi = - getApplicationContext().getPackageManager().getPackageInfo(getPackageName(), 0); - ver.setText(pi.versionName); + PackageInfo pi = getApplicationContext().getPackageManager() + .getPackageInfo(getPackageName(), 0); + ((TextView) findViewById(R.id.nav_upper).findViewById( + R.id.drawer_version_text)).setText(pi.versionName); + ((TextView) findViewById(R.id.no_profiles_layout).findViewById( + R.id.drawer_version_text)).setText(pi.versionName); } catch (Exception e) { e.printStackTrace(); } - if (progressBar == null) - throw new RuntimeException("Can't get hold on the transaction value progress bar"); - if (progressLayout == null) throw new RuntimeException( - "Can't get hold on the transaction value progress bar layout"); - markDrawerItemCurrent(R.id.nav_account_summary); mViewPager.setAdapter(mSectionsPagerAdapter); @@ -215,6 +224,7 @@ public class MainActivity extends ProfileThemedActivity { pageChangeListener = new ViewPager.SimpleOnPageChangeListener() { @Override public void onPageSelected(int position) { + mCurrentPage = position; switch (position) { case 0: markDrawerItemCurrent(R.id.nav_account_summary); @@ -239,56 +249,57 @@ public class MainActivity extends ProfileThemedActivity { if (currentPage != -1) { mCurrentPage = currentPage; } - mAccountFilter = savedInstanceState.getString(STATE_ACC_FILTER, null); + Data.accountFilter.setValue(savedInstanceState.getString(STATE_ACC_FILTER, null)); } - else mAccountFilter = null; Data.lastUpdateDate.observe(this, this::updateLastUpdateDisplay); - findViewById(R.id.btn_no_profiles_add) - .setOnClickListener(v -> startEditProfileActivity(null)); + 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)); + 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(); + if (mProfileListAdapter == null) + mProfileListAdapter = new ProfilesRecyclerViewAdapter(); root.setAdapter(mProfileListAdapter); - if (editingProfilesObserver == null) { - editingProfilesObserver = (o, arg) -> { - if (mProfileListAdapter.isEditingProfiles()) { - profileListHeadArrow.clearAnimation(); - profileListHeadArrow.setVisibility(View.GONE); - profileListHeadMore.setVisibility(View.GONE); - profileListHeadMore - .startAnimation(AnimationUtils.loadAnimation(this, R.anim.fade_out)); - profileListHeadCancel.setVisibility(View.VISIBLE); - profileListHeadCancel - .startAnimation(AnimationUtils.loadAnimation(this, R.anim.fade_in)); + mProfileListAdapter.editingProfiles.observe(this, newValue -> { + if (newValue) { + profileListHeadMore.setVisibility(View.GONE); + profileListHeadCancel.setVisibility(View.VISIBLE); + profileListHeadAddProfile.setVisibility(View.VISIBLE); + if (drawer.isDrawerOpen(GravityCompat.START)) { + profileListHeadMore.startAnimation( + AnimationUtils.loadAnimation(MainActivity.this, R.anim.fade_out)); + profileListHeadCancel.startAnimation( + AnimationUtils.loadAnimation(MainActivity.this, R.anim.fade_in)); + profileListHeadAddProfile.startAnimation( + AnimationUtils.loadAnimation(MainActivity.this, R.anim.fade_in)); } - else { - profileListHeadArrow.setRotation(180f); - profileListHeadArrow.setVisibility(View.VISIBLE); - profileListHeadCancel.setVisibility(View.GONE); - profileListHeadCancel - .startAnimation(AnimationUtils.loadAnimation(this, R.anim.fade_out)); - profileListHeadMore.setVisibility(View.GONE); - if (profileListExpanded) { - profileListHeadMore.setVisibility(View.VISIBLE); - profileListHeadMore - .startAnimation(AnimationUtils.loadAnimation(this, R.anim.fade_in)); - } - else profileListHeadMore.setVisibility(View.GONE); + } + else { + profileListHeadCancel.setVisibility(View.GONE); + profileListHeadMore.setVisibility(View.VISIBLE); + profileListHeadAddProfile.setVisibility(View.GONE); + if (drawer.isDrawerOpen(GravityCompat.START)) { + profileListHeadCancel.startAnimation( + AnimationUtils.loadAnimation(MainActivity.this, R.anim.fade_out)); + profileListHeadMore.startAnimation( + AnimationUtils.loadAnimation(MainActivity.this, R.anim.fade_in)); + profileListHeadAddProfile.startAnimation( + AnimationUtils.loadAnimation(MainActivity.this, R.anim.fade_out)); } - }; - mProfileListAdapter.addEditingProfilesObserver(editingProfilesObserver); - } + } + + mProfileListAdapter.notifyDataSetChanged(); + }); LinearLayoutManager llm = new LinearLayoutManager(this); @@ -297,137 +308,157 @@ public class MainActivity extends ProfileThemedActivity { profileListHeadMore.setOnClickListener((v) -> mProfileListAdapter.flipEditingProfiles()); profileListHeadCancel.setOnClickListener((v) -> mProfileListAdapter.flipEditingProfiles()); - profileListHeadMoreAndCancel - .setOnClickListener((v) -> mProfileListAdapter.flipEditingProfiles()); - + profileListHeadMoreAndCancel.setOnClickListener( + (v) -> mProfileListAdapter.flipEditingProfiles()); if (drawerListener == null) { drawerListener = new DrawerLayout.SimpleDrawerListener() { @Override public void onDrawerClosed(View drawerView) { super.onDrawerClosed(drawerView); - collapseProfileList(); + mProfileListAdapter.setAnimationsEnabled(false); + mProfileListAdapter.editingProfiles.setValue(false); + } + @Override + public void onDrawerOpened(View drawerView) { + super.onDrawerOpened(drawerView); + mProfileListAdapter.setAnimationsEnabled(true); } }; drawer.addDrawerListener(drawerListener); } - - findViewById(R.id.nav_profile_list_head_layout) - .setOnClickListener(this::navProfilesHeadClicked); - findViewById(R.id.nav_profiles_label).setOnClickListener(this::navProfilesHeadClicked); - boolean initialStart = Data.profile.get() == null; - setupProfile(); - if (!initialStart) onProfileChanged(null); - - updateLastUpdateTextFromDB(); } private void scheduleDataRetrievalIfStale(Date lastUpdate) { long now = new Date().getTime(); if ((lastUpdate == null) || (now > (lastUpdate.getTime() + (24 * 3600 * 1000)))) { - if (lastUpdate == null) debug("db::", "WEB data never fetched. scheduling a fetch"); - else debug("db", - String.format("WEB data last fetched at %1.3f and now is %1.3f. re-fetching", - lastUpdate.getTime() / 1000f, now / 1000f)); + if (lastUpdate == null) + debug("db::", "WEB data never fetched. scheduling a fetch"); + else + debug("db", String.format(Locale.ENGLISH, + "WEB data last fetched at %1.3f and now is %1.3f. re-fetching", + lastUpdate.getTime() / 1000f, now / 1000f)); - scheduleTransactionListRetrieval(); + Data.scheduleTransactionListRetrieval(this); } } - private void createShortcuts() { - if (Build.VERSION.SDK_INT < Build.VERSION_CODES.N) return; + private void createShortcuts(List list) { + if (Build.VERSION.SDK_INT < Build.VERSION_CODES.N_MR1) + return; + ShortcutManager sm = getSystemService(ShortcutManager.class); List shortcuts = new ArrayList<>(); - try (LockHolder ignored = 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); - } + int i = 0; + for (MobileLedgerProfile p : list) { + if (shortcuts.size() >= sm.getMaxShortcutCountPerActivity()) + break; + + 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); + i++; } - ShortcutManager sm = getSystemService(ShortcutManager.class); sm.setDynamicShortcuts(shortcuts); } - private void onProfileListChanged(Object arg) { + private void onProfileListChanged(List newList) { + if (newList == null) { + // profiles not yet loaded from DB + findViewById(R.id.loading_layout).setVisibility(View.VISIBLE); + findViewById(R.id.no_profiles_layout).setVisibility(View.GONE); + findViewById(R.id.main_app_layout).setVisibility(View.GONE); + return; + } + + if (newList.isEmpty()) { + findViewById(R.id.no_profiles_layout).setVisibility(View.VISIBLE); + findViewById(R.id.main_app_layout).setVisibility(View.GONE); + findViewById(R.id.loading_layout).setVisibility(View.GONE); + return; + } + + findViewById(R.id.main_app_layout).setVisibility(View.VISIBLE); + findViewById(R.id.no_profiles_layout).setVisibility(View.GONE); + findViewById(R.id.loading_layout).setVisibility(View.GONE); + findViewById(R.id.nav_profile_list).setMinimumHeight( - (int) (getResources().getDimension(R.dimen.thumb_row_height) * - Data.profiles.size())); + (int) (getResources().getDimension(R.dimen.thumb_row_height) * newList.size())); debug("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(() -> { - - 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); - - 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); - } + mProfileListAdapter.notifyDataSetChanged(); + + createShortcuts(newList); + } + /** + * called when the current profile has changed + */ + private void onProfileChanged(MobileLedgerProfile profile) { + boolean haveProfile = profile != null; + + if (haveProfile) + setTitle(profile.getName()); + else + setTitle(R.string.app_name); + + this.profile = profile; + + int newProfileTheme = haveProfile ? profile.getThemeHue() : -1; + if (newProfileTheme != Colors.profileThemeId) { + debug("profiles", + String.format(Locale.ENGLISH, "profile theme %d → %d", Colors.profileThemeId, + newProfileTheme)); + Colors.profileThemeId = newProfileTheme; + profileThemeChanged(); + // profileThemeChanged would restart the activity, so no need to reload the + // data sets below + return; + } - 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) { - debug("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(); + 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(); - debug("transactions", "requesting list reload"); - TransactionListViewModel.scheduleTransactionListReload(); + mProfileListAdapter.notifyDataSetChanged(); - Data.accounts.clear(); - AccountSummaryViewModel.scheduleAccountListReload(); + drawer.closeDrawers(); + + Data.transactions.clear(); + debug("transactions", "requesting list reload"); + TransactionListViewModel.scheduleTransactionListReload(); - if (profile == null) { + Data.accounts.clear(); + AccountSummaryViewModel.scheduleAccountListReload(); + + if (haveProfile) { + if (profile.isPostingPermitted()) { mToolbar.setSubtitle(null); - fab.hide(); + fab.show(); } else { - if (profile.isPostingPermitted()) { - mToolbar.setSubtitle(null); - fab.show(); - } - else { - mToolbar.setSubtitle(R.string.profile_subitlte_read_only); - fab.hide(); - } + mToolbar.setSubtitle(R.string.profile_subtitle_read_only); + fab.hide(); } + } + else { + mToolbar.setSubtitle(null); + fab.hide(); + } - updateLastUpdateTextFromDB(); - }); + updateLastUpdateTextFromDB(); } private void updateLastUpdateDisplay(Date newValue) { LinearLayout l = findViewById(R.id.transactions_last_update_layout); @@ -437,7 +468,8 @@ public class MainActivity extends ProfileThemedActivity { debug("main", "no last update date :("); } else { - final String text = DateFormat.getDateTimeInstance().format(newValue); + final String text = DateFormat.getDateTimeInstance() + .format(newValue); v.setText(text); l.setVisibility(View.VISIBLE); debug("main", String.format("Date formatted: %s", text)); @@ -445,71 +477,49 @@ public class MainActivity extends ProfileThemedActivity { scheduleDataRetrievalIfStale(newValue); } - @Override - public void finish() { - if (profilesObserver != null) { - Data.profiles.deleteObserver(profilesObserver); - profilesObserver = null; - } + private void profileThemeChanged() { + storeThemeIdInPrefs(profile.getThemeHue()); - if (profileObserver != null) { - Data.profile.deleteObserver(profileObserver); - profileObserver = null; - } + // un-hook all observed LiveData + Data.profile.removeObservers(this); + Data.profiles.removeObservers(this); + Data.lastUpdateDate.removeObservers(this); - super.finish(); + recreate(); } - 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); + private void storeThemeIdInPrefs(int themeId) { + // store the new theme id in the preferences + SharedPreferences prefs = getPreferences(MODE_PRIVATE); + SharedPreferences.Editor e = prefs.edit(); + e.putInt(PREF_THEME_ID, themeId); + e.apply(); } 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); + 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; + MLDB.getOption(MLDB.OPT_PROFILE_UUID, null, new GetOptCallback() { + @Override + protected void onResult(String profileUUID) { + MobileLedgerProfile startupProfile; - 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); + startupProfile = Data.getProfile(profileUUID); + Data.setCurrentProfile(startupProfile); + } + }); } public void fabNewTransactionClicked(View view) { Intent intent = new Intent(this, NewTransactionActivity.class); startActivity(intent); - overridePendingTransition(R.anim.slide_in_right, R.anim.dummy); - } - public void navSettingsClicked(View view) { - Intent intent = new Intent(this, SettingsActivity.class); - startActivity(intent); - drawer.closeDrawers(); + overridePendingTransition(R.anim.slide_in_up, R.anim.dummy); } public void markDrawerItemCurrent(int id) { TextView item = drawer.findViewById(id); @@ -561,18 +571,20 @@ public class MainActivity extends ProfileThemedActivity { mBackMeansToAccountList = false; } else { - debug("fragments", String.format("manager stack: %d", - fragmentManager.getBackStackEntryCount())); + debug("fragments", String.format(Locale.ENGLISH, "manager stack: %d", + getSupportFragmentManager().getBackStackEntryCount())); super.onBackPressed(); } } } public void updateLastUpdateTextFromDB() { - final MobileLedgerProfile profile = Data.profile.get(); - long last_update = (profile != null) ? profile.getLongOption(MLDB.OPT_LAST_SCRAPE, 0L) : 0; + if (profile == null) + return; - debug("transactions", String.format("Last update = %d", last_update)); + long last_update = profile.getLongOption(MLDB.OPT_LAST_SCRAPE, 0L); + + debug("transactions", String.format(Locale.ENGLISH, "Last update = %d", last_update)); if (last_update == 0) { Data.lastUpdateDate.postValue(null); } @@ -580,20 +592,14 @@ public class MainActivity extends ProfileThemedActivity { Data.lastUpdateDate.postValue(new Date(last_update)); } } - public void scheduleTransactionListRetrieval() { - if (Data.profile.get() == null) return; - - retrieveTransactionsTask = new RetrieveTransactionsTask(new WeakReference<>(this)); - - retrieveTransactionsTask.execute(); - } public void onStopTransactionRefreshClick(View view) { debug("interactive", "Cancelling transactions refresh"); - if (retrieveTransactionsTask != null) retrieveTransactionsTask.cancel(false); + Data.stopTransactionsRetrieval(); bTransactionListCancelDownload.setEnabled(false); } public void onRetrieveDone(String error) { - progressLayout.setVisibility(View.GONE); + Data.transactionRetrievalDone(); + findViewById(R.id.transaction_progress_layout).setVisibility(View.GONE); if (error == null) { updateLastUpdateTextFromDB(); @@ -601,18 +607,25 @@ public class MainActivity extends ProfileThemedActivity { new RefreshDescriptionsTask().executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR); TransactionListViewModel.scheduleTransactionListReload(); } - else Toast.makeText(this, error, Toast.LENGTH_LONG).show(); + else + Snackbar.make(mViewPager, error, Snackbar.LENGTH_LONG) + .show(); } public void onRetrieveStart() { + ProgressBar progressBar = findViewById(R.id.transaction_list_progress_bar); bTransactionListCancelDownload.setEnabled(true); - progressBar.setIndeterminateTintList(ColorStateList.valueOf(Colors.primary)); - progressBar.setProgressTintList(ColorStateList.valueOf(Colors.primary)); + ColorStateList csl = Colors.getColorStateList(); + progressBar.setIndeterminateTintList(csl); + progressBar.setProgressTintList(csl); progressBar.setIndeterminate(true); - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) progressBar.setProgress(0, false); - else progressBar.setProgress(0); - progressLayout.setVisibility(View.VISIBLE); + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) + progressBar.setProgress(0, false); + else + progressBar.setProgress(0); + findViewById(R.id.transaction_progress_layout).setVisibility(View.VISIBLE); } public void onRetrieveProgress(RetrieveTransactionsTask.Progress progress) { + ProgressBar progressBar = findViewById(R.id.transaction_list_progress_bar); if ((progress.getTotal() == RetrieveTransactionsTask.Progress.INDETERMINATE) || (progress.getTotal() == 0)) { @@ -626,86 +639,27 @@ public class MainActivity extends ProfileThemedActivity { if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) { progressBar.setProgress(progress.getProgress(), true); } - else progressBar.setProgress(progress.getProgress()); + else + progressBar.setProgress(progress.getProgress()); progressBar.setIndeterminate(false); } } public void fabShouldShow() { - MobileLedgerProfile profile = Data.profile.get(); - if ((profile != null) && profile.isPostingPermitted()) fab.show(); + if ((profile != null) && profile.isPostingPermitted() && !drawer.isOpen()) + fab.show(); + else + fabHide(); } - 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() { - boolean wasExpanded = profileListExpanded; - profileListExpanded = false; - - if (wasExpanded) { - 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)); - final Animation moreAnimation = AnimationUtils.loadAnimation(this, R.anim.fade_out); - moreAnimation.setAnimationListener(new Animation.AnimationListener() { - @Override - public void onAnimationStart(Animation animation) { - } - @Override - public void onAnimationEnd(Animation animation) { - profileListHeadMore.setVisibility(View.GONE); - } - @Override - public void onAnimationRepeat(Animation animation) { - } - }); - profileListHeadMore.startAnimation(moreAnimation); - } - else { - profileListContainer.setVisibility(View.GONE); - profileListHeadArrow.setRotation(0f); - profileListHeadMore.setVisibility(View.GONE); - } + public void fabHide() { + fab.hide(); } public void onAccountSummaryRowViewClicked(View view) { ViewGroup row; - if (view.getId() == R.id.account_expander) row = (ViewGroup) view.getParent().getParent(); - else row = (ViewGroup) view.getParent(); + 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()) { @@ -713,7 +667,8 @@ public class MainActivity extends ProfileThemedActivity { case R.id.account_expander: case R.id.account_expander_container: debug("accounts", "Account expander clicked"); - if (!acc.hasSubAccounts()) return; + if (!acc.hasSubAccounts()) + return; boolean wasExpanded = acc.isExpanded(); @@ -724,7 +679,7 @@ public class MainActivity extends ProfileThemedActivity { acc.toggleExpanded(); DbOpQueue.add("update accounts set expanded=? where name=? and profile=?", - new Object[]{acc.isExpanded(), acc.getName(), Data.profile.get().getUuid() + new Object[]{acc.isExpanded(), acc.getName(), profile.getUuid() }); if (wasExpanded) { @@ -737,7 +692,8 @@ public class MainActivity extends ProfileThemedActivity { try (LockHolder ignored = Data.accounts.lockForWriting()) { for (int i = 0; i < Data.accounts.size(); i++) { if (acc.isParentOf(Data.accounts.get(i))) { -// debug("accounts", String.format("Found a child '%s' at position %d", +// debug("accounts", String.format("Found a child '%s' at position +// %d", // Data.accounts.get(i).getName(), i)); if (start == -1) { start = i; @@ -761,8 +717,8 @@ public class MainActivity extends ProfileThemedActivity { Data.accounts.removeQuietly(start); } - mAccountSummaryFragment.modelAdapter - .notifyItemRangeRemoved(start, count); + mAccountSummaryFragment.modelAdapter.notifyItemRangeRemoved(start, + count); } } } @@ -770,15 +726,14 @@ public class MainActivity extends ProfileThemedActivity { debug("accounts", String.format("Expanding account '%s'", acc.getName())); arrow.setRotation(180); animator.rotationBy(-180); - List children = - Data.profile.get().loadVisibleChildAccountsOf(acc); + List children = profile.loadVisibleChildAccountsOf(acc); try (LockHolder ignored = 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()); + mAccountSummaryFragment.modelAdapter.notifyItemRangeInserted( + parentPos + 1, children.size()); } } } @@ -786,11 +741,10 @@ public class MainActivity extends ProfileThemedActivity { 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() - }); + DbOpQueue.add( + "update accounts set amounts_expanded=? where name=? and profile=?", + new Object[]{acc.amountsExpanded(), acc.getName(), profile.getUuid() + }); Data.accounts.triggerItemChangedNotification(acc); } break; @@ -800,13 +754,13 @@ public class MainActivity extends ProfileThemedActivity { public class SectionsPagerAdapter extends FragmentPagerAdapter { SectionsPagerAdapter(FragmentManager fm) { - super(fm); + super(fm, BEHAVIOR_RESUME_ONLY_CURRENT_FRAGMENT); } @NotNull @Override public Fragment getItem(int position) { - debug("main", String.format("Switching to fragment %d", position)); + debug("main", String.format(Locale.ENGLISH, "Switching to fragment %d", position)); switch (position) { case 0: // debug("flow", "Creating account summary fragment");