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=64a30812437677d3a8ea349e9f1cb1004c12e2b5;hp=0e5f469d6628a8a989a81aa4c80ca52c2c51dd40;hb=831ffd898c61c728d860f908e1dec288ae4060a3;hpb=ebc9d1e219e7b86e35acde2c799252f5da1dc5af

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 0e5f469d..64a30812 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;
 
@@ -72,6 +73,7 @@ public class MainActivity extends ProfileThemedActivity {
     DrawerLayout drawer;
     private LinearLayout profileListContainer;
     private View profileListHeadArrow, profileListHeadMore, profileListHeadCancel;
+    private LinearLayout profileListHeadMoreAndCancel;
     private FragmentManager fragmentManager;
     private TextView tvLastUpdate;
     private RetrieveTransactionsTask retrieveTransactionsTask;
@@ -89,7 +91,6 @@ public class MainActivity extends ProfileThemedActivity {
     protected void onStart() {
         super.onStart();
 
-        Data.lastUpdateDate.set(null);
         updateLastUpdateTextFromDB();
         Date lastUpdate = Data.lastUpdateDate.get();
 
@@ -114,11 +115,14 @@ public class MainActivity extends ProfileThemedActivity {
 
         setContentView(R.layout.activity_main);
 
+        setupProfile();
+
         fab = findViewById(R.id.btn_add_transaction);
         profileListContainer = findViewById(R.id.nav_profile_list_container);
         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);
         drawer = findViewById(R.id.drawer_layout);
         tvLastUpdate = findViewById(R.id.transactions_last_update);
         bTransactionListCancelDownload = findViewById(R.id.transaction_list_cancel_download);
@@ -265,8 +269,10 @@ public class MainActivity extends ProfileThemedActivity {
         llm.setOrientation(RecyclerView.VERTICAL);
         root.setLayoutManager(llm);
 
-        profileListHeadMore.setOnClickListener((v) -> mProfileListAdapter.startEditingProfiles());
-        profileListHeadCancel.setOnClickListener((v) -> mProfileListAdapter.stopEditingProfiles());
+        profileListHeadMore.setOnClickListener((v) -> mProfileListAdapter.flipEditingProfiles());
+        profileListHeadCancel.setOnClickListener((v) -> mProfileListAdapter.flipEditingProfiles());
+        profileListHeadMoreAndCancel
+                .setOnClickListener((v) -> mProfileListAdapter.flipEditingProfiles());
 
         drawer.addDrawerListener(new DrawerLayout.SimpleDrawerListener() {
             @Override
@@ -287,11 +293,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();
@@ -438,6 +439,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();
     }
@@ -489,6 +491,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;