]> git.ktnx.net Git - mobile-ledger.git/blobdiff - app/src/main/java/net/ktnx/mobileledger/ui/activity/MainActivity.java
profile list: don't hide the collapse arrow when editting is enabled
[mobile-ledger.git] / app / src / main / java / net / ktnx / mobileledger / ui / activity / MainActivity.java
index c96e5e9c92a9cad7f14f2dedb3cedbde75ef8af8..f934d4d69de330432d019619c722940516bd2ac9 100644 (file)
@@ -119,7 +119,7 @@ public class MainActivity extends ProfileThemedActivity {
 
     }
     @Override
-    protected void onSaveInstanceState(Bundle outState) {
+    protected void onSaveInstanceState(@NotNull Bundle outState) {
         super.onSaveInstanceState(outState);
         outState.putInt(STATE_CURRENT_PAGE, mViewPager.getCurrentItem());
         if (mAccountFilter != null) outState.putString(STATE_ACC_FILTER, mAccountFilter);
@@ -158,7 +158,8 @@ public class MainActivity extends ProfileThemedActivity {
         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);
+        LinearLayout profileListHeadMoreAndCancel =
+                findViewById(R.id.nav_profile_list_head_buttons);
         drawer = findViewById(R.id.drawer_layout);
         bTransactionListCancelDownload = findViewById(R.id.transaction_list_cancel_download);
         progressBar = findViewById(R.id.transaction_list_progress_bar);
@@ -263,8 +264,6 @@ public class MainActivity extends ProfileThemedActivity {
         if (editingProfilesObserver == null) {
             editingProfilesObserver = (o, arg) -> {
                 if (mProfileListAdapter.isEditingProfiles()) {
-                    profileListHeadArrow.clearAnimation();
-                    profileListHeadArrow.setVisibility(View.GONE);
                     profileListHeadMore.setVisibility(View.GONE);
                     profileListHeadMore
                             .startAnimation(AnimationUtils.loadAnimation(this, R.anim.fade_out));
@@ -273,8 +272,6 @@ public class MainActivity extends ProfileThemedActivity {
                             .startAnimation(AnimationUtils.loadAnimation(this, R.anim.fade_in));
                 }
                 else {
-                    profileListHeadArrow.setRotation(180f);
-                    profileListHeadArrow.setVisibility(View.VISIBLE);
                     profileListHeadCancel.setVisibility(View.GONE);
                     profileListHeadCancel
                             .startAnimation(AnimationUtils.loadAnimation(this, R.anim.fade_out));
@@ -335,7 +332,7 @@ public class MainActivity extends ProfileThemedActivity {
         if (Build.VERSION.SDK_INT < Build.VERSION_CODES.N) return;
 
         List<ShortcutInfo> shortcuts = new ArrayList<>();
-        try (LockHolder lh = Data.profiles.lockForReading()) {
+        try (LockHolder ignored = Data.profiles.lockForReading()) {
             for (int i = 0; i < Data.profiles.size(); i++) {
                 MobileLedgerProfile p = Data.profiles.get(i);
                 if (!p.isPostingPermitted()) continue;
@@ -542,7 +539,7 @@ public class MainActivity extends ProfileThemedActivity {
         mViewPager.setCurrentItem(1, true);
     }
     private void showTransactionsFragment(LedgerAccount account) {
-        showTransactionsFragment((account == null) ? (String) null : account.getName());
+        showTransactionsFragment((account == null) ? null : account.getName());
     }
     public void showAccountTransactions(LedgerAccount account) {
         mBackMeansToAccountList = true;
@@ -734,7 +731,7 @@ public class MainActivity extends ProfileThemedActivity {
 
                     // removing all child accounts from the view
                     int start = -1, count = 0;
-                    try (LockHolder lh = Data.accounts.lockForWriting()) {
+                    try (LockHolder ignored = Data.accounts.lockForWriting()) {
                         for (int i = 0; i < Data.accounts.size(); i++) {
                             if (acc.isParentOf(Data.accounts.get(i))) {
 //                                debug("accounts", String.format("Found a child '%s' at position %d",
@@ -772,7 +769,7 @@ public class MainActivity extends ProfileThemedActivity {
                     animator.rotationBy(-180);
                     List<LedgerAccount> children =
                             Data.profile.get().loadVisibleChildAccountsOf(acc);
-                    try (LockHolder lh = Data.accounts.lockForWriting()) {
+                    try (LockHolder ignored = Data.accounts.lockForWriting()) {
                         int parentPos = Data.accounts.indexOf(acc);
                         if (parentPos != -1) {
                             // may have disappeared in a concurrent refresh operation
@@ -799,7 +796,7 @@ public class MainActivity extends ProfileThemedActivity {
 
     public class SectionsPagerAdapter extends FragmentPagerAdapter {
 
-        public SectionsPagerAdapter(FragmentManager fm) {
+        SectionsPagerAdapter(FragmentManager fm) {
             super(fm);
         }