Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ package org.fossify.voicerecorder.dialogs
import androidx.appcompat.app.AlertDialog
import androidx.core.widget.doAfterTextChanged
import org.fossify.commons.extensions.getAlertDialogBuilder
import org.fossify.commons.extensions.isAValidFilename
import org.fossify.commons.extensions.setupDialogStuff
import org.fossify.commons.extensions.viewBinding
import org.fossify.voicerecorder.R
Expand All @@ -26,7 +27,7 @@ class FilenamePatternDialog(private val activity: SimpleActivity, private val ca
true
}

filenamePatternValue.doAfterTextChanged { validatePattern(it?.toString().orEmpty()) }
filenamePatternValue.doAfterTextChanged { validatePattern(it?.toString().orEmpty().trim()) }
}

activity.getAlertDialogBuilder()
Expand All @@ -36,7 +37,7 @@ class FilenamePatternDialog(private val activity: SimpleActivity, private val ca
activity.setupDialogStuff(binding.root, this, R.string.filename_pattern) { alertDialog ->
dialog = alertDialog
alertDialog.getButton(AlertDialog.BUTTON_POSITIVE).setOnClickListener {
val newPattern = binding.filenamePatternValue.text.toString()
val newPattern = binding.filenamePatternValue.text.toString().trim()
config.filenamePattern = newPattern
callback(newPattern)
alertDialog.dismiss()
Expand All @@ -48,6 +49,7 @@ class FilenamePatternDialog(private val activity: SimpleActivity, private val ca
private fun validatePattern(pattern: String) {
binding.filenamePatternHint.error = when {
pattern.isEmpty() -> activity.getString(org.fossify.commons.R.string.filename_cannot_be_empty)
!pattern.isAValidFilename() -> activity.getString(org.fossify.commons.R.string.invalid_name)
!containsAllDateTimePlaceholders(pattern) -> activity.getString(R.string.filename_pattern_must_contain_all)
else -> null
}
Expand Down
Loading