drifty/comaps
1
0
Fork 0
mirror of https://codeberg.org/comaps/comaps synced 2025-12-20 13:23:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

[android] Apply M3 theme like app theme

Browse Source 
Signed-off-by: Jean-Baptiste <jeanbaptiste.charron@outlook.fr>
This commit is contained in:
Jean-Baptiste
2025-09-20 17:20:33 +02:00
committed by map-per
parent 3536716983
commit e3736a8e33
16 changed files with 86 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
android/app/src/main/res/layout/dialog_sorting_types.xml
View File

@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_margin="@dimen/margin_double_and_half"
@@ -32,7 +33,8 @@
android:layout_height="wrap_content"
android:padding="@dimen/margin_half_double_plus"
android:checked="true"
android:text="@string/by_default"/>
android:text="@string/by_default"
app:buttonTint="@null"/>
<RadioButton
style="?fontSubtitle1"
@@ -41,7 +43,8 @@
android:layout_height="wrap_content"
android:padding="@dimen/margin_half_double_plus"
android:checked="false"
android:text="@string/by_name"/>
android:text="@string/by_name"
app:buttonTint="@null"/>
<RadioButton
style="?fontSubtitle1"
@@ -50,7 +53,8 @@
android:layout_height="wrap_content"
android:padding="@dimen/margin_half_double_plus"
android:checked="false"
android:text="@string/by_type"/>
android:text="@string/by_type"
app:buttonTint="@null"/>
<RadioButton
style="?fontSubtitle1"
@@ -59,7 +63,8 @@
android:layout_height="wrap_content"
android:padding="@dimen/margin_half_double_plus"
android:checked="false"
android:text="@string/by_distance"/>
android:text="@string/by_distance"
app:buttonTint="@null"/>
<RadioButton
style="?fontSubtitle1"
@@ -68,6 +73,7 @@
android:layout_height="wrap_content"
android:padding="@dimen/margin_half_double_plus"
android:checked="false"
android:text="@string/by_date"/>
android:text="@string/by_date"
app:buttonTint="@null"/>
</RadioGroup>
</LinearLayout>

3
android/app/src/main/res/layout/edit_bookmark_common.xml
View File

@@ -91,8 +91,9 @@
style="?fontBody1"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginEnd="@dimen/margin_half"
android:layout_marginStart="@dimen/margin_half"
android:layout_below="@id/rl__bookmark_set"
android:layout_margin="@dimen/margin_half"
android:hint="@string/placepage_personal_notes_hint"
android:textColorHint="?android:textColorSecondary">

16
android/app/src/main/res/layout/fragment_editor.xml
View File

@@ -23,7 +23,7 @@
android:textAppearance="@style/MwmTextAppearance.Body4"/>
<com.google.android.material.card.MaterialCardView
android:id="@+id/cv__category"
style="@style/MwmWidget.Editor.CardView">
style="@style/MwmWidget.M3.Editor.CardView">
<RelativeLayout
android:id="@+id/category"
style="@style/MwmWidget.Editor.MetadataBlock"
@@ -64,7 +64,7 @@
</com.google.android.material.card.MaterialCardView>
<com.google.android.material.card.MaterialCardView
android:id="@+id/cv__charging_station"
style="@style/MwmWidget.Editor.CardView"
style="@style/MwmWidget.M3.Editor.CardView"
android:visibility="gone">
<LinearLayout
android:layout_width="match_parent"
@@ -86,12 +86,12 @@
</com.google.android.material.card.MaterialCardView>
<com.google.android.material.card.MaterialCardView
android:id="@+id/cv__name"
style="@style/MwmWidget.Editor.CardView">
style="@style/MwmWidget.M3.Editor.CardView">
<include layout="@layout/localized_name"/>
</com.google.android.material.card.MaterialCardView>
<com.google.android.material.card.MaterialCardView
android:id="@+id/cv__address"
style="@style/MwmWidget.Editor.CardView">
style="@style/MwmWidget.M3.Editor.CardView">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
@@ -147,7 +147,7 @@
<com.google.android.material.card.MaterialCardView
android:id="@+id/cv__details"
style="@style/MwmWidget.Editor.CardView">
style="@style/MwmWidget.M3.Editor.CardView">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
@@ -327,7 +327,7 @@
<com.google.android.material.card.MaterialCardView
android:id="@+id/cv__social_media"
style="@style/MwmWidget.Editor.CardView">
style="@style/MwmWidget.M3.Editor.CardView">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
@@ -369,7 +369,7 @@
<com.google.android.material.card.MaterialCardView
android:id="@+id/cv__building"
style="@style/MwmWidget.Editor.CardView">
style="@style/MwmWidget.M3.Editor.CardView">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
@@ -394,7 +394,7 @@
<com.google.android.material.card.MaterialCardView
android:id="@+id/cv__more"
style="@style/MwmWidget.Editor.CardView"
style="@style/MwmWidget.M3.Editor.CardView"
android:layout_marginBottom="@dimen/margin_base">
<LinearLayout
android:layout_width="match_parent"

