From 1f67f2fdee44e0741bb95f5f22f54b87b9ddb7f2 Mon Sep 17 00:00:00 2001 From: Amine Date: Tue, 21 Nov 2017 19:05:14 +0100 Subject: [PATCH] Fixes #121. --- CHANGELOG.md | 4 ++++ .../readerforselfoss/adapters/SourcesListAdapter.kt | 12 ++++-------- app/src/main/res/layout/activity_sources.xml | 1 - 3 files changed, 8 insertions(+), 9 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9d0882e..9feb755 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,7 @@ +**1.5.4.15** + +- Fixed an issue with the sources list. + **1.5.4.14** - Fixing infinite scroll trying to load more items when there are no more. diff --git a/app/src/main/java/apps/amine/bou/readerforselfoss/adapters/SourcesListAdapter.kt b/app/src/main/java/apps/amine/bou/readerforselfoss/adapters/SourcesListAdapter.kt index 6959542..ed6eba4 100644 --- a/app/src/main/java/apps/amine/bou/readerforselfoss/adapters/SourcesListAdapter.kt +++ b/app/src/main/java/apps/amine/bou/readerforselfoss/adapters/SourcesListAdapter.kt @@ -46,21 +46,17 @@ class SourcesListAdapter(private val app: Activity, .builder() .round() .build(itm.title.toTextDrawableString(), color) - holder.itemImage.setImageDrawable(drawable) + holder.mView.itemImage.setImageDrawable(drawable) } else { - c.circularBitmapDrawable(itm.getIcon(c), holder.itemImage) + c.circularBitmapDrawable(itm.getIcon(c), holder.mView.itemImage) } - holder.sourceTitle.text = itm.title + holder.mView.sourceTitle.text = itm.title } - override fun getItemCount(): Int { - return items.size - } + override fun getItemCount(): Int = items.size inner class ViewHolder(internal val mView: ConstraintLayout) : RecyclerView.ViewHolder(mView) { - lateinit var itemImage: ImageView - lateinit var sourceTitle: TextView init { handleClickListeners() diff --git a/app/src/main/res/layout/activity_sources.xml b/app/src/main/res/layout/activity_sources.xml index 67bf875..9d8be0d 100644 --- a/app/src/main/res/layout/activity_sources.xml +++ b/app/src/main/res/layout/activity_sources.xml @@ -35,7 +35,6 @@ android:layout_height="wrap_content" android:layout_gravity="end|bottom|right" android:src="@drawable/ic_add" - android:tint="?android:textColorPrimary" android:paddingBottom="@dimen/activity_vertical_margin" android:paddingTop="@dimen/activity_vertical_margin" android:layout_alignParentBottom="true"