Some cleanup:
- Remove unnecessary `GlobalScope`. - Rename `Component` to `Graph`, `DaggerComponentOwner` to `DependencyInjectionGraphOwner`. - Rename component builders to factories, where necessary.
This commit is contained in:
parent
6a05e1b911
commit
08bbe3fdaa
20 changed files with 99 additions and 127 deletions
|
|
@ -13,10 +13,10 @@ import dev.zacsweers.metro.GraphExtension
|
|||
import io.element.android.libraries.architecture.NodeFactoriesBindings
|
||||
|
||||
@GraphExtension(QrCodeLoginScope::class)
|
||||
interface QrCodeLoginComponent : NodeFactoriesBindings {
|
||||
interface QrCodeLoginGraph : NodeFactoriesBindings {
|
||||
@ContributesTo(AppScope::class)
|
||||
@GraphExtension.Factory
|
||||
interface Factory {
|
||||
fun create(): QrCodeLoginComponent
|
||||
fun create(): QrCodeLoginGraph
|
||||
}
|
||||
}
|
||||
|
|
@ -26,7 +26,7 @@ import dev.zacsweers.metro.Assisted
|
|||
import dev.zacsweers.metro.Inject
|
||||
import io.element.android.anvilannotations.ContributesNode
|
||||
import io.element.android.features.login.impl.di.QrCodeLoginBindings
|
||||
import io.element.android.features.login.impl.di.QrCodeLoginComponent
|
||||
import io.element.android.features.login.impl.di.QrCodeLoginGraph
|
||||
import io.element.android.features.login.impl.screens.qrcode.confirmation.QrCodeConfirmationNode
|
||||
import io.element.android.features.login.impl.screens.qrcode.confirmation.QrCodeConfirmationStep
|
||||
import io.element.android.features.login.impl.screens.qrcode.error.QrCodeErrorNode
|
||||
|
|
@ -38,7 +38,7 @@ import io.element.android.libraries.architecture.NodeInputs
|
|||
import io.element.android.libraries.architecture.bindings
|
||||
import io.element.android.libraries.architecture.createNode
|
||||
import io.element.android.libraries.core.coroutine.CoroutineDispatchers
|
||||
import io.element.android.libraries.di.DaggerComponentOwner
|
||||
import io.element.android.libraries.di.DependencyInjectionGraphOwner
|
||||
import io.element.android.libraries.matrix.api.auth.qrlogin.MatrixQrCodeLoginData
|
||||
import io.element.android.libraries.matrix.api.auth.qrlogin.QrCodeLoginStep
|
||||
import io.element.android.libraries.matrix.api.auth.qrlogin.QrLoginException
|
||||
|
|
@ -53,7 +53,7 @@ import timber.log.Timber
|
|||
class QrCodeLoginFlowNode(
|
||||
@Assisted buildContext: BuildContext,
|
||||
@Assisted plugins: List<Plugin>,
|
||||
qrCodeLoginComponentBuilder: QrCodeLoginComponent.Factory,
|
||||
qrCodeLoginGraphFactory: QrCodeLoginGraph.Factory,
|
||||
private val coroutineDispatchers: CoroutineDispatchers,
|
||||
) : BaseFlowNode<QrCodeLoginFlowNode.NavTarget>(
|
||||
backstack = BackStack(
|
||||
|
|
@ -62,10 +62,10 @@ class QrCodeLoginFlowNode(
|
|||
),
|
||||
buildContext = buildContext,
|
||||
plugins = plugins,
|
||||
), DaggerComponentOwner {
|
||||
), DependencyInjectionGraphOwner {
|
||||
private var authenticationJob: Job? = null
|
||||
|
||||
override val daggerComponent = qrCodeLoginComponentBuilder.create()
|
||||
override val graph = qrCodeLoginGraphFactory.create()
|
||||
private val qrCodeLoginManager by lazy { bindings<QrCodeLoginBindings>().qrCodeLoginManager() }
|
||||
|
||||
sealed interface NavTarget : Parcelable {
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue