|
1 | 1 | <resources xmlns:tools="http://schemas.android.com/tools"> |
2 | 2 |
|
3 | 3 | <!-- Base application theme. --> |
4 | | - <style name="AppTheme.Base" parent="Theme.AppCompat.DayNight.DarkActionBar"> |
| 4 | + <style name="AppTheme.Base" parent="Theme.Material3.DayNight.NoActionBar"> |
5 | 5 | <!-- Customize your theme here. --> |
6 | 6 | <item name="colorPrimary">@color/colorPrimary</item> |
7 | 7 | <!-- Ensure status bar tone matches app bar exactly --> |
|
10 | 10 |
|
11 | 11 | <item name="android:textColorPrimary">@color/textColorPrimary</item> |
12 | 12 | <item name="android:textColorSecondary">@color/textColorSecondary</item> |
13 | | - |
14 | | - <!-- Make the status bar match the app bar color --> |
15 | | - <item name="android:statusBarColor">?attr/colorPrimary</item> |
16 | | - <item name="android:windowDrawsSystemBarBackgrounds">true</item> |
17 | 13 | </style> |
18 | 14 |
|
19 | 15 | <!-- App theme alias; v23 will override this to add icon contrast --> |
20 | 16 | <style name="UsbTerminalTheme" parent="@style/AppTheme.Base" /> |
21 | 17 |
|
22 | | - <style name="ModalBottomSheet" parent="@style/Widget.MaterialComponents.BottomSheet.Modal"> |
23 | | - <!-- Tint ensures Material background matches day/night color --> |
24 | | - <item name="backgroundTint">@color/bg_modal_bottom_sheet</item> |
25 | | - <item name="android:background">@drawable/bg_modal_bottom_sheet</item> |
26 | | - </style> |
27 | | - |
28 | 18 | <!-- Common items for the bottom sheet theme --> |
29 | | - <style name="ModalBottomSheetTheme.Base" parent="Theme.MaterialComponents.BottomSheetDialog"> |
30 | | - <!-- Match activity/app bar color for a unified look --> |
31 | | - <item name="android:statusBarColor">?attr/colorPrimary</item> |
| 19 | + <style name="ModalBottomSheetTheme.Base" parent="Theme.Material3.DayNight.BottomSheetDialog"> |
| 20 | + <!-- Edge-to-edge for modal as well; host handles coloring --> |
32 | 21 | <item name="android:navigationBarColor">@color/bg_modal_bottom_sheet</item> |
33 | 22 | <item name="android:windowDrawsSystemBarBackgrounds">true</item> |
34 | | - <item name="android:windowIsFloating">false</item> |
35 | | - <item name="bottomSheetStyle">@style/ModalBottomSheet</item> |
36 | 23 | </style> |
37 | 24 |
|
38 | 25 | <!-- Day variant adds light nav bar icons --> |
|
0 commit comments