Chore: Migration cleanup

app/app/build.gradle.kts

@@ -113,8 +113,6 @@ dependencies {
   implementation(libs.androidx.compose.runtime.retain)
   implementation(libs.androidx.compose.uiToolingPreview)
   implementation(libs.androidx.lifecycle.process)
-  implementation(libs.androidx.navigation.common)
-  implementation(libs.androidx.navigation.compose)
   implementation(libs.androidx.navigation3.runtime)
   implementation(libs.androidx.navigation3.ui)
   implementation(libs.androidx.lifecycle.viewmodel.navigation3)

app/app/src/main/kotlin/com/hedvig/android/app/urihandler/ExternalDeepLinkHandler.kt

@@ -2,6 +2,7 @@ package com.hedvig.android.app.urihandler
 
 import com.hedvig.android.app.navigation.BackstackController
 import com.hedvig.android.feature.home.home.navigation.HomeKey
+import com.hedvig.android.logger.LogPriority
 import com.hedvig.android.logger.logcat
 import com.hedvig.android.navigation.compose.HedvigDeepLinkMatcher
 import java.net.URI
@@ -44,11 +45,11 @@ internal class ExternalDeepLinkHandler(
       return
     }
     if (targetsOwnDeepLink(uri)) {
-      logcat { "ExternalDeepLinkHandler no specific match for own-host uri:$uri — falling back to Home" }
+      logcat(LogPriority.WARN) { "ExternalDeepLinkHandler no specific match for own-host uri:$uri — falling back to Home" }
       backstackController.navigateToExternalDeepLink(HomeKey)
       return
     }
-    logcat { "ExternalDeepLinkHandler ignoring unmatched foreign-host external deep link uri:$uri" }
+    logcat(LogPriority.ERROR) { "ExternalDeepLinkHandler ignoring unmatched foreign-host external deep link uri:$uri" }
   }
 
   /**

app/auth/auth-core-public/src/main/kotlin/com/hedvig/android/auth/AuthTokenServiceImpl.kt

@@ -4,25 +4,32 @@ import com.hedvig.android.auth.event.AuthEventStorage
 import com.hedvig.android.auth.storage.AuthTokenStorage
 import com.hedvig.android.auth.token.AuthTokens
 import com.hedvig.android.auth.token.LocalRefreshToken
+import com.hedvig.android.core.common.ApplicationScope
+import com.hedvig.android.core.common.di.AppScope
 import com.hedvig.android.logger.LogPriority
 import com.hedvig.android.logger.logcat
 import com.hedvig.authlib.AccessToken
 import com.hedvig.authlib.AuthRepository
 import com.hedvig.authlib.AuthTokenResult
 import com.hedvig.authlib.RefreshToken
 import com.hedvig.authlib.RefreshTokenGrant
-import kotlinx.coroutines.CoroutineScope
+import dev.zacsweers.metro.ContributesBinding
+import dev.zacsweers.metro.Inject
+import dev.zacsweers.metro.SingleIn
 import kotlinx.coroutines.flow.SharingStarted
 import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.flow.first
 import kotlinx.coroutines.flow.mapLatest
 import kotlinx.coroutines.flow.stateIn
 
+@Inject
+@SingleIn(AppScope::class)
+@ContributesBinding(AppScope::class)
 internal class AuthTokenServiceImpl(
   private val authTokenStorage: AuthTokenStorage,
   private val authRepository: AuthRepository,
   private val authEventStorage: AuthEventStorage,
-  coroutineScope: CoroutineScope,
+  coroutineScope: ApplicationScope,
 ) : AuthTokenService {
   override val authStatus: StateFlow<AuthStatus?> = authTokenStorage.getTokens()
     .mapLatest { authTokens ->

app/auth/auth-core-public/src/main/kotlin/com/hedvig/android/auth/di/AuthMetroProviders.kt

@@ -1,11 +1,6 @@
 package com.hedvig.android.auth.di
 
-import com.hedvig.android.auth.AuthTokenService
-import com.hedvig.android.auth.AuthTokenServiceImpl
-import com.hedvig.android.auth.event.AuthEventStorage
-import com.hedvig.android.auth.storage.AuthTokenStorage
 import com.hedvig.android.core.buildconstants.HedvigBuildConstants
-import com.hedvig.android.core.common.ApplicationScope
 import com.hedvig.android.core.common.di.AppScope
 import com.hedvig.authlib.AuthEnvironment
 import com.hedvig.authlib.AuthRepository
@@ -16,20 +11,6 @@ import dev.zacsweers.metro.SingleIn
 
 @ContributesTo(AppScope::class)
 interface AuthMetroProviders {
-  @Provides
-  @SingleIn(AppScope::class)
-  fun provideAuthTokenService(
-    authTokenStorage: AuthTokenStorage,
-    authRepository: AuthRepository,
-    authEventStorage: AuthEventStorage,
-    applicationScope: ApplicationScope,
-  ): AuthTokenService = AuthTokenServiceImpl(
-    authTokenStorage,
-    authRepository,
-    authEventStorage,
-    applicationScope,
-  )
-
   @Provides
   @SingleIn(AppScope::class)
   fun provideAuthRepository(hedvigBuildConstants: HedvigBuildConstants): AuthRepository = NetworkAuthRepository(

app/core/core-datastore-public/src/androidMain/kotlin/com/hedvig/android/core/datastore/DeviceIdFetcher.android.kt

@@ -1,7 +1,14 @@
 package com.hedvig.android.core.datastore
 
+import com.hedvig.android.core.common.di.AppScope
+import dev.zacsweers.metro.ContributesBinding
+import dev.zacsweers.metro.Inject
+import dev.zacsweers.metro.SingleIn
 import kotlinx.coroutines.flow.firstOrNull
 
+@Inject
+@SingleIn(AppScope::class)
+@ContributesBinding(AppScope::class)
 internal class AndroidDeviceIdFetcher(
   private val deviceIdDataStore: DeviceIdDataStore,
 ) : DeviceIdFetcher {

app/core/core-datastore-public/src/androidMain/kotlin/com/hedvig/android/core/datastore/di/DataStoreMetroProviders.android.kt

@@ -4,9 +4,6 @@ import android.content.Context
 import androidx.datastore.core.DataStore
 import androidx.datastore.preferences.core.Preferences
 import com.hedvig.android.core.common.di.AppScope
-import com.hedvig.android.core.datastore.AndroidDeviceIdFetcher
-import com.hedvig.android.core.datastore.DeviceIdDataStore
-import com.hedvig.android.core.datastore.DeviceIdFetcher
 import dev.zacsweers.metro.ContributesTo
 import dev.zacsweers.metro.Provides
 import dev.zacsweers.metro.SingleIn
@@ -18,9 +15,4 @@ interface AndroidDataStoreMetroProviders {
   fun provideDataStore(applicationContext: Context): DataStore<Preferences> = createDataStore {
     applicationContext.applicationContext.filesDir.resolve(dataStoreFileName).absolutePath
   }
-
-  @Provides
-  @SingleIn(AppScope::class)
-  fun provideDeviceIdFetcher(deviceIdDataStore: DeviceIdDataStore): DeviceIdFetcher =
-    AndroidDeviceIdFetcher(deviceIdDataStore)
 }

app/core/core-datastore-public/src/commonMain/kotlin/com/hedvig/android/core/datastore/DeviceIdDataStore.kt

@@ -5,7 +5,11 @@ import androidx.datastore.preferences.core.Preferences
 import androidx.datastore.preferences.core.edit
 import androidx.datastore.preferences.core.stringPreferencesKey
 import com.benasher44.uuid.uuid4
-import kotlinx.coroutines.CoroutineScope
+import com.hedvig.android.core.common.ApplicationScope
+import com.hedvig.android.core.common.di.AppScope
+import dev.zacsweers.metro.ContributesBinding
+import dev.zacsweers.metro.Inject
+import dev.zacsweers.metro.SingleIn
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.IO
 import kotlinx.coroutines.flow.Flow
@@ -18,9 +22,12 @@ interface DeviceIdDataStore {
   fun observeDeviceId(): Flow<String?>
 }
 
+@Inject
+@SingleIn(AppScope::class)
+@ContributesBinding(AppScope::class)
 internal class DeviceIdDataStoreImpl(
   private val dataStore: DataStore<Preferences>,
-  coroutineScope: CoroutineScope,
+  coroutineScope: ApplicationScope,
 ) : DeviceIdDataStore {
   init {
     coroutineScope.launch(Dispatchers.IO) {

app/feature/feature-addon-purchase/build.gradle.kts

@@ -16,9 +16,6 @@ android {
 }
 
 dependencies {
-  api(libs.androidx.navigation.common)
-
-  implementation(libs.androidx.navigation.compose)
   implementation(libs.apollo.normalizedCache)
   implementation(libs.apollo.testingSupport)
   implementation(libs.arrow.core)

app/feature/feature-chat/build.gradle.kts

@@ -14,11 +14,10 @@ hedvig {
 }
 
 dependencies {
-  api(libs.androidx.navigation.common)
   api(libs.coil.coil)
 
+  implementation(libs.androidx.activity.compose)
   implementation(libs.androidx.datastore.core)
-  implementation(libs.androidx.navigation.compose)
   implementation(libs.apollo.normalizedCache)
   implementation(libs.arrow.core)
   implementation(libs.arrow.fx)

app/feature/feature-chip-id/build.gradle.kts

@@ -12,9 +12,6 @@ hedvig {
 }
 
 dependencies {
-  api(libs.androidx.navigation.common)
-
-  implementation(libs.androidx.navigation.compose)
   implementation(libs.apollo.normalizedCache)
   implementation(libs.apollo.runtime)
   implementation(libs.arrow.core)

app/feature/feature-choose-tier/build.gradle.kts

@@ -16,9 +16,6 @@ android {
 }
 
 dependencies {
-  api(libs.androidx.navigation.common)
-
-  implementation(libs.androidx.navigation.compose)
   implementation(libs.apollo.runtime)
   implementation(libs.arrow.core)
   implementation(libs.coroutines.core)

app/feature/feature-claim-chat/build.gradle.kts

@@ -56,7 +56,7 @@ kotlin {
     }
     androidMain.dependencies {
       implementation(libs.accompanist.permissions)
-      implementation(libs.androidx.navigation.compose)
+      implementation(libs.androidx.activity.compose)
       implementation(libs.bundles.kmpPreviewBugWorkaround)
       implementation(libs.rive.android)
       implementation(projects.composeUi)

app/feature/feature-claim-chat/src/androidMain/kotlin/com/hedvig/feature/claim/chat/data/AudioRecordingManager.kt

@@ -3,14 +3,21 @@ package com.hedvig.feature.claim.chat.data
 import android.content.Context
 import android.media.MediaPlayer
 import android.media.MediaRecorder
+import com.hedvig.android.core.common.di.AppScope
 import com.hedvig.android.core.fileupload.AndroidFile
 import com.hedvig.android.core.fileupload.CommonFile
+import dev.zacsweers.metro.ContributesBinding
+import dev.zacsweers.metro.Inject
+import dev.zacsweers.metro.SingleIn
 import java.io.File
 import java.util.Timer
 import java.util.TimerTask
 import java.util.UUID
 import kotlin.time.Clock
 
+@Inject
+@SingleIn(AppScope::class)
+@ContributesBinding(AppScope::class)
 internal class AndroidAudioRecordingManager(
   private val clock: Clock,
 ) : AudioRecordingManager {

app/feature/feature-claim-details/build.gradle.kts

@@ -16,11 +16,10 @@ android {
 }
 
 dependencies {
-  api(libs.androidx.navigation.common)
   api(libs.coil.coil)
 
+  implementation(libs.androidx.activity.compose)
   implementation(libs.androidx.compose.foundation)
-  implementation(libs.androidx.navigation.compose)
   implementation(libs.apollo.normalizedCache)
   implementation(libs.apollo.runtime)
   implementation(libs.arrow.core)

app/feature/feature-claim-history/build.gradle.kts

@@ -26,7 +26,6 @@ kotlin {
     }
     androidMain.dependencies {
       implementation(libs.bundles.kmpPreviewBugWorkaround)
-      implementation(libs.androidx.navigation.compose)
       implementation(libs.metro.viewmodel.compose)
       implementation(projects.coreResources)
       implementation(projects.designSystemHedvig)

app/feature/feature-connect-payment-trustly/build.gradle.kts

@@ -12,12 +12,9 @@ hedvig {
 }
 
 dependencies {
-  api(libs.androidx.navigation.common)
-
   implementation(libs.androidx.compose.animation)
   implementation(libs.androidx.compose.foundation)
   implementation(libs.androidx.compose.foundationLayout)
-  implementation(libs.androidx.navigation.compose)
   implementation(libs.androidx.other.browser)
   implementation(libs.apollo.api)
   implementation(libs.apollo.runtime)

app/feature/feature-delete-account/build.gradle.kts

@@ -12,11 +12,8 @@ hedvig {
 }
 
 dependencies {
-  api(libs.androidx.navigation.common)
-
   implementation(libs.androidx.datastore.core)
   implementation(libs.androidx.datastore.preferencesCore)
-  implementation(libs.androidx.navigation.compose)
   implementation(libs.apollo.normalizedCache)
   implementation(libs.arrow.core)
   implementation(libs.coroutines.core)

app/feature/feature-edit-coinsured/build.gradle.kts

@@ -16,10 +16,7 @@ android {
 }
 
 dependencies {
-  api(libs.androidx.navigation.common)
-
   implementation(libs.androidx.compose.foundation)
-  implementation(libs.androidx.navigation.compose)
   implementation(libs.arrow.core)
   implementation(libs.arrow.fx)
   implementation(libs.coroutines.core)

app/feature/feature-forever/build.gradle.kts

@@ -10,8 +10,6 @@ hedvig {
 }
 
 dependencies {
-  api(libs.androidx.navigation.common)
-  implementation(libs.androidx.navigation.compose)
   implementation(libs.kotlinx.serialization.core)
   implementation(projects.coreBuildConstants)
   implementation(projects.coreCommonPublic)

app/feature/feature-help-center/build.gradle.kts

@@ -34,8 +34,6 @@ kotlin {
       implementation(libs.coroutines.core)
       implementation(libs.jetbrains.compose.ui.tooling.preview)
       implementation(libs.jetbrains.lifecycle.runtime.compose)
-      implementation(libs.jetbrains.navigation.common)
-      implementation(libs.jetbrains.navigation.compose)
       implementation(libs.jetbrains.navigationevent.compose)
       implementation(libs.metro.viewmodel)
       implementation(libs.metro.viewmodel.compose)

app/feature/feature-home/build.gradle.kts

@@ -16,11 +16,8 @@ android {
 }
 
 dependencies {
-  api(libs.androidx.navigation.common)
-
   implementation(libs.accompanist.permissions)
   implementation(libs.androidx.compose.foundation)
-  implementation(libs.androidx.navigation.compose)
   implementation(libs.apollo.normalizedCache)
   implementation(libs.apollo.runtime)
   implementation(libs.arrow.core)

app/feature/feature-image-viewer/build.gradle.kts

@@ -11,7 +11,6 @@ hedvig {
 
 dependencies {
   implementation(libs.androidx.compose.foundation)
-  implementation(libs.androidx.navigation.compose)
   implementation(libs.coil.coil)
   implementation(libs.coil.compose)
   implementation(libs.kotlinx.serialization.core)

app/feature/feature-insurance-certificate/build.gradle.kts

@@ -19,7 +19,6 @@ android {
 dependencies {
   implementation(libs.arrow.core)
   implementation(libs.arrow.fx)
-  implementation(libs.jetbrains.navigation.compose)
   implementation(libs.kotlinx.serialization.core)
   implementation(projects.apolloCore)
   implementation(projects.apolloOctopusPublic)

app/feature/feature-insurances/build.gradle.kts

@@ -23,7 +23,6 @@ dependencies {
   implementation(libs.arrow.core)
   implementation(libs.arrow.fx)
   implementation(libs.jetbrains.lifecycle.runtime.compose)
-  implementation(libs.jetbrains.navigation.compose)
   implementation(libs.kotlinx.serialization.core)
   implementation(projects.apolloCore)
   implementation(projects.apolloOctopusPublic)

app/feature/feature-login/build.gradle.kts

@@ -17,7 +17,6 @@ android {
 
 dependencies {
   implementation(libs.androidx.compose.foundation)
-  implementation(libs.androidx.navigation.compose)
   implementation(libs.jetbrains.lifecycle.runtime)
   implementation(libs.jetbrains.lifecycle.runtime.compose)
   implementation(libs.jetbrains.lifecycle.viewmodel)