File tree Expand file tree Collapse file tree 5 files changed +5
-59
lines changed
java/xyz/teamgravity/composenestednavigation/ui/theme Expand file tree Collapse file tree 5 files changed +5
-59
lines changed Original file line number Diff line number Diff line change 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" />
Original file line number Diff line number Diff 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
4131fun 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}
Load Diff This file was deleted.
Load Diff This file was deleted.
Original file line number Diff line number Diff line change 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 >
You can’t perform that action at this time.
0 commit comments