Merge pull request #699 from theimpulson/material3

Material3
seedvault-app · Jul 26, 2024 · a07ab64 · a07ab64
2 parents 12fb4d1 + 2f96393
commit a07ab64
Show file tree

Hide file tree

Showing 26 changed files with 164 additions and 82 deletions.
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -105,7 +105,6 @@
 
         <activity
             android:name=".ui.storage.StorageActivity"
-            android:theme="@style/AppTheme.NoActionBar"
             android:windowSoftInputMode="adjustResize" />
 
         <activity
@@ -115,15 +114,13 @@
 
         <activity
             android:name=".ui.recoverycode.RecoveryCodeActivity"
-            android:label="@string/recovery_code_title"
-            android:theme="@style/AppTheme.NoActionBar" />
+            android:label="@string/recovery_code_title" />
 
         <activity
             android:name=".restore.RestoreActivity"
             android:exported="true"
             android:label="@string/restore_title"
-            android:permission="com.stevesoltys.seedvault.RESTORE_BACKUP"
-            android:theme="@style/AppTheme.NoActionBar">
+            android:permission="com.stevesoltys.seedvault.RESTORE_BACKUP">
             <intent-filter>
                 <action android:name="com.stevesoltys.seedvault.RESTORE_BACKUP" />
                 <category android:name="android.intent.category.DEFAULT" />

diff --git a/app/src/main/java/com/stevesoltys/seedvault/App.kt b/app/src/main/java/com/stevesoltys/seedvault/App.kt
@@ -20,6 +20,7 @@ import android.os.UserManager
 import android.provider.Settings
 import androidx.work.ExistingPeriodicWorkPolicy.UPDATE
 import androidx.work.WorkManager
+import com.google.android.material.color.DynamicColors
 import com.stevesoltys.seedvault.crypto.cryptoModule
 import com.stevesoltys.seedvault.header.headerModule
 import com.stevesoltys.seedvault.metadata.MetadataManager
