Merge pull request #5 from mkeeda/fix-preview-background

Make PreviewBackground for shorthand of SpaceshipTheme and Surface
mkeeda · Aug 22, 2021 · 7a92ce2 · 7a92ce2
2 parents 3c65f6b + cb71425
commit 7a92ce2
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 8 deletions.
diff --git a/app/src/main/java/dev/mkeeda/spaceship/ui/timeline/PostDetails.kt b/app/src/main/java/dev/mkeeda/spaceship/ui/timeline/PostDetails.kt
@@ -16,7 +16,7 @@ import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import dev.mkeeda.spaceship.data.TimelinePostDetails
 import dev.mkeeda.spaceship.data.fakeTimeListDetails
-import dev.mkeeda.spaceship.ui.theme.SpaceshipTheme
+import dev.mkeeda.spaceship.ui.util.PreviewBackground
 
 @Composable
 fun PostDetailsScreen(postId: Int) {
@@ -47,10 +47,10 @@ fun PostDetails(postDetails: TimelinePostDetails) {
     }
 }
 
-@Preview(showBackground = true)
+@Preview
 @Composable
 fun PostDetailsScreenPreview() {
-    SpaceshipTheme {
+    PreviewBackground {
         PostDetails(postDetails = fakeTimeListDetails(postId = 0))
     }
 }
diff --git a/app/src/main/java/dev/mkeeda/spaceship/ui/timeline/TimeLine.kt b/app/src/main/java/dev/mkeeda/spaceship/ui/timeline/TimeLine.kt
@@ -25,7 +25,7 @@ import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import dev.mkeeda.spaceship.data.TimelinePost
 import dev.mkeeda.spaceship.data.longFakeTimelinePostItems
-import dev.mkeeda.spaceship.ui.theme.SpaceshipTheme
+import dev.mkeeda.spaceship.ui.util.PreviewBackground
 
 @Composable
 fun TimelineScreen(openPostDetails: (TimelinePost) -> Unit) {
@@ -50,10 +50,10 @@ fun Timeline(
     }
 }
 
-@Preview(showBackground = true)
+@Preview
 @Composable
 fun TimelineScreenPreview() {
-    SpaceshipTheme {
+    PreviewBackground {
         Timeline(
             postItems = longFakeTimelinePostItems,
             openPostDetails = {}
@@ -102,10 +102,10 @@ fun TimelineRow(
     }
 }
 
-@Preview(showBackground = true)
+@Preview
 @Composable
 fun PostRowPreview() {
-    SpaceshipTheme {
+    PreviewBackground {
         TimelineRow(
             post = TimelinePost(
                 id = 0,

diff --git a/app/src/main/java/dev/mkeeda/spaceship/ui/util/Preview.kt b/app/src/main/java/dev/mkeeda/spaceship/ui/util/Preview.kt
@@ -0,0 +1,12 @@
+package dev.mkeeda.spaceship.ui.util
+
+import androidx.compose.material.Surface
+import androidx.compose.runtime.Composable
+import dev.mkeeda.spaceship.ui.theme.SpaceshipTheme
+
+@Composable
+fun PreviewBackground(content: @Composable () -> Unit) {
+    SpaceshipTheme {
+        Surface(content = content)
+    }
+}