From 6defead2ce9fe73129c4fea7e2970920ea4419c9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Manuel=20Jes=C3=BAs=20de=20la=20Fuente?= <m@nueljl.in>
Date: Wed, 29 Mar 2023 17:39:25 +0000
Subject: [PATCH] Use M3 theme, switch to Material Dialogs

- Add Monet dynamic colors on the app's `onCreate()`
- Set parent in styles.xml to `Theme.Material3.DayNight.NoActionBar`
- Use `MaterialAlertDialogBuilder`
- In the About and About KDE fragments, it uses the M3 elevated style instead of outlines
- In `edit_text_alert_dialog_view.xml`, it uses the default theme style instead of specifying the one from MaterialComponents
- Added a todo in the settings fragment: Preference dialogs don't yet use the M3 style.

It complements https://invent.kde.org/network/kdeconnect-android/-/merge_requests/273, though the way that merge request accomplishes color theming is the one from before the onCreate dynamics color method
---
 res/layout/activity_about_kde.xml                         | 8 --------
 res/layout/edit_text_alert_dialog_view.xml                | 6 ++----
 res/layout/fragment_about.xml                             | 7 +------
 res/values/styles.xml                                     | 3 ++-
 .../kde/kdeconnect/UserInterface/AlertDialogFragment.java | 4 +++-
 .../kde/kdeconnect/UserInterface/SettingsFragment.java    | 3 +++
 src/org/kde/kdeconnect/UserInterface/ThemeUtil.java       | 3 +++
 7 files changed, 14 insertions(+), 20 deletions(-)

diff --git a/res/layout/activity_about_kde.xml b/res/layout/activity_about_kde.xml
index 5995d5fa..e22b171e 100644
--- a/res/layout/activity_about_kde.xml
+++ b/res/layout/activity_about_kde.xml
@@ -42,9 +42,7 @@
                 android:layout_marginRight="12dp"
                 android:layout_marginEnd="12dp"
                 android:layout_marginBottom="12dp"
-                card_view:cardBackgroundColor="@color/card_stroke_color"
                 card_view:cardCornerRadius="12dp"
-                card_view:cardElevation="5dp"
                 card_view:cardUseCompatPadding="true">
 
                 <TextView
@@ -65,9 +63,7 @@
                 android:layout_marginRight="12dp"
                 android:layout_marginEnd="12dp"
                 android:layout_marginBottom="12dp"
-                card_view:cardBackgroundColor="@color/card_stroke_color"
                 card_view:cardCornerRadius="12dp"
-                card_view:cardElevation="5dp"
                 card_view:cardUseCompatPadding="true">
 
                 <TextView
@@ -88,9 +84,7 @@
                 android:layout_marginRight="12dp"
                 android:layout_marginEnd="12dp"
                 android:layout_marginBottom="12dp"
-                card_view:cardBackgroundColor="@color/card_stroke_color"
                 card_view:cardCornerRadius="12dp"
-                card_view:cardElevation="5dp"
                 card_view:cardUseCompatPadding="true">
 
                 <TextView
@@ -111,9 +105,7 @@
                 android:layout_marginRight="12dp"
                 android:layout_marginEnd="12dp"
                 android:layout_marginBottom="12dp"
-                card_view:cardBackgroundColor="@color/card_stroke_color"
                 card_view:cardCornerRadius="12dp"
-                card_view:cardElevation="5dp"
                 card_view:cardUseCompatPadding="true">
 
                 <TextView
diff --git a/res/layout/edit_text_alert_dialog_view.xml b/res/layout/edit_text_alert_dialog_view.xml
index ebe52f01..32610094 100644
--- a/res/layout/edit_text_alert_dialog_view.xml
+++ b/res/layout/edit_text_alert_dialog_view.xml
@@ -15,8 +15,7 @@
         android:id="@+id/textInputLayout"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        app:hintEnabled="false"
-        style="@style/Widget.MaterialComponents.TextInputLayout.FilledBox">
+        app:hintEnabled="false">
 
         <!-- inputType="text" is needed, without it lines and maxLines is ignored https://issuetracker.google.com/issues/37118772 -->
         <com.google.android.material.textfield.TextInputEditText
@@ -25,8 +24,7 @@
             android:layout_height="wrap_content"
             android:lines="1"
             android:maxLines="1"
-            android:inputType="text"
-            style="@style/Widget.MaterialComponents.TextInputEditText.FilledBox"/>
+            android:inputType="text" />
 
     </com.google.android.material.textfield.TextInputLayout>
 </FrameLayout>
diff --git a/res/layout/fragment_about.xml b/res/layout/fragment_about.xml
index 8fcfe629..1674bd61 100644
--- a/res/layout/fragment_about.xml
+++ b/res/layout/fragment_about.xml
@@ -19,9 +19,6 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_margin="12dp"
-            card_view:cardBackgroundColor="@color/card_stroke_color"
-            card_view:cardCornerRadius="12dp"
-            card_view:cardElevation="5dp"
             card_view:cardUseCompatPadding="true">
 
             <LinearLayout
