drifty/comaps
1
0
Fork 0
mirror of https://codeberg.org/comaps/comaps synced 2026-01-07 21:13:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

[android] Migrate FAB to Material 3 theme

Browse Source 
Signed-off-by: Jean-Baptiste <jeanbaptiste.charron@outlook.fr>
This commit is contained in:
Jean-Baptiste
2025-09-13 09:53:12 +02:00
committed by Konstantin Pastbin
parent fb09204fc6
commit f0b6a7b81a
11 changed files with 52 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
android/app/src/main/res/values/styles.xml
View File

@@ -410,4 +410,26 @@
<item name="strokeColor">?colorSecondary</item>
<item name="android:textColor">?colorSecondary</item>
</style>
<style name="MwmWidget.M3.FAB.Primary" parent="@style/Widget.Material3.FloatingActionButton.Primary">
<item name="shapeAppearance">@style/ShapeAppearanceOverlay.Material3.FloatingActionButton</item>
<item name="rippleColor">@null</item>
</style>
<style name="MwmWidget.M3.FAB.MapButton" parent="@style/Widget.Material3.FloatingActionButton.Primary">
<item name="android:layout_width">wrap_content</item>
<item name="android:layout_height">wrap_content</item>
<item name="shapeAppearance">@style/ShapeAppearanceOverlay.Material3.FloatingActionButton</item>
<item name="backgroundTint">?menuBackground</item>
<item name="tint">?iconTint</item>
<item name="fabCustomSize">@dimen/map_button_size</item>
<item name="maxImageSize">@dimen/map_button_icon_size</item>
<item name="elevation">0dp</item>
<item name="pressedTranslationZ">0dp</item>
<item name="hoveredFocusedTranslationZ">0dp</item>
</style>
<style name="MwmWidget.M3.FAB.MapButton.Square">
<item name="backgroundTint">?menuBackground</item>
</style>
</resources>

17
android/app/src/main/res/values/themes.xml
View File

@@ -14,7 +14,6 @@
<item name="android:textColorSecondary">@color/text_dark_subtitle</item>
<item name="android:windowBackground">?windowBackgroundForced</item>
<item name="android:colorPrimaryDark">@color/bg_primary_dark</item>
<item name="colorPrimaryVariant">@color/bg_primary_dark</item>
<item name="android:windowSoftInputMode">stateUnspecified|adjustPan</item>
<item name="android:fontFamily">@string/robotoRegular</item>
<item name="android:colorBackgroundCacheHint">@null</item>
@@ -30,7 +29,6 @@
<item name="colorPrimary">@color/bg_primary</item>
<item name="colorControlNormal">?secondary</item>
<item name="colorAccent">@color/base_accent</item>
<item name="colorSecondary">@color/base_accent</item>
<item name="colorAccentTransparent">@color/base_accent_transparent</item>
<item name="colorBtnHighlight">@color/white_38</item>
<item name="panel">@color/bg_panel</item>
@@ -132,6 +130,13 @@
<item name="bottomSheetStyle">@style/MwmWidget.BottomSheet</item>
<!-- Theme used for bottom sheet dialog components -->
<item name="bottomSheetDialogTheme">@style/MwmTheme.BottomSheetDialog</item>
<!-- M3 colors -->
<item name="colorPrimaryVariant">@color/bg_primary_dark</item>
<item name="colorSecondary">@color/base_accent</item>
<item name="colorPrimaryContainer">?colorSecondary</item>
<item name="colorOnPrimaryContainer">?android:textColorPrimaryInverse</item>
</style>
<!-- Night theme -->
@@ -148,7 +153,6 @@
<item name="android:textColorSecondary">@color/text_light_subtitle</item>
<item name="android:windowBackground">?windowBackgroundForced</item>
<item name="android:colorPrimaryDark">@color/bg_primary_dark_night</item>
<item name="colorPrimaryVariant">@color/bg_primary_dark_night</item>
<item name="android:windowSoftInputMode">stateUnspecified|adjustPan</item>
<item name="android:fontFamily">@string/robotoRegular</item>
<item name="android:colorBackgroundCacheHint">@null</item>
@@ -166,7 +170,6 @@
<item name="colorPrimary">@color/bg_primary_night</item>
<item name="colorControlNormal">?secondary</item>
<item name="colorAccent">@color/base_accent_night</item>
<item name="colorSecondary">@color/base_accent_night</item>
<item name="colorAccentTransparent">@color/base_accent_transparent</item>
<item name="colorBtnHighlight">@color/white_24</item>
<item name="panel">@color/bg_panel_night</item>
@@ -252,6 +255,12 @@
<item name="bottomSheetStyle">@style/MwmWidget.BottomSheet</item>
<item name="bottomSheetDialogTheme">@style/MwmTheme.BottomSheetDialog</item>
<!-- M3 colors -->
<item name="colorPrimaryVariant">@color/bg_primary_dark_night</item>
<item name="colorSecondary">@color/base_accent_night</item>
<item name="colorPrimaryContainer">?colorSecondary</item>
<item name="colorOnPrimaryContainer">?android:textColorPrimaryInverse</item>
</style>
<style name="MwmTheme" parent="MwmTheme.Base"/>