feat(tahoe): add tint color variants

Author: Neved4

README.md

@@ -41,6 +41,12 @@ By default, `folderify` uses your system's current light/dark mode. Use `--color
 folderify --color-scheme dark mask.png
 ```
 
+On macOS Tahoe, the default folder color is `multicolor`. Use `--folder-color` to switch to one of the tinted Tahoe folder variants:
+
+```shell
+folderify --macOS 26 --folder-color blue mask.png
+```
+
 Note:
 
 - There is currently no simple way to set an icon that will automatically switch between light and dark when you switch the entire OS. You can only assign one version of an icon to a folder.
@@ -168,6 +174,13 @@ Options:
           [default: auto]
           [possible values: auto, light, dark]
 
+      --folder-color <FOLDER_COLOR>
+          Tahoe folder color. `multicolor` keeps the default macOS folder look,
+          while the tinted variants use Tahoe's tinted folder rendering
+          
+          [default: multicolor]
+          [possible values: multicolor, blue, graphite, green, orange, pink, purple, red, yellow]
+
       --no-trim
           Don't trim margins from the mask.
           By default (i.e. without this flag), transparent margins are trimmed from all 4 sides.

src/args.rs

@@ -58,6 +58,11 @@ struct FolderifyArgs {
     #[clap(long, value_enum, default_value_t = ColorSchemeOrAuto::Auto)]
     color_scheme: ColorSchemeOrAuto,
 
+    /// Tahoe folder color. `multicolor` keeps the default macOS folder look,
+    /// while the tinted variants use Tahoe's tinted folder rendering.
+    #[clap(long, value_enum, default_value_t = FolderColor::Multicolor)]
+    folder_color: FolderColor,
+
     /// Don't trim margins from the mask.
     /// By default (i.e. without this flag), transparent margins are trimmed from all 4 sides.
     #[clap(long, verbatim_doc_comment)]
@@ -94,6 +99,19 @@ pub enum ColorScheme {
     Dark,
 }
 
+#[derive(ValueEnum, Clone, Debug, PartialEq, Copy)]
+pub enum FolderColor {
+    Multicolor,
+    Blue,
+    Graphite,
+    Green,
+    Orange,
+    Pink,
+    Purple,
+    Red,
+    Yellow,
+}
+
 #[derive(ValueEnum, Clone, Debug, PartialEq, Copy)]
 pub enum Badge {
     Alias,
@@ -113,6 +131,28 @@ impl Display for ColorScheme {
     }
 }
 
+impl FolderColor {
+    pub fn as_str(&self) -> &'static str {
+        match self {
+            Self::Multicolor => "multicolor",
+            Self::Blue => "blue",
+            Self::Graphite => "graphite",
+            Self::Green => "green",
+            Self::Orange => "orange",
+            Self::Pink => "pink",
+            Self::Purple => "purple",
+            Self::Red => "red",
+            Self::Yellow => "yellow",
+        }
+    }
+}
+
+impl Display for FolderColor {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        write!(f, "{}", self.as_str())
+    }
+}
+
 #[derive(ValueEnum, Clone, Debug, PartialEq)]
 enum ColorSchemeOrAuto {
     Auto,
@@ -141,6 +181,7 @@ enum SetIconUsingOrAuto {
 pub struct Options {
     pub mask_path: PathBuf,
     pub color_scheme: ColorScheme,
+    pub folder_color: FolderColor,
     pub no_trim: bool,
     pub target: Option<PathBuf>,
     pub folder_style: FolderStyle,
@@ -259,9 +300,18 @@ pub fn get_options() -> Options {
         Some(SetIconUsingOrAuto::Fileicon) => SetIconUsing::Fileicon,
         _ => SetIconUsing::Osascript,
     };
+    if folder_style != FolderStyle::Tahoe
+        && args.folder_color != FolderColor::Multicolor
+    {
+        eprintln!(
+            "Folder tint variants are only available for Tahoe. \
+Ignoring `--folder-color`."
+        );
+    }
     Options {
         mask_path: mask,
         color_scheme: map_color_scheme_auto(args.color_scheme, folder_style),
+        folder_color: normalized_folder_color(folder_style, args.folder_color),
         no_trim: args.no_trim,
         target: args.target,
         folder_style,
@@ -277,6 +327,17 @@ pub fn get_options() -> Options {
     }
 }
 
+fn normalized_folder_color(
+    folder_style: FolderStyle,
+    folder_color: FolderColor,
+) -> FolderColor {
+    if folder_style == FolderStyle::Tahoe {
+        folder_color
+    } else {
+        FolderColor::Multicolor
+    }
+}
+
 fn map_color_scheme_auto(
     color_scheme: ColorSchemeOrAuto,
     folder_style: FolderStyle,

src/icon_conversion.rs

@@ -35,7 +35,7 @@ impl ProgressBarType {
 }
 
 use crate::{
-    args::{Badge, ColorScheme, FolderStyle, Options, SetIconUsing},
+    args::{Badge, ColorScheme, FolderColor, FolderStyle, Options, SetIconUsing},
     command::{
         run_command, run_magick, DEREZ_COMMAND, FILEICON_COMMAND, ICONUTIL_COMMAND,
         OSASCRIPT_COMMAND, REZ_COMMAND, SETFILE_COMMAND, SIPS_COMMAND,
@@ -72,6 +72,24 @@ struct MaskProfile {
     engraving: EngravingInputs,
 }
 
+struct TintedPalette {
+    fill: RGBColor,
+    top_bezel: RGBColor,
+    bottom_bezel: RGBColor,
+}
+
+fn tinted_palette(
+    fill: [u8; 3],
+    top_bezel: [u8; 3],
+    bottom_bezel: [u8; 3],
+) -> TintedPalette {
+    TintedPalette {
+        fill: RGBColor::from_components(fill),
+        top_bezel: RGBColor::from_components(top_bezel),
+        bottom_bezel: RGBColor::from_components(bottom_bezel),
+    }
+}
+
 #[derive(Debug)]
 pub struct WorkingDir {
     working_dir: Temp,
@@ -244,40 +262,101 @@ impl IconResolution {
     }
 }
 
-fn tahoe_mask_profile(resolution: &IconResolution) -> MaskProfile {
+fn tahoe_multicolor_mask_profile(resolution: &IconResolution) -> MaskProfile {
     let size = resolution.size();
     MaskProfile {
         mask_dimensions: Dimensions {
             width: size * 3 / 4,
             height: size / 2,
         },
-        offset_y: resolution.offset_y() - (size as i32 / 160),
+        offset_y: resolution.offset_y(),
         engraving: EngravingInputs {
-            fill_color: RGBColor::new(52, 104, 148),
-            fill_opacity: 0.84,
+            fill_color: RGBColor::new(74, 141, 172),
+            fill_opacity: 0.5,
             top_bezel: BezelInputs {
-                color: RGBColor::new(48, 96, 136),
+                color: RGBColor::new(58, 152, 208),
                 blur: BlurDown {
                     spread_px: 0,
-                    page_y: 1,
+                    page_y: 2,
                 },
-                mask_operation: CompositingOperation::Dst_Out,
-                opacity: 0.18,
+                mask_operation: CompositingOperation::Dst_In,
+                opacity: 0.5,
             },
             bottom_bezel: BezelInputs {
-                color: RGBColor::new(102, 138, 170),
+                color: RGBColor::new(174, 225, 253),
                 blur: resolution.bottom_bezel_blur_down(),
-                mask_operation: CompositingOperation::Dst_In,
-                opacity: 0.2,
+                mask_operation: CompositingOperation::Dst_Out,
+                opacity: resolution.bottom_bezel_alpha(),
             },
         },
     }
 }
 
-fn big_sur_mask_profile(
+fn tahoe_tinted_palette(folder_color: FolderColor) -> TintedPalette {
+    match folder_color {
+        FolderColor::Multicolor => unreachable!(),
+        FolderColor::Blue => {
+            tinted_palette([14, 117, 243], [10, 92, 201], [50, 131, 255])
+        }
+        FolderColor::Graphite => {
+            tinted_palette([129, 128, 133], [104, 103, 108], [142, 141, 147])
+        }
+        FolderColor::Green => {
+            tinted_palette([44, 195, 68], [27, 156, 49], [68, 207, 86])
+        }
+        FolderColor::Orange => {
+            tinted_palette([241, 121, 36], [205, 92, 16], [253, 135, 62])
+        }
+        FolderColor::Pink => {
+            tinted_palette([240, 25, 73], [205, 12, 54], [252, 55, 92])
+        }
+        FolderColor::Purple => {
+            tinted_palette([198, 0, 229], [154, 0, 181], [210, 44, 240])
+        }
+        FolderColor::Red => {
+            tinted_palette([240, 38, 51], [207, 18, 30], [252, 63, 73])
+        }
+        FolderColor::Yellow => {
+            tinted_palette([243, 198, 9], [208, 163, 0], [254, 210, 49])
+        }
+    }
+}
+
+fn tahoe_tinted_mask_profile(
     resolution: &IconResolution,
-    color_scheme: ColorScheme,
+    folder_color: FolderColor,
 ) -> MaskProfile {
+    let size = resolution.size();
+    let palette = tahoe_tinted_palette(folder_color);
+    MaskProfile {
+        mask_dimensions: Dimensions {
+            width: size * 3 / 4,
+            height: size / 2,
+        },
+        offset_y: resolution.offset_y() - (size as i32 / 160),
+        engraving: EngravingInputs {
+            fill_color: palette.fill,
+            fill_opacity: 0.5,
+            top_bezel: BezelInputs {
+                color: palette.top_bezel,
+                blur: BlurDown {
+                    spread_px: 0,
+                    page_y: 2,
+                },
+                mask_operation: CompositingOperation::Dst_In,
+                opacity: 0.5,
+            },
+            bottom_bezel: BezelInputs {
+                color: palette.bottom_bezel,
+                blur: resolution.bottom_bezel_blur_down(),
+                mask_operation: CompositingOperation::Dst_Out,
+                opacity: resolution.bottom_bezel_alpha(),
+            },
+        },
+    }
+}
+
+fn big_sur_mask_profile(resolution: &IconResolution, color_scheme: ColorScheme) -> MaskProfile {
     MaskProfile {
         mask_dimensions: Dimensions {
             width: resolution.size() * 3 / 4,
@@ -433,9 +512,10 @@ impl IconConversion {
         )?;
 
         self.step("Setting fill opacity");
-        let fill = self.simple_operation(&fill_colorized, "2.2_FILL", |args: &mut CommandArgs| {
-            args.opacity(inputs.fill_opacity);
-        })?;
+        let fill =
+            self.simple_operation(&fill_colorized, "2.2_FILL", |args: &mut CommandArgs| {
+                args.opacity(inputs.fill_opacity);
+            })?;
 
         self.step("Complementing mask for top bezel");
         let top_bezel_complement = self.simple_operation(
@@ -562,9 +642,14 @@ impl IconConversion {
         //     println!("[Starting] {}", inputs.resolution);
         // }
 
-        let mask_profile = match icon_inputs.folder_style {
-            FolderStyle::Tahoe => tahoe_mask_profile(&icon_inputs.resolution),
-            FolderStyle::BigSur => {
+        let mask_profile = match (icon_inputs.folder_style, icon_inputs.folder_color) {
+            (FolderStyle::Tahoe, FolderColor::Multicolor) => {
+                tahoe_multicolor_mask_profile(&icon_inputs.resolution)
+            }
+            (FolderStyle::Tahoe, folder_color) => {
+                tahoe_tinted_mask_profile(&icon_inputs.resolution, folder_color)
+            }
+            (FolderStyle::BigSur, _) => {
                 big_sur_mask_profile(&icon_inputs.resolution, icon_inputs.color_scheme)
             }
         };

src/main.rs

@@ -34,6 +34,13 @@ fn main() {
         options.mask_path.display(),
         options.color_scheme
     );
+    if options.folder_style == args::FolderStyle::Tahoe {
+        println!(
+            "[{}] Using folder color: {}",
+            options.mask_path.display(),
+            options.folder_color
+        );
+    }
 
     let working_dir = WorkingDir::new();
     if options.debug {
@@ -83,6 +90,7 @@ fn main() {
                     &IconInputs {
                         folder_style: options.folder_style,
                         color_scheme: options.color_scheme,
+                        folder_color: options.folder_color,
                         resolution,
                         empty_folder: options.empty_folder,
                     },

src/primitives.rs

@@ -32,6 +32,10 @@ impl RGBColor {
     pub fn new(r: u8, g: u8, b: u8) -> Self {
         Self { r, g, b }
     }
+
+    pub fn from_components(components: [u8; 3]) -> Self {
+        Self::new(components[0], components[1], components[2])
+    }
 }
 
 impl Display for RGBColor {