dialogs code cleanup

app/src/main/java/com/sduduzog/slimlauncher/dialogs/ChangeThemeDialog.kt

@@ -9,13 +9,13 @@ import androidx.core.content.edit
 import androidx.fragment.app.DialogFragment
 import com.sduduzog.slimlauncher.R
 
-class ChangeThemeDialog : DialogFragment(){
+class ChangeThemeDialog private constructor() : DialogFragment() {
 
     private lateinit var settings: SharedPreferences
 
     override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
-        val builder = AlertDialog.Builder(context!!)
-        settings  = context!!.getSharedPreferences(getString(R.string.prefs_settings), MODE_PRIVATE)
+        val builder = AlertDialog.Builder(context)
+        settings = context!!.getSharedPreferences(getString(R.string.prefs_settings), MODE_PRIVATE)
 
         val active = settings.getInt(getString(R.string.prefs_settings_key_theme), 0)
         builder.setTitle(R.string.choose_theme_dialog_title)
@@ -29,8 +29,6 @@ class ChangeThemeDialog : DialogFragment(){
     }
 
     companion object {
-        fun getThemeChooser(): ChangeThemeDialog{
-            return ChangeThemeDialog()
-        }
+        fun getThemeChooser(): ChangeThemeDialog = ChangeThemeDialog()
     }
 }

app/src/main/java/com/sduduzog/slimlauncher/dialogs/ChooseTimeFormatDialog.kt

@@ -9,22 +9,21 @@ import androidx.core.content.edit
 import androidx.fragment.app.DialogFragment
 import com.sduduzog.slimlauncher.R
 
-class ChooseTimeFormatDialog : DialogFragment(){
+class ChooseTimeFormatDialog private constructor() : DialogFragment() {
 
     private lateinit var settings: SharedPreferences
 
     override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
-        val builder = AlertDialog.Builder(context!!)
+        val builder = AlertDialog.Builder(context)
         settings = context!!.getSharedPreferences(getString(R.string.prefs_settings), MODE_PRIVATE)
 
         val is24Hour = settings.getBoolean(getString(R.string.prefs_settings_key_time_format), true)
         val index = if (is24Hour) 1 else 0
         builder.setTitle(R.string.choose_time_format_dialog_title)
-        builder.setSingleChoiceItems(R.array.time_format_array, index) {dialogInterface, i ->
+        builder.setSingleChoiceItems(R.array.time_format_array, index) { dialogInterface, i ->
             dialogInterface.dismiss()
             settings.edit {
-                val b = i != 0
-                putBoolean(getString(R.string.prefs_settings_key_time_format), b)
+                putBoolean(getString(R.string.prefs_settings_key_time_format), i != 0)
             }
 
         }
@@ -33,8 +32,6 @@ class ChooseTimeFormatDialog : DialogFragment(){
 
 
     companion object {
-        fun getInstance(): ChooseTimeFormatDialog{
-            return ChooseTimeFormatDialog()
-        }
+        fun getInstance(): ChooseTimeFormatDialog = ChooseTimeFormatDialog()
     }
 }

app/src/main/java/com/sduduzog/slimlauncher/dialogs/RenameAppDialog.kt

@@ -12,21 +12,22 @@ import com.sduduzog.slimlauncher.data.MainViewModel
 import com.sduduzog.slimlauncher.data.model.HomeApp
 import kotlinx.android.synthetic.main.customise_apps_fragment.*
 
-class RenameAppDialog : DialogFragment() {
-
-    private lateinit var app: HomeApp
-    private lateinit var model: MainViewModel
+class RenameAppDialog private constructor(
+        private val app: HomeApp,
+        private val model: MainViewModel
+) : DialogFragment() {
 
     override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
         val view = LayoutInflater.from(context).inflate(R.layout.rename_dialog_edit_text, customise_apps_fragment, false)
         val editText: EditText = view.findViewById(R.id.rename_editText)
         editText.text.append(app.appName)
-        val builder = AlertDialog.Builder(context!!)
-        builder.setTitle("Rename ${app.appName}")
-        builder.setView(view)
-        builder.setPositiveButton("DONE") { _, _ ->
-            val name = editText.text.toString()
-            updateApp(name)
+        val builder = AlertDialog.Builder(context!!).apply {
+            setTitle("Rename ${app.appName}")
+            setView(view)
+            setPositiveButton("DONE") { _, _ ->
+                val name = editText.text.toString()
+                updateApp(name)
+            }
         }
         editText.setOnEditorActionListener { v, _, _ ->
             val name = v.text.toString()
@@ -47,11 +48,6 @@ class RenameAppDialog : DialogFragment() {
     }
 
     companion object {
-        fun getInstance(app: HomeApp, model: MainViewModel): RenameAppDialog {
-            return RenameAppDialog().apply {
-                this.model = model
-                this.app = app
-            }
-        }
+        fun getInstance(app: HomeApp, model: MainViewModel) = RenameAppDialog(app, model)
     }
 }