drifty/comaps
1
0
Fork 0
mirror of https://codeberg.org/comaps/comaps synced 2026-01-04 11:53:47 +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 6cbad3079d
5 changed files with 9 additions and 9 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));
}

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="?cardBackground">
<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="?cardBackground"/>
</com.google.android.material.card.MaterialCardView>
</FrameLayout>

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="?cardBackground">
<include
layout="@layout/toolbar_default"/>

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"

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

@@ -23,7 +23,7 @@
<item name="alertDialogTheme">@style/MwmTheme.AlertDialog</item>
<item name="windowBackgroundForced">@color/bg_window</item>
<item name="cardBackground">@color/bg_cards</item>
<item name="cardBackground">?android:attr/colorBackground</item>
<item name="titleDialogTheme">@color/white_primary</item>
<item name="textDialogTheme">@color/white_secondary</item>
<item name="fullscreenDialogTheme">@style/MwmTheme.DialogFragment.Fullscreen</item>
@@ -42,7 +42,7 @@
<item name="secondary">@color/text_light_hint</item>
<item name="dividerHorizontal">@color/divider</item>
<item name="ppBackground">@color/bg_cards</item>
<item name="ppBackground">?cardBackground</item>
<item name="ppButtonsBackground">@color/bg_window</item>
<item name="ppFloatingMarkerIconColor">@color/white_54</item>