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 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.Observable;
+import java.util.Locale;
import java.util.Observer;
import androidx.appcompat.app.ActionBarDrawerToggle;
import androidx.recyclerview.widget.RecyclerView;
import androidx.viewpager.widget.ViewPager;
+import static net.ktnx.mobileledger.utils.Logger.debug;
+
public class MainActivity extends ProfileThemedActivity {
- private static final String STATE_CURRENT_PAGE = "current_page";
- private static final String BUNDLE_SAVED_STATE = "bundle_savedState";
+ 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 LinearLayout profileListHeadMoreAndCancel;
private FragmentManager fragmentManager;
- private TextView tvLastUpdate;
- private RetrieveTransactionsTask retrieveTransactionsTask;
private View bTransactionListCancelDownload;
private ProgressBar progressBar;
private LinearLayout progressLayout;
private SectionsPagerAdapter mSectionsPagerAdapter;
private ViewPager mViewPager;
private FloatingActionButton fab;
- private boolean profileModificationEnabled = false;
private boolean profileListExpanded = false;
private ProfilesRecyclerViewAdapter mProfileListAdapter;
+ private int mCurrentPage;
+ private String mAccountFilter;
+ private boolean mBackMeansToAccountList = false;
+ 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();
- setupProfile();
-
- 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));
+ debug("flow", "MainActivity.onStart()");
+ mViewPager.setCurrentItem(mCurrentPage, false);
+ if (mAccountFilter != null) showTransactionsFragment(mAccountFilter);
+ else Data.accountFilter.setValue(null);
- scheduleTransactionListRetrieval();
- }
}
@Override
- protected void onSaveInstanceState(Bundle outState) {
+ 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);
+ }
+ @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;
+ 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 onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
-
+ debug("flow", "MainActivity.onCreate()");
setContentView(R.layout.activity_main);
fab = findViewById(R.id.btn_add_transaction);
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);
drawer = findViewById(R.id.drawer_layout);
- tvLastUpdate = findViewById(R.id.transactions_last_update);
bTransactionListCancelDownload = findViewById(R.id.transaction_list_cancel_download);
progressBar = findViewById(R.id.transaction_list_progress_bar);
progressLayout = findViewById(R.id.transaction_progress_layout);
if (extra != null && savedInstanceState == null) savedInstanceState = extra;
- Toolbar toolbar = findViewById(R.id.toolbar);
- setSupportActionBar(toolbar);
+ mToolbar = findViewById(R.id.toolbar);
+ setSupportActionBar(mToolbar);
- 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();
- }
+ Data.profile.observe(this, this::onProfileChanged);
- int newProfileTheme = profile.getThemeId();
- if (newProfileTheme != Colors.profileThemeId) {
- Log.d("profiles", String.format("profile theme %d → %d", Colors.profileThemeId,
- newProfileTheme));
- profileThemeChanged();
- Colors.profileThemeId = newProfileTheme;
- }
- });
- });
- Data.profiles.addObserver((o, arg) -> {
- findViewById(R.id.nav_profile_list).setMinimumHeight(
- (int) (getResources().getDimension(R.dimen.thumb_row_height) *
- Data.profiles.size()));
- mProfileListAdapter.notifyDataSetChanged();
- });
+ Data.profiles.observe(this, this::onProfileListChanged);
- ActionBarDrawerToggle toggle =
- new ActionBarDrawerToggle(this, drawer, toolbar, R.string.navigation_drawer_open,
- R.string.navigation_drawer_close);
- drawer.addDrawerListener(toggle);
- toggle.syncState();
+ 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);
markDrawerItemCurrent(R.id.nav_account_summary);
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));
- }
- super.onPageSelected(position);
- }
- });
+ if (pageChangeListener == null) {
+ pageChangeListener = 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));
+ }
+ super.onPageSelected(position);
+ }
+ };
+ mViewPager.addOnPageChangeListener(pageChangeListener);
+ }
+
+ mCurrentPage = 0;
if (savedInstanceState != null) {
int currentPage = savedInstanceState.getInt(STATE_CURRENT_PAGE, -1);
if (currentPage != -1) {
- mViewPager.setCurrentItem(currentPage, false);
+ mCurrentPage = currentPage;
}
+ mAccountFilter = savedInstanceState.getString(STATE_ACC_FILTER, null);
}
+ else mAccountFilter = null;
- Data.lastUpdateDate.addObserver((o, arg) -> {
- Log.d("main", "lastUpdateDate changed");
- runOnUiThread(this::updateLastUpdateDisplay);
- });
-
- updateLastUpdateDisplay();
+ Data.lastUpdateDate.observe(this, this::updateLastUpdateDisplay);
findViewById(R.id.btn_no_profiles_add)
.setOnClickListener(v -> startEditProfileActivity(null));
if (root == null)
throw new RuntimeException("Can't get hold on the transaction value view");
- mProfileListAdapter = new ProfilesRecyclerViewAdapter();
+ if (mProfileListAdapter == null) mProfileListAdapter = new ProfilesRecyclerViewAdapter();
root.setAdapter(mProfileListAdapter);
- mProfileListAdapter.addEditingProfilesObserver(new Observer() {
- @Override
- public void update(Observable o, Object arg) {
+ 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));
}
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);
- profileListHeadMore
- .setVisibility(profileListExpanded ? View.VISIBLE : View.GONE);
+ if (profileListExpanded) {
+ profileListHeadMore.setVisibility(View.VISIBLE);
+ profileListHeadMore
+ .startAnimation(AnimationUtils.loadAnimation(this, R.anim.fade_in));
+ }
+ else profileListHeadMore.setVisibility(View.GONE);
}
- }
- });
+ };
+ mProfileListAdapter.addEditingProfilesObserver(editingProfilesObserver);
+ }
LinearLayoutManager llm = new LinearLayoutManager(this);
profileListHeadMoreAndCancel
.setOnClickListener((v) -> mProfileListAdapter.flipEditingProfiles());
- drawer.addDrawerListener(new DrawerLayout.SimpleDrawerListener() {
- @Override
- public void onDrawerClosed(View drawerView) {
- super.onDrawerClosed(drawerView);
- collapseProfileList();
+ if (drawerListener == null) {
+ drawerListener = new DrawerLayout.SimpleDrawerListener() {
+ @Override
+ public void onDrawerClosed(View drawerView) {
+ super.onDrawerClosed(drawerView);
+ collapseProfileList();
+ }
+ };
+ drawer.addDrawerListener(drawerListener);
+ }
+
+ findViewById(R.id.nav_profile_list_head_layout)
+ .setOnClickListener(this::navProfilesHeadClicked);
+ findViewById(R.id.nav_profiles_label).setOnClickListener(this::navProfilesHeadClicked);
+ setupProfile();
+ }
+ 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 createShortcuts(List<MobileLedgerProfile> list) {
+ if (Build.VERSION.SDK_INT < Build.VERSION_CODES.O) return;
+
+ 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();
+ 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()) {
+ 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);
+
+ findViewById(R.id.nav_profile_list).setMinimumHeight(
+ (int) (getResources().getDimension(R.dimen.thumb_row_height) * newList.size()));
+
+ debug("profiles", "profile list changed");
+ mProfileListAdapter.notifyDataSetChanged();
+
+ createShortcuts(newList);
+ }
+ /**
+ * 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.getThemeId() : -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;
+ }
+ collapseProfileList();
+
+ 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_subitlte_read_only);
+ fab.hide();
+ }
+ }
+ else {
+ mToolbar.setSubtitle(null);
+ fab.hide();
+ }
+
+ updateLastUpdateTextFromDB();
}
- private void updateLastUpdateDisplay() {
+ private void updateLastUpdateDisplay(Date newValue) {
+ LinearLayout l = findViewById(R.id.transactions_last_update_layout);
TextView v = findViewById(R.id.transactions_last_update);
- Date date = Data.lastUpdateDate.get();
- if (date == null) {
- v.setText(R.string.transaction_last_update_never);
- Log.d("main", "no last update date :(");
+ if (newValue == null) {
+ l.setVisibility(View.INVISIBLE);
+ debug("main", "no last update date :(");
}
else {
- final String text = DateFormat.getDateTimeInstance().format(date);
+ final String text = DateFormat.getDateTimeInstance().format(newValue);
v.setText(text);
- Log.d("main", String.format("Date formatted: %s", text));
+ l.setVisibility(View.VISIBLE);
+ debug("main", String.format("Date formatted: %s", text));
}
+
+ scheduleDataRetrievalIfStale(newValue);
}
private void profileThemeChanged() {
- setupProfileColors();
-
Bundle bundle = new Bundle();
onSaveInstanceState(bundle);
+
+ storeThemeIdInPrefs(profile.getThemeId());
+
// 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();
startActivity(intent, args);
}
private void setupProfile() {
- String profileUUID = MLDB.getOption(MLDB.OPT_PROFILE_UUID, null);
- MobileLedgerProfile profile;
-
- profile = MobileLedgerProfile.loadAllFromDB(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");
+ MLDB.getOption(MLDB.OPT_PROFILE_UUID, null, new GetOptCallback() {
+ @Override
+ protected void onResult(String profileUUID) {
+ MobileLedgerProfile startupProfile;
- Data.setCurrentProfile(profile);
+ startupProfile = Data.getProfile(profileUUID);
+ Data.setCurrentProfile(startupProfile);
+ }
+ });
}
public void fabNewTransactionClicked(View view) {
Intent intent = new Intent(this, NewTransactionActivity.class);
}
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
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",
+ fragmentManager.getBackStackEntryCount()));
+
+ super.onBackPressed();
}
}
}
- public void scheduleTransactionListRetrieval() {
- if (Data.profile.get() == null) return;
-
- retrieveTransactionsTask = new RetrieveTransactionsTask(new WeakReference<>(this));
+ public void updateLastUpdateTextFromDB() {
+ long last_update = (profile != null) ? profile.getLongOption(MLDB.OPT_LAST_SCRAPE, 0L) : 0;
- retrieveTransactionsTask.execute();
+ 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) {
+ Data.transactionRetrievalDone();
progressLayout.setVisibility(View.GONE);
if (error == null) {
}
}
public void fabShouldShow() {
- MobileLedgerProfile profile = Data.profile.get();
if ((profile != null) && profile.isPostingPermitted()) fab.show();
}
+ public void fabHide() {
+ fab.hide();
+ }
public void navProfilesHeadClicked(View view) {
if (profileListExpanded) {
collapseProfileList();
profileListHeadArrow.startAnimation(AnimationUtils.loadAnimation(this, R.anim.rotate_180));
profileListHeadMore.setVisibility(View.VISIBLE);
profileListHeadMore.startAnimation(AnimationUtils.loadAnimation(this, R.anim.fade_in));
+ final ArrayList<MobileLedgerProfile> profiles = Data.profiles.getValue();
findViewById(R.id.nav_profile_list).setMinimumHeight(
(int) (getResources().getDimension(R.dimen.thumb_row_height) *
- Data.profiles.size()));
+ (profiles != null ? profiles.size() : 0)));
}
private void collapseProfileList() {
+ boolean wasExpanded = profileListExpanded;
profileListExpanded = false;
- final Animation animation = AnimationUtils.loadAnimation(this, R.anim.slide_up);
- animation.setAnimationListener(new Animation.AnimationListener() {
- @Override
- public void onAnimationStart(Animation animation) {
+ 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();
+ }
+ @Override
+ public void onAnimationEnd(Animation animation) {
+ profileListContainer.setVisibility(View.GONE);
+ }
+ @Override
+ public void onAnimationRepeat(Animation animation) {
- profileListContainer.startAnimation(animation);
- profileListHeadArrow.setRotation(0f);
- profileListHeadArrow
- .startAnimation(AnimationUtils.loadAnimation(this, R.anim.rotate_180_back));
- profileListHeadMore.setVisibility(View.GONE);
- }
- public void onProfileRowClicked(View v) {
- Data.setCurrentProfile((MobileLedgerProfile) v.getTag());
- }
- public void enableProfileModifications() {
- profileModificationEnabled = true;
- ViewGroup profileList = findViewById(R.id.nav_profile_list);
- for (int i = 0; i < profileList.getChildCount(); i++) {
- View aRow = profileList.getChildAt(i);
- aRow.findViewById(R.id.profile_list_edit_button).setVisibility(View.VISIBLE);
- aRow.findViewById(R.id.profile_list_rearrange_handle).setVisibility(View.VISIBLE);
+ }
+ });
+ 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);
}
- // FIXME enable rearranging
-
- }
- public void disableProfileModifications() {
- profileModificationEnabled = false;
- ViewGroup profileList = findViewById(R.id.nav_profile_list);
- for (int i = 0; i < profileList.getChildCount(); i++) {
- View aRow = profileList.getChildAt(i);
- aRow.findViewById(R.id.profile_list_edit_button).setVisibility(View.GONE);
- aRow.findViewById(R.id.profile_list_rearrange_handle).setVisibility(View.INVISIBLE);
+ else {
+ profileListContainer.setVisibility(View.GONE);
+ profileListHeadArrow.setRotation(0f);
+ profileListHeadMore.setVisibility(View.GONE);
}
- // FIXME disable rearranging
-
}
public void onAccountSummaryRowViewClicked(View view) {
- ViewGroup row = (ViewGroup) view.getParent();
+ 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:
- Log.d("accounts", "Account expander clicked");
+ debug("accounts", "Account expander clicked");
if (!acc.hasSubAccounts()) return;
boolean wasExpanded = acc.isExpanded();
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) {
- Log.d("accounts", String.format("Collapsing account '%s'", acc.getName()));
+ 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))) {
-// Log.d("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;
}
else {
if (start != -1) {
-// Log.d("accounts",
+// 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++) {
-// Log.d("accounts", String.format("Removing item %d: %s", start + 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 {
- Log.d("accounts", String.format("Expanding account '%s'", acc.getName()));
+ debug("accounts", String.format("Expanding account '%s'", acc.getName()));
arrow.setRotation(180);
animator.rotationBy(-180);
- List<LedgerAccount> children =
- Data.profile.get().loadVisibleChildAccountsOf(acc);
+ 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
mAccountSummaryFragment.modelAdapter
.notifyItemRangeInserted(parentPos + 1, children.size());
}
+ }
}
break;
case R.id.account_row_acc_amounts:
- showAccountTransactions(acc);
+ 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) {
+ SectionsPagerAdapter(FragmentManager fm) {
super(fm);
}
+ @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:
-// Log.d("flow", "Creating account summary fragment");
+// debug("flow", "Creating account summary fragment");
return mAccountSummaryFragment = new AccountSummaryFragment();
case 1:
return new TransactionListFragment();
projects / mobile-ledger.git / blobdiff