Improve the skip behaviour strings

DeweyReed · DeweyReed · commit eebe06914410 · 2025-10-13T14:36:32.000+08:00
diff --git a/app-base/src/main/res/values-zh-rCN/strings.xml b/app-base/src/main/res/values-zh-rCN/strings.xml
@@ -223,6 +223,10 @@
     <string name="behaviour_image">图片</string>
     <string name="behaviour_image_help">为该步骤附加一张图片</string>
     <string name="image_pick">选择图片</string>
+    <string name="behaviour_skip">跳过</string>
+    <string name="behaviour_skip_help">在某些循环中跳过此步骤</string>
+    <string name="skip_first">在首次循环中</string>
+    <string name="skip_last">在末次循环中</string>
     <!--Sample timers strings-->
     <string name="sample_timer_template_title">计时器模板</string>
     <string name="sample_timer_template_prepare">准备</string>
diff --git a/app-base/src/main/res/values-zh-rHK/strings.xml b/app-base/src/main/res/values-zh-rHK/strings.xml
@@ -223,6 +223,10 @@
     <string name="behaviour_image">圖片</string>
     <string name="behaviour_image_help">爲該步驟附加一張圖片</string>
     <string name="image_pick">選擇圖片</string>
+    <string name="behaviour_skip">跳過</string>
+    <string name="behaviour_skip_help">在某些循環中跳過此步驟</string>
+    <string name="skip_first">在首次循環中</string>
+    <string name="skip_last">在末次循環中</string>
     <!--Sample timers strings-->
     <string name="sample_timer_template_title">計時器模板</string>
     <string name="sample_timer_template_prepare">準備</string>
diff --git a/app-base/src/main/res/values-zh-rTW/strings.xml b/app-base/src/main/res/values-zh-rTW/strings.xml
@@ -223,6 +223,10 @@
     <string name="behaviour_image">圖片</string>
     <string name="behaviour_image_help">為該步驟附加一張圖片</string>
     <string name="image_pick">選擇圖片</string>
+    <string name="behaviour_skip">跳過</string>
+    <string name="behaviour_skip_help">在某些迴圈中跳過此步驟</string>
+    <string name="skip_first">在首次迴圈中</string>
+    <string name="skip_last">在末次迴圈中</string>
     <!--Sample timers strings-->
     <string name="sample_timer_template_title">計時器模板</string>
     <string name="sample_timer_template_prepare">準備</string>
diff --git a/app-base/src/main/res/values/strings.xml b/app-base/src/main/res/values/strings.xml
@@ -277,14 +277,12 @@
 
     <string name="behaviour_image">Image</string>
     <string name="behaviour_image_help">Attach an image for the step</string>
-
     <string name="image_pick">Pick an image</string>
 
     <string name="behaviour_skip">Skip</string>
     <string name="behaviour_skip_help">Skip this step in some loops</string>
-    <string name="behaviour_skip_first">In the first loop</string>
-    <string name="behaviour_skip_last">In the last loop</string>
-    <string name="behaviour_skip_loops">Loops</string>
+    <string name="skip_first">In the first loop</string>
+    <string name="skip_last">In the last loop</string>
 
     <!--Sample timers strings-->
     <string name="sample_timer_template_title">Timer Template</string>
