Material 3

app/build.gradle

@@ -139,7 +139,6 @@ dependencies {
     implementation "androidx.camera:camera-camera2:$cameraxVersion"
     implementation "androidx.camera:camera-lifecycle:$cameraxVersion"
     implementation "androidx.camera:camera-view:$cameraxVersion"
-    implementation 'androidx.cardview:cardview:1.0.0'
     implementation "androidx.core:core:1.12.0"
     implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
     implementation 'androidx.documentfile:documentfile:1.0.1'
@@ -159,7 +158,7 @@ dependencies {
     implementation "com.github.topjohnwu.libsu:core:${libsuVersion}"
     implementation "com.github.topjohnwu.libsu:io:${libsuVersion}"
     implementation "com.google.guava:guava:${guavaVersion}-android"
-    implementation 'com.google.android.material:material:1.10.0'
+    implementation 'com.google.android.material:material:1.11.0-rc01'
     implementation 'com.google.protobuf:protobuf-javalite:3.25.0'
     implementation 'com.google.zxing:core:3.5.2'
     implementation "com.mikepenz:iconics-core:3.2.5"

app/src/main/AndroidManifest.xml

@@ -27,8 +27,6 @@
         android:icon="@mipmap/${iconName}"
         android:label="Aegis"
         android:supportsRtl="true"
-        android:theme="@style/Theme.Aegis.Launch"
-        tools:replace="android:theme"
         tools:targetApi="tiramisu">
         <activity android:name=".ui.TransferEntriesActivity"
             android:label="@string/title_activity_transfer" />

app/src/main/java/com/beemdevelopment/aegis/AegisApplicationBase.java

@@ -22,6 +22,8 @@
 import com.beemdevelopment.aegis.ui.MainActivity;
 import com.beemdevelopment.aegis.util.IOUtils;
 import com.beemdevelopment.aegis.vault.VaultManager;
+import com.google.android.material.color.DynamicColors;
+import com.google.android.material.color.DynamicColorsOptions;
 import com.mikepenz.iconics.Iconics;
 import com.mikepenz.material_design_iconic_typeface_library.MaterialDesignIconic;
 import com.topjohnwu.superuser.Shell;

app/src/main/java/com/beemdevelopment/aegis/ThemeMap.java

@@ -9,7 +9,7 @@ private ThemeMap() {
 
     }
 
-    public static final Map<Theme, Integer> DEFAULT = ImmutableMap.of(
+    /*public static final Map<Theme, Integer> DEFAULT = ImmutableMap.of(
             Theme.LIGHT, R.style.Theme_Aegis_Light_Default,
             Theme.DARK, R.style.Theme_Aegis_Dark_Default,
             Theme.AMOLED, R.style.Theme_Aegis_TrueDark_Default
@@ -25,5 +25,5 @@ private ThemeMap() {
             Theme.LIGHT, R.style.Theme_Aegis_Light_Fullscreen,
             Theme.DARK, R.style.Theme_Aegis_Dark_Fullscreen,
             Theme.AMOLED, R.style.Theme_Aegis_TrueDark_Fullscreen
-    );
+    );*/
 }

app/src/main/java/com/beemdevelopment/aegis/importers/AndOtpImporter.java

@@ -21,6 +21,7 @@
 import com.beemdevelopment.aegis.ui.tasks.PBKDFTask;
 import com.beemdevelopment.aegis.util.IOUtils;
 import com.beemdevelopment.aegis.vault.VaultEntry;
+import com.google.android.material.dialog.MaterialAlertDialogBuilder;
 import com.topjohnwu.superuser.io.SuFile;
 
 import org.json.JSONArray;
@@ -182,7 +183,7 @@ public void decrypt(Context context, DecryptListener listener) {
                     context.getResources().getString(R.string.andotp_old_format)
             };
 
-            Dialogs.showSecureDialog(new AlertDialog.Builder(context)
+            Dialogs.showSecureDialog(new MaterialAlertDialogBuilder(context)
                     .setTitle(R.string.choose_andotp_importer)
                     .setSingleChoiceItems(choices, 0, null)
                     .setPositiveButton(android.R.string.ok, (dialog, which) -> {

app/src/main/java/com/beemdevelopment/aegis/importers/TotpAuthenticatorImporter.java

@@ -4,8 +4,6 @@
 import android.content.pm.PackageManager;
 import android.util.Xml;
 
-import androidx.appcompat.app.AlertDialog;
-
 import com.beemdevelopment.aegis.R;
 import com.beemdevelopment.aegis.crypto.CryptoUtils;
 import com.beemdevelopment.aegis.encoding.Base32;
@@ -18,6 +16,7 @@
 import com.beemdevelopment.aegis.util.IOUtils;
 import com.beemdevelopment.aegis.util.PreferenceParser;
 import com.beemdevelopment.aegis.vault.VaultEntry;
+import com.google.android.material.dialog.MaterialAlertDialogBuilder;
 import com.topjohnwu.superuser.io.SuFile;
 
 import org.json.JSONArray;
@@ -154,7 +153,7 @@ protected DecryptedState decrypt(char[] password) throws DatabaseImporterExcepti
 
         @Override
         public void decrypt(Context context, DecryptListener listener) {
-            Dialogs.showSecureDialog(new AlertDialog.Builder(context)
+            Dialogs.showSecureDialog(new MaterialAlertDialogBuilder(context)
                     .setMessage(R.string.choose_totpauth_importer)
                     .setPositiveButton(R.string.yes, (dialog, which) -> {
                         Dialogs.showPasswordInputDialog(context, password -> {

app/src/main/java/com/beemdevelopment/aegis/ui/AboutActivity.java

@@ -132,11 +132,10 @@ private void openMail(String mailaddress) {
 
     private void showThirdPartyLicenseDialog() {
         String stylesheet = getString(R.string.custom_notices_format_style);
-        int backgroundColorResource = getConfiguredTheme() == Theme.AMOLED ? R.attr.cardBackgroundFocused : R.attr.cardBackground;
-        String backgroundColor = getThemeColorAsHex(backgroundColorResource);
-        String textColor = getThemeColorAsHex(R.attr.primaryText);
-        String licenseColor = getThemeColorAsHex(R.attr.cardBackgroundFocused);
-        String linkColor = getThemeColorAsHex(androidx.appcompat.R.attr.colorAccent);
+        String backgroundColor = getThemeColorAsHex(com.google.android.material.R.attr.colorSurfaceContainerLow);
+        String textColor = getThemeColorAsHex(com.google.android.material.R.attr.colorOnSurface);
+        String licenseColor = getThemeColorAsHex(com.google.android.material.R.attr.colorSurfaceContainerLow);
+        String linkColor = getThemeColorAsHex(com.google.android.material.R.attr.colorAccent);
 
         stylesheet = String.format(stylesheet, backgroundColor, textColor, licenseColor, linkColor);
 

app/src/main/java/com/beemdevelopment/aegis/ui/AegisActivity.java

@@ -96,7 +96,7 @@ public void onLocked(boolean userInitiated) {
      * Called when the activity is expected to set its theme.
      */
     protected void onSetTheme() {
-        setTheme(ThemeMap.DEFAULT);
+        setTheme(R.style.Theme_Aegis);
     }
 
     /**

app/src/main/java/com/beemdevelopment/aegis/ui/AuthActivity.java

@@ -20,7 +20,6 @@
 
 import androidx.activity.OnBackPressedCallback;
 import androidx.annotation.NonNull;
-import androidx.appcompat.app.AlertDialog;
 import androidx.biometric.BiometricPrompt;
 
 import com.beemdevelopment.aegis.R;
@@ -43,6 +42,7 @@
 import com.beemdevelopment.aegis.vault.slots.SlotException;
 import com.beemdevelopment.aegis.vault.slots.SlotIntegrityException;
 import com.beemdevelopment.aegis.vault.slots.SlotList;
+import com.google.android.material.dialog.MaterialAlertDialogBuilder;
 
 import java.util.List;
 
@@ -163,7 +163,7 @@ protected void onCreate(Bundle savedInstanceState) {
 
         biometricsButton.setOnClickListener(v -> {
             if (_prefs.isPasswordReminderNeeded()) {
-                Dialogs.showSecureDialog(new AlertDialog.Builder(this)
+                Dialogs.showSecureDialog(new MaterialAlertDialogBuilder(this)
                         .setTitle(getString(R.string.password_reminder_dialog_title))
                         .setMessage(getString(R.string.password_reminder_dialog_message))
                         .setCancelable(false)
@@ -185,7 +185,7 @@ protected void onSaveInstanceState(@NonNull Bundle outState) {
 
     @Override
     protected void onSetTheme() {
-        setTheme(ThemeMap.NO_ACTION_BAR);
+        setTheme(R.style.Theme_Aegis);
     }
 
     private void selectPassword() {
@@ -302,7 +302,7 @@ private void finish(MasterKey key, boolean isSlotRepaired) {
     }
 
     private void onInvalidPassword() {
-        Dialogs.showSecureDialog(new AlertDialog.Builder(AuthActivity.this)
+        Dialogs.showSecureDialog(new MaterialAlertDialogBuilder(AuthActivity.this)
                 .setTitle(getString(R.string.unlock_vault_error))
                 .setMessage(getString(R.string.unlock_vault_error_description))
                 .setCancelable(false)

app/src/main/java/com/beemdevelopment/aegis/ui/EditEntryActivity.java

@@ -66,6 +66,7 @@
 import com.bumptech.glide.request.target.CustomTarget;
 import com.bumptech.glide.request.transition.Transition;
 import com.google.android.material.bottomsheet.BottomSheetDialog;
+import com.google.android.material.dialog.MaterialAlertDialogBuilder;
 import com.google.android.material.textfield.TextInputEditText;
 import com.google.android.material.textfield.TextInputLayout;
 
@@ -460,7 +461,7 @@ public boolean onOptionsItemSelected(MenuItem item) {
         } else if (itemId == R.id.action_edit_icon) {
             startIconSelection();
         } else if (itemId == R.id.action_reset_usage_count) {
-            Dialogs.showSecureDialog(new AlertDialog.Builder(this)
+            Dialogs.showSecureDialog(new MaterialAlertDialogBuilder(this)
                     .setTitle(R.string.action_reset_usage_count)
                     .setMessage(R.string.action_reset_usage_count_dialog)
                     .setPositiveButton(android.R.string.yes, (dialog, which) -> resetUsageCount())
@@ -769,7 +770,7 @@ private VaultEntry parseEntry() throws ParseException {
     }
 
     private void onSaveError(String msg) {
-        Dialogs.showSecureDialog(new AlertDialog.Builder(this)
+        Dialogs.showSecureDialog(new MaterialAlertDialogBuilder(this)
                 .setTitle(getString(R.string.saving_profile_error))
                 .setMessage(msg)
                 .setPositiveButton(android.R.string.ok, null)

app/src/main/java/com/beemdevelopment/aegis/ui/GroupManagerActivity.java

@@ -7,14 +7,14 @@
 
 import androidx.activity.OnBackPressedCallback;
 import androidx.annotation.NonNull;
-import androidx.appcompat.app.AlertDialog;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 
 import com.beemdevelopment.aegis.R;
 import com.beemdevelopment.aegis.ui.dialogs.Dialogs;
 import com.beemdevelopment.aegis.ui.views.GroupAdapter;
 import com.beemdevelopment.aegis.vault.VaultGroup;
+import com.google.android.material.dialog.MaterialAlertDialogBuilder;
 
 import java.util.ArrayList;
 import java.util.HashSet;
@@ -84,7 +84,7 @@ protected void onSaveInstanceState(@NonNull Bundle outState) {
 
     @Override
     public void onRemoveGroup(VaultGroup group) {
-        Dialogs.showSecureDialog(new AlertDialog.Builder(this)
+        Dialogs.showSecureDialog(new MaterialAlertDialogBuilder(this)
                 .setTitle(R.string.remove_group)
                 .setMessage(R.string.remove_group_description)
                 .setPositiveButton(android.R.string.yes, (dialog, whichButton) -> {
@@ -98,7 +98,7 @@ public void onRemoveGroup(VaultGroup group) {
     }
 
     public void onRemoveUnusedGroups() {
-        Dialogs.showSecureDialog(new AlertDialog.Builder(this)
+        Dialogs.showSecureDialog(new MaterialAlertDialogBuilder(this)
                 .setTitle(R.string.remove_unused_groups)
                 .setMessage(R.string.remove_unused_groups_description)
                 .setPositiveButton(android.R.string.yes, (dialog, whichButton) -> {

app/src/main/java/com/beemdevelopment/aegis/ui/ImportEntriesActivity.java

@@ -11,7 +11,6 @@
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.appcompat.app.ActionBar;
-import androidx.appcompat.app.AlertDialog;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 
@@ -28,6 +27,7 @@
 import com.beemdevelopment.aegis.vault.VaultEntry;
 import com.beemdevelopment.aegis.vault.VaultGroup;
 import com.beemdevelopment.aegis.vault.VaultRepository;
+import com.google.android.material.dialog.MaterialAlertDialogBuilder;
 import com.google.android.material.floatingactionbutton.FloatingActionButton;
 import com.google.android.material.snackbar.Snackbar;
 
@@ -101,7 +101,7 @@ private void startImport(DatabaseImporter.Definition importerDef, @Nullable File
             if (importer.isInstalledAppVersionSupported()) {
                 startImportApp(importer);
             } else {
-                Dialogs.showSecureDialog(new AlertDialog.Builder(this)
+                Dialogs.showSecureDialog(new MaterialAlertDialogBuilder(this)
                         .setTitle(R.string.warning)
                         .setMessage(getString(R.string.app_version_error, importerDef.getName()))
                         .setCancelable(false)
@@ -296,7 +296,7 @@ private void saveAndFinish(boolean wipeEntries) {
 
                 assignIconIntent.putExtra("entries", assignIconEntriesIds);
 
-                Dialogs.showSecureDialog(new AlertDialog.Builder(this)
+                Dialogs.showSecureDialog(new MaterialAlertDialogBuilder(this)
                         .setTitle(R.string.import_assign_icons_dialog_title)
                         .setMessage(R.string.import_assign_icons_dialog_text)
                         .setPositiveButton(android.R.string.yes, (dialog, which) -> {

app/src/main/java/com/beemdevelopment/aegis/ui/IntroActivity.java

@@ -42,7 +42,7 @@ protected void onCreate(Bundle savedInstanceState) {
 
     @Override
     protected void onSetTheme() {
-        setTheme(ThemeMap.NO_ACTION_BAR);
+        setTheme(R.style.Theme_Aegis);
     }
 
     @Override

app/src/main/java/com/beemdevelopment/aegis/ui/MainActivity.java

@@ -54,6 +54,7 @@
 import com.beemdevelopment.aegis.util.TimeUtils;
 import com.beemdevelopment.aegis.vault.VaultEntry;
 import com.google.android.material.bottomsheet.BottomSheetDialog;
+import com.google.android.material.dialog.MaterialAlertDialogBuilder;
 import com.google.android.material.floatingactionbutton.FloatingActionButton;
 import com.google.common.base.Strings;
 
@@ -78,7 +79,6 @@ public class MainActivity extends AegisActivity implements EntryListView.Listene
     private static final int CODE_SCAN_IMAGE = 6;
     private static final int CODE_ASSIGN_ICONS = 7;
 
-
     // Permission request codes
     private static final int CODE_PERM_CAMERA = 0;
 
@@ -857,9 +857,10 @@ private void updateErrorBar() {
                 _textErrorBar.setText(R.string.backup_reminder_bar_message);
             }
             _btnErrorBar.setOnClickListener(view -> {
-                Dialogs.showSecureDialog(new AlertDialog.Builder(this)
+                Dialogs.showSecureDialog(new MaterialAlertDialogBuilder(this, com.google.android.material.R.style.ThemeOverlay_Material3_MaterialAlertDialog_Centered)
                         .setTitle(R.string.backup_reminder_bar_dialog_title)
                         .setMessage(R.string.backup_reminder_bar_dialog_summary)
+                        .setIcon(R.drawable.ic_info_outline_black_24dp)
                         .setPositiveButton(R.string.backup_reminder_bar_dialog_accept, (dialog, whichButton) -> {
                             startPreferencesActivity(BackupsPreferencesFragment.class, "pref_backups");
                         })
@@ -879,7 +880,7 @@ private void updateErrorBar() {
     private void showPlaintextExportWarningOptions() {
         View view = LayoutInflater.from(this).inflate(R.layout.dialog_plaintext_warning, null);
 
-        AlertDialog dialog = new AlertDialog.Builder(this)
+        AlertDialog dialog = new MaterialAlertDialogBuilder(this)
                 .setTitle(R.string.backup_plaintext_export_warning)
                 .setView(view)
                 .setPositiveButton(android.R.string.ok, null)

app/src/main/java/com/beemdevelopment/aegis/ui/ScannerActivity.java

@@ -97,7 +97,7 @@ protected void onDestroy() {
 
     @Override
     protected void onSetTheme() {
-        setTheme(ThemeMap.FULLSCREEN);
+        setTheme(R.style.Theme_Aegis);
     }
 
     @Override

app/src/main/java/com/beemdevelopment/aegis/ui/dialogs/ChangelogDialog.java

@@ -5,7 +5,7 @@
 import com.beemdevelopment.aegis.R;
 
 public class ChangelogDialog extends SimpleWebViewDialog {
-    private ChangelogDialog() {
+    public ChangelogDialog() {
         super(R.string.changelog);
     }