Support trimming step duration by the music file

DeweyReed · DeweyReed · commit d44feadaf40f · 2025-03-20T16:47:49.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
@@ -133,6 +133,7 @@
     <string name="music_loop">循环</string>
     <string name="music_saf_pick">SAF音乐选择</string>
     <string name="music_saf_pick_desp">如果你想在不授予权限的情况下挑选音乐，或者默认的铃声挑选器不显示你的音乐，启用此选项可能有帮助。</string>
+    <string name="music_trim_step_duration">裁剪步骤时长</string>
     <string name="behaviour_vibration">振动</string>
     <string name="behaviour_vibration_help">在此步骤振动手机</string>
     <string name="vibration_count">次数</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
@@ -133,6 +133,7 @@
     <string name="music_loop">循環</string>
     <string name="music_saf_pick">SAF音樂選擇</string>
     <string name="music_saf_pick_desp">如果你想在不授予權限的情況下挑選音樂，或者默認的鈴聲挑選器不顯示你的音樂，啓用此選項可能有幫助。</string>
+    <string name="music_trim_step_duration">裁剪步驟時長</string>
     <string name="behaviour_vibration">震動</string>
     <string name="behaviour_vibration_help">在此步驟震動手機</string>
     <string name="vibration_count">次數</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
@@ -133,6 +133,7 @@
     <string name="music_loop">循環</string>
     <string name="music_saf_pick">SAF音樂選擇</string>
     <string name="music_saf_pick_desp">如果你想在不授予許可權的情況下挑選音樂，或者預設的鈴聲挑選器不顯示你的音樂，啟用此選項可能有幫助。</string>
+    <string name="music_trim_step_duration">裁剪步驟時長</string>
     <string name="behaviour_vibration">振動</string>
     <string name="behaviour_vibration_help">在此步驟振動手機</string>
     <string name="vibration_count">次數</string>
diff --git a/app-base/src/main/res/values/strings.xml b/app-base/src/main/res/values/strings.xml
@@ -147,6 +147,7 @@
     <string name="music_loop">Loop</string>
     <string name="music_saf_pick">SAF Pick</string>
     <string name="music_saf_pick_desp">If you would like to pick music without granting permission, or the default ringtone picker doesn\'t show your music, enabling this option might help.</string>
+    <string name="music_trim_step_duration">Trim step duration</string>
 
     <string name="behaviour_vibration">Vibration</string>
     <string name="behaviour_vibration_help">Vibrate the phone at this step</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
@@ -14,11 +14,13 @@ import com.github.zawadz88.materialpopupmenu.MaterialPopupMenuBuilder
 import xyz.aprildown.timer.app.base.data.PreferenceData.storedAudioFocusType
 import xyz.aprildown.timer.app.base.data.PreferenceData.storedAudioTypeValue
 import xyz.aprildown.timer.app.base.data.PreferenceData.useVoiceContent2
+import xyz.aprildown.timer.app.base.media.getMediaDuration
 import xyz.aprildown.timer.app.timer.edit.media.BeepDialog
 import xyz.aprildown.timer.app.timer.edit.media.HalfDialog
 import xyz.aprildown.timer.app.timer.edit.media.VibrationDialog
 import xyz.aprildown.timer.app.timer.edit.media.VoiceDialog
 import xyz.aprildown.timer.app.timer.edit.voice.VoiceVariableDialog
+import xyz.aprildown.timer.component.key.ListItem
 import xyz.aprildown.timer.component.key.SimpleInputDialog
 import xyz.aprildown.timer.component.key.switchItem
 import xyz.aprildown.timer.domain.entities.BeepAction
@@ -32,12 +34,14 @@ import xyz.aprildown.timer.domain.entities.VoiceAction
 import xyz.aprildown.timer.domain.utils.Constants
 import xyz.aprildown.tools.helper.safeSharedPreference
 import xyz.aprildown.timer.app.base.R as RBase
