kmp UI locker apps/watchfaces, images, http cache

android/gradle/libs.versions.toml

@@ -18,15 +18,12 @@ room = "2.7.0-alpha07"
 room-sqlite = "2.5.0-alpha07"
 datastore = "1.1.1"
 uuidVersion = "0.8.4"
-compose-lib = "1.6.11"
+compose-lib = "1.7.0-beta02"
 compose-nav = "2.7.0-alpha07"
 compose-viewmodel = "2.8.0"
-compose-material3 = "1.3.0"
 reorderable = "2.3.3"
 
 appcompat = "1.7.0"
-material3Android = "1.3.0"
-
 ktorVersion = "2.3.12"
 
 [plugins]
@@ -76,10 +73,6 @@ ktor-client-contentnegotiation = { module = "io.ktor:ktor-client-content-negotia
 ktor-serialization-json = { module = "io.ktor:ktor-serialization-kotlinx-json", version.ref = "ktorVersion" }
 ktor-client-okhttp = { module = "io.ktor:ktor-client-okhttp", version.ref = "ktorVersion" }
 
-compose-runtime = { module = "org.jetbrains.compose.runtime:runtime", version.ref = "compose-lib" }
-compose-ui = { module = "org.jetbrains.compose.ui:ui", version.ref = "compose-lib" }
-compose-material = { module = "org.jetbrains.compose.material3:material3", version.ref = "compose-material3" }
-compose-foundation = { module = "org.jetbrains.compose.foundation:foundation", version.ref = "compose-lib" }
 compose-navigation = { module = "org.jetbrains.androidx.navigation:navigation-compose", version.ref = "compose-nav" }
 compose-viewmodel = { module = "org.jetbrains.androidx.lifecycle:lifecycle-viewmodel-compose", version.ref = "compose-viewmodel" }
 compose-components-resources = { module = "org.jetbrains.compose.components:components-resources", version.ref = "compose-lib" }

android/shared/src/androidMain/kotlin/io/rebble/cobble/shared/di/DependenciesModule.android.kt

@@ -0,0 +1,12 @@
+package io.rebble.cobble.shared.di
+
+import io.ktor.client.plugins.cache.storage.CacheStorage
+import io.ktor.client.plugins.cache.storage.FileStorage
+import io.rebble.cobble.shared.AndroidPlatformContext
+import io.rebble.cobble.shared.PlatformContext
+
+actual fun makePlatformCacheStorage(platformContext: PlatformContext): CacheStorage {
+    val dir = (platformContext as AndroidPlatformContext).applicationContext.cacheDir.resolve("http_cache")
+    dir.mkdir()
+    return FileStorage(dir)
+}

android/shared/src/commonMain/kotlin/io/rebble/cobble/shared/database/AppDatabase.kt

@@ -22,14 +22,15 @@ import org.koin.mp.KoinPlatformTools
             SyncedLockerEntry::class,
             SyncedLockerEntryPlatform::class
                    ],
-        version = 7,
+        version = 8,
         autoMigrations = [
             AutoMigration(1, 2),
             AutoMigration(2, 3),
             AutoMigration(3, 4),
             AutoMigration(4, 5),
             AutoMigration(5, 6),
-            AutoMigration(6, 7)
+            AutoMigration(6, 7),
+            AutoMigration(7, 8),
         ]
 )
 @TypeConverters(Converters::class)

android/shared/src/commonMain/kotlin/io/rebble/cobble/shared/database/dao/LockerDao.kt

@@ -5,6 +5,7 @@ import io.rebble.cobble.shared.database.NextSyncAction
 import io.rebble.cobble.shared.database.entity.SyncedLockerEntry
 import io.rebble.cobble.shared.database.entity.SyncedLockerEntryPlatform
 import io.rebble.cobble.shared.database.entity.SyncedLockerEntryWithPlatforms
