feat: list components for ui

wllfaria · Aug 9, 2024 · ddfde56 · ddfde56
1 parent c43effd
commit ddfde56
Show file tree

Hide file tree

Showing 3 changed files with 34 additions and 6 deletions.
diff --git a/hac-client/src/components/component_styles.rs b/hac-client/src/components/component_styles.rs
@@ -7,8 +7,8 @@ pub enum ComponentBorder {
 
 #[derive(Debug, Clone, Copy)]
 pub enum ComponentFocus {
-    Focused,
     Unfocused,
+    Focused,
 }
 
 pub fn color_from_focus(
@@ -20,3 +20,12 @@ pub fn color_from_focus(
         ComponentFocus::Unfocused => colors.normal.white,
     }
 }
+
+impl From<bool> for ComponentFocus {
+    fn from(value: bool) -> Self {
+        match value {
+            true => ComponentFocus::Focused,
+            false => ComponentFocus::Unfocused,
+        }
+    }
+}
diff --git a/hac-client/src/components/list_item.rs b/hac-client/src/components/list_item.rs
@@ -1,16 +1,23 @@
 use std::borrow::Cow;
 
 use ratatui::{
-    style::Style,
+    style::{Style, Stylize},
+    text::{Line, Span},
     widgets::{Block, Borders, Paragraph},
 };
 
 use super::component_styles::{color_from_focus, ComponentBorder, ComponentFocus};
 
+pub enum ListItemKind {
+    _Regular,
+    Enumerated(usize),
+}
+
 pub fn list_item<'a, T>(
     text: T,
     focus: ComponentFocus,
     border_kind: ComponentBorder,
+    kind: ListItemKind,
     colors: &hac_colors::Colors,
 ) -> Paragraph<'a>
 where
@@ -30,6 +37,16 @@ where
 
     let style = Style::default();
     let style = style.fg(color_from_focus(focus, colors));
+    let style = style.bg(colors.normal.black);
+
+    let text = match kind {
+        ListItemKind::_Regular => Line::from(Span::from(text.into())),
+        ListItemKind::Enumerated(idx) => Line::from(vec![
+            Span::from(idx.to_string()).fg(colors.normal.red),
+            Span::from(" "),
+            Span::from(text.into()),
+        ]),
+    };
 
-    Paragraph::new(text.into()).block(block).style(style)
+    Paragraph::new(text).block(block).style(style)
 }
diff --git a/hac-client/src/pages/collection_viewer/request_editor/auth_editor/auth_kind_prompt.rs b/hac-client/src/pages/collection_viewer/request_editor/auth_editor/auth_kind_prompt.rs
@@ -1,6 +1,6 @@
 use crate::ascii::LOGO_ASCII;
 use crate::components::component_styles::{ComponentBorder, ComponentFocus};
-use crate::components::list_item::list_item;
+use crate::components::list_item::{list_item, ListItemKind};
 use crate::pages::collection_viewer::collection_store::CollectionStore;
 use crate::pages::{overlay::make_overlay, Eventful, Renderable};
 
@@ -50,11 +50,13 @@ impl Renderable for AuthKindPrompt<'_> {
         //let mut logo_size = logo.len() as u16;
 
         let auth_kinds = AuthKind::iter()
-            .map(|v| {
+            .enumerate()
+            .map(|(idx, v)| {
                 list_item(
                     v.to_string(),
-                    ComponentFocus::Focused,
+                    self.selected_idx.eq(&idx).into(),
                     ComponentBorder::All,
+                    ListItemKind::Enumerated(idx + 1),
                     self.colors,
                 )
             })