From e365778fbf2c6c2e0aa455582029aff0d9cfa227 Mon Sep 17 00:00:00 2001
From: Szymon Wiszczuk <37072867+golota60@users.noreply.github.com>
Date: Mon, 8 Jan 2024 22:17:13 +0100
Subject: [PATCH] chore: update rust-version and dependencies (#3)

* chore: update rust-version to 1.75

* chore: update upstream
---
 README.md                              | 4 ++--
 examples/widget-gallery/Cargo.toml     | 4 ++--
 examples/widget-gallery/src/main.rs    | 2 +-
 oxytail-base/Cargo.toml                | 4 ++--
 oxytail-base/src/widgets/checkbox.rs   | 2 +-
 oxytail-base/src/widgets/text_input.rs | 2 +-
 oxytail-theme-dark/Cargo.toml          | 4 ++--
 7 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/README.md b/README.md
index 8fccdb6..a1a7a31 100644
--- a/README.md
+++ b/README.md
@@ -32,7 +32,7 @@ Next, add `oxytail-base`(to load a theme) and `oxytail-theme-dark`(a theme) also
 ```toml
 [dependencies]
 
-floem = { git = "https://github.com/lapce/floem", rev = "92ba6406b2406e4223933267137229db0a619a0a" }
+floem = { git = "https://github.com/lapce/floem", rev = "e304d30f8771a28788904d64464d8fd192d07439" }
 oxytail-theme-dark = { git = "https://github.com/golota60/oxytail"}
 oxytail-base = { git = "https://github.com/golota60/oxytail"}
 ```
@@ -78,7 +78,7 @@ fn main() {
         })
         // 1. We don't want any default `floem` styling to be interfering with ours,
         // so we need to disable the default styling.
-        .themed(false);
+        .apply_default_theme(false);
 
     // 2. We need to initialize our theme
     init_theme(Theme::Dark);
diff --git a/examples/widget-gallery/Cargo.toml b/examples/widget-gallery/Cargo.toml
index 5c0b9ad..5497dc3 100644
--- a/examples/widget-gallery/Cargo.toml
+++ b/examples/widget-gallery/Cargo.toml
@@ -2,11 +2,11 @@
 name = "widget-gallery"
 version = "0.1.0"
 edition = "2021"
-rust-version = "1.74.1"
+rust-version = "1.75"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
 oxytail-theme-dark = { path = "../../oxytail-theme-dark" }
 oxytail-base = { path = "../../oxytail-base" }
-floem = { git = "https://github.com/lapce/floem", rev = "92ba6406b2406e4223933267137229db0a619a0a" }
\ No newline at end of file
+floem = { git = "https://github.com/lapce/floem", rev = "e304d30f8771a28788904d64464d8fd192d07439" }
\ No newline at end of file
diff --git a/examples/widget-gallery/src/main.rs b/examples/widget-gallery/src/main.rs
index 8b00767..48dfce9 100644
--- a/examples/widget-gallery/src/main.rs
+++ b/examples/widget-gallery/src/main.rs
@@ -80,7 +80,7 @@ fn main() {
             width: 1200.0,
             height: 800.0,
         })
-        .themed(false);
+        .apply_default_theme(false);
 
     init_theme(Theme::Dark);
     let root_view = app_view();
diff --git a/oxytail-base/Cargo.toml b/oxytail-base/Cargo.toml
index 4d9eaed..3cff3fc 100644
--- a/oxytail-base/Cargo.toml
+++ b/oxytail-base/Cargo.toml
@@ -4,10 +4,10 @@ description = "Building block for creating oxytail themes"
 license = "MIT"
 version = "0.1.0"
 edition = "2021"
-rust-version = "1.74.1"
+rust-version = "1.75"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-floem = { git = "https://github.com/lapce/floem", rev = "92ba6406b2406e4223933267137229db0a619a0a" }
+floem = { git = "https://github.com/lapce/floem", rev = "e304d30f8771a28788904d64464d8fd192d07439" }
 
diff --git a/oxytail-base/src/widgets/checkbox.rs b/oxytail-base/src/widgets/checkbox.rs
index 4cf5607..ef44788 100644
--- a/oxytail-base/src/widgets/checkbox.rs
+++ b/oxytail-base/src/widgets/checkbox.rs
@@ -42,6 +42,6 @@ pub fn labeled_checkbox<S: Display + 'static>(
     props: Option<CheckboxProps>,
 ) -> impl View {
     h_stack((checkbox_svg(checked, props), views::label(label)))
-        .base_style(|s| s.items_center().justify_center())
+        .style(|s| s.items_center().justify_center())
         .keyboard_navigatable()
 }
diff --git a/oxytail-base/src/widgets/text_input.rs b/oxytail-base/src/widgets/text_input.rs
index 3b0bb63..7e493f2 100644
--- a/oxytail-base/src/widgets/text_input.rs
+++ b/oxytail-base/src/widgets/text_input.rs
@@ -24,7 +24,7 @@ pub fn text_input(buffer: RwSignal<String>, props: Option<InputProps>) -> TextIn
     let styles_enhancer = theme.get_input_style(props);
 
     // .style() does not exist on an input
-    let styled_input = base_widget.base_style(move |s| styles_enhancer(s));
+    let styled_input = base_widget.style(move |s| styles_enhancer(s));
 
     styled_input
 }
diff --git a/oxytail-theme-dark/Cargo.toml b/oxytail-theme-dark/Cargo.toml
index 51b4334..5a270ed 100644
--- a/oxytail-theme-dark/Cargo.toml
+++ b/oxytail-theme-dark/Cargo.toml
@@ -4,10 +4,10 @@ description = "Dark theme for oxytail-base"
 license = "MIT"
 version = "0.1.0"
 edition = "2021"
-rust-version = "1.74.1"
+rust-version = "1.75"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
+floem = { git = "https://github.com/lapce/floem", rev = "e304d30f8771a28788904d64464d8fd192d07439" }
 oxytail-base = { path = "../oxytail-base"}
-floem = { git = "https://github.com/lapce/floem", rev = "92ba6406b2406e4223933267137229db0a619a0a" }