Merge pull request #51 from InioX/dev

Dev

Cargo.toml

@@ -41,3 +41,4 @@ upon = "0.8.0"
 reqwest = { version = "0.11.23", default_features=false, features = ["blocking", "rustls-tls"] }
 material-colors = "0.1.4"
 ahash = "0.8.7"
+indexmap = "2.2.2"

src/main.rs

@@ -13,8 +13,9 @@ use crate::util::{
     template::Template,
 };
 
+use indexmap::IndexMap;
+
 use material_colors::{Hct, Scheme};
-use std::collections::HashMap;
 
 use clap::{Parser, ValueEnum};
 use color_eyre::{eyre::Result, Report};
@@ -31,8 +32,8 @@ use material_colors::{
 };
 
 pub struct Schemes {
-    pub light: HashMap<String, [u8; 4], ahash::random_state::RandomState>,
-    pub dark: HashMap<String, [u8; 4], ahash::random_state::RandomState>,
+    pub light: IndexMap<String, [u8; 4], ahash::random_state::RandomState>,
+    pub dark: IndexMap<String, [u8; 4], ahash::random_state::RandomState>,
 }
 
 #[derive(Serialize, Deserialize, Debug, Copy, Clone, PartialEq, Eq, PartialOrd, Ord, ValueEnum)]
@@ -71,8 +72,8 @@ fn main() -> Result<(), Report> {
         .expect("Something went wrong while parsing the mode");
 
     let schemes: Schemes = Schemes {
-        dark: HashMap::from(scheme_dark),
-        light: HashMap::from(scheme_light),
+        dark: IndexMap::from_iter(scheme_dark),
+        light: IndexMap::from_iter(scheme_light),
     };
 
     if args.show_colors == Some(true) {

src/util/color.rs

@@ -26,7 +26,7 @@ pub fn rgb_from_argb(color: [u8; 4]) -> Rgb {
     ])
 }
 
-pub fn show_color(schemes: &Schemes, _source_color: &[u8; 4]) {
+pub fn show_color(schemes: &Schemes, source_color: &[u8; 4]) {
     let mut table: Table = generate_table_format();
 
     for (field, _color) in &schemes.dark {
@@ -36,6 +36,8 @@ pub fn show_color(schemes: &Schemes, _source_color: &[u8; 4]) {
         generate_table_rows(&mut table, field, color_light, color_dark);
     }
 
+    generate_table_rows(&mut table, "source_color", rgb_from_argb(*source_color), rgb_from_argb(*source_color));
+
     table.printstd();
 }