+import xyz.aprildown.timer.component.key.R as RComponent
 
 internal fun MaterialPopupMenuBuilder.addMusicItems(
     context: Context,
     action: MusicAction,
     onPickMusicClick: () -> Unit,
-    onLoopChanged: (Boolean) -> Unit
+    onLoopChanged: (Boolean) -> Unit,
+    onTrimStepDuration: (Long) -> Unit,
 ) {
     section {
         item {
@@ -55,6 +59,28 @@ internal fun MaterialPopupMenuBuilder.addMusicItems(
                 onLoopChanged.invoke(isChecked)
             }
         }
+        customItem {
+            layoutResId = RComponent.layout.layout_list_item
+            val uri = action.uri.takeIf { it.isNotBlank() }?.toUri()
+            viewBoundCallback = { view ->
+                val listItem = view as ListItem
+                listItem.setPrimaryText(RBase.string.music_trim_step_duration)
+                listItem.isEnabled = uri != null
+            }
+            if (uri != null) {
+                callback = {
+                    val duration = uri.getMediaDuration(context)
+                    var result = duration / 1000L * 1000L
+                    if (result < duration) {
+                        result += 1000L
+                    }
+                    if (duration >= 1000L) {
+                        onTrimStepDuration(duration)
+                    }
+                }
+            }
+            dismissOnSelect = false
+        }
     }
 }
 
diff --git a/app-timer-edit/src/main/java/xyz/aprildown/timer/app/timer/edit/EditActivity.kt b/app-timer-edit/src/main/java/xyz/aprildown/timer/app/timer/edit/EditActivity.kt
@@ -389,17 +389,23 @@ class EditActivity :
         hideKeyboard()
 
         DurationPicker(this) { hours, minutes, seconds ->
-            val time = (hours * 3600L + minutes * 60L + seconds) * 1000L
-            val item = getStepFromFastAdapter(position)
-            if (item.stepType == StepType.NOTIFIER) {
-                viewModel.notifier = viewModel.notifier.copy(length = time)
-            }
-            item.length = time
-            fastAdapter.notifyAdapterItemChanged(position, EditableStep.Event.Length)
-            postUpdateTotalTime()
+            updateStepLength(
+                position = position,
+                length = (hours * 3600L + minutes * 60L + seconds) * 1000L,
+            )
         }.show()
     }
 
