X-Git-Url: https://git.ktnx.net/?a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fnet%2Fktnx%2Fmobileledger%2Fui%2Factivity%2FMainActivity.java;h=64d32be4797a45c16249ac77f9b49c8d93467f96;hb=73c4c4ca18b426795e582c1d6012f3893d80c8c9;hp=1e4b4460a505e2ac18a2ecdc97f9ad3ab990b0aa;hpb=64dd42bfbc26756163d78bd4028f84993c22b018;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 1e4b4460..64d32be4 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,230 +1,522 @@
/*
* Copyright © 2019 Damyan Ivanov.
- * This file is part of Mobile-Ledger.
- * Mobile-Ledger is free software: you can distribute it and/or modify it
+ * 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
* the Free Software Foundation, either version 3 of the License, or
* (at your opinion), any later version.
*
- * Mobile-Ledger is distributed in the hope that it will be useful,
+ * MoLe is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License terms for details.
*
* You should have received a copy of the GNU General Public License
- * along with Mobile-Ledger. If not, see .
+ * along with MoLe. If not, see .
*/
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;
+import android.content.res.ColorStateList;
+import android.graphics.Color;
+import android.graphics.drawable.Icon;
+import android.os.AsyncTask;
import android.os.Build;
import android.os.Bundle;
-import android.support.annotation.ColorInt;
-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.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.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 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.MLDB;
-import java.lang.ref.WeakReference;
+import org.jetbrains.annotations.NotNull;
+
import java.text.DateFormat;
+import java.util.ArrayList;
import java.util.Date;
+import java.util.List;
+import java.util.Locale;
-public class MainActivity extends AppCompatActivity {
+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 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;
@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));
-
- scheduleTransactionListRetrieval();
- }
+ mViewPager.setCurrentItem(mCurrentPage, false);
+ }
+ @Override
+ protected void onSaveInstanceState(@NotNull Bundle outState) {
+ super.onSaveInstanceState(outState);
+ outState.putInt(STATE_CURRENT_PAGE, mViewPager.getCurrentItem());
+ if (Data.accountFilter.getValue() != null)
+ outState.putString(STATE_ACC_FILTER, Data.accountFilter.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() {
+ 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()");
setContentView(R.layout.activity_main);
- Toolbar toolbar = findViewById(R.id.toolbar);
- setSupportActionBar(toolbar);
-
- Data.profile.addObserver((o, arg) -> {
- MobileLedgerProfile profile = Data.profile.get();
- runOnUiThread(() -> {
- if (profile == null) setTitle(R.string.app_name);
- else setTitle(profile.getName());
- updateLastUpdateTextFromDB();
- });
- });
+ 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);
+
+ Data.profile.observe(this, this::onProfileChanged);
+
+ Data.profiles.observe(this, this::onProfileListChanged);
+
+ if (barDrawerToggle == null) {
+ barDrawerToggle = new ActionBarDrawerToggle(this, drawer, mToolbar,
+ R.string.navigation_drawer_open, R.string.navigation_drawer_close);
+ drawer.addDrawerListener(barDrawerToggle);
+ }
+ barDrawerToggle.syncState();
TextView ver = drawer.findViewById(R.id.drawer_version_text);
try {
- PackageInfo pi =
- getApplicationContext().getPackageManager().getPackageInfo(getPackageName(), 0);
+ PackageInfo pi = getApplicationContext().getPackageManager()
+ .getPackageInfo(getPackageName(), 0);
ver.setText(pi.versionName);
}
catch (Exception e) {
e.printStackTrace();
}
- tvLastUpdate = findViewById(R.id.transactions_last_update);
+ markDrawerItemCurrent(R.id.nav_account_summary);
- 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);
-
- 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;
}
- });
+ Data.accountFilter.setValue(savedInstanceState.getString(STATE_ACC_FILTER, null));
+ }
+
+ Data.lastUpdateDate.observe(this, this::updateLastUpdateDisplay);
+
+ 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));
- 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);
+ 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());
- }
- @Override
- protected void onResume() {
- super.onResume();
+ 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 onDrawerClosed(View drawerView) {
+ super.onDrawerClosed(drawerView);
+ mProfileListAdapter.setAnimationsEnabled(false);
+ mProfileListAdapter.editingProfiles.setValue(false);
+ }
+ @Override
+ public void onDrawerOpened(View drawerView) {
+ super.onDrawerOpened(drawerView);
+ mProfileListAdapter.setAnimationsEnabled(true);
+ }
+ };
+ drawer.addDrawerListener(drawerListener);
+ }
setupProfile();
}
- 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(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));
+
+ Data.scheduleTransactionListRetrieval(this);
+ }
}
- private void setupProfile() {
- String profileUUID = MLDB.getOption(MLDB.OPT_PROFILE_UUID, null);
- MobileLedgerProfile profile;
+ private void createShortcuts(List list) {
+ if (Build.VERSION.SDK_INT < Build.VERSION_CODES.N_MR1)
+ return;
- profile = MobileLedgerProfile.loadAllFromDB(profileUUID);
+ 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;
+
+ 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++;
+ }
+ sm.setDynamicShortcuts(shortcuts);
+ }
+ 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.pager_layout).setVisibility(View.GONE);
+ return;
+ }
- if (Data.profiles.getList().isEmpty()) {
+ if (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);
return;
}
findViewById(R.id.pager_layout).setVisibility(View.VISIBLE);
findViewById(R.id.no_profiles_layout).setVisibility(View.GONE);
+ findViewById(R.id.loading_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()));
- if (profile == null) throw new AssertionError("profile must have a value");
+ debug("profiles", "profile list changed");
+ mProfileListAdapter.notifyDataSetChanged();
- Data.setCurrentProfile(profile);
+ createShortcuts(newList);
}
- 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);
+ /**
+ * called when the current profile has changed
+ */
+ private void onProfileChanged(MobileLedgerProfile profile) {
+ 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);
+
+ this.profile = profile;
+
+ mProfileListAdapter.notifyDataSetChanged();
+
+ 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 would restart the activity, so no need to reload the
+ // data sets below
+ return;
+ }
+
drawer.closeDrawers();
+
+ Data.transactions.clear();
+ debug("transactions", "requesting list reload");
+ TransactionListViewModel.scheduleTransactionListReload();
+
+ Data.accounts.clear();
+ AccountSummaryViewModel.scheduleAccountListReload();
+
+ if (haveProfile) {
+ 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();
}
- 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()));
+ private void updateLastUpdateDisplay(Date newValue) {
+ LinearLayout l = findViewById(R.id.transactions_last_update_layout);
+ TextView v = findViewById(R.id.transactions_last_update);
+ if (newValue == null) {
+ l.setVisibility(View.INVISIBLE);
+ debug("main", "no last update date :(");
}
else {
- item.setBackgroundColor(getResources().getColor(R.color.table_row_dark_bg));
+ 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.getThemeHue());
+
+ // restart activity to reflect theme change
+ finish();
+
+ // un-hook all observed LiveData
+ Data.profile.removeObservers(this);
+ Data.profiles.removeObservers(this);
+ Data.lastUpdateDate.removeObservers(this);
+ 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);
}
+ intent.putExtras(args);
+ startActivity(intent, args);
+ }
+ private void setupProfile() {
+ MLDB.getOption(MLDB.OPT_PROFILE_UUID, null, new GetOptCallback() {
+ @Override
+ protected void onResult(String profileUUID) {
+ MobileLedgerProfile startupProfile;
- @ColorInt int transparent = getResources().getColor(android.R.color.transparent);
+ 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_up, R.anim.dummy);
+ }
+ public void markDrawerItemCurrent(int id) {
+ TextView item = drawer.findViewById(id);
+ 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);
}
}
}
@@ -235,43 +527,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;
+ Data.accountFilter.setValue(null);
}
public void onLatestTransactionsClicked(View view) {
drawer.closeDrawers();
- showTransactionsFragment(null);
+ showTransactionsFragment((String) null);
}
- private void resetFragmentBackStack() {
-// fragmentManager.popBackStack(0, FragmentManager.POP_BACK_STACK_INCLUSIVE);
+ private void showTransactionsFragment(String accName) {
+ Data.accountFilter.setValue(accName);
+ mViewPager.setCurrentItem(1, true);
}
private void showTransactionsFragment(LedgerAccount account) {
- if (account != null) TransactionListFragment.accountFilter.set(account.getName());
- 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;
+ showTransactionsFragment((account == null) ? null : account.getName());
}
public void showAccountTransactions(LedgerAccount account) {
+ mBackMeansToAccountList = true;
showTransactionsFragment(account);
}
@Override
@@ -281,57 +552,67 @@ 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)) {
+ Data.accountFilter.setValue(null);
+ showAccountSummaryFragment();
+ mBackMeansToAccountList = false;
}
else {
- Data.lastUpdateDate.set(new Date(last_update));
+ 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 last_update = profile.getLongOption(MLDB.OPT_LAST_SCRAPE, 0L);
- retrieveTransactionsTask.execute();
- bTransactionListCancelDownload.setEnabled(true);
+ debug("transactions", String.format(Locale.ENGLISH, "Last update = %d", last_update));
+ if (last_update == 0) {
+ Data.lastUpdateDate.postValue(null);
+ }
+ else {
+ Data.lastUpdateDate.postValue(new Date(last_update));
+ }
}
public void onStopTransactionRefreshClick(View view) {
- Log.d("interactive", "Cancelling transactions refresh");
- if (retrieveTransactionsTask != null) retrieveTransactionsTask.cancel(false);
+ debug("interactive", "Cancelling transactions refresh");
+ 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();
- new RefreshDescriptionsTask().execute();
+ new RefreshDescriptionsTask().executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
+ TransactionListViewModel.scheduleTransactionListReload();
}
- else Toast.makeText(this, error, Toast.LENGTH_LONG).show();
+ else
+ Toast.makeText(this, error, Toast.LENGTH_LONG)
+ .show();
}
public void onRetrieveStart() {
+ 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);
+ 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))
{
@@ -345,27 +626,130 @@ public class MainActivity extends AppCompatActivity {
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 navProfilesClicked(View view) {
- drawer.closeDrawers();
- Intent intent = new Intent(this, ProfileListActivity.class);
- startActivity(intent);
+ public void fabShouldShow() {
+ if ((profile != null) && profile.isPostingPermitted())
+ fab.show();
}
+ 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 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 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));
+ debug("main", String.format(Locale.ENGLISH, "Switching to fragment %d", position));
switch (position) {
case 0:
- return new AccountSummaryFragment();
+// debug("flow", "Creating account summary fragment");
+ return mAccountSummaryFragment = new AccountSummaryFragment();
case 1:
return new TransactionListFragment();
default:
@@ -379,5 +763,4 @@ public class MainActivity extends AppCompatActivity {
return 2;
}
}
-
}