From d8ef392ddd77126cdf8e41caa2b80ab7287d6279 Mon Sep 17 00:00:00 2001 From: andrekir Date: Sat, 13 Jul 2024 07:26:45 -0300 Subject: [PATCH] refactor: replace light/dark mode previews with `@PreviewLightDark` --- .../main/java/com/geeksville/mesh/ui/BatteryInfo.kt | 5 ++--- .../main/java/com/geeksville/mesh/ui/DebugFragment.kt | 6 ++---- .../main/java/com/geeksville/mesh/ui/LastHeardInfo.kt | 5 ++--- .../java/com/geeksville/mesh/ui/LinkedCoordinates.kt | 4 ++-- app/src/main/java/com/geeksville/mesh/ui/SignalInfo.kt | 7 +++---- .../mesh/ui/components/NodeFilterTextField.kt | 5 ++--- .../geeksville/mesh/ui/compose/SatelliteCountInfo.kt | 10 ++-------- 7 files changed, 15 insertions(+), 27 deletions(-) diff --git a/app/src/main/java/com/geeksville/mesh/ui/BatteryInfo.kt b/app/src/main/java/com/geeksville/mesh/ui/BatteryInfo.kt index 67d4fed76..102ec4f64 100644 --- a/app/src/main/java/com/geeksville/mesh/ui/BatteryInfo.kt +++ b/app/src/main/java/com/geeksville/mesh/ui/BatteryInfo.kt @@ -1,6 +1,5 @@ package com.geeksville.mesh.ui -import android.content.res.Configuration import androidx.compose.foundation.layout.Row import androidx.compose.foundation.layout.height import androidx.compose.material.Icon @@ -12,6 +11,7 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.graphics.vector.ImageVector import androidx.compose.ui.res.vectorResource import androidx.compose.ui.tooling.preview.Preview +import androidx.compose.ui.tooling.preview.PreviewLightDark import androidx.compose.ui.tooling.preview.PreviewParameter import androidx.compose.ui.tooling.preview.PreviewParameterProvider import androidx.compose.ui.unit.dp @@ -53,9 +53,8 @@ fun BatteryInfo( } } +@PreviewLightDark @Composable -@Preview(showBackground = true) -@Preview(showBackground = true, uiMode = Configuration.UI_MODE_NIGHT_YES) fun BatteryInfoPreview( @PreviewParameter(BatteryInfoPreviewParameterProvider::class) batteryInfo: Pair diff --git a/app/src/main/java/com/geeksville/mesh/ui/DebugFragment.kt b/app/src/main/java/com/geeksville/mesh/ui/DebugFragment.kt index df9ee8616..56a1ffe69 100644 --- a/app/src/main/java/com/geeksville/mesh/ui/DebugFragment.kt +++ b/app/src/main/java/com/geeksville/mesh/ui/DebugFragment.kt @@ -1,6 +1,5 @@ package com.geeksville.mesh.ui -import android.content.res.Configuration import android.os.Bundle import android.view.LayoutInflater import android.view.View @@ -32,7 +31,7 @@ import androidx.compose.ui.text.buildAnnotatedString import androidx.compose.ui.text.font.FontFamily import androidx.compose.ui.text.font.FontStyle import androidx.compose.ui.text.font.FontWeight -import androidx.compose.ui.tooling.preview.Preview +import androidx.compose.ui.tooling.preview.PreviewLightDark import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp import androidx.fragment.app.Fragment @@ -232,8 +231,7 @@ internal fun DebugItem(log: MeshLog) { } } -@Preview(showBackground = true) -@Preview(showBackground = true, uiMode = Configuration.UI_MODE_NIGHT_YES) +@PreviewLightDark @Composable private fun DebugScreenPreview() { AppTheme { diff --git a/app/src/main/java/com/geeksville/mesh/ui/LastHeardInfo.kt b/app/src/main/java/com/geeksville/mesh/ui/LastHeardInfo.kt index b494d97eb..5d559c3d9 100644 --- a/app/src/main/java/com/geeksville/mesh/ui/LastHeardInfo.kt +++ b/app/src/main/java/com/geeksville/mesh/ui/LastHeardInfo.kt @@ -11,7 +11,7 @@ import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.graphics.vector.ImageVector import androidx.compose.ui.res.vectorResource -import androidx.compose.ui.tooling.preview.Preview +import androidx.compose.ui.tooling.preview.PreviewLightDark import androidx.compose.ui.unit.dp import com.geeksville.mesh.R import com.geeksville.mesh.ui.theme.AppTheme @@ -41,9 +41,8 @@ fun LastHeardInfo( } } +@PreviewLightDark @Composable -@Preview(showBackground = true) -@Preview(showBackground = true, uiMode = android.content.res.Configuration.UI_MODE_NIGHT_YES) fun LastHeardInfoPreview() { AppTheme { LastHeardInfo(lastHeard = (System.currentTimeMillis() / 1000).toInt() - 8600) diff --git a/app/src/main/java/com/geeksville/mesh/ui/LinkedCoordinates.kt b/app/src/main/java/com/geeksville/mesh/ui/LinkedCoordinates.kt index cbe47227a..74811f19a 100644 --- a/app/src/main/java/com/geeksville/mesh/ui/LinkedCoordinates.kt +++ b/app/src/main/java/com/geeksville/mesh/ui/LinkedCoordinates.kt @@ -13,6 +13,7 @@ import androidx.compose.ui.text.buildAnnotatedString import androidx.compose.ui.text.style.TextDecoration import androidx.compose.ui.text.withStyle import androidx.compose.ui.tooling.preview.Preview +import androidx.compose.ui.tooling.preview.PreviewLightDark import androidx.compose.ui.tooling.preview.PreviewParameter import androidx.compose.ui.tooling.preview.PreviewParameterProvider import com.geeksville.mesh.Position @@ -84,9 +85,8 @@ fun LinkedCoordinatesSimplePreview() { } } +@PreviewLightDark @Composable -@Preview(showBackground = true) -@Preview(showBackground = true, uiMode = android.content.res.Configuration.UI_MODE_NIGHT_YES) fun LinkedCoordinatesPreview( @PreviewParameter(GPSFormatPreviewParameterProvider::class) format: Int ) { diff --git a/app/src/main/java/com/geeksville/mesh/ui/SignalInfo.kt b/app/src/main/java/com/geeksville/mesh/ui/SignalInfo.kt index 87450fba7..eca3c3add 100644 --- a/app/src/main/java/com/geeksville/mesh/ui/SignalInfo.kt +++ b/app/src/main/java/com/geeksville/mesh/ui/SignalInfo.kt @@ -5,6 +5,7 @@ import androidx.compose.material.Text import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier import androidx.compose.ui.tooling.preview.Preview +import androidx.compose.ui.tooling.preview.PreviewLightDark import androidx.compose.ui.tooling.preview.PreviewParameter import com.geeksville.mesh.NodeInfo import com.geeksville.mesh.ui.preview.NodeInfoPreviewParameterProvider @@ -67,9 +68,8 @@ fun SignalInfoSimplePreview() { } } +@PreviewLightDark @Composable -@Preview(showBackground = true) -@Preview(showBackground = true, uiMode = android.content.res.Configuration.UI_MODE_NIGHT_YES) fun SignalInfoPreview( @PreviewParameter(NodeInfoPreviewParameterProvider::class) nodeInfo: NodeInfo @@ -83,8 +83,7 @@ fun SignalInfoPreview( } @Composable -@Preview(showBackground = true) -@Preview(showBackground = true, uiMode = android.content.res.Configuration.UI_MODE_NIGHT_YES) +@PreviewLightDark fun SignalInfoSelfPreview( @PreviewParameter(NodeInfoPreviewParameterProvider::class) nodeInfo: NodeInfo diff --git a/app/src/main/java/com/geeksville/mesh/ui/components/NodeFilterTextField.kt b/app/src/main/java/com/geeksville/mesh/ui/components/NodeFilterTextField.kt index 21b51590a..49b851de4 100644 --- a/app/src/main/java/com/geeksville/mesh/ui/components/NodeFilterTextField.kt +++ b/app/src/main/java/com/geeksville/mesh/ui/components/NodeFilterTextField.kt @@ -25,7 +25,7 @@ import androidx.compose.ui.platform.LocalFocusManager import androidx.compose.ui.res.stringResource import androidx.compose.ui.text.TextStyle import androidx.compose.ui.text.input.ImeAction -import androidx.compose.ui.tooling.preview.Preview +import androidx.compose.ui.tooling.preview.PreviewLightDark import androidx.compose.ui.unit.dp import com.geeksville.mesh.R import com.geeksville.mesh.ui.theme.AppTheme @@ -84,9 +84,8 @@ fun NodeFilterTextField( ) } +@PreviewLightDark @Composable -@Preview(uiMode = android.content.res.Configuration.UI_MODE_NIGHT_YES) -@Preview(uiMode = android.content.res.Configuration.UI_MODE_NIGHT_NO) fun NodeFilterTextFieldPreview() { AppTheme { Box( diff --git a/app/src/main/java/com/geeksville/mesh/ui/compose/SatelliteCountInfo.kt b/app/src/main/java/com/geeksville/mesh/ui/compose/SatelliteCountInfo.kt index 318be3241..7de5e233f 100644 --- a/app/src/main/java/com/geeksville/mesh/ui/compose/SatelliteCountInfo.kt +++ b/app/src/main/java/com/geeksville/mesh/ui/compose/SatelliteCountInfo.kt @@ -11,7 +11,7 @@ import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.graphics.vector.ImageVector import androidx.compose.ui.res.vectorResource -import androidx.compose.ui.tooling.preview.Preview +import androidx.compose.ui.tooling.preview.PreviewLightDark import androidx.compose.ui.unit.dp import com.geeksville.mesh.R import com.geeksville.mesh.ui.theme.AppTheme @@ -40,14 +40,8 @@ fun SatelliteCountInfo( } } +@PreviewLightDark @Composable -@Preview( - showBackground = true, - uiMode = android.content.res.Configuration.UI_MODE_NIGHT_YES -) -@Preview( - showBackground = true, -) fun SatelliteCountInfoPreview() { AppTheme { SatelliteCountInfo(