From 7eeeceea1c8740d2e22b8091225ca0cd870fc92b Mon Sep 17 00:00:00 2001
From: sadan <117494111+sadan4@users.noreply.github.com>
Date: Mon, 29 Jul 2024 23:37:53 -0400
Subject: [PATCH] rename and add setting

---
 src/plugins/customFolderIcons/components.tsx | 3 +--
 src/plugins/customFolderIcons/index.tsx      | 9 +++------
 src/plugins/customFolderIcons/settings.tsx   | 5 +++++
 src/plugins/customFolderIcons/util.tsx       | 6 ++++--
 4 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/src/plugins/customFolderIcons/components.tsx b/src/plugins/customFolderIcons/components.tsx
index 90f51546e..aab5ee129 100644
--- a/src/plugins/customFolderIcons/components.tsx
+++ b/src/plugins/customFolderIcons/components.tsx
@@ -7,9 +7,8 @@
 import { closeModal, ModalContent, ModalHeader, ModalRoot, openModalLazy } from "@utils/modal";
 import { Button, Menu, Slider, TextInput, useState } from "@webpack/common";
 
-import { folderProp } from ".";
 import settings, { folderIconsData } from "./settings";
-import { int2rgba, setFolderData } from "./util";
+import { folderProp, int2rgba, setFolderData } from "./util";
 
 export function ImageModal(folderProps: folderProp) {
     const [data, setData] = useState(((settings.store.folderIcons ?? {}) as folderIconsData)[folderProps.folderId]?.url ?? "");
diff --git a/src/plugins/customFolderIcons/index.tsx b/src/plugins/customFolderIcons/index.tsx
index 1ef6dfccb..b86ae09bf 100644
--- a/src/plugins/customFolderIcons/index.tsx
+++ b/src/plugins/customFolderIcons/index.tsx
@@ -9,11 +9,8 @@ import definePlugin from "@utils/types";
 
 import { makeContextItem } from "./components";
 import settings, { folderIconsData } from "./settings";
-import { int2rgba } from "./util";
-export interface folderProp {
-    folderId: string;
-    folderColor: number;
-}
+import { folderProp, int2rgba } from "./util";
+
 export default definePlugin({
     settings,
     name: "CustomFolderIcons",
@@ -46,7 +43,7 @@ export default definePlugin({
             return (
                 <div
                     style={{
-                        backgroundColor: int2rgba(props.folderNode.color, .4),
+                        backgroundColor: int2rgba(props.folderNode.color, +settings.store.solidIcon || .4),
                         display: "flex",
                         justifyContent: "center",
                         alignItems: "center",
diff --git a/src/plugins/customFolderIcons/settings.tsx b/src/plugins/customFolderIcons/settings.tsx
index a0b713900..dbe15526a 100644
--- a/src/plugins/customFolderIcons/settings.tsx
+++ b/src/plugins/customFolderIcons/settings.tsx
@@ -14,6 +14,11 @@ export interface folderIcon{
 export type folderIconsData = Record<string, folderIcon | null>;
 
 const settings = definePluginSettings({
+    solidIcon: {
+        type: OptionType.BOOLEAN,
+        default: false,
+        description: "Use a solid background on the background of the image"
+    },
     folderIcons: {
         type: OptionType.COMPONENT,
         hidden: true,
diff --git a/src/plugins/customFolderIcons/util.tsx b/src/plugins/customFolderIcons/util.tsx
index d5ce1d519..efb37e3dc 100644
--- a/src/plugins/customFolderIcons/util.tsx
+++ b/src/plugins/customFolderIcons/util.tsx
@@ -4,7 +4,6 @@
  * SPDX-License-Identifier: GPL-3.0-or-later
  */
 
-import { folderProp } from ".";
 import settings, { folderIcon, folderIconsData } from "./settings";
 
 export async function setFolderData(props: folderProp, newData: folderIcon) {
@@ -14,7 +13,10 @@ export async function setFolderData(props: folderProp, newData: folderIcon) {
     const folderSettings = (settings.store.folderIcons as folderIconsData);
     folderSettings[props.folderId] = newData;
 }
-
+export interface folderProp {
+    folderId: string;
+    folderColor: number;
+}
 /**
     * @param rgbVal RGB value
     * @param alpha alpha bewteen zero and 1