Merge pull request #901 from tunjid/bugfix/1.3.5

Bugfix/1.3.5

Author: tunjid

composeApp/src/androidMain/kotlin/com/tunjid/heron/Platform.android.kt

@@ -48,16 +48,16 @@ fun createAppState(context: Context): AppState =
         logger = {
             AndroidLogger(context)
         },
-        videoPlayerController = { appScope ->
+        videoPlayerController = { appMainScope ->
             ExoplayerController(
                 context = context,
-                scope = appScope,
+                scope = appMainScope,
                 diffingDispatcher = Dispatchers.Default,
             )
         },
-        args = { appScope ->
+        args = { appMainScope ->
             DataBindingArgs(
-                appScope = appScope,
+                appMainScope = appMainScope,
                 connectivity = Connectivity(),
                 savedStatePath = context.savedStatePath(),
                 savedStateFileSystem = FileSystem.SYSTEM,

composeApp/src/androidMain/res/animator/splash_heron_body_animation.xml

@@ -3,17 +3,4 @@
   android:width="288dp"
   android:height="288dp"
   android:viewportWidth="35"
-  android:viewportHeight="48">
-  <target
-    android:name="head"
-    android:animation="@animator/splash_heron_head_animation" />
-  <target
-    android:name="beak"
-    android:animation="@animator/splash_heron_body_animation" />
-  <target
-    android:name="torso"
-    android:animation="@animator/splash_heron_body_animation" />
-  <target
-    android:name="feet"
-    android:animation="@animator/splash_heron_body_animation" />
-</animated-vector>
+  android:viewportHeight="48"/>

composeApp/src/androidMain/res/animator/splash_heron_head_animation.xml

@@ -81,14 +81,14 @@ expect fun getPlatform(): Platform
 
 fun createAppState(
     imageLoader: () -> ImageLoader,
-    notifier: (appScope: CoroutineScope) -> Notifier,
+    notifier: (appMainScope: CoroutineScope) -> Notifier,
     logger: () -> Logger,
-    videoPlayerController: (appScope: CoroutineScope) -> VideoPlayerController,
-    args: (appScope: CoroutineScope) -> DataBindingArgs,
+    videoPlayerController: (appMainScope: CoroutineScope) -> VideoPlayerController,
+    args: (appMainScope: CoroutineScope) -> DataBindingArgs,
 ): AppState {
     logger().install()
 
-    val appScope = CoroutineScope(SupervisorJob() + Dispatchers.Main)
+    val appMainScope = CoroutineScope(SupervisorJob() + Dispatchers.Main.immediate)
 
     val navigationComponent = createGraphFactory<AppNavigationGraph.Factory>().create(
         signInNavigationBindings = SignInNavigationBindings,
@@ -114,14 +114,14 @@ fun createAppState(
     )
 
     val dataBindings = DataBindings(
-        args = args(appScope),
+        args = args(appMainScope),
     )
 
     val scaffoldBindings = ScaffoldBindings(
         args = ScaffoldBindingArgs(
             imageLoader = imageLoader(),
-            notifier = notifier(appScope),
-            videoPlayerController = videoPlayerController(appScope),
+            notifier = notifier(appMainScope),
+            videoPlayerController = videoPlayerController(appMainScope),
             routeMatchers = navigationComponent.allRouteMatchers,
         ),
         dataBindings = dataBindings,

composeApp/src/androidMain/res/drawable/ic_splash_icon.xml

@@ -18,7 +18,7 @@ package com.tunjid.heron.di
 
 import com.tunjid.heron.compose.di.ComposeBindings
 import com.tunjid.heron.conversation.di.ConversationBindings
-import com.tunjid.heron.data.di.AppCoroutineScope
+import com.tunjid.heron.data.di.AppMainScope
 import com.tunjid.heron.data.di.DataBindings
 import com.tunjid.heron.data.repository.AuthRepository
 import com.tunjid.heron.data.repository.UserDataRepository
@@ -95,8 +95,8 @@ interface AppGraph {
     @SingleIn(AppScope::class)
     @Provides
     fun appState(
-        @AppCoroutineScope
-        appScope: CoroutineScope,
+        @AppMainScope
+        appMainScope: CoroutineScope,
         authRepository: AuthRepository,
         userDataRepository: UserDataRepository,
         navigationStateHolder: NavigationStateHolder,

composeApp/src/commonMain/kotlin/com/tunjid/heron/Platform.kt

@@ -45,14 +45,14 @@ fun createAppState(): AppState =
         logger = {
             JvmLogger()
         },
-        videoPlayerController = { appScope ->
+        videoPlayerController = { appMainScope ->
             VlcPlayerController(
-                scope = appScope,
+                scope = appMainScope,
             )
         },
-        args = { appScope ->
+        args = { appMainScope ->
             DataBindingArgs(
-                appScope = appScope,
+                appMainScope = appMainScope,
                 connectivity = Connectivity(),
                 savedStatePath = savedStatePath(),
                 savedStateFileSystem = FileSystem.SYSTEM,

composeApp/src/commonMain/kotlin/com/tunjid/heron/di/AppGraph.kt

@@ -53,9 +53,9 @@ fun createAppState(): AppState =
         videoPlayerController = {
             StubVideoPlayerController
         },
-        args = { appScope ->
+        args = { appMainScope ->
             DataBindingArgs(
-                appScope = appScope,
+                appMainScope = appMainScope,
                 connectivity = Connectivity(),
                 savedStatePath = savedStatePath(),
                 savedStateFileSystem = FileSystem.SYSTEM,

composeApp/src/desktopMain/kotlin/com/tunjid/heron/Platform.jvm.kt

@@ -50,19 +50,19 @@ import com.tunjid.heron.data.network.oauth.crypto.platformCryptographyProvider
 import com.tunjid.heron.data.repository.AuthRepository
 import com.tunjid.heron.data.repository.AuthTokenRepository
 import com.tunjid.heron.data.repository.DataStoreSavedStateDataSource
-import com.tunjid.heron.data.repository.EmbeddableRecordRepository
 import com.tunjid.heron.data.repository.MessageRepository
 import com.tunjid.heron.data.repository.NotificationsRepository
-import com.tunjid.heron.data.repository.OfflineEmbeddableRecordRepository
 import com.tunjid.heron.data.repository.OfflineMessageRepository
 import com.tunjid.heron.data.repository.OfflineNotificationsRepository
 import com.tunjid.heron.data.repository.OfflinePostRepository
 import com.tunjid.heron.data.repository.OfflineProfileRepository
+import com.tunjid.heron.data.repository.OfflineRecordRepository
 import com.tunjid.heron.data.repository.OfflineSearchRepository
 import com.tunjid.heron.data.repository.OfflineTimelineRepository
 import com.tunjid.heron.data.repository.OfflineUserDataRepository
 import com.tunjid.heron.data.repository.PostRepository
 import com.tunjid.heron.data.repository.ProfileRepository
+import com.tunjid.heron.data.repository.RecordRepository
 import com.tunjid.heron.data.repository.SavedStateDataSource
 import com.tunjid.heron.data.repository.SearchRepository
 import com.tunjid.heron.data.repository.TimelineRepository
@@ -103,7 +103,7 @@ import okio.Path
 
 @Qualifier
 @Retention(AnnotationRetention.RUNTIME)
-annotation class AppCoroutineScope
+annotation class AppMainScope
 
 @Qualifier
 @Retention(AnnotationRetention.RUNTIME)
@@ -114,7 +114,7 @@ internal annotation class IODispatcher
 internal annotation class DefaultDispatcher
 
 class DataBindingArgs(
-    val appScope: CoroutineScope,
+    val appMainScope: CoroutineScope,
     val connectivity: Connectivity,
     val savedStatePath: Path,
     val savedStateFileSystem: FileSystem,
@@ -126,10 +126,10 @@ class DataBindings(
     private val args: DataBindingArgs,
 ) {
 
-    @AppCoroutineScope
+    @AppMainScope
     @SingleIn(AppScope::class)
     @Provides
-    fun provideAppScope(): CoroutineScope = args.appScope
+    fun provideAppScope(): CoroutineScope = args.appMainScope
 
     @IODispatcher
     @SingleIn(AppScope::class)
@@ -394,6 +394,6 @@ class DataBindings(
     @SingleIn(AppScope::class)
     @Provides
     internal fun provideRecordRepository(
-        offlineRecordRepository: OfflineEmbeddableRecordRepository,
-    ): EmbeddableRecordRepository = offlineRecordRepository
+        offlineRecordRepository: OfflineRecordRepository,
+    ): RecordRepository = offlineRecordRepository
 }

composeApp/src/iosMain/kotlin/com/tunjid/heron/Platform.ios.kt

@@ -16,17 +16,20 @@
 
 package com.tunjid.heron.data.network
 
-import com.tunjid.heron.data.di.AppCoroutineScope
+import com.tunjid.heron.data.di.AppMainScope
+import com.tunjid.heron.data.di.IODispatcher
 import dev.jordond.connectivity.Connectivity
 import dev.zacsweers.metro.Inject
 import io.ktor.http.Url
+import kotlinx.coroutines.CoroutineDispatcher
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.SharingStarted
 import kotlinx.coroutines.flow.emitAll
 import kotlinx.coroutines.flow.flow
 import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.flow.stateIn
+import kotlinx.coroutines.plus
 
 /**
  * An interface that reports if there's a network connection
@@ -36,8 +39,10 @@ interface NetworkMonitor {
 }
 
 internal class ConnectivityNetworkMonitor @Inject constructor(
-    @AppCoroutineScope
-    appScope: CoroutineScope,
+    @AppMainScope
+    appMainScope: CoroutineScope,
+    @IODispatcher
+    ioDispatcher: CoroutineDispatcher,
     private val connectivity: Connectivity,
 ) : NetworkMonitor {
     override val isConnected: Flow<Boolean> = flow {
@@ -53,7 +58,7 @@ internal class ConnectivityNetworkMonitor @Inject constructor(
         }
     }
         .stateIn(
-            scope = appScope,
+            scope = appMainScope + ioDispatcher,
             initialValue = true,
             // TODO: Can this be WhileSubscribed?
             //  The backing library isn't thread safe for start / stop.