Just a bit of code cleanup

Waboodoo · Apr 30, 2022 · 571d179 · 571d179
1 parent 246970f
commit 571d179
Show file tree

Hide file tree

Showing 7 changed files with 17 additions and 25 deletions.
diff --git a/...Shortcuts/app/src/main/kotlin/ch/rmy/android/http_shortcuts/activities/ExecuteActivity.kt b/...Shortcuts/app/src/main/kotlin/ch/rmy/android/http_shortcuts/activities/ExecuteActivity.kt
@@ -437,7 +437,7 @@ class ExecuteActivity : BaseActivity(), Entrypoint {
             .dismissListener {
                 emitter.cancel()
             }
-            .positive(getString(R.string.action_label_select)) {
+            .positive(R.string.action_label_select) {
                 WifiUtil.showWifiPicker(this)
             }
             .negative(R.string.dialog_cancel)

diff --git a/...my/android/http_shortcuts/activities/editor/advancedsettings/AdvancedSettingsViewModel.kt b/...my/android/http_shortcuts/activities/editor/advancedsettings/AdvancedSettingsViewModel.kt
@@ -96,7 +96,7 @@ class AdvancedSettingsViewModel(application: Application) : BaseViewModel<Unit,
         )
     }
 
-    fun onTimeoutChanged(timeout: Duration) {
+    private fun onTimeoutChanged(timeout: Duration) {
         updateViewState {
             copy(timeout = timeout)
         }

diff --git a/.../android/http_shortcuts/activities/editor/executionsettings/ExecutionSettingsViewModel.kt b/.../android/http_shortcuts/activities/editor/executionsettings/ExecutionSettingsViewModel.kt
@@ -82,7 +82,7 @@ class ExecutionSettingsViewModel(application: Application) : BaseViewModel<Unit,
         )
     }
 
-    fun onDelayChanged(delay: Duration) {
+    private fun onDelayChanged(delay: Duration) {
         performOperation(
             temporaryShortcutRepository.setDelay(delay)
         )

diff --git a/...in/ch/rmy/android/http_shortcuts/activities/editor/shortcuts/TriggerShortcutsViewModel.kt b/...in/ch/rmy/android/http_shortcuts/activities/editor/shortcuts/TriggerShortcutsViewModel.kt
@@ -150,11 +150,11 @@ class TriggerShortcutsViewModel(application: Application) :
         }
     }
 
-    fun onAddShortcutDialogConfirmed(shortcutId: ShortcutId) {
+    private fun onAddShortcutDialogConfirmed(shortcutId: ShortcutId) {
         shortcutIdsInUse = shortcutIdsInUse.plus(shortcutId)
     }
 
-    fun onRemoveShortcutDialogConfirmed(shortcutId: ShortcutId) {
+    private fun onRemoveShortcutDialogConfirmed(shortcutId: ShortcutId) {
         shortcutIdsInUse = shortcutIdsInUse.filter { it != shortcutId }
     }
 

diff --git a/...app/src/main/kotlin/ch/rmy/android/http_shortcuts/activities/misc/share/ShareViewModel.kt b/...app/src/main/kotlin/ch/rmy/android/http_shortcuts/activities/misc/share/ShareViewModel.kt
@@ -19,6 +19,7 @@ import ch.rmy.android.http_shortcuts.data.domains.variables.VariableRepository
 import ch.rmy.android.http_shortcuts.data.enums.ParameterType
 import ch.rmy.android.http_shortcuts.data.models.ShortcutModel
 import ch.rmy.android.http_shortcuts.data.models.VariableModel
+import ch.rmy.android.http_shortcuts.utils.FileTypeUtil
 import ch.rmy.android.http_shortcuts.variables.VariableLookup
 import ch.rmy.android.http_shortcuts.variables.VariableManager
 import ch.rmy.android.http_shortcuts.variables.VariableResolver
@@ -115,7 +116,7 @@ class ShareViewModel(application: Application) : BaseViewModel<ShareViewModel.In
     private fun handleFileSharing() {
         val isImage = fileUris.singleOrNull()
             ?.let(context.contentResolver::getType)
-            ?.contains("image", ignoreCase = true)
+            ?.let(FileTypeUtil::isImage)
         val shortcutsForFileSharing = getTargetableShortcutsForFileSharing(isImage)
         when (shortcutsForFileSharing.size) {
             0 -> {

diff --git a/...rc/main/kotlin/ch/rmy/android/http_shortcuts/activities/widget/WidgetSettingsViewModel.kt b/...rc/main/kotlin/ch/rmy/android/http_shortcuts/activities/widget/WidgetSettingsViewModel.kt
@@ -82,7 +82,7 @@ class WidgetSettingsViewModel(application: Application) :
         }
     }
 
-    fun onLabelColorSelected(color: Int) {
+    private fun onLabelColorSelected(color: Int) {
         updateViewState {
             copy(labelColor = color)
         }

diff --git a/HTTPShortcuts/app/src/main/kotlin/ch/rmy/android/http_shortcuts/utils/DialogBuilder.kt b/HTTPShortcuts/app/src/main/kotlin/ch/rmy/android/http_shortcuts/utils/DialogBuilder.kt
@@ -119,31 +119,22 @@ open class DialogBuilder(val context: Context) {
         dialog.setOnDismissListener { onDismissListener() }
     }
 
-    fun positive(@StringRes buttonText: Int, action: ((MaterialDialog) -> Unit)? = null) =
-        positive(context.getString(buttonText), action)
-
-    fun positive(buttonText: String, action: ((MaterialDialog) -> Unit)? = null) = also {
-        dialog.positiveButton(text = buttonText, click = {
+    fun positive(@StringRes buttonText: Int, action: ((MaterialDialog) -> Unit)? = null) = also {
+        dialog.positiveButton(buttonText) {
             action?.invoke(it)
-        })
+        }
     }
 
-    fun negative(@StringRes buttonText: Int, action: ((MaterialDialog) -> Unit)? = null) =
-        negative(context.getString(buttonText), action)
-
-    fun negative(buttonText: String, action: ((MaterialDialog) -> Unit)? = null) = also {
-        dialog.negativeButton(text = buttonText, click = {
+    fun negative(@StringRes buttonText: Int, action: ((MaterialDialog) -> Unit)? = null) = also {
+        dialog.negativeButton(buttonText) {
             action?.invoke(it)
-        })
+        }
     }
 
-    fun neutral(@StringRes buttonText: Int, action: ((MaterialDialog) -> Unit)? = null) =
-        neutral(context.getString(buttonText), action)
-
-    fun neutral(buttonText: String, action: ((MaterialDialog) -> Unit)? = null) = also {
-        dialog.neutralButton(text = buttonText, click = {
+    fun neutral(@StringRes buttonText: Int, action: ((MaterialDialog) -> Unit)? = null) = also {
+        dialog.neutralButton(buttonText) {
             action?.invoke(it)
-        })
+        }
     }
 
     @SuppressLint("CheckResult")