Merge pull request #123 from TheRustyPickle/themes

New themes

Author: TheRustyPickle

README.md

@@ -1,7 +1,3 @@
-<p align="center">
-  <img src="https://github.com/TheRustyPickle/Rex/assets/35862475/04575a15-53f7-497f-b2e7-88a7a66d1136" width=400>
-</p>
-
 <div align="center"><h1>Rex</h1></div>
 <div align="center">
 <a href="https://wakatime.com/@RustyPickle"><img src="https://wakatime.com/badge/github/TheRustyPickle/Rex.svg" alt="wakatime"></a>
@@ -57,6 +53,7 @@ cargo run --release
 **4. Install using a package manager:**
 
 * On NetBSD a package is available from the [official repositories](https://pkgsrc.se/finance/rex). To install it simply run:
+
 ```sh
 pkgin install rex
 ```

logo.png

@@ -21,6 +21,7 @@ pub struct Config {
     pub location: PathBuf,
     pub backup_db_path: Option<Vec<PathBuf>>,
     pub new_location: Option<PathBuf>,
+    pub theme_index: Option<usize>,
 }
 
 impl Config {
@@ -35,6 +36,7 @@ impl Config {
                 backup_db_path: None,
                 new_location: None,
                 location: target_dir,
+                theme_index: Some(0),
             });
         }
 
@@ -44,6 +46,11 @@ impl Config {
         let mut config: Config = serde_json::from_str(&file_content)?;
 
         config.location = target_dir;
+
+        if config.theme_index.is_none() {
+            config.theme_index = Some(0);
+        }
+
         Ok(config)
     }
 
@@ -157,6 +164,7 @@ pub fn migrate_config(config_path: &PathBuf) -> Result<()> {
         backup_db_path: None,
         new_location: None,
         location: PathBuf::new(),
+        theme_index: Some(0),
     };
 
     let mut backup_path = config_path.to_owned();

tui/src/config.rs

@@ -17,6 +17,7 @@ pub fn activity_keys(handler: &mut InputKeyHandler) -> Result<Option<HandlingOut
             KeyCode::Char('z') => handler.go_summary()?,
             KeyCode::Char('w') => handler.go_search(),
             KeyCode::Char('v') => handler.show_activity_tx_details()?,
+            KeyCode::Char('t') => handler.next_theme()?,
             KeyCode::Right => handler.handle_right_arrow()?,
             KeyCode::Left => handler.handle_left_arrow()?,
             KeyCode::Up => handler.handle_up_arrow(),

tui/src/key_checker/activity.rs

@@ -22,6 +22,7 @@ pub fn add_tx_keys(handler: &mut InputKeyHandler) -> Result<Option<HandlingOutpu
                 KeyCode::Char('w') => handler.go_search(),
                 KeyCode::Char('c') => handler.clear_input()?,
                 KeyCode::Char('y') => handler.go_activity(),
+                KeyCode::Char('t') => handler.next_theme()?,
                 KeyCode::Enter => handler.select_date_field(),
                 KeyCode::Char(c) => {
                     if c.is_numeric() {

tui/src/key_checker/add_tx.rs

@@ -19,6 +19,7 @@ pub fn chart_keys(handler: &mut InputKeyHandler) -> Result<Option<HandlingOutput
             KeyCode::Char('R') => handler.do_chart_lgeneds(),
             KeyCode::Char('w') => handler.go_search(),
             KeyCode::Char('y') => handler.go_activity(),
+            KeyCode::Char('t') => handler.next_theme()?,
             KeyCode::Right => handler.handle_right_arrow()?,
             KeyCode::Left => handler.handle_left_arrow()?,
             KeyCode::Up => handler.handle_up_arrow(),

tui/src/key_checker/chart.rs

@@ -22,6 +22,7 @@ pub fn home_keys(handler: &mut InputKeyHandler) -> Result<Option<HandlingOutput>
             KeyCode::Char(',') => handler.switch_tx_position_up()?,
             KeyCode::Char('.') => handler.switch_tx_position_down()?,
             KeyCode::Char('v') => handler.show_home_tx_details(),
+            KeyCode::Char('t') => handler.next_theme()?,
             KeyCode::Right => handler.handle_right_arrow()?,
             KeyCode::Left => handler.handle_left_arrow()?,
             KeyCode::Up => handler.handle_up_arrow(),

tui/src/key_checker/home.rs

@@ -1119,6 +1119,14 @@ impl<'a> InputKeyHandler<'a> {
     pub fn popup_down(&mut self) {
         self.popup_status.next();
     }
+
+    pub fn next_theme(&mut self) -> Result<()> {
+        let new_index = self.theme.next();
+        self.config.theme_index = Some(new_index);
+        self.config.save_config()?;
+
+        Ok(())
+    }
 }
 
 impl InputKeyHandler<'_> {

tui/src/key_checker/key_handler.rs

@@ -25,6 +25,7 @@ pub fn search_keys(handler: &mut InputKeyHandler) -> Result<Option<HandlingOutpu
                 KeyCode::Char('e') => handler.search_edit_tx()?,
                 KeyCode::Char('d') => handler.do_deletion_popup(),
                 KeyCode::Char('y') => handler.go_activity(),
+                KeyCode::Char('t') => handler.next_theme()?,
                 KeyCode::Up => handler.handle_up_arrow(),
                 KeyCode::Down => handler.handle_down_arrow(),
                 KeyCode::Enter => handler.select_date_field(),

tui/src/key_checker/search.rs

@@ -19,6 +19,7 @@ pub fn summary_keys(handler: &mut InputKeyHandler) -> Result<Option<HandlingOutp
             KeyCode::Char('z') => handler.do_summary_hidden_mode(),
             KeyCode::Char('x') => handler.change_summary_sort(),
             KeyCode::Char('y') => handler.go_activity(),
+            KeyCode::Char('t') => handler.next_theme()?,
             KeyCode::Right => handler.handle_right_arrow()?,
             KeyCode::Left => handler.handle_left_arrow()?,
             KeyCode::Up => handler.handle_up_arrow(),