Album top bar

Author: QuantumBadger

build.gradle.kts

@@ -54,7 +54,7 @@ dependencies {
 	}
 
 	implementation(platform(libs.androidx.compose.bom))
-	implementation(libs.androidx.compose.material)
+	implementation(libs.androidx.compose.material3)
 	implementation(libs.androidx.compose.runtime)
 	implementation(libs.androidx.compose.ui)
 	implementation(libs.androidx.compose.ui.graphics)

gradle/libs.versions.toml

@@ -75,7 +75,7 @@ androidx-test-rules = { module = "androidx.test:rules", version.ref = "androidx-
 androidx-test-junit = { module = "androidx.test.ext:junit", version.ref = "androidx-test-junit" }
 
 androidx-compose-bom = { module = "androidx.compose:compose-bom", version.ref = "compose-bom" }
-androidx-compose-material = { module = "androidx.compose.material:material" }
+androidx-compose-material3 = { module = "androidx.compose.material3:material3" }
 androidx-compose-runtime = { module = "androidx.compose.runtime:runtime" }
 androidx-compose-ui = { module = "androidx.compose.ui:ui" }
 androidx-compose-ui-graphics = { module = "androidx.compose.ui:ui-graphics" }

src/main/java/org/quantumbadger/redreader/compose/ctx/RRComposeContext.kt

@@ -5,17 +5,13 @@ import androidx.compose.runtime.CompositionLocalProvider
 import org.quantumbadger.redreader.compose.prefs.ComposePrefsSingleton
 import org.quantumbadger.redreader.compose.prefs.LocalComposePrefs
 import org.quantumbadger.redreader.compose.prefs.Preference
-import org.quantumbadger.redreader.compose.theme.ComposeThemeLight
-import org.quantumbadger.redreader.compose.theme.LocalComposeTheme
+import org.quantumbadger.redreader.compose.theme.RRComposeContextTheme
 
 @Composable
 fun RRComposeContext(content: @Composable () -> Unit) {
 
 	CompositionLocalProvider(LocalComposePrefs provides ComposePrefsSingleton.instance) {
-
-		val prefs = LocalComposePrefs.current
-
-		CompositionLocalProvider(LocalComposeTheme provides ComposeThemeLight(prefs)) {
+		RRComposeContextTheme {
 			content()
 		}
 	}

src/main/java/org/quantumbadger/redreader/compose/ctx/RRComposeContextTest.kt

@@ -21,6 +21,7 @@ fun RRComposeContextTest(content: @Composable () -> Unit) {
 		override val albumCardShowButtons = testPref(true)
 		override val albumListShowThumbnails = testPref(true)
 		override val albumGridStagger = testPref(false)
+		override val albumGridColumns = testPref(2f)
 	}
 
 	CompositionLocalProvider(LocalComposePrefs provides prefValues) {

src/main/java/org/quantumbadger/redreader/compose/theme/ComposeTheme.kt

@@ -1,11 +1,16 @@
 package org.quantumbadger.redreader.compose.theme
 
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.lightColorScheme
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.CompositionLocalProvider
 import androidx.compose.runtime.staticCompositionLocalOf
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.text.TextStyle
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.unit.sp
 import org.quantumbadger.redreader.compose.prefs.ComposePrefs
+import org.quantumbadger.redreader.compose.prefs.LocalComposePrefs
 
 interface ComposeThemePostCard {
 	val title: TextStyle
@@ -33,6 +38,27 @@ interface ComposeTheme {
 	val album: ComposeThemeAlbum
 }
 
+@Composable
+fun RRComposeContextTheme(
+	content: @Composable () -> Unit,
+) {
+	val prefs = LocalComposePrefs.current
+
+	val theme = ComposeThemeLight(prefs)
+
+	MaterialTheme(
+		// TODO set all values from theme
+		colorScheme = lightColorScheme(
+			primary = Color(0xE7, 0x00, 0x00),
+			secondary = Color(0xD0, 0x00, 0x00),
+		)
+	) {
+		CompositionLocalProvider(LocalComposeTheme provides theme) {
+			content()
+		}
+	}
+}
+
 class ComposeThemeLight(prefs: ComposePrefs) : ComposeTheme {
 
 	val baseTextStyle = TextStyle()

src/main/java/org/quantumbadger/redreader/compose/ui/AlbumCard.kt

@@ -29,7 +29,7 @@ import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.systemBars
 import androidx.compose.foundation.layout.width
 import androidx.compose.foundation.shape.RoundedCornerShape
-import androidx.compose.material.Text
+import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip