X-Git-Url: https://git.ktnx.net/?p=mobile-ledger.git;a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fnet%2Fktnx%2Fmobileledger%2Fui%2Factivity%2FMainActivity.java;h=0f668cee32379af896fc0293dfa47c1826f431e8;hp=e73c4f6f17a0a46a76a8d2781266069104cae819;hb=83cac114e375728080194fb09758b49c50a8119b;hpb=658663a586eaf33b59986fa6d0fac93b36d8b5a6 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 e73c4f6f..0f668cee 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 @@ -27,6 +27,7 @@ import android.os.Bundle; import android.util.Log; import android.view.View; import android.view.ViewGroup; +import android.view.ViewPropertyAnimator; import android.view.animation.Animation; import android.view.animation.AnimationUtils; import android.widget.LinearLayout; @@ -37,6 +38,7 @@ import android.widget.Toast; 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; @@ -46,12 +48,14 @@ 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.MLDB; import java.lang.ref.WeakReference; import java.text.DateFormat; import java.util.Date; +import java.util.List; import java.util.Observable; import java.util.Observer; @@ -69,6 +73,7 @@ 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 AccountSummaryFragment mAccountSummaryFragment; DrawerLayout drawer; private LinearLayout profileListContainer; private View profileListHeadArrow, profileListHeadMore, profileListHeadCancel; @@ -85,12 +90,12 @@ public class MainActivity extends ProfileThemedActivity { private boolean profileModificationEnabled = false; private boolean profileListExpanded = false; private ProfilesRecyclerViewAdapter mProfileListAdapter; - @Override protected void onStart() { super.onStart(); - Data.lastUpdateDate.set(null); + setupProfile(); + updateLastUpdateTextFromDB(); Date lastUpdate = Data.lastUpdateDate.get(); @@ -161,6 +166,12 @@ public class MainActivity extends ProfileThemedActivity { } }); }); + 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, @@ -214,19 +225,11 @@ public class MainActivity extends ProfileThemedActivity { 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); - } - else { - final String text = DateFormat.getDateTimeInstance().format(date); - tvLastUpdate.setText(text); - Log.d("despair", String.format("Date formatted: %s", text)); - } - }); + runOnUiThread(this::updateLastUpdateDisplay); }); + updateLastUpdateDisplay(); + findViewById(R.id.btn_no_profiles_add) .setOnClickListener(v -> startEditProfileActivity(null)); @@ -280,6 +283,19 @@ public class MainActivity extends ProfileThemedActivity { } }); } + private void updateLastUpdateDisplay() { + 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 :("); + } + else { + final String text = DateFormat.getDateTimeInstance().format(date); + v.setText(text); + Log.d("main", String.format("Date formatted: %s", text)); + } + } private void profileThemeChanged() { setupProfileColors(); @@ -291,11 +307,6 @@ public class MainActivity extends ProfileThemedActivity { intent.putExtra(BUNDLE_SAVED_STATE, bundle); startActivity(intent); } - @Override - protected void onResume() { - super.onResume(); - setupProfile(); - } public void startEditProfileActivity(MobileLedgerProfile profile) { Intent intent = new Intent(this, ProfileDetailActivity.class); Bundle args = new Bundle(); @@ -312,7 +323,7 @@ public class MainActivity extends ProfileThemedActivity { 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; @@ -442,6 +453,7 @@ public class MainActivity extends ProfileThemedActivity { updateLastUpdateTextFromDB(); new RefreshDescriptionsTask().executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR); + TransactionListViewModel.scheduleTransactionListReload(); } else Toast.makeText(this, error, Toast.LENGTH_LONG).show(); } @@ -493,6 +505,9 @@ public class MainActivity extends ProfileThemedActivity { profileListHeadArrow.startAnimation(AnimationUtils.loadAnimation(this, R.anim.rotate_180)); profileListHeadMore.setVisibility(View.VISIBLE); profileListHeadMore.startAnimation(AnimationUtils.loadAnimation(this, R.anim.fade_in)); + findViewById(R.id.nav_profile_list).setMinimumHeight( + (int) (getResources().getDimension(R.dimen.thumb_row_height) * + Data.profiles.size())); } private void collapseProfileList() { profileListExpanded = false; @@ -545,6 +560,84 @@ public class MainActivity extends ProfileThemedActivity { // FIXME disable rearranging } + public void onAccountSummaryRowViewClicked(View view) { + ViewGroup row = (ViewGroup) view.getParent(); + 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; + 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; + } + } + } + + if (start != -1) { + 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); + } + } + else { + Log.d("accounts", String.format("Expanding account '%s'", acc.getName())); + arrow.setRotation(180); + animator.rotationBy(-180); + List children = + Data.profile.get().loadVisibleChildAccountsOf(acc); + 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: + showAccountTransactions(acc); + break; + } + } public class SectionsPagerAdapter extends FragmentPagerAdapter { @@ -557,7 +650,8 @@ public class MainActivity extends ProfileThemedActivity { Log.d("main", String.format("Switching to fragment %d", position)); switch (position) { case 0: - return new AccountSummaryFragment(); +// Log.d("flow", "Creating account summary fragment"); + return mAccountSummaryFragment = new AccountSummaryFragment(); case 1: return new TransactionListFragment(); default: @@ -571,5 +665,4 @@ public class MainActivity extends ProfileThemedActivity { return 2; } } - }