chore: unified alert dialog style (#322)

Reviewed-on: https://gitea.angry.im/PeterCxy/OpenEUICC/pulls/322
Co-authored-by: septs <github@septs.pw>
Co-committed-by: septs <github@septs.pw>

app-common/src/main/java/im/angry/openeuicc/ui/EuiccManagementFragment.kt

@@ -95,14 +95,14 @@ open class EuiccManagementFragment : Fragment(), EuiccProfilesChangedListener,
 
         setupRootViewSystemBarInsets(
             view, arrayOf(
-            mainViewPaddingInsetHandler(profileList),
-            { insets ->
-                fab.updateLayoutParams<ViewGroup.MarginLayoutParams> {
-                    rightMargin = origFabMarginRight + insets.right
-                    bottomMargin = origFabMarginBottom + insets.bottom
+                mainViewPaddingInsetHandler(profileList),
+                { insets ->
+                    fab.updateLayoutParams<ViewGroup.MarginLayoutParams> {
+                        rightMargin = origFabMarginRight + insets.right
+                        bottomMargin = origFabMarginBottom + insets.bottom
+                    }
                 }
-            }
-        ))
+            ))
 
         profileList.addOnScrollListener(object : RecyclerView.OnScrollListener() {
             override fun onScrollStateChanged(view: RecyclerView, newState: Int) =
@@ -256,17 +256,11 @@ open class EuiccManagementFragment : Fragment(), EuiccProfilesChangedListener,
                     // This is only really fatal for internal eSIMs
                     if (!isUsb) {
                         withContext(Dispatchers.Main) {
-                            AlertDialog.Builder(requireContext()).apply {
-                                setMessage(R.string.profile_switch_did_not_refresh)
-                                setPositiveButton(android.R.string.ok) { dialog, _ ->
-                                    dialog.dismiss()
-                                    requireActivity().finish()
-                                }
-                                setOnDismissListener { _ ->
-                                    requireActivity().finish()
-                                }
-                                show()
-                            }
+                            AlertDialog.Builder(requireContext(), R.style.AlertDialogTheme)
+                                .setMessage(R.string.profile_switch_did_not_refresh)
+                                .setPositiveButton(android.R.string.ok) { _, _ -> requireActivity().finish() }
+                                .setOnDismissListener { _ -> requireActivity().finish() }
+                                .show()
                         }
                     }
                 }
@@ -276,17 +270,11 @@ open class EuiccManagementFragment : Fragment(), EuiccProfilesChangedListener,
                         // Prevent this Fragment from being used again
                         invalid = true
                         // Timed out waiting for SIM to come back online, we can no longer assume that the LPA is still valid
-                        AlertDialog.Builder(requireContext()).apply {
-                            setMessage(appContainer.customizableTextProvider.profileSwitchingTimeoutMessage)
-                            setPositiveButton(android.R.string.ok) { dialog, _ ->
-                                dialog.dismiss()
-                                requireActivity().finish()
-                            }
-                            setOnDismissListener { _ ->
-                                requireActivity().finish()
-                            }
-                            show()
-                        }
+                        AlertDialog.Builder(requireContext(), R.style.AlertDialogTheme)
+                            .setMessage(appContainer.customizableTextProvider.profileSwitchingTimeoutMessage)
+                            .setPositiveButton(android.R.string.ok) { _, _ -> requireActivity().finish() }
+                            .setOnDismissListener { _ -> requireActivity().finish() }
+                            .show()
                     }
                 }
 

app-common/src/main/java/im/angry/openeuicc/ui/NotificationsActivity.kt

@@ -99,13 +99,10 @@ class NotificationsActivity : BaseEuiccAccessActivity(), OpenEuiccContextMarker
             }
 
             R.id.help -> {
-                AlertDialog.Builder(this, R.style.AlertDialogTheme).apply {
-                    setMessage(R.string.profile_notifications_help)
-                    setPositiveButton(android.R.string.ok) { dialog, _ ->
-                        dialog.dismiss()
-                    }
-                    show()
-                }
+                AlertDialog.Builder(this, R.style.AlertDialogTheme)
+                    .setMessage(R.string.profile_notifications_help)
+                    .setPositiveButton(android.R.string.ok) { _, _ -> }
+                    .show()
                 true
             }
 

app-common/src/main/java/im/angry/openeuicc/ui/ProfileDeleteFragment.kt

