Do not use theme in the Preview, it breaks the screenshots building.

This commit is contained in:
Benoit Marty 2023-01-02 16:12:39 +01:00 committed by Benoit Marty
parent a4bed29a93
commit 4732630d57
9 changed files with 45 additions and 89 deletions

View file

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

View file

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

View file

@ -25,7 +25,6 @@ import androidx.compose.runtime.remember
import androidx.compose.ui.res.stringResource import androidx.compose.ui.res.stringResource
import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.tooling.preview.Preview
import io.element.android.x.architecture.Async 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.ProgressDialog
import io.element.android.x.designsystem.components.dialogs.ConfirmationDialog import io.element.android.x.designsystem.components.dialogs.ConfirmationDialog
import io.element.android.x.designsystem.components.preferences.PreferenceCategory import io.element.android.x.designsystem.components.preferences.PreferenceCategory
@ -92,7 +91,5 @@ fun LogoutPreferenceContent(
@Composable @Composable
@Preview @Preview
fun LogoutContentPreview() { fun LogoutContentPreview() {
ElementXTheme(darkTheme = false) { LogoutPreferenceView(LogoutPreferenceState())
LogoutPreferenceView(LogoutPreferenceState())
}
} }

View file

@ -53,7 +53,6 @@ import coil.request.ImageRequest
import io.element.android.x.architecture.Async import io.element.android.x.architecture.Async
import io.element.android.x.core.compose.LogCompositions import io.element.android.x.core.compose.LogCompositions
import io.element.android.x.core.compose.textFieldState 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.LabelledCheckbox
import io.element.android.x.designsystem.components.dialogs.ErrorDialog import io.element.android.x.designsystem.components.dialogs.ErrorDialog
import io.element.android.x.ui.strings.R as StringR import io.element.android.x.ui.strings.R as StringR
@ -213,9 +212,7 @@ fun BugReportView(
@Composable @Composable
@Preview @Preview
fun BugReportContentPreview() { fun BugReportContentPreview() {
ElementXTheme(darkTheme = false) { BugReportView(
BugReportView( state = BugReportState(),
state = BugReportState(), )
)
}
} }

View file

@ -20,7 +20,6 @@ import androidx.compose.runtime.Composable
import androidx.compose.ui.res.stringResource import androidx.compose.ui.res.stringResource
import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.tooling.preview.Preview
import io.element.android.x.core.compose.LogCompositions 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.designsystem.components.dialogs.ConfirmationDialog
import io.element.android.x.ui.strings.R as StringR import io.element.android.x.ui.strings.R as StringR
@ -66,9 +65,7 @@ fun CrashDetectionContent(
@Preview @Preview
@Composable @Composable
fun CrashDetectionContentPreview() { fun CrashDetectionContentPreview() {
ElementXTheme { CrashDetectionContent(
CrashDetectionContent( state = CrashDetectionState()
state = CrashDetectionState() )
)
}
} }

View file

@ -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.hardware.vibrate
import io.element.android.x.core.screenshot.ImageResult import io.element.android.x.core.screenshot.ImageResult
import io.element.android.x.core.screenshot.screenshot 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.designsystem.components.dialogs.ConfirmationDialog
import io.element.android.x.ui.strings.R as StringR import io.element.android.x.ui.strings.R as StringR
@ -98,7 +97,5 @@ fun RageshakeDialogContent(
@Preview @Preview
@Composable @Composable
fun RageshakeDialogContentPreview() { fun RageshakeDialogContentPreview() {
ElementXTheme { RageshakeDialogContent()
RageshakeDialogContent()
}
} }

View file

@ -37,7 +37,6 @@ import androidx.compose.ui.input.nestedscroll.nestedScroll
import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.tooling.preview.Preview
import androidx.compose.ui.unit.Velocity import androidx.compose.ui.unit.Velocity
import io.element.android.x.core.compose.LogCompositions 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.designsystem.components.avatar.AvatarData
import io.element.android.x.features.roomlist.components.RoomListTopBar import io.element.android.x.features.roomlist.components.RoomListTopBar
import io.element.android.x.features.roomlist.components.RoomSummaryRow import io.element.android.x.features.roomlist.components.RoomSummaryRow
@ -151,29 +150,12 @@ private fun RoomListRoomSummary.contentType() = isPlaceholder
@Preview @Preview
@Composable @Composable
fun PreviewableRoomListView() { fun PreviewableRoomListView() {
ElementXTheme(darkTheme = false) { RoomListView(
RoomListView( roomSummaries = stubbedRoomSummaries(),
roomSummaries = stubbedRoomSummaries(), matrixUser = MatrixUser(id = UserId("@id"), username = "User#1", avatarData = AvatarData("U")),
matrixUser = MatrixUser(id = UserId("@id"), username = "User#1", avatarData = AvatarData("U")), onRoomClicked = {},
onRoomClicked = {}, filter = "filter",
filter = "filter", onFilterChanged = {},
onFilterChanged = {}, onScrollOver = {}
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 = {}
)
}
} }

View file

@ -33,7 +33,6 @@ import androidx.compose.ui.text.style.TextOverflow
import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.tooling.preview.Preview
import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.dp
import androidx.compose.ui.unit.sp 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.Avatar
import io.element.android.x.designsystem.components.avatar.AvatarData import io.element.android.x.designsystem.components.avatar.AvatarData
import io.element.android.x.designsystem.components.avatar.AvatarSize import io.element.android.x.designsystem.components.avatar.AvatarSize
@ -84,29 +83,25 @@ fun MatrixUserHeader(
@Preview @Preview
@Composable @Composable
fun MatrixUserHeaderPreview() { fun MatrixUserHeaderPreview() {
ElementXTheme { MatrixUserHeader(
MatrixUserHeader( MatrixUser(
MatrixUser( id = UserId("@alice:server.org"),
id = UserId("@alice:server.org"), username = "Alice",
username = "Alice", avatarUrl = null,
avatarUrl = null, avatarData = AvatarData("Alice")
avatarData = AvatarData("Alice")
)
) )
} )
} }
@Preview @Preview
@Composable @Composable
fun MatrixUserHeaderNoUsernamePreview() { fun MatrixUserHeaderNoUsernamePreview() {
ElementXTheme { MatrixUserHeader(
MatrixUserHeader( MatrixUser(
MatrixUser( id = UserId("@alice:server.org"),
id = UserId("@alice:server.org"), username = null,
username = null, avatarUrl = null,
avatarUrl = null, avatarData = AvatarData("Alice")
avatarData = AvatarData("Alice")
)
) )
} )
} }

View file

@ -33,7 +33,6 @@ import androidx.compose.ui.text.style.TextOverflow
import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.tooling.preview.Preview
import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.dp
import androidx.compose.ui.unit.sp 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.Avatar
import io.element.android.x.designsystem.components.avatar.AvatarData import io.element.android.x.designsystem.components.avatar.AvatarData
import io.element.android.x.matrix.core.UserId import io.element.android.x.matrix.core.UserId
@ -88,14 +87,12 @@ fun MatrixUserRow(
@Preview @Preview
@Composable @Composable
fun MatrixUserRowPreview() { fun MatrixUserRowPreview() {
ElementXTheme { MatrixUserRow(
MatrixUserRow( MatrixUser(
MatrixUser( id = UserId("@alice:server.org"),
id = UserId("@alice:server.org"), username = "Alice",
username = "Alice", avatarUrl = null,
avatarUrl = null, avatarData = AvatarData("Alice")
avatarData = AvatarData("Alice")
)
) )
} )
} }