Skip to content

Commit 54ab9ec

Browse files
authored
Merge pull request #802 from ooni/fix-compose-previews
Fix compose previews
2 parents 37774bf + 96d0ca7 commit 54ab9ec

File tree

4 files changed

+76
-2
lines changed

4 files changed

+76
-2
lines changed
Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,15 @@
11
package org.ooni.probe.ui.shared
22

3-
import android.app.Activity
43
import androidx.activity.compose.LocalActivity
54
import androidx.compose.material3.windowsizeclass.WindowSizeClass
65
import androidx.compose.material3.windowsizeclass.calculateWindowSizeClass
76
import androidx.compose.runtime.Composable
7+
import androidx.compose.ui.unit.DpSize
8+
import androidx.compose.ui.unit.dp
89

910
@Composable
10-
actual fun calculateWindowSizeClass(): WindowSizeClass = calculateWindowSizeClass(LocalActivity.current as Activity)
11+
actual fun calculateWindowSizeClass(): WindowSizeClass =
12+
LocalActivity.current
13+
?.let { calculateWindowSizeClass(it) }
14+
// Generic default size
15+
?: WindowSizeClass.calculateFromSize(DpSize(360.dp, 800.dp))

composeApp/src/commonMain/kotlin/org/ooni/probe/ui/choosewebsites/ChooseWebsitesScreen.kt

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,9 @@ import ooniprobe.composeapp.generated.resources.ic_timer
5050
import org.jetbrains.compose.resources.painterResource
5151
import org.jetbrains.compose.resources.pluralStringResource
5252
import org.jetbrains.compose.resources.stringResource
53+
import org.jetbrains.compose.ui.tooling.preview.Preview
5354
import org.ooni.probe.ui.shared.TopBar
55+
import org.ooni.probe.ui.theme.AppTheme
5456

5557
@Composable
5658
fun ChooseWebsitesScreen(
@@ -205,3 +207,14 @@ private fun BackConfirmationDialog(
205207
},
206208
)
207209
}
210+
211+
@Preview
212+
@Composable
213+
fun ChooseWebsitesScreenPreview() {
214+
AppTheme {
215+
ChooseWebsitesScreen(
216+
state = ChooseWebsitesViewModel.State(),
217+
onEvent = {},
218+
)
219+
}
220+
}

composeApp/src/commonMain/kotlin/org/ooni/probe/ui/dashboard/DashboardScreen.kt

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -195,3 +195,11 @@ fun DashboardScreenPreview() {
195195
)
196196
}
197197
}
198+
199+
@Preview
200+
@Composable
201+
fun VpnWarningPreview() {
202+
AppTheme {
203+
VpnWarning()
204+
}
205+
}

composeApp/src/commonMain/kotlin/org/ooni/probe/ui/dashboard/RunBackgroundStateSection.kt

Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,10 +33,12 @@ import ooniprobe.composeapp.generated.resources.Results_UploadingMissing
3333
import ooniprobe.composeapp.generated.resources.ic_timer
3434
import org.jetbrains.compose.resources.painterResource
3535
import org.jetbrains.compose.resources.stringResource
36+
import org.jetbrains.compose.ui.tooling.preview.Preview
3637
import org.ooni.probe.data.models.RunBackgroundState
3738
import org.ooni.probe.domain.UploadMissingMeasurements
3839
import org.ooni.probe.ui.shared.relativeDateTime
3940
import org.ooni.probe.ui.shared.shortFormat
41+
import org.ooni.probe.ui.theme.AppTheme
4042
import org.ooni.probe.ui.theme.customColors
4143

4244
@Composable
@@ -230,3 +232,49 @@ private fun RunningTests(
230232
}
231233
}
232234
}
235+
236+
@Preview
237+
@Composable
238+
fun RunBackgroundIdlePreview() {
239+
AppTheme {
240+
Idle(
241+
state = RunBackgroundState.Idle(),
242+
onEvent = {},
243+
)
244+
}
245+
}
246+
247+
@Preview
248+
@Composable
249+
fun RunBackgroundUploadingMissingResultsPreview() {
250+
AppTheme {
251+
UploadingMissingResults(
252+
state = RunBackgroundState.UploadingMissingResults(
253+
UploadMissingMeasurements.State.Uploading(
254+
uploaded = 2,
255+
failedToUpload = 1,
256+
total = 10,
257+
),
258+
),
259+
)
260+
}
261+
}
262+
263+
@Preview
264+
@Composable
265+
fun RunBackgroundRunningTestsPreview() {
266+
AppTheme {
267+
RunningTests(
268+
state = RunBackgroundState.RunningTests(),
269+
onEvent = {},
270+
)
271+
}
272+
}
273+
274+
@Preview
275+
@Composable
276+
fun RunBackgroundStoppingPreview() {
277+
AppTheme {
278+
Stopping()
279+
}
280+
}

0 commit comments

Comments
 (0)