+    private fun updateStepLength(position: Int, length: Long) {
+        val item = getStepFromFastAdapter(position)
+        if (item.stepType == StepType.NOTIFIER) {
+            viewModel.notifier = viewModel.notifier.copy(length = length)
+        }
+        item.length = length
+        fastAdapter.notifyAdapterItemChanged(position, EditableStep.Event.Length)
+        postUpdateTotalTime()
+    }
+
     override fun onAddBtnClick(view: View, position: Int) {
         hideKeyboard()
 
@@ -666,7 +672,10 @@ class EditActivity :
                             changeBehaviour(BehaviourType.MUSIC, position) {
                                 it.toMusicAction().copy(loop = isChecked).toBehaviourEntity()
                             }
-                        }
+                        },
+                        onTrimStepDuration = { duration ->
+                            updateStepLength(position = position, length = duration)
+                        },
                     )
                 }
                 BehaviourType.VIBRATION -> {
diff --git a/app-timer-edit/src/main/java/xyz/aprildown/timer/app/timer/edit/UpdateStepDialog.kt b/app-timer-edit/src/main/java/xyz/aprildown/timer/app/timer/edit/UpdateStepDialog.kt
@@ -5,10 +5,8 @@ import android.content.Intent
 import android.net.Uri
 import android.os.Bundle
 import android.view.View
-import android.widget.EditText
 import androidx.activity.result.PickVisualMediaRequest
 import androidx.activity.result.contract.ActivityResultContracts
-import androidx.cardview.widget.CardView
 import androidx.core.net.toUri
 import androidx.core.widget.ImageViewCompat
 import androidx.fragment.app.DialogFragment
@@ -21,8 +19,9 @@ import xyz.aprildown.timer.app.base.data.PreferenceData.getTypeColor
 import xyz.aprildown.timer.app.base.ui.AppNavigator
 import xyz.aprildown.timer.app.base.ui.StepUpdater
 import xyz.aprildown.timer.app.base.utils.produceTime
+import xyz.aprildown.timer.app.timer.edit.databinding.DialogUpdateStepBinding
+import xyz.aprildown.timer.app.timer.edit.databinding.ItemEditStepBinding
 import xyz.aprildown.timer.component.key.DurationPicker
-import xyz.aprildown.timer.component.key.RoundTextView
 import xyz.aprildown.timer.component.key.behaviour.EditableBehaviourLayout
 import xyz.aprildown.timer.domain.entities.BehaviourEntity
 import xyz.aprildown.timer.domain.entities.BehaviourType
@@ -50,8 +49,7 @@ class UpdateStepDialog :
     @Inject
     lateinit var appNavigator: AppNavigator
 
-    private lateinit var editName: EditText
-    private lateinit var behaviourLayout: EditableBehaviourLayout
+    private lateinit var binding: ItemEditStepBinding
 
     private var length = 0L
 
@@ -75,64 +73,64 @@ class UpdateStepDialog :
 
     override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
         val context = requireContext()
-        val view = View.inflate(context, R.layout.dialog_update_step, null)
+        val dialogBinding = DialogUpdateStepBinding.inflate(layoutInflater)
+        binding = dialogBinding.layoutStep
         val step = step
         val onUpdate = onUpdate
         if (step == null || onUpdate == null) {
             dismiss()
             return super.onCreateDialog(savedInstanceState)
         }
-        view.setUpUpdateStepView(step)
+        binding.setUpUpdateStepView(step)
         return MaterialAlertDialogBuilder(context)
             .setCancelable(false)
             .setTitle(RBase.string.edit_step)
             .setView(view)
             .setPositiveButton(android.R.string.ok) { _, _ ->
                 onUpdate.invoke(
                     StepEntity.Step(
-                        editName.text.toString(),
-                        length,
-                        behaviourLayout.getBehaviours(),
-                        step.type
+                        label = binding.editStepName.text.toString(),
+                        length = length,
+                        behaviour = binding.layoutBehaviour.getBehaviours(),
+                        type = step.type,
                     )
                 )
             }
             .setNegativeButton(android.R.string.cancel, null)
             .create()
     }
 
