...

MFlisar · Nov 12, 2024 · 6002724 · 6002724
1 parent c7556ee
commit 6002724
Show file tree

Hide file tree

Showing 5 changed files with 62 additions and 51 deletions.
diff --git a/demo/desktop/build.gradle.kts b/demo/desktop/build.gradle.kts
@@ -23,6 +23,8 @@ kotlin {
 
                 implementation(compose.desktop.currentOs)
 
+                implementation(libs.compose.material3)
+
                 implementation(project(":ComposeChangelog:Core"))
                 implementation(project(":ComposeChangelog:Modules:StateSaverPreferences"))
                 implementation(project(":ComposeChangelog:Modules:StateSaverKotPreferences"))

diff --git a/demo/desktop/src/jvmMain/kotlin/com/michaelflisar/composechangelog/demo/Main.kt b/demo/desktop/src/jvmMain/kotlin/com/michaelflisar/composechangelog/demo/Main.kt
@@ -2,10 +2,13 @@ package com.michaelflisar.composechangelog.demo
 
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.padding
-import androidx.compose.material.Button
-import androidx.compose.material.MaterialTheme
-import androidx.compose.material.Text
+import androidx.compose.material3.Button
+import androidx.compose.material3.Surface
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Text
+import androidx.compose.material3.darkColorScheme
 import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
@@ -52,52 +55,59 @@ fun main() {
             lastChangelog = changelogStateSaver.lastShownVersion()
         }
 
-        Window(
-            title = "Changelog Demo ($versionName)",
-            onCloseRequest = ::exitApplication,
-            state = rememberWindowState(
-                position = WindowPosition(Alignment.Center),
-                width = 800.dp,
-                height = 600.dp
-            )
+        MaterialTheme(
+            colorScheme = darkColorScheme()
         ) {
-            val showChangelog = remember { mutableStateOf(false) }
-
-            Column(
-                modifier = Modifier.padding(16.dp),
-                verticalArrangement = Arrangement.spacedBy(8.dp)
+            Window(
+                title = "Changelog Demo ($versionName)",
+                onCloseRequest = ::exitApplication,
+                state = rememberWindowState(
+                    position = WindowPosition(Alignment.Center),
+                    width = 800.dp,
+                    height = 600.dp
+                )
             ) {
-                Column {
-                    Text("App Version", fontWeight = FontWeight.Bold)
-                    Text(
-                        "Code: ${Constants.CHANGELOG_FORMATTER.parseVersion(versionName)}",
-                        style = MaterialTheme.typography.body1
-                    )
-                    Text(
-                        "Name: $versionName",
-                        style = MaterialTheme.typography.body1
-                    )
-                    Text(
-                        "Last Changelog: $lastChangelog",
-                        style = MaterialTheme.typography.body1
-                    )
-                }
-                Button(onClick = {
-                    showChangelog.value = true
-                }) {
-                    Text("Show Changelog")
+                val showChangelog = remember { mutableStateOf(false) }
+                Surface(
+                    modifier = Modifier.fillMaxSize()
+                ) {
+                    Column(
+                        modifier = Modifier.padding(16.dp),
+                        verticalArrangement = Arrangement.spacedBy(8.dp)
+                    ) {
+                        Column {
+                            Text("App Version", fontWeight = FontWeight.Bold)
+                            Text(
+                                "Code: ${Constants.CHANGELOG_FORMATTER.parseVersion(versionName)}",
+                                style = MaterialTheme.typography.bodySmall
+                            )
+                            Text(
+                                "Name: $versionName",
+                                style = MaterialTheme.typography.bodySmall
+                            )
+                            Text(
+                                "Last Changelog: $lastChangelog",
+                                style = MaterialTheme.typography.bodySmall
+                            )
+                        }
+                        Button(onClick = {
+                            showChangelog.value = true
+                        }) {
+                            Text("Show Changelog")
+                        }
+                    }
                 }
-            }
 
-            // manual changelog dialog
-            if (showChangelog.value) {
-                ShowChangelogDialog(setup) {
-                    showChangelog.value = false
+                // manual changelog dialog
+                if (showChangelog.value) {
+                    ShowChangelogDialog(setup) {
+                        showChangelog.value = false
+                    }
                 }
-            }
 
-            // automatic changelog dialog
-            ShowChangelogDialogIfNecessary(changelogStateSaver, versionName, setup)
+                // automatic changelog dialog
+                ShowChangelogDialogIfNecessary(changelogStateSaver, versionName, setup)
+            }
         }
     }
 }
diff --git a/library/core/src/androidMain/kotlin/com/michaelflisar/composechangelog/Platform.android.kt b/library/core/src/androidMain/kotlin/com/michaelflisar/composechangelog/Platform.android.kt
@@ -7,7 +7,6 @@ import androidx.compose.material3.AlertDialog
 import androidx.compose.material3.Text
 import androidx.compose.material3.TextButton
 import androidx.compose.runtime.Composable
-import androidx.compose.runtime.MutableState
 import androidx.compose.ui.res.stringResource
 import com.michaelflisar.composechangelog.classes.ChangelogData
 import com.michaelflisar.composechangelog.classes.DataItemRelease

diff --git a/...ore/src/commonMain/kotlin/com/michaelflisar/composechangelog/composables/ChangelogItem.kt b/...ore/src/commonMain/kotlin/com/michaelflisar/composechangelog/composables/ChangelogItem.kt
@@ -10,8 +10,6 @@ import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.text.AnnotatedString
-import androidx.compose.ui.text.fromHtml
 import androidx.compose.ui.unit.dp
 import com.michaelflisar.composechangelog.classes.DataItem
 

diff --git a/library/core/src/jvmMain/kotlin/com/michaelflisar/composechangelog/Platform.jvm.kt b/library/core/src/jvmMain/kotlin/com/michaelflisar/composechangelog/Platform.jvm.kt
@@ -10,8 +10,8 @@ import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.foundation.lazy.LazyListScope
 import androidx.compose.foundation.lazy.LazyListState
 import androidx.compose.foundation.rememberScrollbarAdapter
+import androidx.compose.material3.Surface
 import androidx.compose.runtime.Composable
-import androidx.compose.runtime.MutableState
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.unit.dp
@@ -44,10 +44,12 @@ internal actual fun ShowChangelogDialog(
             height = 400.dp
         )
     ) {
-        Column(
-            modifier = Modifier.padding(16.dp)
-        ) {
-            Changelog(data, setup)
+        Surface {
+            Column(
+                modifier = Modifier.padding(16.dp)
+            ) {
+                Changelog(data, setup)
+            }
         }
     }
 }