X-Git-Url: https://git.ktnx.net/?a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fnet%2Fktnx%2Fmobileledger%2Fui%2Factivity%2FMainActivity.java;h=7e4ae5053f5976ff8b865ef3349eb913f180dc5d;hb=c043546c41586e32628dc11ab530466637f2a72f;hp=24784ffd4ec39956b9f961b1e2ddd32bbb7fb3d4;hpb=7c2040dd059867ce7303594868abe8fa9598ddd7;p=mobile-ledger.git

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 24784ffd..7e4ae505 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
@@ -88,9 +88,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;
     private View bTransactionListCancelDownload;
     private ProgressBar progressBar;
@@ -98,7 +96,6 @@ public class MainActivity extends ProfileThemedActivity {
     private SectionsPagerAdapter mSectionsPagerAdapter;
     private ViewPager mViewPager;
     private FloatingActionButton fab;
-    private boolean profileModificationEnabled = false;
     private boolean profileListExpanded = false;
     private ProfilesRecyclerViewAdapter mProfileListAdapter;
     private int mCurrentPage;
@@ -122,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);
@@ -163,7 +160,6 @@ public class MainActivity extends ProfileThemedActivity {
         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);
         progressBar = findViewById(R.id.transaction_list_progress_bar);
         progressLayout = findViewById(R.id.transaction_progress_layout);
@@ -535,43 +531,18 @@ public class MainActivity extends ProfileThemedActivity {
     private void showAccountSummaryFragment() {
         mViewPager.setCurrentItem(0, true);
         Data.accountFilter.setValue(null);
-//        FragmentTransaction ft = fragmentManager.beginTransaction();
-//        accountSummaryFragment = new AccountSummaryFragment();
-//        ft.replace(R.id.root_frame, accountSummaryFragment);
-//        ft.commit();
-//        currentFragment = accountSummaryFragment;
     }
     public void onLatestTransactionsClicked(View view) {
         drawer.closeDrawers();
 
         showTransactionsFragment((String) null);
     }
-    private void resetFragmentBackStack() {
-//        fragmentManager.popBackStack(0, FragmentManager.POP_BACK_STACK_INCLUSIVE);
-    }
     private void showTransactionsFragment(String accName) {
         Data.accountFilter.setValue(accName);
         mViewPager.setCurrentItem(1, true);
     }
     private void showTransactionsFragment(LedgerAccount account) {
         showTransactionsFragment((account == null) ? (String) null : account.getName());
-//        FragmentTransaction ft = fragmentManager.beginTransaction();
-//        if (transactionListFragment == null) {
-//            debug("flow", "MainActivity creating TransactionListFragment");
-//            transactionListFragment = new TransactionListFragment();
-//        }
-//        Bundle bundle = new Bundle();
-//        if (account != null) {
-//            bundle.putString(TransactionListFragment.BUNDLE_KEY_FILTER_ACCOUNT_NAME,
-//                    account.getName());
-//        }
-//        transactionListFragment.setArguments(bundle);
-//        ft.replace(R.id.root_frame, transactionListFragment);
-//        if (account != null)
-//            ft.addToBackStack(getResources().getString(R.string.title_activity_transaction_list));
-//        ft.commit();
-//
-//        currentFragment = transactionListFragment;
     }
     public void showAccountTransactions(LedgerAccount account) {
         mBackMeansToAccountList = true;
@@ -685,41 +656,51 @@ public class MainActivity extends ProfileThemedActivity {
                        Data.profiles.size()));
     }
     private void collapseProfileList() {
+        boolean wasExpanded = profileListExpanded;
         profileListExpanded = false;
 
-        final Animation animation = AnimationUtils.loadAnimation(this, R.anim.slide_up);
-        animation.setAnimationListener(new Animation.AnimationListener() {
-            @Override
-            public void onAnimationStart(Animation animation) {
+        if (wasExpanded) {
+            final Animation animation = AnimationUtils.loadAnimation(this, R.anim.slide_up);
+            animation.setAnimationListener(new Animation.AnimationListener() {
+                @Override
+                public void onAnimationStart(Animation animation) {
 
-            }
-            @Override
-            public void onAnimationEnd(Animation animation) {
-                profileListContainer.setVisibility(View.GONE);
-            }
-            @Override
-            public void onAnimationRepeat(Animation animation) {
+                }
+                @Override
+                public void onAnimationEnd(Animation animation) {
+                    profileListContainer.setVisibility(View.GONE);
+                }
+                @Override
+                public void onAnimationRepeat(Animation animation) {
 
-            }
-        });
-        mProfileListAdapter.stopEditingProfiles();
-
-        profileListContainer.startAnimation(animation);
-        profileListHeadArrow.setRotation(0f);
-        profileListHeadArrow
-                .startAnimation(AnimationUtils.loadAnimation(this, R.anim.rotate_180_back));
-        final Animation moreAnimation = AnimationUtils.loadAnimation(this, R.anim.fade_out);
-        moreAnimation.setAnimationListener(new Animation.AnimationListener() {
-            @Override
-            public void onAnimationStart(Animation animation) {}
-            @Override
-            public void onAnimationEnd(Animation animation) {
-                profileListHeadMore.setVisibility(View.GONE);
-            }
-            @Override
-            public void onAnimationRepeat(Animation animation) {}
-        });
-        profileListHeadMore.startAnimation(moreAnimation);
+                }
+            });
+            mProfileListAdapter.stopEditingProfiles();
+
+            profileListContainer.startAnimation(animation);
+            profileListHeadArrow.setRotation(0f);
+            profileListHeadArrow
+                    .startAnimation(AnimationUtils.loadAnimation(this, R.anim.rotate_180_back));
+            final Animation moreAnimation = AnimationUtils.loadAnimation(this, R.anim.fade_out);
+            moreAnimation.setAnimationListener(new Animation.AnimationListener() {
+                @Override
+                public void onAnimationStart(Animation animation) {
+                }
+                @Override
+                public void onAnimationEnd(Animation animation) {
+                    profileListHeadMore.setVisibility(View.GONE);
+                }
+                @Override
+                public void onAnimationRepeat(Animation animation) {
+                }
+            });
+            profileListHeadMore.startAnimation(moreAnimation);
+        }
+        else {
+            profileListContainer.setVisibility(View.GONE);
+            profileListHeadArrow.setRotation(0f);
+            profileListHeadMore.setVisibility(View.GONE);
+        }
     }
     public void onAccountSummaryRowViewClicked(View view) {
         ViewGroup row;