Fixes #121.

CHANGELOG.md

@@ -1,3 +1,11 @@
+**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.
+
 **1.5.4.13**
 
 - Displaying the right number of items.

app/src/main/java/apps/amine/bou/readerforselfoss/HomeActivity.kt

@@ -208,7 +208,7 @@ class HomeActivity : AppCompatActivity(), SearchView.OnQueryTextListener {
                                 else -> 0
                             }
 
-                            if (lastVisibleItem === items.size && items.size <= maxItemNumber()) {
+                            if (lastVisibleItem === items.size && items.size <= maxItemNumber() && maxItemNumber() >= itemsNumber) {
                                 getElementsAccordingToTab(appendResults = true, offsetOverride = lastVisibleItem)
                             }
 

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()

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"

build.gradle

@@ -10,7 +10,7 @@ buildscript {
         }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.0.0'
+        classpath 'com.android.tools.build:gradle:3.0.1'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
 
         // NOTE: Do not place your application dependencies here; they belong