[1.227.*] Pre-release merge (#705)

msasikanth · Aug 8, 2024 · 3b53e70 · 3b53e70
2 parents b01f1cd + ae10f1d
commit 3b53e70
Show file tree

Hide file tree

Showing 7 changed files with 35 additions and 35 deletions.
diff --git a/core/base/src/commonMain/kotlin/dev/sasikanth/rss/reader/app/AppInfo.kt b/core/base/src/commonMain/kotlin/dev/sasikanth/rss/reader/app/AppInfo.kt
@@ -16,4 +16,9 @@
 
 package dev.sasikanth.rss.reader.app
 
-data class AppInfo(val versionCode: Int, val versionName: String, val isDebugBuild: Boolean)
+data class AppInfo(
+  val versionCode: Int,
+  val versionName: String,
+  val isDebugBuild: Boolean,
+  val cachePath: () -> String,
+)
diff --git a/shared/src/androidMain/kotlin/dev/sasikanth/rss/reader/di/ApplicationComponent.kt b/shared/src/androidMain/kotlin/dev/sasikanth/rss/reader/di/ApplicationComponent.kt
@@ -54,7 +54,8 @@ abstract class ApplicationComponent(@get:Provides val context: Context) :
     return AppInfo(
       versionName = packageInfo.versionName,
       versionCode = versionCode,
-      isDebugBuild = (applicationInfo.flags and FLAG_DEBUGGABLE) != 0
+      isDebugBuild = (applicationInfo.flags and FLAG_DEBUGGABLE) != 0,
+      cachePath = { context.cacheDir.absolutePath }
     )
   }
 

diff --git a/shared/src/androidMain/kotlin/dev/sasikanth/rss/reader/di/ImageLoaderComponent.android.kt b/shared/src/androidMain/kotlin/dev/sasikanth/rss/reader/di/ImageLoaderComponent.android.kt
@@ -19,14 +19,8 @@ package dev.sasikanth.rss.reader.di
 import android.content.Context
 import coil3.PlatformContext
 import me.tatarka.inject.annotations.Provides
-import okio.Path
-import okio.Path.Companion.toPath
 
 actual interface ImageLoaderPlatformComponent {
 
   @Provides fun providePlatformContext(context: Context): PlatformContext = context
-
-  @Provides
-  fun diskCache(application: Context): Path =
-    application.cacheDir.absolutePath.toPath().resolve("dev_sasikanth_rss_reader_images_cache")
 }
diff --git a/shared/src/commonMain/kotlin/dev/sasikanth/rss/reader/di/ImageLoaderComponent.kt b/shared/src/commonMain/kotlin/dev/sasikanth/rss/reader/di/ImageLoaderComponent.kt
@@ -20,8 +20,9 @@ import coil3.ImageLoader
 import coil3.PlatformContext
 import coil3.disk.DiskCache
 import coil3.memory.MemoryCache
+import dev.sasikanth.rss.reader.app.AppInfo
 import me.tatarka.inject.annotations.Provides
-import okio.Path
+import okio.Path.Companion.toPath
 
 expect interface ImageLoaderPlatformComponent
 
@@ -32,11 +33,15 @@ interface ImageLoaderComponent : ImageLoaderPlatformComponent {
   @Provides
   fun imageLoader(
     platformContext: PlatformContext,
-    cachePath: Path,
+    appInfo: AppInfo,
   ): ImageLoader {
     return ImageLoader.Builder(platformContext)
       .memoryCache { MemoryCache.Builder().maxSizePercent(platformContext, percent = 0.25).build() }
-      .diskCache { DiskCache.Builder().directory(cachePath).build() }
+      .diskCache {
+        DiskCache.Builder()
+          .directory(appInfo.cachePath().toPath().resolve("dev_sasikanth_rss_reader_images_cache"))
+          .build()
+      }
       .build()
   }
 }
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
@@ -116,7 +116,7 @@ internal fun FeaturedSection(
       systemBarsEndPadding
     }
 
-  LaunchedEffect(pagerState) {
+  LaunchedEffect(pagerState, featuredPosts) {
     snapshotFlow {
         val settledPage = pagerState.settledPage
         try {

diff --git a/shared/src/iosMain/kotlin/dev/sasikanth/rss/reader/di/ApplicationComponent.kt b/shared/src/iosMain/kotlin/dev/sasikanth/rss/reader/di/ApplicationComponent.kt
@@ -20,9 +20,13 @@ import dev.sasikanth.rss.reader.data.repository.RssRepository
 import dev.sasikanth.rss.reader.data.repository.SettingsRepository
 import dev.sasikanth.rss.reader.di.scopes.AppScope
 import kotlin.experimental.ExperimentalNativeApi
+import kotlinx.cinterop.ExperimentalForeignApi
 import me.tatarka.inject.annotations.Component
 import me.tatarka.inject.annotations.Provides
 import platform.Foundation.NSBundle
+import platform.Foundation.NSCachesDirectory
+import platform.Foundation.NSFileManager
+import platform.Foundation.NSUserDomainMask
 import platform.UIKit.UIViewController
 
 @AppScope
@@ -45,5 +49,19 @@ abstract class ApplicationComponent(
       versionName = NSBundle.mainBundle.infoDictionary?.get("CFBundleShortVersionString") as? String
           ?: "",
       isDebugBuild = Platform.isDebugBinary,
+      cachePath = { NSFileManager.defaultManager.cacheDir }
     )
+
+  @OptIn(ExperimentalForeignApi::class)
+  private val NSFileManager.cacheDir: String
+    get() =
+      URLForDirectory(
+          directory = NSCachesDirectory,
+          inDomain = NSUserDomainMask,
+          appropriateForURL = null,
+          create = true,
+          error = null,
+        )
+        ?.path
+        .orEmpty()
 }
diff --git a/shared/src/iosMain/kotlin/dev/sasikanth/rss/reader/di/ImageLoaderComponent.ios.kt b/shared/src/iosMain/kotlin/dev/sasikanth/rss/reader/di/ImageLoaderComponent.ios.kt
@@ -17,32 +17,9 @@
 package dev.sasikanth.rss.reader.di
 
 import coil3.PlatformContext
-import kotlinx.cinterop.ExperimentalForeignApi
 import me.tatarka.inject.annotations.Provides
-import okio.Path
-import okio.Path.Companion.toPath
-import platform.Foundation.NSCachesDirectory
-import platform.Foundation.NSFileManager
-import platform.Foundation.NSUserDomainMask
 
 actual interface ImageLoaderPlatformComponent {
 
   @Provides fun providePlatformContext(): PlatformContext = PlatformContext.INSTANCE
-
-  @Provides
-  fun diskCache(): Path =
-    NSFileManager.defaultManager.cacheDir.toPath().resolve("dev_sasikanth_rss_reader_images_cache")
-
-  @OptIn(ExperimentalForeignApi::class)
-  private val NSFileManager.cacheDir: String
-    get() =
-      URLForDirectory(
-          directory = NSCachesDirectory,
-          inDomain = NSUserDomainMask,
-          appropriateForURL = null,
-          create = true,
-          error = null,
-        )
-        ?.path
-        .orEmpty()
 }