Theme switching, custom themes

.github/workflows/ci.yml

@@ -9,7 +9,7 @@ env:
   CARGO_TERM_COLOR: always
 
 jobs:
-  build-test:
+  build:
     strategy:
       fail-fast: false
 
@@ -25,6 +25,7 @@ jobs:
             target: x86_64-apple-darwin
 
     name: Build & Test (${{ matrix.target }})
+
     runs-on: ${{ matrix.os }}
 
     env:
@@ -55,13 +56,10 @@ jobs:
       - name: Build
         run: cargo build --verbose --target ${{ matrix.target }}
 
-      - name: Run tests
-        run: cargo test --verbose --target ${{ matrix.target }}
-
   lint:
-    name: Formatter
+    name: Lint
 
-    needs: build-test
+    needs: build
 
     runs-on: ubuntu-latest
 
@@ -83,7 +81,12 @@ jobs:
         run: cargo clippy -- -D warnings
 
   coverage:
+    name: Coverage
+
+    needs: build
+
     runs-on: ubuntu-latest
+
     steps:
       - name: Checkout
         uses: actions/checkout@v4

src/handlers/app.rs

@@ -152,6 +152,9 @@
                 Key::Ctrl('d') => {
                     self.components.debug.toggle_focus();
                 }
+                Key::Ctrl('g') => {
+                    self.config.borrow_mut().rotate_theme();
+                }
                 _ => {
                     return match self.state {
                         State::Dashboard => self.components.dashboard.event(event),
@@ -214,9 +217,4 @@
         self.previous_state = Some(self.state.clone());
         self.state = other;
     }
-
-    #[allow(dead_code)]
-    pub fn rotate_theme(&mut self) {
-        todo!("Rotate through different themes")
-    }
 }

src/handlers/config.rs

@@ -528,4 +528,11 @@
             )
         }
     }
+
+    pub fn rotate_theme(&mut self) {
+        self.frontend.theme = match self.frontend.theme {
+            Theme::Dark => Theme::Light,
+            _ => Theme::Dark,
+        };
+    }
 }

src/ui/components/chat.rs

@@ -15,7 +15,7 @@
     emotes::{emotes_enabled, hide_message_emotes, is_in_rect, show_span_emotes, Emotes},
     handlers::{
         app::SharedMessages,
-        config::SharedCompleteConfig,
+        config::{SharedCompleteConfig, Theme},
         data::MessageData,
         filters::SharedFilters,
         state::State,
@@ -30,7 +30,10 @@
         following::FollowingWidget, utils::centered_rect, ChannelSwitcherWidget, ChatInputWidget,
         Component, MessageSearchWidget,
     },
-    utils::text::{title_line, TitleStyle},
+    utils::{
+        styles::{BORDER_DARK, BORDER_LIGHT, WINDOW_DARK, WINDOW_LIGHT},
+        text::{title_line, TitleStyle},
+    },
 };
 
 pub struct ChatWidget {
@@ -294,9 +297,16 @@
                 Block::default()
                     .borders(Borders::ALL)
                     .border_type(self.config.borrow().frontend.border_type.clone().into())
-                    .title(chat_title),
+                    .title(chat_title)
+                    .style(match self.config.borrow().frontend.theme {
+                        Theme::Dark => WINDOW_DARK,
+                        _ => WINDOW_LIGHT,
+                    }),
             )
-            .style(Style::default().fg(Color::White));
+            .style(match self.config.borrow().frontend.theme {
+                Theme::Dark => BORDER_DARK,
+                _ => BORDER_LIGHT,
+            });
 
         f.render_widget(list, *first_v_chunk);
 
@@ -317,7 +327,11 @@
                 .border_type(self.config.borrow().frontend.border_type.clone().into())
                 .title(title_line(&title, Style::default()))
                 .title_position(Position::Bottom)
-                .title_alignment(Alignment::Right);
+                .title_alignment(Alignment::Right)
+                .style(match self.config.borrow().frontend.theme {
+                    Theme::Dark => BORDER_DARK,
+                    _ => BORDER_LIGHT,
+                });
 
             let rect = Rect::new(
                 first_v_chunk.x,

src/utils/styles.rs

@@ -1,15 +1,26 @@
 use tui::style::{Color, Modifier, Style};
 
-#[allow(dead_code)]
-pub const BORDER_NAME_DARK: Style = Style {
+pub const WINDOW_DARK: Style = Style {
+    fg: None,
+    bg: None,
+    add_modifier: Modifier::empty(),
+    sub_modifier: Modifier::empty(),
+};
+pub const WINDOW_LIGHT: Style = Style {
+    fg: None,
+    bg: Some(Color::White),
+    add_modifier: Modifier::empty(),
+    sub_modifier: Modifier::empty(),
+};
+
+pub const BORDER_DARK: Style = Style {
     fg: Some(Color::White),
     bg: None,
     add_modifier: Modifier::empty(),
     sub_modifier: Modifier::empty(),
 };
 
-#[allow(dead_code)]
-pub const BORDER_NAME_LIGHT: Style = Style {
+pub const BORDER_LIGHT: Style = Style {
     fg: Some(Color::Black),
     bg: None,
     add_modifier: Modifier::empty(),
@@ -31,14 +42,14 @@ pub const DATETIME_LIGHT: Style = Style {
 };
 
 pub const HIGHLIGHT_NAME_DARK: Style = Style {
-    fg: Some(Color::Black),
-    bg: Some(Color::White),
+    fg: Some(Color::Rgb(83, 83, 95)),
+    bg: Some(Color::Rgb(173, 173, 184)),
     add_modifier: Modifier::BOLD,
     sub_modifier: Modifier::empty(),
 };
 pub const HIGHLIGHT_NAME_LIGHT: Style = Style {
-    fg: Some(Color::White),
-    bg: Some(Color::Black),
+    fg: Some(Color::Rgb(173, 173, 184)),
+    bg: Some(Color::Rgb(83, 83, 95)),
     add_modifier: Modifier::BOLD,
     sub_modifier: Modifier::empty(),
 };