From 86d180a85590f742f2f8e27ce2751e988f194245 Mon Sep 17 00:00:00 2001
From: Riku Isokoski <riksu9000@gmail.com>
Date: Mon, 4 Oct 2021 11:13:45 +0300
Subject: [PATCH] Improve gesture consistency across the firmware

---
 src/displayapp/screens/Metronome.cpp | 14 ++++++++++++++
 src/displayapp/screens/Metronome.h   |  2 ++
 src/displayapp/screens/Music.cpp     | 14 ++++++++------
 3 files changed, 24 insertions(+), 6 deletions(-)

diff --git a/src/displayapp/screens/Metronome.cpp b/src/displayapp/screens/Metronome.cpp
index 8347e1bb..6b6ad2c6 100644
--- a/src/displayapp/screens/Metronome.cpp
+++ b/src/displayapp/screens/Metronome.cpp
@@ -113,9 +113,15 @@ void Metronome::OnEvent(lv_obj_t* obj, lv_event_t event) {
           lv_label_set_text_fmt(bpmValue, "%03d", bpm);
         }
         tappedTime = xTaskGetTickCount();
+        allowExit = true;
       }
       break;
     }
+    case LV_EVENT_RELEASED:
+    case LV_EVENT_PRESS_LOST:
+      if (obj == bpmTap) {
+        allowExit = false;
+      }
     case LV_EVENT_CLICKED: {
       if (obj == playPause) {
         metronomeStarted = !metronomeStarted;
@@ -135,3 +141,11 @@ void Metronome::OnEvent(lv_obj_t* obj, lv_event_t event) {
       break;
   }
 }
+
+bool Metronome::OnTouchEvent(TouchEvents event) {
+  if (event == TouchEvents::SwipeDown && allowExit) {
+    running = false;
+    return true;
+  }
+  return false;
+}
diff --git a/src/displayapp/screens/Metronome.h b/src/displayapp/screens/Metronome.h
index 373c884c..6e6589fe 100644
--- a/src/displayapp/screens/Metronome.h
+++ b/src/displayapp/screens/Metronome.h
@@ -14,6 +14,7 @@ namespace Pinetime {
         ~Metronome() override;
         void Refresh() override;
         void OnEvent(lv_obj_t* obj, lv_event_t event);
+        bool OnTouchEvent(TouchEvents event) override;
 
       private:
         TickType_t startTime = 0;
@@ -25,6 +26,7 @@ namespace Pinetime {
         uint8_t counter = 1;
 
         bool metronomeStarted = false;
+        bool allowExit = false;
 
         lv_obj_t *bpmArc, *bpmTap, *bpmValue;
         lv_obj_t *bpbDropdown, *currentBpbText;
diff --git a/src/displayapp/screens/Music.cpp b/src/displayapp/screens/Music.cpp
index 8a01a6fe..9f17b956 100644
--- a/src/displayapp/screens/Music.cpp
+++ b/src/displayapp/screens/Music.cpp
@@ -277,12 +277,14 @@ bool Music::OnTouchEvent(Pinetime::Applications::TouchEvents event) {
       return true;
     }
     case TouchEvents::SwipeDown: {
-      lv_obj_set_hidden(btnNext, false);
-      lv_obj_set_hidden(btnPrev, false);
-
-      lv_obj_set_hidden(btnVolDown, true);
-      lv_obj_set_hidden(btnVolUp, true);
-      return true;
+      if (lv_obj_get_hidden(btnNext)) {
+        lv_obj_set_hidden(btnNext, false);
+        lv_obj_set_hidden(btnPrev, false);
+        lv_obj_set_hidden(btnVolDown, true);
+        lv_obj_set_hidden(btnVolUp, true);
+        return true;
+      }
+      return false;
     }
     case TouchEvents::SwipeLeft: {
       musicService.event(Controllers::MusicService::EVENT_MUSIC_NEXT);