Replace custom preview annotation

(cherry picked from commit e6ca54fd04668fde5ae12429101a13dc1f03b99e)

# Conflicts:
#	app/src/main/java/eu/kanade/presentation/more/settings/widget/TextPreferenceWidget.kt
#	app/src/main/java/eu/kanade/presentation/reader/PageIndicatorText.kt

app/src/main/java/eu/kanade/presentation/reader/ChapterTransition.kt

@@ -32,6 +32,7 @@ import androidx.compose.ui.text.Placeholder
 import androidx.compose.ui.text.PlaceholderVerticalAlign
 import androidx.compose.ui.text.buildAnnotatedString
 import androidx.compose.ui.text.style.TextOverflow
+import androidx.compose.ui.tooling.preview.PreviewLightDark
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 import eu.kanade.presentation.theme.TachiyomiTheme
@@ -42,7 +43,6 @@ import eu.kanade.tachiyomi.data.database.models.toDomainChapter
 import eu.kanade.tachiyomi.ui.reader.model.ChapterTransition
 import eu.kanade.tachiyomi.ui.reader.model.ReaderChapter
 import tachiyomi.domain.chapter.service.calculateChapterGap
-import tachiyomi.presentation.core.util.ThemePreviews
 import tachiyomi.presentation.core.util.secondaryItemAlpha
 
 @Composable
@@ -304,7 +304,7 @@ private val FakeChapterLongTitle = previewChapter(
     chapterNumber = 1f,
 )
 
