From d6c8fbe268c3d37639098bc0d2021299e5dcf350 Mon Sep 17 00:00:00 2001
From: Jeremy Soller <jackpot51@gmail.com>
Date: Tue, 28 Nov 2023 13:14:50 -0700
Subject: [PATCH] Bundle close and open menu icons

---
 .../close-menu-symbolic.svg}                        |  4 ++--
 res/icons/open-menu-symbolic.svg                    |  3 +++
 src/widget/nav_bar_toggle.rs                        | 13 ++++++++-----
 3 files changed, 13 insertions(+), 7 deletions(-)
 rename res/{sidebar-active.svg => icons/close-menu-symbolic.svg} (76%)
 create mode 100644 res/icons/open-menu-symbolic.svg

diff --git a/res/sidebar-active.svg b/res/icons/close-menu-symbolic.svg
similarity index 76%
rename from res/sidebar-active.svg
rename to res/icons/close-menu-symbolic.svg
index 1bfcea78..caf00d31 100644
--- a/res/sidebar-active.svg
+++ b/res/icons/close-menu-symbolic.svg
@@ -1,4 +1,4 @@
 <svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M10 4C10 3.446 9.554 3 9 3H4C3.446 3 3 3.446 3 4C3 4.554 3.446 5 4 5H9C9.554 5 10 4.554 10 4ZM7 8C7 7.446 6.554 7 6 7H4C3.446 7 3 7.446 3 8C3 8.554 3.446 9 4 9H6C6.554 9 7 8.554 7 8ZM10 12C10 11.446 9.554 11 9 11H4C3.446 11 3 11.446 3 12C3 12.554 3.446 13 4 13H9C9.554 13 10 12.554 10 12Z" fill="#94EBEB"/>
-<path d="M12 5L9 8L12 11" stroke="#94EBEB" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M10 4C10 3.446 9.554 3 9 3H4C3.446 3 3 3.446 3 4C3 4.554 3.446 5 4 5H9C9.554 5 10 4.554 10 4ZM7 8C7 7.446 6.554 7 6 7H4C3.446 7 3 7.446 3 8C3 8.554 3.446 9 4 9H6C6.554 9 7 8.554 7 8ZM10 12C10 11.446 9.554 11 9 11H4C3.446 11 3 11.446 3 12C3 12.554 3.446 13 4 13H9C9.554 13 10 12.554 10 12Z" fill="#232323"/>
+<path d="M12 5L9 8L12 11" stroke="#232323" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
 </svg>
diff --git a/res/icons/open-menu-symbolic.svg b/res/icons/open-menu-symbolic.svg
new file mode 100644
index 00000000..efae2a2f
--- /dev/null
+++ b/res/icons/open-menu-symbolic.svg
@@ -0,0 +1,3 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M13 4C13 3.446 12.554 3 12 3H4C3.446 3 3 3.446 3 4C3 4.554 3.446 5 4 5H12C12.554 5 13 4.554 13 4ZM13 8C13 7.446 12.554 7 12 7H4C3.446 7 3 7.446 3 8C3 8.554 3.446 9 4 9H12C12.554 9 13 8.554 13 8ZM13 12C13 11.446 12.554 11 12 11H4C3.446 11 3 11.446 3 12C3 12.554 3.446 13 4 13H12C12.554 13 13 12.554 13 12Z" fill="#232323"/>
+</svg>
diff --git a/src/widget/nav_bar_toggle.rs b/src/widget/nav_bar_toggle.rs
index 54883e19..64e991f0 100644
--- a/src/widget/nav_bar_toggle.rs
+++ b/src/widget/nav_bar_toggle.rs
@@ -26,12 +26,15 @@ pub fn nav_bar_toggle<Message>() -> NavBarToggle<Message> {
 impl<'a, Message: 'static + Clone> From<NavBarToggle<Message>> for Element<'a, Message> {
     fn from(nav_bar_toggle: NavBarToggle<Message>) -> Self {
         let icon = if nav_bar_toggle.active {
-            widget::icon::from_svg_bytes(&include_bytes!("../../res/sidebar-active.svg")[..])
-                .symbolic(true)
+            widget::icon::from_svg_bytes(
+                &include_bytes!("../../res/icons/close-menu-symbolic.svg")[..],
+            )
+            .symbolic(true)
         } else {
-            widget::icon::from_name("open-menu-symbolic")
-                .size(16)
-                .handle()
+            widget::icon::from_svg_bytes(
+                &include_bytes!("../../res/icons/open-menu-symbolic.svg")[..],
+            )
+            .symbolic(true)
         };
 
         widget::button::text("")