Use material dialogs everywhere (#247)

This should address a number of theme-related issues.

Related: https://ebce-lyrasis.atlassian.net/browse/PP-651
Related: https://ebce-lyrasis.atlassian.net/browse/PP-650

simplified-lcp/build.gradle.kts

@@ -1,8 +1,20 @@
 dependencies {
+    implementation(libs.androidx.activity)
+    implementation(libs.androidx.activity.ktx)
+    implementation(libs.androidx.appcompat)
+    implementation(libs.androidx.appcompat.resources)
+    implementation(libs.androidx.cardview)
+    implementation(libs.androidx.collection)
     implementation(libs.androidx.constraintlayout)
-    implementation(libs.kotlinx.coroutines)
+    implementation(libs.androidx.constraintlayout.core)
+    implementation(libs.androidx.coordinatorlayout)
+    implementation(libs.androidx.drawerlayout)
+    implementation(libs.androidx.lifecycle.common)
+    implementation(libs.androidx.savedstate)
+    implementation(libs.google.material)
     implementation(libs.kotlin.reflect)
     implementation(libs.kotlin.stdlib)
+    implementation(libs.kotlinx.coroutines)
     implementation(libs.palace.drm.core)
     implementation(libs.r2.lcp)
     implementation(libs.r2.shared)

simplified-lcp/src/main/java/org/nypl/simplified/lcp/LCPContentProtectionProvider.kt

@@ -1,9 +1,9 @@
 package org.nypl.simplified.lcp
 
-import android.app.AlertDialog
 import android.content.Context
 import android.view.LayoutInflater
 import android.widget.TextView
+import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.withContext
 import org.librarysimplified.lcp.R
@@ -71,7 +71,7 @@ class LCPContentProtectionProvider : ContentProtectionProvider {
     val inputPassphrase = view.findViewById<TextView>(R.id.inputPassphrase)
 
     return suspendCoroutine { cont ->
-      AlertDialog.Builder(context).apply {
+      MaterialAlertDialogBuilder(context).apply {
         setTitle(R.string.dialog_manual_passphrase_title)
         setMessage(hint)
         setPositiveButton(R.string.dialog_manual_passphrase_done) { dialog, _ ->

simplified-main/src/main/java/org/librarysimplified/main/MainAdobeWarnings.kt

@@ -2,7 +2,7 @@ package org.librarysimplified.main
 
 import android.content.Context
 import androidx.annotation.UiThread
-import androidx.appcompat.app.AlertDialog
+import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import org.librarysimplified.services.api.ServiceDirectoryType
 import org.nypl.drm.core.AdobeAdeptExecutorType
 import org.nypl.simplified.adobe.extensions.AdobeDRMServices
@@ -26,7 +26,7 @@ object MainAdobeWarnings {
         val drmService = services.optionalService(AdobeAdeptExecutorType::class.java)
         if (drmService == null) {
           if (AdobeDRMServices.isIntendedToBePresent(context)) {
-            AlertDialog.Builder(context)
+            MaterialAlertDialogBuilder(context)
               .setMessage(R.string.bootAdobeDRMFailed)
               .create()
               .show()

simplified-ui-accounts/src/main/java/org/nypl/simplified/ui/accounts/AccountDetailFragment.kt

@@ -14,7 +14,7 @@ import android.widget.ImageView
 import android.widget.ProgressBar
 import android.widget.TextView
 import androidx.activity.result.contract.ActivityResultContracts
-import androidx.appcompat.app.AlertDialog
+import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import androidx.appcompat.widget.SwitchCompat
 import androidx.constraintlayout.widget.ConstraintLayout
 import androidx.core.app.ActivityCompat
@@ -503,7 +503,7 @@ class AccountDetailFragment : Fragment(R.layout.account) {
           } catch (e: Exception) {
             this.logger.error("unable to start activity: ", e)
             val context = this.requireContext()
-            AlertDialog.Builder(context)
+            MaterialAlertDialogBuilder(context)
               .setMessage(context.getString(R.string.accountReportFailed, supportUrl))
               .create()
               .show()
@@ -964,7 +964,7 @@ class AccountDetailFragment : Fragment(R.layout.account) {
         } catch (e: Exception) {
           this.logger.error("unable to start activity: ", e)
           val context = this.requireContext()
-          AlertDialog.Builder(context)
+          MaterialAlertDialogBuilder(context)
             .setMessage(context.getString(R.string.accountPasswordResetFailed, supportUrl))
             .create()
             .show()
@@ -1104,7 +1104,7 @@ class AccountDetailFragment : Fragment(R.layout.account) {
 
   private fun onAgeCheckboxClicked(): (View) -> Unit = {
     val isOver13 = this.viewModel.isOver13
-    AlertDialog.Builder(this.requireContext())
+    MaterialAlertDialogBuilder(this.requireContext())
       .setTitle(R.string.accountCOPPADeleteBooks)
       .setMessage(R.string.accountCOPPADeleteBooksConfirm)
       .setNegativeButton(R.string.accountCancel) { _, _ ->
@@ -1173,14 +1173,14 @@ class AccountDetailFragment : Fragment(R.layout.account) {
   }
 
   private fun showErrorGettingLocationDialog() {
-    AlertDialog.Builder(requireContext())
+    MaterialAlertDialogBuilder(requireContext())
       .setMessage(getString(R.string.accountCardCreatorLocationFailed))
       .create()
       .show()
   }
 
   private fun showLocationDisclaimerDialog() {
-    AlertDialog.Builder(requireContext())
+    MaterialAlertDialogBuilder(requireContext())
       .setMessage(R.string.accountCardCreatorDialogPermissionsMessage)
       .setPositiveButton(android.R.string.ok) { _, _ -> requestLocationPermissions() }
       .setNegativeButton(R.string.accountCardCreatorDialogCancel) { dialog, _ -> dialog?.dismiss() }
@@ -1189,7 +1189,7 @@ class AccountDetailFragment : Fragment(R.layout.account) {
   }
 
   private fun showSettingsDialog() {
-    AlertDialog.Builder(requireContext())
+    MaterialAlertDialogBuilder(requireContext())
       .setMessage(R.string.accountCardCreatorDialogOpenSettingsMessage)
       .setPositiveButton(R.string.accountCardCreatorDialogOpenSettings) { _, _ ->
         openAppSettings()

simplified-ui-accounts/src/main/java/org/nypl/simplified/ui/accounts/AccountListFragment.kt

@@ -5,7 +5,7 @@ import android.view.Menu
 import android.view.MenuInflater
 import android.view.MenuItem
 import android.view.View
-import androidx.appcompat.app.AlertDialog
+import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import androidx.core.os.bundleOf
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.viewModels
@@ -75,7 +75,7 @@ class AccountListFragment : Fragment(R.layout.account_list) {
 
   private fun onAccountDeleteClicked(account: AccountType) {
     val context = this.requireContext()
-    AlertDialog.Builder(context)
+    MaterialAlertDialogBuilder(context)
       .setTitle(R.string.accountsDeleteConfirmTitle)
       .setMessage(
         context.getString(
@@ -197,7 +197,7 @@ class AccountListFragment : Fragment(R.layout.account_list) {
   }
 
   private fun showAccountDeletionFailedDialog(accountEvent: AccountEventDeletionFailed) {
-    AlertDialog.Builder(this.requireContext())
+    MaterialAlertDialogBuilder(this.requireContext())
       .setTitle(R.string.accountsDeletionFailed)
       .setMessage(R.string.accountsDeletionFailedMessage)
       .setPositiveButton(R.string.accountsDetails) { _, _ ->

simplified-ui-accounts/src/main/java/org/nypl/simplified/ui/accounts/AccountListRegistryFragment.kt

@@ -1,5 +1,6 @@
 package org.nypl.simplified.ui.accounts
 
+import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import android.annotation.SuppressLint
 import android.content.Context
 import android.location.LocationManager
@@ -275,7 +276,7 @@ class AccountListRegistryFragment : Fragment(R.layout.account_list_registry) {
 
     if (this.errorDialog == null) {
       val newDialog =
-        AlertDialog.Builder(this.requireActivity())
+        MaterialAlertDialogBuilder(this.requireActivity())
           .setTitle(R.string.accountCreationFailed)
           .setMessage(R.string.accountCreationFailedMessage)
           .setPositiveButton(R.string.accountsDetails) { dialog, _ ->

simplified-ui-accounts/src/main/java/org/nypl/simplified/ui/accounts/saml20/AccountSAML20Fragment.kt

@@ -4,7 +4,7 @@ import android.os.Bundle
 import android.view.View
 import android.webkit.WebView
 import android.widget.ProgressBar
-import androidx.appcompat.app.AlertDialog
+import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import androidx.core.os.bundleOf
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.viewModels
@@ -122,7 +122,7 @@ class AccountSAML20Fragment : Fragment(R.layout.account_saml20) {
 
   private fun onSAMLEventFailed(event: AccountSAML20InternalEvent.Failed) {
     val newDialog =
-      AlertDialog.Builder(this.requireActivity())
+      MaterialAlertDialogBuilder(this.requireActivity())
         .setTitle(R.string.accountCreationFailed)
         .setMessage(R.string.accountCreationFailedMessage)
         .setPositiveButton(R.string.accountsDetails) { dialog, _ ->

simplified-ui-catalog/src/main/java/org/librarysimplified/ui/catalog/AgeGateDialog.kt

@@ -1,6 +1,7 @@
 package org.librarysimplified.ui.catalog
 
 import android.app.Dialog
+import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
@@ -55,7 +56,7 @@ class AgeGateDialog : DialogFragment(), AdapterView.OnItemSelectedListener {
   }
 
   override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
-    val dialog = AlertDialog.Builder(requireContext())
+    val dialog = MaterialAlertDialogBuilder(requireContext())
       .setTitle(getString(R.string.ageVerification))
       .setPositiveButton(R.string.catalogDone) { _, _ ->
         val selection = birthYearSpinner.selectedItem.toString()

simplified-ui-catalog/src/main/java/org/librarysimplified/ui/catalog/CatalogBookDetailFragment.kt

@@ -9,7 +9,7 @@ import android.widget.ImageView
 import android.widget.LinearLayout
 import android.widget.ProgressBar
 import android.widget.TextView
-import androidx.appcompat.app.AlertDialog
+import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import androidx.core.os.bundleOf
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.viewModels
@@ -660,7 +660,7 @@ class CatalogBookDetailFragment : Fragment(R.layout.book_detail) {
   }
 
   private fun onBookStatusReachedLoanLimit() {
-    AlertDialog.Builder(requireContext())
+    MaterialAlertDialogBuilder(requireContext())
       .setTitle(R.string.bookReachedLoanLimitDialogTitle)
       .setMessage(R.string.bookReachedLoanLimitDialogMessage)
       .setPositiveButton(R.string.bookReachedLoanLimitDialogButton) { dialog, _ ->

simplified-ui-catalog/src/main/java/org/librarysimplified/ui/catalog/CatalogFeedFragment.kt

@@ -19,7 +19,7 @@ import android.widget.RadioButton
 import android.widget.RadioGroup
 import android.widget.Space
 import android.widget.TextView
-import androidx.appcompat.app.AlertDialog
+import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import androidx.appcompat.widget.AppCompatTextView
 import androidx.appcompat.widget.SearchView
 import androidx.core.os.bundleOf
@@ -794,7 +794,7 @@ class CatalogFeedFragment : Fragment(R.layout.feed), AgeGateDialog.BirthYearSele
     val checkedItem = choices.indexOfFirst { it.isActive }
 
     // Build the dialog
-    val alertBuilder = AlertDialog.Builder(this.requireContext())
+    val alertBuilder = MaterialAlertDialogBuilder(this.requireContext())
     alertBuilder.setTitle(groupName)
     alertBuilder.setSingleChoiceItems(names, checkedItem) { dialog, checked ->
       val selected = choices[checked]

simplified-ui-catalog/src/main/java/org/librarysimplified/ui/catalog/CatalogPagedViewHolder.kt

@@ -7,7 +7,7 @@ import android.widget.Button
 import android.widget.ImageView
 import android.widget.ProgressBar
 import android.widget.TextView
-import androidx.appcompat.app.AlertDialog
+import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import androidx.recyclerview.widget.RecyclerView
 import com.google.common.base.Preconditions
 import com.google.common.util.concurrent.FluentFuture
@@ -363,7 +363,7 @@ class CatalogPagedViewHolder(
   }
 
   private fun onBookStatusReachedLoanLimit() {
-    AlertDialog.Builder(context)
+    MaterialAlertDialogBuilder(context)
       .setTitle(R.string.bookReachedLoanLimitDialogTitle)
       .setMessage(R.string.bookReachedLoanLimitDialogMessage)
       .setPositiveButton(R.string.bookReachedLoanLimitDialogButton) { dialog, _ ->

simplified-ui-settings/src/main/java/org/nypl/simplified/ui/settings/SettingsDebugFragment.kt

@@ -1,6 +1,6 @@
 package org.nypl.simplified.ui.settings
 
-import android.app.AlertDialog
+import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import android.graphics.Color
 import android.os.Bundle
 import android.view.View
@@ -344,7 +344,7 @@ class SettingsDebugFragment : Fragment(R.layout.settings_debug) {
     message.append(context.cacheDir?.isDirectory ?: false)
     message.append("\n")
 
-    AlertDialog.Builder(context)
+    MaterialAlertDialogBuilder(context)
       .setTitle("Cache Directory")
       .setMessage(message.toString())
       .show()

simplified-viewer-audiobook/src/main/java/org/librarysimplified/viewer/audiobook/AudioBookPlayerActivity.kt

@@ -8,7 +8,7 @@ import android.os.Bundle
 import android.widget.ImageView
 import android.widget.Toast
 import androidx.annotation.StringRes
-import androidx.appcompat.app.AlertDialog
+import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import androidx.appcompat.app.AppCompatActivity
 import androidx.appcompat.app.AppCompatDelegate
 import androidx.appcompat.app.TxContextWrappingDelegate
@@ -773,7 +773,7 @@ class AudioBookPlayerActivity :
   }
 
   private fun loanReturnShowDialog() {
-    val alert = AlertDialog.Builder(this)
+    val alert = MaterialAlertDialogBuilder(this)
     alert.setTitle(R.string.audio_book_player_return_title)
     alert.setMessage(R.string.audio_book_player_return_question)
     alert.setNegativeButton(R.string.audio_book_player_do_keep) { dialog, _ ->
@@ -875,9 +875,7 @@ class AudioBookPlayerActivity :
      */
 
     this.uiThread.runOnUIThread {
-      this.supportActionBar?.setTitle(
-        org.librarysimplified.audiobook.views.R.string.audiobook_player_toc_title
-      )
+      this.supportActionBar?.setTitle(R.string.audio_book_player_toc_title)
 
       val fragment = PlayerTOCFragment.newInstance()
 
@@ -1049,7 +1047,7 @@ class AudioBookPlayerActivity :
     this.log.error("error: {}: ", title, failure)
 
     this.uiThread.runOnUIThread {
-      AlertDialog.Builder(context)
+      MaterialAlertDialogBuilder(context)
         .setTitle(title)
         .setMessage(failure.localizedMessage)
         .setOnDismissListener {

simplified-viewer-audiobook/src/main/res/values/strings.xml

@@ -12,4 +12,5 @@
   <string name="audio_book_player_error_engine_open">Unable to initialize audio engine</string>
   <string name="audio_book_player_return_question">Would you like to return it?</string>
   <string name="audio_book_player_return_title">Your Audiobook Has Finished</string>
+  <string name="audio_book_player_toc_title">Table Of Contents</string>
 </resources>

simplified-viewer-epub-readium2/src/main/java/org/librarysimplified/viewer/epub/readium2/Reader2Activity.kt

@@ -7,7 +7,7 @@ import android.os.Bundle
 import android.webkit.WebView
 import android.widget.Toast
 import androidx.annotation.StringRes
-import androidx.appcompat.app.AlertDialog
+import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import androidx.appcompat.app.AppCompatActivity
 import androidx.appcompat.app.AppCompatDelegate
 import androidx.appcompat.app.TxContextWrappingDelegate
@@ -392,7 +392,7 @@ class Reader2Activity : AppCompatActivity(R.layout.reader2) {
     localLastReadBookmark: SR2Bookmark,
     serverLastReadBookmark: SR2Bookmark
   ) {
-    AlertDialog.Builder(this)
+    MaterialAlertDialogBuilder(this)
       .setTitle(R.string.reader_position_title)
       .setMessage(R.string.reader_position_message)
       .setNegativeButton(R.string.reader_position_move) { dialog, _ ->
@@ -617,7 +617,7 @@ class Reader2Activity : AppCompatActivity(R.layout.reader2) {
         exception
       }
 
-    AlertDialog.Builder(this)
+    MaterialAlertDialogBuilder(this)
       .setTitle(R.string.bookOpenFailedTitle)
       .setMessage(
         this.getString(

simplified-viewer-pdf-pdfjs/src/main/java/org/librarysimplified/viewer/pdf/pdfjs/PdfReaderActivity.kt

@@ -11,9 +11,9 @@ import android.webkit.JavascriptInterface
 import android.webkit.WebView
 import android.widget.FrameLayout
 import android.widget.ProgressBar
-import androidx.appcompat.app.AlertDialog
 import androidx.appcompat.app.AppCompatActivity
 import androidx.appcompat.widget.Toolbar
+import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import com.google.common.util.concurrent.MoreExecutors
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.GlobalScope
@@ -194,7 +194,7 @@ class PdfReaderActivity : AppCompatActivity() {
     params: PdfReaderParameters,
     isSavedInstanceStateNull: Boolean
   ) {
-    AlertDialog.Builder(this)
+    MaterialAlertDialogBuilder(this)
       .setTitle(R.string.viewer_position_title)
       .setMessage(R.string.viewer_position_message)
       .setNegativeButton(R.string.viewer_position_move) { dialog, _ ->
@@ -421,7 +421,7 @@ class PdfReaderActivity : AppCompatActivity() {
     this.log.error("error: {}: ", title, failure)
 
     this.uiThread.runOnUIThread {
-      AlertDialog.Builder(context)
+      MaterialAlertDialogBuilder(context)
         .setTitle(title)
         .setMessage(failure.localizedMessage)
         .setOnDismissListener {

simplified-viewer-preview/src/main/java/org/librarysimplified/viewer/preview/BookPreviewActivity.kt

@@ -6,7 +6,7 @@ import android.os.Bundle
 import android.widget.FrameLayout
 import android.widget.ProgressBar
 import androidx.activity.viewModels
-import androidx.appcompat.app.AlertDialog
+import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import androidx.appcompat.app.AppCompatActivity
 import androidx.appcompat.app.AppCompatDelegate
 import androidx.appcompat.app.TxContextWrappingDelegate
@@ -208,7 +208,7 @@ class BookPreviewActivity : AppCompatActivity(R.layout.activity_book_preview) {
   }
 
   private fun handlePreviewDownloadFailed() {
-    AlertDialog.Builder(this)
+    MaterialAlertDialogBuilder(this)
       .setTitle(R.string.bookPreviewFailedTitle)
       .setMessage(R.string.bookPreviewFailedMessage)
       .setOnDismissListener { this.onBackPressed() }