Skip to content

Commit b1eb4d0

Browse files
Setup Material3;
1 parent 5404290 commit b1eb4d0

File tree

5 files changed

+5
-59
lines changed

5 files changed

+5
-59
lines changed

app/src/main/AndroidManifest.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@
1212
android:supportsRtl="true"
1313
android:theme="@style/Theme.ComposeNestedNavigation"
1414
tools:targetApi="31">
15+
1516
<activity
1617
android:name=".MainActivity"
1718
android:exported="true"
18-
android:label="@string/app_name"
1919
android:theme="@style/Theme.ComposeNestedNavigation">
2020
<intent-filter>
2121
<action android:name="android.intent.action.MAIN" />

app/src/main/java/xyz/teamgravity/composenestednavigation/ui/theme/Theme.kt

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -25,22 +25,11 @@ private val LightColorScheme = lightColorScheme(
2525
primary = Purple40,
2626
secondary = PurpleGrey40,
2727
tertiary = Pink40
28-
29-
/* Other default colors to override
30-
background = Color(0xFFFFFBFE),
31-
surface = Color(0xFFFFFBFE),
32-
onPrimary = Color.White,
33-
onSecondary = Color.White,
34-
onTertiary = Color.White,
35-
onBackground = Color(0xFF1C1B1F),
36-
onSurface = Color(0xFF1C1B1F),
37-
*/
3828
)
3929

4030
@Composable
4131
fun ComposeNestedNavigationTheme(
4232
darkTheme: Boolean = isSystemInDarkTheme(),
43-
// Dynamic color is available on Android 12+
4433
dynamicColor: Boolean = true,
4534
content: @Composable () -> Unit
4635
) {
@@ -64,7 +53,6 @@ fun ComposeNestedNavigationTheme(
6453

6554
MaterialTheme(
6655
colorScheme = colorScheme,
67-
typography = Typography,
6856
content = content
6957
)
7058
}

app/src/main/java/xyz/teamgravity/composenestednavigation/ui/theme/Type.kt

Lines changed: 0 additions & 34 deletions
This file was deleted.

app/src/main/res/values/colors.xml

Lines changed: 0 additions & 10 deletions
This file was deleted.

app/src/main/res/values/themes.xml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<resources>
2+
<resources xmlns:tools="http://schemas.android.com/tools">
33

4-
<style name="Theme.ComposeNestedNavigation" parent="android:Theme.Material.Light.NoActionBar" />
4+
<style name="Theme.ComposeNestedNavigation" parent="android:Theme.Material.Light.NoActionBar">
5+
<item name="android:forceDarkAllowed" tools:targetApi="q">false</item>
6+
</style>
57
</resources>

0 commit comments

Comments
 (0)