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=50fb32cf7d45acbecfa9e441f82d5c6308599451;hp=ddefc65c3a66cc64848b651bd208d60a1ba09d99;hb=88e1dbc1a1427beb57611c24af255186c32c825e;hpb=bd5da50ef980c0c9657ec1e9c3e681ab5092f438 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 ddefc65c..50fb32cf 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 @@ -23,6 +23,8 @@ import android.graphics.drawable.ColorDrawable; 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; @@ -32,12 +34,14 @@ 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.ArrayList; import java.util.Collections; -import java.util.Observer; +import java.util.Locale; import androidx.annotation.NonNull; +import androidx.constraintlayout.widget.ConstraintLayout; +import androidx.lifecycle.MutableLiveData; import androidx.recyclerview.widget.ItemTouchHelper; import androidx.recyclerview.widget.RecyclerView; @@ -49,9 +53,10 @@ public class ProfilesRecyclerViewAdapter MobileLedgerProfile profile = (MobileLedgerProfile) ((View) view.getParent()).getTag(); editProfile(view, profile); }; - private ObservableValue editingProfiles = new ObservableValue<>(false); + public MutableLiveData editingProfiles = new MutableLiveData<>(false); private RecyclerView recyclerView; private ItemTouchHelper rearrangeHelper; + private boolean animationsEnabled = true; public ProfilesRecyclerViewAdapter() { debug("flow", "ProfilesRecyclerViewAdapter.new()"); @@ -65,15 +70,12 @@ public class ProfilesRecyclerViewAdapter public boolean onMove(@NonNull RecyclerView recyclerView, @NonNull RecyclerView.ViewHolder viewHolder, @NonNull RecyclerView.ViewHolder target) { - Data.profiles.blockNotifications(); - try { - Collections.swap(Data.profiles, viewHolder.getAdapterPosition(), target.getAdapterPosition()); - MobileLedgerProfile.storeProfilesOrder(); - notifyItemMoved(viewHolder.getAdapterPosition(), target.getAdapterPosition()); - } - finally { - Data.profiles.unblockNotifications(); - } + final ArrayList profiles = Data.profiles.getValue(); + assert profiles != null; + Collections.swap(profiles, viewHolder.getAdapterPosition(), + target.getAdapterPosition()); + MobileLedgerProfile.storeProfilesOrder(); + notifyItemMoved(viewHolder.getAdapterPosition(), target.getAdapterPosition()); return true; } @Override @@ -82,11 +84,8 @@ public class ProfilesRecyclerViewAdapter }; rearrangeHelper = new ItemTouchHelper(cb); } - public void addEditingProfilesObserver(Observer o) { - editingProfiles.addObserver(o); - } - public void deleteEditingProfilesObserver(Observer o) { - editingProfiles.deleteObserver(o); + public void setAnimationsEnabled(boolean animationsEnabled) { + this.animationsEnabled = animationsEnabled; } @Override public void onDetachedFromRecyclerView(@NonNull RecyclerView recyclerView) { @@ -98,26 +97,24 @@ public class ProfilesRecyclerViewAdapter public void onAttachedToRecyclerView(@NonNull RecyclerView recyclerView) { super.onAttachedToRecyclerView(recyclerView); this.recyclerView = recyclerView; - if (editingProfiles.get()) rearrangeHelper.attachToRecyclerView(recyclerView); + if (editingProfiles.getValue()) rearrangeHelper.attachToRecyclerView(recyclerView); } public void startEditingProfiles() { - if (editingProfiles.get()) return; - this.editingProfiles.set(true); - notifyDataSetChanged(); + if (editingProfiles.getValue()) return; + this.editingProfiles.setValue(true); rearrangeHelper.attachToRecyclerView(recyclerView); } public void stopEditingProfiles() { - if (!editingProfiles.get()) return; - this.editingProfiles.set(false); - notifyDataSetChanged(); + if (!editingProfiles.getValue()) return; + this.editingProfiles.setValue(false); rearrangeHelper.attachToRecyclerView(null); } public void flipEditingProfiles() { - if (editingProfiles.get()) stopEditingProfiles(); + if (editingProfiles.getValue()) stopEditingProfiles(); else startEditingProfiles(); } private void editProfile(View view, MobileLedgerProfile profile) { - int index = Data.profiles.indexOf(profile); + int index = Data.getProfileIndex(profile); Context context = view.getContext(); Intent intent = new Intent(context, ProfileDetailActivity.class); intent.addFlags(Intent.FLAG_ACTIVITY_NO_USER_ACTION); @@ -125,6 +122,14 @@ public class ProfilesRecyclerViewAdapter context.startActivity(intent); } + private void onProfileRowClicked(View v) { + if (editingProfiles.getValue()) 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) { @@ -132,26 +137,22 @@ 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"); - debug("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(); 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.OnTouchListener dragStarter = (v, event) -> { - if (rearrangeHelper != null && editingProfiles.get()) { + if (rearrangeHelper != null && editingProfiles.getValue()) { rearrangeHelper.startDrag(holder); return true; } @@ -163,9 +164,11 @@ public class ProfilesRecyclerViewAdapter } @Override public void onBindViewHolder(@NonNull final ProfileListViewHolder holder, int position) { - final MobileLedgerProfile profile = Data.profiles.get(position); - final MobileLedgerProfile currentProfile = Data.profile.get(); - debug("profiles", String.format("pos %d: %s, current: %s", position, profile.getUuid(), + final ArrayList profiles = Data.profiles.getValue(); + assert profiles != null; + final MobileLedgerProfile profile = profiles.get(position); + final MobileLedgerProfile currentProfile = Data.profile.getValue(); + debug("profiles", String.format(Locale.ENGLISH,"pos %d: %s, current: %s", position, profile.getUuid(), (currentProfile == null) ? "" : currentProfile.getUuid())); holder.itemView.setTag(profile); @@ -182,27 +185,40 @@ public class ProfilesRecyclerViewAdapter final boolean sameProfile = (currentProfile != null) && currentProfile.equals(profile); holder.itemView .setBackground(sameProfile ? new ColorDrawable(Colors.tableRowDarkBG) : null); - if (editingProfiles.get()) { + if (editingProfiles.getValue()) { + 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 { + 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(); - } - public boolean isEditingProfiles() { - return editingProfiles.get(); + final ArrayList profiles = Data.profiles.getValue(); + return profiles != null ? profiles.size() : 0; } 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); @@ -211,6 +227,7 @@ public class ProfilesRecyclerViewAdapter 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; } } }