Merge pull request #72 from THEOplayer/maintenance/tweak-demo

Tweak demo code a bit

Author: MattiasBuelens

app/src/main/java/com/theoplayer/android/ui/demo/MainActivity.kt

@@ -15,9 +15,23 @@ import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.rounded.Brush
 import androidx.compose.material.icons.rounded.Movie
 import androidx.compose.material.icons.rounded.Refresh
-import androidx.compose.material3.*
-import androidx.compose.runtime.*
+import androidx.compose.material3.ExperimentalMaterial3Api
+import androidx.compose.material3.Icon
+import androidx.compose.material3.IconButton
+import androidx.compose.material3.ListItem
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.RadioButton
+import androidx.compose.material3.Scaffold
+import androidx.compose.material3.Surface
+import androidx.compose.material3.Text
+import androidx.compose.material3.TopAppBar
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
 import androidx.compose.runtime.saveable.rememberSaveable
+import androidx.compose.runtime.setValue
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.tooling.preview.Preview
@@ -85,11 +99,10 @@ fun MainContent() {
     var themeMenuOpen by remember { mutableStateOf(false) }
     var theme by rememberSaveable { mutableStateOf(PlayerTheme.Default) }
 
-    Surface(
+    Scaffold(
         modifier = Modifier.fillMaxSize(),
-        color = MaterialTheme.colorScheme.background
-    ) {
-        Scaffold(topBar = {
+        containerColor = MaterialTheme.colorScheme.background,
+        topBar = {
             TopAppBar(
                 title = {
                     Text(text = "Demo")
@@ -109,51 +122,51 @@ fun MainContent() {
                     }
                 }
             )
-        }) { padding ->
-            val playerModifier = Modifier
-                .padding(padding)
-                .fillMaxSize(1f)
-            when (theme) {
-                PlayerTheme.Default -> {
-                    DefaultUI(
+        }
+    ) { padding ->
+        val playerModifier = Modifier
+            .padding(padding)
+            .fillMaxSize(1f)
+        when (theme) {
+            PlayerTheme.Default -> {
+                DefaultUI(
+                    modifier = playerModifier,
+                    player = player,
+                    title = stream.title
+                )
+            }
+
+            PlayerTheme.Nitflex -> {
+                NitflexTheme(useDarkTheme = true) {
+                    NitflexUI(
                         modifier = playerModifier,
                         player = player,
                         title = stream.title
                     )
                 }
-
-                PlayerTheme.Nitflex -> {
-                    NitflexTheme(useDarkTheme = true) {
-                        NitflexUI(
-                            modifier = playerModifier,
-                            player = player,
-                            title = stream.title
-                        )
-                    }
-                }
             }
+        }
 
-            if (streamMenuOpen) {
-                SelectStreamDialog(
-                    streams = streams,
-                    currentStream = stream,
-                    onSelectStream = {
-                        stream = it
-                        streamMenuOpen = false
-                    },
-                    onDismissRequest = { streamMenuOpen = false }
-                )
-            }
-            if (themeMenuOpen) {
-                SelectThemeDialog(
-                    currentTheme = theme,
-                    onSelectTheme = {
-                        theme = it
-                        themeMenuOpen = false
-                    },
-                    onDismissRequest = { themeMenuOpen = false }
-                )
-            }
+        if (streamMenuOpen) {
+            SelectStreamDialog(
+                streams = streams,
+                currentStream = stream,
+                onSelectStream = {
+                    stream = it
+                    streamMenuOpen = false
+                },
+                onDismissRequest = { streamMenuOpen = false }
+            )
+        }
+        if (themeMenuOpen) {
+            SelectThemeDialog(
+                currentTheme = theme,
+                onSelectTheme = {
+                    theme = it
+                    themeMenuOpen = false
+                },
+                onDismissRequest = { themeMenuOpen = false }
+            )
         }
     }
 }
@@ -218,7 +231,7 @@ fun SelectThemeDialog(
                     style = MaterialTheme.typography.headlineSmall
                 )
                 LazyColumn {
-                    items(items = PlayerTheme.values()) {
+                    items(items = PlayerTheme.entries) {
                         ListItem(
                             headlineContent = { Text(text = it.title) },
                             leadingContent = {