1
android/app/src/main/res/layout/fragment_timetable_advanced.xml
View File

@@ -16,6 +16,7 @@
<com.google.android.material.card.MaterialCardView
android:layout_width="match_parent"
android:layout_height="wrap_content"
style="@style/MwmWidget.M3.Editor.CardView"
card_view:cardBackgroundColor="?cardBackground"
card_view:cardCornerRadius="2dp"
card_view:cardElevation="4dp">

6
android/app/src/main/res/layout/item_bookmark_category.xml
View File

@@ -8,8 +8,8 @@
android:background="@drawable/bg_clickable_card">
<com.google.android.material.checkbox.MaterialCheckBox
android:id="@+id/checkbox"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_width="40dp"
android:layout_height="40dp"
android:layout_alignBottom="@id/bottom_line_container"
android:layout_alignParentStart="true"
android:layout_alignParentTop="true"
@@ -18,7 +18,7 @@
android:layout_marginStart="8dp"
android:background="@null"
android:button="@drawable/visibility_selector"
android:buttonTint="?accentColorSelector"
app:buttonTint="@color/accent_color_selector"
android:padding="@dimen/margin_half" />
<com.google.android.material.textview.MaterialTextView
android:id="@+id/name"

4
android/app/src/main/res/layout/item_bookmark_category_choose.xml
View File

@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="48dp"
android:background="?clickableBackground"
@@ -14,7 +15,8 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:clickable="false"
android:focusable="false"/>
android:focusable="false"
app:buttonTint="@null"/>
<com.google.android.material.textview.MaterialTextView
android:id="@+id/tv__set_name"

1
android/app/src/main/res/layout/item_editor_input.xml
View File

@@ -18,7 +18,6 @@
android:layout_width="0dp"
android:layout_centerVertical="true"
android:layout_marginStart="14dp"
android:textColorHint="?android:textColorSecondary"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@+id/icon"

3
android/app/src/main/res/layout/item_selection.xml
View File

@@ -19,7 +19,8 @@
android:layout_marginEnd="@dimen/margin_base"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"/>
app:layout_constraintTop_toTopOf="parent"
app:buttonTint="@null"/>
<LinearLayout
android:layout_width="match_parent"

3
android/app/src/main/res/layout/item_street.xml
View File

@@ -19,7 +19,8 @@
android:layout_marginEnd="@dimen/margin_base"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"/>
app:layout_constraintTop_toTopOf="parent"
app:buttonTint="@null"/>
<LinearLayout
android:layout_width="match_parent"

2
android/app/src/main/res/layout/item_timetable.xml
View File

@@ -3,7 +3,7 @@
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
xmlns:app="http://schemas.android.com/apk/res-auto"
style="@style/MwmWidget.Editor.CardView"
style="@style/MwmWidget.M3.Editor.CardView"
android:layout_marginBottom="@dimen/margin_half"
android:layout_marginTop="@dimen/margin_half">

25
android/app/src/main/res/layout/routing_plan.xml
View File