diff --git a/app-timer-edit/src/main/java/xyz/aprildown/timer/app/timer/edit/BehaviourSettingsView.kt b/app-timer-edit/src/main/java/xyz/aprildown/timer/app/timer/edit/BehaviourSettingsView.kt
@@ -344,15 +344,15 @@ internal fun MaterialPopupMenuBuilder.addSkipItems(
     section {
         item {
             label = buildString {
-                append(context.getString(RBase.string.behaviour_skip_loops))
+                append(context.getString(RBase.string.name_loop_loop_hint))
                 append(": ")
                 append(
                     when (val target = action.target) {
                         SkipAction.Target.First -> {
-                            context.getString(RBase.string.behaviour_skip_first)
+                            context.getString(RBase.string.skip_first)
                         }
                         SkipAction.Target.Last -> {
-                            context.getString(RBase.string.behaviour_skip_last)
+                            context.getString(RBase.string.skip_last)
                         }
                         is SkipAction.Target.Loops -> {
                             target.loopNumbers.joinToString()
diff --git a/app-timer-edit/src/main/java/xyz/aprildown/timer/app/timer/edit/media/SkipDialog.kt b/app-timer-edit/src/main/java/xyz/aprildown/timer/app/timer/edit/media/SkipDialog.kt
@@ -12,7 +12,7 @@ import xyz.aprildown.timer.app.base.R as RBase
 internal class SkipDialog(private val context: Context) {
     fun showTargetDialog(oldTarget: SkipAction.Target, func: (SkipAction.Target) -> Unit) {
         val builder = MaterialAlertDialogBuilder(context)
-            .setTitle(RBase.string.behaviour_skip_loops)
+            .setTitle(RBase.string.name_loop_loop_hint)
             .setPositiveButton(RBase.string.ok, null)
             .setNegativeButton(RBase.string.cancel, null)
 
diff --git a/app-timer-edit/src/main/res/layout/dialog_skip_target.xml b/app-timer-edit/src/main/res/layout/dialog_skip_target.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
@@ -20,7 +21,7 @@
             android:gravity="center_vertical"
             android:paddingStart="20dp"
             android:paddingEnd="0dp"
-            android:text="@string/behaviour_skip_first"
+            android:text="@string/skip_first"
             android:textAppearance="?android:textAppearanceMedium"
             android:textColor="?textColorAlertDialogListItem" />
 
@@ -40,7 +41,7 @@
             android:gravity="center_vertical"
             android:paddingStart="20dp"
             android:paddingEnd="0dp"
-            android:text="@string/behaviour_skip_last"
+            android:text="@string/skip_last"
             android:textAppearance="?android:textAppearanceMedium"
             android:textColor="?textColorAlertDialogListItem" />
 
@@ -68,13 +69,13 @@
             style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.Dense"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:hint="@string/behaviour_skip_loops">
+            android:hint="@string/name_loop_loop_hint"
+            app:placeholderText="0 1 2">
 
             <com.google.android.material.textfield.TextInputEditText
                 android:id="@+id/edit"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:hint="1 2 3"
                 android:imeOptions="actionDone"
                 android:importantForAutofill="no"
                 android:inputType="number|text"
diff --git a/component-key/src/main/java/xyz/aprildown/timer/component/key/behaviour/BehaviourLayoutUtils.kt b/component-key/src/main/java/xyz/aprildown/timer/component/key/behaviour/BehaviourLayoutUtils.kt
@@ -83,10 +83,10 @@ internal fun BehaviourEntity.getChipText(context: Context): String {
                 append(
                     when (val target = toSkipAction().target) {
                         SkipAction.Target.First -> {
-                            context.getString(RBase.string.behaviour_skip_first)
+                            context.getString(RBase.string.skip_first)
                         }
                         SkipAction.Target.Last -> {
-                            context.getString(RBase.string.behaviour_skip_last)
+                            context.getString(RBase.string.skip_last)
                         }
                         is SkipAction.Target.Loops -> {
                             target.loopNumbers.joinToString()

Original file line number	Diff line number	Diff line change
`@@ -83,10 +83,10 @@ internal fun BehaviourEntity.getChipText(context: Context): String {`
`83`	`83`	`append(`
`84`	`84`	`when (val target = toSkipAction().target) {`
`85`	`85`	`SkipAction.Target.First -> {`
`86`		`- context.getString(RBase.string.behaviour_skip_first)`
	`86`	`+ context.getString(RBase.string.skip_first)`
`87`	`87`	`}`
`88`	`88`	`SkipAction.Target.Last -> {`
`89`		`- context.getString(RBase.string.behaviour_skip_last)`
	`89`	`+ context.getString(RBase.string.skip_last)`
`90`	`90`	`}`
`91`	`91`	`is SkipAction.Target.Loops -> {`
`92`	`92`	`target.loopNumbers.joinToString()`