From 5fc07724b6b27c188ca135321f48450168127061 Mon Sep 17 00:00:00 2001
From: Josh <josh_ped@proton.me>
Date: Wed, 8 May 2024 23:34:22 -0400
Subject: [PATCH] Add bird app to build and switch calculator to weather in
 quickring

---
 src/displayapp/DisplayApp.cpp      | 10 +++++-----
 src/displayapp/apps/CMakeLists.txt |  1 +
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/displayapp/DisplayApp.cpp b/src/displayapp/DisplayApp.cpp
index a1d064eb..314d28f1 100644
--- a/src/displayapp/DisplayApp.cpp
+++ b/src/displayapp/DisplayApp.cpp
@@ -317,7 +317,7 @@ void DisplayApp::Refresh() {
         };
 
         if (!currentScreen->OnTouchEvent(gesture)) {
-          if (currentApp == Apps::Clock || currentApp == Apps::Music || currentApp == Apps::Calculator || currentApp == Apps::QuickSettings) {
+          if (currentApp == Apps::Clock || currentApp == Apps::Music || currentApp == Apps::Weather || currentApp == Apps::QuickSettings) {
             switch (gesture) {
               case TouchEvents::SwipeUp:
                 if (currentApp == Apps::Clock) {
@@ -333,8 +333,8 @@ void DisplayApp::Refresh() {
                 if (currentApp == Apps::Clock) {
                   LoadNewScreen(Apps::QuickSettings, DisplayApp::FullRefreshDirections::RightAnim);
                 } else if (currentApp == Apps::QuickSettings) {
-                  LoadNewScreen(Apps::Calculator, DisplayApp::FullRefreshDirections::RightAnim);
-                } else if (currentApp == Apps::Calculator) {
+                  LoadNewScreen(Apps::Weather, DisplayApp::FullRefreshDirections::RightAnim);
+                } else if (currentApp == Apps::Weather) {
                   LoadNewScreen(Apps::Music, DisplayApp::FullRefreshDirections::RightAnim);
                 } else {
                   LoadNewScreen(Apps::Clock, DisplayApp::FullRefreshDirections::RightAnim);
@@ -344,8 +344,8 @@ void DisplayApp::Refresh() {
                 if (currentApp == Apps::Clock) {
                   LoadNewScreen(Apps::Music, DisplayApp::FullRefreshDirections::LeftAnim);
                 } else if (currentApp == Apps::Music) {
-                  LoadNewScreen(Apps::Calculator, DisplayApp::FullRefreshDirections::LeftAnim);
-                } else if (currentApp == Apps::Calculator) {
+                  LoadNewScreen(Apps::Weather, DisplayApp::FullRefreshDirections::LeftAnim);
+                } else if (currentApp == Apps::Weather) {
                   LoadNewScreen(Apps::QuickSettings, DisplayApp::FullRefreshDirections::LeftAnim);
                 } else {
                   LoadNewScreen(Apps::Clock, DisplayApp::FullRefreshDirections::LeftAnim);
diff --git a/src/displayapp/apps/CMakeLists.txt b/src/displayapp/apps/CMakeLists.txt
index 21d03e72..8c9a2f22 100644
--- a/src/displayapp/apps/CMakeLists.txt
+++ b/src/displayapp/apps/CMakeLists.txt
@@ -17,6 +17,7 @@ else ()
     set(DEFAULT_USER_APP_TYPES "${DEFAULT_USER_APP_TYPES}, Apps::Weather")
     #set(DEFAULT_USER_APP_TYPES "${DEFAULT_USER_APP_TYPES}, Apps::Calculator")
     #set(DEFAULT_USER_APP_TYPES "${DEFAULT_USER_APP_TYPES}, Apps::Motion")
+    set(DEFAULT_USER_APP_TYPES "${DEFAULT_USER_APP_TYPES}, Apps::Bird")
     set(USERAPP_TYPES "${DEFAULT_USER_APP_TYPES}" CACHE STRING "List of user apps to build into the firmware")
 endif ()