X-Git-Url: https://git.ktnx.net/?p=mobile-ledger.git;a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fnet%2Fktnx%2Fmobileledger%2Fui%2Fprofiles%2FProfilesRecyclerViewAdapter.java;h=8ee0dd96c696c5a299a52cdfe38a4b034f7b3a40;hp=013fa1915f349849337c214b051ab16fa9ebfec3;hb=2c9601c763805df628328312468278404f448663;hpb=03416b0efdbc1f864bbfea02455172358d6f69d7
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 013fa191..8ee0dd96 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;
@@ -20,11 +20,13 @@ package net.ktnx.mobileledger.ui.profiles;
import android.content.Context;
import android.content.Intent;
import android.graphics.drawable.ColorDrawable;
-import android.util.Log;
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;
import net.ktnx.mobileledger.R;
@@ -32,28 +34,29 @@ import net.ktnx.mobileledger.model.Data;
import net.ktnx.mobileledger.model.MobileLedgerProfile;
import net.ktnx.mobileledger.ui.activity.ProfileDetailActivity;
import net.ktnx.mobileledger.utils.Colors;
+import net.ktnx.mobileledger.utils.ObservableValue;
import java.util.Collections;
+import java.util.Observer;
import androidx.annotation.NonNull;
+import androidx.constraintlayout.widget.ConstraintLayout;
import androidx.recyclerview.widget.ItemTouchHelper;
import androidx.recyclerview.widget.RecyclerView;
+import static net.ktnx.mobileledger.utils.Logger.debug;
+
public class ProfilesRecyclerViewAdapter
extends RecyclerView.Adapter {
private final View.OnClickListener mOnClickListener = view -> {
MobileLedgerProfile profile = (MobileLedgerProfile) ((View) view.getParent()).getTag();
editProfile(view, profile);
};
- private boolean editingProfiles = false;
+ private ObservableValue editingProfiles = new ObservableValue<>(false);
private RecyclerView recyclerView;
private ItemTouchHelper rearrangeHelper;
public ProfilesRecyclerViewAdapter() {
- Data.profiles.addObserver((o, arg) -> {
- Log.d("profiles", "profile list changed");
- if (arg == null) notifyDataSetChanged();
- else notifyItemChanged((int) arg);
- });
+ debug("flow", "ProfilesRecyclerViewAdapter.new()");
ItemTouchHelper.Callback cb = new ItemTouchHelper.Callback() {
@Override
@@ -65,10 +68,16 @@ public class ProfilesRecyclerViewAdapter
public boolean onMove(@NonNull RecyclerView recyclerView,
@NonNull RecyclerView.ViewHolder viewHolder,
@NonNull RecyclerView.ViewHolder target) {
- Collections.swap(Data.profiles.getList(), viewHolder.getAdapterPosition(),
- target.getAdapterPosition());
- MobileLedgerProfile.storeProfilesOrder();
- notifyItemMoved(viewHolder.getAdapterPosition(), target.getAdapterPosition());
+ Data.profiles.blockNotifications();
+ try {
+ Collections.swap(Data.profiles, viewHolder.getAdapterPosition(),
+ target.getAdapterPosition());
+ MobileLedgerProfile.storeProfilesOrder();
+ notifyItemMoved(viewHolder.getAdapterPosition(), target.getAdapterPosition());
+ }
+ finally {
+ Data.profiles.unblockNotifications();
+ }
return true;
}
@Override
@@ -77,6 +86,12 @@ public class ProfilesRecyclerViewAdapter
};
rearrangeHelper = new ItemTouchHelper(cb);
}
+ public void addEditingProfilesObserver(Observer o) {
+ editingProfiles.addObserver(o);
+ }
+ public void deleteEditingProfilesObserver(Observer o) {
+ editingProfiles.deleteObserver(o);
+ }
@Override
public void onDetachedFromRecyclerView(@NonNull RecyclerView recyclerView) {
rearrangeHelper.attachToRecyclerView(null);
@@ -87,25 +102,22 @@ public class ProfilesRecyclerViewAdapter
public void onAttachedToRecyclerView(@NonNull RecyclerView recyclerView) {
super.onAttachedToRecyclerView(recyclerView);
this.recyclerView = recyclerView;
- if (editingProfiles) rearrangeHelper.attachToRecyclerView(recyclerView);
- }
- public boolean editingProfiles() {
- return this.editingProfiles;
+ if (editingProfiles.get()) rearrangeHelper.attachToRecyclerView(recyclerView);
}
public void startEditingProfiles() {
- if (editingProfiles) return;
- this.editingProfiles = true;
+ if (editingProfiles.get()) return;
+ this.editingProfiles.set(true);
notifyDataSetChanged();
rearrangeHelper.attachToRecyclerView(recyclerView);
}
public void stopEditingProfiles() {
- if (!editingProfiles) return;
- this.editingProfiles = false;
+ if (!editingProfiles.get()) return;
+ this.editingProfiles.set(false);
notifyDataSetChanged();
rearrangeHelper.attachToRecyclerView(null);
}
public void flipEditingProfiles() {
- if (editingProfiles) stopEditingProfiles();
+ if (editingProfiles.get()) stopEditingProfiles();
else startEditingProfiles();
}
private void editProfile(View view, MobileLedgerProfile profile) {
@@ -117,6 +129,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) {
@@ -124,13 +144,14 @@ 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");
- Log.d("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();
@@ -140,20 +161,24 @@ 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
public void onBindViewHolder(@NonNull final ProfileListViewHolder holder, int position) {
final MobileLedgerProfile profile = Data.profiles.get(position);
final MobileLedgerProfile currentProfile = Data.profile.get();
- Log.d("profiles", String.format("pos %d: %s, current: %s", position, profile.getUuid(),
+ debug("profiles", String.format("pos %d: %s, current: %s", position, profile.getUuid(),
(currentProfile == null) ? "" : currentProfile.getUuid()));
holder.itemView.setTag(profile);
@@ -167,27 +192,45 @@ 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) {
+ 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 {
- holder.mRearrangeHandle.setVisibility(View.GONE);
+ 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
public int getItemCount() {
return Data.profiles.size();
}
+ public boolean isEditingProfiles() {
+ return editingProfiles.get();
+ }
class ProfileListViewHolder extends RecyclerView.ViewHolder {
final TextView mEditButton;
final TextView mTitle, mColorTag;
+ final LinearLayout tagAndHandleLayout;
final ImageView mRearrangeHandle;
+ final ConstraintLayout mRow;
ProfileListViewHolder(View view) {
super(view);
@@ -195,6 +238,8 @@ 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);
+ mRow = (ConstraintLayout) view;
}
}
}