Merge pull request #74

Update popup text
TheRustyPickle · Mar 3, 2024 · 6d1ffd9 · 6d1ffd9
2 parents 58609b1 + f62308c
commit 6d1ffd9
Show file tree

Hide file tree

Showing 7 changed files with 135 additions and 94 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "rex-tui"
-version = "0.1.14"
+version = "0.1.15"
 edition = "2021"
 authors = ["TheRustyPickle <rusty.pickle94@gmail.com>"]
 readme = "README.md"

diff --git a/src/key_checker/key_handler.rs b/src/key_checker/key_handler.rs
@@ -224,7 +224,7 @@ impl<'a> InputKeyHandler<'a> {
 
     #[cfg(not(tarpaulin_include))]
     pub fn go_history(&mut self) {
-        *self.page = CurrentUi::History;
+        *self.page = CurrentUi::Activity;
     }
 
     /// Turns on help popup
@@ -236,7 +236,8 @@ impl<'a> InputKeyHandler<'a> {
             CurrentUi::Chart => *self.popup = PopupState::ChartHelp,
             CurrentUi::Summary => *self.popup = PopupState::SummaryHelp,
             CurrentUi::Search => *self.popup = PopupState::SearchHelp,
-            CurrentUi::Initial | CurrentUi::History => {}
+            CurrentUi::Activity => *self.popup = PopupState::ActivityHelp,
+            CurrentUi::Initial => {}
         }
     }
 
@@ -539,7 +540,7 @@ impl<'a> InputKeyHandler<'a> {
                     }
                 }
             }
-            CurrentUi::History => match self.history_tab {
+            CurrentUi::Activity => match self.history_tab {
                 HistoryTab::Years => {
                     self.history_months.set_index_zero();
                     self.history_years.previous();
@@ -608,7 +609,7 @@ impl<'a> InputKeyHandler<'a> {
                 }
                 SummaryTab::Table => {}
             },
-            CurrentUi::History => match self.history_tab {
+            CurrentUi::Activity => match self.history_tab {
                 HistoryTab::Years => {
                     self.history_months.set_index_zero();
                     self.history_years.next();
@@ -633,7 +634,7 @@ impl<'a> InputKeyHandler<'a> {
             CurrentUi::Summary => self.do_summary_up(),
             CurrentUi::Chart => self.do_chart_up(),
             CurrentUi::Search => self.do_search_up(),
-            CurrentUi::History => self.do_history_up(),
+            CurrentUi::Activity => self.do_history_up(),
             CurrentUi::Initial => {}
         }
         self.check_autofill();
@@ -648,7 +649,7 @@ impl<'a> InputKeyHandler<'a> {
             CurrentUi::Summary => self.do_summary_down(),
             CurrentUi::Chart => self.do_chart_down(),
             CurrentUi::Search => self.do_search_down(),
-            CurrentUi::History => self.do_history_down(),
+            CurrentUi::Activity => self.do_history_down(),
             CurrentUi::Initial => {}
         }
         self.check_autofill();

diff --git a/src/page_handler/ui_handler.rs b/src/page_handler/ui_handler.rs
@@ -293,7 +293,7 @@ pub fn start_app<B: Backend>(
                         &mut search_table,
                         &search_date_type,
                     ),
-                    CurrentUi::History => history_ui(
+                    CurrentUi::Activity => history_ui(
                         f,
                         &history_months,
                         &history_years,
@@ -394,7 +394,7 @@ pub fn start_app<B: Backend>(
                 CurrentUi::Chart => chart_keys(&mut handler),
                 CurrentUi::Summary => summary_keys(&mut handler),
                 CurrentUi::Search => search_keys(&mut handler),
-                CurrentUi::History => history_keys(&mut handler),
+                CurrentUi::Activity => history_keys(&mut handler),
             };
 
             // If there is a status it means it needs to be handled outside the UI

diff --git a/src/page_handler/ui_state.rs b/src/page_handler/ui_state.rs
@@ -168,7 +168,7 @@ pub enum CurrentUi {
     Chart,
     Summary,
     Search,
-    History,
+    Activity,
 }
 
 /// Indicates which popup is currently on and is being shown in the screen
@@ -179,6 +179,7 @@ pub enum PopupState {
     ChartHelp,
     SummaryHelp,
     SearchHelp,
+    ActivityHelp,
     DeleteFailed(String),
     TxDeletion,
     Nothing,