do not dim non-current profiles

[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 0ee87da1157177718218a5a2636c66a27c577183..9f2c48a246e253edc70a527435c3963c2e47b9b0 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
@@ -25,6 +25,7 @@ import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.ImageView;
+import android.widget.LinearLayout;
 import android.widget.TextView;
 
 import net.ktnx.mobileledger.R;
@@ -145,13 +146,17 @@ public class ProfilesRecyclerViewAdapter
             MobileLedgerProfile myProfile = (MobileLedgerProfile) holder.itemView.getTag();
             final MobileLedgerProfile currentProfile = Data.profile.get();
             final boolean sameProfile = currentProfile.equals(myProfile);
-            view.setAlpha(sameProfile ? 1 : 0.5f);
         });
 
-        holder.mRearrangeHandle.setOnTouchListener((v, event) -> {
-            rearrangeHelper.startDrag(holder);
-            return true;
-        });
+        View.OnTouchListener dragStarter = (v, event) -> {
+            if (rearrangeHelper != null && editingProfiles.get()) {
+                rearrangeHelper.startDrag(holder);
+                return true;
+            }
+            return false;
+        };
+
+        holder.tagAndHandleLayout.setOnTouchListener(dragStarter);
         return holder;
     }
     @Override
@@ -173,7 +178,6 @@ public class ProfilesRecyclerViewAdapter
         holder.mEditButton.setOnClickListener(mOnClickListener);
 
         final boolean sameProfile = currentProfile.equals(profile);
-        holder.itemView.setAlpha(sameProfile ? 1 : 0.5f);
         holder.itemView
                 .setBackground(sameProfile ? new ColorDrawable(Colors.tableRowDarkBG) : null);
         if (editingProfiles.get()) {
@@ -181,7 +185,7 @@ public class ProfilesRecyclerViewAdapter
             holder.mEditButton.setVisibility(View.VISIBLE);
         }
         else {
-            holder.mRearrangeHandle.setVisibility(View.GONE);
+            holder.mRearrangeHandle.setVisibility(View.INVISIBLE);
             holder.mEditButton.setVisibility(View.GONE);
         }
     }
@@ -195,6 +199,7 @@ public class ProfilesRecyclerViewAdapter
     class ProfileListViewHolder extends RecyclerView.ViewHolder {
         final TextView mEditButton;
         final TextView mTitle, mColorTag;
+        final LinearLayout tagAndHandleLayout;
         final ImageView mRearrangeHandle;
 
         ProfileListViewHolder(View view) {
@@ -203,6 +208,7 @@ public class ProfilesRecyclerViewAdapter
             mTitle = view.findViewById(R.id.title);
             mColorTag = view.findViewById(R.id.colorTag);
             mRearrangeHandle = view.findViewById(R.id.profile_list_rearrange_handle);
+            tagAndHandleLayout = view.findViewById(R.id.handle_and_tag);
         }
     }
 }