[1.232.*] Pre-release merge (#727)

gradle/libs.versions.toml

@@ -1,7 +1,7 @@
 [versions]
-kotlin = "2.0.0"
-android_gradle_plugin = "8.5.1"
-compose = "1.6.11"
+kotlin = "2.0.10"
+android_gradle_plugin = "8.5.2"
+compose = "1.7.0-beta02"
 
 android_sdk_compile = "34"
 android_sdk_target = "34"
@@ -15,26 +15,26 @@ kotlinx_immutable_collections = "0.3.7"
 kotlinx_serialization_json = "1.7.1"
 decompose = "3.0.0"
 essenty = "2.1.0"
-androidx_activity = "1.9.1"
+androidx_activity = "1.9.2"
 androidx_appcompat = "1.7.0"
 androidx_core = "1.13.1"
-androidx_collection = "1.4.2"
-androidx_test_runner = "1.6.1"
+androidx_collection = "1.4.3"
+androidx_test_runner = "1.6.2"
 androidx_test_rules = "1.6.1"
-androidx_work = "2.9.0"
+androidx_work = "2.9.1"
 androidx_datastore = "1.1.1"
 androidx_browser = "1.8.0"
-androidx_annotation = "1.8.1"
+androidx_annotation = "1.8.2"
 coil = "3.0.0-alpha09"
 spotless = "6.25.0"
 ktfmt = "0.44"
 kotlininject = "0.7.1"
-ksp = "2.0.0-1.0.24"
+ksp = "2.0.10-1.0.24"
 material_color_utilities = "1.0.0-alpha01"
 ksoup = "0.1.2"
 sqliteAndroid = "3.45.0"
 windowSizeClass = "0.5.0"
-desugarJdk = "2.0.4"
+desugarJdk = "2.1.2"
 lyricist = "1.7.0"
 atomicfu = "0.25.0"
 okio = "3.9.0"
@@ -43,10 +43,10 @@ stately = "2.0.7"
 xmlutil = "0.90.1"
 ktxml = "0.3.2"
 uri = "0.0.18"
-webview = "1.9.20"
+webview = "1.9.40-alpha01"
 uuid = "0.8.4"
 bugsnag-plugin = "8.1.0"
-bugsnag = "6.6.1"
+bugsnag = "6.7.0"
 crashkios-bugsnag = "0.8.6"
 kermit = "2.0.4"
 reorderable = "2.3.0"

shared/src/commonMain/kotlin/dev/sasikanth/rss/reader/feed/ui/FeedInfoBottomSheet.kt

@@ -121,10 +121,11 @@ fun FeedInfoBottomSheet(
       onDismissRequest = { feedPresenter.dispatch(FeedEvent.BackClicked) },
       containerColor = AppTheme.colorScheme.tintedBackground,
       contentColor = Color.Unspecified,
-      windowInsets =
+      contentWindowInsets = {
         WindowInsets.systemBars
           .only(WindowInsetsSides.Bottom)
-          .union(WindowInsets.ime.only(WindowInsetsSides.Bottom)),
+          .union(WindowInsets.ime.only(WindowInsetsSides.Bottom))
+      },
       sheetState = SheetState(skipPartiallyExpanded = true, density = LocalDensity.current),
       scrimColor = SYSTEM_SCRIM
     ) {

shared/src/commonMain/kotlin/dev/sasikanth/rss/reader/groupselection/ui/GroupSelectionSheet.kt

@@ -74,10 +74,11 @@ fun GroupSelectionSheet(presenter: GroupSelectionPresenter, modifier: Modifier =
       onDismissRequest = { presenter.dispatch(GroupSelectionEvent.BackClicked) },
       containerColor = AppTheme.colorScheme.tintedBackground,
       contentColor = Color.Unspecified,
-      windowInsets =
+      contentWindowInsets = {
         WindowInsets.systemBars
           .only(WindowInsetsSides.Bottom)
-          .union(WindowInsets.ime.only(WindowInsetsSides.Bottom)),
+          .union(WindowInsets.ime.only(WindowInsetsSides.Bottom))
+      },
       sheetState = SheetState(skipPartiallyExpanded = true, density = LocalDensity.current),
       scrimColor = SYSTEM_SCRIM
     ) {

shared/src/commonMain/kotlin/dev/sasikanth/rss/reader/home/ui/FeaturedPostItem.kt

@@ -51,6 +51,7 @@ import dev.sasikanth.rss.reader.ui.AppTheme
 import dev.sasikanth.rss.reader.util.relativeDurationString
 import dev.sasikanth.rss.reader.utils.Constants
 import dev.sasikanth.rss.reader.utils.LocalWindowSizeClass
+import dev.sasikanth.rss.reader.utils.getOffsetFractionForPage
 
 private val featuredImageAspectRatio: Float
   @Composable

shared/src/commonMain/kotlin/dev/sasikanth/rss/reader/home/ui/FeaturedSection.kt

@@ -61,6 +61,7 @@ import dev.sasikanth.rss.reader.ui.LocalDynamicColorState
 import dev.sasikanth.rss.reader.util.canBlurImage
 import dev.sasikanth.rss.reader.utils.Constants.EPSILON
 import dev.sasikanth.rss.reader.utils.LocalWindowSizeClass
+import dev.sasikanth.rss.reader.utils.getOffsetFractionForPage
 import kotlin.math.absoluteValue
 import kotlinx.collections.immutable.ImmutableList
 

shared/src/commonMain/kotlin/dev/sasikanth/rss/reader/ui/AppTheme.kt

@@ -15,10 +15,10 @@
  */
 package dev.sasikanth.rss.reader.ui
 
-import androidx.compose.material.ripple.LocalRippleTheme
 import androidx.compose.material.ripple.RippleAlpha
-import androidx.compose.material.ripple.RippleTheme
+import androidx.compose.material3.LocalRippleConfiguration
 import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.RippleConfiguration
 import androidx.compose.material3.darkColorScheme
 import androidx.compose.material3.lightColorScheme
 import androidx.compose.runtime.Composable
@@ -48,7 +48,11 @@ internal fun AppTheme(useDarkTheme: Boolean = false, content: @Composable () ->
 
     CompositionLocalProvider(
       LocalAppColorScheme provides colorScheme,
-      LocalRippleTheme provides AppRippleTheme
+      LocalRippleConfiguration provides
+        RippleConfiguration(
+          color = colorScheme.tintedForeground,
+          rippleAlpha = DefaultRippleAlpha,
+        )
     ) {
       content()
     }
@@ -61,13 +65,6 @@ internal object AppTheme {
     @Composable @ReadOnlyComposable get() = LocalAppColorScheme.current
 }
 
-private object AppRippleTheme : RippleTheme {
-
-  @Composable override fun defaultColor() = AppTheme.colorScheme.tintedForeground
-
-  @Composable override fun rippleAlpha(): RippleAlpha = DefaultRippleAlpha
-}
-
 private val GolosFontFamily: FontFamily
   @Composable
   get() =

shared/src/commonMain/kotlin/dev/sasikanth/rss/reader/utils/ComposeExt.kt

@@ -17,6 +17,7 @@ package dev.sasikanth.rss.reader.utils
 
 import androidx.compose.foundation.layout.WindowInsets
 import androidx.compose.foundation.layout.ime
+import androidx.compose.foundation.pager.PagerState
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.ReadOnlyComposable
 import androidx.compose.runtime.SideEffect
@@ -61,3 +62,7 @@ internal fun LogCompositions(tag: String, msg: String) {
   SideEffect { ref.value++ }
   Logger.d(tag) { "Compositions: $msg ${ref.value}" }
 }
+
+fun PagerState.getOffsetFractionForPage(page: Int): Float {
+  return (currentPage - page) + currentPageOffsetFraction
+}