/*
- * 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
import android.os.Bundle;
import android.util.Log;
import android.view.View;
-import android.view.ViewGroup;
-import android.view.ViewPropertyAnimator;
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.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;
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.account_summary.AccountSummaryAdapter;
import net.ktnx.mobileledger.ui.account_summary.AccountSummaryFragment;
-import net.ktnx.mobileledger.ui.account_summary.AccountSummaryViewModel;
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.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.Logger;
import net.ktnx.mobileledger.utils.MLDB;
import org.jetbrains.annotations.NotNull;
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 View profileListHeadMore, profileListHeadCancel, profileListHeadAddProfile;
private View bTransactionListCancelDownload;
protected void onStart() {
super.onStart();
+ Logger.debug("MainActivity", "onStart()");
+
mViewPager.setCurrentItem(mCurrentPage, false);
}
@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);
+ 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;
super.onDestroy();
}
protected void setupProfileColors() {
SharedPreferences prefs = getPreferences(MODE_PRIVATE);
int profileColor = prefs.getInt(PREF_THEME_ID, -2);
- if (profileColor == -2) profileColor = Data.retrieveCurrentThemeIdFromDb();
+ if (profileColor == -2)
+ profileColor = Data.retrieveCurrentThemeIdFromDb();
Colors.setupTheme(this, profileColor);
Colors.profileThemeId = profileColor;
storeThemeIdInPrefs(profileColor);
}
@Override
protected void onCreate(Bundle savedInstanceState) {
+ debug("MainActivity", "onCreate()/entry");
super.onCreate(savedInstanceState);
- debug("flow", "MainActivity.onCreate()");
+ debug("MainActivity", "onCreate()/after super");
setContentView(R.layout.activity_main);
fab = findViewById(R.id.btn_add_transaction);
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);
- Data.profile.observe(this, this::onProfileChanged);
+ Data.observeProfile(this, this::onProfileChanged);
Data.profiles.observe(this, this::onProfileListChanged);
}
barDrawerToggle.syncState();
- 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();
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);
mProfileListAdapter.editingProfiles.observe(this, newValue -> {
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 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);
}
- setupProfile();
+
+ Data.drawerOpen.observe(this, open -> {
+ if (open)
+ drawer.open();
+ else
+ drawer.close();
+ });
}
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(Locale.ENGLISH,
- "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));
Data.scheduleTransactionListRetrieval(this);
}
}
private void createShortcuts(List<MobileLedgerProfile> list) {
- if (Build.VERSION.SDK_INT < Build.VERSION_CODES.N_MR1) return;
+ if (Build.VERSION.SDK_INT < Build.VERSION_CODES.N_MR1)
+ return;
+ ShortcutManager sm = getSystemService(ShortcutManager.class);
List<ShortcutInfo> shortcuts = new ArrayList<>();
int i = 0;
for (MobileLedgerProfile p : list) {
- 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();
+ 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++;
}
- ShortcutManager sm = getSystemService(ShortcutManager.class);
sm.setDynamicShortcuts(shortcuts);
}
private void onProfileListChanged(List<MobileLedgerProfile> 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.pager_layout).setVisibility(View.GONE);
- return;
- }
-
- if (newList.isEmpty()) {
+ 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.loading_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);
- findViewById(R.id.loading_layout).setVisibility(View.GONE);
findViewById(R.id.nav_profile_list).setMinimumHeight(
(int) (getResources().getDimension(R.dimen.thumb_row_height) * newList.size()));
* 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;
- findViewById(R.id.no_profiles_layout).setVisibility(haveProfile ? View.GONE : View.VISIBLE);
- findViewById(R.id.pager_layout).setVisibility(haveProfile ? View.VISIBLE : View.VISIBLE);
- if (haveProfile) setTitle(profile.getName());
- else setTitle(R.string.app_name);
+ if (haveProfile)
+ setTitle(profile.getName());
+ else
+ setTitle(R.string.app_name);
- this.profile = profile;
+ if (this.profile != null)
+ this.profile.getDisplayedAccounts()
+ .removeObservers(this);
- mProfileListAdapter.notifyDataSetChanged();
+ this.profile = profile;
- int newProfileTheme = haveProfile ? profile.getThemeId() : -1;
+ int newProfileTheme = haveProfile ? profile.getThemeHue() : -1;
if (newProfileTheme != Colors.profileThemeId) {
debug("profiles",
String.format(Locale.ENGLISH, "profile theme %d → %d", Colors.profileThemeId,
newProfileTheme));
- MainActivity.this.profileThemeChanged();
Colors.profileThemeId = newProfileTheme;
+ profileThemeChanged();
// 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);
+
+ mProfileListAdapter.notifyDataSetChanged();
Data.transactions.clear();
debug("transactions", "requesting list reload");
TransactionListViewModel.scheduleTransactionListReload();
- Data.accounts.clear();
- AccountSummaryViewModel.scheduleAccountListReload();
-
if (haveProfile) {
+ profile.scheduleAccountListReload();
+
if (profile.isPostingPermitted()) {
mToolbar.setSubtitle(null);
fab.show();
}
else {
- mToolbar.setSubtitle(R.string.profile_subitlte_read_only);
+ mToolbar.setSubtitle(R.string.profile_subtitle_read_only);
fab.hide();
}
}
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));
scheduleDataRetrievalIfStale(newValue);
}
private void profileThemeChanged() {
- Bundle bundle = new Bundle();
- onSaveInstanceState(bundle);
-
- storeThemeIdInPrefs(profile.getThemeId());
-
- // restart activity to reflect theme change
- finish();
+ storeThemeIdInPrefs(profile.getThemeHue());
// un-hook all observed LiveData
- Data.profile.removeObservers(this);
+ Data.removeProfileObservers(this);
Data.profiles.removeObservers(this);
Data.lastUpdateDate.removeObservers(this);
- Intent intent = new Intent(this, this.getClass());
- intent.putExtra(BUNDLE_SAVED_STATE, bundle);
- startActivity(intent);
+
+ recreate();
}
private void storeThemeIdInPrefs(int themeId) {
// store the new theme id in the preferences
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);
startActivity(intent);
overridePendingTransition(R.anim.slide_in_up, R.anim.dummy);
}
- public void navSettingsClicked(View view) {
- Intent intent = new Intent(this, SettingsActivity.class);
- startActivity(intent);
- drawer.closeDrawers();
- }
public void markDrawerItemCurrent(int id) {
TextView item = drawer.findViewById(id);
item.setBackgroundColor(Colors.tableRowDarkBG);
public void onLatestTransactionsClicked(View view) {
drawer.closeDrawers();
- showTransactionsFragment((String) null);
+ showTransactionsFragment(null);
}
- private void showTransactionsFragment(String accName) {
+ public void showTransactionsFragment(String accName) {
Data.accountFilter.setValue(accName);
mViewPager.setCurrentItem(1, true);
}
- private void showTransactionsFragment(LedgerAccount account) {
- showTransactionsFragment((account == null) ? null : account.getName());
- }
- public void showAccountTransactions(LedgerAccount account) {
+ public void showAccountTransactions(String accountName) {
mBackMeansToAccountList = true;
- showTransactionsFragment(account);
+ showTransactionsFragment(accountName);
}
@Override
public void onBackPressed() {
}
}
public void updateLastUpdateTextFromDB() {
- if (profile == null) return;
+ if (profile == null)
+ return;
long last_update = profile.getLongOption(MLDB.OPT_LAST_SCRAPE, 0L);
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);
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);
+ 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) {
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() {
- if ((profile != null) && profile.isPostingPermitted()) fab.show();
+ if ((profile != null) && profile.isPostingPermitted() && !drawer.isOpen())
+ fab.show();
+ else
+ fabHide();
}
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();
-
- LedgerAccount acc = (LedgerAccount) row.getTag();
- switch (view.getId()) {
- case R.id.account_row_acc_name:
- case R.id.account_expander:
- case R.id.account_expander_container:
- debug("accounts", "Account expander clicked");
- if (!acc.hasSubAccounts()) return;
-
- boolean wasExpanded = acc.isExpanded();
-
- View arrow = row.findViewById(R.id.account_expander_container);
-
- arrow.clearAnimation();
- ViewPropertyAnimator animator = arrow.animate();
-
- acc.toggleExpanded();
- DbOpQueue.add("update accounts set expanded=? where name=? and profile=?",
- new Object[]{acc.isExpanded(), acc.getName(), profile.getUuid()
- });
-
- if (wasExpanded) {
- debug("accounts", String.format("Collapsing account '%s'", acc.getName()));
- arrow.setRotation(0);
- animator.rotationBy(180);
-
- // removing all child accounts from the view
- int start = -1, count = 0;
- 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",
-// Data.accounts.get(i).getName(), i));
- if (start == -1) {
- start = i;
- }
- count++;
- }
- else {
- if (start != -1) {
-// debug("accounts",
-// String.format("Found a non-child '%s' at position %d",
-// Data.accounts.get(i).getName(), i));
- break;
- }
- }
- }
-
- if (start != -1) {
- for (int j = 0; j < count; j++) {
-// debug("accounts", String.format("Removing item %d: %s", start + j,
-// Data.accounts.get(start).getName()));
- Data.accounts.removeQuietly(start);
- }
-
- mAccountSummaryFragment.modelAdapter
- .notifyItemRangeRemoved(start, count);
- }
- }
- }
- else {
- debug("accounts", String.format("Expanding account '%s'", acc.getName()));
- arrow.setRotation(180);
- animator.rotationBy(-180);
- List<LedgerAccount> 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());
- }
- }
- }
- break;
- 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(),
- profile.getUuid()
- });
- Data.accounts.triggerItemChangedNotification(acc);
- }
- break;
- }
- }
- public class SectionsPagerAdapter extends FragmentPagerAdapter {
+ public static class SectionsPagerAdapter extends FragmentPagerAdapter {
SectionsPagerAdapter(FragmentManager fm) {
- super(fm);
+ super(fm, BEHAVIOR_RESUME_ONLY_CURRENT_FRAGMENT);
}
@NotNull
switch (position) {
case 0:
// debug("flow", "Creating account summary fragment");
- return mAccountSummaryFragment = new AccountSummaryFragment();
+ return new AccountSummaryFragment();
case 1:
return new TransactionListFragment();
default: