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=08a071ddf63106703fbd10c00c501c6065b22599;hp=013fa1915f349849337c214b051ab16fa9ebfec3;hb=HEAD;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..08a071dd 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,58 +1,73 @@
/*
- * 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.
+ * Copyright © 2021 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.
*
- * 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;
-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 androidx.annotation.NonNull;
+import androidx.constraintlayout.widget.ConstraintLayout;
+import androidx.lifecycle.MutableLiveData;
+import androidx.recyclerview.widget.AsyncListDiffer;
+import androidx.recyclerview.widget.DiffUtil;
+import androidx.recyclerview.widget.ItemTouchHelper;
+import androidx.recyclerview.widget.RecyclerView;
+
import net.ktnx.mobileledger.R;
+import net.ktnx.mobileledger.db.DB;
+import net.ktnx.mobileledger.db.Profile;
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 java.util.ArrayList;
import java.util.Collections;
+import java.util.List;
-import androidx.annotation.NonNull;
-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;
+ public final MutableLiveData editingProfiles = new MutableLiveData<>(false);
+ private final ItemTouchHelper rearrangeHelper;
+ private final AsyncListDiffer listDiffer;
private RecyclerView recyclerView;
- private ItemTouchHelper rearrangeHelper;
+ private boolean animationsEnabled = true;
+
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()");
+
+ setHasStableIds(true);
+ listDiffer = new AsyncListDiffer<>(this, new DiffUtil.ItemCallback() {
+ @Override
+ public boolean areItemsTheSame(@NonNull Profile oldItem, @NonNull Profile newItem) {
+ return oldItem.getId() == newItem.getId();
+ }
+ @Override
+ public boolean areContentsTheSame(@NonNull Profile oldItem, @NonNull Profile newItem) {
+ return oldItem.equals(newItem);
+ }
});
ItemTouchHelper.Callback cb = new ItemTouchHelper.Callback() {
@@ -65,10 +80,14 @@ 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());
+ final List profiles = new ArrayList<>(listDiffer.getCurrentList());
+ Collections.swap(profiles, viewHolder.getBindingAdapterPosition(),
+ target.getBindingAdapterPosition());
+ DB.get()
+ .getProfileDAO()
+ .updateOrder(profiles, null);
+// notifyItemMoved(viewHolder.getBindingAdapterPosition(), target
+// .getBindingAdapterPosition());
return true;
}
@Override
@@ -78,6 +97,18 @@ public class ProfilesRecyclerViewAdapter
rearrangeHelper = new ItemTouchHelper(cb);
}
@Override
+ public long getItemId(int position) {
+ return listDiffer.getCurrentList()
+ .get(position)
+ .getId();
+ }
+ public void setProfileList(List list) {
+ listDiffer.submitList(list);
+ }
+ public void setAnimationsEnabled(boolean animationsEnabled) {
+ this.animationsEnabled = animationsEnabled;
+ }
+ @Override
public void onDetachedFromRecyclerView(@NonNull RecyclerView recyclerView) {
rearrangeHelper.attachToRecyclerView(null);
super.onDetachedFromRecyclerView(recyclerView);
@@ -87,107 +118,102 @@ public class ProfilesRecyclerViewAdapter
public void onAttachedToRecyclerView(@NonNull RecyclerView recyclerView) {
super.onAttachedToRecyclerView(recyclerView);
this.recyclerView = recyclerView;
- if (editingProfiles) rearrangeHelper.attachToRecyclerView(recyclerView);
+ if (editingProfiles())
+ rearrangeHelper.attachToRecyclerView(recyclerView);
}
public boolean editingProfiles() {
- return this.editingProfiles;
+ final Boolean b = editingProfiles.getValue();
+ if (b == null)
+ return false;
+ return b;
}
public void startEditingProfiles() {
- if (editingProfiles) return;
- this.editingProfiles = true;
- notifyDataSetChanged();
+ if (editingProfiles())
+ return;
+ this.editingProfiles.setValue(true);
rearrangeHelper.attachToRecyclerView(recyclerView);
}
public void stopEditingProfiles() {
- if (!editingProfiles) return;
- this.editingProfiles = false;
- notifyDataSetChanged();
+ if (!editingProfiles())
+ return;
+ this.editingProfiles.setValue(false);
rearrangeHelper.attachToRecyclerView(null);
}
public void flipEditingProfiles() {
- if (editingProfiles) stopEditingProfiles();
- else startEditingProfiles();
- }
- private void editProfile(View view, MobileLedgerProfile profile) {
- int index = Data.profiles.indexOf(profile);
- Context context = view.getContext();
- Intent intent = new Intent(context, ProfileDetailActivity.class);
- intent.addFlags(Intent.FLAG_ACTIVITY_NO_USER_ACTION);
- if (index != -1) intent.putExtra(ProfileDetailFragment.ARG_ITEM_ID, index);
-
- context.startActivity(intent);
+ if (editingProfiles())
+ stopEditingProfiles();
+ else
+ startEditingProfiles();
}
@NonNull
@Override
public ProfileListViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
View view = LayoutInflater.from(parent.getContext())
- .inflate(R.layout.profile_list_content, parent, false);
- ProfileListViewHolder holder = new ProfileListViewHolder(view);
-
- 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);
- });
- 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.setAlpha(sameProfile ? 1 : 0.5f);
- });
-
- holder.mRearrangeHandle.setOnTouchListener((v, event) -> {
- rearrangeHelper.startDrag(holder);
- return true;
- });
- return holder;
+ .inflate(R.layout.profile_list_content, parent, false);
+ return new ProfileListViewHolder(view);
}
@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(),
- (currentProfile == null) ? "" : currentProfile.getUuid()));
- holder.itemView.setTag(profile);
+ final Profile profile = listDiffer.getCurrentList()
+ .get(position);
+ final Profile currentProfile = Data.getProfile();
+// debug("profiles", String.format(Locale.ENGLISH, "pos %d: %s, current: %s", position,
+// profile.getUuid(), currentProfile.getUuid()));
- int hue = profile.getThemeId();
- if (hue == -1) holder.mColorTag
- .setBackgroundColor(Colors.getPrimaryColorForHue(Colors.DEFAULT_HUE_DEG));
- else holder.mColorTag.setBackgroundColor(Colors.getPrimaryColorForHue(hue));
+ int hue = profile.getTheme();
+ if (hue == -1)
+ holder.mColorTag.setBackgroundColor(
+ Colors.getPrimaryColorForHue(Colors.DEFAULT_HUE_DEG));
+ else
+ holder.mColorTag.setBackgroundColor(Colors.getPrimaryColorForHue(hue));
holder.mTitle.setText(profile.getName());
// holder.mSubTitle.setText(profile.getUrl());
- holder.mEditButton.setOnClickListener(mOnClickListener);
+ holder.mEditButton.setOnClickListener(view -> {
+ Profile p = listDiffer.getCurrentList()
+ .get(holder.getBindingAdapterPosition());
+ ProfileDetailActivity.start(view.getContext(), p);
+ });
- final boolean sameProfile = currentProfile.equals(profile);
- holder.itemView.setAlpha(sameProfile ? 1 : 0.5f);
- holder.itemView
- .setBackground(sameProfile ? new ColorDrawable(Colors.tableRowDarkBG) : null);
- if (editingProfiles) {
+ final boolean sameProfile =
+ currentProfile != null && currentProfile.getId() == profile.getId();
+ holder.itemView.setBackground(
+ sameProfile ? new ColorDrawable(Colors.tableRowDarkBG) : null);
+ if (editingProfiles()) {
+ boolean wasHidden = holder.mEditButton.getVisibility() == View.GONE;
holder.mRearrangeHandle.setVisibility(View.VISIBLE);
holder.mEditButton.setVisibility(View.VISIBLE);
+ if (wasHidden && animationsEnabled) {
+ 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 && animationsEnabled) {
+ 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();
+ return listDiffer.getCurrentList()
+ .size();
}
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 +221,49 @@ 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;
+
+
+ mRow.setOnClickListener(this::onProfileRowClicked);
+ mTitle.setOnClickListener(v -> {
+ View row = (View) v.getParent();
+ onProfileRowClicked(row);
+ });
+ mColorTag.setOnClickListener(v -> {
+ View row = (View) v.getParent()
+ .getParent();
+ onProfileRowClicked(row);
+ });
+ mTitle.setOnLongClickListener(v -> {
+ flipEditingProfiles();
+ return true;
+ });
+
+ View.OnTouchListener dragStarter = (v, event) -> {
+ if (rearrangeHelper != null && editingProfiles()) {
+ rearrangeHelper.startDrag(this);
+ return true;
+ }
+ return false;
+ };
+
+ tagAndHandleLayout.setOnTouchListener(dragStarter);
+ }
+ private void onProfileRowClicked(View v) {
+ if (editingProfiles())
+ return;
+ Profile profile = listDiffer.getCurrentList()
+ .get(getBindingAdapterPosition());
+ if (Data.getProfile() != profile) {
+ debug("profiles", "Setting profile to " + profile.getName());
+ Data.drawerOpen.setValue(false);
+ Data.setCurrentProfile(profile);
+ }
+ else
+ debug("profiles",
+ "Not setting profile to the current profile " + profile.getName());
}
+
}
}