Lift return

seadowg · seadowg · commit e49aa3477456 · 2023-03-11T08:23:48.000Z
diff --git a/collect_app/src/main/java/org/odk/collect/android/formentry/QuitFormDialog.kt b/collect_app/src/main/java/org/odk/collect/android/formentry/QuitFormDialog.kt
@@ -118,10 +118,10 @@ object QuitFormDialog {
     }
 
     private fun getDiscardItem(formSaveViewModel: FormSaveViewModel): IconMenuItem {
-        if (formSaveViewModel.hasSaved()) {
-            return IconMenuItem(R.drawable.ic_delete, R.string.discard_changes)
+        return if (formSaveViewModel.hasSaved()) {
+            IconMenuItem(R.drawable.ic_delete, R.string.discard_changes)
         } else {
-            return IconMenuItem(R.drawable.ic_delete, R.string.do_not_save)
+            IconMenuItem(R.drawable.ic_delete, R.string.do_not_save)
         }
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -118,10 +118,10 @@ object QuitFormDialog {`
`118`	`118`	`}`
`119`	`119`
`120`	`120`	`private fun getDiscardItem(formSaveViewModel: FormSaveViewModel): IconMenuItem {`
`121`		`- if (formSaveViewModel.hasSaved()) {`
`122`		`- return IconMenuItem(R.drawable.ic_delete, R.string.discard_changes)`
	`121`	`+ return if (formSaveViewModel.hasSaved()) {`
	`122`	`+ IconMenuItem(R.drawable.ic_delete, R.string.discard_changes)`
`123`	`123`	`} else {`
`124`		`- return IconMenuItem(R.drawable.ic_delete, R.string.do_not_save)`
	`124`	`+ IconMenuItem(R.drawable.ic_delete, R.string.do_not_save)`
`125`	`125`	`}`
`126`	`126`	`}`
`127`	`127`	`}`