X-Git-Url: https://git.ktnx.net/?a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fnet%2Fktnx%2Fmobileledger%2Fui%2Factivity%2FMainActivity.java;h=dcf653fd4fc761ada654ba852181f5b9d8308d29;hb=1c794eb9a03c3c3c29860eb974d0f7970b6002c9;hp=0fe1402687540ce20327e5e82cd22fcb8cfbeec1;hpb=998dd32a089d199a2569069415755eb3169b35b0;p=mobile-ledger-staging.git 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 0fe14026..c66f43c4 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 @@ -1,5 +1,5 @@ /* - * Copyright © 2019 Damyan Ivanov. + * Copyright © 2020 Damyan Ivanov. * This file is part of MoLe. * MoLe is free software: you can distribute it and/or modify it * under the term of the GNU General Public License as published by @@ -19,227 +19,479 @@ 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.graphics.Color; +import android.graphics.drawable.Icon; import android.os.Build; import android.os.Bundle; -import android.support.annotation.ColorInt; -import android.support.design.widget.FloatingActionButton; -import android.support.v4.app.Fragment; -import android.support.v4.app.FragmentManager; -import android.support.v4.app.FragmentPagerAdapter; -import android.support.v4.view.GravityCompat; -import android.support.v4.view.ViewPager; -import android.support.v4.widget.DrawerLayout; -import android.support.v7.app.ActionBarDrawerToggle; -import android.support.v7.app.AppCompatActivity; -import android.support.v7.widget.Toolbar; +import android.text.format.DateUtils; import android.util.Log; import android.view.View; +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.lifecycle.ViewModelProvider; +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.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.MainModel; import net.ktnx.mobileledger.ui.account_summary.AccountSummaryFragment; +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.utils.Colors; +import net.ktnx.mobileledger.utils.Logger; import net.ktnx.mobileledger.utils.MLDB; -import java.lang.ref.WeakReference; -import java.text.DateFormat; +import org.jetbrains.annotations.NotNull; + +import java.util.ArrayList; import java.util.Date; +import java.util.List; +import java.util.Locale; +import java.util.Objects; -public class MainActivity extends AppCompatActivity { +/* + * 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"; DrawerLayout drawer; - private FragmentManager fragmentManager; - private TextView tvLastUpdate; - 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 ProfilesRecyclerViewAdapter mProfileListAdapter; + private int mCurrentPage; + private boolean mBackMeansToAccountList = false; + private Toolbar mToolbar; + private DrawerLayout.SimpleDrawerListener drawerListener; + private ActionBarDrawerToggle barDrawerToggle; + private ViewPager.SimpleOnPageChangeListener pageChangeListener; + private MobileLedgerProfile profile; + private MainModel mainModel; @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)); + Logger.debug("MainActivity", "onStart()"); - scheduleTransactionListRetrieval(); - } + mViewPager.setCurrentItem(mCurrentPage, false); + } + @Override + protected void onSaveInstanceState(@NotNull Bundle outState) { + super.onSaveInstanceState(outState); + outState.putInt(STATE_CURRENT_PAGE, mViewPager.getCurrentItem()); + if (mainModel.getAccountFilter() + .getValue() != null) + outState.putString(STATE_ACC_FILTER, mainModel.getAccountFilter() + .getValue()); + } + @Override + protected void onDestroy() { + mSectionsPagerAdapter = null; + RecyclerView root = findViewById(R.id.nav_profile_list); + if (root != null) + root.setAdapter(null); + if (drawer != null) + drawer.removeDrawerListener(drawerListener); + drawerListener = null; + if (drawer != null) + drawer.removeDrawerListener(barDrawerToggle); + barDrawerToggle = null; + if (mViewPager != null) + mViewPager.removeOnPageChangeListener(pageChangeListener); + pageChangeListener = null; + super.onDestroy(); + } + @Override + protected void setupProfileColors() { + final int profileColor = Data.retrieveCurrentThemeIdFromDb(); + Colors.setupTheme(this, profileColor); + Colors.profileThemeId = profileColor; + } + @Override + protected void onResume() { + super.onResume(); + fabShouldShow(); } @Override protected void onCreate(Bundle savedInstanceState) { + Logger.debug("MainActivity", "onCreate()/entry"); super.onCreate(savedInstanceState); + Logger.debug("MainActivity", "onCreate()/after super"); setContentView(R.layout.activity_main); - Toolbar toolbar = findViewById(R.id.toolbar); - setSupportActionBar(toolbar); - fab = findViewById(R.id.btn_add_transaction); - 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(); - } - }); - }); + mainModel = new ViewModelProvider(this).get(MainModel.class); + fab = findViewById(R.id.btn_add_transaction); + profileListHeadMore = findViewById(R.id.nav_profiles_start_edit); + profileListHeadCancel = findViewById(R.id.nav_profiles_cancel_edit); + LinearLayout profileListHeadMoreAndCancel = + findViewById(R.id.nav_profile_list_head_buttons); + profileListHeadAddProfile = findViewById(R.id.nav_new_profile_button); drawer = findViewById(R.id.drawer_layout); - ActionBarDrawerToggle toggle = - new ActionBarDrawerToggle(this, drawer, toolbar, R.string.navigation_drawer_open, - R.string.navigation_drawer_close); - drawer.addDrawerListener(toggle); - toggle.syncState(); + bTransactionListCancelDownload = findViewById(R.id.transaction_list_cancel_download); + mSectionsPagerAdapter = new SectionsPagerAdapter(getSupportFragmentManager()); + mViewPager = findViewById(R.id.root_frame); + + Bundle extra = getIntent().getBundleExtra(BUNDLE_SAVED_STATE); + if (extra != null && savedInstanceState == null) + savedInstanceState = extra; + + + mToolbar = findViewById(R.id.toolbar); + setSupportActionBar(mToolbar); - TextView ver = drawer.findViewById(R.id.drawer_version_text); + Data.observeProfile(this, this::onProfileChanged); + + Data.profiles.observe(this, this::onProfileListChanged); + Data.backgroundTaskProgress.observe(this, this::onRetrieveProgress); + Data.backgroundTasksRunning.observe(this, this::onRetrieveRunningChanged); + + if (barDrawerToggle == null) { + barDrawerToggle = new ActionBarDrawerToggle(this, drawer, mToolbar, + R.string.navigation_drawer_open, R.string.navigation_drawer_close); + drawer.addDrawerListener(barDrawerToggle); + } + barDrawerToggle.syncState(); 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(); } - tvLastUpdate = findViewById(R.id.transactions_last_update); - - bTransactionListCancelDownload = findViewById(R.id.transaction_list_cancel_download); - progressBar = findViewById(R.id.transaction_list_progress_bar); - if (progressBar == null) - throw new RuntimeException("Can't get hold on the transaction value progress bar"); - progressLayout = findViewById(R.id.transaction_progress_layout); - if (progressLayout == null) throw new RuntimeException( - "Can't get hold on the transaction value progress bar layout"); - - fragmentManager = getSupportFragmentManager(); - mSectionsPagerAdapter = new SectionsPagerAdapter(fragmentManager); - markDrawerItemCurrent(R.id.nav_account_summary); - mViewPager = findViewById(R.id.root_frame); mViewPager.setAdapter(mSectionsPagerAdapter); - mViewPager.addOnPageChangeListener(new ViewPager.SimpleOnPageChangeListener() { - @Override - public void onPageSelected(int position) { - switch (position) { - case 0: - markDrawerItemCurrent(R.id.nav_account_summary); - break; - case 1: - markDrawerItemCurrent(R.id.nav_latest_transactions); - break; - default: - Log.e("MainActivity", String.format("Unexpected page index %d", position)); + + if (pageChangeListener == null) { + pageChangeListener = new ViewPager.SimpleOnPageChangeListener() { + @Override + public void onPageSelected(int position) { + mCurrentPage = position; + switch (position) { + case 0: + markDrawerItemCurrent(R.id.nav_account_summary); + break; + case 1: + markDrawerItemCurrent(R.id.nav_latest_transactions); + break; + default: + Log.e("MainActivity", + String.format("Unexpected page index %d", position)); + } + + super.onPageSelected(position); } + }; + mViewPager.addOnPageChangeListener(pageChangeListener); + } - super.onPageSelected(position); + mCurrentPage = 0; + if (savedInstanceState != null) { + int currentPage = savedInstanceState.getInt(STATE_CURRENT_PAGE, -1); + if (currentPage != -1) { + mCurrentPage = currentPage; } - }); + mainModel.getAccountFilter() + .setValue(savedInstanceState.getString(STATE_ACC_FILTER, null)); + } + + findViewById(R.id.btn_no_profiles_add).setOnClickListener( + v -> startEditProfileActivity(null)); + + findViewById(R.id.btn_add_transaction).setOnClickListener(this::fabNewTransactionClicked); - Data.lastUpdateDate.addObserver((o, arg) -> { - Log.d("main", "lastUpdateDate changed"); - runOnUiThread(() -> { - Date date = Data.lastUpdateDate.get(); - if (date == null) { - tvLastUpdate.setText(R.string.transaction_last_update_never); + 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(); + root.setAdapter(mProfileListAdapter); + + 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 { - final String text = DateFormat.getDateTimeInstance().format(date); - tvLastUpdate.setText(text); - Log.d("despair", String.format("Date formatted: %s", text)); + } + 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.notifyDataSetChanged(); }); - findViewById(R.id.btn_no_profiles_add).setOnClickListener(v -> startAddProfileActivity()); + 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()); + if (drawerListener == null) { + drawerListener = new DrawerLayout.SimpleDrawerListener() { + @Override + public void onDrawerSlide(@NonNull View drawerView, float slideOffset) { + if (slideOffset > 0.2) + fabHide(); + } + @Override + public void onDrawerClosed(View drawerView) { + super.onDrawerClosed(drawerView); + mProfileListAdapter.setAnimationsEnabled(false); + mProfileListAdapter.editingProfiles.setValue(false); + Data.drawerOpen.setValue(false); + fabShouldShow(); + } + @Override + public void onDrawerOpened(View drawerView) { + super.onDrawerOpened(drawerView); + mProfileListAdapter.setAnimationsEnabled(true); + Data.drawerOpen.setValue(true); + fabHide(); + } + }; + drawer.addDrawerListener(drawerListener); + } - findViewById(R.id.btn_add_transaction).setOnClickListener(this::fabNewTransactionClicked); - } - @Override - protected void onResume() { - super.onResume(); - setupProfile(); + Data.drawerOpen.observe(this, open -> { + if (open) + drawer.open(); + else + drawer.close(); + }); + + mainModel.getUpdateError() + .observe(this, (error) -> { + if (error == null) + return; + + Snackbar.make(mViewPager, error, Snackbar.LENGTH_LONG) + .show(); + mainModel.clearUpdateError(); + }); + Data.locale.observe(this, l -> refreshLastUpdateInfo()); + Data.lastUpdateDate.observe(this, date -> refreshLastUpdateInfo()); + Data.lastUpdateTransactionCount.observe(this, date -> refreshLastUpdateInfo()); + Data.lastUpdateAccountCount.observe(this, date -> refreshLastUpdateInfo()); } - private void startAddProfileActivity() { - Intent intent = new Intent(this, ProfileListActivity.class); - Bundle args = new Bundle(); - args.putInt(ProfileListActivity.ARG_ACTION, ProfileListActivity.ACTION_EDIT_PROFILE); - args.putInt(ProfileListActivity.ARG_PROFILE_INDEX, ProfileListActivity.PROFILE_INDEX_NONE); - intent.putExtras(args); - startActivity(intent, args); + private void scheduleDataRetrievalIfStale(long lastUpdate) { + long now = new Date().getTime(); + if ((lastUpdate == 0) || (now > (lastUpdate + (24 * 3600 * 1000)))) { + if (lastUpdate == 0) + Logger.debug("db::", "WEB data never fetched. scheduling a fetch"); + else + Logger.debug("db", String.format(Locale.ENGLISH, + "WEB data last fetched at %1.3f and now is %1.3f. re-fetching", + lastUpdate / 1000f, now / 1000f)); + + mainModel.scheduleTransactionListRetrieval(); + } } - private void setupProfile() { - String profileUUID = MLDB.getOption(MLDB.OPT_PROFILE_UUID, null); - MobileLedgerProfile profile; - - profile = MobileLedgerProfile.loadAllFromDB(profileUUID); + private void createShortcuts(List list) { + if (Build.VERSION.SDK_INT < Build.VERSION_CODES.N_MR1) + return; - if (Data.profiles.getList().isEmpty()) { + ShortcutManager sm = getSystemService(ShortcutManager.class); + List shortcuts = new ArrayList<>(); + int i = 0; + for (MobileLedgerProfile p : list) { + if (shortcuts.size() >= sm.getMaxShortcutCountPerActivity()) + break; + + if (!p.isPostingPermitted()) + continue; + + final ShortcutInfo.Builder builder = + new ShortcutInfo.Builder(this, "new_transaction_" + p.getUuid()); + ShortcutInfo si = builder.setShortLabel(p.getName()) + .setIcon(Icon.createWithResource(this, + R.drawable.thick_plus_icon)) + .setIntent(new Intent(Intent.ACTION_VIEW, null, this, + NewTransactionActivity.class).putExtra("profile_uuid", + p.getUuid())) + .setRank(i) + .build(); + shortcuts.add(si); + i++; + } + sm.setDynamicShortcuts(shortcuts); + } + private void onProfileListChanged(List newList) { + if ((newList == null) || newList.isEmpty()) { findViewById(R.id.no_profiles_layout).setVisibility(View.VISIBLE); - findViewById(R.id.pager_layout).setVisibility(View.GONE); + findViewById(R.id.main_app_layout).setVisibility(View.GONE); return; } - findViewById(R.id.pager_layout).setVisibility(View.VISIBLE); + findViewById(R.id.main_app_layout).setVisibility(View.VISIBLE); findViewById(R.id.no_profiles_layout).setVisibility(View.GONE); - if (profile == null) profile = Data.profiles.get(0); + findViewById(R.id.nav_profile_list).setMinimumHeight( + (int) (getResources().getDimension(R.dimen.thumb_row_height) * newList.size())); + + Logger.debug("profiles", "profile list changed"); + mProfileListAdapter.notifyDataSetChanged(); + + createShortcuts(newList); + } + /** + * called when the current profile has changed + */ + private void onProfileChanged(MobileLedgerProfile profile) { + if (this.profile == null) { + if (profile == null) + return; + } + else { + if (this.profile.equals(profile)) + return; + } + + boolean haveProfile = profile != null; + + if (haveProfile) + setTitle(profile.getName()); + else + setTitle(R.string.app_name); - if (profile == null) throw new AssertionError("profile must have a value"); + mainModel.setProfile(profile); - Data.setCurrentProfile(profile); + this.profile = profile; + + int newProfileTheme = haveProfile ? profile.getThemeHue() : -1; + if (newProfileTheme != Colors.profileThemeId) { + Logger.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; + } + + findViewById(R.id.no_profiles_layout).setVisibility(haveProfile ? View.GONE : View.VISIBLE); + findViewById(R.id.pager_layout).setVisibility(haveProfile ? View.VISIBLE : View.VISIBLE); + + mProfileListAdapter.notifyDataSetChanged(); + + mainModel.clearAccounts(); + mainModel.clearTransactions(); + + if (haveProfile) { + mainModel.scheduleAccountListReload(); + Logger.debug("transactions", "requesting list reload"); + mainModel.scheduleTransactionListReload(); + + if (profile.isPostingPermitted()) { + mToolbar.setSubtitle(null); + fab.show(); + } + else { + mToolbar.setSubtitle(R.string.profile_subtitle_read_only); + fab.hide(); + } + } + else { + mToolbar.setSubtitle(null); + fab.hide(); + } + + updateLastUpdateTextFromDB(); + } + private void profileThemeChanged() { + // un-hook all observed LiveData + Data.removeProfileObservers(this); + Data.profiles.removeObservers(this); + Data.lastUpdateTransactionCount.removeObservers(this); + Data.lastUpdateAccountCount.removeObservers(this); + Data.lastUpdateDate.removeObservers(this); + + recreate(); + } + 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); + } + intent.putExtras(args); + startActivity(intent, args); } 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); - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) { - item.setBackgroundColor(getResources().getColor(R.color.table_row_dark_bg, getTheme())); - } - else { - item.setBackgroundColor(getResources().getColor(R.color.table_row_dark_bg)); - } - - @ColorInt int transparent = getResources().getColor(android.R.color.transparent); + item.setBackgroundColor(Colors.tableRowDarkBG); LinearLayout actions = drawer.findViewById(R.id.nav_actions); for (int i = 0; i < actions.getChildCount(); i++) { View view = actions.getChildAt(i); if (view.getId() != id) { - view.setBackgroundColor(transparent); + view.setBackgroundColor(Color.TRANSPARENT); } } } @@ -250,44 +502,22 @@ public class MainActivity extends AppCompatActivity { } private void showAccountSummaryFragment() { mViewPager.setCurrentItem(0, true); - TransactionListFragment.accountFilter.set(null); -// FragmentTransaction ft = fragmentManager.beginTransaction(); -// accountSummaryFragment = new AccountSummaryFragment(); -// ft.replace(R.id.root_frame, accountSummaryFragment); -// ft.commit(); -// currentFragment = accountSummaryFragment; + mainModel.getAccountFilter() + .setValue(null); } public void onLatestTransactionsClicked(View view) { drawer.closeDrawers(); showTransactionsFragment(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()); + public void showTransactionsFragment(String accName) { + mainModel.getAccountFilter() + .setValue(accName); mViewPager.setCurrentItem(1, true); -// FragmentTransaction ft = fragmentManager.beginTransaction(); -// if (transactionListFragment == null) { -// Log.d("flow", "MainActivity creating TransactionListFragment"); -// transactionListFragment = new TransactionListFragment(); -// } -// Bundle bundle = new Bundle(); -// if (account != null) { -// bundle.putString(TransactionListFragment.BUNDLE_KEY_FILTER_ACCOUNT_NAME, -// account.getName()); -// } -// transactionListFragment.setArguments(bundle); -// ft.replace(R.id.root_frame, transactionListFragment); -// if (account != null) -// ft.addToBackStack(getResources().getString(R.string.title_activity_transaction_list)); -// ft.commit(); -// -// currentFragment = transactionListFragment; } - public void showAccountTransactions(LedgerAccount account) { - showTransactionsFragment(account); + public void showAccountTransactions(String accountName) { + mBackMeansToAccountList = true; + showTransactionsFragment(accountName); } @Override public void onBackPressed() { @@ -296,90 +526,161 @@ public class MainActivity extends AppCompatActivity { drawer.closeDrawer(GravityCompat.START); } else { - Log.d("fragments", - String.format("manager stack: %d", fragmentManager.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; - - Log.d("transactions", String.format("Last update = %d", last_update)); - if (last_update == 0) { - Data.lastUpdateDate.set(null); + if (mBackMeansToAccountList && (mViewPager.getCurrentItem() == 1)) { + mainModel.getAccountFilter() + .setValue(null); + showAccountSummaryFragment(); + mBackMeansToAccountList = false; } else { - Data.lastUpdateDate.set(new Date(last_update)); + Logger.debug("fragments", String.format(Locale.ENGLISH, "manager stack: %d", + getSupportFragmentManager().getBackStackEntryCount())); + + super.onBackPressed(); } } } - public void scheduleTransactionListRetrieval() { - if (Data.profile.get() == null) return; + public void updateLastUpdateTextFromDB() { + if (profile == null) + return; - retrieveTransactionsTask = new RetrieveTransactionsTask(new WeakReference<>(this)); + long lastUpdate = profile.getLongOption(MLDB.OPT_LAST_SCRAPE, 0L); + + Logger.debug("transactions", String.format(Locale.ENGLISH, "Last update = %d", lastUpdate)); + if (lastUpdate == 0) { + Data.lastUpdateDate.postValue(null); + } + else { + Data.lastUpdateDate.postValue(new Date(lastUpdate)); + } + + scheduleDataRetrievalIfStale(lastUpdate); - retrieveTransactionsTask.execute(); - bTransactionListCancelDownload.setEnabled(true); + } + private void refreshLastUpdateInfo() { + final int formatFlags = DateUtils.FORMAT_SHOW_DATE | DateUtils.FORMAT_SHOW_YEAR | + DateUtils.FORMAT_SHOW_TIME | DateUtils.FORMAT_NUMERIC_DATE; + String templateForTransactions = + getResources().getString(R.string.transaction_count_summary); + String templateForAccounts = getResources().getString(R.string.account_count_summary); + Integer accountCount = Data.lastUpdateAccountCount.getValue(); + Integer transactionCount = Data.lastUpdateTransactionCount.getValue(); + Date lastUpdate = Data.lastUpdateDate.getValue(); + if (lastUpdate == null) { + Data.lastTransactionsUpdateText.set("----"); + Data.lastAccountsUpdateText.set("----"); + } + else { + Data.lastTransactionsUpdateText.set( + String.format(Objects.requireNonNull(Data.locale.getValue()), + templateForTransactions, + transactionCount == null ? 0 : transactionCount, + DateUtils.formatDateTime(this, lastUpdate.getTime(), formatFlags))); + Data.lastAccountsUpdateText.set( + String.format(Objects.requireNonNull(Data.locale.getValue()), + templateForAccounts, accountCount == null ? 0 : accountCount, + DateUtils.formatDateTime(this, lastUpdate.getTime(), formatFlags))); + } } public void onStopTransactionRefreshClick(View view) { - Log.d("interactive", "Cancelling transactions refresh"); - if (retrieveTransactionsTask != null) retrieveTransactionsTask.cancel(false); + Logger.debug("interactive", "Cancelling transactions refresh"); + mainModel.stopTransactionsRetrieval(); bTransactionListCancelDownload.setEnabled(false); } - public void onRetrieveDone(String error) { - progressLayout.setVisibility(View.GONE); - - if (error == null) { - updateLastUpdateTextFromDB(); - - new RefreshDescriptionsTask().execute(); + public void onRetrieveRunningChanged(Boolean running) { + final View progressLayout = findViewById(R.id.transaction_progress_layout); + if (running) { + ProgressBar progressBar = findViewById(R.id.transaction_list_progress_bar); + bTransactionListCancelDownload.setEnabled(true); + 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); + } + else { + progressLayout.setVisibility(View.GONE); } - else Toast.makeText(this, error, Toast.LENGTH_LONG).show(); - } - public void onRetrieveStart() { - progressBar.setIndeterminate(true); - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) progressBar.setProgress(0, false); - else progressBar.setProgress(0); - progressLayout.setVisibility(View.VISIBLE); } public void onRetrieveProgress(RetrieveTransactionsTask.Progress progress) { - if ((progress.getTotal() == RetrieveTransactionsTask.Progress.INDETERMINATE) || - (progress.getTotal() == 0)) - { + ProgressBar progressBar = findViewById(R.id.transaction_list_progress_bar); + + if (progress.getState() == RetrieveTransactionsTask.ProgressState.FINISHED) { + Logger.debug("progress", "Done"); + findViewById(R.id.transaction_progress_layout).setVisibility(View.GONE); + + mainModel.transactionRetrievalDone(); + + if (progress.getError() != null) { + Snackbar.make(mViewPager, progress.getError(), Snackbar.LENGTH_LONG) + .show(); + return; + } + + return; + } + + + bTransactionListCancelDownload.setEnabled(true); +// ColorStateList csl = Colors.getColorStateList(); +// progressBar.setIndeterminateTintList(csl); +// progressBar.setProgressTintList(csl); +// 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); + + if (progress.isIndeterminate() || (progress.getTotal() <= 0)) { progressBar.setIndeterminate(true); + Logger.debug("progress", "indeterminate"); } else { - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) { - progressBar.setMin(0); + if (progressBar.isIndeterminate()) { + progressBar.setIndeterminate(false); } +// Logger.debug("progress", +// String.format(Locale.US, "%d/%d", progress.getProgress(), progress.getTotal +// ())); progressBar.setMax(progress.getTotal()); - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) { - progressBar.setProgress(progress.getProgress(), true); - } - else progressBar.setProgress(progress.getProgress()); - progressBar.setIndeterminate(false); + // for some reason animation doesn't work - no progress is shown (stick at 0) + // on lineageOS 14.1 (Nougat, 7.1.2) + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) + progressBar.setProgress(progress.getProgress(), false); + else + progressBar.setProgress(progress.getProgress()); } } - public void navProfilesClicked(View view) { - drawer.closeDrawers(); - Intent intent = new Intent(this, ProfileListActivity.class); - startActivity(intent); + public void fabShouldShow() { + if ((profile != null) && profile.isPostingPermitted() && !drawer.isOpen()) + fab.show(); + else + fabHide(); } - public class SectionsPagerAdapter extends FragmentPagerAdapter { + public void fabHide() { + fab.hide(); + } + + public static class SectionsPagerAdapter extends FragmentPagerAdapter { - public SectionsPagerAdapter(FragmentManager fm) { - super(fm); + SectionsPagerAdapter(FragmentManager fm) { + super(fm, BEHAVIOR_RESUME_ONLY_CURRENT_FRAGMENT); } + @NotNull @Override public Fragment getItem(int position) { - Log.d("main", String.format("Switching to fragment %d", position)); + Logger.debug("main", + String.format(Locale.ENGLISH, "Switching to fragment %d", position)); switch (position) { case 0: +// debug("flow", "Creating account summary fragment"); return new AccountSummaryFragment(); case 1: return new TransactionListFragment(); @@ -394,8 +695,4 @@ public class MainActivity extends AppCompatActivity { return 2; } } - public void fabShouldShow() { - MobileLedgerProfile profile = Data.profile.get(); - if (profile.isPostingPermitted()) fab.show(); - } }