X-Git-Url: https://git.ktnx.net/?a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fnet%2Fktnx%2Fmobileledger%2Fui%2Fprofiles%2FProfilesRecyclerViewAdapter.java;h=a96517c28a0419893f7571425e130c4ba58b4de8;hb=ebc9d1e219e7b86e35acde2c799252f5da1dc5af;hp=0ee87da1157177718218a5a2636c66a27c577183;hpb=9f687628614baacdf48cecf395041b8826ef76bf;p=mobile-ledger.git

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 0ee87da1..a96517c2 100644
--- 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;
@@ -148,10 +149,15 @@ public class ProfilesRecyclerViewAdapter
             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
@@ -181,7 +187,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 +201,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 +210,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);
         }
     }
 }