@@ -43,9 +43,8 @@
<app.organicmaps.widget.RoutingToolbarButton
android:id="@+id/vehicle"
style="@style/Widget.AppCompat.CompoundButton.RadioButton"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_width="@dimen/routing_toolbar_button"
android:layout_height="@dimen/routing_toolbar_button"
android:layout_marginStart="@dimen/routing_selector_wheel_margin"
android:contentDescription="@string/vehicle"
tools:button="@drawable/ic_car"
@@ -53,9 +52,8 @@
<app.organicmaps.widget.RoutingToolbarButton
android:id="@+id/pedestrian"
style="@style/Widget.AppCompat.CompoundButton.RadioButton"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_width="@dimen/routing_toolbar_button"
android:layout_height="@dimen/routing_toolbar_button"
android:layout_marginStart="12dp"
android:layout_marginEnd="12dp"
android:contentDescription="@string/pedestrian"
@@ -64,9 +62,8 @@
<app.organicmaps.widget.RoutingToolbarButton
android:id="@+id/transit"
style="@style/Widget.AppCompat.CompoundButton.RadioButton"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_width="@dimen/routing_toolbar_button"
android:layout_height="@dimen/routing_toolbar_button"
android:layout_marginEnd="@dimen/margin_half_plus"
android:contentDescription="@string/subway"
tools:button="@drawable/ic_route_planning_metro_40px"
@@ -74,9 +71,8 @@
<app.organicmaps.widget.RoutingToolbarButton
android:id="@+id/bicycle"
style="@style/Widget.AppCompat.CompoundButton.RadioButton"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_width="@dimen/routing_toolbar_button"
android:layout_height="@dimen/routing_toolbar_button"
android:layout_marginEnd="12dp"
android:contentDescription="@string/bicycle"
tools:button="@drawable/ic_bike"
@@ -84,9 +80,8 @@
<app.organicmaps.widget.RoutingToolbarButton
android:id="@+id/ruler"
style="@style/Widget.AppCompat.CompoundButton.RadioButton"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_width="@dimen/routing_toolbar_button"
android:layout_height="@dimen/routing_toolbar_button"
android:layout_marginEnd="12dp"
android:contentDescription="@string/ruler"
tools:button="@drawable/ic_ruler_route"

10
android/app/src/main/res/values-night/themes.xml
View File

@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<resources xmlns:tools="http://schemas.android.com/tools">
<style name="MwmTheme.Base" parent="Theme.MaterialComponents.DayNight.NoActionBar.Bridge">
<style name="MwmTheme.Base" parent="Theme.Material3.DayNight.NoActionBar">
<item name="materialCalendarStyle">@style/Widget.MaterialComponents.MaterialCalendar</item>
<item name="materialCalendarFullscreenTheme">@style/MwmWidget.MaterialCalendar.Theme.FullScreen.Dark</item>
<item name="materialCalendarTheme">@style/MwmWidget.MaterialCalendar.Theme.Dark</item>
@@ -121,11 +121,17 @@
<item name="colorSecondary">@color/base_accent</item>
<item name="colorPrimaryContainer">?colorSecondary</item>
<item name="colorOnPrimaryContainer">?android:textColorPrimaryInverse</item>
<item name="colorOnSurfaceInverse">?android:textColorPrimaryInverse</item>
<item name="colorPrimaryInverse">?colorSecondary</item>
<item name="android:textColorLink">?colorSecondary</item>
<item name="colorOnSurfaceVariant">?colorSecondary</item>
<item name="colorControlActivated">?colorSecondary</item>
<item name="colorOutlineVariant">@color/divider</item>
</style>
<style name="MwmTheme" parent="MwmTheme.Base"/>
<style name="MwmTheme.DialogFragment.Fullscreen" parent="Theme.AppCompat.DayNight">
<style name="MwmTheme.DialogFragment.Fullscreen" parent="Theme.Material3.DayNight">
<item name="colorControlNormal">@color/text_dark_hint</item>
<item name="android:textColorHint">@color/text_light_hint</item>
</style>

1
android/app/src/main/res/values/dimens.xml
View File

@@ -183,4 +183,5 @@
<!--App Icons -->
<dimen name="app_icon_border_width">0.8</dimen>
<dimen name="routing_toolbar_button">40dp</dimen>
</resources>

11
android/app/src/main/res/values/styles-editor.xml
View File

