chore: update colloid

Signed-off-by: Pranav <npv12@iitbbs.ac.in>

.github/workflows/release.yml

@@ -20,10 +20,10 @@ jobs:
           cache: 'pip'
       - name: Install dependencies
         run: pip install -r requirements.txt
-      - name: Install colloid specific deps
-        run: sudo apt-get install sassc
+      - name: Install colloid specific dependencies
+        run: sudo apt update && sudo apt install -y sassc inkscape optipng
       - name: Generate themes
-        run: python ./install.py all -a all --zip -d $PWD/releases
+        run: python ./install.py all -a all --zip -d $PWD/releases --recreate-asset
       - name: Add zips to release
         uses: softprops/action-gh-release@v1
         with:

README.md

@@ -128,7 +128,7 @@ Compulsory field        Specify color variant(s) [mocha|frappe|macchiato|latte|a
 -a, --accent VARIANT... Specify theme color variant(s) [rosewater|flamingo|pink|mauve|red|maroon|peach|yellow|green|teal|sky|
                         sapphire|blue|lavender|all] (Default: blue)
 -s, --size VARIANT...   Specify size variant [standard|compact] (Default: standard variant)
--l, --libadwaita        Link installed gtk-4.0 theme to config folder for all libadwaita app use this theme
+-l, --link              Link installed gtk-4.0 theme to config folder for all libadwaita app use this theme
 --zip                   Zips up the finally produced themes. 
 --tweaks                Specify versions for tweaks [black|rimless|normal]
                         1. black:    Blackness color version
@@ -148,11 +148,16 @@ python install.py all -a all
 
 ## Development
 
+You need to install the following packages to build the theme. Check with your distribution for the package names in the repository
+- `sassc`
+- `inkscape`
+- `optipng`
+
 A few important notes to keep in mind
 
-* `recolor.py` handles all changes that needs to be done to colloid to ensure it generated catppuccin colors. If vinceliuice changes anything in his theme in future, that is where you must change
-* `var.py` includes all different variables that you can tinker around as per your personal requirements. 
-* `create_theme.py` consists of a wrapper that will recolor the colloid theme, install it as per the args provided and rename it accordingly. 
+- `recolor.py` handles all changes that needs to be done to colloid to ensure it generated catppuccin colors. If vinceliuice changes anything in his theme in future, that is where you must change
+- `var.py` includes all different variables that you can tinker around as per your personal requirements. 
+- `create_theme.py` consists of a wrapper that will recolor the colloid theme, install it as per the args provided and rename it accordingly. 
  
 ## 💝 Thanks to
 

install.py

@@ -79,7 +79,7 @@ parser.add_argument("--zip",
 parser.add_argument("--recreate-asset",
                     help="Recreate assets for xfwm4 and such",
                     type=bool,
-                    default=True,
+                    default=False,
                     action=argparse.BooleanOptionalAction,
                     dest="rec_asset")
 

scripts/create_theme.py

@@ -6,12 +6,12 @@ from typing import List
 from scripts.ctp_colors import ctp_colors
 from scripts.patches import recreate_xfwm4_assets
 from scripts.recolor import recolor
-from scripts.utils import zip_multiple_folders
+from scripts.utils import replacetext, zip_multiple_folders
 from scripts.var import def_color_map, repo_dir, src_dir, theme_name, work_dir
 
 
 def create_theme(types: List[str], accents: List[str], dest: str, link: bool = False, 
-    name: str = theme_name, size: str = "standard", tweaks=[], zip = False, recreate_assets = True) -> None:
+    name: str = theme_name, size: str = "standard", tweaks=[], zip = False, recreate_assets = False) -> None:
 
     try:
         os.makedirs(dest)  # Create our destination directory
@@ -19,11 +19,12 @@ def create_theme(types: List[str], accents: List[str], dest: str, link: bool = F
         pass
 
     for type in types:
+        if recreate_assets:
+            recreate_xfwm4_assets(type)
+
         for accent in accents:
             # Recolor colloid wrt our selection like mocha. latte
             recolor(ctp_colors[type], accent)
-            if recreate_assets:
-                recreate_xfwm4_assets(type)
             theme_style: str = "light" if type == "latte" else "dark"
             install_cmd: str = f"./install.sh -c {theme_style} -s {size} -n {name} -d {dest} -t {def_color_map[accent]}"
             if tweaks:
@@ -38,8 +39,8 @@ def create_theme(types: List[str], accents: List[str], dest: str, link: bool = F
             try:
                 # Rename colloid generated files as per catppuccin
                 new_filename = dest + \
-                    f"/{theme_name}-{type.capitalize()}-{size.capitalize()}-{accent.capitalize()}-{theme_style.title()}"
-                filename = f"{theme_name}"
+                    f"/{name}-{type.capitalize()}-{size.capitalize()}-{accent.capitalize()}-{theme_style.title()}"
+                filename = f"{name}"
                 if def_color_map[accent] != 'default':
                     filename += f"-{def_color_map[accent].capitalize()}"
                 filename += f"-{theme_style.capitalize()}"
@@ -56,6 +57,7 @@ def create_theme(types: List[str], accents: List[str], dest: str, link: bool = F
                 os.rename(dest + "/" + filename + '-xhdpi',
                         new_filename + '-xhdpi')
                 os.rename(dest + "/" + filename, new_filename)
+                replacetext(new_filename + '/index.theme', filename, new_filename.split("/")[-1])
                 print("Successfully renamed file")
             except Exception as e:
                 print("Failed to rename the files due to:", e)