if note "quest" is shown in frame of overlay and already hidden, prov…

…ide ability to just close it
streetcomplete · Oct 21, 2022 · 92b2734 · 92b2734
1 parent bd68112
commit 92b2734
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 1 deletion.
diff --git a/app/src/main/java/de/westnordost/streetcomplete/quests/note_discussion/NoteDiscussionForm.kt b/app/src/main/java/de/westnordost/streetcomplete/quests/note_discussion/NoteDiscussionForm.kt
@@ -66,14 +66,18 @@ class NoteDiscussionForm : AbstractQuestForm() {
     interface Listener {
         /** Called when the user successfully answered the quest */
         fun onNoteQuestSolved(questType: QuestType, noteId: Long, position: LatLon)
+        /** Called when the user did not answer the quest but also did not hide it */
+        fun onNoteQuestClosed()
     }
     private val listener: Listener? get() = parentFragment as? Listener ?: activity as? Listener
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
 
+        val alreadyHidden = osmNoteQuestController.getVisible(noteId) == null
         setButtonPanelAnswers(listOf(
-            AnswerItem(R.string.quest_noteDiscussion_no) { hideQuest() }
+            if (alreadyHidden) AnswerItem(R.string.short_no_answer_on_button) { closeQuest() }
+            else               AnswerItem(R.string.quest_noteDiscussion_no) { hideQuest() }
         ))
 
         binding.noteInput.doAfterTextChanged { checkIsFormComplete() }
@@ -115,6 +119,10 @@ class NoteDiscussionForm : AbstractQuestForm() {
         }
     }
 
+    private fun closeQuest() {
+        listener?.onNoteQuestClosed()
+    }
+
     private fun hideQuest() {
         viewLifecycleScope.launch {
             withContext(Dispatchers.IO) { osmNoteQuestController.hide(noteId) }

diff --git a/app/src/main/java/de/westnordost/streetcomplete/screens/main/MainFragment.kt b/app/src/main/java/de/westnordost/streetcomplete/screens/main/MainFragment.kt
@@ -498,6 +498,10 @@ class MainFragment :
         closeBottomSheet()
     }
 
+    override fun onNoteQuestClosed() {
+        closeBottomSheet()
+    }
+
     /* ------------------------------- CreateNoteFragment.Listener ------------------------------ */
 
     override fun onCreatedNote(position: LatLon) {