From 95fed075fe81e3c337aab5e408a041f0fdb064ec Mon Sep 17 00:00:00 2001
From: Violet Caulfield <violet@cosmonautical.cloud>
Date: Sat, 23 Nov 2024 20:41:28 -0600
Subject: [PATCH] sure

---
 colors.config.ts                            | 12 +++++++
 components/Login/helpers/server-address.tsx |  4 +--
 fonts.config.ts                             | 32 +++++++++++++++++
 tamagui.config.ts                           | 38 +++------------------
 4 files changed, 51 insertions(+), 35 deletions(-)
 create mode 100644 colors.config.ts
 create mode 100644 fonts.config.ts

diff --git a/colors.config.ts b/colors.config.ts
new file mode 100644
index 00000000..ff79e424
--- /dev/null
+++ b/colors.config.ts
@@ -0,0 +1,12 @@
+import { config } from "@tamagui/config/v3";
+import { createTokens } from "tamagui";
+import { Colors } from "./enums/colors";
+
+
+export const jellifyTokens = createTokens({
+    ...config.tokens,
+    color: {
+        primary: Colors.Primary,
+        secondary: Colors.Secondary
+    }
+})
\ No newline at end of file
diff --git a/components/Login/helpers/server-address.tsx b/components/Login/helpers/server-address.tsx
index 1645cd42..388a72fb 100644
--- a/components/Login/helpers/server-address.tsx
+++ b/components/Login/helpers/server-address.tsx
@@ -4,7 +4,7 @@ import { useMutation } from "@tanstack/react-query";
 import { MMKVStorageKeys } from "../../../enums/mmkv-storage-keys";
 import { JellifyServer } from "../../../types/JellifyServer";
 import { useApiClientContext } from "../../jellyfin-api-provider";
-import { Spacer, View, XStack } from "tamagui";
+import { getTokens, Spacer, View, XStack } from "tamagui";
 import { SwitchWithLabel } from "../../helpers/switch-with-label";
 import { Heading } from "../../helpers/text";
 import Input from "../../helpers/input";
@@ -68,7 +68,7 @@ export default function ServerAddress(): React.JSX.Element {
                     label="Use HTTPS" 
                     size="$2"
                     width={100}
-                    backgroundColor="$pink1"
+                    backgroundColor={"$pink6"}
                  />
                     
                 
diff --git a/fonts.config.ts b/fonts.config.ts
new file mode 100644
index 00000000..7481cf55
--- /dev/null
+++ b/fonts.config.ts
@@ -0,0 +1,32 @@
+import { config } from "@tamagui/config/v3";
+import { createFont } from "tamagui";
+
+const aileronFace = {
+    100: { normal: 'Aileron-UltraLight', italic: 'Aileron UltraLight Italic' },
+    200: { normal: 'Aileron-Thin', italic: 'Aileron Thin Italic' },
+    300: { normal: 'Aileron-Light', italic: 'Aileron Light Italic' },
+    400: { normal: 'Aileron-Regular', italic: 'Aileron Italic'} ,
+    500: { normal: 'Aileron-Regular', italic: 'Aileron Italic' },
+    600: { normal: 'Aileron-SemiBold', italic: 'Aileron SemiBold Italic' },
+    700: { normal: 'Aileron-Bold', italic: 'Aileron Bold Italic' },
+    800: { normal: 'Aileron-Heavy', italic: 'Aileron Heavy Italic' },
+    900: { normal: 'Aileron-Black', italic: 'Aileron-BlackItalic' }
+};
+
+export const bodyFont = createFont({
+    family: "Aileron-Bold",
+    size: config.fonts.body.size,
+    lineHeight: config.fonts.body.lineHeight,
+    weight: config.fonts.body.weight,
+    letterSpacing: config.fonts.body.letterSpacing,
+    face: aileronFace
+})
+
+export const headingFont = createFont({
+    family: "Aileron-Black",
+    size: config.fonts.heading.size,
+    lineHeight: config.fonts.heading.lineHeight,
+    weight: config.fonts.heading.weight,
+    letterSpacing: config.fonts.heading.letterSpacing,
+    face: aileronFace
+})
\ No newline at end of file
diff --git a/tamagui.config.ts b/tamagui.config.ts
index 8e9f6dd9..efb4a911 100644
--- a/tamagui.config.ts
+++ b/tamagui.config.ts
@@ -1,35 +1,7 @@
-import { animations, tokens, themes, media, shorthands, config } from '@tamagui/config/v3'
-import { createFont, createTamagui } from 'tamagui' // or '@tamagui/core'
-
-const aileronFace = {
-    100: { normal: 'Aileron-UltraLight', italic: 'Aileron UltraLight Italic' },
-    200: { normal: 'Aileron-Thin', italic: 'Aileron Thin Italic' },
-    300: { normal: 'Aileron-Light', italic: 'Aileron Light Italic' },
-    400: { normal: 'Aileron-Regular', italic: 'Aileron Italic'} ,
-    500: { normal: 'Aileron-Regular', italic: 'Aileron Italic' },
-    600: { normal: 'Aileron-SemiBold', italic: 'Aileron SemiBold Italic' },
-    700: { normal: 'Aileron-Bold', italic: 'Aileron Bold Italic' },
-    800: { normal: 'Aileron-Heavy', italic: 'Aileron Heavy Italic' },
-    900: { normal: 'Aileron-Black', italic: 'Aileron-BlackItalic' }
-};
-
-const bodyFont = createFont({
-    family: "Aileron-Bold",
-    size: config.fonts.body.size,
-    lineHeight: config.fonts.body.lineHeight,
-    weight: config.fonts.body.weight,
-    letterSpacing: config.fonts.body.letterSpacing,
-    face: aileronFace
-})
-
-const headingFont = createFont({
-    family: "Aileron-Black",
-    size: config.fonts.heading.size,
-    lineHeight: config.fonts.heading.lineHeight,
-    weight: config.fonts.heading.weight,
-    letterSpacing: config.fonts.heading.letterSpacing,
-    face: aileronFace
-})
+import { animations, tokens, themes, media, shorthands } from '@tamagui/config/v3'
+import { createTamagui } from 'tamagui' // or '@tamagui/core'
+import { headingFont, bodyFont } from './fonts.config'
+import { jellifyTokens } from './colors.config'
 
 const jellifyConfig = createTamagui({
     animations,
@@ -39,7 +11,7 @@ const jellifyConfig = createTamagui({
     },
     media,
     shorthands,
-    tokens,
+    jellifyTokens,
     themes,
 })