Nmc/2031 Dialog theming

app/src/main/java/com/nextcloud/ui/dialog/chooseStorage/ChooseStorageLocationDialogFragment.kt

@@ -19,14 +19,14 @@ import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import com.nextcloud.client.di.Injectable
 import com.nextcloud.client.preferences.AppPreferencesImpl
 import com.nextcloud.utils.HumanReadableFormatter
+import com.nmc.android.utils.DialogThemeUtils
 import com.owncloud.android.MainApp
 import com.owncloud.android.R
 import com.owncloud.android.databinding.DialogDataStorageLocationBinding
 import com.owncloud.android.datastorage.DataStorageProvider
 import com.owncloud.android.datastorage.StoragePoint
 import com.owncloud.android.datastorage.StoragePoint.PrivacyType
 import com.owncloud.android.datastorage.StoragePoint.StorageType
-import com.owncloud.android.ui.dialog.extensions.themeButtons
 import com.owncloud.android.ui.model.ExtendedSettingsActivityDialog
 import com.owncloud.android.utils.theme.ViewThemeUtils
 import java.io.File
@@ -48,11 +48,6 @@ class ChooseStorageLocationDialogFragment :
     private val selectedPrivacyType
         get() = if (binding.allowMediaIndexSwitch.isChecked) PrivacyType.PUBLIC else PrivacyType.PRIVATE
 
-    override fun onStart() {
-        super.onStart()
-        dialog?.themeButtons(viewThemeUtils)
-    }
-
     override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
         binding = DialogDataStorageLocationBinding.inflate(layoutInflater)
 
@@ -66,7 +61,8 @@ class ChooseStorageLocationDialogFragment :
                 dialog.dismiss()
             }.setView(binding.root)
 
-        viewThemeUtils.dialog.colorMaterialAlertDialogBackground(requireContext(), builder)
+        // NMC customization: customize dialog bg color
+        DialogThemeUtils.colorMaterialAlertDialogBackground(requireContext(), builder)
 
         binding.storageRadioGroup.setOnCheckedChangeListener { _, _ ->
             updateMediaIndexSwitch()

app/src/main/java/com/nmc/android/utils/DialogThemeUtils.kt

@@ -0,0 +1,30 @@
+package com.nmc.android.utils
+
+import android.content.Context
+import android.content.res.ColorStateList
+import android.os.Build
+import com.google.android.material.dialog.MaterialAlertDialogBuilder
+import com.google.android.material.shape.MaterialShapeDrawable
+import com.owncloud.android.R
+
+object DialogThemeUtils {
+    fun colorMaterialAlertDialogBackground(context: Context, dialogBuilder: MaterialAlertDialogBuilder) {
+        val materialShapeDrawable = MaterialShapeDrawable(
+            context,
+            null,
+            androidx.appcompat.R.attr.alertDialogStyle,
+            com.google.android.material.R.style.MaterialAlertDialog_MaterialComponents
+        )
+        materialShapeDrawable.initializeElevationOverlay(context)
+        materialShapeDrawable.fillColor =
+            ColorStateList.valueOf(context.resources.getColor(R.color.alert_bg_color, null))
+
+        // dialogCornerRadius first appeared in Android Pie
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
+            val radius: Float =
+                context.resources.getDimension(com.nextcloud.android.common.ui.R.dimen.dialogBorderRadius)
+            materialShapeDrawable.setCornerSize(radius)
+        }
+        dialogBuilder.background = materialShapeDrawable
+    }
+}

app/src/main/java/com/owncloud/android/ui/activity/FileDisplayActivity.kt

@@ -76,6 +76,7 @@ import com.nextcloud.utils.extensions.lastFragment
 import com.nextcloud.utils.extensions.navigateToAllFiles
 import com.nextcloud.utils.extensions.setVisibleIf
 import com.nextcloud.utils.view.FastScrollUtils
+import com.nmc.android.utils.DialogThemeUtils
 import com.owncloud.android.MainApp
 import com.owncloud.android.R
 import com.owncloud.android.authentication.PassCodeManager

