Merge branch 'develop' into BOOK-473-refactor/#229

Author: easyhooon

README.md

@@ -77,7 +77,7 @@
 
 - [Circuit](https://github.com/slackhq/circuit)
 - ~~Google ML Kit~~ Google Cloud Vision
-- Dagger Hilt
+- ~~Dagger Hilt~~ Metro
 - Retrofit, OkHttp3
 - Lottie-Compose
 - Firebase(Analytics, Crashlytics, Remote Config)

app/build.gradle.kts

@@ -1,13 +1,16 @@
 @file:Suppress("INLINE_FROM_HIGHER_PLATFORM")
 
 import com.android.build.gradle.internal.cxx.configure.gradleLocalProperties
+import com.google.devtools.ksp.gradle.KspExtension
+import org.gradle.kotlin.dsl.configure
 import java.util.Properties
 
 plugins {
     alias(libs.plugins.booket.android.application)
     alias(libs.plugins.booket.android.application.compose)
-    alias(libs.plugins.booket.android.hilt)
     alias(libs.plugins.booket.android.firebase)
+    alias(libs.plugins.metro)
+    alias(libs.plugins.ksp)
 }
 
 android {
@@ -63,8 +66,8 @@ composeStabilityAnalyzer {
     enabled.set(true)
 }
 
-ksp {
-    arg("circuit.codegen.mode", "hilt")
+extensions.configure<KspExtension> {
+    arg("circuit.codegen.mode", "metro")
 }
 
 dependencies {
@@ -75,6 +78,7 @@ dependencies {
         projects.core.datastore.api,
         projects.core.datastore.impl,
         projects.core.designsystem,
+        projects.core.di,
         projects.core.model,
         projects.core.network,
         projects.core.ui,

app/src/main/AndroidManifest.xml

@@ -12,6 +12,7 @@
 
     <application
         android:name=".BooketApplication"
+        android:appComponentFactory="com.ninecraft.booket.di.MetroAppComponentFactory"
         android:allowBackup="true"
         android:dataExtractionRules="@xml/data_extraction_rules"
         android:fullBackupContent="@xml/backup_rules"
@@ -21,7 +22,8 @@
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/Theme.Booket"
-        tools:targetApi="31">
+        tools:targetApi="31"
+        tools:replace="android:appComponentFactory">
 
         <provider
             android:name="androidx.startup.InitializationProvider"

app/src/main/kotlin/com/ninecraft/booket/BooketApplication.kt

@@ -5,10 +5,13 @@ import coil.ImageLoader
 import coil.ImageLoaderFactory
 import coil.disk.DiskCache
 import coil.util.DebugLogger
-import dagger.hilt.android.HiltAndroidApp
+import com.ninecraft.booket.di.AppGraph
+import dev.zacsweers.metro.createGraphFactory
 
-@HiltAndroidApp
 class BooketApplication : Application(), ImageLoaderFactory {
+
+    val appGraph by lazy { createGraphFactory<AppGraph.Factory>().create(this) }
+
     override fun newImageLoader(): ImageLoader {
         return ImageLoader.Builder(this)
             .diskCache {

app/src/main/kotlin/com/ninecraft/booket/ReedFirebaseMessagingService.kt

@@ -3,6 +3,7 @@ package com.ninecraft.booket
 import android.app.NotificationChannel
 import android.app.NotificationManager
 import android.app.PendingIntent
+import android.app.Service
 import android.content.Context
 import android.content.Intent
 import androidx.core.app.NotificationCompat
@@ -11,20 +12,24 @@ import com.google.firebase.messaging.FirebaseMessagingService
 import com.google.firebase.messaging.RemoteMessage
 import com.ninecraft.booket.core.data.api.repository.UserRepository
 import com.ninecraft.booket.core.designsystem.R
+import com.ninecraft.booket.core.di.ServiceKey
 import com.ninecraft.booket.feature.main.MainActivity
-import dagger.hilt.android.AndroidEntryPoint
+import dev.zacsweers.metro.AppScope
+import dev.zacsweers.metro.ContributesIntoMap
+import dev.zacsweers.metro.Inject
+import dev.zacsweers.metro.binding
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.SupervisorJob
 import kotlinx.coroutines.cancel
 import kotlinx.coroutines.launch
-import javax.inject.Inject
 
-@AndroidEntryPoint
-class ReedFirebaseMessagingService : FirebaseMessagingService() {
-
-    @Inject
-    lateinit var userRepository: UserRepository
+@ContributesIntoMap(AppScope::class, binding = binding<Service>())
+@ServiceKey(ReedFirebaseMessagingService::class)
+@Inject
+class ReedFirebaseMessagingService(
+    private val userRepository: UserRepository,
+) : FirebaseMessagingService() {
 
     private val scope = CoroutineScope(Dispatchers.IO + SupervisorJob())
 

app/src/main/kotlin/com/ninecraft/booket/di/AppGraph.kt

@@ -0,0 +1,31 @@
+package com.ninecraft.booket.di
+
+import android.app.Activity
+import android.app.Service
+import android.content.Context
+import com.ninecraft.booket.core.di.ApplicationContext
+import com.ninecraft.booket.core.di.DataScope
+import dev.zacsweers.metro.AppScope
+import dev.zacsweers.metro.DependencyGraph
+import dev.zacsweers.metro.Multibinds
+import dev.zacsweers.metro.Provider
+import dev.zacsweers.metro.Provides
+import kotlin.reflect.KClass
+
+@DependencyGraph(
+    scope = AppScope::class,
+    additionalScopes = [DataScope::class],
+)
+interface AppGraph {
+
+    @Multibinds(allowEmpty = true)
+    val activityProviders: Map<KClass<out Activity>, Provider<Activity>>
+
+    @Multibinds(allowEmpty = true)
+    val serviceProviders: Map<KClass<out Service>, Provider<Service>>
+
+    @DependencyGraph.Factory
+    fun interface Factory {
+        fun create(@ApplicationContext @Provides context: Context): AppGraph
+    }
+}

app/src/main/kotlin/com/ninecraft/booket/di/CircuitGraph.kt

@@ -0,0 +1,52 @@
+package com.ninecraft.booket.di
+
+import androidx.compose.foundation.background
+import androidx.compose.foundation.text.BasicText
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.text.TextStyle
+import com.slack.circuit.foundation.Circuit
+import com.slack.circuit.foundation.LocalCircuit
+import com.slack.circuit.runtime.Navigator
+import com.slack.circuit.runtime.presenter.Presenter
+import com.slack.circuit.runtime.ui.Ui
+import dev.zacsweers.metro.AppScope
+import dev.zacsweers.metro.ContributesTo
+import dev.zacsweers.metro.Multibinds
+import dev.zacsweers.metro.Provides
+
+@ContributesTo(AppScope::class)
+interface CircuitGraph {
+
+    @Multibinds(allowEmpty = true)
+    fun presenterFactories(): Set<Presenter.Factory>
+
+    @Multibinds(allowEmpty = true)
+    fun uiFactories(): Set<Ui.Factory>
+
+    @Provides
+    fun provideCircuit(
+        presenterFactories: Set<Presenter.Factory>,
+        uiFactories: Set<Ui.Factory>,
+    ): Circuit {
+        return Circuit.Builder()
+            .addPresenterFactories(presenterFactories)
+            .addUiFactories(uiFactories)
+            .setAnimatedNavDecoratorFactory(CrossFadeNavDecoratorFactory())
+            .setOnUnavailableContent { screen, modifier ->
+                val circuit = LocalCircuit.current
+                BasicText(
+                    text = """
+                      Route not available: ${screen.javaClass.name}.
+                      Presenter: ${circuit?.presenter(screen, Navigator.NoOp)?.javaClass}
+                      UI: ${circuit?.ui(screen)?.javaClass}
+                      All presenterFactories: ${circuit?.newBuilder()?.presenterFactories}
+                      All uiFactories: ${circuit?.newBuilder()?.uiFactories}
+                      """
+                        .trimIndent(),
+                    modifier = modifier.background(Color.Red),
+                    style = TextStyle(color = Color.Yellow),
+                )
+            }
+            .build()
+    }
+}

app/src/main/kotlin/com/ninecraft/booket/di/CircuitModule.kt

@@ -0,0 +1,61 @@
+package com.ninecraft.booket.di
+
+import android.app.Activity
+import android.app.Application
+import android.app.Service
+import android.content.Intent
+import androidx.annotation.Keep
+import androidx.core.app.AppComponentFactory
+import com.ninecraft.booket.BooketApplication
+import dev.zacsweers.metro.Provider
+import kotlin.reflect.KClass
+
+/**
+ * AppComponentFactory that uses Metro for constructor injection of Activities and Services.
+ *
+ * Requires minSdk 28+. For lower versions, use manual graph access.
+ */
+@Keep
+class MetroAppComponentFactory : AppComponentFactory() {
+
+    private inline fun <reified T : Any> getInstance(
+        cl: ClassLoader,
+        className: String,
+        providers: Map<KClass<out T>, Provider<T>>,
+    ): T? {
+        val clazz = Class.forName(className, false, cl).asSubclass(T::class.java)
+        val modelProvider = providers[clazz.kotlin] ?: return null
+        return modelProvider()
+    }
+
+    override fun instantiateActivityCompat(
+        cl: ClassLoader,
+        className: String,
+        intent: Intent?,
+    ): Activity {
+        return getInstance(cl, className, activityProviders)
+            ?: super.instantiateActivityCompat(cl, className, intent)
+    }
+
+    override fun instantiateServiceCompat(
+        cl: ClassLoader,
+        className: String,
+        intent: Intent?,
+    ): Service {
+        return getInstance(cl, className, serviceProviders)
+            ?: super.instantiateServiceCompat(cl, className, intent)
+    }
+
+    override fun instantiateApplicationCompat(cl: ClassLoader, className: String): Application {
+        val app = super.instantiateApplicationCompat(cl, className)
+        val appGraph = (app as BooketApplication).appGraph
+        activityProviders = appGraph.activityProviders
+        serviceProviders = appGraph.serviceProviders
+        return app
+    }
+
+    companion object {
+        private lateinit var activityProviders: Map<KClass<out Activity>, Provider<Activity>>
+        private lateinit var serviceProviders: Map<KClass<out Service>, Provider<Service>>
+    }
+}

app/src/main/kotlin/com/ninecraft/booket/di/MetroAppComponentFactory.kt

@@ -9,6 +9,7 @@ dependencies {
     compileOnly(libs.android.gradle.plugin)
     compileOnly(libs.kotlin.gradle.plugin)
     compileOnly(libs.compose.compiler.gradle.plugin)
+    compileOnly(libs.ksp.gradle.plugin)
     implementation(files(libs.javaClass.superclass.protectionDomain.codeSource.location))
 }
 
@@ -20,7 +21,6 @@ gradlePlugin {
         "android.library.compose" to "AndroidLibraryComposeConventionPlugin",
         "android.feature" to "AndroidFeatureConventionPlugin",
         "android.firebase" to "AndroidFirebaseConventionPlugin",
-        "android.hilt" to "AndroidHiltConventionPlugin",
         "android.retrofit" to "AndroidRetrofitConventionPlugin",
         "jvm.library" to "JvmLibraryConventionPlugin",
         "kotlin.library.serialization" to "KotlinLibrarySerializationConventionPlugin",