@@ -54,12 +54,13 @@ class ProfileDeleteFragment : DialogFragment(), EuiccChannelFragmentMarker {
         get() = requireDialog() as AlertDialog
 
     override fun onCreateDialog(savedInstanceState: Bundle?): Dialog =
-        AlertDialog.Builder(requireContext(), R.style.AlertDialogTheme).apply {
-            setMessage(getString(R.string.profile_delete_confirm, name))
-            setView(editText)
-            setPositiveButton(android.R.string.ok, null) // Set listener to null to prevent auto closing
-            setNegativeButton(android.R.string.cancel, null)
-        }.create()
+        AlertDialog.Builder(requireContext(), R.style.AlertDialogTheme)
+            .setMessage(getString(R.string.profile_delete_confirm, name))
+            .setView(editText)
+            // Set listener to null to prevent auto closing
+            .setPositiveButton(android.R.string.ok, null)
+            .setNegativeButton(android.R.string.cancel, null)
+            .create()
 
     override fun onResume() {
         super.onResume()

app-common/src/main/java/im/angry/openeuicc/ui/wizard/DownloadWizardMethodSelectFragment.kt

@@ -1,6 +1,5 @@
 package im.angry.openeuicc.ui.wizard
 
-import android.app.AlertDialog
 import android.content.ClipboardManager
 import android.graphics.BitmapFactory
 import android.os.Bundle
@@ -11,6 +10,7 @@ import android.widget.ImageView
 import android.widget.TextView
 import android.widget.Toast
 import androidx.activity.result.contract.ActivityResultContracts
+import androidx.appcompat.app.AlertDialog
 import androidx.core.net.toUri
 import androidx.lifecycle.lifecycleScope
 import androidx.recyclerview.widget.DividerItemDecoration
@@ -123,13 +123,12 @@ class DownloadWizardMethodSelectFragment : DownloadWizardActivity.DownloadWizard
             state.confirmationCodeRequired = parsed.confirmationCodeRequired
             gotoNextFragment(DownloadWizardDetailsFragment())
         } catch (_: IllegalArgumentException) {
-            AlertDialog.Builder(requireContext()).apply {
-                setTitle(R.string.profile_download_incorrect_lpa_string)
-                setMessage(R.string.profile_download_incorrect_lpa_string_message)
-                setCancelable(true)
-                setNegativeButton(android.R.string.cancel, null)
-                show()
-            }
+            AlertDialog.Builder(requireContext(), R.style.AlertDialogTheme)
+                .setTitle(R.string.profile_download_incorrect_lpa_string)
+                .setMessage(R.string.profile_download_incorrect_lpa_string_message)
+                .setCancelable(true)
+                .setNegativeButton(android.R.string.cancel, null)
+                .show()
         }
     }
 

app-common/src/main/java/im/angry/openeuicc/util/UiUtils.kt

@@ -126,21 +126,21 @@ fun <T : ActivityResultCaller> T.setupLogSaving(
                 }
             }
 
-            AlertDialog.Builder(context).apply {
-                setMessage(R.string.logs_saved_message)
-                setNegativeButton(android.R.string.cancel) { _, _ -> }
-                setPositiveButton(android.R.string.ok) { _, _ ->
-                    val intent = Intent(Intent.ACTION_SEND).apply {
-                        type = "text/plain"
-                        clipData = ClipData.newUri(context.contentResolver, lastFileName, uri)
-                        putExtra(Intent.EXTRA_TITLE, lastFileName)
-                        putExtra(Intent.EXTRA_STREAM, uri)
-                        addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION)
-                    }
+            val intent = Intent(Intent.ACTION_SEND).apply {
+                type = "text/plain"
+                clipData = ClipData.newUri(context.contentResolver, lastFileName, uri)
+                putExtra(Intent.EXTRA_TITLE, lastFileName)
+                putExtra(Intent.EXTRA_STREAM, uri)
+                addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION)
+            }
 
+            AlertDialog.Builder(context, R.style.AlertDialogTheme)
+                .setMessage(R.string.logs_saved_message)
+                .setNegativeButton(android.R.string.cancel) { _, _ -> }
+                .setPositiveButton(android.R.string.ok) { _, _ ->
                     context.startActivity(Intent.createChooser(intent, null))
                 }
-            }.show()
+                .show()
         }
 
     return {