[android] Use M3 background in dark mode

Signed-off-by: Jean-Baptiste <jeanbaptiste.charron@outlook.fr>

SECURITY.md

@@ -1,17 +0,0 @@
-## Reporting Vulnerabilities
-You can report a security vulnerability by creating an issue or send mail to security@comaps.app
-
-## Verifying Fingerprints
-
-To [verify](https://developer.android.com/studio/command-line/apksigner#usage-verify) the APK, use the following signing certificate fingerprints:
-```
-SHA-256: 4894e8e6963627ef660031d8593fe77297f835acb4e23810003e926135023b4c
-SHA-1: 8b7b5739f917e9f7c681671ced0c9c8562123ade
-MD5: 9cce0ffea281dc2f0e0a154d6d2e281e
-```
-
-To verify CoMaps via [AppVerifier](https://github.com/soupslurpr/AppVerifier), use the following signing certificate fingerprint:
-```
-app.comaps
-48:94:E8:E6:96:36:27:EF:66:00:31:D8:59:3F:E7:72:97:F8:35:AC:B4:E2:38:10:00:3E:92:61:35:02:3B:4C
-```

android/app/src/main/java/app/organicmaps/settings/BaseXmlSettingsFragment.java

@@ -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));
   }

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

@@ -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">

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

@@ -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">

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

@@ -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>

android/app/src/main/res/layout/about.xml

@@ -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">

android/app/src/main/res/layout/activity_download_resources.xml

@@ -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"

android/app/src/main/res/layout/activity_map_placeholder.xml

@@ -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">
 

android/app/src/main/res/layout/activity_request_permissions.xml

@@ -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">
 

android/app/src/main/res/layout/activity_settings.xml

@@ -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"/>

android/app/src/main/res/layout/fragment_driving_options.xml

@@ -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">

android/app/src/main/res/layout/fragment_osm_login.xml

@@ -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">

android/app/src/main/res/layout/fragment_osm_profile.xml

@@ -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"

android/app/src/main/res/layout/fragment_prefs_storage.xml

@@ -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"

android/app/src/main/res/layout/place_page_map_too_old.xml

@@ -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"

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

@@ -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"/>

android/app/src/main/res/values/arrays.xml

@@ -27,9 +27,9 @@
     <item>type2_combo</item>
     <item>nacs</item>
     <item>chademo</item>
-    <item>type2</item>
-    <item>type2_cable</item>
     <item>type1</item>
+    <item>type2_cable</item>
+    <item>type2</item>
     <item>schuko</item>
     <item>unknown</item>
   </string-array>

android/app/src/main/res/values/colors.xml

@@ -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>

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

@@ -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" />

android/app/src/main/res/values/themes.xml

@@ -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"/>

android/sdk/build.gradle

@@ -146,7 +146,7 @@ project.afterEvaluate {
 
   final taskName = gradle.startParameter.taskNames
 
-  if (['assemble', 'bundle', 'compile', 'install', 'run', 'publish'].any{taskName.any{task->task.startsWith(it)}}) {
+  if (['assemble', 'bundle', 'compile', 'install', 'run'].any{taskName.any{task->task.startsWith(it)}}) {
     exec {
       workingDir '../..'