Merge branch 'develop' into feature/fga/presenter_tests

2023-01-19 16:00:41 +01:00 · 2023-01-19 16:00:41 +01:00 · 5e0a040dba
commit 5e0a040dba
parent 97efff8aa4 337842c5dc
256 changed files with 102522 additions and 133 deletions
--- a/features/login/src/main/kotlin/io/element/android/x/features/login/changeserver/ChangeServerView.kt
+++ b/features/login/src/main/kotlin/io/element/android/x/features/login/changeserver/ChangeServerView.kt
@ -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"),
+    )
 }
--- a/features/login/src/main/kotlin/io/element/android/x/features/login/root/LoginRootScreen.kt
+++ b/features/login/src/main/kotlin/io/element/android/x/features/login/root/LoginRootScreen.kt
@ -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",
+        ),
+    )
 }
--- a/features/logout/src/main/kotlin/io/element/android/x/features/logout/LogoutPreferenceScreen.kt
+++ b/features/logout/src/main/kotlin/io/element/android/x/features/logout/LogoutPreferenceScreen.kt
@ -25,7 +25,6 @@ import androidx.compose.runtime.remember
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.tooling.preview.Preview
 import io.element.android.x.architecture.Async
-import io.element.android.x.designsystem.ElementXTheme
 import io.element.android.x.designsystem.components.ProgressDialog
 import io.element.android.x.designsystem.components.dialogs.ConfirmationDialog
 import io.element.android.x.designsystem.components.preferences.PreferenceCategory
@ -92,7 +91,5 @@ fun LogoutPreferenceContent(
@Composable
@Preview
 fun LogoutContentPreview() {
-    ElementXTheme(darkTheme = false) {
-        LogoutPreferenceView(LogoutPreferenceState())
-    }
+    LogoutPreferenceView(LogoutPreferenceState())
 }
--- a/features/messages/src/main/kotlin/io/element/android/x/features/messages/textcomposer/MessageComposerView.kt
+++ b/features/messages/src/main/kotlin/io/element/android/x/features/messages/textcomposer/MessageComposerView.kt
@ -18,6 +18,7 @@ package io.element.android.x.features.messages.textcomposer

 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
+import io.element.android.x.designsystem.LocalIsDarkTheme
 import io.element.android.x.textcomposer.TextComposer

@Composable
@ -50,6 +51,7 @@ fun MessageComposerView(
        onComposerTextChange = ::onComposerTextChange,
        composerCanSendMessage = state.isSendButtonVisible,
        composerText = state.text?.charSequence?.toString(),
+        isInDarkMode = LocalIsDarkTheme.current,
        modifier = modifier
    )
 }
--- a/features/messages/src/main/kotlin/io/element/android/x/features/messages/timeline/TimelineView.kt
+++ b/features/messages/src/main/kotlin/io/element/android/x/features/messages/timeline/TimelineView.kt
@ -356,7 +356,7 @@ class MessagesItemGroupPositionToMessagesTimelineItemContentProvider :
    )

