Cleanup Themes

app/src/main/java/org/thoughtcrime/securesms/conversation/v2/MessageDetailActivity.kt

@@ -43,6 +43,7 @@ import androidx.compose.ui.text.TextStyle
 import androidx.compose.ui.text.font.FontFamily
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.tooling.preview.PreviewParameter
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.viewinterop.AndroidView
 import androidx.lifecycle.lifecycleScope
@@ -73,7 +74,8 @@ import org.thoughtcrime.securesms.ui.CellWithPaddingAndMargin
 import org.thoughtcrime.securesms.ui.Divider
 import org.thoughtcrime.securesms.ui.HorizontalPagerIndicator
 import org.thoughtcrime.securesms.ui.ItemButton
-import org.thoughtcrime.securesms.ui.Theme
+import org.thoughtcrime.securesms.ui.PreviewTheme
+import org.thoughtcrime.securesms.ui.ThemeResPreviewParameterProvider
 import org.thoughtcrime.securesms.ui.blackAlpha40
 import org.thoughtcrime.securesms.ui.colorDestructive
 import org.thoughtcrime.securesms.ui.destructiveButtonColors
@@ -352,8 +354,10 @@ fun ExpandButton(modifier: Modifier = Modifier, onClick: () -> Unit) {
 
 @Preview
 @Composable
-fun PreviewFileDetails() {
+fun PreviewFileDetails(
-    Theme(R.style.Ocean_Dark) {
+    @PreviewParameter(ThemeResPreviewParameterProvider::class) themeResId: Int
+) {
+    PreviewTheme(themeResId) {
         FileDetails(
             fileDetails = listOf(
                 TitledText("File Id:", "Screen Shot 2023-07-06 at 11.35.50 am.png"),
@@ -365,6 +369,16 @@ fun PreviewFileDetails() {
     }
 }
 
+@Preview
+@Composable
+fun PreviewMessageDetails(
+    @PreviewParameter(ThemeResPreviewParameterProvider::class) themeResId: Int
+) {
+    PreviewTheme(themeResId) {
+        PreviewMessageDetails()
+    }
+}
+
 @OptIn(ExperimentalFoundationApi::class)
 @Composable
 fun FileDetails(attachments: List<Attachment>, pagerState: PagerState) {

app/src/main/java/org/thoughtcrime/securesms/ui/Themes.kt

@@ -23,16 +23,14 @@ import org.thoughtcrime.securesms.conversation.v2.PreviewMessageDetails
 
 val LocalExtraColors = staticCompositionLocalOf<ExtraColors> { error("No Custom Attribute value provided") }
 
+
 data class ExtraColors(
     val settingsBackground: Color,
 )
 
-fun Context.getColorFromTheme(@AttrRes attr: Int, defaultValue: Int = 0x0): Color = try {
+/**
-    MaterialColors.getColor(this, attr, defaultValue).let(::Color)
+ * Converts current Theme to Compose Theme.
-} catch (e: Exception) {
+ */
-    colorDestructive
-}
-
 @Composable
 fun AppTheme(
     content: @Composable () -> Unit
@@ -50,25 +48,24 @@ fun AppTheme(
     }
 }
 
-@Preview
+fun Context.getColorFromTheme(@AttrRes attr: Int, defaultValue: Int = 0x0): Color =
-@Composable
+    MaterialColors.getColor(this, attr, defaultValue).let(::Color)
-fun PreviewMessageDetails(
-    @PreviewParameter(ThemeResPreviewParameterProvider::class) themeResId: Int
-) {
-    Theme(themeResId) {
-        Box(modifier = Modifier.background(color = MaterialTheme.colors.background)) {
-            PreviewMessageDetails()
-        }
-    }
-}
 
+/**
+ * Set the theme and a background for Compose Previews.
+ */
 @Composable
-fun Theme(@StyleRes themeResId: Int, content: @Composable () -> Unit) {
+fun PreviewTheme(
+    themeResId: Int,
+    content: @Composable () -> Unit
+) {
     CompositionLocalProvider(
         LocalContext provides ContextThemeWrapper(LocalContext.current, themeResId)
     ) {
         AppTheme {
-            content()
+            Box(modifier = Modifier.background(color = MaterialTheme.colors.background)) {
+                content()
+            }
         }
     }
 }