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.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.LockHolder;
import net.ktnx.mobileledger.utils.MLDB;
import java.lang.ref.WeakReference;
import java.text.DateFormat;
-import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.Observable;
import androidx.viewpager.widget.ViewPager;
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";
public AccountSummaryFragment mAccountSummaryFragment;
DrawerLayout drawer;
private LinearLayout profileListContainer;
private boolean profileModificationEnabled = false;
private boolean profileListExpanded = false;
private ProfilesRecyclerViewAdapter mProfileListAdapter;
+ private int mCurrentPage;
+ private String mAccountFilter;
@Override
protected void onStart() {
super.onStart();
scheduleTransactionListRetrieval();
}
+
+ mViewPager.setCurrentItem(mCurrentPage, false);
+ if (mAccountFilter != null) showTransactionsFragment(mAccountFilter);
+
}
@Override
protected void onSaveInstanceState(Bundle outState) {
super.onSaveInstanceState(outState);
outState.putInt(STATE_CURRENT_PAGE, mViewPager.getCurrentItem());
+ if (TransactionListFragment.accountFilter.get() != null)
+ outState.putString(STATE_ACC_FILTER, TransactionListFragment.accountFilter.get());
}
@Override
protected void onCreate(Bundle savedInstanceState) {
}
});
});
+ 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();
+ });
ActionBarDrawerToggle toggle =
new ActionBarDrawerToggle(this, drawer, toolbar, R.string.navigation_drawer_open,
}
});
+ 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);
}
Data.lastUpdateDate.addObserver((o, arg) -> {
profile = MobileLedgerProfile.loadAllFromDB(profileUUID);
- if (Data.profiles.getList().isEmpty()) {
+ if (Data.profiles.isEmpty()) {
findViewById(R.id.no_profiles_layout).setVisibility(View.VISIBLE);
findViewById(R.id.pager_layout).setVisibility(View.GONE);
return;
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(LedgerAccount account) {
- if (account != null) TransactionListFragment.accountFilter.set(account.getName());
+ private void showTransactionsFragment(String accName) {
+ TransactionListFragment.accountFilter.set(accName);
+ TransactionListFragment.accountFilter.notifyObservers();
mViewPager.setCurrentItem(1, true);
+ }
+ private void showTransactionsFragment(LedgerAccount account) {
+ showTransactionsFragment((account == null) ? (String) null : account.getName());
// FragmentTransaction ft = fragmentManager.beginTransaction();
// if (transactionListFragment == null) {
// Log.d("flow", "MainActivity creating TransactionListFragment");
}
public void onAccountSummaryRowViewClicked(View view) {
ViewGroup row = (ViewGroup) view.getParent();
- if (view.getId() == R.id.account_expander_container) {
- Log.d("accounts", "Account expander clicked");
- LedgerAccount acc = (LedgerAccount) row.getTag();
- if (!acc.hasSubAccounts()) return;
-
- boolean wasExpanded = acc.isExpanded();
-
- view.clearAnimation();
- ViewPropertyAnimator animator = view.animate();
-
- acc.toggleExpanded();
- Data.profile.get().storeAccount(MLDB.getWritableDatabase(), acc);
-
- if (wasExpanded) {
- Log.d("accounts", String.format("Collapsing account '%s'", acc.getName()));
- view.setRotation(0);
- animator.rotationBy(180);
-
- // removing all child accounts from the view
- int start = -1, count = 0;
- int i = 0;
- final ArrayList<LedgerAccount> accountList = Data.accounts.get();
- for (LedgerAccount a : accountList) {
- if (acc.isParentOf(a)) {
- if (start == -1) {
- start = i;
+ LedgerAccount acc = (LedgerAccount) row.getTag();
+ switch (view.getId()) {
+ case R.id.account_row_acc_name:
+ case R.id.account_expander_container:
+ Log.d("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(), Data.profile.get().getUuid()
+ });
+
+ if (wasExpanded) {
+ Log.d("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 lh = 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",
+// Data.accounts.get(i).getName(), i));
+ if (start == -1) {
+ start = i;
+ }
+ count++;
+ }
+ else {
+ if (start != -1) {
+// Log.d("accounts",
+// String.format("Found a non-child '%s' at position %d",
+// Data.accounts.get(i).getName(), i));
+ break;
+ }
+ }
}
- count++;
- }
- else {
+
if (start != -1) {
- break;
+ for (int j = 0; j < count; j++) {
+// Log.d("accounts", String.format("Removing item %d: %s", start + j,
+// Data.accounts.get(start).getName()));
+ Data.accounts.removeQuietly(start);
+ }
+
+ mAccountSummaryFragment.modelAdapter
+ .notifyItemRangeRemoved(start, count);
}
}
- i++;
}
-
- if (start != -1) {
- for (int j = 0; j < count; j++) {
- Log.d("accounts", String.format("Removing item %d: %s", start + j,
- accountList.get(start).getName()));
- accountList.remove(start);
+ else {
+ Log.d("accounts", String.format("Expanding account '%s'", acc.getName()));
+ arrow.setRotation(180);
+ animator.rotationBy(-180);
+ List<LedgerAccount> children =
+ Data.profile.get().loadVisibleChildAccountsOf(acc);
+ try (LockHolder lh = Data.accounts.lockForWriting()) {
+ int parentPos = Data.accounts.indexOf(acc);
+ if (parentPos != -1) {
+ // may have disappeared in a concurrent refresh operation
+ Data.accounts.addAllQuietly(parentPos + 1, children);
+ mAccountSummaryFragment.modelAdapter
+ .notifyItemRangeInserted(parentPos + 1, children.size());
+ }
}
-
- mAccountSummaryFragment.modelAdapter.notifyItemRangeRemoved(start, count);
}
- }
- else {
- Log.d("accounts", String.format("Expanding account '%s'", acc.getName()));
- view.setRotation(180);
- animator.rotationBy(-180);
- ArrayList<LedgerAccount> accounts = Data.accounts.get();
- List<LedgerAccount> children = Data.profile.get().loadVisibleChildAccountsOf(acc);
- int parentPos = accounts.indexOf(acc);
- if (parentPos == -1) throw new RuntimeException(
- "Can't find index of clicked account " + acc.getName());
- accounts.addAll(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(),
+ Data.profile.get().getUuid()
+ });
+ Data.accounts.triggerItemChangedNotification(acc);
+ }
+ break;
}
}
projects / mobile-ledger.git / blobdiff