-    private fun View.setUpUpdateStepView(step: StepEntity.Step) {
-        val context = context
+    private fun ItemEditStepBinding.setUpUpdateStepView(step: StepEntity.Step) {
+        val context = root.context
 
-        findViewById<CardView>(R.id.cardEditStep).cardElevation = 0f
+        cardEditStep.cardElevation = 0f
 
         val color = step.type.getTypeColor(context)
-        ImageViewCompat.setImageTintList(findViewById(R.id.colorStep), color.toColorStateList())
-        findViewById<View>(R.id.viewStepGroupIndicatorStart).gone()
-        findViewById<View>(R.id.viewStepGroupIndicatorEnd).gone()
+        ImageViewCompat.setImageTintList(colorStep, color.toColorStateList())
+        viewStepGroupIndicatorStart.gone()
+        viewStepGroupIndicatorEnd.gone()
 
-        editName = findViewById(R.id.editStepName)
-        editName.setText(step.label)
+        editStepName.setText(step.label)
+
+        textStepLength.setBgColor(color)
 
-        val lengthLabel = findViewById<RoundTextView>(R.id.textStepLength)
-        lengthLabel.setBgColor(color)
-        fun updateLength(length: Long) {
-            lengthLabel.text = length.produceTime()
-            this@UpdateStepDialog.length = length
-        }
         updateLength(step.length)
-        lengthLabel.setOnClickListener {
+        textStepLength.setOnClickListener {
             DurationPicker(context) { hours, minutes, seconds ->
                 updateLength((hours * 3600L + minutes * 60L + seconds) * 1000L)
             }.show()
         }
 
-        findViewById<View>(R.id.btnStepAdd).gone()
+        btnStepAdd.gone()
+
+        layoutBehaviour.setEnabledColor(color)
+        layoutBehaviour.setBehaviours(step.behaviour)
+        layoutBehaviour.setListener(this@UpdateStepDialog)
+    }
 
-        behaviourLayout = findViewById(R.id.layoutBehaviour)
-        behaviourLayout.setEnabledColor(color)
-        behaviourLayout.setBehaviours(step.behaviour)
-        behaviourLayout.setListener(this@UpdateStepDialog)
+    private fun updateLength(length: Long) {
+        binding.textStepLength.text = length.produceTime()
+        this@UpdateStepDialog.length = length
     }
 
     override fun showBehaviourSettingsView(
@@ -177,7 +175,8 @@ class UpdateStepDialog :
                             changeBehaviour(BehaviourType.MUSIC) {
                                 it.toMusicAction().copy(loop = isChecked).toBehaviourEntity()
                             }
-                        }
+                        },
+                        onTrimStepDuration = ::updateLength,
                     )
                 }
                 BehaviourType.VIBRATION -> {
@@ -318,7 +317,7 @@ class UpdateStepDialog :
     ) {
         var found = false
         val newBehaviours = mutableListOf<BehaviourEntity>()
-        behaviourLayout.getBehaviours().forEach {
+        binding.layoutBehaviour.getBehaviours().forEach {
             if (it.type == type) {
                 newBehaviours += transform.invoke(it)
                 found = true
@@ -329,7 +328,7 @@ class UpdateStepDialog :
         if (!found) {
             newBehaviours += transform(BehaviourEntity(type))
         }
-        behaviourLayout.setBehaviours(newBehaviours)
+        binding.layoutBehaviour.setBehaviours(newBehaviours)
     }
 
     companion object : StepUpdater {
diff --git a/app-timer-edit/src/main/res/layout/dialog_update_step.xml b/app-timer-edit/src/main/res/layout/dialog_update_step.xml
@@ -4,6 +4,7 @@
     android:layout_height="wrap_content">
 
     <include
+        android:id="@+id/layoutStep"
         layout="@layout/item_edit_step"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
diff --git a/component-key/src/main/java/xyz/aprildown/timer/component/key/ListItem.kt b/component-key/src/main/java/xyz/aprildown/timer/component/key/ListItem.kt
@@ -85,4 +85,10 @@ class ListItem(
             minimumHeight = res.getDimensionPixelSize(R.dimen.list_item_two_lines_height)
         }
     }
+
+    override fun setEnabled(enabled: Boolean) {
+        super.setEnabled(enabled)
+        primaryTextView.isEnabled = enabled
+        secondaryTextView.isEnabled = enabled
+    }
 }
diff --git a/component-key/src/main/java/xyz/aprildown/timer/component/key/ListItemWithLayout.kt b/component-key/src/main/java/xyz/aprildown/timer/component/key/ListItemWithLayout.kt
@@ -67,6 +67,7 @@ class ListItemWithLayout(
 
     override fun setEnabled(enabled: Boolean) {
         super.setEnabled(enabled)
+        listItem.isEnabled = enabled
         inflatedView?.isEnabled = enabled
     }
 

Original file line number	Diff line number	Diff line change
`@@ -85,4 +85,10 @@ class ListItem(`
`85`	`85`	`minimumHeight = res.getDimensionPixelSize(R.dimen.list_item_two_lines_height)`
`86`	`86`	`}`
`87`	`87`	`}`
	`88`	`+`
	`89`	`+ override fun setEnabled(enabled: Boolean) {`
	`90`	`+ super.setEnabled(enabled)`
	`91`	`+ primaryTextView.isEnabled = enabled`
	`92`	`+ secondaryTextView.isEnabled = enabled`
	`93`	`+ }`
`88`	`94`	`}`
Original file line number	Diff line number	Diff line change
`@@ -67,6 +67,7 @@ class ListItemWithLayout(`
`67`	`67`
`68`	`68`	`override fun setEnabled(enabled: Boolean) {`
`69`	`69`	`super.setEnabled(enabled)`
	`70`	`+ listItem.isEnabled = enabled`
`70`	`71`	`inflatedView?.isEnabled = enabled`
`71`	`72`	`}`
`72`	`73`