Bump androidxComposeMaterial3 from 1.1.2 to 1.2.0-rc01 (#86)

app/src/main/kotlin/com/sanmer/geomag/ui/screens/settings/about/AboutScreen.kt

@@ -1,5 +1,6 @@
 package com.sanmer.geomag.ui.screens.settings.about
 
+import androidx.compose.foundation.BorderStroke
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Row
@@ -10,13 +11,14 @@ import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.layout.width
 import androidx.compose.foundation.rememberScrollState
+import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.foundation.verticalScroll
 import androidx.compose.material3.ButtonDefaults
 import androidx.compose.material3.FilledTonalButton
 import androidx.compose.material3.Icon
 import androidx.compose.material3.MaterialTheme
-import androidx.compose.material3.OutlinedCard
 import androidx.compose.material3.Scaffold
+import androidx.compose.material3.Surface
 import androidx.compose.material3.Text
 import androidx.compose.material3.TopAppBarDefaults
 import androidx.compose.material3.TopAppBarScrollBehavior
@@ -112,10 +114,10 @@ fun AboutScreen(
  }
  }
 
- OutlinedCard(
- modifier = Modifier
-  .padding(vertical = 30.dp, horizontal = 20.dp)
-  .fillMaxWidth()
+ Surface(
+ modifier = Modifier.padding(vertical = 30.dp, horizontal = 20.dp),
+ border = BorderStroke(1.dp, color = MaterialTheme.colorScheme.outline),
+ shape = RoundedCornerShape(15.dp)
  ) {
  Column(
  modifier = Modifier.padding(all = 15.dp)

app/src/main/kotlin/com/sanmer/geomag/ui/theme/color/AlmondBlossom.kt

@@ -109,13 +109,13 @@ val AlmondBlossomLightScheme = lightColorScheme(
  inverseSurface = inverseSurfaceLight,
  inverseOnSurface = inverseOnSurfaceLight,
  inversePrimary = inversePrimaryLight,
- //surfaceDim = surfaceDimLight,
- //surfaceBright = surfaceBrightLight,
- //surfaceContainerLowest = surfaceContainerLowestLight,
- //surfaceContainerLow = surfaceContainerLowLight,
- //surfaceContainer = surfaceContainerLight,
- //surfaceContainerHigh = surfaceContainerHighLight,
- //surfaceContainerHighest = surfaceContainerHighestLight,
+ surfaceDim = surfaceDimLight,
+ surfaceBright = surfaceBrightLight,
+ surfaceContainerLowest = surfaceContainerLowestLight,
+ surfaceContainerLow = surfaceContainerLowLight,
+ surfaceContainer = surfaceContainerLight,
+ surfaceContainerHigh = surfaceContainerHighLight,
+ surfaceContainerHighest = surfaceContainerHighestLight,
 )
 
 val AlmondBlossomDarkScheme = darkColorScheme(
@@ -147,11 +147,11 @@ val AlmondBlossomDarkScheme = darkColorScheme(
  inverseSurface = inverseSurfaceDark,
  inverseOnSurface = inverseOnSurfaceDark,
  inversePrimary = inversePrimaryDark,
- //surfaceDim = surfaceDimDark,
- //surfaceBright = surfaceBrightDark,
- //surfaceContainerLowest = surfaceContainerLowestDark,
- //surfaceContainerLow = surfaceContainerLowDark,
- //surfaceContainer = surfaceContainerDark,
- //surfaceContainerHigh = surfaceContainerHighDark,
- //surfaceContainerHighest = surfaceContainerHighestDark,
+ surfaceDim = surfaceDimDark,
+ surfaceBright = surfaceBrightDark,
+ surfaceContainerLowest = surfaceContainerLowestDark,
+ surfaceContainerLow = surfaceContainerLowDark,
+ surfaceContainer = surfaceContainerDark,
+ surfaceContainerHigh = surfaceContainerHighDark,
+ surfaceContainerHighest = surfaceContainerHighestDark,
 )

app/src/main/kotlin/com/sanmer/geomag/ui/theme/color/Jeufosse.kt

@@ -109,13 +109,13 @@ val JeufosseLightScheme = lightColorScheme(
  inverseSurface = inverseSurfaceLight,
  inverseOnSurface = inverseOnSurfaceLight,
  inversePrimary = inversePrimaryLight,
- //surfaceDim = surfaceDimLight,
- //surfaceBright = surfaceBrightLight,
- //surfaceContainerLowest = surfaceContainerLowestLight,
- //surfaceContainerLow = surfaceContainerLowLight,
- //surfaceContainer = surfaceContainerLight,
- //surfaceContainerHigh = surfaceContainerHighLight,
- //surfaceContainerHighest = surfaceContainerHighestLight,
+ surfaceDim = surfaceDimLight,
+ surfaceBright = surfaceBrightLight,
+ surfaceContainerLowest = surfaceContainerLowestLight,
+ surfaceContainerLow = surfaceContainerLowLight,
+ surfaceContainer = surfaceContainerLight,
+ surfaceContainerHigh = surfaceContainerHighLight,
+ surfaceContainerHighest = surfaceContainerHighestLight,
 )
 
 val JeufosseDarkScheme = darkColorScheme(
@@ -147,11 +147,11 @@ val JeufosseDarkScheme = darkColorScheme(
  inverseSurface = inverseSurfaceDark,
  inverseOnSurface = inverseOnSurfaceDark,
  inversePrimary = inversePrimaryDark,
- //surfaceDim = surfaceDimDark,
- //surfaceBright = surfaceBrightDark,
- //surfaceContainerLowest = surfaceContainerLowestDark,
- //surfaceContainerLow = surfaceContainerLowDark,
- //surfaceContainer = surfaceContainerDark,
- //surfaceContainerHigh = surfaceContainerHighDark,
- //surfaceContainerHighest = surfaceContainerHighestDark,
+ surfaceDim = surfaceDimDark,
+ surfaceBright = surfaceBrightDark,
+ surfaceContainerLowest = surfaceContainerLowestDark,
+ surfaceContainerLow = surfaceContainerLowDark,
+ surfaceContainer = surfaceContainerDark,
+ surfaceContainerHigh = surfaceContainerHighDark,
+ surfaceContainerHighest = surfaceContainerHighestDark,
 )

app/src/main/kotlin/com/sanmer/geomag/ui/theme/color/PlainAuvers.kt

@@ -109,13 +109,13 @@ val PlainAuversLightScheme = lightColorScheme(
  inverseSurface = inverseSurfaceLight,
  inverseOnSurface = inverseOnSurfaceLight,
  inversePrimary = inversePrimaryLight,
- //surfaceDim = surfaceDimLight,
- //surfaceBright = surfaceBrightLight,
- //surfaceContainerLowest = surfaceContainerLowestLight,
- //surfaceContainerLow = surfaceContainerLowLight,
- //surfaceContainer = surfaceContainerLight,
- //surfaceContainerHigh = surfaceContainerHighLight,
- //surfaceContainerHighest = surfaceContainerHighestLight,
+ surfaceDim = surfaceDimLight,
+ surfaceBright = surfaceBrightLight,
+ surfaceContainerLowest = surfaceContainerLowestLight,
+ surfaceContainerLow = surfaceContainerLowLight,
+ surfaceContainer = surfaceContainerLight,
+ surfaceContainerHigh = surfaceContainerHighLight,
+ surfaceContainerHighest = surfaceContainerHighestLight,
 )
 
 val PlainAuversDarkScheme = darkColorScheme(
@@ -147,11 +147,11 @@ val PlainAuversDarkScheme = darkColorScheme(
  inverseSurface = inverseSurfaceDark,
  inverseOnSurface = inverseOnSurfaceDark,
  inversePrimary = inversePrimaryDark,
- //surfaceDim = surfaceDimDark,
- //surfaceBright = surfaceBrightDark,
- //surfaceContainerLowest = surfaceContainerLowestDark,
- //surfaceContainerLow = surfaceContainerLowDark,
- //surfaceContainer = surfaceContainerDark,
- //surfaceContainerHigh = surfaceContainerHighDark,
- //surfaceContainerHighest = surfaceContainerHighestDark,
+ surfaceDim = surfaceDimDark,
+ surfaceBright = surfaceBrightDark,
+ surfaceContainerLowest = surfaceContainerLowestDark,
+ surfaceContainerLow = surfaceContainerLowDark,
+ surfaceContainer = surfaceContainerDark,
+ surfaceContainerHigh = surfaceContainerHighDark,
+ surfaceContainerHighest = surfaceContainerHighestDark,
 )

app/src/main/kotlin/com/sanmer/geomag/ui/theme/color/PoppyField.kt

@@ -109,13 +109,13 @@ val PoppyFieldLightScheme = lightColorScheme(
  inverseSurface = inverseSurfaceLight,
  inverseOnSurface = inverseOnSurfaceLight,
  inversePrimary = inversePrimaryLight,
- //surfaceDim = surfaceDimLight,
- //surfaceBright = surfaceBrightLight,
- //surfaceContainerLowest = surfaceContainerLowestLight,
- //surfaceContainerLow = surfaceContainerLowLight,
- //surfaceContainer = surfaceContainerLight,
- //surfaceContainerHigh = surfaceContainerHighLight,
- //surfaceContainerHighest = surfaceContainerHighestLight,
+ surfaceDim = surfaceDimLight,
+ surfaceBright = surfaceBrightLight,
+ surfaceContainerLowest = surfaceContainerLowestLight,
+ surfaceContainerLow = surfaceContainerLowLight,
+ surfaceContainer = surfaceContainerLight,
+ surfaceContainerHigh = surfaceContainerHighLight,
+ surfaceContainerHighest = surfaceContainerHighestLight,
 )
 
 val PoppyFieldDarkScheme = darkColorScheme(
@@ -147,11 +147,11 @@ val PoppyFieldDarkScheme = darkColorScheme(
  inverseSurface = inverseSurfaceDark,
  inverseOnSurface = inverseOnSurfaceDark,
  inversePrimary = inversePrimaryDark,
- //surfaceDim = surfaceDimDark,
- //surfaceBright = surfaceBrightDark,
- //surfaceContainerLowest = surfaceContainerLowestDark,
- //surfaceContainerLow = surfaceContainerLowDark,
- //surfaceContainer = surfaceContainerDark,
- //surfaceContainerHigh = surfaceContainerHighDark,
- //surfaceContainerHighest = surfaceContainerHighestDark,
+ surfaceDim = surfaceDimDark,
+ surfaceBright = surfaceBrightDark,
+ surfaceContainerLowest = surfaceContainerLowestDark,
+ surfaceContainerLow = surfaceContainerLowDark,
+ surfaceContainer = surfaceContainerDark,
+ surfaceContainerHigh = surfaceContainerHighDark,
+ surfaceContainerHighest = surfaceContainerHighestDark,
 )

app/src/main/kotlin/com/sanmer/geomag/ui/theme/color/Pourville.kt

@@ -109,13 +109,13 @@ val PourvilleLightScheme = lightColorScheme(
  inverseSurface = inverseSurfaceLight,
  inverseOnSurface = inverseOnSurfaceLight,
  inversePrimary = inversePrimaryLight,
- //surfaceDim = surfaceDimLight,
- //surfaceBright = surfaceBrightLight,
- //surfaceContainerLowest = surfaceContainerLowestLight,
- //surfaceContainerLow = surfaceContainerLowLight,
- //surfaceContainer = surfaceContainerLight,
- //surfaceContainerHigh = surfaceContainerHighLight,
- //surfaceContainerHighest = surfaceContainerHighestLight,
+ surfaceDim = surfaceDimLight,
+ surfaceBright = surfaceBrightLight,
+ surfaceContainerLowest = surfaceContainerLowestLight,
+ surfaceContainerLow = surfaceContainerLowLight,
+ surfaceContainer = surfaceContainerLight,
+ surfaceContainerHigh = surfaceContainerHighLight,
+ surfaceContainerHighest = surfaceContainerHighestLight,
 )
 
 val PourvilleDarkScheme = darkColorScheme(
@@ -147,11 +147,11 @@ val PourvilleDarkScheme = darkColorScheme(
  inverseSurface = inverseSurfaceDark,
  inverseOnSurface = inverseOnSurfaceDark,
  inversePrimary = inversePrimaryDark,
- //surfaceDim = surfaceDimDark,
- //surfaceBright = surfaceBrightDark,
- //surfaceContainerLowest = surfaceContainerLowestDark,
- //surfaceContainerLow = surfaceContainerLowDark,
- //surfaceContainer = surfaceContainerDark,
- //surfaceContainerHigh = surfaceContainerHighDark,
- //surfaceContainerHighest = surfaceContainerHighestDark,
+ surfaceDim = surfaceDimDark,
+ surfaceBright = surfaceBrightDark,
+ surfaceContainerLowest = surfaceContainerLowestDark,
+ surfaceContainerLow = surfaceContainerLowDark,
+ surfaceContainer = surfaceContainerDark,
+ surfaceContainerHigh = surfaceContainerHighDark,
+ surfaceContainerHighest = surfaceContainerHighestDark,
 )

app/src/main/kotlin/com/sanmer/geomag/ui/theme/color/SoleilLevant.kt

@@ -109,13 +109,13 @@ val SoleilLevantLightScheme = lightColorScheme(
  inverseSurface = inverseSurfaceLight,
  inverseOnSurface = inverseOnSurfaceLight,
  inversePrimary = inversePrimaryLight,
- //surfaceDim = surfaceDimLight,
- //surfaceBright = surfaceBrightLight,
- //surfaceContainerLowest = surfaceContainerLowestLight,
- //surfaceContainerLow = surfaceContainerLowLight,
- //surfaceContainer = surfaceContainerLight,
- //surfaceContainerHigh = surfaceContainerHighLight,
- //surfaceContainerHighest = surfaceContainerHighestLight,
+ surfaceDim = surfaceDimLight,
+ surfaceBright = surfaceBrightLight,
+ surfaceContainerLowest = surfaceContainerLowestLight,
+ surfaceContainerLow = surfaceContainerLowLight,
+ surfaceContainer = surfaceContainerLight,
+ surfaceContainerHigh = surfaceContainerHighLight,
+ surfaceContainerHighest = surfaceContainerHighestLight,
 )
 
 val SoleilLevantDarkScheme = darkColorScheme(
@@ -147,11 +147,11 @@ val SoleilLevantDarkScheme = darkColorScheme(
  inverseSurface = inverseSurfaceDark,
  inverseOnSurface = inverseOnSurfaceDark,
  inversePrimary = inversePrimaryDark,
- //surfaceDim = surfaceDimDark,
- //surfaceBright = surfaceBrightDark,
- //surfaceContainerLowest = surfaceContainerLowestDark,
- //surfaceContainerLow = surfaceContainerLowDark,
- //surfaceContainer = surfaceContainerDark,
- //surfaceContainerHigh = surfaceContainerHighDark,
- //surfaceContainerHighest = surfaceContainerHighestDark,
+ surfaceDim = surfaceDimDark,
+ surfaceBright = surfaceBrightDark,
+ surfaceContainerLowest = surfaceContainerLowestDark,
+ surfaceContainerLow = surfaceContainerLowDark,
+ surfaceContainer = surfaceContainerDark,
+ surfaceContainerHigh = surfaceContainerHighDark,
+ surfaceContainerHighest = surfaceContainerHighestDark,
 )

app/src/main/kotlin/com/sanmer/geomag/ui/theme/color/WildRoses.kt

@@ -109,13 +109,13 @@ val WildRosesLightScheme = lightColorScheme(
  inverseSurface = inverseSurfaceLight,
  inverseOnSurface = inverseOnSurfaceLight,
  inversePrimary = inversePrimaryLight,
- //surfaceDim = surfaceDimLight,
- //surfaceBright = surfaceBrightLight,
- //surfaceContainerLowest = surfaceContainerLowestLight,
- //surfaceContainerLow = surfaceContainerLowLight,
- //surfaceContainer = surfaceContainerLight,
- //surfaceContainerHigh = surfaceContainerHighLight,
- //surfaceContainerHighest = surfaceContainerHighestLight,
+ surfaceDim = surfaceDimLight,
+ surfaceBright = surfaceBrightLight,
+ surfaceContainerLowest = surfaceContainerLowestLight,
+ surfaceContainerLow = surfaceContainerLowLight,
+ surfaceContainer = surfaceContainerLight,
+ surfaceContainerHigh = surfaceContainerHighLight,
+ surfaceContainerHighest = surfaceContainerHighestLight,
 )
 
 val WildRosesDarkScheme = darkColorScheme(
@@ -147,11 +147,11 @@ val WildRosesDarkScheme = darkColorScheme(
  inverseSurface = inverseSurfaceDark,
  inverseOnSurface = inverseOnSurfaceDark,
  inversePrimary = inversePrimaryDark,
- //surfaceDim = surfaceDimDark,
- //surfaceBright = surfaceBrightDark,
- //surfaceContainerLowest = surfaceContainerLowestDark,
- //surfaceContainerLow = surfaceContainerLowDark,
- //surfaceContainer = surfaceContainerDark,
- //surfaceContainerHigh = surfaceContainerHighDark,
- //surfaceContainerHighest = surfaceContainerHighestDark,
+ surfaceDim = surfaceDimDark,
+ surfaceBright = surfaceBrightDark,
+ surfaceContainerLowest = surfaceContainerLowestDark,
+ surfaceContainerLow = surfaceContainerLowDark,
+ surfaceContainer = surfaceContainerDark,
+ surfaceContainerHigh = surfaceContainerHighDark,
+ surfaceContainerHighest = surfaceContainerHighestDark,
 )

gradle/libs.versions.toml

@@ -5,7 +5,7 @@ androidxActivity = "1.8.2"
 androidxAppCompat = "1.6.1"
 androidxCompose = "1.6.0"
 androidxComposeCompiler = "1.5.8"
-androidxComposeMaterial3 = "1.1.2"
+androidxComposeMaterial3 = "1.2.0-rc01"
 androidxCore = "1.12.0"
 androidxCoreSplashscreen = "1.0.1"
 androidxDataStore = "1.0.0"