drifty/comaps
1
0
Fork 0
mirror of https://codeberg.org/comaps/comaps synced 2025-12-29 01:03:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

[android] Use M3 background in dark mode

Browse Source 
Signed-off-by: Jean-Baptiste <jeanbaptiste.charron@outlook.fr>
This commit is contained in:
Jean-Baptiste
2025-12-20 14:54:21 +01:00
parent 0eafe3482e
commit f00736c641
18 changed files with 23 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
android/app/src/main/java/app/organicmaps/settings/BaseXmlSettingsFragment.java
View File

@@ -6,12 +6,10 @@ import android.view.View;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.annotation.XmlRes;
import androidx.core.content.ContextCompat;
import androidx.core.view.ViewCompat;
import androidx.preference.Preference;
import androidx.preference.PreferenceFragmentCompat;
import androidx.recyclerview.widget.RecyclerView;
import app.organicmaps.R;
import app.organicmaps.util.Utils;
import app.organicmaps.util.WindowInsetUtils.ScrollableContentInsetsListener;
@@ -44,7 +42,6 @@ abstract class BaseXmlSettingsFragment extends PreferenceFragmentCompat
public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState)
{
super.onViewCreated(view, savedInstanceState);
view.setBackgroundColor(ContextCompat.getColor(requireContext(), R.color.bg_cards));
RecyclerView recyclerView = getListView();
ViewCompat.setOnApplyWindowInsetsListener(recyclerView, new ScrollableContentInsetsListener(recyclerView));
}

2
android/app/src/main/res/layout-land/about.xml
View File

@@ -5,7 +5,7 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="?cardBackground"
android:background="?appBackground"
android:clipToPadding="false"
android:fadeScrollbars="false"
android:fillViewport="true">

2
android/app/src/main/res/layout-land/fragment_osm_login.xml
View File

@@ -13,7 +13,7 @@
android:id="@+id/scrollView"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="?cardBackground"
android:background="?appBackground"
android:fadeScrollbars="false"
android:fillViewport="true"
android:clipToPadding="false">

6
android/app/src/main/res/layout-w1020dp/activity_settings.xml
View File

@@ -3,7 +3,8 @@
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">
android:orientation="vertical"
android:background="?appBackground">
<include
layout="@layout/toolbar_extended"/>
@@ -17,7 +18,8 @@
android:id="@+id/fragment_container"
style="@style/MwmWidget.FrameLayout.Elevation"
android:layout_width="match_parent"
android:layout_height="match_parent"/>
android:layout_height="match_parent"
android:background="?appBackground"/>
</com.google.android.material.card.MaterialCardView>
</FrameLayout>

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

@@ -4,7 +4,7 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="?cardBackground"
android:background="?appBackground"
android:clipToPadding="false"
android:fadeScrollbars="false"
android:fillViewport="true">

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

@@ -5,7 +5,7 @@
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="?cardBackground">
android:background="?appBackground">
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="match_parent"

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

@@ -4,7 +4,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:background="?cardBackground"
android:background="?appBackground"
android:gravity="center"
android:orientation="vertical">

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

@@ -3,7 +3,7 @@
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="?cardBackground"
android:background="?appBackground"
android:gravity="center"
android:orientation="vertical">

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

@@ -3,7 +3,8 @@
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">
android:orientation="vertical"
android:background="?appBackground">
<include
layout="@layout/toolbar_default"/>

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

@@ -2,7 +2,7 @@
<LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:background="?cardBackground"
android:background="?appBackground"
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="match_parent">

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

@@ -13,7 +13,7 @@
android:id="@+id/scrollView"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="?cardBackground"
android:background="?appBackground"
android:fadeScrollbars="false"
android:fillViewport="true"
android:clipToPadding="false">

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

@@ -6,7 +6,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
android:background="?cardBackground">
android:background="?appBackground">
<com.google.android.material.appbar.MaterialToolbar
android:id="@+id/toolbar"
style="@style/MwmWidget.ToolbarStyle"

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

@@ -5,7 +5,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
android:background="?cardBackground">
android:background="?appBackground">
<com.google.android.material.textview.MaterialTextView
android:id="@+id/header"

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

@@ -9,7 +9,7 @@ android:layout_marginHorizontal="@dimen/margin_base"
android:layout_marginTop="@dimen/margin_half"
app:strokeWidth="1dp"
app:strokeColor="@color/base_accent"
app:cardBackgroundColor="@color/bg_cards">
app:cardBackgroundColor="?cardBackground">
<LinearLayout
android:layout_width="match_parent"

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

@@ -150,6 +150,8 @@
<item name="colorSurfaceContainer">@color/md_theme_surfaceContainer</item>
<item name="colorSurfaceContainerHigh">@color/md_theme_surfaceContainerHigh</item>
<item name="colorSurfaceContainerHighest">@color/md_theme_surfaceContainerHighest</item>
<item name="appBackground">?android:attr/colorBackground</item>
</style>
<style name="MwmTheme" parent="MwmTheme.Base"/>

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

@@ -64,6 +64,7 @@
<color name="bg_cards">@android:color/white</color>
<color name="bg_panel">@color/bg_window</color>
<color name="bg_primary_dark">#37653F</color> <!-- secondary dark -->
<color name="bg_app">@android:color/white</color>
<color name="bg_dialog_translucent">#BB000000</color>
<color name="bg_text_translucent">#99FFFFFF</color>

1
android/app/src/main/res/values/themes-attrs.xml
View File

@@ -6,6 +6,7 @@
<attr name="textDialogTheme" format="reference" />
<attr name="windowBackgroundForced" format="reference|color" />
<attr name="cardBackground" format="reference" />
<attr name="appBackground" format="reference|color" />
<attr name="clickableBackground" format="reference" />
<attr name="statusBar" format="color" />
<attr name="secondary" format="color" />

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

@@ -158,6 +158,8 @@
<item name="colorSurfaceContainerHigh">@color/md_theme_surfaceContainerHigh</item>
<item name="colorSurfaceContainerHighest">@color/md_theme_surfaceContainerHighest</item>
<item name="appBackground">@color/bg_app</item>
</style>
<style name="MwmTheme" parent="MwmTheme.Base"/>