fix(config): merge highlight styles into Home section

louis-thevenet · Nov 24, 2024 · ada558e · ada558e
1 parent 8cf398b
commit ada558e
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 20 deletions.
diff --git a/.config/config.toml b/.config/config.toml
@@ -113,15 +113,11 @@
 "<Right>" = "Right"
 
 [styles.Explorer]
-highlighted_entry = "dark grey on rgb 255 153 000"
-highlighted_searchbar = "rgb 255 153 000"
 preview_headers = "bold rgb 255 153 000"
 
-[styles.Filter]
-highlighted_searchbar = "rgb 255 153 000"
-
 [styles.Home]
-highlighted_tab = "dark grey on rgb 255 153 000"
+highlighted_style = "dark grey on rgb 255 153 000"
+highlighted_bar_style = "rgb 255 153 000"
 
 [tasks_config]
 use_american_format = true

diff --git a/src/components/explorer_tab.rs b/src/components/explorer_tab.rs
@@ -358,9 +358,9 @@ impl<'a> ExplorerTab<'a> {
                 *self
                     .config
                     .styles
-                    .get(&crate::app::Mode::Explorer)
+                    .get(&crate::app::Mode::Home)
                     .unwrap()
-                    .get("highlighted_searchbar")
+                    .get("highlighted_bar_style")
                     .unwrap()
             } else {
                 Style::new()
@@ -429,9 +429,9 @@ impl<'a> ExplorerTab<'a> {
                 *self
                     .config
                     .styles
-                    .get(&crate::app::Mode::Explorer)
+                    .get(&crate::app::Mode::Home)
                     .unwrap()
-                    .get("highlighted_searchbar")
+                    .get("highlighted_bar_style")
                     .unwrap(),
             ),
         );
@@ -661,9 +661,9 @@ impl<'a> Component for ExplorerTab<'a> {
         let highlighted_style = *self
             .config
             .styles
-            .get(&crate::app::Mode::Explorer)
+            .get(&crate::app::Mode::Home)
             .unwrap()
-            .get("highlighted_entry")
+            .get("highlighted_style")
             .unwrap();
 
         // Left Block

diff --git a/src/components/filter_tab.rs b/src/components/filter_tab.rs
@@ -116,7 +116,7 @@ impl<'a> FilterTab<'a> {
             .styles
             .get(&crate::app::Mode::Home)
             .unwrap()
-            .get("highlighted_tab")
+            .get("highlighted_style")
             .unwrap();
 
         let selected_tab_index = self.sorting_mode as usize;
@@ -253,9 +253,9 @@ impl<'a> Component for FilterTab<'a> {
                 *self
                     .config
                     .styles
-                    .get(&crate::app::Mode::Filter)
+                    .get(&crate::app::Mode::Home)
                     .unwrap()
-                    .get("highlighted_searchbar")
+                    .get("highlighted_bar_style")
                     .unwrap()
             } else {
                 Style::new()

diff --git a/src/components/home.rs b/src/components/home.rs
@@ -46,7 +46,7 @@ impl Home {
             .styles
             .get(&crate::app::Mode::Home)
             .unwrap()
-            .get("highlighted_tab")
+            .get("highlighted_style")
             .unwrap();
 
         let selected_tab_index = self.selected_tab as usize;

diff --git a/src/components/time_management_tab.rs b/src/components/time_management_tab.rs
@@ -356,7 +356,7 @@ impl<'a> TimeManagementTab<'a> {
             .styles
             .get(&crate::app::Mode::Home)
             .unwrap()
-            .get("highlighted_tab")
+            .get("highlighted_style")
             .unwrap();
 
         let items: Vec<ListItem> = MethodsAvailable::iter()
@@ -395,9 +395,9 @@ impl<'a> TimeManagementTab<'a> {
                 *self
                     .config
                     .styles
-                    .get(&crate::app::Mode::Explorer)
+                    .get(&crate::app::Mode::Home)
                     .unwrap()
-                    .get("highlighted_searchbar")
+                    .get("highlighted_bar_style")
                     .unwrap(),
             ),
         );
@@ -439,7 +439,7 @@ impl<'a> TimeManagementTab<'a> {
             .styles
             .get(&crate::app::Mode::Home)
             .unwrap()
-            .get("highlighted_tab")
+            .get("highlighted_style")
             .unwrap();
 
         StatefulWidget::render(