From f7df4f3575a24e7206f0e5e57c96319c574aa056 Mon Sep 17 00:00:00 2001
From: GullCode <gullradriel@hotmail.com>
Date: Mon, 13 Mar 2023 23:14:06 +0100
Subject: [PATCH] Use rssi focusable, added shortcut to level app, glass app,
 cut buttons a bit better in the ui, better pause/resume/skiplock/unlock
 button

---
 firmware/application/apps/ui_recon.cpp | 10 +++++++++-
 firmware/application/apps/ui_recon.hpp | 14 ++++++++++----
 2 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/firmware/application/apps/ui_recon.cpp b/firmware/application/apps/ui_recon.cpp
index 170ed044..3b05a147 100644
--- a/firmware/application/apps/ui_recon.cpp
+++ b/firmware/application/apps/ui_recon.cpp
@@ -666,6 +666,7 @@ namespace ui {
                 &field_lock_wait,
                 &button_recon_setup,
                 &button_scanner_mode,
+                &button_looking_glass,
                 &file_name,
                 &rssi,
                 &text_cycle,
@@ -880,6 +881,13 @@ namespace ui {
             nav_.pop();
             nav_.push<AnalogAudioView>();
         };
+
+        button_looking_glass.on_select = [this](Button&) {
+            recon_thread->stop();
+            nav_.pop();
+            nav_.push<GlassView>();
+        };
+
         
         rssi.set_focusable(true);
         rssi.on_select = [this](RSSI&) {
@@ -1104,7 +1112,7 @@ namespace ui {
                 show_max(); /* display step information */
                 text_cycle.set( "MANUAL SEARCH" );
                 button_scanner_mode.set_style( &style_white );
-                button_scanner_mode.set_text( "M-SEARCH" );
+                button_scanner_mode.set_text( "MSEARCH" );
                 file_name.set_style( &style_white );
                 file_name.set( "USE: MANUAL RANGE" );
 
diff --git a/firmware/application/apps/ui_recon.hpp b/firmware/application/apps/ui_recon.hpp
index 0783928d..c3196cbe 100644
--- a/firmware/application/apps/ui_recon.hpp
+++ b/firmware/application/apps/ui_recon.hpp
@@ -32,6 +32,7 @@
 #include "audio.hpp"
 #include "ui_mictx.hpp"
 #include "ui_level.hpp"
+#include "ui_looking_glass_app.hpp"
 #include "portapack_persistent_memory.hpp"
 #include "baseband_api.hpp"
 #include "string_format.hpp"
@@ -286,15 +287,15 @@ namespace ui {
                }; */
 
             Text big_display {		//Show frequency in text mode
-                { 0, 5 * 16 , 28 * 8, 16 },
+                { 0, 5 * 16 , 21 * 8, 16 },
             };
 
             Text freq_stats {		//Show frequency stats in text mode
-                { 0, 6 * 16 , 28 * 8, 16 },
+                { 0, 6 * 16 , 21 * 8, 16 },
             };
 
             Text text_timer {		//Show frequency stats in text mode
-                { 0, 7 * 16 , 28 * 8, 16 },
+                { 0, 7 * 16 , 21 * 8, 16 },
             };
 
             Button button_recon_setup {
@@ -302,8 +303,13 @@ namespace ui {
                     "OPT"
             };
 
+            Button button_looking_glass {
+                { 240 - 5 * 8 , 6 * 16 , 5 * 8, 28 },
+                    "GLASS"
+            };
+
             Button button_scanner_mode {
-                { 21 * 8 , 8 * 16 , 9 * 8, 28 },
+                { 240 - 8 * 8 , 8 * 16 , 8 * 8, 28 },
                     "RECON"
             };