locale-aware String.format

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

diff --git a/app/src/main/java/net/ktnx/mobileledger/ui/profiles/ProfilesRecyclerViewAdapter.java b/app/src/main/java/net/ktnx/mobileledger/ui/profiles/ProfilesRecyclerViewAdapter.java
index ddefc65c3a66cc64848b651bd208d60a1ba09d99..a4221cddc460a3d4deabc91e8bfe70806f1661de 100644 (file)
--- a/app/src/main/java/net/ktnx/mobileledger/ui/profiles/ProfilesRecyclerViewAdapter.java
+++ b/app/src/main/java/net/ktnx/mobileledger/ui/profiles/ProfilesRecyclerViewAdapter.java
@@ -23,6 +23,8 @@ import android.graphics.drawable.ColorDrawable;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
+import android.view.animation.Animation;
+import android.view.animation.AnimationUtils;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.TextView;
@@ -35,9 +37,11 @@ import net.ktnx.mobileledger.utils.Colors;
 import net.ktnx.mobileledger.utils.ObservableValue;
 
 import java.util.Collections;
+import java.util.Locale;
 import java.util.Observer;
 
 import androidx.annotation.NonNull;
+import androidx.constraintlayout.widget.ConstraintLayout;
 import androidx.recyclerview.widget.ItemTouchHelper;
 import androidx.recyclerview.widget.RecyclerView;
 
@@ -67,7 +71,8 @@ public class ProfilesRecyclerViewAdapter
                                   @NonNull RecyclerView.ViewHolder target) {
                 Data.profiles.blockNotifications();
                 try {
-                    Collections.swap(Data.profiles, viewHolder.getAdapterPosition(), target.getAdapterPosition());
+                    Collections.swap(Data.profiles, viewHolder.getAdapterPosition(),
+                            target.getAdapterPosition());
                     MobileLedgerProfile.storeProfilesOrder();
                     notifyItemMoved(viewHolder.getAdapterPosition(), target.getAdapterPosition());
                 }
@@ -125,6 +130,14 @@ public class ProfilesRecyclerViewAdapter
 
         context.startActivity(intent);
     }
+    private void onProfileRowClicked(View v) {
+        if (editingProfiles.get()) return;
+        MobileLedgerProfile profile = (MobileLedgerProfile) v.getTag();
+        if (profile == null)
+            throw new IllegalStateException("Profile row without associated profile");
+        debug("profiles", "Setting profile to " + profile.getName());
+        Data.setCurrentProfile(profile);
+    }
     @NonNull
     @Override
     public ProfileListViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
@@ -132,23 +145,19 @@ public class ProfilesRecyclerViewAdapter
                 .inflate(R.layout.profile_list_content, parent, false);
         ProfileListViewHolder holder = new ProfileListViewHolder(view);
 
+        holder.mRow.setOnClickListener(this::onProfileRowClicked);
         holder.mTitle.setOnClickListener(v -> {
             View row = (View) v.getParent();
-            MobileLedgerProfile profile = (MobileLedgerProfile) row.getTag();
-            if (profile == null)
-                throw new IllegalStateException("Profile row without associated profile");
-            debug("profiles", "Setting profile to " + profile.getName());
-            Data.setCurrentProfile(profile);
+            onProfileRowClicked(row);
+        });
+        holder.mColorTag.setOnClickListener(v -> {
+            View row = (View) v.getParent().getParent();
+            onProfileRowClicked(row);
         });
         holder.mTitle.setOnLongClickListener(v -> {
             flipEditingProfiles();
             return true;
         });
-        Data.profile.addObserver((o, arg) -> {
-            MobileLedgerProfile myProfile = (MobileLedgerProfile) holder.itemView.getTag();
-            final MobileLedgerProfile currentProfile = Data.profile.get();
-            final boolean sameProfile = currentProfile.equals(myProfile);
-        });
 
         View.OnTouchListener dragStarter = (v, event) -> {
             if (rearrangeHelper != null && editingProfiles.get()) {
@@ -165,7 +174,7 @@ public class ProfilesRecyclerViewAdapter
     public void onBindViewHolder(@NonNull final ProfileListViewHolder holder, int position) {
         final MobileLedgerProfile profile = Data.profiles.get(position);
         final MobileLedgerProfile currentProfile = Data.profile.get();
-        debug("profiles", String.format("pos %d: %s, current: %s", position, profile.getUuid(),
+        debug("profiles", String.format(Locale.ENGLISH,"pos %d: %s, current: %s", position, profile.getUuid(),
                 (currentProfile == null) ? "<NULL>" : currentProfile.getUuid()));
         holder.itemView.setTag(profile);
 
@@ -183,12 +192,26 @@ public class ProfilesRecyclerViewAdapter
         holder.itemView
                 .setBackground(sameProfile ? new ColorDrawable(Colors.tableRowDarkBG) : null);
         if (editingProfiles.get()) {
+            boolean wasHidden = holder.mEditButton.getVisibility() == View.GONE;
             holder.mRearrangeHandle.setVisibility(View.VISIBLE);
             holder.mEditButton.setVisibility(View.VISIBLE);
+            if (wasHidden) {
+                Animation a = AnimationUtils
+                        .loadAnimation(holder.mRearrangeHandle.getContext(), R.anim.fade_in);
+                holder.mRearrangeHandle.startAnimation(a);
+                holder.mEditButton.startAnimation(a);
+            }
         }
         else {
+            boolean wasShown = holder.mEditButton.getVisibility() == View.VISIBLE;
             holder.mRearrangeHandle.setVisibility(View.INVISIBLE);
             holder.mEditButton.setVisibility(View.GONE);
+            if (wasShown) {
+                Animation a = AnimationUtils
+                        .loadAnimation(holder.mRearrangeHandle.getContext(), R.anim.fade_out);
+                holder.mRearrangeHandle.startAnimation(a);
+                holder.mEditButton.startAnimation(a);
+            }
         }
     }
     @Override
@@ -203,6 +226,7 @@ public class ProfilesRecyclerViewAdapter
         final TextView mTitle, mColorTag;
         final LinearLayout tagAndHandleLayout;
         final ImageView mRearrangeHandle;
+        final ConstraintLayout mRow;
 
         ProfileListViewHolder(View view) {
             super(view);
@@ -211,6 +235,7 @@ public class ProfilesRecyclerViewAdapter
             mColorTag = view.findViewById(R.id.colorTag);
             mRearrangeHandle = view.findViewById(R.id.profile_list_rearrange_handle);
             tagAndHandleLayout = view.findViewById(R.id.handle_and_tag);
+            mRow = (ConstraintLayout) view;
         }
     }
 }