+ private lateinit var addDomainListener: AddDomainListener
+
// The public interface is used to send information back to the parent activity.
interface AddDomainListener {
// The public interface is used to send information back to the parent activity.
interface AddDomainListener {
- fun onAddDomain(dialogFragment: DialogFragment)
+ fun addDomain(dialogFragment: DialogFragment)
}
}
- // The add domain listener is initialized in `onAttach()` and used in `onCreateDialog()`.
- private lateinit var addDomainListener: AddDomainListener
-
override fun onAttach(context: Context) {
// Run the default commands.
super.onAttach(context)
override fun onAttach(context: Context) {
// Run the default commands.
super.onAttach(context)
@@ -58,14+60,12 @@ class AddDomainDialog: DialogFragment() {
}
companion object {
}
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
- fun addDomain(urlString: String): AddDomainDialog {
+ fun addDomain(urlString: String?): AddDomainDialog {
dialogBuilder.setPositiveButton(R.string.add) { _: DialogInterface, _: Int ->
// Return the dialog fragment to the parent activity on add.
dialogBuilder.setPositiveButton(R.string.add) { _: DialogInterface, _: Int ->
// Return the dialog fragment to the parent activity on add.
- addDomainListener.onAddDomain(this)
+ addDomainListener.addDomain(this)
}
// Create an alert dialog from the builder.
val alertDialog = dialogBuilder.create()
// Get a handle for the shared preferences.
}
// Create an alert dialog from the builder.
val alertDialog = dialogBuilder.create()
// Get a handle for the shared preferences.
- val sharedPreferences = PreferenceManager.getDefaultSharedPreferences(context)
+ val sharedPreferences = PreferenceManager.getDefaultSharedPreferences(requireContext())
// Get the screenshot preference.
// 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) {
// Disable screenshots if not allowed.
if (!allowScreenshots) {
@@ -125,8+123,8 @@ class AddDomainDialog: DialogFragment() {
// The alert dialog must be shown before the contents can be modified.
alertDialog.show()
// The alert dialog must be shown before the contents can be modified.
alertDialog.show()
- // Initialize the domains database helper. The `0` specifies the database version, but that is ignored and set instead using a constant in domains database helper.
- val domainsDatabaseHelper = DomainsDatabaseHelper(context, null, null, 0)
+ // Initialize the domains database helper.
+ val domainsDatabaseHelper = DomainsDatabaseHelper(requireContext())
// Get handles for the views in the alert dialog.
val addDomainEditText = alertDialog.findViewById<EditText>(R.id.domain_name_edittext)!!
// Get handles for the views in the alert dialog.
val addDomainEditText = alertDialog.findViewById<EditText>(R.id.domain_name_edittext)!!
@@ -171,7+169,7 @@ class AddDomainDialog: DialogFragment() {
// Check the key code and event.
if (keyCode == KeyEvent.KEYCODE_ENTER && keyEvent.action == KeyEvent.ACTION_DOWN) { // The event is a key-down on the enter key.
// Trigger the add domain listener and return the dialog fragment to the parent activity.
// Check the key code and event.
if (keyCode == KeyEvent.KEYCODE_ENTER && keyEvent.action == KeyEvent.ACTION_DOWN) { // The event is a key-down on the enter key.
// Trigger the add domain listener and return the dialog fragment to the parent activity.