Sulkta-Coop/element-x-ada
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

[Architecture] fix compile and rename LoginRootScreen -> LoginRootView

Browse source
This commit is contained in:
ganfra 2023-03-09 10:37:17 +01:00
parent ec1c84e058
commit ab5cdee031
3 changed files with 6 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

4
features/login/impl/src/main/kotlin/io/element/android/features/login/impl/root/LoginRootNode.kt
View file

@ -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,

6
features/login/impl/src/main/kotlin/io/element/android/features/login/impl/root/LoginRootScreen.kt → features/login/impl/src/main/kotlin/io/element/android/features/login/impl/root/LoginRootView.kt
View file

@ -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 = {}
)

4
samples/minimal/src/main/kotlin/io/element/android/samples/minimal/LoginScreen.kt
View file

@ -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 = {},