From 70a53040273404245e6907bb69dfef95e7ee4d02 Mon Sep 17 00:00:00 2001
From: MoetaYuko <loli@yuko.moe>
Date: Wed, 29 May 2024 16:59:02 +0800
Subject: [PATCH] ags: clean up and export handleStyles to command line

---
 .config/ags/config.js                         |  4 ++--
 .config/ags/config_overviewOnly.js            | 19 ++-----------------
 .config/ags/init.js                           | 16 +++++++++-------
 .../scripts/color_generation/applycolor.sh    |  3 +--
 4 files changed, 14 insertions(+), 28 deletions(-)

diff --git a/.config/ags/config.js b/.config/ags/config.js
index 228b63749..f440dbd22 100644
--- a/.config/ags/config.js
+++ b/.config/ags/config.js
@@ -20,7 +20,7 @@ import Overview from './modules/overview/main.js';
 import Session from './modules/session/main.js';
 import SideLeft from './modules/sideleft/main.js';
 import SideRight from './modules/sideright/main.js';
-import { COMPILED_STYLE_DIR, handleStyles } from './init.js';
+import { COMPILED_STYLE_DIR } from './init.js';
 
 const range = (length, start = 1) => Array.from({ length }, (_, i) => i + start);
 function forMonitors(widget) {
@@ -32,7 +32,7 @@ function forMonitorsAsync(widget) {
     return range(n, 0).forEach((n) => widget(n).catch(print))
 }
 
-handleStyles();
+handleStyles(true);
 
 const Windows = () => [
     // forMonitors(DesktopBackground),
diff --git a/.config/ags/config_overviewOnly.js b/.config/ags/config_overviewOnly.js
index 857f37c7f..9c42aaa1b 100644
--- a/.config/ags/config_overviewOnly.js
+++ b/.config/ags/config_overviewOnly.js
@@ -8,26 +8,12 @@
 //     bind = Super, Tab, exec, ags -t overview
 
 // Import
-import GLib from 'gi://GLib';
 import App from 'resource:///com/github/Aylur/ags/app.js'
-import * as Utils from 'resource:///com/github/Aylur/ags/utils.js'
-// Stuff
-import userOptions from './modules/.configuration/user_options.js';
 // Widgets
 import Overview from './modules/overview/main.js';
+import { COMPILED_STYLE_DIR } from './init.js';
 
-const COMPILED_STYLE_DIR = `${GLib.get_user_cache_dir()}/ags/user/generated`
-Utils.exec(`mkdir -p "${GLib.get_user_state_dir()}/ags/scss"`);
-Utils.exec(`bash -c 'echo "" > ${GLib.get_user_state_dir()}/ags/scss/_musicwal.scss'`); // reset music styles
-Utils.exec(`bash -c 'echo "" > ${GLib.get_user_state_dir()}/ags/scss/_musicmaterial.scss'`); // reset music styles
-async function applyStyle() {
-    Utils.exec(`mkdir -p ${COMPILED_STYLE_DIR}`);
-    Utils.exec(`sass -I "${GLib.get_user_state_dir()}/ags/scss" -I "${App.configDir}/scss/fallback" "${App.configDir}/scss/main.scss" "${COMPILED_STYLE_DIR}/style.css"`);
-    App.resetCss();
-    App.applyCss(`${COMPILED_STYLE_DIR}/style.css`);
-    console.log('[LOG] Styles loaded')
-}
-applyStyle().catch(print);
+handleStyles(true);
 
 App.config({
     css: `${COMPILED_STYLE_DIR}/style.css`,
@@ -36,4 +22,3 @@ App.config({
         Overview(),
     ],
 });
-
diff --git a/.config/ags/init.js b/.config/ags/init.js
index 25a7e2c71..dd8546258 100644
--- a/.config/ags/init.js
+++ b/.config/ags/init.js
@@ -4,17 +4,20 @@ import * as Utils from 'resource:///com/github/Aylur/ags/utils.js'
 
 export const COMPILED_STYLE_DIR = `${GLib.get_user_cache_dir()}/ags/user/generated`
 
-export const handleStyles = () => {
+globalThis['handleStyles'] = (resetMusic) => {
     // Reset
     Utils.exec(`mkdir -p "${GLib.get_user_state_dir()}/ags/scss"`);
-    Utils.exec(`bash -c 'echo "" > ${GLib.get_user_state_dir()}/ags/scss/_musicwal.scss'`); // reset music styles
-    Utils.exec(`bash -c 'echo "" > ${GLib.get_user_state_dir()}/ags/scss/_musicmaterial.scss'`); // reset music styles
+    if (resetMusic) {
+        Utils.exec(`bash -c 'echo "" > ${GLib.get_user_state_dir()}/ags/scss/_musicwal.scss'`); // reset music styles
+        Utils.exec(`bash -c 'echo "" > ${GLib.get_user_state_dir()}/ags/scss/_musicmaterial.scss'`); // reset music styles
+    }
     // Generate overrides
-    Utils.writeFile(`
-@mixin symbolic-icon {
+    Utils.writeFile(
+`@mixin symbolic-icon {
     -gtk-icon-theme: '${userOptions.icons.symbolicIconTheme}';
 }
-    `, `${GLib.get_user_state_dir()}/ags/scss/_lib_mixins_overrides.scss`)
+`,
+        `${GLib.get_user_state_dir()}/ags/scss/_lib_mixins_overrides.scss`)
     // Compile and apply
     async function applyStyle() {
         Utils.exec(`mkdir -p ${COMPILED_STYLE_DIR}`);
@@ -25,4 +28,3 @@ export const handleStyles = () => {
     }
     applyStyle().catch(print);
 }
-
diff --git a/.config/ags/scripts/color_generation/applycolor.sh b/.config/ags/scripts/color_generation/applycolor.sh
index 8f67b9367..d39539f70 100755
--- a/.config/ags/scripts/color_generation/applycolor.sh
+++ b/.config/ags/scripts/color_generation/applycolor.sh
@@ -150,9 +150,8 @@ apply_gtk() { # Using gradience-cli
 }
 
 apply_ags() {
-    sass -I "$STATE_DIR/scss" -I "$CONFIG_DIR/scss/fallback" "$CONFIG_DIR"/scss/main.scss "$CACHE_DIR"/user/generated/style.css
+    ags run-js "handleStyles(false);"
     ags run-js 'openColorScheme.value = true; Utils.timeout(2000, () => openColorScheme.value = false);'
-    ags run-js "App.resetCss(); App.applyCss('${CACHE_DIR}/user/generated/style.css');"
 }
 
 if [[ "$1" = "--bad-apple" ]]; then