@@ -57,12 +57,14 @@
<style name="MwmWidget.Editor.CustomTextInput">
<item name="android:layout_height">wrap_content</item>
<item name="android:layout_width">match_parent</item>
<item name="android:textColorHint">?iconTint</item>
</style>
<style name="MwmWidget.Editor.FieldLayout">
<item name="android:layout_width">match_parent</item>
<item name="android:layout_height">wrap_content</item>
<item name="android:layout_marginStart">@dimen/editor_margin_left</item>
<item name="android:textColorHighlight">?colorPrimary</item>
</style>
<style name="MwmWidget.Editor.FieldLayout.EditText" parent="MwmWidget.Editor">
@@ -83,4 +85,13 @@
<item name="android:clickable">true</item>
<item name="android:textAppearance">@style/MwmTextAppearance.Body1</item>
</style>
<style name="MwmWidget.M3.Editor.CardView" parent="Widget.Material3.CardView.Elevated">
<item name="android:layout_width">match_parent</item>
<item name="android:layout_height">wrap_content</item>
<item name="android:layout_marginBottom">@dimen/margin_half</item>
<item name="cardBackgroundColor">?cardBackground</item>
<item name="android:padding">@dimen/margin_base</item>
<item name="cardPreventCornerOverlap">false</item>
</style>
</resources>

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

@@ -35,17 +35,20 @@
<item name="maxImageSize">34dp</item>
</style>
<style name="MwmWidget.Components.SearchWheel" parent="Theme.Material3.Dark">
<style name="MwmWidget.Components.SearchWheel" parent="Widget.MaterialComponents.FloatingActionButton">
<item name="android:layout_width">wrap_content</item>
<item name="android:layout_height">wrap_content</item>
<item name="android:backgroundTint">?menuBackground</item>
<item name="backgroundTint">?menuBackground</item>
<item name="elevation">0dp</item>
<item name="hoveredFocusedTranslationZ">0dp</item>
<item name="pressedTranslationZ">0dp</item>
<item name="android:tint">?iconTint</item>
<item name="tint">?iconTint</item>
<item name="maxImageSize">@dimen/map_button_icon_size</item>
<item name="borderWidth">0dp</item>
<item name="fabCustomSize">38dp</item>
<item name="ensureMinTouchTargetSize">false</item>
</style>
<style name="MwmWidget.MapButton.Bottom">
@@ -138,7 +141,7 @@
<item name="cornerSize">50%</item>
</style>
<style name="MwmWidget.ToolbarStyle" parent="ThemeOverlay.MaterialComponents.Dark.ActionBar">
<style name="MwmWidget.ToolbarStyle" parent="ThemeOverlay.Material3.Dark.ActionBar">
<item name="android:background">?colorPrimary</item>
<item name="android:displayOptions">homeAsUp|showTitle</item>
<item name="contentInsetStart">0dp</item>
@@ -155,7 +158,7 @@
<item name="android:elevation">0dp</item>
</style>
<style name="MwmWidget.ToolbarTheme" parent="ThemeOverlay.MaterialComponents.Dark.ActionBar">
<style name="MwmWidget.ToolbarTheme" parent="ThemeOverlay.Material3.Dark.ActionBar">
<item name="android:gravity">center_vertical</item>
<item name="colorAccent">@android:color/white</item>
<item name="colorSecondary">@android:color/white</item>
@@ -168,7 +171,7 @@
<item name="colorSecondary">#FF32363A</item>
</style>
<style name="MwmWidget.ToolbarTheme.Transparent" parent="ThemeOverlay.MaterialComponents.Dark.ActionBar">
<style name="MwmWidget.ToolbarTheme.Transparent" parent="ThemeOverlay.Material3.Dark.ActionBar">
<item name="android:gravity">center_vertical</item>
<item name="colorAccent">@android:color/white</item>
<item name="colorSecondary">@android:color/white</item>
@@ -178,7 +181,7 @@
<style
name="MwmWidget.ToolbarTheme.DownButton"
parent="ThemeOverlay.MaterialComponents.Dark.ActionBar">
parent="ThemeOverlay.Material3.Dark.ActionBar">
<item name="android:gravity">center_vertical</item>
<item name="colorAccent">@android:color/white</item>
<item name="colorSecondary">@android:color/white</item>
@@ -315,12 +318,12 @@
</style>
<style name="MwmWidget.MaterialCalendar.Theme.FullScreen.Dark"
parent="ThemeOverlay.MaterialComponents.MaterialCalendar.Fullscreen">
parent="ThemeOverlay.Material3.MaterialCalendar.Fullscreen">
<item name="colorSurface">@color/material_calendar_surface_dark</item>
</style>
<style name="MwmWidget.MaterialCalendar.Theme.Dark"
parent="ThemeOverlay.MaterialComponents.MaterialCalendar">
parent="ThemeOverlay.Material3.MaterialCalendar">
<item name="colorSurface">@color/material_calendar_surface_dark</item>
</style>

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

