fix: more fixes

Author: mmstick

i18n/en/cosmic_initial_setup.ftl

@@ -6,6 +6,7 @@ next = Next
 password = Password
 password-confirm = Confirm Password
 settings = Settings
+skip = Skip
 skip-setup-and-close = Skip setup and close
 type-to-search = Type to search…
 wifi = Wi-Fi

src/main.rs

@@ -340,13 +340,18 @@ impl Application for App {
 
         let page = &self.pages[self.page_i];
 
-        let skip_setup_and_close = page
-            .skippable()
-            .then(|| widget::button::link(fl!("skip-setup-and-close")).on_press(Message::Finish));
+        let skip_button = page
+            .optional()
+            .then(|| widget::button::link(fl!("skip")).on_press(Message::PageOpen(self.page_i + 1)))
+            .or_else(|| {
+                page.skippable().then(|| {
+                    widget::button::link(fl!("skip-setup-and-close")).on_press(Message::Finish)
+                })
+            });
 
         let mut button_row = widget::row::with_capacity(4)
             .spacing(space_xxs)
-            .push_maybe(skip_setup_and_close)
+            .push_maybe(skip_button)
             .push(widget::horizontal_space());
 
         if let Some(page_i) = self.page_i.checked_sub(1) {

src/page/appearance.rs

@@ -15,6 +15,14 @@ use crate::{fl, page};
 static COSMIC_DARK_SVG: &'static [u8] = include_bytes!("../../res/cosmic-dark.svg");
 static COSMIC_LIGHT_SVG: &'static [u8] = include_bytes!("../../res/cosmic-light.svg");
 
+fn dark_icon() -> widget::svg::Handle {
+    widget::svg::Handle::from_memory(COSMIC_DARK_SVG)
+}
+
+fn light_icon() -> widget::svg::Handle {
+    widget::svg::Handle::from_memory(COSMIC_LIGHT_SVG)
+}
+
 struct Theme {
     name: String,
     builder: ThemeBuilder,
@@ -56,13 +64,13 @@ impl Page {
         let mut themes = vec![
             Theme {
                 name: "COSMIC Dark".to_string(),
-                handle: widget::svg::Handle::from_memory(COSMIC_DARK_SVG),
+                handle: dark_icon(),
                 builder: ThemeBuilder::dark(),
                 is_dark: true,
             },
             Theme {
                 name: "COSMIC Light".to_string(),
-                handle: widget::svg::Handle::from_memory(COSMIC_LIGHT_SVG),
+                handle: light_icon(),
                 builder: ThemeBuilder::light(),
                 is_dark: false,
             },
@@ -89,11 +97,12 @@ impl Page {
 
                 match ron::de::from_bytes::<ThemeBuilder>(&buffer[..read]) {
                     Ok(builder) => {
+                        let is_dark = name.ends_with("dark");
                         themes.push(Theme {
                             name: name.replace('-', " ").to_title_case(),
-                            handle: widget::svg::Handle::from_memory(COSMIC_DARK_SVG),
+                            handle: if is_dark { dark_icon() } else { light_icon() },
                             builder,
-                            is_dark: name.ends_with("dark"),
+                            is_dark,
                         });
                     }
 

src/page/layout.rs

@@ -20,7 +20,7 @@ struct Layout {
 pub struct Page {
     locale: String,
     layouts: Vec<Layout>,
-    selected: usize,
+    selected: Option<usize>,
 }
 
 #[derive(Copy, Clone, Debug, PartialEq, Eq)]
@@ -39,7 +39,7 @@ impl Page {
         match message {
             Message::Selected(id) => {
                 if let Some(layout) = self.layouts.get(id) {
-                    self.selected = id;
+                    self.selected = Some(id);
                     apply_layout(&layout.path);
                 }
             }
@@ -58,6 +58,10 @@ impl super::Page for Page {
         self
     }
 
+    fn skippable(&self) -> bool {
+        true
+    }
+
     fn init(&mut self) -> cosmic::Task<super::Message> {
         let Ok(layouts_dir) = std::fs::read_dir("/usr/share/cosmic-layouts/") else {
             return cosmic::Task::none();
@@ -167,7 +171,7 @@ fn layout_button<'a>(
     locale: &str,
     layout: &'a Layout,
     id: usize,
-    current: usize,
+    current: Option<usize>,
     spacing: u16,
 ) -> cosmic::Element<'a, super::Message> {
     let name = layout
@@ -186,7 +190,7 @@ fn layout_button<'a>(
 
     let button = widget::button::custom_image_button(thumbnail, None)
         .class(cosmic::theme::Button::Image)
-        .selected(current == id)
+        .selected(current.map_or(false, |current| current == id))
         .on_press(Message::Selected(id).into());
 
     widget::column::with_capacity(2)

src/page/mod.rs

@@ -135,6 +135,10 @@ pub trait Page {
         true
     }
 
+    fn optional(&self) -> bool {
+        false
+    }
+
     fn skippable(&self) -> bool {
         false
     }

src/page/new_apps.rs

@@ -24,6 +24,10 @@ impl super::Page for Page {
         self
     }
 
+    fn skippable(&self) -> bool {
+        true
+    }
+
     fn view(&self) -> cosmic::Element<super::Message> {
         let cosmic_theme::Spacing { space_s, .. } = cosmic::theme::active().cosmic().spacing;
 

src/page/new_shortcuts.rs

@@ -24,6 +24,10 @@ impl super::Page for Page {
         self
     }
 
+    fn skippable(&self) -> bool {
+        true
+    }
+
     fn view(&self) -> cosmic::Element<super::Message> {
         let cosmic_theme::Spacing { space_s, .. } = cosmic::theme::active().cosmic().spacing;
 

src/page/wifi.rs

@@ -50,7 +50,7 @@ impl super::Page for Page {
         connection_settings()
     }
 
-    fn skippable(&self) -> bool {
+    fn optional(&self) -> bool {
         true
     }
 

src/page/workflow.rs

@@ -24,6 +24,10 @@ impl super::Page for Page {
         self
     }
 
+    fn skippable(&self) -> bool {
+        true
+    }
+
     fn view(&self) -> cosmic::Element<super::Message> {
         let cosmic_theme::Spacing { space_xl, .. } = cosmic::theme::active().cosmic().spacing;