diff --git a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/root/LoginRootNode.kt b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/root/LoginRootNode.kt index 43070ba0da..fce214f2e4 100644 --- a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/root/LoginRootNode.kt +++ b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/root/LoginRootNode.kt @@ -18,7 +18,6 @@ package io.element.android.features.login.impl.root import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier -import androidx.lifecycle.Lifecycle import com.bumble.appyx.core.modality.BuildContext import com.bumble.appyx.core.node.Node import com.bumble.appyx.core.plugin.Plugin @@ -26,7 +25,6 @@ import com.bumble.appyx.core.plugin.plugins import dagger.assisted.Assisted import dagger.assisted.AssistedInject import io.element.android.anvilannotations.ContributesNode -import io.element.android.libraries.designsystem.utils.OnLifecycleEvent import io.element.android.libraries.di.AppScope @ContributesNode(AppScope::class) @@ -47,7 +45,7 @@ class LoginRootNode @AssistedInject constructor( @Composable override fun View(modifier: Modifier) { val state = presenter.present() - LoginRootScreen( + LoginRootView( state = state, modifier = modifier, onChangeServer = this::onChangeHomeServer, diff --git a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/root/LoginRootScreen.kt b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/root/LoginRootView.kt similarity index 99% rename from features/login/impl/src/main/kotlin/io/element/android/features/login/impl/root/LoginRootScreen.kt rename to features/login/impl/src/main/kotlin/io/element/android/features/login/impl/root/LoginRootView.kt index 781652ae0e..c82cff1721 100644 --- a/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/root/LoginRootScreen.kt +++ b/features/login/impl/src/main/kotlin/io/element/android/features/login/impl/root/LoginRootView.kt @@ -62,7 +62,7 @@ import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.tooling.preview.PreviewParameter import androidx.compose.ui.unit.dp -import io.element.android.features.login.error.loginError +import io.element.android.features.login.impl.error.loginError import io.element.android.libraries.designsystem.ElementTextStyles import io.element.android.libraries.designsystem.components.dialogs.ErrorDialog import io.element.android.libraries.designsystem.components.form.textFieldState @@ -85,7 +85,7 @@ import io.element.android.libraries.ui.strings.R as StringR @OptIn(ExperimentalMaterial3Api::class) @Composable -fun LoginRootScreen( +fun LoginRootView( state: LoginRootState, modifier: Modifier = Modifier, onChangeServer: () -> Unit = {}, @@ -349,7 +349,7 @@ internal fun LoginRootScreenDarkPreview(@PreviewParameter(LoginRootStateProvider @Composable private fun ContentToPreview(state: LoginRootState) { - LoginRootScreen( + LoginRootView( state = state, onBackPressed = {} ) diff --git a/samples/minimal/src/main/kotlin/io/element/android/samples/minimal/LoginScreen.kt b/samples/minimal/src/main/kotlin/io/element/android/samples/minimal/LoginScreen.kt index 4eb80e6120..e7ea426a65 100644 --- a/samples/minimal/src/main/kotlin/io/element/android/samples/minimal/LoginScreen.kt +++ b/samples/minimal/src/main/kotlin/io/element/android/samples/minimal/LoginScreen.kt @@ -20,7 +20,7 @@ import androidx.compose.runtime.Composable import androidx.compose.runtime.remember import androidx.compose.ui.Modifier import io.element.android.features.login.impl.root.LoginRootPresenter -import io.element.android.features.login.impl.root.LoginRootScreen +import io.element.android.features.login.impl.root.LoginRootView import io.element.android.libraries.matrix.api.auth.MatrixAuthenticationService class LoginScreen(private val authenticationService: MatrixAuthenticationService) { @@ -31,7 +31,7 @@ class LoginScreen(private val authenticationService: MatrixAuthenticationService LoginRootPresenter(authenticationService = authenticationService) } val state = presenter.present() - LoginRootScreen( + LoginRootView( state = state, modifier = modifier, onBackPressed = {},