Compare commits

..

2 Commits

Author SHA1 Message Date
1f67f2fdee Fixes #121. 2017-11-21 19:05:14 +01:00
ebf4d294a8 Fixing infinite scroll trying to load more items when there are no more. 2017-11-20 21:08:13 +01:00
5 changed files with 14 additions and 11 deletions

View File

@ -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.

View File

@ -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)
}

View File

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

View File

@ -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"

View File

@ -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