From 4732630d5776bca387d49969506fb53c2367f038 Mon Sep 17 00:00:00 2001 From: Benoit Marty Date: Mon, 2 Jan 2023 16:12:39 +0100 Subject: [PATCH] Do not use theme in the Preview, it breaks the screenshots building. --- .../login/changeserver/ChangeServerView.kt | 9 ++--- .../x/features/login/root/LoginRootScreen.kt | 13 +++---- .../features/logout/LogoutPreferenceScreen.kt | 5 +-- .../rageshake/bugreport/BugReportView.kt | 9 ++--- .../crash/ui/CrashDetectionScreen.kt | 9 ++--- .../detection/RageshakeDetectionView.kt | 5 +-- .../x/features/roomlist/RoomListView.kt | 34 +++++-------------- .../matrix/ui/components/MatrixUserHeader.kt | 33 ++++++++---------- .../x/matrix/ui/components/MatrixUserRow.kt | 17 ++++------ 9 files changed, 45 insertions(+), 89 deletions(-) diff --git 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 index 80dc4f2e0b..1ac77b16b8 100644 --- 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"), + ) } diff --git 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 index 6e0f38886a..665064f270 100644 --- 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", + ), + ) } diff --git 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 index 18c4e73b1e..5f76d9e3b4 100644 --- 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()) } diff --git 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 index b22cc7c48c..009ca812ef 100644 --- 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(), + ) } diff --git 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 index 13d174468b..494cc0d843 100644 --- 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() + ) } diff --git 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 index 6f647758ce..c438c0a600 100644 --- 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() } diff --git 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 index 97d849415c..4bab6b3bfa 100644 --- 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 @@ -151,29 +150,12 @@ 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 = {} - ) - } + RoomListView( + roomSummaries = stubbedRoomSummaries(), + matrixUser = MatrixUser(id = UserId("@id"), username = "User#1", avatarData = AvatarData("U")), + onRoomClicked = {}, + filter = "filter", + onFilterChanged = {}, + onScrollOver = {} + ) } diff --git 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 index 928c0f032b..08acd79a0c 100644 --- 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") ) - } + ) } diff --git 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 index 6fbde8bd64..e121ced17c 100644 --- 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") ) - } + ) }