task-001: make extended palette explicit

1 files changed, 28 insertions, 24 deletions

diff --git a/schist_desktop_gui/src/theme.rs b/schist_desktop_gui/src/theme.rs
index 0e71689..3b3fd6c 100644
--- a/schist_desktop_gui/src/theme.rs
+++ b/schist_desktop_gui/src/theme.rs
@@ -16,41 +16,41 @@ pub fn make_theme(_state: &Gui) -> Theme {
             danger: red_4(),
             warning: red_4(),
         },
-        |palette| palette::Extended {
+        |_palette| palette::Extended {
             background: palette::Background {
-                base: palette::Pair::new(black(), palette.text),
-                neutral: palette::Pair::new(black(), palette.text),
-                weak: palette::Pair::new(grey_2(), palette.text),
-                weaker: palette::Pair::new(grey_2(), palette.text),
-                weakest: palette::Pair::new(grey_2(), palette.text),
-                strong: palette::Pair::new(grey_2(), palette.text),
-                stronger: palette::Pair::new(grey_2(), palette.text),
-                strongest: palette::Pair::new(grey_2(), palette.text),
+                base: palette::Pair::new(black(), white()),
+                neutral: palette::Pair::new(black(), white()),
+                weak: palette::Pair::new(grey_2(), white()),
+                weaker: palette::Pair::new(grey_2(), white()),
+                weakest: palette::Pair::new(grey_2(), white()),
+                strong: palette::Pair::new(grey_2(), white()),
+                stronger: palette::Pair::new(grey_2(), white()),
+                strongest: palette::Pair::new(grey_2(), white()),
             },
             primary: palette::Primary {
-                base: palette::Pair::new(palette.background, palette.text),
-                weak: palette::Pair::new(palette.background, palette.text),
-                strong: palette::Pair::new(palette.background, palette.text),
+                base: palette::Pair::new(black(), white()),
+                weak: palette::Pair::new(black(), white()),
+                strong: palette::Pair::new(black(), white()),
             },
             secondary: palette::Secondary {
-                base: palette::Pair::new(palette.background, palette.text),
-                weak: palette::Pair::new(palette.background, palette.text),
-                strong: palette::Pair::new(palette.background, palette.text),
+                base: palette::Pair::new(black(), white()),
+                weak: palette::Pair::new(grey_2(), grey_7()),
+                strong: palette::Pair::new(black(), white()),
             },
             success: palette::Success {
-                base: palette::Pair::new(palette.background, accent_8()),
-                weak: palette::Pair::new(palette.background, accent_8()),
-                strong: palette::Pair::new(palette.background, accent_8()),
+                base: palette::Pair::new(black(), accent_8()),
+                weak: palette::Pair::new(black(), accent_8()),
+                strong: palette::Pair::new(black(), accent_8()),
             },
             danger: palette::Danger {
-                base: palette::Pair::new(palette.background, red_7()),
-                weak: palette::Pair::new(palette.background, red_7()),
-                strong: palette::Pair::new(palette.background, red_4()),
+                base: palette::Pair::new(black(), red_7()),
+                weak: palette::Pair::new(black(), red_7()),
+                strong: palette::Pair::new(black(), red_4()),
             },
             warning: palette::Warning {
-                base: palette::Pair::new(palette.background, red_7()),
-                weak: palette::Pair::new(palette.background, red_7()),
-                strong: palette::Pair::new(palette.background, red_4()),
+                base: palette::Pair::new(black(), red_7()),
+                weak: palette::Pair::new(black(), red_7()),
+                strong: palette::Pair::new(black(), red_4()),
             },
             is_dark: true,
         },
@@ -65,6 +65,10 @@ fn grey_2() -> Color {
     Color::from_rgb8(11, 31, 47)
 }
 
+fn grey_7() -> Color {
+    Color::from_rgb8(138, 162, 182)
+}
+
 fn white() -> Color {
     Color::from_rgb8(225, 249, 255)
 }