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=208303983d55af65d6b5560ee8a77a6b758ea97e;hp=95b35872189cb619f49dec3ab47c74fe4e71e324;hb=03cd43a4c159765ad48427ee6fc44d03940acb24;hpb=04b04dfc19e899309eeab7989918f8869d5b1d65

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 95b35872..20830398 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
@@ -66,12 +66,13 @@ import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 import androidx.viewpager.widget.ViewPager;
 
-public class MainActivity extends CrashReportingActivity {
+public class MainActivity extends ProfileThemedActivity {
     private static final String STATE_CURRENT_PAGE = "current_page";
     private static final String BUNDLE_SAVED_STATE = "bundle_savedState";
     DrawerLayout drawer;
     private LinearLayout profileListContainer;
     private View profileListHeadArrow, profileListHeadMore, profileListHeadCancel;
+    private LinearLayout profileListHeadMoreAndCancel;
     private FragmentManager fragmentManager;
     private TextView tvLastUpdate;
     private RetrieveTransactionsTask retrieveTransactionsTask;
@@ -119,6 +120,7 @@ public class MainActivity extends CrashReportingActivity {
         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);
@@ -250,6 +252,7 @@ public class MainActivity extends CrashReportingActivity {
                     profileListHeadCancel.setVisibility(View.VISIBLE);
                 }
                 else {
+                    profileListHeadArrow.setRotation(180f);
                     profileListHeadArrow.setVisibility(View.VISIBLE);
                     profileListHeadCancel.setVisibility(View.GONE);
                     profileListHeadMore.setVisibility(View.GONE);
@@ -264,8 +267,10 @@ public class MainActivity extends CrashReportingActivity {
         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
@@ -488,6 +493,9 @@ public class MainActivity extends CrashReportingActivity {
         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;
@@ -507,12 +515,13 @@ public class MainActivity extends CrashReportingActivity {
 
             }
         });
+        mProfileListAdapter.stopEditingProfiles();
+
         profileListContainer.startAnimation(animation);
+        profileListHeadArrow.setRotation(0f);
         profileListHeadArrow
                 .startAnimation(AnimationUtils.loadAnimation(this, R.anim.rotate_180_back));
         profileListHeadMore.setVisibility(View.GONE);
-
-        mProfileListAdapter.stopEditingProfiles();
     }
     public void onProfileRowClicked(View v) {
         Data.setCurrentProfile((MobileLedgerProfile) v.getTag());
@@ -534,7 +543,7 @@ public class MainActivity extends CrashReportingActivity {
         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.GONE);
+            aRow.findViewById(R.id.profile_list_rearrange_handle).setVisibility(View.INVISIBLE);
         }
         // FIXME disable rearranging