refactor: Hilt -> Metro Migration #227
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -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 | ||
| } | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -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() | ||
| } | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||||||||||||||||||||||||||||||||||||||
|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
| @@ -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) | ||||||||||||||||||||||||||||||||||||||||||
| } | ||||||||||||||||||||||||||||||||||||||||||
|
Comment on lines
+40
to
+47
There was a problem hiding this comment. lateinit ๋ณ์ ์ ๊ทผ ์ ์ด๊ธฐํ ์์ ๋ฌธ์ ๊ฐ ๋ฐ์ํ ์ ์์ต๋๋ค.
๋ค์ diff๋ฅผ ์ ์ฉํ์ธ์: override fun instantiateServiceCompat(
cl: ClassLoader,
className: String,
intent: Intent?,
): Service {
- return getInstance(cl, className, serviceProviders)
+ return if (::serviceProviders.isInitialized) {
+ getInstance(cl, className, serviceProviders)
+ } else {
+ null
+ }
?: super.instantiateServiceCompat(cl, className, intent)
}๐ค Prompt for AI Agents |
||||||||||||||||||||||||||||||||||||||||||
|
|
||||||||||||||||||||||||||||||||||||||||||
| 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 | ||||||||||||||||||||||||||||||||||||||||||
| } | ||||||||||||||||||||||||||||||||||||||||||
|
Comment on lines
+49
to
+55
There was a problem hiding this comment. ํ์ ์บ์คํ ๊ณผ thread safety ๋ฌธ์ ๊ฐ ์์ต๋๋ค.
๋ค์ diff๋ฅผ ์ ์ฉํ์ฌ ์์ ์ฑ์ ๊ฐ์ ํ์ธ์: 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
+ if (app is BooketApplication) {
+ synchronized(this) {
+ if (!::activityProviders.isInitialized) {
+ val appGraph = app.appGraph
+ activityProviders = appGraph.activityProviders
+ serviceProviders = appGraph.serviceProviders
+ }
+ }
+ }
return app
}๐ Committable suggestion
Suggested change
|
||||||||||||||||||||||||||||||||||||||||||
|
|
||||||||||||||||||||||||||||||||||||||||||
| companion object { | ||||||||||||||||||||||||||||||||||||||||||
| private lateinit var activityProviders: Map<KClass<out Activity>, Provider<Activity>> | ||||||||||||||||||||||||||||||||||||||||||
| private lateinit var serviceProviders: Map<KClass<out Service>, Provider<Service>> | ||||||||||||||||||||||||||||||||||||||||||
| } | ||||||||||||||||||||||||||||||||||||||||||
| } | ||||||||||||||||||||||||||||||||||||||||||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
lateinit ๋ณ์ ์ ๊ทผ ์ ์ด๊ธฐํ ์์ ๋ฌธ์ ๊ฐ ๋ฐ์ํ ์ ์์ต๋๋ค.
activityProviders๋instantiateApplicationCompat์์ ์ด๊ธฐํ๋์ง๋ง, Activity๊ฐ Application๋ณด๋ค ๋จผ์ ์์ฑ๋๋ ๊ฒฝ์ฐUninitializedPropertyAccessException์ด ๋ฐ์ํฉ๋๋ค. ์ด๊ธฐํ ์ฌ๋ถ๋ฅผ ํ์ธํ๊ฑฐ๋ nullable ํ์ ์ผ๋ก ๋ณ๊ฒฝํ๋ ๊ฒ์ ๊ณ ๋ คํ์ธ์.๋ค์ diff๋ฅผ ์ ์ฉํ์ฌ ์ด๊ธฐํ ์ฒดํฌ๋ฅผ ์ถ๊ฐํ ์ ์์ต๋๋ค:
override fun instantiateActivityCompat( cl: ClassLoader, className: String, intent: Intent?, ): Activity { - return getInstance(cl, className, activityProviders) + return if (::activityProviders.isInitialized) { + getInstance(cl, className, activityProviders) + } else { + null + } ?: super.instantiateActivityCompat(cl, className, intent) }๐ Committable suggestion
๐ค Prompt for AI Agents