@Suppress("PreviewPublic")
-@Preview(showBackground = true)
+@Preview
@Composable
 fun TimelineItemsPreview(
    @PreviewParameter(MessagesTimelineItemContentProvider::class)
--- a/features/rageshake/src/main/kotlin/io/element/android/x/features/rageshake/bugreport/BugReportView.kt
+++ b/features/rageshake/src/main/kotlin/io/element/android/x/features/rageshake/bugreport/BugReportView.kt
@ -53,7 +53,6 @@ import coil.request.ImageRequest
 import io.element.android.x.architecture.Async
 import io.element.android.x.core.compose.LogCompositions
 import io.element.android.x.core.compose.textFieldState
-import io.element.android.x.designsystem.ElementXTheme
 import io.element.android.x.designsystem.components.LabelledCheckbox
 import io.element.android.x.designsystem.components.dialogs.ErrorDialog
 import io.element.android.x.ui.strings.R as StringR
@ -213,9 +212,7 @@ fun BugReportView(
@Composable
@Preview
 fun BugReportContentPreview() {
-    ElementXTheme(darkTheme = false) {
-        BugReportView(
-            state = BugReportState(),
-        )
-    }
+    BugReportView(
+        state = BugReportState(),
+    )
 }
--- a/features/rageshake/src/main/kotlin/io/element/android/x/features/rageshake/crash/ui/CrashDetectionScreen.kt
+++ b/features/rageshake/src/main/kotlin/io/element/android/x/features/rageshake/crash/ui/CrashDetectionScreen.kt
@ -20,7 +20,6 @@ import androidx.compose.runtime.Composable
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.tooling.preview.Preview
 import io.element.android.x.core.compose.LogCompositions
-import io.element.android.x.designsystem.ElementXTheme
 import io.element.android.x.designsystem.components.dialogs.ConfirmationDialog
 import io.element.android.x.ui.strings.R as StringR

@ -66,9 +65,7 @@ fun CrashDetectionContent(
@Preview
@Composable
 fun CrashDetectionContentPreview() {
-    ElementXTheme {
-        CrashDetectionContent(
-            state = CrashDetectionState()
-        )
-    }
+    CrashDetectionContent(
+        state = CrashDetectionState()
+    )
 }
--- a/features/rageshake/src/main/kotlin/io/element/android/x/features/rageshake/detection/RageshakeDetectionView.kt
+++ b/features/rageshake/src/main/kotlin/io/element/android/x/features/rageshake/detection/RageshakeDetectionView.kt
@ -28,7 +28,6 @@ import io.element.android.x.core.compose.OnLifecycleEvent
 import io.element.android.x.core.hardware.vibrate
 import io.element.android.x.core.screenshot.ImageResult
 import io.element.android.x.core.screenshot.screenshot
-import io.element.android.x.designsystem.ElementXTheme
 import io.element.android.x.designsystem.components.dialogs.ConfirmationDialog
 import io.element.android.x.ui.strings.R as StringR

@ -98,7 +97,5 @@ fun RageshakeDialogContent(
@Preview
@Composable
 fun RageshakeDialogContentPreview() {
-    ElementXTheme {
-        RageshakeDialogContent()
-    }
+    RageshakeDialogContent()
 }
--- a/features/rageshake/src/main/kotlin/io/element/android/x/features/rageshake/preferences/RageshakePreferencesView.kt
+++ b/features/rageshake/src/main/kotlin/io/element/android/x/features/rageshake/preferences/RageshakePreferencesView.kt
@ -75,6 +75,12 @@ fun RageshakePreferencesView(

@Composable
@Preview
-fun RageshakePreferencesPreview() {
+fun RageshakePreferencesViewPreview() {
    RageshakePreferencesView(RageshakePreferencesState(isEnabled = true, isSupported = true, sensitivity = 0.5f))
 }
+
+@Composable
+@Preview
+fun RageshakePreferenceNotSupportedPreview() {
+    RageshakePreferencesView(RageshakePreferencesState(isEnabled = true, isSupported = false, sensitivity = 0.5f))
+}
--- a/features/roomlist/src/main/kotlin/io/element/android/x/features/roomlist/RoomListView.kt
+++ b/features/roomlist/src/main/kotlin/io/element/android/x/features/roomlist/RoomListView.kt
@ -37,7 +37,6 @@ import androidx.compose.ui.input.nestedscroll.nestedScroll
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.Velocity
 import io.element.android.x.core.compose.LogCompositions
-import io.element.android.x.designsystem.ElementXTheme
 import io.element.android.x.designsystem.components.avatar.AvatarData
 import io.element.android.x.features.roomlist.components.RoomListTopBar
 import io.element.android.x.features.roomlist.components.RoomSummaryRow
@ -150,30 +149,13 @@ private fun RoomListRoomSummary.contentType() = isPlaceholder

@Preview
@Composable
-fun PreviewableRoomListView() {
-    ElementXTheme(darkTheme = false) {
-        RoomListView(
-            roomSummaries = stubbedRoomSummaries(),
-            matrixUser = MatrixUser(id = UserId("@id"), username = "User#1", avatarData = AvatarData("U")),
-            onRoomClicked = {},
-            filter = "filter",
-            onFilterChanged = {},
-            onScrollOver = {}
-        )
-    }
-}
-
-@Preview
-@Composable
-fun PreviewableDarkRoomListView() {
-    ElementXTheme(darkTheme = true) {
-        RoomListView(
-            roomSummaries = stubbedRoomSummaries(),
-            matrixUser = MatrixUser(id = UserId("@id"), username = "User#1", avatarData = AvatarData("U")),
-            onRoomClicked = {},
-            filter = "filter",
-            onFilterChanged = {},
-            onScrollOver = {}
-        )
-    }
+fun RoomListViewPreview() {
+    RoomListView(
+        roomSummaries = stubbedRoomSummaries(),
+        matrixUser = MatrixUser(id = UserId("@id"), username = "User#1", avatarData = AvatarData("U")),
+        onRoomClicked = {},
+        filter = "filter",
+        onFilterChanged = {},
+        onScrollOver = {}
+    )
 }