From bb8273e29fd31f64e17847d26fbb5f4f87418da6 Mon Sep 17 00:00:00 2001
From: Niko Diamadis <niko@cyb3rko.de>
Date: Fri, 3 Feb 2023 11:16:01 +0100
Subject: [PATCH 01/12] Apply Material3 styles

---
 app/build.gradle                   | 2 +-
 app/src/main/res/values/styles.xml | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index d9c17d7..63912ea 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -66,7 +66,7 @@ dependencies {
     implementation project(':client')
     implementation 'androidx.appcompat:appcompat:1.5.1'
     implementation 'androidx.core:core-splashscreen:1.0.0'
-    implementation 'com.google.android.material:material:1.4.0'
+    implementation 'com.google.android.material:material:1.7.0'
     implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
     implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.1.0'
     implementation 'androidx.vectordrawable:vectordrawable:1.1.0'
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index b8c79e1..e1a3dbb 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -1,7 +1,7 @@
 <resources>
 
     <!-- Base application theme. -->
-    <style name="AppTheme" parent="Theme.MaterialComponents.DayNight">
+    <style name="AppTheme" parent="Theme.Material3.DayNight">
         <!-- Customize your theme here. -->
         <item name="colorPrimary">@color/colorPrimary</item>
         <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
@@ -21,7 +21,7 @@
         <item name="postSplashScreenTheme">@style/AppTheme.NoActionBar</item>
     </style>
 
-    <style name="AppTheme.AppBarOverlay" parent="ThemeOverlay.MaterialComponents.Dark.ActionBar" />
+    <style name="AppTheme.AppBarOverlay" parent="ThemeOverlay.Material3.Dark" />
 
     <style name="AppTheme.PopupOverlay" parent="AppTheme" />
 

From 786191c235fd907014044debe48c2b21ccb55720 Mon Sep 17 00:00:00 2001
From: Niko Diamadis <niko@cyb3rko.de>
Date: Fri, 3 Feb 2023 11:50:30 +0100
Subject: [PATCH 02/12] Update Login design

---
 .../com/github/gotify/login/AdvancedDialog.kt |  4 +-
 .../com/github/gotify/login/LoginActivity.kt  | 29 +++----
 app/src/main/res/layout/activity_login.xml    | 82 ++++++++++++-------
 .../res/layout/advanced_settings_dialog.xml   |  7 +-
 .../main/res/layout/client_name_dialog.xml    | 17 ++++
 app/src/main/res/values/strings.xml           |  2 +-
 6 files changed, 91 insertions(+), 50 deletions(-)
 create mode 100644 app/src/main/res/layout/client_name_dialog.xml

diff --git a/app/src/main/kotlin/com/github/gotify/login/AdvancedDialog.kt b/app/src/main/kotlin/com/github/gotify/login/AdvancedDialog.kt
index 6a1910d..8c4809f 100644
--- a/app/src/main/kotlin/com/github/gotify/login/AdvancedDialog.kt
+++ b/app/src/main/kotlin/com/github/gotify/login/AdvancedDialog.kt
@@ -1,11 +1,11 @@
 package com.github.gotify.login
 
-import android.app.AlertDialog
 import android.content.Context
 import android.view.LayoutInflater
 import android.widget.CompoundButton
 import com.github.gotify.R
 import com.github.gotify.databinding.AdvancedSettingsDialogBinding
+import com.google.android.material.dialog.MaterialAlertDialogBuilder
 
 internal class AdvancedDialog(
     private val context: Context,
@@ -42,7 +42,7 @@ internal class AdvancedDialog(
         } else {
             showRemoveCACertificate(selectedCertificate)
         }
-        AlertDialog.Builder(context)
+        MaterialAlertDialogBuilder(context)
             .setView(binding.root)
             .setTitle(R.string.advanced_settings)
             .setPositiveButton(context.getString(R.string.done), null)
diff --git a/app/src/main/kotlin/com/github/gotify/login/LoginActivity.kt b/app/src/main/kotlin/com/github/gotify/login/LoginActivity.kt
index ed84f7b..f46dd42 100644
--- a/app/src/main/kotlin/com/github/gotify/login/LoginActivity.kt
+++ b/app/src/main/kotlin/com/github/gotify/login/LoginActivity.kt
@@ -8,10 +8,7 @@ import android.os.Bundle
 import android.text.Editable
 import android.text.TextWatcher
 import android.view.View
-import android.widget.EditText
-import androidx.appcompat.app.AlertDialog
 import androidx.appcompat.app.AppCompatActivity
-import androidx.appcompat.view.ContextThemeWrapper
 import com.github.gotify.R
 import com.github.gotify.SSLSettings
 import com.github.gotify.Settings
@@ -27,10 +24,13 @@ import com.github.gotify.client.api.UserApi
 import com.github.gotify.client.model.Client
 import com.github.gotify.client.model.VersionInfo
 import com.github.gotify.databinding.ActivityLoginBinding
+import com.github.gotify.databinding.ClientNameDialogBinding
 import com.github.gotify.init.InitializationActivity
 import com.github.gotify.log.Log
 import com.github.gotify.log.LogsActivity
 import com.github.gotify.log.UncaughtExceptionHandler
+import com.google.android.material.dialog.MaterialAlertDialogBuilder
+import com.google.android.material.textfield.TextInputEditText
 import okhttp3.HttpUrl
 import java.security.cert.X509Certificate
 
@@ -59,7 +59,7 @@ internal class LoginActivity : AppCompatActivity() {
     override fun onPostCreate(savedInstanceState: Bundle?) {
         super.onPostCreate(savedInstanceState)
 
-        binding.gotifyUrl.addTextChangedListener(object : TextWatcher {
+        binding.gotifyUrlEditext.addTextChangedListener(object : TextWatcher {
             override fun beforeTextChanged(charSequence: CharSequence, i: Int, i1: Int, i2: Int) {}
 
             override fun onTextChanged(charSequence: CharSequence, i: Int, i1: Int, i2: Int) {
@@ -83,7 +83,7 @@ internal class LoginActivity : AppCompatActivity() {
     }
 
     private fun doCheckUrl() {
-        val url = binding.gotifyUrl.text.toString().trim().trimEnd('/')
+        val url = binding.gotifyUrlEditext.text.toString().trim().trimEnd('/')
         val parsedUrl = HttpUrl.parse(url)
         if (parsedUrl == null) {
             Utils.showSnackBar(this, "Invalid URL (include http:// or https://)")
@@ -110,7 +110,7 @@ internal class LoginActivity : AppCompatActivity() {
     }
 
     private fun showHttpWarning() {
-        AlertDialog.Builder(ContextThemeWrapper(this, R.style.AppTheme_Dialog))
+        MaterialAlertDialogBuilder(this)
             .setTitle(R.string.warning)
             .setCancelable(true)
             .setMessage(R.string.http_warning)
@@ -213,8 +213,8 @@ internal class LoginActivity : AppCompatActivity() {
     }
 
     private fun doLogin() {
-        val username = binding.username.text.toString()
-        val password = binding.password.text.toString()
+        val username = binding.usernameEditext.text.toString()
+        val password = binding.passwordEditext.text.toString()
 
         binding.login.visibility = View.GONE
         binding.loginProgress.visibility = View.VISIBLE
@@ -238,21 +238,22 @@ internal class LoginActivity : AppCompatActivity() {
     }
 
     private fun newClientDialog(client: ApiClient) {
-        val clientName = EditText(this)
-        clientName.setText(Build.MODEL)
+        val clientDialogBinding = ClientNameDialogBinding.inflate(layoutInflater)
+        val clientDialogEditext = clientDialogBinding.clientNameEditext
+        clientDialogEditext.setText(Build.MODEL)
 
-        AlertDialog.Builder(ContextThemeWrapper(this, R.style.AppTheme_Dialog))
+        MaterialAlertDialogBuilder(this)
             .setTitle(R.string.create_client_title)
             .setMessage(R.string.create_client_message)
-            .setView(clientName)
-            .setPositiveButton(R.string.create, doCreateClient(client, clientName))
+            .setView(clientDialogBinding.root)
+            .setPositiveButton(R.string.create, doCreateClient(client, clientDialogEditext))
             .setNegativeButton(R.string.cancel) { _, _ -> onCancelClientDialog() }
             .show()
     }
 
     private fun doCreateClient(
         client: ApiClient,
-        nameProvider: EditText
+        nameProvider: TextInputEditText
     ): DialogInterface.OnClickListener {
         return DialogInterface.OnClickListener { _, _ ->
             val newClient = Client().name(nameProvider.text.toString())
diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml
index 1ce90e8..8c23990 100644
--- a/app/src/main/res/layout/activity_login.xml
+++ b/app/src/main/res/layout/activity_login.xml
@@ -13,19 +13,18 @@
         tools:context=".login.LoginActivity"
         tools:layout_editor_absoluteY="25dp">
 
-        <Button
+        <com.google.android.material.button.MaterialButton
             android:id="@+id/open_logs"
-            android:layout_width="70dp"
+            android:layout_width="wrap_content"
             android:layout_height="40dp"
             android:insetTop="0dp"
-            style="@style/Widget.AppCompat.Button.Borderless.Colored"
+            style="@style/Widget.Material3.Button.TextButton"
             android:text="@string/logs"
-            app:backgroundTint="#00FFFFFF"
             android:textColor="@color/colorNavPrimary"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent" />
 
-        <ProgressBar
+        <com.google.android.material.progressindicator.CircularProgressIndicator
             android:id="@+id/checkurl_progress"
             android:layout_width="49dp"
             android:layout_height="wrap_content"
@@ -34,19 +33,21 @@
             android:layout_weight="1"
             android:minWidth="40dp"
             android:minHeight="40dp"
+            android:indeterminateOnly="true"
             android:visibility="gone"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintHorizontal_bias="0.501"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="@+id/checkurl" />
 
-        <ProgressBar
+        <com.google.android.material.progressindicator.CircularProgressIndicator
             android:id="@+id/login_progress"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_weight="1"
             android:minWidth="40dp"
             android:minHeight="40dp"
+            android:indeterminateOnly="true"
             android:visibility="gone"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
@@ -68,65 +69,86 @@
             app:srcCompat="@drawable/gotify"
             android:contentDescription="@string/gotify_logo" />
 
-        <EditText
+        <com.google.android.material.textfield.TextInputLayout
             android:id="@+id/gotify_url"
             android:layout_width="0dp"
-            android:layout_height="42dp"
+            android:layout_height="wrap_content"
             android:layout_alignParentTop="true"
             android:layout_centerHorizontal="true"
-            android:layout_marginTop="8dp"
+            android:layout_marginTop="16dp"
             android:ems="10"
-            android:hint="@string/gotify_url"
-            android:inputType="textUri"
-            android:singleLine="true"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@+id/gotify_logo_image"
             app:layout_constraintWidth_max="280dp"
-            tools:text="Gotify URL" />
+            tools:text="Gotify URL">
 
-        <EditText
+            <com.google.android.material.textfield.TextInputEditText
+                android:id="@+id/gotify_url_editext"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:singleLine="true"
+                android:inputType="textUri"
+                android:hint="@string/gotify_url" />
+
+        </com.google.android.material.textfield.TextInputLayout>
+
+        <com.google.android.material.textfield.TextInputLayout
             android:id="@+id/username"
             android:layout_width="0dp"
-            android:layout_height="47dp"
+            android:layout_height="wrap_content"
             android:layout_marginStart="8dp"
             android:layout_marginTop="8dp"
             android:layout_marginEnd="8dp"
             android:ems="10"
-            android:hint="@string/username"
-            android:inputType="textPersonName"
             android:visibility="gone"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@+id/checkurl"
-            app:layout_constraintWidth_max="280dp"
-            tools:text="Username"/>
+            app:layout_constraintWidth_max="280dp">
 
-        <EditText
+            <com.google.android.material.textfield.TextInputEditText
+                android:id="@+id/username_editext"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:singleLine="true"
+                android:inputType="textPersonName"
+                android:hint="@string/username" />
+
+        </com.google.android.material.textfield.TextInputLayout>
+
+        <com.google.android.material.textfield.TextInputLayout
             android:id="@+id/password"
             android:layout_width="0dp"
-            android:layout_height="50dp"
+            android:layout_height="wrap_content"
             android:layout_marginStart="8dp"
             android:layout_marginTop="8dp"
             android:layout_marginEnd="8dp"
             android:ems="10"
-            android:hint="@string/password"
-            android:inputType="textPassword"
             android:visibility="gone"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@+id/username"
-            app:layout_constraintWidth_max="280dp"
-            tools:text="Password" />
+            app:layout_constraintWidth_max="280dp">
 
-        <Button
+            <com.google.android.material.textfield.TextInputEditText
+                android:id="@+id/password_editext"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:singleLine="true"
+                android:inputType="textPassword"
+                android:hint="@string/password" />
+
+        </com.google.android.material.textfield.TextInputLayout>
+
+        <com.google.android.material.button.MaterialButton
             android:id="@+id/login"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_marginStart="8dp"
             android:layout_marginTop="8dp"
             android:layout_marginEnd="8dp"
-            android:background="@color/colorPrimaryDark"
+            android:backgroundTint="@color/colorPrimaryDark"
             android:textColor="@android:color/white"
             android:text="@string/login"
             android:visibility="gone"
@@ -135,13 +157,13 @@
             app:layout_constraintTop_toBottomOf="@+id/password"
             app:layout_constraintWidth_max="280dp" />
 
-        <Button
+        <com.google.android.material.button.MaterialButton
             android:id="@+id/checkurl"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_marginTop="8dp"
             android:layout_marginEnd="8dp"
-            android:background="@color/colorPrimaryDark"
+            android:backgroundTint="@color/colorPrimaryDark"
             android:text="@string/check_url"
             android:textColor="@android:color/white"
             android:visibility="visible"
@@ -152,7 +174,7 @@
 
         <ImageButton
             android:id="@+id/advanced_settings"
-            style="@style/Widget.AppCompat.Button.Borderless"
+            style="@style/Widget.Material3.Button.TextButton"
             android:layout_width="50dp"
             android:layout_height="wrap_content"
             android:text="@string/check_url"
diff --git a/app/src/main/res/layout/advanced_settings_dialog.xml b/app/src/main/res/layout/advanced_settings_dialog.xml
index bf569ff..e9a7d65 100644
--- a/app/src/main/res/layout/advanced_settings_dialog.xml
+++ b/app/src/main/res/layout/advanced_settings_dialog.xml
@@ -4,19 +4,20 @@
     android:layout_height="match_parent"
     android:padding="20dp">
 
-    <CheckBox
+    <com.google.android.material.checkbox.MaterialCheckBox
         android:id="@+id/disableSSL"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:text="@string/disabled_validate_ssl" />
 
-    <Button
+    <com.google.android.material.button.MaterialButton
         android:id="@+id/toggle_ca_cert"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:textColor="@android:color/white"
         android:text="@string/select_ca_certificate" />
 
-    <TextView
+    <com.google.android.material.textview.MaterialTextView
         android:id="@+id/seleceted_ca_cert"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/client_name_dialog.xml b/app/src/main/res/layout/client_name_dialog.xml
new file mode 100644
index 0000000..0b28d3a
--- /dev/null
+++ b/app/src/main/res/layout/client_name_dialog.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<com.google.android.material.textfield.TextInputLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/client_name"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:paddingEnd="24dp"
+    android:paddingStart="24dp">
+
+    <com.google.android.material.textfield.TextInputEditText
+        android:id="@+id/client_name_editext"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:inputType="textCapWords"
+        android:singleLine="true" />
+
+</com.google.android.material.textfield.TextInputLayout>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 5c097c8..22e40cc 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -35,7 +35,7 @@
     <string name="logs">Logs</string>
     <string name="message_image_desc">The image of a message</string>
     <string name="delete_message">Delete message</string>
-    <string name="gotify_url">https://push.example.com</string>
+    <string name="gotify_url">Gotify URL</string>
     <string name="username">Username</string>
     <string name="password">Password</string>
     <string name="disabled_validate_ssl">Disable SSL Validation</string>

From a91146145f2765875ec7b169f73990e8585a1363 Mon Sep 17 00:00:00 2001
From: Niko Diamadis <niko@cyb3rko.de>
Date: Fri, 3 Feb 2023 12:07:25 +0100
Subject: [PATCH 03/12] Update Share design

---
 app/src/main/res/layout/activity_share.xml | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/app/src/main/res/layout/activity_share.xml b/app/src/main/res/layout/activity_share.xml
index 1ec1138..b581e95 100644
--- a/app/src/main/res/layout/activity_share.xml
+++ b/app/src/main/res/layout/activity_share.xml
@@ -22,7 +22,7 @@
             android:layout_height="wrap_content"
             android:layout_margin="20dp">
 
-            <EditText
+            <com.google.android.material.textfield.TextInputEditText
                 android:id="@+id/title"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
@@ -74,7 +74,7 @@
             android:layout_marginHorizontal="20dp"
             android:layout_marginBottom="20dp">
 
-            <TextView
+            <com.google.android.material.textview.MaterialTextView
                 android:id="@+id/txtAppListDesc"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
@@ -112,7 +112,7 @@
                 android:layout_height="match_parent"
                 android:layout_weight="0" />
 
-            <TextView
+            <com.google.android.material.textview.MaterialTextView
                 android:id="@+id/missingAppsText"
                 android:layout_width="wrap_content"
                 android:layout_height="match_parent"
@@ -122,13 +122,14 @@
                 android:visibility="visible" />
         </LinearLayout>
 
-        <Button
+        <com.google.android.material.button.MaterialButton
             android:id="@+id/push_button"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_gravity="center_vertical|center_horizontal"
             android:layout_marginHorizontal="20dp"
             android:layout_marginBottom="20dp"
+            android:textColor="@android:color/white"
             android:text="@string/push_button" />
 
     </LinearLayout>

From 863034f9ce94da4fd3f77b5feed3162fce5aeb72 Mon Sep 17 00:00:00 2001
From: Niko Diamadis <niko@cyb3rko.de>
Date: Fri, 3 Feb 2023 12:08:15 +0100
Subject: [PATCH 04/12] Update Logs design

---
 app/src/main/res/layout/activity_logs.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/res/layout/activity_logs.xml b/app/src/main/res/layout/activity_logs.xml
index a7038ef..f5e9f48 100644
--- a/app/src/main/res/layout/activity_logs.xml
+++ b/app/src/main/res/layout/activity_logs.xml
@@ -17,7 +17,7 @@
             android:layout_height="match_parent"
             app:layout_behavior="@string/appbar_scrolling_view_behavior">
 
-            <TextView
+            <com.google.android.material.textview.MaterialTextView
                 android:id="@+id/log_content"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"

From 6a819f87da4058ece5dc266c60a34b20c854dc69 Mon Sep 17 00:00:00 2001
From: Niko Diamadis <niko@cyb3rko.de>
Date: Fri, 3 Feb 2023 16:26:59 +0100
Subject: [PATCH 05/12] Update Settings design

---
 .../gotify/settings/SettingsActivity.kt       | 67 ++++++++++++++++++-
 1 file changed, 65 insertions(+), 2 deletions(-)

diff --git a/app/src/main/kotlin/com/github/gotify/settings/SettingsActivity.kt b/app/src/main/kotlin/com/github/gotify/settings/SettingsActivity.kt
index fa88d2b..bb4a825 100644
--- a/app/src/main/kotlin/com/github/gotify/settings/SettingsActivity.kt
+++ b/app/src/main/kotlin/com/github/gotify/settings/SettingsActivity.kt
@@ -1,6 +1,7 @@
 package com.github.gotify.settings
 
-import android.app.AlertDialog
+import android.app.Dialog
+import android.content.DialogInterface
 import android.content.Intent
 import android.content.SharedPreferences
 import android.content.SharedPreferences.OnSharedPreferenceChangeListener
@@ -9,11 +10,13 @@ import android.view.MenuItem
 import android.view.View
 import androidx.appcompat.app.AppCompatActivity
 import androidx.preference.ListPreference
+import androidx.preference.ListPreferenceDialogFragmentCompat
 import androidx.preference.Preference
 import androidx.preference.PreferenceFragmentCompat
 import androidx.preference.PreferenceManager
 import com.github.gotify.R
 import com.github.gotify.databinding.SettingsActivityBinding
+import com.google.android.material.dialog.MaterialAlertDialogBuilder
 
 internal class SettingsActivity : AppCompatActivity(), OnSharedPreferenceChangeListener {
     private lateinit var binding: SettingsActivityBinding
@@ -64,7 +67,7 @@ internal class SettingsActivity : AppCompatActivity(), OnSharedPreferenceChangeL
                 findPreference(getString(R.string.setting_key_message_layout))
             messageLayout?.onPreferenceChangeListener =
                 Preference.OnPreferenceChangeListener { _, _ ->
-                    AlertDialog.Builder(context)
+                    MaterialAlertDialogBuilder(requireContext())
                         .setTitle(R.string.setting_message_layout_dialog_title)
                         .setMessage(R.string.setting_message_layout_dialog_message)
                         .setPositiveButton(
@@ -81,6 +84,24 @@ internal class SettingsActivity : AppCompatActivity(), OnSharedPreferenceChangeL
                 }
         }
 
+        override fun onDisplayPreferenceDialog(preference: Preference) {
+            if (preference is ListPreference) {
+                showListPreferenceDialog(preference)
+            } else {
+                super.onDisplayPreferenceDialog(preference)
+            }
+        }
+
+        private fun showListPreferenceDialog(preference: ListPreference) {
+            val dialogFragment = MaterialListPreference()
+            dialogFragment.arguments = Bundle(1).apply { putString("key", preference.key) }
+            dialogFragment.setTargetFragment(this, 0)
+            dialogFragment.show(
+                parentFragmentManager,
+                "androidx.preference.PreferenceFragment.DIALOG"
+            )
+        }
+
         private fun restartApp() {
             val packageManager = requireContext().packageManager
             val packageName = requireContext().packageName
@@ -91,4 +112,46 @@ internal class SettingsActivity : AppCompatActivity(), OnSharedPreferenceChangeL
             Runtime.getRuntime().exit(0)
         }
     }
+
+    class MaterialListPreference : ListPreferenceDialogFragmentCompat() {
+        private var mWhichButtonClicked = 0
+
+        override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
+            mWhichButtonClicked = DialogInterface.BUTTON_NEGATIVE
+            val builder = MaterialAlertDialogBuilder(requireActivity())
+                .setTitle(preference.dialogTitle)
+                .setPositiveButton(preference.positiveButtonText, this)
+                .setNegativeButton(preference.negativeButtonText, this)
+
+            val contentView = context?.let { onCreateDialogView(it) }
+            if (contentView != null) {
+                onBindDialogView(contentView)
+                builder.setView(contentView)
+            } else {
+                builder.setMessage(preference.dialogMessage)
+            }
+            onPrepareDialogBuilder(builder)
+            return builder.create()
+        }
+
+        override fun onClick(dialog: DialogInterface, which: Int) {
+            mWhichButtonClicked = which
+        }
+
+        override fun onDismiss(dialog: DialogInterface) {
+            onDialogClosedWasCalledFromOnDismiss = true
+            super.onDismiss(dialog)
+        }
+
+        private var onDialogClosedWasCalledFromOnDismiss = false
+
+        override fun onDialogClosed(positiveResult: Boolean) {
+            if (onDialogClosedWasCalledFromOnDismiss) {
+                onDialogClosedWasCalledFromOnDismiss = false
+                super.onDialogClosed(mWhichButtonClicked == DialogInterface.BUTTON_POSITIVE)
+            } else {
+                super.onDialogClosed(positiveResult)
+            }
+        }
+    }
 }

From d6196bd06bb25ee8c106ba37a3040574d8ebc15c Mon Sep 17 00:00:00 2001
From: Niko Diamadis <niko@cyb3rko.de>
Date: Fri, 3 Feb 2023 16:35:58 +0100
Subject: [PATCH 06/12] Update Splashscreen dialog design

---
 .../com/github/gotify/init/InitializationActivity.kt      | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/src/main/kotlin/com/github/gotify/init/InitializationActivity.kt b/app/src/main/kotlin/com/github/gotify/init/InitializationActivity.kt
index ac88631..49e6d1f 100644
--- a/app/src/main/kotlin/com/github/gotify/init/InitializationActivity.kt
+++ b/app/src/main/kotlin/com/github/gotify/init/InitializationActivity.kt
@@ -5,7 +5,6 @@ import android.app.NotificationManager
 import android.content.Intent
 import android.os.Build
 import android.os.Bundle
-import androidx.appcompat.app.AlertDialog
 import androidx.appcompat.app.AppCompatActivity
 import androidx.core.splashscreen.SplashScreen.Companion.installSplashScreen
 import androidx.preference.PreferenceManager
@@ -24,6 +23,7 @@ import com.github.gotify.login.LoginActivity
 import com.github.gotify.messages.MessagesActivity
 import com.github.gotify.service.WebSocketService
 import com.github.gotify.settings.ThemeHelper
+import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import com.livinglifetechway.quickpermissionskotlin.runWithPermissions
 import com.livinglifetechway.quickpermissionskotlin.util.QuickPermissionsOptions
 import com.livinglifetechway.quickpermissionskotlin.util.QuickPermissionsRequest
@@ -98,7 +98,7 @@ internal class InitializationActivity : AppCompatActivity() {
     }
 
     private fun dialog(message: String) {
-        AlertDialog.Builder(this)
+        MaterialAlertDialogBuilder(this)
             .setTitle(R.string.oops)
             .setMessage(message)
             .setPositiveButton(R.string.retry) { _, _ -> tryAuthenticate() }
@@ -176,7 +176,7 @@ internal class InitializationActivity : AppCompatActivity() {
     }
 
     private fun processPermissionRationale(req: QuickPermissionsRequest) {
-        AlertDialog.Builder(this)
+        MaterialAlertDialogBuilder(this)
             .setMessage(getString(R.string.permissions_denied_temp))
             .setPositiveButton(getString(R.string.permissions_dialog_grant)) { _, _ ->
                 req.proceed()
@@ -186,7 +186,7 @@ internal class InitializationActivity : AppCompatActivity() {
     }
 
     private fun processPermissionsPermanentDenied(req: QuickPermissionsRequest) {
-        AlertDialog.Builder(this)
+        MaterialAlertDialogBuilder(this)
             .setMessage(getString(R.string.permissions_denied_permanent))
             .setPositiveButton(getString(R.string.permissions_dialog_grant)) { _, _ ->
                 req.openAppSettings()

From 10ec551b2ca42f424bb036f6b27b309a478c6d7b Mon Sep 17 00:00:00 2001
From: Niko Diamadis <niko@cyb3rko.de>
Date: Fri, 3 Feb 2023 16:39:18 +0100
Subject: [PATCH 07/12] Update Messages design

---
 .../kotlin/com/github/gotify/messages/MessagesActivity.kt  | 5 ++---
 app/src/main/res/layout/activity_messages.xml              | 4 ++--
 app/src/main/res/layout/message_item.xml                   | 6 +++---
 app/src/main/res/layout/message_item_compact.xml           | 6 +++---
 app/src/main/res/layout/nav_header_drawer.xml              | 7 +++----
 5 files changed, 13 insertions(+), 15 deletions(-)

diff --git a/app/src/main/kotlin/com/github/gotify/messages/MessagesActivity.kt b/app/src/main/kotlin/com/github/gotify/messages/MessagesActivity.kt
index 78b13bf..c7b8fee 100644
--- a/app/src/main/kotlin/com/github/gotify/messages/MessagesActivity.kt
+++ b/app/src/main/kotlin/com/github/gotify/messages/MessagesActivity.kt
@@ -16,9 +16,7 @@ import android.view.View
 import android.widget.ImageButton
 import android.widget.TextView
 import androidx.appcompat.app.ActionBarDrawerToggle
-import androidx.appcompat.app.AlertDialog
 import androidx.appcompat.app.AppCompatActivity
-import androidx.appcompat.view.ContextThemeWrapper
 import androidx.core.content.ContextCompat
 import androidx.core.graphics.drawable.DrawableCompat
 import androidx.core.view.GravityCompat
@@ -53,6 +51,7 @@ import com.github.gotify.messages.provider.MessageWithImage
 import com.github.gotify.service.WebSocketService
 import com.github.gotify.settings.SettingsActivity
 import com.github.gotify.sharing.ShareActivity
+import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import com.google.android.material.navigation.NavigationView
 import com.google.android.material.snackbar.BaseTransientBottomBar.BaseCallback
 import com.google.android.material.snackbar.Snackbar
@@ -260,7 +259,7 @@ internal class MessagesActivity :
             startLoading()
             binding.appBarDrawer.toolbar.subtitle = ""
         } else if (id == R.id.logout) {
-            AlertDialog.Builder(ContextThemeWrapper(this, R.style.AppTheme_Dialog))
+            MaterialAlertDialogBuilder(this)
                 .setTitle(R.string.logout)
                 .setMessage(getString(R.string.logout_confirm))
                 .setPositiveButton(R.string.yes) { _, _ -> doLogout() }
diff --git a/app/src/main/res/layout/activity_messages.xml b/app/src/main/res/layout/activity_messages.xml
index 819d50d..955952c 100644
--- a/app/src/main/res/layout/activity_messages.xml
+++ b/app/src/main/res/layout/activity_messages.xml
@@ -45,7 +45,7 @@
                         android:scrollbars="none"
                         android:orientation="vertical">
 
-                        <TextView
+                        <com.google.android.material.textview.MaterialTextView
                             android:id="@+id/textView2"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
@@ -60,7 +60,7 @@
                             app:layout_constraintTop_toTopOf="parent"
                             app:layout_constraintVertical_bias="0.3" />
 
-                        <Button
+                        <com.google.android.material.button.MaterialButton
                             android:id="@+id/learn_gotify"
                             style="@style/Widget.AppCompat.Button.Colored"
                             android:layout_width="wrap_content"
diff --git a/app/src/main/res/layout/message_item.xml b/app/src/main/res/layout/message_item.xml
index ca51d26..7e64bad 100644
--- a/app/src/main/res/layout/message_item.xml
+++ b/app/src/main/res/layout/message_item.xml
@@ -8,7 +8,7 @@
     android:padding="10dp"
     android:background="?android:colorBackground">
 
-    <TextView
+    <com.google.android.material.textview.MaterialTextView
         android:id="@+id/message_date"
         android:layout_width="wrap_content"
         android:layout_height="20dp"
@@ -17,7 +17,7 @@
         app:layout_constraintEnd_toStartOf="@+id/message_delete"
         app:layout_constraintTop_toTopOf="parent" />
 
-    <TextView
+    <com.google.android.material.textview.MaterialTextView
         android:id="@+id/message_title"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
@@ -41,7 +41,7 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/message_title" />
 
-    <TextView
+    <com.google.android.material.textview.MaterialTextView
         android:id="@+id/message_text"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/message_item_compact.xml b/app/src/main/res/layout/message_item_compact.xml
index 7cd344d..448ad62 100644
--- a/app/src/main/res/layout/message_item_compact.xml
+++ b/app/src/main/res/layout/message_item_compact.xml
@@ -8,7 +8,7 @@
     android:padding="10dp"
     android:background="?android:colorBackground">
 
-    <TextView
+    <com.google.android.material.textview.MaterialTextView
         android:id="@+id/message_date"
         android:layout_width="wrap_content"
         android:layout_height="20dp"
@@ -17,7 +17,7 @@
         app:layout_constraintEnd_toStartOf="@+id/message_delete"
         app:layout_constraintTop_toTopOf="parent" />
 
-    <TextView
+    <com.google.android.material.textview.MaterialTextView
         android:id="@+id/message_title"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
@@ -42,7 +42,7 @@
         app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintBottom_toBottomOf="parent" />
 
-    <TextView
+    <com.google.android.material.textview.MaterialTextView
         android:id="@+id/message_text"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/nav_header_drawer.xml b/app/src/main/res/layout/nav_header_drawer.xml
index 3a80a4c..254d281 100644
--- a/app/src/main/res/layout/nav_header_drawer.xml
+++ b/app/src/main/res/layout/nav_header_drawer.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="@dimen/nav_header_height"
     android:layout_alignParentBottom="false"
@@ -26,7 +25,7 @@
         app:layout_constraintStart_toStartOf="parent"
         app:srcCompat="@drawable/gotify" />
 
-    <TextView
+    <com.google.android.material.textview.MaterialTextView
         android:id="@+id/header_user"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
@@ -36,7 +35,7 @@
         app:layout_constraintBottom_toTopOf="@+id/header_connection"
         app:layout_constraintStart_toStartOf="parent" />
 
-    <TextView
+    <com.google.android.material.textview.MaterialTextView
         android:id="@+id/header_connection"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
@@ -46,7 +45,7 @@
         app:layout_constraintBottom_toTopOf="@+id/header_version"
         app:layout_constraintStart_toStartOf="parent" />
 
-    <TextView
+    <com.google.android.material.textview.MaterialTextView
         android:id="@+id/header_version"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"

From f244d35d7f9b8688bdc6c2e067760c694605bd4c Mon Sep 17 00:00:00 2001
From: Niko Diamadis <niko@cyb3rko.de>
Date: Fri, 3 Feb 2023 16:40:47 +0100
Subject: [PATCH 08/12] Update app bar design

---
 app/src/main/res/layout/app_bar_drawer.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/res/layout/app_bar_drawer.xml b/app/src/main/res/layout/app_bar_drawer.xml
index c3e4de2..bc0fc67 100644
--- a/app/src/main/res/layout/app_bar_drawer.xml
+++ b/app/src/main/res/layout/app_bar_drawer.xml
@@ -8,7 +8,7 @@
     tools:context=".messages.MessagesActivity">
 
 
-        <androidx.appcompat.widget.Toolbar
+        <com.google.android.material.appbar.MaterialToolbar
             android:id="@+id/toolbar"
             android:layout_width="match_parent"
             android:layout_height="?attr/actionBarSize"

From 7580dbb280e79e7e0b435e1be42226d7e3b635c7 Mon Sep 17 00:00:00 2001
From: Niko Diamadis <niko@cyb3rko.de>
Date: Fri, 3 Feb 2023 16:41:03 +0100
Subject: [PATCH 09/12] Remove unused dialog style

---
 app/src/main/res/values/styles.xml | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index e1a3dbb..ac2ad10 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -25,8 +25,4 @@
 
     <style name="AppTheme.PopupOverlay" parent="AppTheme" />
 
-    <style name="AppTheme.Dialog" parent="AppTheme" >
-        <item name="colorPrimary">@color/colorNavPrimary</item>
-    </style>
-
 </resources>

From d539ef8a76942fa91066cab39574554906cb0e7b Mon Sep 17 00:00:00 2001
From: Niko Diamadis <niko@cyb3rko.de>
Date: Fri, 3 Feb 2023 20:51:43 +0100
Subject: [PATCH 10/12] Update missed components

---
 .../com/github/gotify/messages/MessagesActivity.kt   | 12 ++++++------
 app/src/main/res/layout/activity_messages.xml        |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/app/src/main/kotlin/com/github/gotify/messages/MessagesActivity.kt b/app/src/main/kotlin/com/github/gotify/messages/MessagesActivity.kt
index c7b8fee..5b5704c 100644
--- a/app/src/main/kotlin/com/github/gotify/messages/MessagesActivity.kt
+++ b/app/src/main/kotlin/com/github/gotify/messages/MessagesActivity.kt
@@ -522,12 +522,12 @@ internal class MessagesActivity :
             }
         }
         if (item.itemId == R.id.action_delete_app) {
-            val alert = android.app.AlertDialog.Builder(this)
-            alert.setTitle(R.string.delete_app)
-            alert.setMessage(R.string.ack)
-            alert.setPositiveButton(R.string.yes) { _, _ -> deleteApp(viewModel.appId) }
-            alert.setNegativeButton(R.string.no, null)
-            alert.show()
+            MaterialAlertDialogBuilder(this)
+                .setTitle(R.string.delete_app)
+                .setMessage(R.string.ack)
+                .setPositiveButton(R.string.yes) { _, _ -> deleteApp(viewModel.appId) }
+                .setNegativeButton(R.string.no, null)
+                .show()
         }
         return super.onContextItemSelected(item)
     }
diff --git a/app/src/main/res/layout/activity_messages.xml b/app/src/main/res/layout/activity_messages.xml
index 955952c..ef9d826 100644
--- a/app/src/main/res/layout/activity_messages.xml
+++ b/app/src/main/res/layout/activity_messages.xml
@@ -62,11 +62,11 @@
 
                         <com.google.android.material.button.MaterialButton
                             android:id="@+id/learn_gotify"
-                            style="@style/Widget.AppCompat.Button.Colored"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:layout_marginTop="32dp"
                             android:text="Learn how to send messages"
+                            android:textColor="@android:color/white"
                             app:layout_constraintEnd_toEndOf="parent"
                             app:layout_constraintStart_toStartOf="parent"
                             app:layout_constraintTop_toBottomOf="@+id/textView2" />

From bb9f66b8d3ae1abcc7b64b0ea6a0d58533ae06fc Mon Sep 17 00:00:00 2001
From: Niko Diamadis <niko@cyb3rko.de>
Date: Sat, 4 Feb 2023 10:16:51 +0100
Subject: [PATCH 11/12] Fix messages not being selectable

---
 .../com/github/gotify/messages/ListMessageAdapter.kt       | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/app/src/main/kotlin/com/github/gotify/messages/ListMessageAdapter.kt b/app/src/main/kotlin/com/github/gotify/messages/ListMessageAdapter.kt
index e36916d..15451ea 100644
--- a/app/src/main/kotlin/com/github/gotify/messages/ListMessageAdapter.kt
+++ b/app/src/main/kotlin/com/github/gotify/messages/ListMessageAdapter.kt
@@ -101,6 +101,13 @@ internal class ListMessageAdapter(
         return currentItem.message.id
     }
 
+    // Fix for message not being selectable (https://issuetracker.google.com/issues/37095917)
+    override fun onViewAttachedToWindow(holder: ViewHolder) {
+        super.onViewAttachedToWindow(holder)
+        holder.message.isEnabled = false
+        holder.message.isEnabled = true
+    }
+
     class ViewHolder(binding: ViewBinding) : RecyclerView.ViewHolder(binding.root) {
         lateinit var image: ImageView
         lateinit var message: TextView

From 5fa19e3b8818c3b7df6e2b1a5acdb7882db1aeab Mon Sep 17 00:00:00 2001
From: Niko Diamadis <niko@cyb3rko.de>
Date: Sat, 4 Feb 2023 10:57:22 +0100
Subject: [PATCH 12/12] Fix cancelable client name dialog

---
 app/src/main/kotlin/com/github/gotify/login/LoginActivity.kt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/src/main/kotlin/com/github/gotify/login/LoginActivity.kt b/app/src/main/kotlin/com/github/gotify/login/LoginActivity.kt
index f46dd42..ac31707 100644
--- a/app/src/main/kotlin/com/github/gotify/login/LoginActivity.kt
+++ b/app/src/main/kotlin/com/github/gotify/login/LoginActivity.kt
@@ -248,6 +248,7 @@ internal class LoginActivity : AppCompatActivity() {
             .setView(clientDialogBinding.root)
             .setPositiveButton(R.string.create, doCreateClient(client, clientDialogEditext))
             .setNegativeButton(R.string.cancel) { _, _ -> onCancelClientDialog() }
+            .setCancelable(false)
             .show()
     }