-@ThemePreviews
+@PreviewLightDark
 @Composable
 private fun TransitionTextPreview() {
     TachiyomiTheme {
@@ -318,7 +318,7 @@ private fun TransitionTextPreview() {
     }
 }
 
-@ThemePreviews
+@PreviewLightDark
 @Composable
 private fun TransitionTextLongTitlePreview() {
     TachiyomiTheme {
@@ -332,7 +332,7 @@ private fun TransitionTextLongTitlePreview() {
     }
 }
 
-@ThemePreviews
+@PreviewLightDark
 @Composable
 private fun TransitionTextWithGapPreview() {
     TachiyomiTheme {
@@ -346,7 +346,7 @@ private fun TransitionTextWithGapPreview() {
     }
 }
 
-@ThemePreviews
+@PreviewLightDark
 @Composable
 private fun TransitionTextNoNextPreview() {
     TachiyomiTheme {
@@ -360,7 +360,7 @@ private fun TransitionTextNoNextPreview() {
     }
 }
 
-@ThemePreviews
+@PreviewLightDark
 @Composable
 private fun TransitionTextNoPreviousPreview() {
     TachiyomiTheme {

app/src/main/java/eu/kanade/presentation/reader/OrientationSelectDialog.kt

@@ -4,6 +4,7 @@ import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.lazy.grid.items
+import androidx.compose.material3.Surface
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.collectAsState
 import androidx.compose.runtime.getValue
@@ -12,6 +13,7 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.vector.ImageVector
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.res.vectorResource
+import androidx.compose.ui.tooling.preview.PreviewLightDark
 import androidx.compose.ui.unit.dp
 import eu.kanade.domain.manga.model.readerOrientation
 import eu.kanade.presentation.components.AdaptiveSheet
@@ -21,7 +23,6 @@ import eu.kanade.tachiyomi.ui.reader.setting.ReaderOrientation
 import eu.kanade.tachiyomi.ui.reader.setting.ReaderSettingsScreenModel
 import tachiyomi.presentation.core.components.SettingsIconGrid
 import tachiyomi.presentation.core.components.material.IconToggleButton
-import tachiyomi.presentation.core.util.ThemePreviews
 
 @Composable
 fun OrientationSelectDialog(
@@ -66,13 +67,15 @@ private fun DialogContent(
     }
 }
 
-@ThemePreviews
+@PreviewLightDark
 @Composable
 private fun DialogContentPreview() {
     TachiyomiTheme {
-        DialogContent(
-            orientation = ReaderOrientation.DEFAULT,
-            onChangeOrientation = {},
-        )
+        Surface {
+            DialogContent(
+                orientation = ReaderOrientation.DEFAULT,
+                onChangeOrientation = {},
+            )
+        }
     }
 }

app/src/main/java/eu/kanade/presentation/reader/PageIndicatorText.kt

@@ -2,6 +2,7 @@ package eu.kanade.presentation.reader
 
 import androidx.compose.foundation.layout.Box
 import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Surface
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
@@ -9,9 +10,9 @@ import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.drawscope.Stroke
 import androidx.compose.ui.text.TextStyle
 import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.tooling.preview.PreviewLightDark
 import androidx.compose.ui.unit.sp
 import eu.kanade.presentation.theme.TachiyomiTheme
-import tachiyomi.presentation.core.util.ThemePreviews
 
 @Composable
 fun PageIndicatorText(
@@ -49,10 +50,12 @@ fun PageIndicatorText(
     }
 }
 
-@ThemePreviews
+@PreviewLightDark
 @Composable
 private fun PageIndicatorTextPreview() {
     TachiyomiTheme {
-        PageIndicatorText(currentPage = "10", totalPages = 69)
+        Surface {
+            PageIndicatorText(currentPage = "10", totalPages = 69)
+        }
     }
 }

app/src/main/java/eu/kanade/presentation/reader/ReadingModeSelectDialog.kt

@@ -5,6 +5,7 @@ import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.lazy.grid.items
 import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Surface
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.collectAsState
 import androidx.compose.runtime.getValue
@@ -13,6 +14,7 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.vector.ImageVector
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.res.vectorResource
+import androidx.compose.ui.tooling.preview.PreviewLightDark
 import eu.kanade.domain.manga.model.readingMode
 import eu.kanade.presentation.components.AdaptiveSheet
 import eu.kanade.presentation.theme.TachiyomiTheme
@@ -22,7 +24,6 @@ import eu.kanade.tachiyomi.ui.reader.setting.ReadingMode
 import tachiyomi.presentation.core.components.SettingsIconGrid
 import tachiyomi.presentation.core.components.material.IconToggleButton
 import tachiyomi.presentation.core.components.material.padding
-import tachiyomi.presentation.core.util.ThemePreviews
 
 @Composable
 fun ReadingModeSelectDialog(
@@ -67,13 +68,15 @@ private fun DialogContent(
     }
 }
 
-@ThemePreviews
+@PreviewLightDark
 @Composable
 private fun DialogContentPreview() {
     TachiyomiTheme {
-        DialogContent(
-            readingMode = ReadingMode.DEFAULT,
-            onChangeReadingMode = {},
-        )
+        Surface {
+            DialogContent(
+                readingMode = ReadingMode.DEFAULT,
+                onChangeReadingMode = {},
+            )
+        }
     }
 }

app/src/main/java/eu/kanade/presentation/reader/appbars/ExhUtils.kt

@@ -18,6 +18,7 @@ import androidx.compose.material.icons.outlined.KeyboardArrowUp
 import androidx.compose.material3.Icon
 import androidx.compose.material3.IconButton
 import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Surface
 import androidx.compose.material3.Switch
 import androidx.compose.material3.Text
 import androidx.compose.material3.TextButton
@@ -35,11 +36,10 @@ import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.font.FontFamily
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.text.input.KeyboardType
+import androidx.compose.ui.tooling.preview.PreviewLightDark
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
-import eu.kanade.presentation.theme.TachiyomiTheme
 import eu.kanade.tachiyomi.R
-import tachiyomi.presentation.core.util.ThemePreviews
 
 @Composable
 fun ExhUtils(
@@ -66,7 +66,9 @@ fun ExhUtils(
         AnimatedVisibility(visible = isVisible) {
             Column {
                 Row(
-                    Modifier.fillMaxWidth().height(IntrinsicSize.Min),
+                    Modifier
+                        .fillMaxWidth()
+                        .height(IntrinsicSize.Min),
                     verticalAlignment = Alignment.CenterVertically,
                 ) {
                     Row(
@@ -221,9 +223,9 @@ fun ExhUtils(
 }
 
 @Composable
-@ThemePreviews
+@PreviewLightDark
 private fun ExhUtilsPreview() {
-    TachiyomiTheme {
+    Surface {
         ExhUtils(
             isVisible = true,
             onSetExhUtilsVisibility = {},