diff --git a/app/src/main/java/com/readrops/app/adapters/MainItemListAdapter.java b/app/src/main/java/com/readrops/app/adapters/MainItemListAdapter.java index 937d7252..6abd08e0 100644 --- a/app/src/main/java/com/readrops/app/adapters/MainItemListAdapter.java +++ b/app/src/main/java/com/readrops/app/adapters/MainItemListAdapter.java @@ -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 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 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 { int position = getAdapterPosition(); @@ -295,41 +266,74 @@ public class MainItemListAdapter extends PagedListAdapter diff --git a/app/src/main/res/layout/image_item.xml b/app/src/main/res/layout/image_item.xml deleted file mode 100644 index 8f76e64d..00000000 --- a/app/src/main/res/layout/image_item.xml +++ /dev/null @@ -1,148 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/list_item.xml b/app/src/main/res/layout/list_item.xml new file mode 100644 index 00000000..2ec8dd54 --- /dev/null +++ b/app/src/main/res/layout/list_item.xml @@ -0,0 +1,151 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file