Bump the minimum API to 23. https://redmine.stoutner.com/issues/793

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

diff --git a/app/src/main/java/com/stoutner/privacybrowser/dialogs/CreateHomeScreenShortcutDialog.kt b/app/src/main/java/com/stoutner/privacybrowser/dialogs/CreateHomeScreenShortcutDialog.kt
index 69be19d27344fe231a9c3944e75c7423b6ce353c..0a0932fbab31a35fdb17eb3ca1a99003aab4a9b6 100644 (file)
--- a/app/src/main/java/com/stoutner/privacybrowser/dialogs/CreateHomeScreenShortcutDialog.kt
+++ b/app/src/main/java/com/stoutner/privacybrowser/dialogs/CreateHomeScreenShortcutDialog.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2015-2020 Soren Stoutner <soren@stoutner.com>.
+ * Copyright © 2015-2021 Soren Stoutner <soren@stoutner.com>.
  *
  * This file is part of Privacy Browser <https://www.stoutner.com/privacy-browser>.
  *
@@ -19,7 +19,6 @@
 
 package com.stoutner.privacybrowser.dialogs
 
-import android.annotation.SuppressLint
 import android.app.Dialog
 import android.content.DialogInterface
 import android.content.Intent
@@ -50,14 +49,19 @@ import com.stoutner.privacybrowser.R
 
 import java.io.ByteArrayOutputStream
 
-class CreateHomeScreenShortcutDialog: DialogFragment() {
-    // Define the class variables.
+// Define the class constants.
+private const val SHORTCUT_NAME = "shortcut_name"
+private const val URL_STRING = "url_string"
+private const val FAVORITE_ICON_BYTE_ARRAY = "favorite_icon_byte_array"
+
+class CreateHomeScreenShortcutDialog : DialogFragment() {
+    // Declare the class views.
     private lateinit var shortcutNameEditText: EditText
     private lateinit var urlEditText: EditText
     private lateinit var openWithPrivacyBrowserRadioButton: RadioButton
 
     companion object {
-        // `@JvmStatic` will no longer be required once all the code has transitioned to Kotlin.  Also, the function can then be moved out of a companion object and just become a package-level function.
+        // `@JvmStatic` will no longer be required once all the code has transitioned to Kotlin.
         @JvmStatic
         fun createDialog(shortcutName: String, urlString: String, favoriteIconBitmap: Bitmap): CreateHomeScreenShortcutDialog {
             // Create a favorite icon byte array output stream.
@@ -66,16 +70,16 @@ class CreateHomeScreenShortcutDialog: DialogFragment() {
             // Convert the favorite icon to a PNG and place it in the byte array output stream.  `0` is for lossless compression (the only option for a PNG).
             favoriteIconBitmap.compress(Bitmap.CompressFormat.PNG, 0, favoriteIconByteArrayOutputStream)
 
-            // Convert the byte array output stream to a byte array.
+            // Convert the favorite icon byte array output stream to a byte array.
             val favoriteIconByteArray = favoriteIconByteArrayOutputStream.toByteArray()
 
             // Create an arguments bundle.
             val argumentsBundle = Bundle()
 
             // Store the variables in the bundle.
-            argumentsBundle.putString("shortcut_name", shortcutName)
-            argumentsBundle.putString("url_string", urlString)
-            argumentsBundle.putByteArray("favorite_icon_byte_array", favoriteIconByteArray)
+            argumentsBundle.putString(SHORTCUT_NAME, shortcutName)
+            argumentsBundle.putString(URL_STRING, urlString)
+            argumentsBundle.putByteArray(FAVORITE_ICON_BYTE_ARRAY, favoriteIconByteArray)
 
             // Create a new instance of the dialog.
             val createHomeScreenShortcutDialog = CreateHomeScreenShortcutDialog()
@@ -88,34 +92,32 @@ class CreateHomeScreenShortcutDialog: DialogFragment() {
         }
     }
 
-    // `@SuppressLing("InflateParams")` removes the warning about using `null` as the parent view group when inflating the `AlertDialog`.
-    @SuppressLint("InflateParams")
     override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
         // Get the arguments.
         val arguments = requireArguments()
 
-        // Get the strings from the arguments.
-        val initialShortcutName = arguments.getString("shortcut_name")
-        val initialUrlString = arguments.getString("url_string")
-
-        // Get the favorite icon byte array.
-        val favoriteIconByteArray = arguments.getByteArray("favorite_icon_byte_array")!!
+        // Get the variables from the arguments.
+        val initialShortcutName = arguments.getString(SHORTCUT_NAME)
+        val initialUrlString = arguments.getString(URL_STRING)
+        val favoriteIconByteArray = arguments.getByteArray(FAVORITE_ICON_BYTE_ARRAY)!!
 
         // Convert the favorite icon byte array to a bitmap.
         val favoriteIconBitmap = BitmapFactory.decodeByteArray(favoriteIconByteArray, 0, favoriteIconByteArray.size)
 
-        // Use an alert dialog builder to create the dialog.
-        val dialogBuilder = AlertDialog.Builder(requireContext(), R.style.PrivacyBrowserAlertDialog)
-
         // Create a drawable version of the favorite icon.
         val favoriteIconDrawable: Drawable = BitmapDrawable(resources, favoriteIconBitmap)
 
-        // Set the title and icon.
+        // Use an alert dialog builder to create the dialog.
+        val dialogBuilder = AlertDialog.Builder(requireContext(), R.style.PrivacyBrowserAlertDialog)
+
+        // Set the title.
         dialogBuilder.setTitle(R.string.create_shortcut)
+
+        // Set the icon.
         dialogBuilder.setIcon(favoriteIconDrawable)
 
-        // Set the view.  The parent view is null because it will be assigned by the alert dialog.
-        dialogBuilder.setView(requireActivity().layoutInflater.inflate(R.layout.create_home_screen_shortcut_dialog, null))
+        // Set the view.
+        dialogBuilder.setView(R.layout.create_home_screen_shortcut_dialog)
 
         // Set a listener on the close button.  Using null closes the dialog without doing anything else.
         dialogBuilder.setNegativeButton(R.string.cancel, null)
@@ -133,7 +135,7 @@ class CreateHomeScreenShortcutDialog: DialogFragment() {
         val sharedPreferences = PreferenceManager.getDefaultSharedPreferences(context)
 
         // Get the screenshot preference.
-        val allowScreenshots = sharedPreferences.getBoolean("allow_screenshots", false)
+        val allowScreenshots = sharedPreferences.getBoolean(getString(R.string.allow_screenshots_key), false)
 
         // Disable screenshots if not allowed.
         if (!allowScreenshots) {