Select the prefilled text by default in SimpleInputDialog

Author: DeweyReed

app-timer-list/src/main/java/xyz/aprildown/timer/app/timer/list/FolderToolbar.kt

@@ -41,8 +41,14 @@ internal class FolderToolbar(
         cardElevation = context.dimen(R.dimen.elevation_timer_card).toFloat()
         binding = ViewFolderToolbarBinding.inflate(LayoutInflater.from(context), this)
 
-        fun requestFolderName(f: (String) -> Unit) {
-            SimpleInputDialog(context).show(titleRes = RBase.string.folder_name) {
+        fun requestFolderName(
+            prefill: String? = null,
+            f: (String) -> Unit,
+        ) {
+            SimpleInputDialog(context).show(
+                titleRes = RBase.string.folder_name,
+                preFill = prefill,
+            ) {
                 if (it.isNotBlank()) {
                     f.invoke(it)
                 }
@@ -124,7 +130,10 @@ internal class FolderToolbar(
                         item {
                             labelRes = RBase.string.folder_rename
                             callback = {
-                                requestFolderName {
+                                requestFolderName(
+                                    prefill = binding.textFolderToolbarCurrent.text.toString()
+                                        .takeIf { it.isNotBlank() },
+                                ) {
                                     this@FolderToolbar.callback?.onChangeCurrentFolderName(it)
                                 }
                             }

app-timer-one/src/main/java/xyz/aprildown/timer/app/timer/one/BaseOneFragment.kt

@@ -39,6 +39,7 @@ import xyz.aprildown.timer.presentation.one.OneViewModel
 import xyz.aprildown.timer.presentation.stream.MachineContract
 import xyz.aprildown.timer.presentation.stream.StreamState
 import xyz.aprildown.timer.presentation.stream.TimerIndex
+import xyz.aprildown.timer.presentation.stream.getLoop
 import xyz.aprildown.timer.presentation.stream.getStep
 import javax.inject.Inject
 import javax.inject.Provider
@@ -245,7 +246,9 @@ abstract class BaseOneFragment<T : ViewBinding>(
     protected fun showPickLoopDialog(maxLoop: Int, onPick: (Int) -> Unit) {
         SimpleInputDialog(requireContext()).show(
             inputType = InputType.TYPE_CLASS_NUMBER,
-            hint = getString(RBase.string.name_loop_loop_hint)
+            preFill = viewModel.timerCurrentIndex.value
+                ?.getLoop(viewModel.timer.value?.loop ?: 0)?.toString(),
+            hint = getString(RBase.string.name_loop_loop_hint),
         ) { input ->
             input.toIntOrNull()
                 ?.takeIf { it in 1..maxLoop }

component-key/src/main/java/xyz/aprildown/timer/component/key/SimpleInputDialog.kt

@@ -14,7 +14,6 @@ import androidx.core.view.updateLayoutParams
 import com.github.deweyreed.tools.anko.dp
 import com.github.deweyreed.tools.helper.gone
 import com.github.deweyreed.tools.helper.onImeActionClick
-import com.github.deweyreed.tools.helper.setTextAndSelectEnd
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import xyz.aprildown.timer.app.base.R as RBase
 
@@ -71,7 +70,8 @@ class SimpleInputDialog(
         }
 
         if (!preFill.isNullOrBlank()) {
-            edit.setTextAndSelectEnd(preFill)
+            edit.setText(preFill)
+            edit.post { edit.selectAll() }
         }
         if (hint != null) {
             edit.hint = hint

presentation/src/main/java/xyz/aprildown/timer/presentation/stream/TimerIndex.kt

@@ -73,15 +73,15 @@ fun Intent.putTimerIndex(index: TimerIndex?): Intent = apply {
     }
 }
 
-fun TimerIndex?.getNiceLoopString(max: Int = 1): String =
-    "%d/%d".format(
-        this?.let {
-            when (it) {
-                is TimerIndex.Start -> 1
-                is TimerIndex.Step -> it.loopIndex + 1
-                is TimerIndex.Group -> it.loopIndex + 1
-                is TimerIndex.End -> max
-            }
-        } ?: 0,
-        max
-    )
+fun TimerIndex?.getNiceLoopString(max: Int = 1): String {
+    return "%d/%d".format(this?.getLoop(max) ?: 0, max)
+}
+
+fun TimerIndex.getLoop(max: Int): Int {
+    return when (this) {
+        is TimerIndex.Start -> 1
+        is TimerIndex.Step -> loopIndex + 1
+        is TimerIndex.Group -> loopIndex + 1
+        is TimerIndex.End -> max
+    }
+}