fix: update material-colors to 0.3.1 (#69)

Cargo.toml

@@ -38,6 +38,6 @@ reqwest = { version = "0.11.23", default_features = false, features = [
   "blocking",
   "rustls-tls",
 ] }
-material-colors = { version = "0.2.1", features = ["image"] }
+material-colors = { version = "0.3.1", features = ["image"] }
 ahash = "0.8.7"
 indexmap = "2.2.2"

src/main.rs

@@ -15,7 +15,7 @@ use crate::util::{
 
 use indexmap::IndexMap;
 
-use material_colors::{Argb, Scheme};
+use material_colors::{color::Argb, scheme::Scheme};
 
 use clap::{Parser, ValueEnum};
 use color_eyre::{eyre::Result, Report};

src/util/color.rs

@@ -1,9 +1,9 @@
 use material_colors::dynamic_color::dynamic_scheme::DynamicScheme;
 use material_colors::dynamic_color::material_dynamic_colors::MaterialDynamicColors;
-use material_colors::utils::theme::{ColorGroup, CustomColor, CustomColorGroup};
+use material_colors::theme::{ColorGroup, CustomColor, CustomColorGroup};
 use material_colors::{
-    Argb, FilterType, Hct, ImageReader, SchemeContent, SchemeExpressive, SchemeFidelity,
-    SchemeFruitSalad, SchemeMonochrome, SchemeNeutral, SchemeRainbow, SchemeTonalSpot,
+    color::Argb, image::FilterType, hct::Hct, image::ImageReader, scheme::variant::{SchemeContent, SchemeExpressive, SchemeFidelity,
+    SchemeFruitSalad, SchemeMonochrome, SchemeNeutral, SchemeRainbow, SchemeTonalSpot},
 };
 use owo_colors::{OwoColorize, Style};
 

src/util/config.rs

@@ -1,6 +1,5 @@
 use directories::ProjectDirs;
-use material_colors::utils::color::ParseRgbError;
-use material_colors::Argb;
+use material_colors::color::Argb;
 use std::fs;
 use std::path::PathBuf;
 use std::{collections::HashMap, str::FromStr};
@@ -31,14 +30,14 @@ impl CustomColor {
     pub fn to_custom_color(
         &self,
         name: String,
-    ) -> Result<material_colors::utils::theme::CustomColor, ParseRgbError> {
+    ) -> Result<material_colors::theme::CustomColor, material_colors::error::Error> {
         Ok(match self {
-            CustomColor::Color(color) => material_colors::utils::theme::CustomColor {
+            CustomColor::Color(color) => material_colors::theme::CustomColor {
                 value: Argb::from_str(color)?,
                 blend: true,
                 name,
             },
-            CustomColor::Options { color, blend } => material_colors::utils::theme::CustomColor {
+            CustomColor::Options { color, blend } => material_colors::theme::CustomColor {
                 value: Argb::from_str(color)?,
                 blend: *blend,
                 name,

src/util/template.rs

@@ -4,7 +4,7 @@ use color_eyre::Help;
 use color_eyre::{eyre::Result, Report};
 
 use colorsys::{ColorAlpha, Hsl};
-use material_colors::Argb;
+use material_colors::color::Argb;
 use serde::{Deserialize, Serialize};
 
 use upon::Value;