app/src/main/java/com/owncloud/android/ui/activity/ReceiveExternalFilesActivity.java

@@ -61,6 +61,7 @@
 import com.nextcloud.utils.extensions.IntentExtensionsKt;
 import com.nextcloud.utils.fileNameValidator.FileNameTextWatcher;
 import com.nextcloud.utils.fileNameValidator.FileNameValidator;
+import com.nmc.android.utils.DialogThemeUtils;
 import com.owncloud.android.MainApp;
 import com.owncloud.android.R;
 import com.owncloud.android.databinding.ReceiveExternalFilesBinding;
@@ -367,7 +368,8 @@ public Dialog onCreateDialog(Bundle savedInstanceState) {
             });
             builder.setNeutralButton(R.string.uploader_wrn_no_account_quit_btn_text,
                                      (dialog, which) -> requireActivity().finish());
-            viewThemeUtils.dialog.colorMaterialAlertDialogBackground(requireContext(), builder);
+            // NMC customization: customize dialog bg color
+            DialogThemeUtils.INSTANCE.colorMaterialAlertDialogBackground(requireContext(), builder);
             return builder.create();
         }
     }

app/src/main/java/com/owncloud/android/ui/activity/SettingsActivity.java

@@ -57,6 +57,7 @@
 import com.nextcloud.utils.extensions.ContextExtensionsKt;
 import com.nextcloud.utils.mdm.MDMConfig;
 import com.owncloud.android.BuildConfig;
+import com.nmc.android.utils.DialogThemeUtils;
 import com.owncloud.android.MainApp;
 import com.owncloud.android.R;
 import com.owncloud.android.authentication.AuthenticatorActivity;
@@ -642,7 +643,7 @@ private void onRenewE2ECertificateResult(Preference preference, E2ECertificateRe
     }
 
     private void showRemoveE2EAlertDialog(PreferenceCategory preferenceCategoryMore, Preference preference) {
-        new MaterialAlertDialogBuilder(this, R.style.FallbackTheming_Dialog)
+        MaterialAlertDialogBuilder builder = new MaterialAlertDialogBuilder(this, R.style.FallbackTheming_Dialog)
             .setTitle(R.string.prefs_e2e_mnemonic)
             .setMessage(getString(R.string.remove_e2e_message))
             .setCancelable(true)
@@ -657,8 +658,10 @@ private void showRemoveE2EAlertDialog(PreferenceCategory preferenceCategoryMore,
                 }
 
                 dialog.dismiss();
-            })
-            .create()
+            });
+        // NMC customization: customize dialog bg color
+        DialogThemeUtils.INSTANCE.colorMaterialAlertDialogBackground(this, builder);
+        builder.create()
             .show();
     }
 
@@ -1176,14 +1179,16 @@ public void handleMnemonicRequest(Intent data) {
     }
 
     private void showMnemonicAlertDialogDialog(String mnemonic) {
-        new MaterialAlertDialogBuilder(this, R.style.FallbackTheming_Dialog)
-            .setTitle(R.string.prefs_e2e_mnemonic)
+        MaterialAlertDialogBuilder builder = new MaterialAlertDialogBuilder(this, R.style.FallbackTheming_Dialog)
+            .setTitle(R.string.dialog_e2e_mnemonic_title)
             .setMessage(mnemonic)
             .setPositiveButton(R.string.common_ok, (dialog, which) -> dialog.dismiss())
             .setNegativeButton(R.string.common_cancel, (dialog, i) -> dialog.dismiss())
             .setNeutralButton(R.string.common_copy, (dialog, i) ->
-                ClipboardUtil.copyToClipboard(this, mnemonic, false))
-            .create()
+                ClipboardUtil.copyToClipboard(this, mnemonic, false));
+        // NMC customization: customize dialog bg color
+        DialogThemeUtils.INSTANCE.colorMaterialAlertDialogBackground(this, builder);
+        builder.create()
             .show();
     }
 

