Merge pull request 'random-stuff' (#4) from random-stuff into main

Reviewed-on: https://git.joeac.net/joeac/schist/pulls/4

1 files changed, 19 insertions, 6 deletions

diff --git a/schist_desktop_gui/src/gui/components/bucket_name_and_balance.rs b/schist_desktop_gui/src/gui/components/bucket_name_and_balance.rs
index 24a3952..8a5a16e 100644
--- a/schist_desktop_gui/src/gui/components/bucket_name_and_balance.rs
+++ b/schist_desktop_gui/src/gui/components/bucket_name_and_balance.rs
@@ -1,7 +1,10 @@
-use iced::{widget::row, Element};
+use iced::{
+    widget::{row, text},
+    Element, Length,
+};
 use schist_models::Bucket;
 
-use crate::gui::components::{navigation, Text};
+use crate::gui::components::navigation;
 
 #[derive(Clone, Debug, PartialEq)]
 pub struct BucketNameAndBalance {
@@ -14,11 +17,21 @@ impl BucketNameAndBalance {
     }
 }
 
-impl<'a> Into<Element<'a, navigation::Message<BucketNameAndBalance>>> for BucketNameAndBalance {
-    fn into(self) -> Element<'a, navigation::Message<BucketNameAndBalance>> {
+impl<'a> From<&'a BucketNameAndBalance> for Element<'a, navigation::Message<BucketNameAndBalance>> {
+    fn from(bucket_name_and_balance: &'a BucketNameAndBalance) -> Self {
+        let balance_style = if bucket_name_and_balance
+            .bucket
+            .balance
+            .is_none_or(|balance| balance >= 0)
+        {
+            text::default
+        } else {
+            text::danger
+        };
+
         row![
-            Text::new(&self.bucket.name).as_element(),
-            Text::new(&self.bucket.balance.unwrap_or(0).to_string()).as_element(),
+            text(bucket_name_and_balance.bucket.name.clone()).width(Length::Fill),
+            text(bucket_name_and_balance.bucket.pretty_balance_per_100()).style(balance_style),
         ]
         .into()
     }