Revert "resolve conflicts merge" (#2860)

This reverts commit 344aa0c741.

.github/workflows/past_version.txt

@@ -1 +1 @@
-v2.1.0
+v2.2.0

.github/workflows/version.txt

@@ -1 +1 @@
-v2.2.0
+v2.3.1

firmware/application/apps/ui_standalone_view.cpp

@@ -285,9 +285,9 @@ bool StandaloneView::on_encoder(const EncoderEvent event) {
 
 bool StandaloneView::on_touch(const TouchEvent event) {
     if (get_application_information()->header_version > 1) {
-        get_application_information()->OnTouchEvent(event.point.x(), event.point.y(), (uint32_t)event.type);
+        return get_application_information()->OnTouchEvent(event.point.x(), event.point.y(), (uint32_t)event.type);
     }
-    return true;
+    return false;
 }
 
 bool StandaloneView::on_keyboard(const KeyboardEvent event) {

firmware/common/standalone_app.hpp

@@ -148,7 +148,7 @@ struct standalone_application_information_t {
     void (*shutdown)();
 
     void (*PaintViewMirror)();
-    void (*OnTouchEvent)(int x, int y, uint32_t type);
+    bool (*OnTouchEvent)(int x, int y, uint32_t type);
     void (*OnFocus)();
     bool (*OnKeyEvent)(uint8_t key);
     bool (*OnEncoder)(int32_t delta);

firmware/standalone/digitalrain/digitalrain.cpp

@@ -77,7 +77,7 @@ ui::Widget* touch_widget(ui::Widget* const w, ui::TouchEvent event) {
 
 ui::Widget* captured_widget{nullptr};
 
-void OnTouchEvent(int, int, uint32_t) {
+bool OnTouchEvent(int, int, uint32_t) {
     if (standaloneViewMirror) {
         _api->exit_app();
         /* //left here for example, but not used in digital rain
@@ -96,6 +96,7 @@ void OnTouchEvent(int, int, uint32_t) {
             captured_widget->on_touch(event);
             */
     }
+    return false;
 }
 
 void OnFocus() {

firmware/standalone/digitalrain/digitalrain.hpp

@@ -40,7 +40,7 @@ void shutdown();
 void OnFocus();
 bool OnKeyEvent(uint8_t);
 bool OnEncoder(int32_t);
-void OnTouchEvent(int, int, uint32_t);
+bool OnTouchEvent(int, int, uint32_t);
 bool OnKeyboad(uint8_t);
 void PaintViewMirror();
 

firmware/standalone/pacman/main.cpp

@@ -23,7 +23,7 @@
 #include "pacman.hpp"
 #include <memory>
 
-void notouch(int, int, uint32_t) {
+bool notouch(int, int, uint32_t) {
     // do nothing
 }
 void nothing() {