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=833c038a26ef095e35f8ac397609a25e6b5b2f7a;hp=40bf49c6c0e782a9c45c8a51824e7069378c912f;hb=a1e1420ed00d5ceee82a77d2f7df774fbd933284;hpb=fd0dea6de18289bbb3c9f3e7d6e16cba96ed5e64

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 40bf49c6..833c038a 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
@@ -58,6 +58,8 @@ import net.ktnx.mobileledger.utils.Colors;
 import net.ktnx.mobileledger.utils.LockHolder;
 import net.ktnx.mobileledger.utils.MLDB;
 
+import org.jetbrains.annotations.NotNull;
+
 import java.lang.ref.WeakReference;
 import java.text.DateFormat;
 import java.util.ArrayList;
@@ -114,15 +116,15 @@ public class MainActivity extends ProfileThemedActivity {
         Log.d("flow", "MainActivity.onStart()");
         mViewPager.setCurrentItem(mCurrentPage, false);
         if (mAccountFilter != null) showTransactionsFragment(mAccountFilter);
-        else Data.accountFilter.set(null);
+        else Data.accountFilter.setValue(null);
 
     }
     @Override
     protected void onSaveInstanceState(Bundle outState) {
         super.onSaveInstanceState(outState);
         outState.putInt(STATE_CURRENT_PAGE, mViewPager.getCurrentItem());
-        if (Data.accountFilter.get() != null)
-            outState.putString(STATE_ACC_FILTER, Data.accountFilter.get());
+        if (mAccountFilter != null)
+            outState.putString(STATE_ACC_FILTER, mAccountFilter);
     }
     @Override
     protected void onDestroy() {
@@ -520,7 +522,7 @@ public class MainActivity extends ProfileThemedActivity {
     }
     private void showAccountSummaryFragment() {
         mViewPager.setCurrentItem(0, true);
-        Data.accountFilter.set(null);
+        Data.accountFilter.setValue(null);
 //        FragmentTransaction ft = fragmentManager.beginTransaction();
 //        accountSummaryFragment = new AccountSummaryFragment();
 //        ft.replace(R.id.root_frame, accountSummaryFragment);
@@ -536,8 +538,7 @@ public class MainActivity extends ProfileThemedActivity {
 //        fragmentManager.popBackStack(0, FragmentManager.POP_BACK_STACK_INCLUSIVE);
     }
     private void showTransactionsFragment(String accName) {
-        Data.accountFilter.set(accName);
-        Data.accountFilter.notifyObservers();
+        Data.accountFilter.setValue(accName);
         mViewPager.setCurrentItem(1, true);
     }
     private void showTransactionsFragment(LedgerAccount account) {
@@ -572,7 +573,7 @@ public class MainActivity extends ProfileThemedActivity {
         }
         else {
             if (mBackMeansToAccountList && (mViewPager.getCurrentItem() == 1)) {
-                Data.accountFilter.set(null);
+                Data.accountFilter.setValue(null);
                 showAccountSummaryFragment();
                 mBackMeansToAccountList = false;
             }
@@ -697,31 +698,6 @@ public class MainActivity extends ProfileThemedActivity {
                 .startAnimation(AnimationUtils.loadAnimation(this, R.anim.rotate_180_back));
         profileListHeadMore.setVisibility(View.GONE);
     }
-    public void onProfileRowClicked(View v) {
-        Data.setCurrentProfile((MobileLedgerProfile) v.getTag());
-    }
-    public void enableProfileModifications() {
-        profileModificationEnabled = true;
-        ViewGroup profileList = findViewById(R.id.nav_profile_list);
-        for (int i = 0; i < profileList.getChildCount(); i++) {
-            View aRow = profileList.getChildAt(i);
-            aRow.findViewById(R.id.profile_list_edit_button).setVisibility(View.VISIBLE);
-            aRow.findViewById(R.id.profile_list_rearrange_handle).setVisibility(View.VISIBLE);
-        }
-        // FIXME enable rearranging
-
-    }
-    public void disableProfileModifications() {
-        profileModificationEnabled = false;
-        ViewGroup profileList = findViewById(R.id.nav_profile_list);
-        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.INVISIBLE);
-        }
-        // FIXME disable rearranging
-
-    }
     public void onAccountSummaryRowViewClicked(View view) {
         ViewGroup row;
         if (view.getId() == R.id.account_expander) row = (ViewGroup) view.getParent().getParent();
@@ -823,6 +799,7 @@ public class MainActivity extends ProfileThemedActivity {
             super(fm);
         }
 
+        @NotNull
         @Override
         public Fragment getItem(int position) {
             Log.d("main", String.format("Switching to fragment %d", position));