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

Merge branch 'develop' into feature/fga/presenter_tests

Browse source
This commit is contained in:
ganfra 2023-01-19 16:00:41 +01:00
commit 5e0a040dba
256 changed files with 102522 additions and 133 deletions
Download patch file Download diff file Expand all files Collapse all files

9
features/login/src/main/kotlin/io/element/android/x/features/login/changeserver/ChangeServerView.kt
View file

@ -54,7 +54,6 @@ import androidx.compose.ui.unit.dp
import androidx.compose.ui.unit.sp
import io.element.android.x.architecture.Async
import io.element.android.x.core.compose.textFieldState
import io.element.android.x.designsystem.ElementXTheme
import io.element.android.x.designsystem.components.VectorIcon
import io.element.android.x.features.login.R
import io.element.android.x.features.login.error.changeServerError
@ -183,9 +182,7 @@ fun ChangeServerView(
@Composable
@Preview
fun ChangeServerContentPreview() {
ElementXTheme {
ChangeServerView(
state = ChangeServerState(homeserver = "matrix.org"),
)
}
ChangeServerView(
state = ChangeServerState(homeserver = "matrix.org"),
)
}

13
features/login/src/main/kotlin/io/element/android/x/features/login/root/LoginRootScreen.kt
View file

@ -59,7 +59,6 @@ import androidx.compose.ui.tooling.preview.Preview
import androidx.compose.ui.unit.dp
import androidx.compose.ui.unit.sp
import io.element.android.x.core.compose.textFieldState
import io.element.android.x.designsystem.ElementXTheme
import io.element.android.x.features.login.error.loginError
import io.element.android.x.matrix.core.SessionId
import io.element.android.x.ui.strings.R as StringR
@ -224,11 +223,9 @@ fun LoginRootScreen(
@Composable
@Preview
fun LoginContentPreview() {
ElementXTheme(darkTheme = false) {
LoginRootScreen(
state = LoginRootState(
homeserver = "matrix.org",
),
)
}
LoginRootScreen(
state = LoginRootState(
homeserver = "matrix.org",
),
)
}