From 987f3f90470409094208cdd76ca4b9d1a51eddfe Mon Sep 17 00:00:00 2001 From: J-Jamet Date: Tue, 28 Oct 2025 14:15:19 +0100 Subject: [PATCH] fix: Revert fragment view --- .../tasks/ProgressTaskDialogFragment.kt | 22 ++++++++++--------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/app/src/main/java/com/kunzisoft/keepass/tasks/ProgressTaskDialogFragment.kt b/app/src/main/java/com/kunzisoft/keepass/tasks/ProgressTaskDialogFragment.kt index 70a725f0f..cd764729b 100644 --- a/app/src/main/java/com/kunzisoft/keepass/tasks/ProgressTaskDialogFragment.kt +++ b/app/src/main/java/com/kunzisoft/keepass/tasks/ProgressTaskDialogFragment.kt @@ -71,16 +71,9 @@ open class ProgressTaskDialogFragment : DialogFragment() { lifecycleScope.launch { repeatOnLifecycle(Lifecycle.State.STARTED) { progressTaskViewModel.progressMessageState.collect { state -> - titleView?.text = state.title - messageView?.text = state.message - warningView?.apply { - state.warning?.let { warning -> - text = warning - visibility = View.VISIBLE - } ?: run { - visibility = View.GONE - } - } + updateView(titleView, state.title) + updateView(messageView, state.message) + updateView(warningView, state.warning) cancelButton?.isVisible = state.cancelable != null cancelButton?.setOnClickListener { state.cancelable?.invoke() @@ -97,6 +90,15 @@ open class ProgressTaskDialogFragment : DialogFragment() { return super.onCreateDialog(savedInstanceState) } + private fun updateView(textView: TextView?, value: String?) { + if (value == null) { + textView?.visibility = View.GONE + } else { + textView?.text = value + textView?.visibility = View.VISIBLE + } + } + companion object { private val TAG = ProgressTaskDialogFragment::class.java.simpleName const val PROGRESS_TASK_DIALOG_TAG = "progressDialogFragment"