[1.58.*] Pre-release merge (#288)

msasikanth · Feb 5, 2024 · 8972c96 · 8972c96
2 parents 0e00c94 + 0729cc6
commit 8972c96
Show file tree

Hide file tree

Showing 12 changed files with 377 additions and 181 deletions.
diff --git a/...etwork/src/commonMain/kotlin/dev/sasikanth/rss/reader/core/network/fetcher/FeedFetcher.kt b/...etwork/src/commonMain/kotlin/dev/sasikanth/rss/reader/core/network/fetcher/FeedFetcher.kt
@@ -23,15 +23,18 @@ import dev.sasikanth.rss.reader.core.network.parser.FeedParser.Companion.ATTR_TY
 import dev.sasikanth.rss.reader.core.network.parser.FeedParser.Companion.RSS_MEDIA_TYPE
 import dev.sasikanth.rss.reader.core.network.parser.FeedParser.Companion.TAG_LINK
 import io.ktor.client.HttpClient
+import io.ktor.client.call.body
 import io.ktor.client.request.get
 import io.ktor.client.statement.HttpResponse
-import io.ktor.client.statement.bodyAsText
 import io.ktor.http.ContentType
 import io.ktor.http.HttpStatusCode
 import io.ktor.http.URLBuilder
 import io.ktor.http.URLProtocol
 import io.ktor.http.Url
+import io.ktor.http.charset
 import io.ktor.http.contentType
+import io.ktor.utils.io.charsets.Charsets
+import io.ktor.utils.io.core.String
 import me.tatarka.inject.annotations.Inject
 
 @Inject
@@ -86,7 +89,8 @@ class FeedFetcher(private val httpClient: HttpClient, private val feedParser: Fe
     url: String,
     redirectCount: Int
   ): FeedFetchResult {
-    val responseContent = response.bodyAsText()
+    val originalCharset = response.charset() ?: Charsets.UTF_8
+    val responseContent = String(response.body<ByteArray>(), charset = originalCharset)
     return if (response.contentType()?.withoutParameters() == ContentType.Text.Html) {
       val feedUrl = fetchFeedLinkFromHtmlIfExists(responseContent, url)
       if (feedUrl != url && !feedUrl.isNullOrBlank()) {

diff --git a/...trings/src/commonMain/kotlin/dev/sasikanth/rss/reader/resources/strings/EnTwineStrings.kt b/...trings/src/commonMain/kotlin/dev/sasikanth/rss/reader/resources/strings/EnTwineStrings.kt
@@ -109,9 +109,9 @@ val EnTwineStrings =
     postsAll = "All",
     postsUnread = "Unread",
     postsToday = "Today",
-    openSource = "Open Source",
+    openSource = "Support Open Source",
     openSourceDesc =
-      "Twine is built on open source technologies and is completely free to use, you can find the source code of Twine and some of my other popular projects on GitHub. Click here to head over there.",
+      "Twine is built on open-source technologies and is free to use. You can find the source code for Twine and some of my other popular projects on GitHub. Click here to open GitHub and tip for the project.",
     markAsRead = "Mark as Read",
     markAsUnRead = "Mark as Unread",
     removeFeed = "Remove feed",

diff --git a/shared/src/commonMain/kotlin/dev/sasikanth/rss/reader/bookmarks/ui/BookmarksScreen.kt b/shared/src/commonMain/kotlin/dev/sasikanth/rss/reader/bookmarks/ui/BookmarksScreen.kt
@@ -55,6 +55,7 @@ import dev.sasikanth.rss.reader.bookmarks.BookmarksPresenter
 import dev.sasikanth.rss.reader.bookmarks.OpenLink
 import dev.sasikanth.rss.reader.components.CompactFloatingActionButton
 import dev.sasikanth.rss.reader.home.ui.PostListItem
+import dev.sasikanth.rss.reader.home.ui.PostMetadataConfig
 import dev.sasikanth.rss.reader.platform.LocalLinkHandler
 import dev.sasikanth.rss.reader.resources.icons.Bookmarks
 import dev.sasikanth.rss.reader.resources.icons.TwineIcons
@@ -126,7 +127,12 @@ internal fun BookmarksScreen(
               if (post != null) {
                 PostListItem(
                   item = post,
-                  enablePostSource = false,
+                  postMetadataConfig =
+                    PostMetadataConfig.DEFAULT.copy(
+                      showUnreadIndicator = false,
+                      showToggleReadUnreadOption = false,
+                      enablePostSource = false
+                    ),
                   onClick = { bookmarksPresenter.dispatch(BookmarksEvent.OnPostClicked(post)) },
                   onPostBookmarkClick = {
                     bookmarksPresenter.dispatch(BookmarksEvent.OnPostBookmarkClick(post))

diff --git a/shared/src/commonMain/kotlin/dev/sasikanth/rss/reader/feed/FeedPresenter.kt b/shared/src/commonMain/kotlin/dev/sasikanth/rss/reader/feed/FeedPresenter.kt
@@ -20,6 +20,7 @@ import com.arkivanov.decompose.ComponentContext
 import com.arkivanov.essenty.instancekeeper.InstanceKeeper
 import com.arkivanov.essenty.instancekeeper.getOrCreate
 import com.arkivanov.essenty.lifecycle.doOnCreate
+import dev.sasikanth.rss.reader.repository.ObservableSelectedFeed
 import dev.sasikanth.rss.reader.repository.RssRepository
 import dev.sasikanth.rss.reader.util.DispatchersProvider
 import kotlinx.coroutines.CoroutineScope
@@ -39,6 +40,7 @@ import me.tatarka.inject.annotations.Inject
 class FeedPresenter(
   dispatchersProvider: DispatchersProvider,
   rssRepository: RssRepository,
+  private val observableSelectedFeed: ObservableSelectedFeed,
   @Assisted feedLink: String,
   @Assisted componentContext: ComponentContext,
   @Assisted private val dismiss: () -> Unit
@@ -49,7 +51,8 @@ class FeedPresenter(
       PresenterInstance(
         dispatchersProvider = dispatchersProvider,
         rssRepository = rssRepository,
-        feedLink = feedLink
+        feedLink = feedLink,
+        observableSelectedFeed = observableSelectedFeed,
       )
     }
 
@@ -75,7 +78,8 @@ class FeedPresenter(
   private class PresenterInstance(
     dispatchersProvider: DispatchersProvider,
     private val rssRepository: RssRepository,
-    private val feedLink: String
+    private val feedLink: String,
+    private val observableSelectedFeed: ObservableSelectedFeed,
   ) : InstanceKeeper.Instance {
 
     private val coroutineScope = CoroutineScope(SupervisorJob() + dispatchersProvider.main)
@@ -109,6 +113,7 @@ class FeedPresenter(
     private fun removeFeed() {
       coroutineScope.launch {
         rssRepository.removeFeed(feedLink)
+        observableSelectedFeed.clearSelection()
         effects.emit(FeedEffect.DismissSheet)
       }
     }

diff --git a/shared/src/commonMain/kotlin/dev/sasikanth/rss/reader/feed/ui/FeedInfoBottomSheet.kt b/shared/src/commonMain/kotlin/dev/sasikanth/rss/reader/feed/ui/FeedInfoBottomSheet.kt
@@ -22,17 +22,19 @@ import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.PaddingValues
 import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.WindowInsets
+import androidx.compose.foundation.layout.WindowInsetsSides
+import androidx.compose.foundation.layout.asPaddingValues
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.ime
+import androidx.compose.foundation.layout.only
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.requiredHeight
 import androidx.compose.foundation.layout.requiredSize
-import androidx.compose.foundation.layout.union
+import androidx.compose.foundation.layout.systemBars
 import androidx.compose.foundation.layout.width
 import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.outlined.Delete
-import androidx.compose.material3.BottomSheetDefaults
 import androidx.compose.material3.CircularProgressIndicator
 import androidx.compose.material3.Icon
 import androidx.compose.material3.MaterialTheme
@@ -83,11 +85,16 @@ fun FeedInfoBottomSheet(
     onDismissRequest = { feedPresenter.dispatch(FeedEvent.BackClicked) },
     containerColor = AppTheme.colorScheme.tintedBackground,
     contentColor = AppTheme.colorScheme.tintedForeground,
-    windowInsets = BottomSheetDefaults.windowInsets.union(WindowInsets.ime),
+    windowInsets = WindowInsets.ime.only(WindowInsetsSides.Bottom),
   ) {
     Column(
       horizontalAlignment = Alignment.CenterHorizontally,
-      modifier = Modifier.fillMaxWidth().padding(horizontal = 24.dp).padding(bottom = 16.dp)
+      modifier =
+        Modifier.fillMaxWidth()
+          .padding(horizontal = 24.dp)
+          .padding(
+            bottom = 16.dp + WindowInsets.systemBars.asPaddingValues().calculateBottomPadding()
+          )
     ) {
       Spacer(Modifier.requiredHeight(8.dp))
 

diff --git a/shared/src/commonMain/kotlin/dev/sasikanth/rss/reader/home/ui/FeaturedPostItem.kt b/shared/src/commonMain/kotlin/dev/sasikanth/rss/reader/home/ui/FeaturedPostItem.kt
@@ -167,7 +167,6 @@ private fun DefaultFeaturedPostItem(
       postRead = item.read,
       postBookmarked = item.bookmarked,
       commentsLink = item.commentsLink,
-      enablePostSource = true,
       onBookmarkClick = onBookmarkClick,
       onCommentsClick = onCommentsClick,
       onSourceClick = onSourceClick,
@@ -244,7 +243,6 @@ private fun LargeScreenFeaturedPostItem(
         postRead = item.read,
         postBookmarked = item.bookmarked,
         commentsLink = item.commentsLink,
-        enablePostSource = true,
         onBookmarkClick = onBookmarkClick,
         onCommentsClick = onCommentsClick,
         onSourceClick = onSourceClick,

diff --git a/shared/src/commonMain/kotlin/dev/sasikanth/rss/reader/home/ui/PostList.kt b/shared/src/commonMain/kotlin/dev/sasikanth/rss/reader/home/ui/PostList.kt
@@ -108,7 +108,6 @@ internal fun PostsList(
       if (post != null) {
         PostListItem(
           item = post,
-          enablePostSource = true,
           reduceReadItemAlpha = true,
           onClick = { onPostClicked(post) },
           onPostBookmarkClick = { onPostBookmarkClick(post) },
@@ -131,13 +130,13 @@ internal fun PostsList(
 @Composable
 fun PostListItem(
   item: PostWithMetadata,
-  enablePostSource: Boolean,
   onClick: () -> Unit,
   onPostBookmarkClick: () -> Unit,
   onPostCommentsClick: () -> Unit,
   onPostSourceClick: () -> Unit,
   togglePostReadClick: () -> Unit,
-  reduceReadItemAlpha: Boolean = false
+  reduceReadItemAlpha: Boolean = false,
+  postMetadataConfig: PostMetadataConfig = PostMetadataConfig.DEFAULT,
 ) {
   Column(
     modifier =
@@ -175,11 +174,11 @@ fun PostListItem(
     PostMetadata(
       feedName = item.feedName,
       postPublishedAt = item.date.relativeDurationString(),
+      config = postMetadataConfig,
       postLink = item.link,
       postRead = item.read,
       postBookmarked = item.bookmarked,
       commentsLink = item.commentsLink,
-      enablePostSource = enablePostSource,
       onBookmarkClick = onPostBookmarkClick,
       onCommentsClick = onPostCommentsClick,
       onSourceClick = onPostSourceClick,