[1.206.*] Pre-release merge (#670)

msasikanth · Jul 28, 2024 · 543f902 · 543f902
2 parents 727938f + 092f69c
commit 543f902
Show file tree

Hide file tree

Showing 8 changed files with 84 additions and 18 deletions.
diff --git a/shared/src/commonMain/kotlin/dev/sasikanth/rss/reader/home/HomePresenter.kt b/shared/src/commonMain/kotlin/dev/sasikanth/rss/reader/home/HomePresenter.kt
@@ -349,6 +349,32 @@ class HomePresenter(
         .onEach { hasFeeds -> _state.update { it.copy(hasFeeds = hasFeeds) } }
         .launchIn(coroutineScope)
 
+      combine(observableActiveSource.activeSource, settingsRepository.postsType) {
+          activeSource,
+          postsType ->
+          Pair(activeSource, postsType)
+        }
+        .flatMapLatest { (activeSource, postsType) ->
+          val postsAfter =
+            when (postsType) {
+              PostsType.ALL,
+              PostsType.UNREAD -> Instant.DISTANT_PAST
+              PostsType.TODAY -> {
+                getTodayStartInstant()
+              }
+              PostsType.LAST_24_HOURS -> {
+                getLast24HourStart()
+              }
+            }
+
+          rssRepository.hasUnreadPosts(
+            sourceId = activeSource?.id,
+            postsAfter = postsAfter,
+          )
+        }
+        .onEach { hasUnreadPosts -> _state.update { it.copy(hasUnreadPosts = hasUnreadPosts) } }
+        .launchIn(coroutineScope)
+
       settingsRepository.enableFeaturedItemBlur
         .onEach { value -> _state.update { it.copy(featuredItemBlurEnabled = value) } }
         .launchIn(coroutineScope)

diff --git a/shared/src/commonMain/kotlin/dev/sasikanth/rss/reader/home/HomeState.kt b/shared/src/commonMain/kotlin/dev/sasikanth/rss/reader/home/HomeState.kt
@@ -37,7 +37,8 @@ internal data class HomeState(
   val activeSource: Source?,
   val featuredItemBlurEnabled: Boolean,
   val hasFeeds: Boolean?,
-  val postsType: PostsType
+  val postsType: PostsType,
+  val hasUnreadPosts: Boolean
 ) {
 
   companion object {
@@ -51,7 +52,8 @@ internal data class HomeState(
         activeSource = null,
         featuredItemBlurEnabled = true,
         hasFeeds = null,
-        postsType = PostsType.ALL
+        postsType = PostsType.ALL,
+        hasUnreadPosts = false,
       )
   }
 

diff --git a/shared/src/commonMain/kotlin/dev/sasikanth/rss/reader/home/ui/HomeScreen.kt b/shared/src/commonMain/kotlin/dev/sasikanth/rss/reader/home/ui/HomeScreen.kt
@@ -156,6 +156,7 @@ internal fun HomeScreen(homePresenter: HomePresenter, modifier: Modifier = Modif
               postsType = state.postsType,
               listState = listState,
               hasFeeds = hasFeeds,
+              hasUnreadPosts = state.hasUnreadPosts,
               onSearchClicked = { homePresenter.dispatch(HomeEvent.SearchClicked) },
               onBookmarksClicked = { homePresenter.dispatch(HomeEvent.BookmarksClicked) },
               onSettingsClicked = { homePresenter.dispatch(HomeEvent.SettingsClicked) },

diff --git a/shared/src/commonMain/kotlin/dev/sasikanth/rss/reader/home/ui/HomeTopAppBar.kt b/shared/src/commonMain/kotlin/dev/sasikanth/rss/reader/home/ui/HomeTopAppBar.kt
@@ -16,6 +16,8 @@
 
 package dev.sasikanth.rss.reader.home.ui
 
+import androidx.compose.animation.animateColor
+import androidx.compose.animation.core.updateTransition
 import androidx.compose.foundation.background
 import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.Arrangement
@@ -41,9 +43,11 @@ import androidx.compose.material.icons.rounded.MoreVert
 import androidx.compose.material.icons.rounded.Search
 import androidx.compose.material3.Icon
 import androidx.compose.material3.IconButton
+import androidx.compose.material3.LocalContentColor
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.CompositionLocalProvider
 import androidx.compose.runtime.ReadOnlyComposable
 import androidx.compose.runtime.derivedStateOf
 import androidx.compose.runtime.getValue
@@ -77,6 +81,7 @@ internal fun HomeTopAppBar(
   postsType: PostsType,
   listState: LazyListState,
   hasFeeds: Boolean?,
+  hasUnreadPosts: Boolean,
   modifier: Modifier = Modifier,
   onSearchClicked: () -> Unit,
   onBookmarksClicked: () -> Unit,
@@ -138,7 +143,11 @@ internal fun HomeTopAppBar(
       ) {
         PostsFilterButton(postsType = postsType, onPostTypeChanged = onPostTypeChanged)
 
-        MarkPostsAsReadButton(source = source, onMarkPostsAsRead = onMarkPostsAsRead)
+        MarkPostsAsReadButton(
+          source = source,
+          onMarkPostsAsRead = onMarkPostsAsRead,
+          enabled = hasUnreadPosts,
+        )
       }
     }
   }
@@ -223,29 +232,41 @@ private fun MarkPostsAsReadButton(
   source: Source?,
   onMarkPostsAsRead: (Source?) -> Unit,
   modifier: Modifier = Modifier,
+  enabled: Boolean = true,
 ) {
+  val transition = updateTransition(enabled, "button_enable_state")
+  val backgroundColor by
+    transition.animateColor {
+      if (it) Color.White.copy(alpha = 0.12f) else Color.White.copy(alpha = 0f)
+    }
+  val contentColor by
+    transition.animateColor {
+      if (it) AppTheme.colorScheme.textEmphasisHigh
+      else AppTheme.colorScheme.onSurface.copy(alpha = 0.38f)
+    }
+
   Row(
     modifier =
       modifier
         .clip(RoundedCornerShape(8.dp))
-        .clickable(onClick = { onMarkPostsAsRead(source) })
-        .background(color = Color.White.copy(alpha = 0.12f))
+        .clickable(enabled = enabled, onClick = { onMarkPostsAsRead(source) })
+        .background(color = backgroundColor)
         .padding(vertical = 4.dp)
         .padding(start = 8.dp, end = 12.dp),
     horizontalArrangement = Arrangement.spacedBy(8.dp),
   ) {
-    Text(
-      text = LocalStrings.current.markAsRead,
-      style = MaterialTheme.typography.bodyMedium,
-      color = AppTheme.colorScheme.textEmphasisHigh,
-    )
+    CompositionLocalProvider(LocalContentColor provides contentColor) {
+      Text(
+        text = LocalStrings.current.markAsRead,
+        style = MaterialTheme.typography.bodyMedium,
+      )
 
-    Icon(
-      imageVector = Icons.Filled.DoneAll,
-      contentDescription = null,
-      modifier = Modifier.requiredSize(20.dp),
-      tint = AppTheme.colorScheme.textEmphasisHigh,
-    )
+      Icon(
+        imageVector = Icons.Filled.DoneAll,
+        contentDescription = null,
+        modifier = Modifier.requiredSize(20.dp),
+      )
+    }
   }
 }
 

diff --git a/shared/src/commonMain/kotlin/dev/sasikanth/rss/reader/reader/ui/ReaderHTML.kt b/shared/src/commonMain/kotlin/dev/sasikanth/rss/reader/reader/ui/ReaderHTML.kt
@@ -16,6 +16,7 @@
 
 package dev.sasikanth.rss.reader.reader.ui
 
+import androidx.compose.ui.unit.LayoutDirection
 import twine.shared.generated.resources.Res
 
 object ReaderHTML {
@@ -26,6 +27,7 @@ object ReaderHTML {
     feedHomePageLink: String,
     publishedAt: String,
     locale: String,
+    direction: LayoutDirection
   ): String {
     val readabilityJS = readFile("readability.js")
     val readerJS = readFile("main.js")
@@ -41,7 +43,7 @@ object ReaderHTML {
 
     // language=HTML
     return """
-    <html lang="$locale">
+    <html lang="$locale" dir="${direction.name}">
     <head>
       <link rel="preconnect" href="https://fonts.googleapis.com">
       <link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>

diff --git a/shared/src/commonMain/kotlin/dev/sasikanth/rss/reader/reader/ui/ReaderScreen.kt b/shared/src/commonMain/kotlin/dev/sasikanth/rss/reader/reader/ui/ReaderScreen.kt
@@ -44,6 +44,7 @@ import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.toArgb
+import androidx.compose.ui.platform.LocalLayoutDirection
 import androidx.compose.ui.text.intl.Locale
 import androidx.compose.ui.unit.dp
 import com.multiplatform.webview.jsbridge.rememberWebViewJsBridge
@@ -240,6 +241,7 @@ internal fun ReaderScreen(
           this.supportZoom = false
         }
 
+        val layoutDirection = LocalLayoutDirection.current
         LaunchedEffect(state.content) {
           withContext(dispatchersProvider.io) {
             val htmlTemplate =
@@ -248,7 +250,8 @@ internal fun ReaderScreen(
                 feedName = state.feed!!.name,
                 feedHomePageLink = state.feed!!.homepageLink,
                 publishedAt = state.publishedAt!!,
-                locale = Locale.current.toLanguageTag()
+                locale = Locale.current.toLanguageTag(),
+                direction = layoutDirection
               )
 
             navigator.loadHtml(htmlTemplate, state.link)

diff --git a/shared/src/commonMain/kotlin/dev/sasikanth/rss/reader/repository/RssRepository.kt b/shared/src/commonMain/kotlin/dev/sasikanth/rss/reader/repository/RssRepository.kt
@@ -846,6 +846,14 @@ class RssRepository(
     }
   }
 
+  fun hasUnreadPosts(sourceId: String?, postsAfter: Instant = Instant.DISTANT_PAST): Flow<Boolean> {
+    return postQueries
+      .unreadPostsCount(sourceId = sourceId, after = postsAfter)
+      .asFlow()
+      .mapToOne(ioDispatcher)
+      .map { it > 0 }
+  }
+
   private fun sanitizeSearchQuery(searchQuery: String): String {
     return searchQuery.replace(Regex.fromLiteral("\""), "\"\"").run { "\"$this\"" }
   }

diff --git a/shared/src/commonMain/sqldelight/dev/sasikanth/rss/reader/database/Post.sq b/shared/src/commonMain/sqldelight/dev/sasikanth/rss/reader/database/Post.sq
@@ -118,3 +118,6 @@ WHERE post.id = :id;
 
 hasPost:
 SELECT EXISTS(SELECT 1 FROM post WHERE id = :id);
+
+unreadPostsCount:
+SELECT COUNT(*) FROM post WHERE read != 1 AND date > :after AND (sourceId = :sourceId OR :sourceId IS NULL);