feat: better fonts and colorsHEADmain

1 files changed, 75 insertions, 10 deletions

diff --git a/src/main.rs b/src/main.rs
index e83f789..b785562 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -15,6 +15,7 @@ use filamento::files::Files;
 use filamento::presence::{Offline, Presence, PresenceType};
 use filamento::{roster::Contact, user::User, UpdateMessage};
 use iced::alignment::Horizontal::Right;
+use iced::font::{Stretch, Weight};
 use iced::futures::{SinkExt, Stream, StreamExt};
 use iced::keyboard::{on_key_press, on_key_release, Key, Modifiers};
 use iced::theme::palette::{Background, Danger, Extended, Pair, Primary, Secondary, Success};
@@ -26,7 +27,7 @@ use iced::widget::{
     scrollable, stack, text, text_input, toggler, Column, Svg, Text, Toggler,
 };
 use iced::Length::{self, Fill, Shrink};
-use iced::{color, stream, Color, Element, Subscription, Task, Theme};
+use iced::{color, stream, Color, Element, Font, Subscription, Task, Theme};
 use icons::Icon;
 use indexmap::{indexmap, IndexMap};
 use jid::JID;
@@ -525,9 +526,31 @@ async fn main() -> iced::Result {
                 ])
             }
         };
+        let mut font = Font::with_name("K2D");
+        font.weight = Weight::Medium;
+        // font.stretch = Stretch::Condensed;
         iced::application("Macaw", Macaw::update, Macaw::view)
+            .font(include_bytes!("../assets/fonts/Diolce-Regular.ttf"))
+            .font(include_bytes!("../assets/fonts/K2D-Italic.ttf"))
+            .font(include_bytes!("../assets/fonts/K2D-Thin.ttf"))
+            .font(include_bytes!("../assets/fonts/K2D-ExtraBold.ttf"))
+            .font(include_bytes!("../assets/fonts/K2D-ExtraLightItalic.ttf"))
+            .font(include_bytes!("../assets/fonts/K2D-ExtraLight.ttf"))
+            .font(include_bytes!("../assets/fonts/K2D-Light.ttf"))
+            .font(include_bytes!("../assets/fonts/K2D-Light.ttf"))
+            .font(include_bytes!("../assets/fonts/K2D-BoldItalic.ttf"))
+            .font(include_bytes!("../assets/fonts/K2D-MediumItalic.ttf"))
+            .font(include_bytes!("../assets/fonts/K2D-ThinItalic.ttf"))
+            .font(include_bytes!("../assets/fonts/K2D-Medium.ttf"))
+            .font(include_bytes!("../assets/fonts/K2D-Bold.ttf"))
+            .font(include_bytes!("../assets/fonts/K2D-Regular.ttf"))
+            .font(include_bytes!("../assets/fonts/K2D-ExtraBoldItalic.ttf"))
+            .font(include_bytes!("../assets/fonts/K2D-LightItalic.ttf"))
+            .font(include_bytes!("../assets/fonts/K2D-SemiBoldItalic.ttf"))
+            .font(include_bytes!("../assets/fonts/K2D-SemiBold.ttf"))
+            .default_font(font)
             .subscription(subscription)
