[1.217.*] Pre-release merge (#687)

msasikanth · Aug 4, 2024 · 009be56 · 009be56
2 parents bf2d7b4 + 4efd3f4
commit 009be56
Show file tree

Hide file tree

Showing 4 changed files with 108 additions and 77 deletions.
diff --git a/shared/src/commonMain/composeResources/files/reader/main.js b/shared/src/commonMain/composeResources/files/reader/main.js
@@ -63,8 +63,12 @@ function updateStyles(colors) {
   const styles = `
   body {
     padding-top: 16px;
+    padding-left: 16px;
+    padding-right: 16px;
     color: ${colors.textColor};
     font-family: 'Golos Text', sans-serif;
+    overflow-wrap: break-word;
+    overflow-x: hidden;
   }
   a {
     color: ${colors.linkColor};

diff --git a/shared/src/commonMain/kotlin/dev/sasikanth/rss/reader/home/ui/FeaturedSection.kt b/shared/src/commonMain/kotlin/dev/sasikanth/rss/reader/home/ui/FeaturedSection.kt
@@ -19,6 +19,7 @@ import androidx.compose.animation.core.Spring
 import androidx.compose.animation.core.spring
 import androidx.compose.foundation.ExperimentalFoundationApi
 import androidx.compose.foundation.background
+import androidx.compose.foundation.gestures.snapping.SnapFlingBehavior
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.PaddingValues
 import androidx.compose.foundation.layout.WindowInsets
@@ -28,7 +29,6 @@ import androidx.compose.foundation.layout.aspectRatio
 import androidx.compose.foundation.layout.calculateEndPadding
 import androidx.compose.foundation.layout.calculateStartPadding
 import androidx.compose.foundation.layout.only
-import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.systemBars
 import androidx.compose.foundation.pager.HorizontalPager
 import androidx.compose.foundation.pager.PagerDefaults
@@ -106,24 +106,16 @@ internal fun FeaturedSection(
 
       val systemBarsPaddingValues =
         WindowInsets.systemBars.only(WindowInsetsSides.Horizontal).asPaddingValues()
-      val startPadding = systemBarsPaddingValues.calculateStartPadding(layoutDirection)
-      val endPadding = systemBarsPaddingValues.calculateEndPadding(layoutDirection)
+      val systemBarsStartPadding = systemBarsPaddingValues.calculateStartPadding(layoutDirection)
+      val systemBarsEndPadding = systemBarsPaddingValues.calculateEndPadding(layoutDirection)
 
-      val horizontalPadding =
-        if (startPadding > endPadding) {
-          startPadding
+      val systemBarsHorizontalPadding =
+        if (systemBarsStartPadding > systemBarsEndPadding) {
+          systemBarsStartPadding
         } else {
-          endPadding
+          systemBarsEndPadding
         }
 
-      val pagerContentPadding =
-        PaddingValues(
-          start = horizontalPadding + 24.dp,
-          top = 8.dp + paddingValues.calculateTopPadding(),
-          end = horizontalPadding + 24.dp,
-          bottom = 24.dp
-        )
-
       LaunchedEffect(pagerState, featuredPosts) {
         dynamicColorState.onContentChange(featuredPosts.map { it.imageUrl!! })
 
@@ -154,85 +146,116 @@ internal fun FeaturedSection(
           }
       }
 
-      HorizontalPager(
-        state = pagerState,
-        verticalAlignment = Alignment.Top,
-        flingBehavior =
+      Box {
+        // Duplicated pager setup for background, to avoid pager content padding
+        // from the items
+        val pagerFlingBehavior =
           PagerDefaults.flingBehavior(
             state = pagerState,
             snapAnimationSpec = spring(stiffness = Spring.StiffnessVeryLow)
-          ),
-      ) { page ->
-        val featuredPost = featuredPosts.getOrNull(page)
-        if (featuredPost != null) {
-          Box {
-            FeaturedSectionBackground(
-              post = featuredPost,
-              featuredItemBlurEnabled = featuredItemBlurEnabled,
-              modifier =
-                Modifier.graphicsLayer {
-                  val pageOffset =
-                    if (page in 0..pagerState.pageCount) {
-                      pagerState.getOffsetFractionForPage(page)
-                    } else {
-                      0f
-                    }
+          )
 
-                  translationX = size.width * pageOffset
-                  alpha = (1f - pageOffset.absoluteValue)
-                }
-            )
+        FeaturedSectionBackground(
+          modifier = Modifier.matchParentSize(),
+          state = pagerState,
+          featuredPosts = featuredPosts,
+          flingBehavior = pagerFlingBehavior,
+          featuredItemBlurEnabled = featuredItemBlurEnabled,
+        )
 
-            FeaturedPostItem(
-              modifier = Modifier.padding(pagerContentPadding),
-              item = featuredPost,
-              page = page,
-              pagerState = pagerState,
-              onClick = { onItemClick(featuredPost) },
-              onBookmarkClick = { onPostBookmarkClick(featuredPost) },
-              onCommentsClick = { onPostCommentsClick(featuredPost.commentsLink!!) },
-              onSourceClick = { onPostSourceClick(featuredPost.sourceId) },
-              onTogglePostReadClick = { onTogglePostReadClick(featuredPost.id, featuredPost.read) }
-            )
+        HorizontalPager(
+          state = pagerState,
+          verticalAlignment = Alignment.Top,
+          contentPadding =
+            PaddingValues(
+              start = systemBarsHorizontalPadding + 24.dp,
+              top = 8.dp + paddingValues.calculateTopPadding(),
+              end = systemBarsHorizontalPadding + 24.dp,
+              bottom = 24.dp
+            ),
+          pageSpacing = 16.dp,
+          flingBehavior = pagerFlingBehavior,
+        ) { page ->
+          val featuredPost = featuredPosts.getOrNull(page)
+          if (featuredPost != null) {
+            Box {
+              FeaturedPostItem(
+                item = featuredPost,
+                page = page,
+                pagerState = pagerState,
+                onClick = { onItemClick(featuredPost) },
+                onBookmarkClick = { onPostBookmarkClick(featuredPost) },
+                onCommentsClick = { onPostCommentsClick(featuredPost.commentsLink!!) },
+                onSourceClick = { onPostSourceClick(featuredPost.sourceId) },
+                onTogglePostReadClick = {
+                  onTogglePostReadClick(featuredPost.id, featuredPost.read)
+                }
+              )
+            }
           }
         }
       }
     }
   }
 }
 
+@OptIn(ExperimentalFoundationApi::class)
 @Composable
 private fun FeaturedSectionBackground(
-  post: PostWithMetadata,
+  state: PagerState,
+  featuredPosts: ImmutableList<PostWithMetadata>,
+  flingBehavior: SnapFlingBehavior,
   featuredItemBlurEnabled: Boolean,
   modifier: Modifier = Modifier,
 ) {
-  val gradientOverlayModifier =
-    Modifier.then(modifier).drawWithCache {
-      val radialGradient =
-        Brush.radialGradient(
-          colors =
-            listOf(Color.Black, Color.Black.copy(alpha = 0.0f), Color.Black.copy(alpha = 0.0f)),
-          center = Offset(x = this.size.width, y = 40f)
-        )
+  HorizontalPager(
+    modifier = modifier,
+    state = state,
+    verticalAlignment = Alignment.Top,
+    flingBehavior = flingBehavior
+  ) { page ->
+    val featuredPost = featuredPosts.getOrNull(page)
+    featuredPost?.let {
+      val gradientOverlayModifier =
+        Modifier.drawWithCache {
+          val radialGradient =
+            Brush.radialGradient(
+              colors =
+                listOf(Color.Black, Color.Black.copy(alpha = 0.0f), Color.Black.copy(alpha = 0.0f)),
+              center = Offset(x = this.size.width, y = 40f)
+            )
 
-      val linearGradient =
-        Brush.verticalGradient(
-          colors = listOf(Color.Black, Color.Black.copy(alpha = 0.0f)),
-        )
+          val linearGradient =
+            Brush.verticalGradient(
+              colors = listOf(Color.Black, Color.Black.copy(alpha = 0.0f)),
+            )
 
-      onDrawWithContent {
-        drawContent()
-        drawRect(radialGradient)
-        drawRect(linearGradient)
-      }
-    }
+          onDrawWithContent {
+            drawContent()
+            drawRect(radialGradient)
+            drawRect(linearGradient)
+          }
+        }
+
+      val swipeTransitionModifier =
+        Modifier.graphicsLayer {
+            val pageOffset =
+              if (page in 0..state.pageCount) {
+                state.getOffsetFractionForPage(page)
+              } else {
+                0f
+              }
 
-  Box {
-    if (canBlurImage && featuredItemBlurEnabled) {
-      FeaturedSectionBlurredBackground(post = post, modifier = gradientOverlayModifier)
-    } else {
-      FeaturedSectionGradientBackground(modifier = gradientOverlayModifier)
+            translationX = size.width * pageOffset
+            alpha = (1f - pageOffset.absoluteValue)
+          }
+          .then(gradientOverlayModifier)
+
+      if (canBlurImage && featuredItemBlurEnabled) {
+        FeaturedSectionBlurredBackground(post = featuredPost, modifier = swipeTransitionModifier)
+      } else {
+        FeaturedSectionGradientBackground(modifier = swipeTransitionModifier)
+      }
     }
   }
 }

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
@@ -96,8 +96,12 @@ internal fun HomeScreen(homePresenter: HomePresenter, modifier: Modifier = Modif
     rememberStandardBottomSheetState(
       initialValue = state.feedsSheetState,
       confirmValueChange = {
-        homePresenter.dispatch(HomeEvent.FeedsSheetStateChanged(it))
-        true
+        if (it != SheetValue.Hidden) {
+          homePresenter.dispatch(HomeEvent.FeedsSheetStateChanged(it))
+          true
+        } else {
+          false
+        }
       }
     )
   val bottomSheetScaffoldState =

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
@@ -272,7 +272,7 @@ internal fun ReaderScreen(
           }
         }
 
-        Box(Modifier.fillMaxSize().padding(paddingValues).padding(horizontal = 16.dp)) {
+        Box(Modifier.fillMaxSize().padding(paddingValues)) {
           WebView(
             modifier = Modifier.fillMaxSize(),
             state = webViewState,