From d6a8dd67103d78ade507e837ebce2d6e9d5ca900 Mon Sep 17 00:00:00 2001
From: Beef <beefers@riseup.net>
Date: Tue, 21 Feb 2023 17:59:29 +0000
Subject: [PATCH] [UI] Move color variables

---
 src/def.d.ts                              | 8 +++-----
 src/lib/windowObject.ts                   | 2 ++
 src/ui/color.ts                           | 4 ++--
 src/ui/settings/components/PluginCard.tsx | 8 ++++----
 4 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/def.d.ts b/src/def.d.ts
index 7505e9d..b7e2094 100644
--- a/src/def.d.ts
+++ b/src/def.d.ts
@@ -340,11 +340,9 @@ interface VendettaObject {
             getAssetByID: (id: number) => Asset;
             getAssetIDByName: (name: string) => number;
         };
-        color: {
-            // TODO: Make a vain attempt to type these
-            map: Indexable<any>;
-            raw: Indexable<any>;
-        }
+        // TODO: Make a vain attempt to type these
+        semanticColors: Indexable<any>;
+        rawColors: Indexable<any>;
     };
     plugins: {
         plugins: Indexable<Plugin>;
diff --git a/src/lib/windowObject.ts b/src/lib/windowObject.ts
index 7d2e8c5..6fcdbe2 100644
--- a/src/lib/windowObject.ts
+++ b/src/lib/windowObject.ts
@@ -12,6 +12,7 @@ import * as common from "@metro/common";
 import * as components from "@ui/components";
 import * as toasts from "@ui/toasts";
 import * as assets from "@ui/assets";
+import * as color from "@ui/color";
 import * as utils from "@utils";
 
 function without<T extends Record<string, any>>(object: T, ...keys: string[]) {
@@ -32,6 +33,7 @@ export default async function windowObject(unloads: any[]): Promise<VendettaObje
             components,
             toasts,
             assets,
+            ...color,
         },
         plugins: without(plugins, "initPlugins"),
         commands: without(commands, "patchCommands"),
diff --git a/src/ui/color.ts b/src/ui/color.ts
index 33d15bd..60b6e3c 100644
--- a/src/ui/color.ts
+++ b/src/ui/color.ts
@@ -6,7 +6,7 @@ import { constants } from "@metro/hoist";
 const colorModule = findByProps("SemanticColorsByThemeTable");
 
 //? SemanticColor is effectively ThemeColorMap
-export const map = (colorModule?.SemanticColor ?? constants.ThemeColorMap);
+export const semanticColors = (constants.ThemeColorMap ?? colorModule?.SemanticColor);
 
 //? RawColor is effectively Colors
-export const raw = (colorModule?.RawColor ?? constants.Colors);
\ No newline at end of file
+export const rawColors = (constants.Colors ?? colorModule?.RawColor);
\ No newline at end of file
diff --git a/src/ui/settings/components/PluginCard.tsx b/src/ui/settings/components/PluginCard.tsx
index f5de1dc..812a6eb 100644
--- a/src/ui/settings/components/PluginCard.tsx
+++ b/src/ui/settings/components/PluginCard.tsx
@@ -4,7 +4,7 @@ import { Forms, General } from "@ui/components";
 import { Plugin } from "@types";
 import { getAssetIDByName } from "@ui/assets";
 import { showToast } from "@ui/toasts";
-import { map as colorMap } from "@ui/color";
+import { semanticColors } from "@ui/color";
 import { removePlugin, startPlugin, stopPlugin, getSettings } from "@lib/plugins";
 import copyText from "@utils/copyText";
 
@@ -17,14 +17,14 @@ const { TouchableOpacity, Image } = General;
 // TODO: These styles work weirdly. iOS has cramped text, Android with low DPI probably does too. Fix?
 const styles = stylesheet.createThemedStyleSheet({
     card: {
-        backgroundColor: colorMap?.BACKGROUND_SECONDARY,
+        backgroundColor: semanticColors?.BACKGROUND_SECONDARY,
         borderRadius: 5,
         marginHorizontal: 10,
         marginBottom: 10,
     },
     header: {
         padding: 0,
-        backgroundColor: colorMap?.BACKGROUND_TERTIARY,
+        backgroundColor: semanticColors?.BACKGROUND_TERTIARY,
         borderTopLeftRadius: 5,
         borderTopRightRadius: 5,
     },
@@ -36,7 +36,7 @@ const styles = stylesheet.createThemedStyleSheet({
         width: 22,
         height: 22,
         marginLeft: 5,
-        tintColor: colorMap?.INTERACTIVE_NORMAL,
+        tintColor: semanticColors?.INTERACTIVE_NORMAL,
     }
 })