-            // .theme(Macaw::theme)
+            .theme(Macaw::theme)
             .run_with(|| {
                 (
                     Macaw::new(
@@ -549,9 +572,49 @@ async fn main() -> iced::Result {
     } else {
         if let Some(e) = client_creation_error {
             iced::application("Macaw", Macaw::update, Macaw::view)
+                .font(include_bytes!("../assets/fonts/Diolce-Regular.otf"))
+                .font(include_bytes!("../assets/fonts/K2D-Italic.ttf"))
+                .font(include_bytes!("../assets/fonts/K2D-Thin.ttf"))
+                .font(include_bytes!("../assets/fonts/K2D-ExtraBold.ttf"))
+                .font(include_bytes!("../assets/fonts/K2D-ExtraLightItalic.ttf"))
+                .font(include_bytes!("../assets/fonts/K2D-ExtraLight.ttf"))
+                .font(include_bytes!("../assets/fonts/K2D-Light.ttf"))
+                .font(include_bytes!("../assets/fonts/K2D-Light.ttf"))
+                .font(include_bytes!("../assets/fonts/K2D-BoldItalic.ttf"))
+                .font(include_bytes!("../assets/fonts/K2D-MediumItalic.ttf"))
+                .font(include_bytes!("../assets/fonts/K2D-ThinItalic.ttf"))
+                .font(include_bytes!("../assets/fonts/K2D-Medium.ttf"))
+                .font(include_bytes!("../assets/fonts/K2D-Bold.ttf"))
+                .font(include_bytes!("../assets/fonts/K2D-Regular.ttf"))
+                .font(include_bytes!("../assets/fonts/K2D-ExtraBoldItalic.ttf"))
+                .font(include_bytes!("../assets/fonts/K2D-LightItalic.ttf"))
+                .font(include_bytes!("../assets/fonts/K2D-SemiBoldItalic.ttf"))
+                .font(include_bytes!("../assets/fonts/K2D-SemiBold.ttf"))
+                .default_font(Font::with_name("K2D"))
+                .theme(Macaw::theme)
                 .run_with(|| (Macaw::new(None, cfg), Task::done(Message::Error(e))))
         } else {
             iced::application("Macaw", Macaw::update, Macaw::view)
+                .font(include_bytes!("../assets/fonts/Diolce-Regular.otf"))
+                .font(include_bytes!("../assets/fonts/K2D-Italic.ttf"))
+                .font(include_bytes!("../assets/fonts/K2D-Thin.ttf"))
+                .font(include_bytes!("../assets/fonts/K2D-ExtraBold.ttf"))
+                .font(include_bytes!("../assets/fonts/K2D-ExtraLightItalic.ttf"))
+                .font(include_bytes!("../assets/fonts/K2D-ExtraLight.ttf"))
+                .font(include_bytes!("../assets/fonts/K2D-Light.ttf"))
+                .font(include_bytes!("../assets/fonts/K2D-Light.ttf"))
+                .font(include_bytes!("../assets/fonts/K2D-BoldItalic.ttf"))
+                .font(include_bytes!("../assets/fonts/K2D-MediumItalic.ttf"))
+                .font(include_bytes!("../assets/fonts/K2D-ThinItalic.ttf"))
+                .font(include_bytes!("../assets/fonts/K2D-Medium.ttf"))
+                .font(include_bytes!("../assets/fonts/K2D-Bold.ttf"))
+                .font(include_bytes!("../assets/fonts/K2D-Regular.ttf"))
+                .font(include_bytes!("../assets/fonts/K2D-ExtraBoldItalic.ttf"))
+                .font(include_bytes!("../assets/fonts/K2D-LightItalic.ttf"))
+                .font(include_bytes!("../assets/fonts/K2D-SemiBoldItalic.ttf"))
+                .font(include_bytes!("../assets/fonts/K2D-SemiBold.ttf"))
+                .default_font(Font::with_name("K2D"))
+                .theme(Macaw::theme)
                 .run_with(|| (Macaw::new(None, cfg), Task::none()))
         }
     }
@@ -1185,15 +1248,15 @@ impl Macaw {
         let extended = Extended {
             background: Background {
                 base: Pair {
-                    color: color!(0x392c25),
+                    color: color!(0x503e34),
                     text: color!(0xdcdcdc),
                 },
                 weak: Pair {
-                    color: color!(0xdcdcdc),
-                    text: color!(0x392c25),
+                    color: color!(0x392c25),
+                    text: color!(0xdcdcdc),
                 },
                 strong: Pair {
-                    color: color!(0x364b3b),
+                    color: color!(0x293f2e),
                     text: color!(0xdcdcdc),
                 },
             },
@@ -1214,15 +1277,15 @@ impl Macaw {
             secondary: Secondary {
                 base: Pair {
                     color: color!(0xffce07),
-                    text: color!(0x000000),
+                    text: color!(0xdcdcdc),
                 },
                 weak: Pair {
                     color: color!(0xffce07),
-                    text: color!(0x000000),
+                    text: color!(0xdcdcdc),
                 },
                 strong: Pair {
                     color: color!(0xffce07),
-                    text: color!(0x000000),
+                    text: color!(0xdcdcdc),
                 },
             },
             success: Success {
@@ -1395,10 +1458,12 @@ fn chat_list_item<'a>(
                 .spacing(8)
                 .width(Fill)
             ]
+            .spacing(8)
         ]
+        .spacing(8)
         .into()
     } else {
-        row![avatar_stack, text(name)].into()
+        row![avatar_stack, text(name)].spacing(8).into()
     };
     let mut button =
         button(content).on_press(Message::ToggleChat(chat_list_item.correspondent().clone()));