fix profile list not updating tag colour after saving profile changes

[mobile-ledger.git] / app / src / main / java / net / ktnx / mobileledger / ui / profiles / ProfileDetailFragment.java

diff --git a/app/src/main/java/net/ktnx/mobileledger/ui/profiles/ProfileDetailFragment.java b/app/src/main/java/net/ktnx/mobileledger/ui/profiles/ProfileDetailFragment.java
index ec3ed661966466c77e356b68cd369b5c4354747f..72c4ed4cdab47fb56448a70ec3f2dc1a1262895f 100644 (file)
--- a/app/src/main/java/net/ktnx/mobileledger/ui/profiles/ProfileDetailFragment.java
+++ b/app/src/main/java/net/ktnx/mobileledger/ui/profiles/ProfileDetailFragment.java
@@ -112,35 +112,8 @@ public class ProfileDetailFragment extends Fragment {
         super.onCreateOptionsMenu(menu, inflater);
         inflater.inflate(R.menu.profile_details, menu);
         final MenuItem menuDeleteProfile = menu.findItem(R.id.menuDelete);
-        menuDeleteProfile.setOnMenuItemClickListener(item -> {
-            AlertDialog.Builder builder = new AlertDialog.Builder(getContext());
-            builder.setTitle(mProfile.getName());
-            builder.setMessage(R.string.remove_profile_dialog_message);
-            builder.setPositiveButton(R.string.Remove, (dialog, which) -> {
-                debug("profiles",
-                        String.format("[fragment] removing profile %s", mProfile.getUuid()));
-                mProfile.removeFromDB();
-                ArrayList<MobileLedgerProfile> oldList = Data.profiles.getValue();
-                if (oldList == null)
-                    throw new AssertionError();
-                ArrayList<MobileLedgerProfile> newList = new ArrayList<>(oldList);
-                newList.remove(mProfile);
-                Data.profiles.setValue(newList);
-                if (mProfile.equals(Data.getProfile())) {
-                    debug("profiles", "[fragment] setting current profile to 0");
-                    Data.setCurrentProfile(newList.get(0));
-                }
-
-                final FragmentActivity activity = getActivity();
-                if (activity != null)
-                    activity.finish();
-            });
-            builder.show();
-            return false;
-        });
+        menuDeleteProfile.setOnMenuItemClickListener(item -> onDeleteProfile());
         final ArrayList<MobileLedgerProfile> profiles = Data.profiles.getValue();
-        menuDeleteProfile.setVisible(
-                (mProfile != null) && (profiles != null) && (profiles.size() > 1));
 
         if (BuildConfig.DEBUG) {
             final MenuItem menuWipeProfileData = menu.findItem(R.id.menuWipeData);
@@ -148,6 +121,31 @@ public class ProfileDetailFragment extends Fragment {
             menuWipeProfileData.setVisible(mProfile != null);
         }
     }
+    private boolean onDeleteProfile() {
+        AlertDialog.Builder builder = new AlertDialog.Builder(getContext());
+        builder.setTitle(mProfile.getName());
+        builder.setMessage(R.string.remove_profile_dialog_message);
+        builder.setPositiveButton(R.string.Remove, (dialog, which) -> {
+            debug("profiles", String.format("[fragment] removing profile %s", mProfile.getUuid()));
+            mProfile.removeFromDB();
+            ArrayList<MobileLedgerProfile> oldList = Data.profiles.getValue();
+            if (oldList == null)
+                throw new AssertionError();
+            ArrayList<MobileLedgerProfile> newList = new ArrayList<>(oldList);
+            newList.remove(mProfile);
+            Data.profiles.setValue(newList);
+            if (mProfile.equals(Data.getProfile())) {
+                debug("profiles", "[fragment] setting current profile to 0");
+                Data.setCurrentProfile(newList.get(0));
+            }
+
+            final FragmentActivity activity = getActivity();
+            if (activity != null)
+                activity.finish();
+        });
+        builder.show();
+        return false;
+    }
     private boolean onWipeDataMenuClicked() {
         // this is a development option, so no confirmation
         mProfile.wipeAllData();
@@ -419,22 +417,35 @@ public class ProfileDetailFragment extends Fragment {
             return;
 
         ProfileDetailModel model = getModel();
+        final ArrayList<MobileLedgerProfile> profiles =
+                Objects.requireNonNull(Data.profiles.getValue());
 
         if (mProfile != null) {
+            int pos = Data.profiles.getValue()
+                                   .indexOf(mProfile);
+            mProfile = new MobileLedgerProfile(mProfile);
             model.updateProfile(mProfile);
-//                debug("profiles", String.format("Selected item is %d", mProfile.getThemeHue()));
             mProfile.storeInDB();
             debug("profiles", "profile stored in DB");
-            triggerProfileChange();
+            profiles.set(pos, mProfile);
+//                debug("profiles", String.format("Selected item is %d", mProfile.getThemeHue()));
+
+            final MobileLedgerProfile currentProfile = Data.getProfile();
+            if (mProfile.getUuid()
+                        .equals(currentProfile.getUuid()))
+            {
+                Data.setCurrentProfile(mProfile);
+            }
+
+            ProfilesRecyclerViewAdapter viewAdapter = ProfilesRecyclerViewAdapter.getInstance();
+            if (viewAdapter != null)
+                viewAdapter.notifyItemChanged(pos);
         }
         else {
             mProfile = new MobileLedgerProfile(String.valueOf(UUID.randomUUID()));
             model.updateProfile(mProfile);
             mProfile.storeInDB();
-            final ArrayList<MobileLedgerProfile> profiles = Data.profiles.getValue();
-            if (profiles == null)
-                throw new AssertionError();
-            ArrayList<MobileLedgerProfile> newList = new ArrayList<>(profiles);
+            final ArrayList<MobileLedgerProfile> newList = new ArrayList<>(profiles);
             newList.add(mProfile);
             Data.profiles.setValue(newList);
             MobileLedgerProfile.storeProfilesOrder();