@@ -114,6 +115,7 @@ open class App : Application() {
 
     override fun onCreate() {
         super.onCreate()
+        DynamicColors.applyToActivitiesIfAvailable(this)
         startKoin()
         if (isDebugBuild()) {
             StrictMode.setThreadPolicy(

diff --git a/app/src/main/java/com/stevesoltys/seedvault/restore/RestoreProgressFragment.kt b/app/src/main/java/com/stevesoltys/seedvault/restore/RestoreProgressFragment.kt
@@ -14,12 +14,12 @@ import android.view.WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON
 import android.widget.Button
 import android.widget.ProgressBar
 import android.widget.TextView
-import androidx.appcompat.app.AlertDialog
 import androidx.core.content.ContextCompat.getColor
 import androidx.fragment.app.Fragment
 import androidx.lifecycle.lifecycleScope
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
+import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import com.stevesoltys.seedvault.R
 import com.stevesoltys.seedvault.ui.AppBackupState.FAILED_NOT_INSTALLED
 import org.koin.androidx.viewmodel.ext.android.sharedViewModel
@@ -99,7 +99,7 @@ class RestoreProgressFragment : Fragment() {
         // check if any restore failed, because the app is not installed
         val failed = viewModel.restoreProgress.value?.any { it.state == FAILED_NOT_INSTALLED }
         if (failed != true) return // nothing left to do if there's no failures due to not installed
-        AlertDialog.Builder(requireContext())
+        MaterialAlertDialogBuilder(requireContext())
             .setTitle(R.string.restore_restoring_error_title)
             .setMessage(R.string.restore_restoring_error_message)
             .setPositiveButton(android.R.string.ok) { dialog, _ ->

diff --git a/app/src/main/java/com/stevesoltys/seedvault/restore/install/InstallProgressFragment.kt b/app/src/main/java/com/stevesoltys/seedvault/restore/install/InstallProgressFragment.kt
@@ -19,11 +19,11 @@ import android.widget.TextView
 import android.widget.Toast
 import android.widget.Toast.LENGTH_LONG
 import androidx.activity.result.contract.ActivityResultContract
-import androidx.appcompat.app.AlertDialog
 import androidx.fragment.app.Fragment
 import androidx.lifecycle.lifecycleScope
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
+import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import com.stevesoltys.seedvault.R
 import com.stevesoltys.seedvault.restore.RestoreViewModel
 import org.koin.androidx.viewmodel.ext.android.sharedViewModel
@@ -96,7 +96,7 @@ class InstallProgressFragment : Fragment(), InstallItemListener {
         adapter.setFinished()
         button.isEnabled = true
         if (!hasShownFailDialog && installResult.hasFailed) {
-            AlertDialog.Builder(requireContext())
+            MaterialAlertDialogBuilder(requireContext())
                 .setIcon(R.drawable.ic_warning)
                 .setTitle(R.string.restore_installing_error_title)
                 .setMessage(R.string.restore_installing_error_message)

diff --git a/app/src/main/java/com/stevesoltys/seedvault/settings/SchedulingFragment.kt b/app/src/main/java/com/stevesoltys/seedvault/settings/SchedulingFragment.kt
@@ -8,6 +8,8 @@ package com.stevesoltys.seedvault.settings
 import android.content.SharedPreferences
 import android.os.Bundle
 import android.view.View
+import androidx.preference.ListPreference
+import androidx.preference.Preference
 import androidx.preference.PreferenceCategory
 import androidx.preference.PreferenceFragmentCompat
 import androidx.preference.PreferenceManager
@@ -16,6 +18,7 @@ import androidx.work.ExistingPeriodicWorkPolicy.UPDATE
 import com.stevesoltys.seedvault.R
 import com.stevesoltys.seedvault.permitDiskReads
 import com.stevesoltys.seedvault.plugins.StoragePluginManager
+import com.stevesoltys.seedvault.settings.preference.M3ListPreference
 import org.koin.android.ext.android.inject
 import org.koin.androidx.viewmodel.ext.android.sharedViewModel
 
@@ -42,6 +45,21 @@ class SchedulingFragment : PreferenceFragmentCompat(),
         }
     }
 
+    override fun onDisplayPreferenceDialog(preference: Preference?) {
+        when (preference) {
+            is ListPreference -> {
+                val dialogFragment = M3ListPreference.newInstance(preference.getKey())
+                dialogFragment.setTargetFragment(this, 0)
+                dialogFragment.show(
+                    parentFragmentManager,
+                    M3ListPreference.PREFERENCE_DIALOG_FRAGMENT_TAG
+                )
+            }
+
+            else -> super.onDisplayPreferenceDialog(preference)
+        }
+    }
+
     override fun onStart() {
         super.onStart()
 

diff --git a/app/src/main/java/com/stevesoltys/seedvault/settings/SettingsActivity.kt b/app/src/main/java/com/stevesoltys/seedvault/settings/SettingsActivity.kt
@@ -34,6 +34,7 @@ class SettingsActivity : RequireProvisioningActivity(), OnPreferenceStartFragmen
 
         setContentView(R.layout.activity_fragment_container)
 
+        setSupportActionBar(requireViewById(R.id.toolbar))
         supportActionBar!!.setDisplayHomeAsUpEnabled(true)
 
         // always start with settings fragment as a base (when fresh start)

diff --git a/app/src/main/java/com/stevesoltys/seedvault/settings/SettingsFragment.kt b/app/src/main/java/com/stevesoltys/seedvault/settings/SettingsFragment.kt
@@ -19,12 +19,12 @@ import android.view.MenuItem
 import android.view.View
 import android.widget.Toast
 import android.widget.Toast.LENGTH_LONG
-import androidx.appcompat.app.AlertDialog
 import androidx.preference.Preference
 import androidx.preference.Preference.OnPreferenceChangeListener
 import androidx.preference.PreferenceFragmentCompat
 import androidx.preference.TwoStatePreference
 import androidx.work.WorkInfo
+import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import com.stevesoltys.seedvault.R
 import com.stevesoltys.seedvault.permitDiskReads
 import com.stevesoltys.seedvault.plugins.StoragePluginManager
@@ -77,7 +77,7 @@ class SettingsFragment : PreferenceFragmentCompat() {
             when (enabled) {
                 true -> return@OnPreferenceChangeListener trySetBackupEnabled(true)
                 false -> {
-                    AlertDialog.Builder(requireContext())
+                    MaterialAlertDialogBuilder(requireContext())
                         .setIcon(R.drawable.ic_warning)
                         .setTitle(R.string.settings_backup_dialog_title)
                         .setMessage(R.string.settings_backup_dialog_message)
@@ -123,7 +123,7 @@ class SettingsFragment : PreferenceFragmentCompat() {
         apkBackup.onPreferenceChangeListener = OnPreferenceChangeListener { _, newValue ->
             val enable = newValue as Boolean
             if (enable) return@OnPreferenceChangeListener true
-            AlertDialog.Builder(requireContext())
+            MaterialAlertDialogBuilder(requireContext())
                 .setIcon(R.drawable.ic_warning)
                 .setTitle(R.string.settings_backup_apk_dialog_title)
                 .setMessage(R.string.settings_backup_apk_dialog_message)
@@ -313,7 +313,7 @@ class SettingsFragment : PreferenceFragmentCompat() {
     }
 
     private fun onEnablingStorageBackup() {
-        AlertDialog.Builder(requireContext())
+        MaterialAlertDialogBuilder(requireContext())
             .setIcon(R.drawable.ic_warning)
             .setTitle(R.string.settings_backup_storage_dialog_title)
             .setMessage(R.string.settings_backup_storage_dialog_message)
@@ -341,7 +341,7 @@ class SettingsFragment : PreferenceFragmentCompat() {
     }
 
     private fun showCodeRegenerationNeededDialog() {
-        AlertDialog.Builder(requireContext())
+        MaterialAlertDialogBuilder(requireContext())
             .setIcon(R.drawable.ic_vpn_key)
             .setTitle(R.string.settings_backup_new_code_dialog_title)
             .setMessage(R.string.settings_backup_new_code_dialog_message)

diff --git a/app/src/main/java/com/stevesoltys/seedvault/settings/preference/M3ListPreference.kt b/app/src/main/java/com/stevesoltys/seedvault/settings/preference/M3ListPreference.kt
@@ -0,0 +1,45 @@
+/*
+ * SPDX-FileCopyrightText: 2024 The Calyx Institute
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package com.stevesoltys.seedvault.settings.preference
+
+import android.app.Dialog
+import android.os.Bundle
+import androidx.preference.ListPreferenceDialogFragmentCompat
+import com.google.android.material.dialog.MaterialAlertDialogBuilder
+
+class M3ListPreference : ListPreferenceDialogFragmentCompat() {
+
+    companion object {
+        const val PREFERENCE_DIALOG_FRAGMENT_TAG = "androidx.preference.PreferenceFragment.DIALOG"
+
+        fun newInstance(key: String?): M3ListPreference {
+            val fragment = M3ListPreference()
+            val bundle = Bundle(1)
+            bundle.putString(ARG_KEY, key)
+            fragment.arguments = bundle
+            return fragment
+        }
+    }
+
+    override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
+        val builder = MaterialAlertDialogBuilder(requireContext())
+            .setTitle(preference.dialogTitle)
+            .setIcon(preference.dialogIcon)
+            .setPositiveButton(preference.positiveButtonText, this)
+            .setNegativeButton(preference.negativeButtonText, this)
+
+        val contentView = onCreateDialogView(requireContext())
+        if (contentView != null) {
+            onBindDialogView(contentView)
+            builder.setView(contentView)
+        } else {
+            builder.setMessage(preference.dialogMessage)
+        }
+
+        onPrepareDialogBuilder(builder)
+        return builder.create()
+    }
+}
diff --git a/app/src/main/java/com/stevesoltys/seedvault/ui/recoverycode/RecoveryCodeInputFragment.kt b/app/src/main/java/com/stevesoltys/seedvault/ui/recoverycode/RecoveryCodeInputFragment.kt
@@ -21,20 +21,20 @@ import android.view.View.VISIBLE
 import android.view.ViewGroup
 import android.view.WindowManager.LayoutParams.FLAG_SECURE
 import android.widget.ArrayAdapter
-import android.widget.AutoCompleteTextView
 import android.widget.Button
 import android.widget.TextView
 import android.widget.Toast
 import android.widget.Toast.LENGTH_LONG
 import androidx.activity.result.contract.ActivityResultContracts.StartActivityForResult
-import androidx.appcompat.app.AlertDialog
 import androidx.constraintlayout.widget.ConstraintLayout
 import androidx.core.content.ContextCompat.getMainExecutor
 import androidx.fragment.app.Fragment
 import cash.z.ecc.android.bip39.Mnemonics
 import cash.z.ecc.android.bip39.Mnemonics.ChecksumException
 import cash.z.ecc.android.bip39.Mnemonics.InvalidWordException
+import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import com.google.android.material.snackbar.Snackbar
+import com.google.android.material.textfield.MaterialAutoCompleteTextView
 import com.google.android.material.textfield.TextInputLayout
 import com.stevesoltys.seedvault.R
 import com.stevesoltys.seedvault.isDebugBuild
@@ -118,7 +118,7 @@ class RecoveryCodeInputFragment : Fragment() {
 
         for (i in 0 until WORD_NUM) {
             val wordLayout = getWordLayout(i)
-            val editText = wordLayout.editText as AutoCompleteTextView
+            val editText = wordLayout.editText as MaterialAutoCompleteTextView
             editText.onFocusChangeListener = OnFocusChangeListener { _, focus ->
                 if (!focus) wordLayout.isErrorEnabled = false
             }
@@ -207,7 +207,7 @@ class RecoveryCodeInputFragment : Fragment() {
     }
 
     private fun onExistingCodeChecked(verified: Boolean) {
-        AlertDialog.Builder(requireContext()).apply {
+        MaterialAlertDialogBuilder(requireContext()).apply {
             if (verified) {
                 setTitle(R.string.recovery_code_verification_ok_title)
                 setMessage(R.string.recovery_code_verification_ok_message)
@@ -237,7 +237,7 @@ class RecoveryCodeInputFragment : Fragment() {
     }
 
     private fun generateNewCode() {
-        AlertDialog.Builder(requireContext())
+        MaterialAlertDialogBuilder(requireContext())
             .setIcon(R.drawable.ic_warning)
             .setTitle(R.string.recovery_code_verification_new_dialog_title)
             .setMessage(R.string.recovery_code_verification_new_dialog_message)

diff --git a/app/src/main/java/com/stevesoltys/seedvault/ui/storage/StorageActivity.kt b/app/src/main/java/com/stevesoltys/seedvault/ui/storage/StorageActivity.kt
@@ -16,7 +16,7 @@ import android.net.Uri
 import android.os.Bundle
 import androidx.activity.result.contract.ActivityResultContracts.OpenDocumentTree
 import androidx.annotation.CallSuper
-import androidx.appcompat.app.AlertDialog
+import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import com.stevesoltys.seedvault.R
 import com.stevesoltys.seedvault.plugins.saf.StorageRootResolver
 import com.stevesoltys.seedvault.ui.BackupActivity
@@ -89,7 +89,7 @@ class StorageActivity : BackupActivity() {
 
     private fun onInvalidLocation(errorMsg: String) {
         if (viewModel.isRestoreOperation) {
-            val dialog = AlertDialog.Builder(this)
+            val dialog = MaterialAlertDialogBuilder(this)
                 .setTitle(getString(R.string.restore_invalid_location_title))
                 .setMessage(errorMsg)
                 .setPositiveButton(android.R.string.ok) { dialog, _ -> dialog.dismiss() }

diff --git a/app/src/main/java/com/stevesoltys/seedvault/ui/storage/StorageOptionAdapter.kt b/app/src/main/java/com/stevesoltys/seedvault/ui/storage/StorageOptionAdapter.kt
@@ -15,9 +15,9 @@ import android.view.View.VISIBLE
 import android.view.ViewGroup
 import android.widget.ImageView
 import android.widget.TextView
-import androidx.appcompat.app.AlertDialog
 import androidx.recyclerview.widget.RecyclerView.Adapter
 import androidx.recyclerview.widget.RecyclerView.ViewHolder
+import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import com.stevesoltys.seedvault.R
 import com.stevesoltys.seedvault.ui.storage.StorageOption.SafOption
 import com.stevesoltys.seedvault.ui.storage.StorageOptionAdapter.StorageOptionViewHolder
@@ -91,7 +91,7 @@ internal class StorageOptionAdapter(
     }
 
     private fun showWarningDialog(context: Context, item: StorageOption) {
-        AlertDialog.Builder(context)
+        MaterialAlertDialogBuilder(context)
             .setTitle(R.string.storage_internal_warning_title)
             .setMessage(R.string.storage_internal_warning_message)
             .setPositiveButton(R.string.storage_internal_warning_choose_other) { dialog, _ ->

diff --git a/app/src/main/res/drawable/ic_app_settings.xml b/app/src/main/res/drawable/ic_app_settings.xml
@@ -1,7 +1,7 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
-    android:tint="?attr/colorControlNormal"
+    android:tint="@color/accent_primary"
     android:viewportWidth="24"
     android:viewportHeight="24">
 

diff --git a/app/src/main/res/drawable/ic_call.xml b/app/src/main/res/drawable/ic_call.xml
@@ -6,7 +6,7 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
-    android:tint="?attr/colorControlNormal"
+    android:tint="@color/accent_primary"
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path

diff --git a/app/src/main/res/drawable/ic_contacts.xml b/app/src/main/res/drawable/ic_contacts.xml
@@ -6,7 +6,7 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
-    android:tint="?attr/colorControlNormal"
+    android:tint="@color/accent_primary"
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path

diff --git a/app/src/main/res/drawable/ic_message.xml b/app/src/main/res/drawable/ic_message.xml
@@ -6,7 +6,7 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
-    android:tint="?attr/colorControlNormal"
+    android:tint="@color/accent_primary"
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path

diff --git a/app/src/main/res/drawable/ic_settings.xml b/app/src/main/res/drawable/ic_settings.xml
@@ -6,7 +6,7 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
-    android:tint="?attr/colorControlNormal"
+    android:tint="@color/accent_primary"
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path

diff --git a/app/src/main/res/layout/activity_fragment_container.xml b/app/src/main/res/layout/activity_fragment_container.xml
@@ -3,7 +3,21 @@
   SPDX-FileCopyrightText: 2020 The Calyx Institute
   SPDX-License-Identifier: Apache-2.0
   -->
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/fragment"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="match_parent" />
+    android:layout_height="match_parent"
+    android:orientation="vertical">
+
+    <androidx.appcompat.widget.Toolbar
+        android:id="@+id/toolbar"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:minHeight="?attr/actionBarSize"
+        android:theme="?attr/actionBarTheme" />
+
+    <FrameLayout
+        android:id="@+id/fragment"
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:layout_weight="1" />
+</LinearLayout>
diff --git a/app/src/main/res/layout/fragment_restore_app_selection.xml b/app/src/main/res/layout/fragment_restore_app_selection.xml
@@ -16,7 +16,8 @@
 
             <androidx.constraintlayout.widget.ConstraintLayout
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content">
+                android:layout_height="wrap_content"
+                android:background="@color/background">
 
                 <ImageView
                     android:id="@+id/imageView"