all colors

Kartonrealista · Jul 5, 2024 · ecfbbc8 · ecfbbc8
1 parent 06b1a1a
commit ecfbbc8
Show file tree

Hide file tree

Showing 2 changed files with 91 additions and 6 deletions.
diff --git a/src/app.rs b/src/app.rs
@@ -411,7 +411,7 @@ impl Application for YourApp {
             }
             Message::GotoMenu => {
                 self.game = Game::new();
-            }            
+            }
             Message::InputWidth(input) => self.game.menu.width_inptut = input,
             Message::InputHeight(input) => self.game.menu.height_inptut = input,
             Message::StartPressed => {
@@ -515,6 +515,31 @@ fn playfield(game: &Game) -> widget::Container<'_, Message, cosmic::Theme> {
                 ..
             } => container(centralize_tile_content(text(format!("64")).size(16)))
                 .style(theme::Container::custom(widget_colors::red2theme)),
+            Tile {
+                tilecontent: Some(128),
+                ..
+            } => container(centralize_tile_content(text(format!("128")).size(16)))
+                .style(theme::Container::custom(widget_colors::yellow1theme)),
+            Tile {
+                tilecontent: Some(256),
+                ..
+            } => container(centralize_tile_content(text(format!("256")).size(16)))
+                .style(theme::Container::custom(widget_colors::yellow2theme)),
+            Tile {
+                tilecontent: Some(512),
+                ..
+            } => container(centralize_tile_content(text(format!("512")).size(16)))
+                .style(theme::Container::custom(widget_colors::yellow3theme)),
+            Tile {
+                tilecontent: Some(1024),
+                ..
+            } => container(centralize_tile_content(text(format!("1024")).size(16)))
+                .style(theme::Container::custom(widget_colors::yellow4theme)),
+            Tile {
+                tilecontent: Some(2048),
+                ..
+            } => container(centralize_tile_content(text(format!("2048")).size(16)))
+                .style(theme::Container::custom(widget_colors::yellow5theme)),
             Tile {
                 tilecontent: Some(content),
                 ..

diff --git a/src/app/widget_colors.rs b/src/app/widget_colors.rs
@@ -46,6 +46,41 @@ const RED2RGB: Color = Color {
     a: 1.0,
 };
 
+const YELLOW1RGB: Color = Color {
+    r: 237.0 / 255.0,
+    g: 207.0 / 255.0,
+    b: 115.0 / 255.0,
+    a: 1.0,
+};
+
+const YELLOW2RGB: Color = Color {
+    r: 237.0 / 255.0,
+    g: 204.0 / 255.0,
+    b: 98.0 / 255.0,
+    a: 1.0,
+};
+
+const YELLOW3RGB: Color = Color {
+    r: 237.0 / 255.0,
+    g: 200.0 / 255.0,
+    b: 80.0 / 255.0,
+    a: 1.0,
+};
+
+const YELLOW4RGB: Color = Color {
+    r: 237.0 / 255.0,
+    g: 197.0 / 255.0,
+    b: 63.0 / 255.0,
+    a: 1.0,
+};
+
+const YELLOW5RGB: Color = Color {
+    r: 237.0 / 255.0,
+    g: 194.0 / 255.0,
+    b: 45.0 / 255.0,
+    a: 1.0,
+};
+
 pub fn blacktheme(theme: &Theme) -> widget::container::Appearance {
     let mut appearance = orange1theme(theme);
     appearance.icon_color = Some(Color::BLACK);
@@ -85,14 +120,12 @@ pub fn orange1theme(theme: &Theme) -> widget::container::Appearance {
 
 pub fn orange2theme(theme: &Theme) -> widget::container::Appearance {
     let mut appearance = orange1theme(theme);
-    appearance.icon_color = Some(ORANGE2RGB);
     appearance.background = Some(cosmic::iced::Background::Color(ORANGE2RGB));
     appearance
 }
 
 pub fn gray1theme(theme: &Theme) -> widget::container::Appearance {
     let mut appearance = orange1theme(theme);
-    appearance.icon_color = Some(GREY1RGB);
     appearance.background = Some(cosmic::iced::Background::Color(GREY1RGB));
     appearance.text_color = Some(Color {
         r: 119.0 / 255.0,
@@ -105,21 +138,48 @@ pub fn gray1theme(theme: &Theme) -> widget::container::Appearance {
 
 pub fn gray2theme(theme: &Theme) -> widget::container::Appearance {
     let mut appearance = gray1theme(theme);
-    appearance.icon_color = Some(GREY2RGB);
     appearance.background = Some(cosmic::iced::Background::Color(GREY2RGB));
     appearance
 }
 
 pub fn red1theme(theme: &Theme) -> widget::container::Appearance {
     let mut appearance = orange1theme(theme);
-    appearance.icon_color = Some(RED1RGB);
     appearance.background = Some(cosmic::iced::Background::Color(RED1RGB));
     appearance
 }
 
 pub fn red2theme(theme: &Theme) -> widget::container::Appearance {
     let mut appearance = orange1theme(theme);
-    appearance.icon_color = Some(RED2RGB);
     appearance.background = Some(cosmic::iced::Background::Color(RED2RGB));
     appearance
+}
+
+pub fn yellow1theme(theme: &Theme) -> widget::container::Appearance {
+    let mut appearance = orange1theme(theme);
+    appearance.background = Some(cosmic::iced::Background::Color(YELLOW1RGB));
+    appearance
+}
+
+pub fn yellow2theme(theme: &Theme) -> widget::container::Appearance {
+    let mut appearance = orange1theme(theme);
+    appearance.background = Some(cosmic::iced::Background::Color(YELLOW2RGB));
+    appearance
+}
+
+pub fn yellow3theme(theme: &Theme) -> widget::container::Appearance {
+    let mut appearance = orange1theme(theme);
+    appearance.background = Some(cosmic::iced::Background::Color(YELLOW3RGB));
+    appearance
+}
+
+pub fn yellow4theme(theme: &Theme) -> widget::container::Appearance {
+    let mut appearance = orange1theme(theme);
+    appearance.background = Some(cosmic::iced::Background::Color(YELLOW4RGB));
+    appearance
+}
+
+pub fn yellow5theme(theme: &Theme) -> widget::container::Appearance {
+    let mut appearance = orange1theme(theme);
+    appearance.background = Some(cosmic::iced::Background::Color(YELLOW5RGB));
+    appearance
 }