From 881621f03b901198f47f31e44b1599f3dc75df06 Mon Sep 17 00:00:00 2001
From: Thomas Ballivet <thomas.ballivet@gmail.com>
Date: Tue, 6 May 2025 20:32:40 +0200
Subject: [PATCH] Improve visibility of primary button text

---
 liana-ui/src/component/button.rs | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/liana-ui/src/component/button.rs b/liana-ui/src/component/button.rs
index 9d4e46ba..0d7769fd 100644
--- a/liana-ui/src/component/button.rs
+++ b/liana-ui/src/component/button.rs
@@ -1,16 +1,16 @@
+use super::text::text;
+use crate::font::MEDIUM;
 use crate::{theme, widget::*};
 use iced::alignment::{Horizontal, Vertical};
 use iced::widget::{button, container, row};
 
-use super::text::text;
-
 pub fn menu<'a, T: 'a>(icon: Option<Text<'a>>, t: &'static str) -> Button<'a, T> {
-    button::Button::new(content_menu(icon.map(|i| i.style(theme::text::secondary)), t).padding(10))
+    Button::new(content_menu(icon.map(|i| i.style(theme::text::secondary)), t).padding(10))
         .style(theme::button::menu)
 }
 
 pub fn menu_active<'a, T: 'a>(icon: Option<Text<'a>>, t: &'static str) -> Button<'a, T> {
-    button::Button::new(content_menu(icon.map(|i| i.style(theme::text::secondary)), t).padding(10))
+    Button::new(content_menu(icon.map(|i| i.style(theme::text::secondary)), t).padding(10))
         .style(theme::button::menu_pressed)
 }
 
@@ -22,33 +22,33 @@ fn content_menu<'a, T: 'a>(icon: Option<Text<'a>>, t: &'static str) -> Container
 }
 
 pub fn alert<'a, T: 'a>(icon: Option<Text<'a>>, t: &'static str) -> Button<'a, T> {
-    button::Button::new(content(icon, t)).style(theme::button::destructive)
+    Button::new(content(icon, text(t))).style(theme::button::destructive)
 }
 
 pub fn primary<'a, T: 'a>(icon: Option<Text<'a>>, t: &'static str) -> Button<'a, T> {
-    button::Button::new(content(icon, t)).style(theme::button::primary)
+    Button::new(content(icon, text(t).font(MEDIUM))).style(theme::button::primary)
 }
 
 pub fn transparent<'a, T: 'a>(icon: Option<Text<'a>>, t: &'static str) -> Button<'a, T> {
-    button::Button::new(content(icon, t)).style(theme::button::container)
+    Button::new(content(icon, text(t))).style(theme::button::container)
 }
 
 pub fn secondary<'a, T: 'a>(icon: Option<Text<'a>>, t: &'static str) -> Button<'a, T> {
-    button::Button::new(content(icon, t)).style(theme::button::secondary)
+    Button::new(content(icon, text(t))).style(theme::button::secondary)
 }
 
 pub fn border<'a, T: 'a>(icon: Option<Text<'a>>, t: &'static str) -> Button<'a, T> {
-    button::Button::new(content(icon, t)).style(theme::button::secondary)
+    Button::new(content(icon, text(t))).style(theme::button::secondary)
 }
 
 pub fn transparent_border<'a, T: 'a>(icon: Option<Text<'a>>, t: &'static str) -> Button<'a, T> {
-    button(content(icon, t)).style(theme::button::container_border)
+    button(content(icon, text(t))).style(theme::button::container_border)
 }
 
-fn content<'a, T: 'a>(icon: Option<Text<'a>>, t: &'static str) -> Container<'a, T> {
+fn content<'a, T: 'a>(icon: Option<Text<'a>>, text: Text<'a>) -> Container<'a, T> {
     match icon {
-        None => container(text(t)).align_x(Horizontal::Center).padding(5),
-        Some(i) => container(row![i, text(t)].spacing(10).align_y(Vertical::Center))
+        None => container(text).align_x(Horizontal::Center).padding(5),
+        Some(i) => container(row![i, text].spacing(10).align_y(Vertical::Center))
             .align_x(Horizontal::Center)
             .padding(5),
     }