mirror of
https://github.com/vitorpamplona/amethyst.git
synced 2024-09-29 16:30:49 +00:00
Improves Preview Utilities
This commit is contained in:
parent
dd81c51fab
commit
0f69030cdf
@ -57,10 +57,7 @@ import com.vitorpamplona.amethyst.ui.theme.placeholderText
|
||||
@Composable
|
||||
@Preview
|
||||
fun LeftPictureLayoutPreview() {
|
||||
ThemeComparisonColumn(
|
||||
onDark = { LeftPictureLayoutPreviewCard() },
|
||||
onLight = { LeftPictureLayoutPreviewCard() },
|
||||
)
|
||||
ThemeComparisonColumn { LeftPictureLayoutPreviewCard() }
|
||||
}
|
||||
|
||||
@Composable
|
||||
|
@ -54,10 +54,7 @@ import kotlinx.collections.immutable.persistentSetOf
|
||||
@Composable
|
||||
@Preview
|
||||
fun BlankNotePreview() {
|
||||
ThemeComparisonColumn(
|
||||
onDark = { BlankNote() },
|
||||
onLight = { BlankNote() },
|
||||
)
|
||||
ThemeComparisonColumn { BlankNote() }
|
||||
}
|
||||
|
||||
@Composable
|
||||
@ -106,15 +103,7 @@ fun HiddenNotePreview() {
|
||||
val nav: (String) -> Unit = {}
|
||||
|
||||
ThemeComparisonColumn(
|
||||
onDark = {
|
||||
HiddenNote(
|
||||
reports = persistentSetOf<Note>(),
|
||||
isHiddenAuthor = true,
|
||||
accountViewModel = accountViewModel,
|
||||
nav = nav,
|
||||
) {}
|
||||
},
|
||||
onLight = {
|
||||
toPreview = {
|
||||
HiddenNote(
|
||||
reports = persistentSetOf<Note>(),
|
||||
isHiddenAuthor = true,
|
||||
@ -194,8 +183,7 @@ fun HiddenNote(
|
||||
@Composable
|
||||
fun HiddenNoteByMePreview() {
|
||||
ThemeComparisonColumn(
|
||||
onDark = { HiddenNoteByMe {} },
|
||||
onLight = { HiddenNoteByMe {} },
|
||||
toPreview = { HiddenNoteByMe {} },
|
||||
)
|
||||
}
|
||||
|
||||
|
@ -186,22 +186,13 @@ fun ZapTheDevsCardPreview() {
|
||||
accountViewModel,
|
||||
) { releaseNote ->
|
||||
if (releaseNote != null) {
|
||||
ThemeComparisonColumn(
|
||||
onDark = {
|
||||
ZapTheDevsCard(
|
||||
releaseNote,
|
||||
accountViewModel,
|
||||
nav = {},
|
||||
)
|
||||
},
|
||||
onLight = {
|
||||
ZapTheDevsCard(
|
||||
releaseNote,
|
||||
accountViewModel,
|
||||
nav = {},
|
||||
)
|
||||
},
|
||||
)
|
||||
ThemeComparisonColumn {
|
||||
ZapTheDevsCard(
|
||||
releaseNote,
|
||||
accountViewModel,
|
||||
nav = {},
|
||||
)
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -40,34 +40,19 @@ import com.vitorpamplona.amethyst.ui.theme.ThemeComparisonColumn
|
||||
@Composable
|
||||
@Preview
|
||||
fun AddButtonPreview() {
|
||||
ThemeComparisonColumn(
|
||||
onDark = {
|
||||
Row {
|
||||
Column {
|
||||
AddButton(isActive = true) {}
|
||||
AddButton(isActive = false) {}
|
||||
}
|
||||
|
||||
Column {
|
||||
RemoveButton(isActive = true) {}
|
||||
RemoveButton(isActive = false) {}
|
||||
}
|
||||
ThemeComparisonColumn {
|
||||
Row {
|
||||
Column {
|
||||
AddButton(isActive = true) {}
|
||||
AddButton(isActive = false) {}
|
||||
}
|
||||
},
|
||||
onLight = {
|
||||
Row {
|
||||
Column {
|
||||
AddButton(isActive = true) {}
|
||||
AddButton(isActive = false) {}
|
||||
}
|
||||
|
||||
Column {
|
||||
RemoveButton(isActive = true) {}
|
||||
RemoveButton(isActive = false) {}
|
||||
}
|
||||
Column {
|
||||
RemoveButton(isActive = true) {}
|
||||
RemoveButton(isActive = false) {}
|
||||
}
|
||||
},
|
||||
)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@Composable
|
||||
|
@ -34,8 +34,7 @@ import com.vitorpamplona.amethyst.ui.theme.lessImportantLink
|
||||
@Preview
|
||||
fun DisplayPoWPreview() {
|
||||
ThemeComparisonColumn(
|
||||
onDark = { DisplayPoW(pow = 24) },
|
||||
onLight = { DisplayPoW(pow = 24) },
|
||||
toPreview = { DisplayPoW(pow = 24) },
|
||||
)
|
||||
}
|
||||
|
||||
|
@ -872,48 +872,26 @@ private fun RenderWikiHeaderForThreadPreview() {
|
||||
}
|
||||
|
||||
LoadNote(baseNoteHex = "277f982a4cd3f67cc47ad9282176acabee1713848f547d6021e0c155572078e1", accountViewModel = accountViewModel) { baseNote ->
|
||||
ThemeComparisonColumn(
|
||||
onDark = {
|
||||
val bg = MaterialTheme.colorScheme.background
|
||||
val backgroundColor =
|
||||
remember {
|
||||
mutableStateOf(bg)
|
||||
}
|
||||
|
||||
Column {
|
||||
RenderWikiHeaderForThread(noteEvent = event, accountViewModel = accountViewModel, nav)
|
||||
RenderTextEvent(
|
||||
baseNote!!,
|
||||
false,
|
||||
true,
|
||||
backgroundColor,
|
||||
editState,
|
||||
accountViewModel,
|
||||
nav,
|
||||
)
|
||||
ThemeComparisonColumn {
|
||||
val bg = MaterialTheme.colorScheme.background
|
||||
val backgroundColor =
|
||||
remember {
|
||||
mutableStateOf(bg)
|
||||
}
|
||||
},
|
||||
onLight = {
|
||||
val bg = MaterialTheme.colorScheme.background
|
||||
val backgroundColor =
|
||||
remember {
|
||||
mutableStateOf(bg)
|
||||
}
|
||||
|
||||
Column {
|
||||
RenderWikiHeaderForThread(noteEvent = event, accountViewModel = accountViewModel, nav)
|
||||
RenderTextEvent(
|
||||
baseNote!!,
|
||||
false,
|
||||
true,
|
||||
backgroundColor,
|
||||
editState,
|
||||
accountViewModel,
|
||||
nav,
|
||||
)
|
||||
}
|
||||
},
|
||||
)
|
||||
Column {
|
||||
RenderWikiHeaderForThread(noteEvent = event, accountViewModel = accountViewModel, nav)
|
||||
RenderTextEvent(
|
||||
baseNote!!,
|
||||
false,
|
||||
true,
|
||||
backgroundColor,
|
||||
editState,
|
||||
accountViewModel,
|
||||
nav,
|
||||
)
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -228,8 +228,7 @@ fun HomeFeeds(
|
||||
@Composable
|
||||
fun HomeFeedEmptyPreview() {
|
||||
ThemeComparisonRow(
|
||||
onDark = { HomeFeedEmpty {} },
|
||||
onLight = { HomeFeedEmpty {} },
|
||||
toPreview = { HomeFeedEmpty {} },
|
||||
)
|
||||
}
|
||||
|
||||
|
@ -115,10 +115,7 @@ fun LoginPage() {
|
||||
val accountViewModel: AccountStateViewModel = viewModel()
|
||||
|
||||
ThemeComparisonRow(
|
||||
onDark = {
|
||||
LoginPage(accountViewModel, true) {}
|
||||
},
|
||||
onLight = {
|
||||
toPreview = {
|
||||
LoginPage(accountViewModel, true) {}
|
||||
},
|
||||
)
|
||||
|
@ -83,10 +83,7 @@ fun SignUpPage() {
|
||||
val accountViewModel: AccountStateViewModel = viewModel()
|
||||
|
||||
ThemeComparisonRow(
|
||||
onDark = {
|
||||
SignUpPage(accountViewModel) {}
|
||||
},
|
||||
onLight = {
|
||||
toPreview = {
|
||||
SignUpPage(accountViewModel) {}
|
||||
},
|
||||
)
|
||||
|
@ -451,16 +451,13 @@ fun AmethystTheme(
|
||||
}
|
||||
|
||||
@Composable
|
||||
fun ThemeComparisonColumn(
|
||||
onDark: @Composable () -> Unit,
|
||||
onLight: @Composable () -> Unit,
|
||||
) {
|
||||
fun ThemeComparisonColumn(toPreview: @Composable () -> Unit) {
|
||||
Column {
|
||||
Box {
|
||||
val darkTheme: SharedPreferencesViewModel = viewModel()
|
||||
darkTheme.updateTheme(ThemeType.DARK)
|
||||
AmethystTheme(darkTheme) {
|
||||
Surface(color = MaterialTheme.colorScheme.background) { onDark() }
|
||||
Surface(color = MaterialTheme.colorScheme.background) { toPreview() }
|
||||
}
|
||||
}
|
||||
|
||||
@ -468,23 +465,20 @@ fun ThemeComparisonColumn(
|
||||
val lightTheme: SharedPreferencesViewModel = viewModel()
|
||||
lightTheme.updateTheme(ThemeType.LIGHT)
|
||||
AmethystTheme(lightTheme) {
|
||||
Surface(color = MaterialTheme.colorScheme.background) { onLight() }
|
||||
Surface(color = MaterialTheme.colorScheme.background) { toPreview() }
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@Composable
|
||||
fun ThemeComparisonRow(
|
||||
onDark: @Composable () -> Unit,
|
||||
onLight: @Composable () -> Unit,
|
||||
) {
|
||||
fun ThemeComparisonRow(toPreview: @Composable () -> Unit) {
|
||||
Row {
|
||||
Box(modifier = Modifier.weight(1f)) {
|
||||
val darkTheme: SharedPreferencesViewModel = viewModel()
|
||||
darkTheme.updateTheme(ThemeType.DARK)
|
||||
AmethystTheme(darkTheme) {
|
||||
Surface(color = MaterialTheme.colorScheme.background) { onDark() }
|
||||
Surface(color = MaterialTheme.colorScheme.background) { toPreview() }
|
||||
}
|
||||
}
|
||||
|
||||
@ -492,7 +486,7 @@ fun ThemeComparisonRow(
|
||||
val lightTheme: SharedPreferencesViewModel = viewModel()
|
||||
lightTheme.updateTheme(ThemeType.LIGHT)
|
||||
AmethystTheme(lightTheme) {
|
||||
Surface(color = MaterialTheme.colorScheme.background) { onLight() }
|
||||
Surface(color = MaterialTheme.colorScheme.background) { toPreview() }
|
||||
}
|
||||
}
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user