Merge pull request #260 from naz013/feature/REM-904_Fix_reminder_buil…

…der_on_android_11 REM-904 - Add logging to builder dialogs
naz013 · Dec 29, 2024 · f0b0019 · f0b0019
2 parents 0cd8e03 + f24f4dd
commit f0b0019
Show file tree

Hide file tree

Showing 7 changed files with 141 additions and 88 deletions.
diff --git a/app/src/main/java/com/elementary/tasks/reminder/build/BuildReminderActivity.kt b/app/src/main/java/com/elementary/tasks/reminder/build/BuildReminderActivity.kt
@@ -27,6 +27,7 @@ import com.elementary.tasks.reminder.build.valuedialog.ValueDialog
 import com.elementary.tasks.reminder.build.valuedialog.ValueDialogCallback
 import com.github.naz013.common.Permissions
 import com.github.naz013.feature.common.livedata.nonNullObserve
+import com.github.naz013.feature.common.livedata.observeEvent
 import com.github.naz013.ui.common.Dialogues
 import com.github.naz013.ui.common.activity.BindingActivity
 import com.github.naz013.ui.common.view.singleClick
@@ -155,25 +156,19 @@ class BuildReminderActivity :
       binding.scrollView.visibleGone(it.isNotEmpty())
       binding.emptyView.visibleGone(it.isEmpty())
     }
-    viewModel.askPermissions.nonNullObserve(this) {
-      it.getContentIfNotHandled()?.also { list ->
-        permissionFlowDelegate.permissionFlow.askPermissions(list) {
-          viewModel.onPermissionsGranted()
-        }
+    viewModel.askPermissions.observeEvent(this) { list ->
+      permissionFlowDelegate.permissionFlow.askPermissions(list) {
+        viewModel.onPermissionsGranted()
       }
     }
-    viewModel.askEditPermissions.nonNullObserve(this) {
-      it.getContentIfNotHandled()?.also { list ->
-        permissionFlowDelegate.permissionFlow.askPermissions(list) {
-          viewModel.onEditPermissionsGranted()
-        }
+    viewModel.askEditPermissions.observeEvent(this) { list ->
+      permissionFlowDelegate.permissionFlow.askPermissions(list) {
+        viewModel.onEditPermissionsGranted()
       }
     }
-    viewModel.showEditDialog.nonNullObserve(this) {
-      it.getContentIfNotHandled()?.also { pair ->
-        ValueDialog.newInstance(pair.first)
-          .show(supportFragmentManager, ValueDialog.TAG)
-      }
+    viewModel.showEditDialog.observeEvent(this) { pair ->
+      ValueDialog.newInstance(pair.first)
+        .show(supportFragmentManager, ValueDialog.TAG)
     }
     viewModel.result.observe(this) { commands ->
       if (commands != null) {