X-Git-Url: https://git.ktnx.net/?a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fnet%2Fktnx%2Fmobileledger%2Fui%2Fprofiles%2FProfilesRecyclerViewAdapter.java;h=dfffc8f233743553a9d3689d4911d82673f90f64;hb=a50108a81e10a6371d1d49e3610c87a46e3ab9b4;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..dfffc8f2 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
@@ -1,18 +1,18 @@
/*
* Copyright © 2019 Damyan Ivanov.
- * This file is part of MoLe.
- * MoLe is free software: you can distribute it and/or modify it
- * under the term of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your opinion), any later version.
+ * This file is part of MoLe.
+ * MoLe is free software: you can distribute it and/or modify it
+ * under the term of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your opinion), any later version.
*
- * MoLe is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License terms for details.
+ * MoLe is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License terms for details.
*
- * You should have received a copy of the GNU General Public License
- * along with Mobile-Ledger. If not, see .
+ * You should have received a copy of the GNU General Public License
+ * along with MoLe. If not, see .
*/
package net.ktnx.mobileledger.ui.profiles;
@@ -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;
@@ -73,7 +74,7 @@ public class ProfilesRecyclerViewAdapter
public boolean onMove(@NonNull RecyclerView recyclerView,
@NonNull RecyclerView.ViewHolder viewHolder,
@NonNull RecyclerView.ViewHolder target) {
- Collections.swap(Data.profiles.getList(), viewHolder.getAdapterPosition(),
+ Collections.swap(Data.profiles, viewHolder.getAdapterPosition(),
target.getAdapterPosition());
MobileLedgerProfile.storeProfilesOrder();
notifyItemMoved(viewHolder.getAdapterPosition(), target.getAdapterPosition());
@@ -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
@@ -172,8 +177,7 @@ public class ProfilesRecyclerViewAdapter
holder.mEditButton.setOnClickListener(mOnClickListener);
- final boolean sameProfile = currentProfile.equals(profile);
- holder.itemView.setAlpha(sameProfile ? 1 : 0.5f);
+ final boolean sameProfile = (currentProfile != null) && currentProfile.equals(profile);
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);
}
}
}