+import kotlinx.coroutines.flow.Flow
 
 @Dao
 interface LockerDao {
@@ -28,6 +29,10 @@ interface LockerDao {
     @Query("SELECT * FROM SyncedLockerEntry ORDER BY `order`")
     suspend fun getAllEntries(): List<SyncedLockerEntryWithPlatforms>
 
+    @Transaction
+    @Query("SELECT * FROM SyncedLockerEntry ORDER BY `order`")
+    fun getAllEntriesFlow(): Flow<List<SyncedLockerEntryWithPlatforms>>
+
     @Query("DELETE FROM SyncedLockerEntryPlatform WHERE lockerEntryId = :entryId")
     suspend fun clearPlatformsFor(entryId: String)
 
@@ -47,4 +52,7 @@ interface LockerDao {
 
     @Query("UPDATE SyncedLockerEntry SET `order` = :order WHERE id = :id")
     suspend fun updateOrder(id: String, order: Int)
+
+    @Query("DELETE FROM SyncedLockerEntry")
+    suspend fun clearAll()
 }

android/shared/src/commonMain/kotlin/io/rebble/cobble/shared/database/entity/SyncedLockerEntry.kt

@@ -59,7 +59,14 @@ data class SyncedLockerEntryPlatform(
         val processInfoFlags: Int,
         val name: String,
         val description: String,
-        val icon: String,
+        @Embedded
+        val images: SyncedLockerEntryPlatformImages,
+)
+
+data class SyncedLockerEntryPlatformImages(
+        val icon: String?,
+        val list: String?,
+        val screenshot: String?,
 )
 
 /**
@@ -81,5 +88,7 @@ fun SyncedLockerEntryPlatform.dataEqualTo(other: SyncedLockerEntryPlatform): Boo
             processInfoFlags == other.processInfoFlags &&
             name == other.name &&
             description == other.description &&
-            icon == other.icon
+            images.icon == other.images.icon &&
+            images.list == other.images.list &&
+            images.screenshot == other.images.screenshot
 }

android/shared/src/commonMain/kotlin/io/rebble/cobble/shared/di/DependenciesModule.kt

@@ -1,16 +1,24 @@
 package io.rebble.cobble.shared.di
 
 import io.ktor.client.HttpClient
+import io.ktor.client.plugins.cache.HttpCache
+import io.ktor.client.plugins.cache.storage.CacheStorage
 import io.ktor.client.plugins.contentnegotiation.ContentNegotiation
 import io.ktor.serialization.kotlinx.json.json
+import io.rebble.cobble.shared.PlatformContext
 import org.koin.dsl.module
 
 val dependenciesModule = module {
     factory {
         HttpClient {
+            install(HttpCache) {
+                publicStorage(makePlatformCacheStorage(get()))
+            }
             install(ContentNegotiation) {
                 json()
             }
         }
     }
-}
+}
+
+expect fun makePlatformCacheStorage(platformContext: PlatformContext): CacheStorage

android/shared/src/commonMain/kotlin/io/rebble/cobble/shared/di/StateModule.kt

@@ -4,6 +4,7 @@ import io.rebble.cobble.shared.domain.state.ConnectionState
 import io.rebble.cobble.shared.domain.state.CurrentToken
 import io.rebble.cobble.shared.domain.state.watchOrNull
 import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.flow.*
 import org.koin.core.qualifier.named
 import org.koin.dsl.bind
@@ -18,6 +19,7 @@ val stateModule = module {
         get<StateFlow<ConnectionState>>(named("connectionState"))
                 .flatMapLatest { it.watchOrNull?.metadata?.take(1) ?: flowOf(null) }
                 .filterNotNull()
+                .stateIn(CoroutineScope(Dispatchers.Default), SharingStarted.WhileSubscribed(), null)
     }
     single(named("connectionScope")) {
         MutableStateFlow<CoroutineScope>(CoroutineScope(EmptyCoroutineContext))

android/shared/src/commonMain/kotlin/io/rebble/cobble/shared/domain/api/appstore/LockerEntry.kt

@@ -3,6 +3,7 @@ package io.rebble.cobble.shared.domain.api.appstore
 import io.rebble.cobble.shared.database.NextSyncAction
 import io.rebble.cobble.shared.database.entity.SyncedLockerEntry
 import io.rebble.cobble.shared.database.entity.SyncedLockerEntryPlatform
+import io.rebble.cobble.shared.database.entity.SyncedLockerEntryPlatformImages
 import io.rebble.cobble.shared.database.entity.SyncedLockerEntryWithPlatforms
 import kotlinx.serialization.Serializable
 import kotlinx.serialization.SerialName
@@ -132,6 +133,10 @@ fun LockerEntryPlatform.toEntity(lockerEntryId: String): SyncedLockerEntryPlatfo
             processInfoFlags = pebbleProcessInfoFlags,
             name = name,
             description = description,
-            icon = images.icon
+            SyncedLockerEntryPlatformImages(
+                    icon = images.icon,
+                    list = images.list,
+                    screenshot = images.screenshot
+            )
     )
 }

android/shared/src/commonMain/kotlin/io/rebble/cobble/shared/domain/calendar/CalendarSync.kt

@@ -25,7 +25,7 @@ class CalendarSync(
 ): AutoCloseable, KoinComponent {
     private val calendarSyncer: PhoneCalendarSyncer by inject()
     private val watchTimelineSyncer = WatchTimelineSyncer(blobDBService)
-    private val metadataFlow: Flow<WatchVersion.WatchVersionResponse> by inject(named("connectedWatchMetadata"))
+    private val metadataFlow: StateFlow<WatchVersion.WatchVersionResponse?> by inject(named("connectedWatchMetadata"))
     private val timelinePinDao: TimelinePinDao by inject()
     private val calendarDao: CalendarDao by inject()
     private val calendarEnableChangeFlow: MutableSharedFlow<List<Calendar>> = MutableSharedFlow()
@@ -34,7 +34,7 @@ class CalendarSync(
         Logging.d("CalendarSync init")
     }
 
-    private val watchConnectedListener = metadataFlow.onEach {
+    private val watchConnectedListener = metadataFlow.filterNotNull().onEach {
         Logging.d("Watch connected, syncing calendar pins")
         val res = onWatchConnected(it.isUnfaithful.get() ?: false)
         Logging.d("Calendar sync result: $res")

android/shared/src/commonMain/kotlin/io/rebble/cobble/shared/domain/state/ConnectionState.kt

@@ -36,5 +36,5 @@ object ConnectionStateManager: KoinComponent {
     /**
      * Flow of the currently connected watch's metadata. This flow only emits when a watch is connected and will not emit if negotiation never completes.
      */
-    val connectedWatchMetadata: Flow<WatchVersion.WatchVersionResponse> by inject(named("connectedWatchMetadata"))
+    val connectedWatchMetadata: StateFlow<WatchVersion.WatchVersionResponse?> by inject(named("connectedWatchMetadata"))
 }

android/shared/src/commonMain/kotlin/io/rebble/cobble/shared/jobs/LockerSyncJob.kt

@@ -29,6 +29,7 @@ class LockerSyncJob: KoinComponent {
     private val blobDBService: BlobDBService by inject()
     suspend fun beginSync(): Boolean {
         val locker = RWS.appstoreClient?.getLocker() ?: return false
+        lockerDao.clearAll()
         val storedLocker = lockerDao.getAllEntries()
 
         val changedEntries = locker.filter { new ->
@@ -45,6 +46,9 @@ class LockerSyncJob: KoinComponent {
             lockerDao.clearPlatformsFor(it.id)
         }
         lockerDao.insertOrReplaceAll(changedEntries.map { it.toEntity() })
+        lockerDao.insertOrReplaceAllPlatforms(newEntries.flatMap { new ->
+            new.hardwarePlatforms.map { it.toEntity(new.id) }
+        })
         lockerDao.insertOrReplaceAllPlatforms(changedEntries.flatMap { new ->
             new.hardwarePlatforms.map { it.toEntity(new.id) }
         })