Migrate the remaining classes to Kotlin. https://redmine.stoutner.com/issues/989

[PrivacyBrowserAndroid.git] / app / src / main / java / com / stoutner / privacybrowser / dialogs / ViewRequestDialog.kt

diff --git a/app/src/main/java/com/stoutner/privacybrowser/dialogs/ViewRequestDialog.kt b/app/src/main/java/com/stoutner/privacybrowser/dialogs/ViewRequestDialog.kt
index 2c80301ba416df58bc863398186043b5ac17a10f..8c9aed2f581c55b5a0adbc156b25a72fdda099a7 100644 (file)
--- a/app/src/main/java/com/stoutner/privacybrowser/dialogs/ViewRequestDialog.kt
+++ b/app/src/main/java/com/stoutner/privacybrowser/dialogs/ViewRequestDialog.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2018-2022 Soren Stoutner <soren@stoutner.com>.
+ * Copyright 2018-2023 Soren Stoutner <soren@stoutner.com>.
  *
  * This file is part of Privacy Browser Android <https://www.stoutner.com/privacy-browser-android>.
  *
@@ -22,13 +22,13 @@ package com.stoutner.privacybrowser.dialogs
 import android.app.Dialog
 import android.content.Context
 import android.content.DialogInterface
-import android.content.res.Configuration
 import android.os.Bundle
 import android.view.View
 import android.view.WindowManager
 import android.widget.TextView
 
 import androidx.appcompat.app.AlertDialog
+import androidx.core.content.ContextCompat.getColor
 import androidx.fragment.app.DialogFragment
 import androidx.preference.PreferenceManager
 
@@ -41,29 +41,7 @@ private const val IS_LAST_REQUEST = "is_last_request"
 private const val REQUEST_DETAILS = "request_details"
 
 class ViewRequestDialog : DialogFragment() {
-    // Define the class variables.
-    private lateinit var viewRequestListener: ViewRequestListener
-
-    // The public interface is used to send information back to the parent activity.
-    interface ViewRequestListener {
-        // Show the previous request.
-        fun onPrevious(currentId: Int)
-
-        // Show the next request.
-        fun onNext(currentId: Int)
-    }
-
-    override fun onAttach(context: Context) {
-        // Run the default commands.
-        super.onAttach(context)
-
-        // Get a handle for the listener from the launching context.
-        viewRequestListener = context as ViewRequestListener
-    }
-
     companion object {
-        // `@JvmStatic` will no longer be required once all the code has transitioned to Kotlin.
-        @JvmStatic
         fun request(id: Int, isLastRequest: Boolean, requestDetails: Array<String>): ViewRequestDialog {
             // Create a bundle.
             val bundle = Bundle()
@@ -84,6 +62,26 @@ class ViewRequestDialog : DialogFragment() {
         }
     }
 
+    // Define the class variables.
+    private lateinit var viewRequestListener: ViewRequestListener
+
+    // The public interface is used to send information back to the parent activity.
+    interface ViewRequestListener {
+        // Show the previous request.
+        fun onPrevious(currentId: Int)
+
+        // Show the next request.
+        fun onNext(currentId: Int)
+    }
+
+    override fun onAttach(context: Context) {
+        // Run the default commands.
+        super.onAttach(context)
+
+        // Get a handle for the listener from the launching context.
+        viewRequestListener = context as ViewRequestListener
+    }
+
     override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
         // Get the arguments from the bundle.
         val id = requireArguments().getInt(ID)
@@ -93,11 +91,8 @@ class ViewRequestDialog : DialogFragment() {
         // Use an alert dialog builder to create the alert dialog.
         val dialogBuilder = AlertDialog.Builder(requireContext(), R.style.PrivacyBrowserAlertDialog)
 
-        // Get the current theme status.
-        val currentThemeStatus = resources.configuration.uiMode and Configuration.UI_MODE_NIGHT_MASK
-
-        // Set the icon according to the theme.
-        dialogBuilder.setIconAttribute(R.attr.blockAdsBlueIcon)
+        // Set the icon.
+        dialogBuilder.setIcon(R.drawable.block_ads_enabled)
 
         // Set the title.
         dialogBuilder.setTitle(resources.getString(R.string.request_details) + " - " + id)
@@ -164,50 +159,31 @@ class ViewRequestDialog : DialogFragment() {
                 // Set the text.
                 requestDisposition.setText(R.string.default_allowed)
 
-                // Set the background color.  The deprecated `getColor()` must be used until the minimum API >= 23.
-                @Suppress("DEPRECATION")
-                requestDisposition.setBackgroundColor(resources.getColor(R.color.transparent))
+                // Set the background color to be transparent.
+                requestDisposition.setBackgroundColor(getColor(requireContext(), R.color.transparent))
             }
 
             BlocklistHelper.REQUEST_ALLOWED -> {
                 // Set the text.
                 requestDisposition.setText(R.string.allowed)
 
-                // Set the background color according to the theme.  The deprecated `getColor()` must be used until the minimum API >= 23.
-                if (currentThemeStatus == Configuration.UI_MODE_NIGHT_NO) {
-                    @Suppress("DEPRECATION")
-                    requestDisposition.setBackgroundColor(resources.getColor(R.color.blue_100))
-                } else {
-                    @Suppress("DEPRECATION")
-                    requestDisposition.setBackgroundColor(resources.getColor(R.color.blue_700_50))
-                }
+                // Set the background color to be blue.
+                requestDisposition.setBackgroundColor(getColor(requireContext(), R.color.blue_background))
             }
 
             BlocklistHelper.REQUEST_THIRD_PARTY -> {
                 // Set the text.
                 requestDisposition.setText(R.string.third_party_blocked)
 
-                // Set the background color according to the theme.  The deprecated `getColor()` must be used until the minimum API >= 23.
-                if (currentThemeStatus == Configuration.UI_MODE_NIGHT_NO) {
-                    @Suppress("DEPRECATION")
-                    requestDisposition.setBackgroundColor(resources.getColor(R.color.yellow_100))
-                } else {
-                    @Suppress("DEPRECATION")
-                    requestDisposition.setBackgroundColor(resources.getColor(R.color.yellow_700_50))
-                }
+                // Set the background color to be yellow.
+                requestDisposition.setBackgroundColor(getColor(requireContext(), R.color.yellow_background))
             }
             BlocklistHelper.REQUEST_BLOCKED -> {
                 // Set the text.
                 requestDisposition.setText(R.string.blocked)
 
-                // Set the background color according to the theme.  The deprecated `getColor()` must be used until the minimum API >= 23.
-                if (currentThemeStatus == Configuration.UI_MODE_NIGHT_NO) {
-                    @Suppress("DEPRECATION")
-                    requestDisposition.setBackgroundColor(resources.getColor(R.color.red_100))
-                } else {
-                    @Suppress("DEPRECATION")
-                    requestDisposition.setBackgroundColor(resources.getColor(R.color.red_700_40))
-                }
+                // Set the background color to be red.
+                requestDisposition.setBackgroundColor(getColor(requireContext(), R.color.red_background))
             }
         }
 
@@ -259,4 +235,4 @@ class ViewRequestDialog : DialogFragment() {
         // Return the alert dialog.
         return alertDialog
     }
-}
\ No newline at end of file
+}