Fixed small images being rendered too large and flickering on scroll

Fixed compose stability. Now items in reader are not re-rendered when
scrolling.

Fixed small images being rendered too large on screen

Author: spacecowboy

.editorconfig

@@ -14,6 +14,7 @@ ij_visual_guides = none
 ij_wrap_on_typing = false
 
 [*.{kt,kts}]
+max_line_length = 200
 ktlint_code_style = ktlint_official
 ktlint_function_naming_ignore_when_annotated_with=Composable
 twitter_compose_allowed_composition_locals = LocalTypographySettings,LocalDimens,LocalWindowSize,LocalFoldableHinge

app/build.gradle.kts

@@ -3,6 +3,7 @@ plugins {
     alias(libs.plugins.kotlin.android)
     alias(libs.plugins.kotlin.ksp)
     alias(libs.plugins.kotlin.parcelize)
+    alias(libs.plugins.kotlin.serialization)
 }
 
 android {
@@ -184,25 +185,21 @@ android {
     }
 }
 
-// https://chris.banes.dev/composable-metrics/
-// gw installDebugMini -Pmyapp.enableComposeCompilerReports=true
-// build/compose_metrics/[...]-composables.txt
-// tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).configureEach {
-//  kotlinOptions {
-//    if (project.findProperty("myapp.enableComposeCompilerReports") == "true") {
-//      freeCompilerArgs += [
-//              "-P",
-//              "plugin:androidx.compose.compiler.plugins.kotlin:reportsDestination=" +
-//                      project.buildDir.absolutePath + "/compose_metrics"
-//      ]
-//      freeCompilerArgs += [
-//              "-P",
-//              "plugin:androidx.compose.compiler.plugins.kotlin:metricsDestination=" +
-//                      project.buildDir.absolutePath + "/compose_metrics"
-//      ]
-//    }
-//  }
-// }
+// gw installDebug -Pmyapp.enableComposeCompilerReports=true --rerun-tasks
+tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile::class.java) {
+    kotlinOptions {
+        if (project.findProperty("myapp.enableComposeCompilerReports") == "true") {
+            freeCompilerArgs += listOf(
+                "-P",
+                "plugin:androidx.compose.compiler.plugins.kotlin:reportsDestination=${project.buildDir.resolve("compose_metrics").canonicalPath}"
+            )
+            freeCompilerArgs += listOf(
+                "-P",
+                "plugin:androidx.compose.compiler.plugins.kotlin:metricsDestination=${project.buildDir.resolve("compose_metrics").canonicalPath}"
+            )
+        }
+    }
+}
 
 configurations.all {
     resolutionStrategy {

app/src/androidTest/java/com/nononsenseapps/feeder/db/room/MigrationFromLegacy5ToLatest.kt

@@ -281,7 +281,7 @@ class MigrationFromLegacy5ToLatest {
                     assertTrue(it.unread)
                     assertNull(it.author)
                     assertNull(it.enclosureLink)
-                    assertNull(it.imageUrl)
+                    assertNull(it.thumbnailImage)
                     assertNull(it.pubDate)
                     assertNull(it.link)
                     assertFalse(it.notified)
@@ -318,7 +318,7 @@ class MigrationFromLegacy5ToLatest {
                     assertFalse(it.unread)
                     assertEquals("author$index", it.author)
                     assertEquals("https://enclosure$index", it.enclosureLink)
-                    assertEquals("https://image$index", it.imageUrl)
+                    assertEquals("https://image$index", it.thumbnailImage?.url)
                     assertEquals(ZonedDateTime.of(2018, 2, 3, 4, 5, 0, 0, ZoneOffset.UTC), it.pubDate)
                     assertEquals("https://link$index", it.link)
                     assertTrue(it.notified)

app/src/androidTest/java/com/nononsenseapps/feeder/db/room/MigrationFromLegacy6ToLatest.kt

@@ -254,7 +254,7 @@ class MigrationFromLegacy6ToLatest {
                     assertTrue(it.unread)
                     assertNull(it.author)
                     assertNull(it.enclosureLink)
-                    assertNull(it.imageUrl)
+                    assertNull(it.thumbnailImage)
                     assertNull(it.pubDate)
                     assertNull(it.link)
                     assertFalse(it.notified)
@@ -289,7 +289,7 @@ class MigrationFromLegacy6ToLatest {
                     assertFalse(it.unread)
                     assertEquals("author$index", it.author)
                     assertEquals("https://enclosure$index", it.enclosureLink)
-                    assertEquals("https://image$index", it.imageUrl)
+                    assertEquals("https://image$index", it.thumbnailImage?.url)
                     assertEquals(ZonedDateTime.of(2018, 2, 3, 4, 5, 0, 0, ZoneOffset.UTC), it.pubDate)
                     assertEquals("https://link$index", it.link)
                     assertTrue(it.notified)

app/src/main/java/com/nononsenseapps/feeder/archmodel/FeedItemStore.kt

@@ -9,15 +9,15 @@ import com.nononsenseapps.feeder.db.room.AppDatabase
 import com.nononsenseapps.feeder.db.room.FeedItem
 import com.nononsenseapps.feeder.db.room.FeedItemCursor
 import com.nononsenseapps.feeder.db.room.FeedItemDao
-import com.nononsenseapps.feeder.db.room.FeedItemDao.Companion.feedItemsListOrderByAsc
-import com.nononsenseapps.feeder.db.room.FeedItemDao.Companion.feedItemsListOrderByDesc
+import com.nononsenseapps.feeder.db.room.FeedItemDao.Companion.FEED_ITEM_LIST_SORT_ORDER_ASC
+import com.nononsenseapps.feeder.db.room.FeedItemDao.Companion.FEED_ITEM_LIST_SORT_ORDER_DESC
 import com.nononsenseapps.feeder.db.room.FeedItemIdWithLink
 import com.nononsenseapps.feeder.db.room.FeedItemWithFeed
 import com.nononsenseapps.feeder.db.room.ID_SAVED_ARTICLES
 import com.nononsenseapps.feeder.db.room.ID_UNSET
 import com.nononsenseapps.feeder.db.room.upsertFeedItems
+import com.nononsenseapps.feeder.model.PREVIEW_COLUMNS
 import com.nononsenseapps.feeder.model.PreviewItem
-import com.nononsenseapps.feeder.model.previewColumns
 import com.nononsenseapps.feeder.ui.compose.feed.FeedListItem
 import com.nononsenseapps.feeder.ui.compose.feedarticle.FeedListFilter
 import kotlinx.coroutines.Dispatchers
@@ -77,15 +77,15 @@ class FeedItemStore(override val di: DI) : DIAware {
             val args = mutableListOf<Any?>()
 
             queryString.apply {
-                append("SELECT $previewColumns FROM feed_items\n")
+                append("SELECT $PREVIEW_COLUMNS FROM feed_items\n")
                 append("LEFT JOIN feeds ON feed_items.feed_id = feeds.id\n")
                 append("WHERE\n")
 
                 rawQueryFilter(filter, args, minReadTime, feedId, tag)
 
                 when (newestFirst) {
-                    true -> append("ORDER BY $feedItemsListOrderByDesc\n")
-                    else -> append("ORDER BY $feedItemsListOrderByAsc\n")
+                    true -> append("ORDER BY $FEED_ITEM_LIST_SORT_ORDER_DESC\n")
+                    else -> append("ORDER BY $FEED_ITEM_LIST_SORT_ORDER_ASC\n")
                 }
             }
 
@@ -276,8 +276,7 @@ class FeedItemStore(override val di: DI) : DIAware {
         dao.markAllAsRead()
     }
 
-    fun getFeedsItemsWithDefaultFullTextNeedingDownload(): Flow<List<FeedItemIdWithLink>> =
-        dao.getFeedsItemsWithDefaultFullTextNeedingDownload()
+    fun getFeedsItemsWithDefaultFullTextNeedingDownload(): Flow<List<FeedItemIdWithLink>> = dao.getFeedsItemsWithDefaultFullTextNeedingDownload()
 
     suspend fun markAsFullTextDownloaded(feedItemId: Long) = dao.markAsFullTextDownloaded(feedItemId)
 
@@ -332,7 +331,7 @@ private fun PreviewItem.toFeedListItem() =
         feedTitle = feedDisplayTitle,
         unread = readTime == null,
         pubDate = pubDate?.toLocalDateTime()?.formatDynamically() ?: "",
-        imageUrl = imageUrl,
+        image = image,
         link = link,
         bookmarked = bookmarked,
         feedImageUrl = feedImageUrl,

app/src/main/java/com/nononsenseapps/feeder/archmodel/Repository.kt

@@ -24,6 +24,7 @@ import com.nononsenseapps.feeder.db.room.ID_UNSET
 import com.nononsenseapps.feeder.db.room.RemoteFeed
 import com.nononsenseapps.feeder.db.room.SyncDevice
 import com.nononsenseapps.feeder.db.room.SyncRemote
+import com.nononsenseapps.feeder.model.ThumbnailImage
 import com.nononsenseapps.feeder.model.workmanager.SyncServiceSendReadWorker
 import com.nononsenseapps.feeder.model.workmanager.requestFeedSync
 import com.nononsenseapps.feeder.sync.DeviceListResponse
@@ -510,8 +511,7 @@ class Repository(override val di: DI) : DIAware {
 
     fun ensurePeriodicSyncConfigured() = settingsStore.configurePeriodicSync(replace = false)
 
-    fun getFeedsItemsWithDefaultFullTextNeedingDownload(): Flow<List<FeedItemIdWithLink>> =
-        feedItemStore.getFeedsItemsWithDefaultFullTextNeedingDownload()
+    fun getFeedsItemsWithDefaultFullTextNeedingDownload(): Flow<List<FeedItemIdWithLink>> = feedItemStore.getFeedsItemsWithDefaultFullTextNeedingDownload()
 
     suspend fun markAsFullTextDownloaded(feedItemId: Long) = feedItemStore.markAsFullTextDownloaded(feedItemId)
 
@@ -796,8 +796,7 @@ data class Article(
     val bookmarked: Boolean = item?.bookmarked ?: false
     val wordCount: Int = item?.wordCount ?: 0
     val wordCountFull: Int = item?.wordCountFull ?: 0
-    val image: String? = item?.imageUrl
-    val imageFromBody: Boolean = item?.imageFromBody ?: false
+    val image: ThumbnailImage? = item?.thumbnailImage
 }
 
 enum class TextToDisplay {

app/src/main/java/com/nononsenseapps/feeder/db/room/Converters.kt

@@ -1,7 +1,11 @@
 package com.nononsenseapps.feeder.db.room
 
 import androidx.room.TypeConverter
+import com.nononsenseapps.feeder.model.ImageFromHTML
+import com.nononsenseapps.feeder.model.ThumbnailImage
 import com.nononsenseapps.feeder.util.sloppyLinkToStrictURLNoThrows
+import kotlinx.serialization.encodeToString
+import kotlinx.serialization.json.Json
 import java.net.URL
 import java.time.Instant
 import java.time.ZonedDateTime
@@ -38,4 +42,27 @@ class Converters {
 
     @TypeConverter
     fun longFromInstant(value: Instant?): Long? = value?.toEpochMilli()
+
+    @TypeConverter
+    fun stringFromThumbnailImage(value: ThumbnailImage?): String? =
+        value?.let {
+            Json.encodeToString(it)
+        }
+
+    @TypeConverter
+    fun thumbnailImageFromString(value: String?): ThumbnailImage? =
+        value?.let {
+            try {
+                Json.decodeFromString<ThumbnailImage>(it)
+            } catch (_: Throwable) {
+                // Legacy values may be stored as just a URL
+                try {
+                    val url = URL(it)
+                    // But we don't know what type so we pick a conservative default
+                    ImageFromHTML(url = url.toString(), width = null, height = null)
+                } catch (_: Throwable) {
+                    null
+                }
+            }
+        }
 }

app/src/main/java/com/nononsenseapps/feeder/db/room/FeedItem.kt

@@ -30,6 +30,7 @@ import com.nononsenseapps.feeder.db.COL_WORD_COUNT_FULL
 import com.nononsenseapps.feeder.db.FEED_ITEMS_TABLE_NAME
 import com.nononsenseapps.feeder.model.ParsedArticle
 import com.nononsenseapps.feeder.model.ParsedFeed
+import com.nononsenseapps.feeder.model.ThumbnailImage
 import com.nononsenseapps.feeder.model.host
 import com.nononsenseapps.feeder.ui.text.HtmlToPlainTextConverter
 import java.net.URI
@@ -74,8 +75,13 @@ data class FeedItem
         var title: String = "",
         @ColumnInfo(name = COL_PLAINTITLE) var plainTitle: String = "",
         @ColumnInfo(name = COL_PLAINSNIPPET) var plainSnippet: String = "",
-        @ColumnInfo(name = COL_IMAGEURL) var imageUrl: String? = null,
-        @ColumnInfo(name = COL_IMAGE_FROM_BODY) var imageFromBody: Boolean = false,
+        @ColumnInfo(name = COL_IMAGEURL) var thumbnailImage: ThumbnailImage? = null,
+        @ColumnInfo(name = COL_IMAGE_FROM_BODY)
+        @Deprecated(
+            "This column has been 'removed' but sqlite doesn't support drop column.",
+            replaceWith = ReplaceWith("thumbnailImage?.fromBody ?: false"),
+        )
+        var imageFromBody: Boolean = false,
         @ColumnInfo(name = COL_ENCLOSURELINK) var enclosureLink: String? = null,
         @ColumnInfo(name = COL_ENCLOSURE_TYPE) var enclosureType: String? = null,
         @ColumnInfo(name = COL_AUTHOR) var author: String? = null,
@@ -152,8 +158,7 @@ data class FeedItem
             this.title = this.plainTitle
             this.plainSnippet = summary
 
-            this.imageUrl = safeImage?.url
-            this.imageFromBody = safeImage?.fromBody ?: false
+            this.thumbnailImage = safeImage
             val firstEnclosure = entry.attachments?.firstOrNull()
             this.enclosureLink = firstEnclosure?.url
             this.enclosureType = firstEnclosure?.mime_type?.lowercase()