karol/OpenTracks
1
0
Fork 0
forked from upstream-mirrors/OpenTracks
Code Pull Requests Actions Releases 2 Activity

Cleanup: list adapters.

Browse Source
This commit is contained in:
Dennis Guse
2025-06-27 14:23:42 +02:00
parent 2e13054042
commit 0dca1461e1
2 changed files with 9 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/de/dennisguse/opentracks/ui/TrackListAdapter.java
+6 -8
View File
@@ -163,7 +163,6 @@ public class TrackListAdapter extends RecyclerView.Adapter<RecyclerView.ViewHold
public class ViewHolder extends RecyclerView.ViewHolder implements View.OnClickListener, View.OnLongClickListener { public class ViewHolder extends RecyclerView.ViewHolder implements View.OnClickListener, View.OnLongClickListener {
private final TrackListItemBinding viewBinding; private final TrackListItemBinding viewBinding;
private final View view;
private Track.Id trackId; private Track.Id trackId;
@@ -171,10 +170,9 @@ public class TrackListAdapter extends RecyclerView.Adapter<RecyclerView.ViewHold
super(itemView); super(itemView);
viewBinding = TrackListItemBinding.bind(itemView); viewBinding = TrackListItemBinding.bind(itemView);
view = itemView;
view.setOnClickListener(this); viewBinding.getRoot().setOnClickListener(this);
view.setOnLongClickListener(this); viewBinding.getRoot().setOnLongClickListener(this);
} }
@@ -233,7 +231,7 @@ public class TrackListAdapter extends RecyclerView.Adapter<RecyclerView.ViewHold
public void setSelected(boolean isSelected) { public void setSelected(boolean isSelected) {
selection.put((int) getId(), isSelected); selection.put((int) getId(), isSelected);
view.setActivated(isSelected); viewBinding.getRoot().setActivated(isSelected);
} }
public long getId() { public long getId() {
@@ -244,7 +242,7 @@ public class TrackListAdapter extends RecyclerView.Adapter<RecyclerView.ViewHold
@Override @Override
public void onClick(View v) { public void onClick(View v) {
if (selectionMode) { if (selectionMode) {
setSelected(!view.isActivated()); setSelected(!viewBinding.getRoot().isActivated());
actionMode.invalidate(); actionMode.invalidate();
return; return;
} }
@@ -260,14 +258,14 @@ public class TrackListAdapter extends RecyclerView.Adapter<RecyclerView.ViewHold
.putExtra(TrackRecordedActivity.EXTRA_TRACK_ID, trackId); .putExtra(TrackRecordedActivity.EXTRA_TRACK_ID, trackId);
ActivityOptions activityOptions = ActivityOptions.makeSceneTransitionAnimation( ActivityOptions activityOptions = ActivityOptions.makeSceneTransitionAnimation(
context, context,
new Pair<>(view.findViewById(R.id.track_list_item_icon), TrackRecordedActivity.VIEW_TRACK_ICON)); new Pair<>(viewBinding.getRoot().findViewById(R.id.track_list_item_icon), TrackRecordedActivity.VIEW_TRACK_ICON));
context.startActivity(newIntent, activityOptions.toBundle()); context.startActivity(newIntent, activityOptions.toBundle());
} }
} }
@Override @Override
public boolean onLongClick(View v) { public boolean onLongClick(View v) {
setSelected(!view.isActivated()); setSelected(!viewBinding.getRoot().isActivated());
if (!selectionMode) { if (!selectionMode) {
actionMode = context.startSupportActionMode(TrackListAdapter.this); actionMode = context.startSupportActionMode(TrackListAdapter.this);
} else { } else {
src/main/java/de/dennisguse/opentracks/ui/markers/MarkerListAdapter.java
+3 -7
View File
@@ -164,7 +164,6 @@ public class MarkerListAdapter extends RecyclerView.Adapter<RecyclerView.ViewHol
public class ViewHolder extends RecyclerView.ViewHolder implements View.OnClickListener, View.OnLongClickListener { public class ViewHolder extends RecyclerView.ViewHolder implements View.OnClickListener, View.OnLongClickListener {
private final MarkerListItemBinding viewBinding; private final MarkerListItemBinding viewBinding;
private final View view;
private Marker marker; private Marker marker;
@@ -172,23 +171,20 @@ public class MarkerListAdapter extends RecyclerView.Adapter<RecyclerView.ViewHol
super(view); super(view);
viewBinding = MarkerListItemBinding.bind(view); viewBinding = MarkerListItemBinding.bind(view);
this.view = view;
view.setOnClickListener(this); viewBinding.getRoot().setOnClickListener(this);
view.setOnLongClickListener(this); viewBinding.getRoot().setOnLongClickListener(this);
} }
public void bind(Marker marker) { public void bind(Marker marker) {
this.marker = marker; this.marker = marker;
viewBinding.markerListItemPhoto.setVisibility(marker.hasPhoto() ? View.VISIBLE : View.GONE); viewBinding.markerListItemPhoto.setVisibility(marker.hasPhoto() ? View.VISIBLE : View.GONE);
viewBinding.markerListItemTextGradient.setVisibility(marker.hasPhoto() ? View.VISIBLE : View.GONE);
if (marker.hasPhoto()) { if (marker.hasPhoto()) {
int height = ThemeUtils.getPhotoHeight(context); int height = ThemeUtils.getPhotoHeight(context);
ViewGroup.LayoutParams params = viewBinding.markerListItemPhoto.getLayoutParams(); ViewGroup.LayoutParams params = viewBinding.markerListItemPhoto.getLayoutParams();
params.height = height; params.height = height;
viewBinding.markerListItemPhoto.setLayoutParams(params); viewBinding.markerListItemPhoto.setLayoutParams(params);
viewBinding.markerListItemTextGradient.setLayoutParams(params);
asyncLoadPhoto(viewBinding.markerListItemPhoto, marker.getPhotoUrl(), marker.getId()); asyncLoadPhoto(viewBinding.markerListItemPhoto, marker.getPhotoUrl(), marker.getId());
} }
@@ -208,7 +204,7 @@ public class MarkerListAdapter extends RecyclerView.Adapter<RecyclerView.ViewHol
public void setSelected(boolean isSelected) { public void setSelected(boolean isSelected) {
selection.put((int) getId(), isSelected); selection.put((int) getId(), isSelected);
view.setActivated(isSelected); viewBinding.getRoot().setActivated(isSelected);
} }
public long getId() { public long getId() {