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=ecd78167354df9b5bc046381476e27ba16186535;hp=08bdf927d4e921e9b9a55caa0980d61dc99aed9f;hb=ae668e7470adf8eefb0fd2bb5905f9c6ebebfc36;hpb=8f55113a112873aa98652eae5c7f56a357e24957 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 08bdf927..ecd78167 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 @@ -46,6 +46,7 @@ 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; @@ -90,7 +91,6 @@ public class MainActivity extends ProfileThemedActivity { protected void onStart() { super.onStart(); - Data.lastUpdateDate.set(null); updateLastUpdateTextFromDB(); Date lastUpdate = Data.lastUpdateDate.get(); @@ -269,7 +269,8 @@ public class MainActivity extends ProfileThemedActivity { profileListHeadMore.setOnClickListener((v) -> mProfileListAdapter.flipEditingProfiles()); profileListHeadCancel.setOnClickListener((v) -> mProfileListAdapter.flipEditingProfiles()); - profileListHeadMoreAndCancel.setOnClickListener((v) -> mProfileListAdapter.flipEditingProfiles()); + profileListHeadMoreAndCancel + .setOnClickListener((v) -> mProfileListAdapter.flipEditingProfiles()); drawer.addDrawerListener(new DrawerLayout.SimpleDrawerListener() { @Override @@ -441,6 +442,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(); } @@ -492,6 +494,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;