app/src/main/java/com/owncloud/android/ui/activity/StorageMigration.java

@@ -21,6 +21,7 @@
 import com.google.android.material.dialog.MaterialAlertDialogBuilder;
 import com.nextcloud.client.account.User;
 import com.nextcloud.utils.AppConstants;
+import com.nmc.android.utils.DialogThemeUtils;
 import com.owncloud.android.MainApp;
 import com.owncloud.android.R;
 import com.owncloud.android.datamodel.FileDataStorageManager;
@@ -107,7 +108,8 @@ public static void a(ViewThemeUtils viewThemeUtils, Context context) {
 
             });
 
-        viewThemeUtils.dialog.colorMaterialAlertDialogBackground(context, builder);
+        // NMC customization: customize dialog bg color
+        DialogThemeUtils.INSTANCE.colorMaterialAlertDialogBackground(context, builder);
 
         AlertDialog alertDialog = builder.create();
 
@@ -158,7 +160,8 @@ private void askToOverride() {
                     progressDialog.getButton(ProgressDialog.BUTTON_POSITIVE).setVisibility(View.GONE);
                 });
 
-        viewThemeUtils.dialog.colorMaterialAlertDialogBackground(mContext, builder);
+        // NMC customization: customize dialog bg color
+        DialogThemeUtils.INSTANCE.colorMaterialAlertDialogBackground(mContext, builder);
         builder.create().show();
     }
 
@@ -251,7 +254,8 @@ private void askToStillMove() {
                         }
                     });
 
-            viewThemeUtils.dialog.colorMaterialAlertDialogBackground(mContext, builder);
+            // NMC customization: customize dialog bg color
+            DialogThemeUtils.INSTANCE.colorMaterialAlertDialogBackground(mContext, builder);
             builder.create().show();
         }
 

app/src/main/java/com/owncloud/android/ui/activity/filedisplayactivity/FileDisplayDialogs.kt

@@ -11,6 +11,7 @@ import androidx.appcompat.app.AppCompatActivity
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import com.nextcloud.client.account.User
 import com.nextcloud.utils.extensions.isDialogFragmentReady
+import com.nmc.android.utils.DialogThemeUtils
 import com.owncloud.android.R
 import com.owncloud.android.lib.common.utils.Log_OC
 import com.owncloud.android.ui.dialog.ConfirmationDialogFragment
@@ -27,7 +28,8 @@ class FileDisplayDialogs(private val activity: AppCompatActivity, private val vi
                 .setPositiveButton(R.string.dialog_close) { dialog, _ -> dialog?.dismiss() }
                 .setIcon(R.drawable.ic_settings)
 
-            viewThemeUtils.dialog.colorMaterialAlertDialogBackground(activity.applicationContext, builder)
+            // NMC customization: customize dialog bg color
+            DialogThemeUtils.colorMaterialAlertDialogBackground(activity.applicationContext, builder)
 
             builder.create().show()
         } catch (e: BadTokenException) {
@@ -54,7 +56,8 @@ class FileDisplayDialogs(private val activity: AppCompatActivity, private val vi
             .setTitle(R.string.common_choose_account)
             .setItems(accountNames) { _, which -> onUserChosen(users[which]) }
 
-        viewThemeUtils.dialog.colorMaterialAlertDialogBackground(activity.applicationContext, builder)
+        // NMC customization: customize dialog bg color
+        DialogThemeUtils.colorMaterialAlertDialogBackground(activity.applicationContext, builder)
 
         builder.create().show()
     }

app/src/main/java/com/owncloud/android/ui/adapter/StoragePathAdapter.kt

@@ -29,7 +29,6 @@ class StoragePathAdapter(
             val storagePathItem = pathList[position]
             holder.binding.btnStoragePath.setIconResource(storagePathItem.icon)
             holder.binding.btnStoragePath.text = storagePathItem.name
-            viewThemeUtils.material.colorMaterialButtonPrimaryBorderless(holder.binding.btnStoragePath)
         }
     }