Fix import/export dialog behaviour broken

hhpmmd · Aug 30, 2021 · 2179204 · 2179204
1 parent 8c79725
commit 2179204
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 11 deletions.
diff --git a/app/src/main/java/com/samco/trackandgraph/displaytrackgroup/ExportFeaturesDialog.kt b/app/src/main/java/com/samco/trackandgraph/displaytrackgroup/ExportFeaturesDialog.kt
@@ -79,19 +79,15 @@ class ExportFeaturesDialog : DialogFragment() {
             alertDialog = builder.create()
             alertDialog.setCanceledOnTouchOutside(true)
             alertDialog.setOnShowListener { setAlertDialogShowListeners() }
-            alertDialog.setOnShowListener {
-                val negativeButton = alertDialog.getButton(android.app.AlertDialog.BUTTON_NEGATIVE)
-                negativeButton.setTextColor(requireContext().getColorFromAttr(R.attr.colorControlNormal))
-            }
             alertDialog
         } ?: throw IllegalStateException("Activity cannot be null")
     }
 
     private fun setAlertDialogShowListeners() {
         positiveButton = alertDialog.getButton(AlertDialog.BUTTON_POSITIVE)
         positiveButton.setTextColor(positiveButton.context.getColorFromAttr(R.attr.colorSecondary))
-        alertDialog.getButton(AlertDialog.BUTTON_NEGATIVE)
-            .setTextColor(alertDialog.context.getColorFromAttr(R.attr.colorControlNormal))
+        alertDialog.getButton(android.app.AlertDialog.BUTTON_NEGATIVE)
+            .setTextColor(requireContext().getColorFromAttr(R.attr.colorControlNormal))
         positiveButton.isEnabled = false
         viewModel.loadFeatures(requireActivity(), groupId!!)
         listenToState()

diff --git a/app/src/main/java/com/samco/trackandgraph/displaytrackgroup/ImportFeaturesDialog.kt b/app/src/main/java/com/samco/trackandgraph/displaytrackgroup/ImportFeaturesDialog.kt
@@ -71,10 +71,6 @@ class ImportFeaturesDialog : DialogFragment() {
             alertDialog = builder.create()
             alertDialog.setCanceledOnTouchOutside(true)
             alertDialog.setOnShowListener { setAlertDialogShowListeners() }
-            alertDialog.setOnShowListener {
-                val negativeButton = alertDialog.getButton(android.app.AlertDialog.BUTTON_NEGATIVE)
-                negativeButton.setTextColor(requireContext().getColorFromAttr(R.attr.colorControlNormal))
-            }
             alertDialog
         } ?: throw IllegalStateException("Activity cannot be null")
     }
@@ -88,7 +84,7 @@ class ImportFeaturesDialog : DialogFragment() {
         listenToImportState()
         listenToException()
         val negativeButton = alertDialog.getButton(AlertDialog.BUTTON_NEGATIVE)
-        negativeButton.setTextColor(negativeButton.context.getColorFromAttr(R.attr.colorControlNormal))
+        negativeButton.setTextColor(requireContext().getColorFromAttr(R.attr.colorControlNormal))
         negativeButton.setOnClickListener { dismiss() }
         alertDialog.setOnCancelListener { run {} }
     }