@@ -151,9 +148,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_margin="12dp"
-            card_view:cardBackgroundColor="@color/card_stroke_color"
-            card_view:cardCornerRadius="12dp"
-            card_view:cardElevation="5dp"
+            style="@style/Widget.Material3.CardView.Elevated"
             card_view:cardUseCompatPadding="true">
 
             <LinearLayout
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 3ac5f9fc..081485c0 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -1,6 +1,6 @@
 <resources>
     <!-- NoActionBar because we use a Toolbar widget as ActionBar -->
-    <style name="KdeConnectThemeBase" parent="Theme.MaterialComponents.DayNight">
+    <style name="KdeConnectThemeBase" parent="Theme.Material3.DayNight.NoActionBar">
         <!-- The main color attributes -->
         <!-- The three colors used by system widgets, according to https://chris.banes.me/2014/10/17/appcompat-v21/ -->
         <item name="colorPrimary">@color/primary</item>
@@ -26,6 +26,7 @@
         <item name="preferenceTheme">@style/PreferenceThemeOverlay</item>
         <item name="popupTheme">@style/ThemeOverlay.AppCompat.DayNight</item>
 
+        <item name="materialCardViewStyle">@style/Widget.Material3.CardView.Elevated</item>
     </style>
 
     <style name="KdeConnectTheme" parent="KdeConnectThemeBase" />
diff --git a/src/org/kde/kdeconnect/UserInterface/AlertDialogFragment.java b/src/org/kde/kdeconnect/UserInterface/AlertDialogFragment.java
index de1ce766..d8ce48c6 100644
--- a/src/org/kde/kdeconnect/UserInterface/AlertDialogFragment.java
+++ b/src/org/kde/kdeconnect/UserInterface/AlertDialogFragment.java
@@ -18,6 +18,8 @@ import androidx.annotation.StringRes;
 import androidx.appcompat.app.AlertDialog;
 import androidx.fragment.app.DialogFragment;
 
+import com.google.android.material.dialog.MaterialAlertDialogBuilder;
+
 public class AlertDialogFragment extends DialogFragment implements DialogInterface.OnClickListener {
     private static final String KEY_TITLE_RES_ID = "TitleResId";
     private static final String KEY_TITLE = "Title";
@@ -62,7 +64,7 @@ public class AlertDialogFragment extends DialogFragment implements DialogInterfa
         @SuppressLint("ResourceType")
         String titleString = titleResId > 0 ? getString(titleResId) : title;
 
-        AlertDialog.Builder builder = new AlertDialog.Builder(requireContext())
+        AlertDialog.Builder builder = new MaterialAlertDialogBuilder(requireContext())
                 .setTitle(titleString)
                 .setPositiveButton(positiveButtonResId, this);
         if (negativeButtonResId != 0) {
diff --git a/src/org/kde/kdeconnect/UserInterface/SettingsFragment.java b/src/org/kde/kdeconnect/UserInterface/SettingsFragment.java
index 896d0be7..290f12c0 100644
--- a/src/org/kde/kdeconnect/UserInterface/SettingsFragment.java
+++ b/src/org/kde/kdeconnect/UserInterface/SettingsFragment.java
@@ -47,6 +47,9 @@ public class SettingsFragment extends PreferenceFragmentCompat {
         Context context = getPreferenceManager().getContext();
         PreferenceScreen screen = getPreferenceManager().createPreferenceScreen(context);
 
+        // TODO: preference alert dialogs don't use the material alert dialogs yet
+        // see https://github.com/material-components/material-components-android/issues/2732
+
         // Rename device
         renameDevice = new EditTextPreference(context);
         renameDevice.setKey(DeviceHelper.KEY_DEVICE_NAME_PREFERENCE);
diff --git a/src/org/kde/kdeconnect/UserInterface/ThemeUtil.java b/src/org/kde/kdeconnect/UserInterface/ThemeUtil.java
index d6aefef8..95daf22a 100644
--- a/src/org/kde/kdeconnect/UserInterface/ThemeUtil.java
+++ b/src/org/kde/kdeconnect/UserInterface/ThemeUtil.java
@@ -7,6 +7,8 @@ import androidx.annotation.NonNull;
 import androidx.appcompat.app.AppCompatDelegate;
 import androidx.preference.PreferenceManager;
 
+import com.google.android.material.color.DynamicColors;
+
 
 /**
  * Utilities for working with android {@link android.content.res.Resources.Theme Themes}.
@@ -44,6 +46,7 @@ public class ThemeUtil {
     public static void setUserPreferredTheme(Activity activity) {
         String appTheme = PreferenceManager.getDefaultSharedPreferences(activity)
                 .getString("theme_pref", DEFAULT_MODE);
+        DynamicColors.applyIfAvailable(activity);
         applyTheme(appTheme);
     }
 }