Match font and timezone selection context item styling to designs

cosmic-settings/src/app.rs

@@ -996,7 +996,7 @@ impl SettingsApp {
             if section
                 .show_while
                 .as_ref()
-                .map_or(true, |func| func(model.as_ref()))
+                .is_none_or(|func| func(model.as_ref()))
             {
                 sections_column.push(
                     (section.view_fn)(&self.pages, model.as_ref(), section)
@@ -1108,7 +1108,7 @@ impl SettingsApp {
             if section
                 .show_while
                 .as_ref()
-                .map_or(true, |func| func(model.as_ref()))
+                .is_none_or(|func| func(model.as_ref()))
             {
                 let section = (section.view_fn)(&self.pages, model.as_ref(), section)
                     .map(Message::PageMessage)

cosmic-settings/src/config.rs

@@ -19,6 +19,12 @@ pub struct Config {
     state: cosmic_config::Config,
 }
 
+impl Default for Config {
+    fn default() -> Self {
+        Self::new()
+    }
+}
+
 impl Config {
     pub fn new() -> Self {
         let config = match cosmic_config::Config::new(NAME, 1) {

cosmic-settings/src/pages/accessibility/mod.rs

@@ -231,7 +231,7 @@ pub fn vision() -> section::Section<crate::pages::Message> {
                         text::body(status_text).wrapping(Wrapping::Word),
                         page.wayland_available
                             .is_some()
-                            .then_some(crate::pages::Message::Page(magnifier_entity).into()),
+                            .then_some(crate::pages::Message::Page(magnifier_entity)),
                     )
                 })
                 .add(
@@ -270,7 +270,7 @@ pub fn vision() -> section::Section<crate::pages::Message> {
                         Some(page.screen_filter_selection as usize),
                         move |idx| {
                             let filter = ColorFilter::from_usize(idx).unwrap_or_default();
-                            Message::SetScreenFilterSelection(filter).into()
+                            Message::SetScreenFilterSelection(filter)
                         },
                         cosmic::iced::window::Id::RESERVED,
                         Message::Surface,

cosmic-settings/src/pages/applications/default_apps.rs

@@ -187,16 +187,13 @@ impl Page {
                             .iter()
                             .map(|m| m.essence_str())
                             .filter(|m| m.starts_with("audio"))
-                            .chain(
-                                [
-                                    "application/ogg",
-                                    "application/x-cue",
-                                    "application/x-ogg",
-                                    "audio/mp3",
-                                    "x-content/audio-cdda",
-                                ]
-                                .into_iter(),
-                            )
+                            .chain([
+                                "application/ogg",
+                                "application/x-cue",
+                                "application/x-ogg",
+                                "audio/mp3",
+                                "x-content/audio-cdda",
+                            ])
                             .collect();
                         &mime_types
                     }),
@@ -528,7 +525,7 @@ async fn load_defaults(assocs: &BTreeMap<Arc<str>, Arc<App>>, for_mimes: &[&str]
 
 async fn xdg_mime_query_default(mime_type: &str) -> Option<String> {
     let output = tokio::process::Command::new("xdg-mime")
-        .args(&["query", "default", mime_type])
+        .args(["query", "default", mime_type])
         .output()
         .await
         .ok()?;

cosmic-settings/src/pages/applications/startup_apps.rs

@@ -63,9 +63,9 @@ enum Context {
     AddApplication(DirectoryType),
 }
 
-impl Into<Vec<PathBuf>> for DirectoryType {
-    fn into(self) -> Vec<PathBuf> {
-        match self {
+impl From<DirectoryType> for Vec<PathBuf> {
+    fn from(val: DirectoryType) -> Self {
+        match val {
             DirectoryType::User => vec![
                 dirs::config_dir()
                     .expect("config dir not found")
@@ -121,7 +121,7 @@ impl page::Page<crate::pages::Message> for Page {
                 Some(
                     cosmic::app::context_drawer(
                         self.add_application_context_view(directory_type.clone()),
-                        crate::pages::Message::CloseContextDrawer.into(),
+                        crate::pages::Message::CloseContextDrawer,
                     )
                     .title(fl!("startup-apps", "search-for-application"))
                     .header(search),
@@ -224,7 +224,7 @@ impl Page {
                 let directories: Vec<PathBuf> = directory_type.clone().into();
 
                 let directory_to_target =
-                    directories.get(0).expect("Always at least one directory");
+                    directories.first().expect("Always at least one directory");
 
                 _ = std::fs::create_dir_all(directory_to_target.as_path());
 
@@ -271,7 +271,7 @@ impl Page {
                     let directories: Vec<PathBuf> = directory_type.clone().into();
 
                     let directory_to_target =
-                        directories.get(0).expect("Always at least one directory");
+                        directories.first().expect("Always at least one directory");
                     if let Ok(exists) = std::fs::exists(directory_to_target.join(file_name.clone()))
                     {
                         if exists {

cosmic-settings/src/pages/bluetooth/mod.rs

@@ -830,7 +830,7 @@ fn connected_devices() -> Section<crate::pages::Message> {
                         .model
                         .popup_device
                         .as_deref()
-                        .map_or(false, |p| path.as_str() == p.as_str())
+                        .is_some_and(|p| path.as_str() == p.as_str())
                     {
                         widget::popover(
                             widget::button::icon(widget::icon::from_name("view-more-symbolic"))
@@ -1012,29 +1012,29 @@ mod systemd {
 
     pub fn activate_bluetooth() -> impl Future<Output = ()> + Send {
         tokio::process::Command::new("pkexec")
-            .args(&["systemctl", "start", "bluetooth"])
+            .args(["systemctl", "start", "bluetooth"])
             .status()
             .map(|_| ())
     }
 
     pub fn enable_bluetooth() -> impl Future<Output = ()> + Send {
         tokio::process::Command::new("pkexec")
-            .args(&["systemctl", "enable", "--now", "bluetooth"])
+            .args(["systemctl", "enable", "--now", "bluetooth"])
             .status()
             .map(|_| ())
     }
 
     pub fn is_bluetooth_enabled() -> bool {
         std::process::Command::new("systemctl")
-            .args(&["is-enabled", "bluetooth"])
+            .args(["is-enabled", "bluetooth"])
             .status()
             .map(|status| status.success())
             .unwrap_or(true)
     }
 
     pub fn is_bluetooth_active() -> bool {
         std::process::Command::new("systemctl")
-            .args(&["is-active", "bluetooth"])
+            .args(["is-active", "bluetooth"])
             .status()
             .map(|status| status.success())
             .unwrap_or(true)

cosmic-settings/src/pages/desktop/appearance/drawer.rs

@@ -129,7 +129,7 @@ impl Content {
     ) -> Task<app::Message> {
         match message {
             FontMessage::FontLoaded(interface, mono) => {
-                return self.font_config.font_loaded(mono, interface);
+                self.font_config.font_loaded(mono, interface)
             }
             FontMessage::Search(input) => match context_view {
                 None => Task::none(),
@@ -141,7 +141,7 @@ impl Content {
                         return task;
                     }
                 }
-                return Task::none();
+                Task::none()
             }
         }
     }

cosmic-settings/src/pages/desktop/appearance/font_config.rs

@@ -38,15 +38,12 @@ pub fn load_font_families() -> (Vec<Arc<str>>, Vec<Arc<str>>) {
                 };
 
                 if face.monospaced {
-                    if mono
-                        .last()
-                        .map_or(true, |name| &**name != font_name.as_str())
-                    {
+                    if mono.last().is_none_or(|name| &**name != font_name.as_str()) {
                         mono.push(Arc::from(font_name.as_str()));
                     }
                 } else if interface
                     .last()
-                    .map_or(true, |name| &**name != font_name.as_str())
+                    .is_none_or(|name| &**name != font_name.as_str())
                 {
                     interface.push(Arc::from(font_name.as_str()));
                 }
@@ -75,6 +72,12 @@ pub struct Model {
     pub monospace_font: FontConfig,
 }
 
+impl Default for Model {
+    fn default() -> Self {
+        Self::new()
+    }
+}
+
 impl Model {
     pub fn new() -> Model {
         Model {
@@ -118,7 +121,7 @@ impl Model {
                 };
 
                 update_config(MONOSPACE_FONT, self.monospace_font.clone());
-                return None;
+                None
             }
             ContextView::SystemFont => {
                 self.interface_font = FontConfig {
@@ -131,9 +134,9 @@ impl Model {
                 tokio::spawn(async move {
                     set_gnome_font_name(font.as_ref()).await;
                 });
-                return None;
+                None
             }
-            _ => return None,
+            _ => None,
         }
     }
 
@@ -148,7 +151,7 @@ impl Model {
                 fonts
                     .iter()
                     .filter(|f| f.to_lowercase().contains(&self.font_search))
-                    .map(|f| f.clone())
+                    .cloned()
                     .collect(),
             );
         }
@@ -175,7 +178,7 @@ impl Model {
         callback: impl Fn(Arc<str>) -> super::Message,
     ) -> Element<'_, super::Message> {
         let svg_accent = Rc::new(|theme: &cosmic::Theme| svg::Style {
-            color: Some(theme.cosmic().accent_color().into()),
+            color: Some(theme.cosmic().accent_text_color().into()),
         });
 
         let (mut families, current_font) = match *context_view {
@@ -195,6 +198,11 @@ impl Model {
             list.add(
                 settings::item_row(vec![
                     widget::text::body(&**family)
+                        .class(if selected {
+                            cosmic::theme::Text::Accent
+                        } else {
+                            cosmic::theme::Text::Default
+                        })
                         .wrapping(Wrapping::Word)
                         .width(cosmic::iced::Length::Fill)
                         .into(),

cosmic-settings/src/pages/desktop/appearance/mod.rs

@@ -302,7 +302,7 @@ impl Page {
                 theme_staged = self
                     .theme_manager
                     .selected_customizer_mut()
-                    .set_accent(Some(c).map(Srgb::from));
+                    .set_accent(Some(Srgb::from(c)));
             }
 
             Message::Reset => {

cosmic-settings/src/pages/desktop/appearance/mode_and_colors.rs

@@ -26,13 +26,13 @@ pub fn section() -> Section<crate::pages::Message> {
 
             let mut section = settings::section()
                 .title(&section.title)
-                .add(theme_mode(&page, section, &label_keys))
-                .add(auto_switch(&page, section, &label_keys))
-                .add(accent_color_palette(&page, section, &label_keys))
-                .add(application_background(&page, section, &label_keys))
-                .add(container_background(&page, section, &label_keys))
-                .add(interface_text(&page, section, &label_keys))
-                .add(control_tint(&page, section, &label_keys))
+                .add(theme_mode(page, section, &label_keys))
+                .add(auto_switch(page, section, &label_keys))
+                .add(accent_color_palette(page, section, &label_keys))
+                .add(application_background(page, section, &label_keys))
+                .add(container_background(page, section, &label_keys))
+                .add(interface_text(page, section, &label_keys))
+                .add(control_tint(page, section, &label_keys))
                 .add(
                     settings::item::builder(&descriptions[label_keys["window_hint_toggle"]])
                         .toggler(
@@ -196,16 +196,13 @@ fn accent_color_palette<'a>(
     let mut accent_palette_row = Vec::with_capacity(accent.len());
 
     for &color in accent {
-        accent_palette_row.push(
-            color_button(
-                Some(Message::PaletteAccent(color.into())),
-                color.into(),
-                cur_accent == color,
-                48,
-                48,
-            )
-            .into(),
-        );
+        accent_palette_row.push(color_button(
+            Some(Message::PaletteAccent(color.into())),
+            color.into(),
+            cur_accent == color,
+            48,
+            48,
+        ));
     }
 
     accent_palette_row.push(

cosmic-settings/src/pages/desktop/appearance/theme_manager.rs

@@ -85,7 +85,7 @@ impl From<(Option<Config>, Option<Config>, Option<Vec<Srgba>>)> for ThemeCustomi
             custom_window_hint: None,
         };
 
-        if let None = customizer.accent_palette {
+        if customizer.accent_palette.is_none() {
             let palette = customizer.builder.0.palette.as_ref();
             customizer.accent_palette = Some(vec![
                 palette.accent_blue,
@@ -159,7 +159,7 @@ impl Default for Manager {
 }
 
 impl Manager {
-    pub fn build_theme<'a>(&mut self, stage: ThemeStaged) -> Task<app::Message> {
+    pub fn build_theme(&mut self, stage: ThemeStaged) -> Task<app::Message> {
         macro_rules! theme_transaction {
             ($config:ident, $current_theme:ident, $new_theme:ident, { $($name:ident;)+ }) => {
                 let tx = $config.transaction();
@@ -194,10 +194,10 @@ impl Manager {
             None
         };
 
-        let mut data = std::iter::once(current).chain(other.into_iter());
+        let mut data = std::iter::once(current).chain(other);
 
         cosmic::task::future(async move {
-            while let Some((builder, config)) = data.next() {
+            for (builder, config) in data.by_ref() {
                 if let Some(config) = config {
                     let current_theme = match Theme::get_entry(&config) {
                         Ok(theme) => theme,
@@ -277,7 +277,7 @@ impl Manager {
 
     #[inline]
     pub fn custom_window_hint(&self) -> &Option<Srgb> {
-        &self.selected_customizer().custom_window_hint()
+        self.selected_customizer().custom_window_hint()
     }
 
     #[inline]

cosmic-settings/src/pages/desktop/dock/mod.rs

@@ -68,7 +68,7 @@ impl Page {
             }
             Message::Inner(inner) => {
                 if let inner::Message::Surface(a) = inner {
-                    return cosmic::task::message(crate::app::Message::Surface(a));
+                    cosmic::task::message(crate::app::Message::Surface(a))
                 } else {
                     self.inner
                         .update(inner)

cosmic-settings/src/pages/desktop/panel/applets_inner.rs

@@ -590,7 +590,7 @@ impl Applet<'static> {
     }
 }
 
-impl<'a> Applet<'a> {
+impl Applet<'_> {
     fn into_owned(self) -> Applet<'static> {
         Applet {
             id: Cow::from(self.id.into_owned()),
@@ -641,7 +641,7 @@ impl<'a, Message: 'static + Clone> AppletReorderList<'a, Message> {
             .into_iter()
             .map(|info| {
                 let id_clone = info.id.to_string();
-                let is_dragged = active_dnd.as_ref().map_or(false, |dnd| dnd.id == info.id);
+                let is_dragged = active_dnd.as_ref().is_some_and(|dnd| dnd.id == info.id);
 
                 let content = if is_dragged {
                     row::with_capacity(0).height(Length::Fixed(32.0))
@@ -859,8 +859,8 @@ pub fn dnd_icon(info: Applet<'static>, layout: &layout::Layout) -> AppletReorder
     }
 }
 
-impl<'a, Message: 'static> Widget<Message, cosmic::Theme, cosmic::Renderer>
-    for AppletReorderList<'a, Message>
+impl<Message: 'static> Widget<Message, cosmic::Theme, cosmic::Renderer>
+    for AppletReorderList<'_, Message>
 where
     Message: Clone,
 {