FreshRSS
/
Readrops
mirror of https://github.com/readrops/Readrops.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Global improvements to Item ListAdapter 

Use data binding, fix flickering effect when updating list or item, split global bind method
This commit is contained in:
Shinokuni 2019-09-28 14:32:21 +02:00
parent ee40b9a072
commit a202dcc395
4 changed files with 244 additions and 237 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

180
app/src/main/java/com/readrops/app/adapters/MainItemListAdapter.java
View File

@ -9,7 +9,6 @@ import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.widget.ImageView;
import android.widget.TextView;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
@ -30,6 +29,7 @@ import com.bumptech.glide.util.ViewPreloadSizeProvider;
import com.readrops.app.R;
import com.readrops.app.database.entities.Item;
import com.readrops.app.database.pojo.ItemWithFeed;
import com.readrops.app.databinding.ListItemBinding;
import com.readrops.app.utils.DateUtils;
import com.readrops.app.utils.GlideRequests;
import com.readrops.app.utils.Utils;
@ -78,20 +78,24 @@ public class MainItemListAdapter extends PagedListAdapter<ItemWithFeed, MainItem
itemWithFeed.getColor() == t1.getColor() &&
itemWithFeed.getBgColor() == t1.getBgColor();
}
@Override
public Object getChangePayload(@NonNull ItemWithFeed oldItem, @NonNull ItemWithFeed newItem) {
return newItem;
}
};
private static final DrawableCrossFadeFactory FADE_FACTORY = new DrawableCrossFadeFactory.Builder().setCrossFadeEnabled(true).build();
private static final RequestOptions requestOptions = new RequestOptions().transforms(new CenterCrop(), new RoundedCorners(16));
private static final RequestOptions REQUEST_OPTIONS = new RequestOptions().transforms(new CenterCrop(), new RoundedCorners(16));
@NonNull
@Override
public ItemViewHolder onCreateViewHolder(@NonNull ViewGroup viewGroup, int i) {
LayoutInflater inflater = LayoutInflater.from(viewGroup.getContext());
View view = inflater.inflate(R.layout.image_item, viewGroup, false);
ListItemBinding binding = ListItemBinding.inflate(LayoutInflater.from(viewGroup.getContext()));
ItemViewHolder viewHolder = new ItemViewHolder(view);
preloadSizeProvider.setView(viewHolder.itemImage);
ItemViewHolder viewHolder = new ItemViewHolder(binding);
preloadSizeProvider.setView(binding.itemImage);
return viewHolder;
}
@ -101,6 +105,14 @@ public class MainItemListAdapter extends PagedListAdapter<ItemWithFeed, MainItem
if (payloads.size() > 0) {
ItemWithFeed itemWithFeed = (ItemWithFeed) payloads.get(0);
holder.bind(itemWithFeed);
holder.applyColors(itemWithFeed);
if (itemWithFeed.getFolder() != null)
holder.binding.itemFolderName.setText(itemWithFeed.getFolder().getName());
else
holder.binding.itemFolderName.setText(R.string.no_folder);
holder.setReadState(itemWithFeed.getItem().isRead());
holder.setSelected(selection.contains(position));
} else
@ -112,56 +124,22 @@ public class MainItemListAdapter extends PagedListAdapter<ItemWithFeed, MainItem
ItemWithFeed itemWithFeed = getItem(i);
viewHolder.bind(itemWithFeed);
if (itemWithFeed.getItem().hasImage()) {
viewHolder.itemImage.setVisibility(View.VISIBLE);
glideRequests
.load(itemWithFeed.getItem().getImageLink())
.centerCrop()
.apply(requestOptions)
.diskCacheStrategy(DiskCacheStrategy.ALL)
.transition(DrawableTransitionOptions.withCrossFade(FADE_FACTORY))
.into(viewHolder.itemImage);
} else
viewHolder.itemImage.setVisibility(View.GONE);
if (itemWithFeed.getFeedIconUrl() != null) {
glideRequests.
load(itemWithFeed.getFeedIconUrl())
.diskCacheStrategy(DiskCacheStrategy.ALL)
.placeholder(R.drawable.ic_rss_feed)
.into(viewHolder.feedIcon);
} else
viewHolder.feedIcon.setImageResource(R.drawable.ic_rss_feed);
Resources resources = viewHolder.itemView.getResources();
if (itemWithFeed.getBgColor() != 0) {
viewHolder.feedName.setTextColor(itemWithFeed.getBgColor());
Utils.setDrawableColor(viewHolder.date.getBackground(), itemWithFeed.getBgColor());
} else if (itemWithFeed.getColor() != 0) {
viewHolder.feedName.setTextColor(itemWithFeed.getColor());
Utils.setDrawableColor(viewHolder.date.getBackground(), itemWithFeed.getColor());
} else if (itemWithFeed.getBgColor() == 0 && itemWithFeed.getColor() == 0) {
viewHolder.feedName.setTextColor(resources.getColor(android.R.color.tab_indicator_text));
Utils.setDrawableColor(viewHolder.date.getBackground(),
ContextCompat.getColor(viewHolder.itemView.getContext(), R.color.colorPrimary));
}
viewHolder.setImages(itemWithFeed);
viewHolder.applyColors(itemWithFeed);
int minutes = (int) Math.round(itemWithFeed.getItem().getReadTime());
if (minutes < 1)
viewHolder.itemReadTime.setText(R.string.read_time_lower_than_1);
viewHolder.binding.itemReadtime.setText(R.string.read_time_lower_than_1);
else if (minutes > 1)
viewHolder.itemReadTime.setText(resources.getString(R.string.read_time, String.valueOf(minutes)));
viewHolder.binding.itemReadtime.setText(viewHolder.itemView.getContext().
getString(R.string.read_time, String.valueOf(minutes)));
else
viewHolder.itemReadTime.setText(R.string.read_time_one_minute);
viewHolder.binding.itemReadtime.setText(R.string.read_time_one_minute);
if (itemWithFeed.getFolder() != null)
viewHolder.itemFolderName.setText(itemWithFeed.getFolder().getName());
viewHolder.binding.itemFolderName.setText(itemWithFeed.getFolder().getName());
else
viewHolder.itemFolderName.setText(R.string.no_folder);
viewHolder.binding.itemFolderName.setText(R.string.no_folder);
viewHolder.setReadState(itemWithFeed.getItem().isRead());
viewHolder.setSelected(selection.contains(viewHolder.getAdapterPosition()));
@ -179,7 +157,7 @@ public class MainItemListAdapter extends PagedListAdapter<ItemWithFeed, MainItem
else
selection.add(position);
notifyItemChanged(position);
notifyItemChanged(position, getItem(position));
}
public void clearSelection() {
@ -248,7 +226,7 @@ public class MainItemListAdapter extends PagedListAdapter<ItemWithFeed, MainItem
return glideRequests
.load(url)
.centerCrop()
.apply(requestOptions)
.apply(REQUEST_OPTIONS)
.diskCacheStrategy(DiskCacheStrategy.ALL)
.transition(DrawableTransitionOptions.withCrossFade(FADE_FACTORY));
}
@ -265,19 +243,12 @@ public class MainItemListAdapter extends PagedListAdapter<ItemWithFeed, MainItem
public class ItemViewHolder extends RecyclerView.ViewHolder {
private TextView itemTitle;
private TextView date;
private TextView feedName;
private TextView itemDescription;
private ImageView feedIcon;
private ImageView itemImage;
private TextView itemReadTime;
private TextView itemFolderName;
private ListItemBinding binding;
View[] alphaViews;
ItemViewHolder(@NonNull View itemView) {
super(itemView);
ItemViewHolder(ListItemBinding binding) {
super(binding.getRoot());
this.binding = binding;
itemView.setOnClickListener((view -> {
int position = getAdapterPosition();
@ -295,41 +266,74 @@ public class MainItemListAdapter extends PagedListAdapter<ItemWithFeed, MainItem
return true;
});
itemTitle = itemView.findViewById(R.id.item_title);
date = itemView.findViewById(R.id.item_date);
feedName = itemView.findViewById(R.id.item_feed_title);
itemDescription = itemView.findViewById(R.id.item_description);
feedIcon = itemView.findViewById(R.id.item_feed_icon);
itemImage = itemView.findViewById(R.id.item_image);
itemReadTime = itemView.findViewById(R.id.item_readtime);
itemFolderName = itemView.findViewById(R.id.item_folder_name);
alphaViews = new View[]{
date,
itemFolderName,
feedIcon,
feedName,
itemDescription,
itemTitle,
itemImage,
itemReadTime
binding.itemDate,
binding.itemFolderName,
binding.itemFeedIcon,
binding.itemFeedName,
binding.itemDescription,
binding.itemTitle,
binding.itemImage,
binding.itemReadtime
};
}
private void bind(ItemWithFeed itemWithFeed) {
Item item = itemWithFeed.getItem();
itemTitle.setText(item.getTitle());
date.setText(DateUtils.formatedDateByLocal(item.getPubDate()));
feedName.setText(itemWithFeed.getFeedName());
binding.itemTitle.setText(item.getTitle());
binding.itemDate.setText(DateUtils.formatedDateByLocal(item.getPubDate()));
binding.itemFeedName.setText(itemWithFeed.getFeedName());
if (item.getCleanDescription() != null) {
itemDescription.setVisibility(View.VISIBLE);
itemDescription.setText(item.getCleanDescription());
binding.itemDescription.setVisibility(View.VISIBLE);
binding.itemDescription.setText(item.getCleanDescription());
} else {
itemDescription.setVisibility(View.GONE);
binding.itemDescription.setVisibility(View.GONE);
if (itemWithFeed.getItem().hasImage())
itemTitle.setMaxLines(4);
binding.itemTitle.setMaxLines(4);
}
}
private void setImages(ItemWithFeed itemWithFeed) {
if (itemWithFeed.getItem().hasImage()) {
binding.itemImage.setVisibility(View.VISIBLE);
glideRequests
.load(itemWithFeed.getItem().getImageLink())
.centerCrop()
.apply(REQUEST_OPTIONS)
.diskCacheStrategy(DiskCacheStrategy.ALL)
.transition(DrawableTransitionOptions.withCrossFade(FADE_FACTORY))
.into(binding.itemImage);
} else
binding.itemImage.setVisibility(View.GONE);
if (itemWithFeed.getFeedIconUrl() != null) {
glideRequests.
load(itemWithFeed.getFeedIconUrl())
.diskCacheStrategy(DiskCacheStrategy.ALL)
.placeholder(R.drawable.ic_rss_feed_grey)
.into(binding.itemFeedIcon);
} else
binding.itemFeedIcon.setImageResource(R.drawable.ic_rss_feed_grey);
}
private void applyColors(ItemWithFeed itemWithFeed) {
Resources resources = itemView.getResources();
if (itemWithFeed.getBgColor() != 0) {
binding.itemFeedName.setTextColor(itemWithFeed.getBgColor());
Utils.setDrawableColor(binding.itemDate.getBackground(), itemWithFeed.getBgColor());
} else if (itemWithFeed.getColor() != 0) {
binding.itemFeedName.setTextColor(itemWithFeed.getColor());
Utils.setDrawableColor(binding.itemDate.getBackground(), itemWithFeed.getColor());
} else if (itemWithFeed.getBgColor() == 0 && itemWithFeed.getColor() == 0) {
binding.itemFeedName.setTextColor(resources.getColor(android.R.color.tab_indicator_text));
Utils.setDrawableColor(binding.itemDate.getBackground(),
ContextCompat.getColor(itemView.getContext(), R.color.colorPrimary));
}
}
@ -343,9 +347,9 @@ public class MainItemListAdapter extends PagedListAdapter<ItemWithFeed, MainItem
private void setSelected(boolean selected) {
Context context = itemView.getContext();
if (selected)
if (selected) {
itemView.setBackground(new ColorDrawable(ContextCompat.getColor(context, R.color.selected_background)));
else {
} else {
TypedValue outValue = new TypedValue();
context.getTheme().resolveAttribute(
android.R.attr.selectableItemBackground, outValue, true);
@ -355,7 +359,7 @@ public class MainItemListAdapter extends PagedListAdapter<ItemWithFeed, MainItem
}
public ImageView getItemImage() {
return itemImage;
return binding.itemImage;
}
}
}

2
app/src/main/res/layout/activity_main.xml
View File

@ -72,7 +72,7 @@
android:layout_height="match_parent"
android:scrollbars="vertical"
tools:itemCount="3"
tools:listitem="@layout/image_item"
tools:listitem="@layout/list_item"
tools:visibility="visible" />
</androidx.swiperefreshlayout.widget.SwipeRefreshLayout>

148
app/src/main/res/layout/image_item.xml
View File

@ -1,148 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="?android:attr/selectableItemBackground"
android:clickable="true"
android:focusable="true"
android:padding="6dp">
<RelativeLayout
android:id="@+id/layout_start"
android:layout_width="match_parent"
android:layout_height="wrap_content">
<ImageView
android:id="@+id/item_image"
android:layout_width="150dp"
android:layout_height="92dp"
android:layout_alignParentEnd="true"
android:layout_marginStart="6dp"
android:visibility="gone"
tools:visibility="visible" />
<TextView
android:id="@+id/item_description"
style="@style/TextAppearance.AppCompat.Small"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@id/item_title"
android:layout_alignParentStart="true"
android:layout_toStartOf="@id/item_image"
android:ellipsize="end"
android:maxLines="3"
android:minLines="1"
tools:text="This is an item description" />
<TextView
android:id="@+id/item_title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentStart="true"
android:layout_toStartOf="@id/item_image"
android:ellipsize="end"
android:maxLines="2"
android:minLines="1"
android:textAppearance="@style/TextAppearance.AppCompat.Subhead"
android:textSize="16sp"
android:textStyle="bold"
tools:text="This is an item title with sufficient length" />
</RelativeLayout>
<RelativeLayout
android:id="@+id/layout_end"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@id/layout_start"
android:layout_marginTop="6dp">
<ImageView
android:id="@+id/item_folder_icon"
android:layout_width="20dp"
android:layout_height="20dp"
android:layout_below="@id/item_feed_title_layout"
android:layout_alignParentStart="true"
android:layout_marginTop="6dp"
android:src="@drawable/ic_folder_grey" />
<RelativeLayout
android:id="@+id/item_feed_title_layout"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentStart="true"
android:layout_toStartOf="@id/item_date">
<ImageView
android:id="@+id/item_feed_icon"
android:layout_width="20dp"
android:layout_height="20dp"
android:layout_alignParentStart="true"
android:src="@drawable/ic_rss_feed" />
<TextView
android:id="@+id/item_feed_title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentEnd="true"
android:layout_marginStart="4dp"
android:layout_toEndOf="@id/item_feed_icon"
android:ellipsize="end"
android:maxLines="1"
tools:text="Feed Name" />
</RelativeLayout>
<RelativeLayout
android:id="@+id/item_readtime_layout"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@id/item_date"
android:layout_alignParentEnd="true"
android:layout_marginTop="6dp">
<ImageView
android:id="@+id/item_readtime_icon"
android:layout_width="20dp"
android:layout_height="20dp"
android:src="@drawable/ic_read_time_grey" />
<TextView
android:id="@+id/item_readtime"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="4dp"
android:layout_toEndOf="@id/item_readtime_icon"
tools:text="3 mins" />
</RelativeLayout>
<TextView
android:id="@+id/item_date"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentEnd="true"
android:layout_marginStart="4dp"
android:background="@drawable/item_date_background"
android:paddingStart="8dp"
android:paddingTop="1dp"
android:paddingEnd="8dp"
android:paddingBottom="1dp"
android:textColor="@color/colorBackground"
tools:text="8 feb 2019" />
<TextView
android:id="@+id/item_folder_name"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@id/item_feed_title_layout"
android:layout_marginStart="6dp"
android:layout_marginTop="6dp"
android:layout_toEndOf="@id/item_folder_icon"
tools:text="Folder 1" />
</RelativeLayout>
</RelativeLayout>

151
app/src/main/res/layout/list_item.xml Normal file
View File

@ -0,0 +1,151 @@
<?xml version="1.0" encoding="utf-8"?>
<layout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools">
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="?android:attr/selectableItemBackground"
android:clickable="true"
android:focusable="true"
android:padding="6dp">
<RelativeLayout
android:id="@+id/layout_start"
android:layout_width="match_parent"
android:layout_height="wrap_content">
<ImageView
android:id="@+id/item_image"
android:layout_width="150dp"
android:layout_height="92dp"
android:layout_alignParentEnd="true"
android:layout_marginStart="6dp"
android:visibility="gone"
tools:visibility="visible" />
<TextView
android:id="@+id/item_description"
style="@style/TextAppearance.AppCompat.Small"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@id/item_title"
android:layout_alignParentStart="true"
android:layout_toStartOf="@id/item_image"
android:ellipsize="end"
android:maxLines="3"
android:minLines="1"
tools:text="This is an item description" />
<TextView
android:id="@+id/item_title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentStart="true"
android:layout_toStartOf="@id/item_image"
android:ellipsize="end"
android:maxLines="2"
android:minLines="1"
android:textAppearance="@style/TextAppearance.AppCompat.Subhead"
android:textSize="16sp"
android:textStyle="bold"
tools:text="This is an item title with sufficient length" />
</RelativeLayout>
<RelativeLayout
android:id="@+id/layout_end"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@id/layout_start"
android:layout_marginTop="6dp">
<ImageView
android:id="@+id/item_folder_icon"
android:layout_width="20dp"
android:layout_height="20dp"
android:layout_below="@id/item_feed_title_layout"
android:layout_alignParentStart="true"
android:layout_marginTop="6dp"
android:src="@drawable/ic_folder_grey" />
<RelativeLayout
android:id="@+id/item_feed_title_layout"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentStart="true"
android:layout_toStartOf="@id/item_date">
<ImageView
android:id="@+id/item_feed_icon"
android:layout_width="20dp"
android:layout_height="20dp"
android:layout_alignParentStart="true"
android:src="@drawable/ic_rss_feed_grey" />
<TextView
android:id="@+id/item_feed_name"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentEnd="true"
android:layout_marginStart="4dp"
android:layout_toEndOf="@id/item_feed_icon"
android:ellipsize="end"
android:maxLines="1"
tools:text="Feed Name" />
</RelativeLayout>
<RelativeLayout
android:id="@+id/item_readtime_layout"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@id/item_date"
android:layout_alignParentEnd="true"
android:layout_marginTop="6dp">
<ImageView
android:id="@+id/item_readtime_icon"
android:layout_width="20dp"
android:layout_height="20dp"
android:src="@drawable/ic_read_time_grey" />
<TextView
android:id="@+id/item_readtime"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="4dp"
android:layout_toEndOf="@id/item_readtime_icon"
tools:text="3 mins" />
</RelativeLayout>
<TextView
android:id="@+id/item_date"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentEnd="true"
android:layout_marginStart="4dp"
android:background="@drawable/item_date_background"
android:paddingStart="8dp"
android:paddingTop="1dp"
android:paddingEnd="8dp"
android:paddingBottom="1dp"
android:textColor="@color/colorBackground"
tools:text="8 feb 2019" />
<TextView
android:id="@+id/item_folder_name"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@id/item_feed_title_layout"
android:layout_marginStart="6dp"
android:layout_marginTop="6dp"
android:layout_toEndOf="@id/item_folder_icon"
tools:text="Folder 1" />
</RelativeLayout>
</RelativeLayout>
</layout>