Merge pull request #28 from vector-im/feature/bma/uiTests

UI tests
2023-01-19 15:07:21 +01:00 · 2023-01-19 15:07:21 +01:00 · 3b428de991
commit 3b428de991
parent 6e3a496770 7b2eae6cf5
108 changed files with 867 additions and 125 deletions
--- a/libraries/designsystem/src/main/kotlin/io/element/android/x/designsystem/components/avatar/Avatar.kt
+++ b/libraries/designsystem/src/main/kotlin/io/element/android/x/designsystem/components/avatar/Avatar.kt
@ -97,6 +97,6 @@ private fun InitialsAvatar(

@Preview
@Composable
-fun InitialsAvatar() {
-    InitialsAvatar(AvatarData("A"))
+fun InitialsAvatarPreview() {
+    Avatar(AvatarData(name = "A"))
 }
--- a/libraries/designsystem/src/main/kotlin/io/element/android/x/designsystem/components/preferences/PreferenceCategory.kt
+++ b/libraries/designsystem/src/main/kotlin/io/element/android/x/designsystem/components/preferences/PreferenceCategory.kt
@ -53,7 +53,7 @@ fun PreferenceCategory(
 }

@Composable
-@Preview(showBackground = false)
+@Preview
 fun PreferenceCategoryPreview() {
    PreferenceCategory(
        title = "Category title",
--- a/libraries/designsystem/src/main/kotlin/io/element/android/x/designsystem/components/preferences/PreferenceScreen.kt
+++ b/libraries/designsystem/src/main/kotlin/io/element/android/x/designsystem/components/preferences/PreferenceScreen.kt
@ -111,7 +111,7 @@ fun PreferenceTopAppBar(
 }

@Composable
-@Preview(showBackground = false)
+@Preview
 fun PreferenceScreenPreview() {
    PreferenceView(
        title = "Preference screen"
--- a/libraries/designsystem/src/main/kotlin/io/element/android/x/designsystem/components/preferences/PreferenceSlide.kt
+++ b/libraries/designsystem/src/main/kotlin/io/element/android/x/designsystem/components/preferences/PreferenceSlide.kt
@ -85,7 +85,7 @@ fun PreferenceSlide(
 }

@Composable
-@Preview(showBackground = false)
+@Preview
 fun PreferenceSlidePreview() {
    PreferenceSlide(
        title = "Slide",
--- a/libraries/designsystem/src/main/kotlin/io/element/android/x/designsystem/components/preferences/PreferenceSwitch.kt
+++ b/libraries/designsystem/src/main/kotlin/io/element/android/x/designsystem/components/preferences/PreferenceSwitch.kt
@ -76,7 +76,7 @@ fun PreferenceSwitch(
 }

@Composable
-@Preview(showBackground = false)
+@Preview
 fun PreferenceSwitchPreview() {
    PreferenceSwitch(
        title = "Switch",
--- a/libraries/designsystem/src/main/kotlin/io/element/android/x/designsystem/components/preferences/PreferenceText.kt
+++ b/libraries/designsystem/src/main/kotlin/io/element/android/x/designsystem/components/preferences/PreferenceText.kt
@ -64,7 +64,7 @@ fun PreferenceText(
 }

@Composable
-@Preview(showBackground = false)
+@Preview
 fun PreferenceTextPreview() {
    PreferenceText(
        title = "Title",
--- a/libraries/matrixui/src/main/kotlin/io/element/android/x/matrix/ui/components/MatrixUserHeader.kt
+++ b/libraries/matrixui/src/main/kotlin/io/element/android/x/matrix/ui/components/MatrixUserHeader.kt
@ -33,7 +33,6 @@ import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
-import io.element.android.x.designsystem.ElementXTheme
 import io.element.android.x.designsystem.components.avatar.Avatar
 import io.element.android.x.designsystem.components.avatar.AvatarData
 import io.element.android.x.designsystem.components.avatar.AvatarSize
@ -84,29 +83,25 @@ fun MatrixUserHeader(
@Preview
@Composable
 fun MatrixUserHeaderPreview() {
-    ElementXTheme {
-        MatrixUserHeader(
-            MatrixUser(
-                id = UserId("@alice:server.org"),
-                username = "Alice",
-                avatarUrl = null,
-                avatarData = AvatarData("Alice")
-            )
+    MatrixUserHeader(
+        MatrixUser(
+            id = UserId("@alice:server.org"),
+            username = "Alice",
+            avatarUrl = null,
+            avatarData = AvatarData("Alice")
        )
-    }
+    )
 }

@Preview
@Composable
 fun MatrixUserHeaderNoUsernamePreview() {
-    ElementXTheme {
-        MatrixUserHeader(
-            MatrixUser(
-                id = UserId("@alice:server.org"),
-                username = null,
-                avatarUrl = null,
-                avatarData = AvatarData("Alice")
-            )
+    MatrixUserHeader(
+        MatrixUser(
+            id = UserId("@alice:server.org"),
+            username = null,
+            avatarUrl = null,
+            avatarData = AvatarData("Alice")
        )
-    }
+    )
 }
--- a/libraries/matrixui/src/main/kotlin/io/element/android/x/matrix/ui/components/MatrixUserRow.kt
+++ b/libraries/matrixui/src/main/kotlin/io/element/android/x/matrix/ui/components/MatrixUserRow.kt
@ -33,7 +33,6 @@ import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
-import io.element.android.x.designsystem.ElementXTheme
 import io.element.android.x.designsystem.components.avatar.Avatar
 import io.element.android.x.designsystem.components.avatar.AvatarData
 import io.element.android.x.matrix.core.UserId
@ -88,14 +87,12 @@ fun MatrixUserRow(
@Preview
@Composable
 fun MatrixUserRowPreview() {
-    ElementXTheme {
-        MatrixUserRow(
-            MatrixUser(
-                id = UserId("@alice:server.org"),
-                username = "Alice",
-                avatarUrl = null,
-                avatarData = AvatarData("Alice")
-            )
+    MatrixUserRow(
+        MatrixUser(
+            id = UserId("@alice:server.org"),
+            username = "Alice",
+            avatarUrl = null,
+            avatarData = AvatarData("Alice")
        )
-    }
+    )
 }
--- a/libraries/textcomposer/src/main/kotlin/io/element/android/x/textcomposer/TextComposer.kt
+++ b/libraries/textcomposer/src/main/kotlin/io/element/android/x/textcomposer/TextComposer.kt
@ -18,7 +18,6 @@ package io.element.android.x.textcomposer

 import android.graphics.Color
 import android.net.Uri
-import androidx.compose.foundation.isSystemInDarkTheme
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
@ -42,6 +41,7 @@ fun TextComposer(
    composerText: String?,
    composerMode: MessageComposerMode,
    composerCanSendMessage: Boolean,
+    isInDarkMode: Boolean,
    modifier: Modifier = Modifier,
    onSendMessage: (String) -> Unit = {},
    onFullscreenToggle: () -> Unit = {},
@ -51,7 +51,6 @@ fun TextComposer(
    if (LocalInspectionMode.current) {
        FakeComposer(modifier)
    } else {
-        val isInDarkMode = isSystemInDarkTheme()
        AndroidView(
            modifier = modifier,
            factory = { context ->
@ -156,5 +155,6 @@ fun TextComposerPreview() {
        onCloseSpecialMode = {},
        composerCanSendMessage = true,
        composerText = "Message",
+        isInDarkMode = true,
    )
 }