Small tweaks and bugfixes (#162)

* Attempt to fix layout crash with placeholders Default "placeholders" to true for the article pager in an attempt to avoid the IllegalStateException "Error: Placement happened before lookahead." Placeholders in the DB are different from placeholders in the UI, but the error also only happens during scroll. * Tweak font styles on article cards
jocmp · Jul 13, 2024 · 11df0d0 · 11df0d0
1 parent e3cef3d
commit 11df0d0
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 8 deletions.
diff --git a/app/src/main/java/com/capyreader/app/ui/articles/ArticleRow.kt b/app/src/main/java/com/capyreader/app/ui/articles/ArticleRow.kt
@@ -13,6 +13,7 @@ import androidx.compose.material3.ListItemColors
 import androidx.compose.material3.ListItemDefaults
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.MaterialTheme.colorScheme
+import androidx.compose.material3.MaterialTheme.typography
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.Stable
@@ -24,6 +25,10 @@ import androidx.compose.ui.hapticfeedback.HapticFeedbackType
 import androidx.compose.ui.layout.ContentScale
 import androidx.compose.ui.platform.LocalHapticFeedback
 import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.text.TextStyle
+import androidx.compose.ui.text.font.Font
+import androidx.compose.ui.text.font.FontStyle
+import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.tooling.preview.PreviewParameter
@@ -83,6 +88,7 @@ fun ArticleRow(
             headlineContent = {
                 Text(
                     article.title,
+                    fontWeight = titleFontWeight(read = article.read),
                 )
             },
             supportingContent = {
@@ -104,6 +110,8 @@ fun ArticleRow(
                             time = article.publishedAt,
                             currentTime = currentTime,
                         ),
+                        style = typography.labelSmall,
+                        modifier = Modifier.padding(vertical = 4.dp),
                         maxLines = 1,
                     )
                 }
@@ -153,6 +161,14 @@ fun PlaceholderArticleRow() {
     )
 }
 
+@Composable
+fun titleFontWeight(read: Boolean): FontWeight {
+    return if (read) {
+        FontWeight.Normal
+    } else {
+        FontWeight.Bold
+    }
+}
 
 @Composable
 @Stable
@@ -173,12 +189,11 @@ private fun listItemColors(
 @Composable
 fun findFeedNameColor(read: Boolean): Color {
     val defaults = ListItemDefaults.colors()
-    val colorScheme = MaterialTheme.colorScheme
 
     return if (read) {
         defaults.disabledHeadlineColor
     } else {
-        colorScheme.onSurface
+        Color.Unspecified
     }
 }
 
@@ -195,7 +210,7 @@ fun ArticleRowPreview_Selected_DarkMode() {
         contentHTML = "<div>Test</div>",
         extractedContentURL = null,
         imageURL = URL("https://example.com"),
-        summary = "Test article here",
+        summary = "The Galaxy S24 series, while bringing little physical change, packs a lot of AI narrative. One of the biggest Galaxy S24 features is the AI Generative Edit",
         url = URL("https://9to5google.com/?p=605559"),
         updatedAt = ZonedDateTime.of(2024, 2, 11, 8, 33, 0, 0, ZoneOffset.UTC),
         publishedAt = ZonedDateTime.of(2024, 2, 11, 8, 33, 0, 0, ZoneOffset.UTC),
@@ -249,7 +264,7 @@ fun ArticleRowPreview_Unread() {
         summary = "Test article here",
         url = URL("https://9to5google.com/?p=605559"),
         updatedAt = ZonedDateTime.of(2024, 2, 11, 8, 33, 0, 0, ZoneOffset.UTC),
-        publishedAt = ZonedDateTime.of(2024, 2, 11, 8, 33, 0, 0, ZoneOffset.UTC),
+        publishedAt = ZonedDateTime.of(LocalDateTime.now().minusHours(1), ZoneOffset.UTC),
         read = false,
         starred = false,
         feedName = "9to5Google"

diff --git a/app/src/main/java/com/capyreader/app/ui/articles/ArticleScreenViewModel.kt b/app/src/main/java/com/capyreader/app/ui/articles/ArticleScreenViewModel.kt
@@ -17,7 +17,7 @@ import com.jocmp.capy.Countable
 import com.jocmp.capy.Feed
 import com.jocmp.capy.Folder
 import com.jocmp.capy.MarkRead
-import com.jocmp.capy.buildPager
+import com.jocmp.capy.buildArticlePager
 import com.jocmp.capy.common.UnauthorizedError
 import com.jocmp.capy.countAll
 import com.capyreader.app.common.AppPreferences
@@ -54,7 +54,7 @@ class ArticleScreenViewModel(
     }
 
     val articles: Flow<PagingData<Article>> = filter
-        .flatMapLatest { account.buildPager(it).flow }
+        .flatMapLatest { account.buildArticlePager(it).flow }
         .cachedIn(viewModelScope)
 
     val folders: Flow<List<Folder>> = account.folders.combine(_counts) { folders, latestCounts ->

diff --git a/.../main/java/com/jocmp/capy/AccountPager.kt → ...jocmp/capy/AccountBuildArticlePagerExt.kt b/.../main/java/com/jocmp/capy/AccountPager.kt → ...jocmp/capy/AccountBuildArticlePagerExt.kt
@@ -5,15 +5,14 @@ import androidx.paging.PagingConfig
 import com.jocmp.capy.persistence.ArticlePagerFactory
 import java.time.OffsetDateTime
 
-fun Account.buildPager(
+fun Account.buildArticlePager(
     filter: ArticleFilter,
     since: OffsetDateTime = OffsetDateTime.now()
 ): Pager<Int, Article> {
     return Pager(
         config = PagingConfig(
             pageSize = 50,
             prefetchDistance = 10,
-            enablePlaceholders = false
         ),
         pagingSourceFactory = { ArticlePagerFactory(database).find(filter = filter, since = since) }
     )