@@ -1,10 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<resources xmlns:tools="http://schemas.android.com/tools">
<!-- Default theme -->
<style name="MwmTheme.Base" parent="Theme.MaterialComponents.Light.NoActionBar.Bridge">
<item name="materialCalendarStyle">@style/Widget.MaterialComponents.MaterialCalendar</item>
<item name="materialCalendarFullscreenTheme">@style/ThemeOverlay.MaterialComponents.MaterialCalendar.Fullscreen</item>
<item name="materialCalendarTheme">@style/ThemeOverlay.MaterialComponents.MaterialCalendar</item>
<style name="MwmTheme.Base" parent="Theme.Material3.Light.NoActionBar">
<item name="materialCalendarStyle">@style/Widget.Material3.MaterialCalendar</item>
<item name="materialCalendarFullscreenTheme">@style/ThemeOverlay.Material3.MaterialCalendar.Fullscreen</item>
<item name="materialCalendarTheme">@style/ThemeOverlay.Material3.MaterialCalendar</item>
<item name="android:listViewStyle">@style/MwmWidget.ListView</item>
<item name="android:textViewStyle">@style/MwmWidget.TextView</item>
<item name="android:forceDarkAllowed" tools:targetApi="Q">false</item>
@@ -128,6 +128,12 @@
<item name="colorSecondary">@color/base_accent</item>
<item name="colorPrimaryContainer">?colorSecondary</item>
<item name="colorOnPrimaryContainer">?android:textColorPrimaryInverse</item>
<item name="colorOnSurfaceInverse">?android:textColorPrimaryInverse</item>
<item name="colorPrimaryInverse">?colorSecondary</item>
<item name="android:textColorLink">?colorSecondary</item>
<item name="colorOnSurfaceVariant">?colorSecondary</item>
<item name="colorControlActivated">?colorSecondary</item>
<item name="colorOutlineVariant">@color/divider</item>
</style>
@@ -161,7 +167,7 @@
<item name="android:windowBackground">@color/bg_window</item>
</style>
<style name="MwmTheme.AlertDialog" parent="Theme.MaterialComponents.DayNight.Dialog.Alert">
<style name="MwmTheme.AlertDialog" parent="Theme.Material3.DayNight.Dialog.Alert">
<item name="colorAccent">?buttonDialogTextColor</item>
<item name="colorSecondary">?buttonDialogTextColor</item>
<item name="colorPrimary">?buttonDialogTextColor</item>
@@ -180,7 +186,7 @@
<item name="android:textColor">?titleDialogTheme</item>
</style>
<style name="MwmTheme.DialogFragment.Fullscreen" parent="Theme.AppCompat.Light">
<style name="MwmTheme.DialogFragment.Fullscreen" parent="Theme.Material3.Light">
<item name="android:colorPrimaryDark">?statusBar</item>
<item name="colorAccent">@color/base_accent</item>
<item name="colorPrimary">@color/bg_primary</item>
@@ -247,7 +253,7 @@
<item name="iconTint">@color/white_primary</item>
</style>
<style name="PopupMenu" parent="ThemeOverlay.MaterialComponents">
<style name="PopupMenu" parent="ThemeOverlay.Material3">
<item name="android:popupBackground">?windowBackgroundForced</item>
</style>
</resources>