From 584fb07a074bcb48fb3d57dd332a71c07788e4d0 Mon Sep 17 00:00:00 2001
From: amsyarasyiq <82711525+amsyarasyiq@users.noreply.github.com>
Date: Wed, 28 Feb 2024 18:04:40 +0800
Subject: [PATCH] Move settings related to core

---
 .../ui/settings => core/ui}/components/AddonPage.tsx |  2 +-
 .../settings => core/ui}/components/AssetDisplay.tsx |  0
 src/{lib/ui/settings => core/ui}/components/Card.tsx |  0
 .../ui}/components/InstallButton.tsx                 |  0
 .../settings => core/ui}/components/PluginCard.tsx   |  2 +-
 .../ui}/components/SettingsSection.tsx               |  2 +-
 .../ui/settings => core/ui}/components/ThemeCard.tsx |  2 +-
 .../ui/settings => core/ui}/components/Version.tsx   |  0
 src/{lib => core}/ui/settings/data.tsx               | 10 +++++-----
 src/core/ui/settings/index.ts                        | 12 ++++++++++++
 src/{lib => core}/ui/settings/pages/AssetBrowser.tsx |  2 +-
 src/{lib => core}/ui/settings/pages/Developer.tsx    |  2 +-
 src/{lib => core}/ui/settings/pages/General.tsx      |  2 +-
 src/{lib => core}/ui/settings/pages/Plugins.tsx      |  4 ++--
 src/{lib => core}/ui/settings/pages/Themes.tsx       |  4 ++--
 src/{lib => core}/ui/settings/patches/panels.tsx     |  4 ++--
 src/{lib => core}/ui/settings/patches/you.tsx        |  2 +-
 src/index.ts                                         |  2 +-
 src/lib/ui/index.ts                                  |  2 +-
 src/lib/ui/settings/index.ts                         | 11 -----------
 20 files changed, 33 insertions(+), 32 deletions(-)
 rename src/{lib/ui/settings => core/ui}/components/AddonPage.tsx (98%)
 rename src/{lib/ui/settings => core/ui}/components/AssetDisplay.tsx (100%)
 rename src/{lib/ui/settings => core/ui}/components/Card.tsx (100%)
 rename src/{lib/ui/settings => core/ui}/components/InstallButton.tsx (100%)
 rename src/{lib/ui/settings => core/ui}/components/PluginCard.tsx (98%)
 rename src/{lib/ui/settings => core/ui}/components/SettingsSection.tsx (95%)
 rename src/{lib/ui/settings => core/ui}/components/ThemeCard.tsx (98%)
 rename src/{lib/ui/settings => core/ui}/components/Version.tsx (100%)
 rename src/{lib => core}/ui/settings/data.tsx (95%)
 create mode 100644 src/core/ui/settings/index.ts
 rename src/{lib => core}/ui/settings/pages/AssetBrowser.tsx (93%)
 rename src/{lib => core}/ui/settings/pages/Developer.tsx (99%)
 rename src/{lib => core}/ui/settings/pages/General.tsx (99%)
 rename src/{lib => core}/ui/settings/pages/Plugins.tsx (81%)
 rename src/{lib => core}/ui/settings/pages/Themes.tsx (90%)
 rename src/{lib => core}/ui/settings/patches/panels.tsx (93%)
 rename src/{lib => core}/ui/settings/patches/you.tsx (98%)
 delete mode 100644 src/lib/ui/settings/index.ts

diff --git a/src/lib/ui/settings/components/AddonPage.tsx b/src/core/ui/components/AddonPage.tsx
similarity index 98%
rename from src/lib/ui/settings/components/AddonPage.tsx
rename to src/core/ui/components/AddonPage.tsx
index e19da85..b3bc533 100644
--- a/src/lib/ui/settings/components/AddonPage.tsx
+++ b/src/core/ui/components/AddonPage.tsx
@@ -1,7 +1,7 @@
 import { NavigationNative, ReactNative as RN, clipboard } from "@metro/common";
 import { useProxy } from "@/lib/api/storage";
 import { HelpMessage, ErrorBoundary, Search } from "@ui/components";
-import { CardWrapper } from "@ui/settings/components/Card";
+import { CardWrapper } from "@/core/ui/components/Card";
 import { settings } from "@lib/settings";
 import { findByProps } from "@/lib/metro/filters";
 import { HTTP_REGEX_MULTI } from "@/lib/utils/constants";
diff --git a/src/lib/ui/settings/components/AssetDisplay.tsx b/src/core/ui/components/AssetDisplay.tsx
similarity index 100%
rename from src/lib/ui/settings/components/AssetDisplay.tsx
rename to src/core/ui/components/AssetDisplay.tsx
diff --git a/src/lib/ui/settings/components/Card.tsx b/src/core/ui/components/Card.tsx
similarity index 100%
rename from src/lib/ui/settings/components/Card.tsx
rename to src/core/ui/components/Card.tsx
diff --git a/src/lib/ui/settings/components/InstallButton.tsx b/src/core/ui/components/InstallButton.tsx
similarity index 100%
rename from src/lib/ui/settings/components/InstallButton.tsx
rename to src/core/ui/components/InstallButton.tsx
diff --git a/src/lib/ui/settings/components/PluginCard.tsx b/src/core/ui/components/PluginCard.tsx
similarity index 98%
rename from src/lib/ui/settings/components/PluginCard.tsx
rename to src/core/ui/components/PluginCard.tsx
index 8fe46a7..2bc5047 100644
--- a/src/lib/ui/settings/components/PluginCard.tsx
+++ b/src/core/ui/components/PluginCard.tsx
@@ -4,7 +4,7 @@ import { MMKVManager } from "@lib/api/native/modules";
 import { getAssetIDByName } from "@/lib/api/assets";
 import { showToast } from "@ui/toasts";
 import { showConfirmationAlert } from "@ui/alerts";
-import Card, { CardWrapper } from "@ui/settings/components/Card";
+import Card, { CardWrapper } from "@/core/ui/components/Card";
 import { useProxy } from "@/lib/api/storage";
 import { ButtonColors } from "@/lib/utils/types";
 import { Strings, formatString } from "@/core/i18n";
diff --git a/src/lib/ui/settings/components/SettingsSection.tsx b/src/core/ui/components/SettingsSection.tsx
similarity index 95%
rename from src/lib/ui/settings/components/SettingsSection.tsx
rename to src/core/ui/components/SettingsSection.tsx
index 6ae0d8a..a2de438 100644
--- a/src/lib/ui/settings/components/SettingsSection.tsx
+++ b/src/core/ui/components/SettingsSection.tsx
@@ -1,7 +1,7 @@
 import { NavigationNative } from "@metro/common";
 import { useProxy } from "@/lib/api/storage";
 import { getAssetIDByName } from "@/lib/api/assets";
-import { getScreens } from "@ui/settings/data";
+import { getScreens } from "@/core/ui/settings/data";
 import { ErrorBoundary, Forms } from "@ui/components";
 import { settings } from "@lib/settings";
 import { Strings } from "@/core/i18n";
diff --git a/src/lib/ui/settings/components/ThemeCard.tsx b/src/core/ui/components/ThemeCard.tsx
similarity index 98%
rename from src/lib/ui/settings/components/ThemeCard.tsx
rename to src/core/ui/components/ThemeCard.tsx
index 7adf286..d9c4f2a 100644
--- a/src/lib/ui/settings/components/ThemeCard.tsx
+++ b/src/core/ui/components/ThemeCard.tsx
@@ -6,7 +6,7 @@ import { getAssetIDByName } from "@/lib/api/assets";
 import { showConfirmationAlert } from "@ui/alerts";
 import { showToast } from "@ui/toasts";
 import { settings } from "@lib/settings";
-import Card, { CardWrapper } from "@ui/settings/components/Card";
+import Card, { CardWrapper } from "@/core/ui/components/Card";
 import { ButtonColors } from "@/lib/utils/types";
 import { Strings, formatString } from "@/core/i18n";
 
diff --git a/src/lib/ui/settings/components/Version.tsx b/src/core/ui/components/Version.tsx
similarity index 100%
rename from src/lib/ui/settings/components/Version.tsx
rename to src/core/ui/components/Version.tsx
diff --git a/src/lib/ui/settings/data.tsx b/src/core/ui/settings/data.tsx
similarity index 95%
rename from src/lib/ui/settings/data.tsx
rename to src/core/ui/settings/data.tsx
index 17ff99b..2d41229 100644
--- a/src/lib/ui/settings/data.tsx
+++ b/src/core/ui/settings/data.tsx
@@ -8,11 +8,11 @@ import { without } from "@lib/utils";
 import { getAssetIDByName } from "@/lib/api/assets";
 import { settings } from "@lib/settings";
 import ErrorBoundary from "@ui/components/ErrorBoundary";
-import InstallButton from "@ui/settings/components/InstallButton";
-import General from "@ui/settings/pages/General";
-import Plugins from "@ui/settings/pages/Plugins";
-import Themes from "@ui/settings/pages/Themes";
-import Developer from "@ui/settings/pages/Developer";
+import InstallButton from "@/core/ui/components/InstallButton";
+import General from "@/core/ui/settings/pages/General";
+import Plugins from "@/core/ui/settings/pages/Plugins";
+import Themes from "@/core/ui/settings/pages/Themes";
+import Developer from "@/core/ui/settings/pages/Developer";
 import { PROXY_PREFIX } from "@/lib/utils/constants";
 import { findByProps } from "@/lib/metro/filters";
 import { isThemeSupported } from "@/lib/api/native/loader";
diff --git a/src/core/ui/settings/index.ts b/src/core/ui/settings/index.ts
new file mode 100644
index 0000000..5ca7f93
--- /dev/null
+++ b/src/core/ui/settings/index.ts
@@ -0,0 +1,12 @@
+// TODO: make settings patches part of the api
+import patchPanels from "@/core/ui/settings/patches/panels";
+import patchYou from "@/core/ui/settings/patches/you";
+
+export default function initSettings() {
+    const patches = [
+        patchPanels(),
+        patchYou(),
+    ]
+
+    return () => patches.forEach(p => p?.());
+}
diff --git a/src/lib/ui/settings/pages/AssetBrowser.tsx b/src/core/ui/settings/pages/AssetBrowser.tsx
similarity index 93%
rename from src/lib/ui/settings/pages/AssetBrowser.tsx
rename to src/core/ui/settings/pages/AssetBrowser.tsx
index af141e9..43e3284 100644
--- a/src/lib/ui/settings/pages/AssetBrowser.tsx
+++ b/src/core/ui/settings/pages/AssetBrowser.tsx
@@ -1,7 +1,7 @@
 import { ReactNative as RN } from "@metro/common";
 import { all } from "@/lib/api/assets";
 import { Forms, Search, ErrorBoundary } from "@ui/components";
-import AssetDisplay from "@ui/settings/components/AssetDisplay";
+import AssetDisplay from "@/core/ui/components/AssetDisplay";
 
 const { FormDivider } = Forms;
 
diff --git a/src/lib/ui/settings/pages/Developer.tsx b/src/core/ui/settings/pages/Developer.tsx
similarity index 99%
rename from src/lib/ui/settings/pages/Developer.tsx
rename to src/core/ui/settings/pages/Developer.tsx
index b993872..f7d64ff 100644
--- a/src/lib/ui/settings/pages/Developer.tsx
+++ b/src/core/ui/settings/pages/Developer.tsx
@@ -5,7 +5,7 @@ import { useProxy } from "@/lib/api/storage";
 import { getAssetIDByName } from "@/lib/api/assets";
 import { ErrorBoundary, Forms } from "@ui/components";
 import { settings, loaderConfig } from "@lib/settings";
-import AssetBrowser from "@ui/settings/pages/AssetBrowser";
+import AssetBrowser from "@/core/ui/settings/pages/AssetBrowser";
 import { semanticColors } from "@ui/color";
 import { getReactDevToolsProp, getReactDevToolsVersion, isLoaderConfigSupported, isReactDevToolsPreloaded } from "@/lib/api/native/loader";
 import { Strings } from "@/core/i18n";
diff --git a/src/lib/ui/settings/pages/General.tsx b/src/core/ui/settings/pages/General.tsx
similarity index 99%
rename from src/lib/ui/settings/pages/General.tsx
rename to src/core/ui/settings/pages/General.tsx
index f104440..bcd3dd0 100644
--- a/src/lib/ui/settings/pages/General.tsx
+++ b/src/core/ui/settings/pages/General.tsx
@@ -5,7 +5,7 @@ import { useProxy } from "@/lib/api/storage";
 import { getAssetIDByName } from "@/lib/api/assets";
 import { Summary } from "@ui/components";
 import { settings } from "@lib/settings";
-import Version from "@ui/settings/components/Version";
+import Version from "@/core/ui/components/Version";
 import { findByProps } from "@lib/metro/filters";
 import { semanticColors } from "@ui/color";
 import { Strings } from "@/core/i18n";
diff --git a/src/lib/ui/settings/pages/Plugins.tsx b/src/core/ui/settings/pages/Plugins.tsx
similarity index 81%
rename from src/lib/ui/settings/pages/Plugins.tsx
rename to src/core/ui/settings/pages/Plugins.tsx
index 23c68dc..7b5ea8b 100644
--- a/src/lib/ui/settings/pages/Plugins.tsx
+++ b/src/core/ui/settings/pages/Plugins.tsx
@@ -1,8 +1,8 @@
 import { useProxy } from "@/lib/api/storage";
 import { BunnyPlugin, installPlugin, plugins } from "@lib/managers/plugins";
 import { settings } from "@lib/settings";
-import AddonPage from "@ui/settings/components/AddonPage";
-import PluginCard from "@ui/settings/components/PluginCard";
+import AddonPage from "@/core/ui/components/AddonPage";
+import PluginCard from "@/core/ui/components/PluginCard";
 import { Strings } from "@/core/i18n";
 
 export default function Plugins() {
diff --git a/src/lib/ui/settings/pages/Themes.tsx b/src/core/ui/settings/pages/Themes.tsx
similarity index 90%
rename from src/lib/ui/settings/pages/Themes.tsx
rename to src/core/ui/settings/pages/Themes.tsx
index 4d28a40..1e6a0da 100644
--- a/src/lib/ui/settings/pages/Themes.tsx
+++ b/src/core/ui/settings/pages/Themes.tsx
@@ -2,8 +2,8 @@ import { useProxy } from "@/lib/api/storage";
 import { Theme, installTheme, themes } from "@lib/managers/themes";
 import { Button } from "@ui/components";
 import { settings } from "@lib/settings";
-import AddonPage from "@ui/settings/components/AddonPage";
-import ThemeCard from "@ui/settings/components/ThemeCard";
+import AddonPage from "@/core/ui/components/AddonPage";
+import ThemeCard from "@/core/ui/components/ThemeCard";
 import { ButtonColors } from "@/lib/utils/types";
 import { Strings } from "@/core/i18n";
 
diff --git a/src/lib/ui/settings/patches/panels.tsx b/src/core/ui/settings/patches/panels.tsx
similarity index 93%
rename from src/lib/ui/settings/patches/panels.tsx
rename to src/core/ui/settings/patches/panels.tsx
index 46bcdc4..d3c3b31 100644
--- a/src/lib/ui/settings/patches/panels.tsx
+++ b/src/core/ui/settings/patches/panels.tsx
@@ -2,8 +2,8 @@ import { i18n } from "@metro/common";
 import { findByName } from "@metro/filters";
 import { after } from "@lib/api/patcher";
 import { findInReactTree } from "@lib/utils";
-import { getPanelsScreens } from "@ui/settings/data";
-import SettingsSection from "@ui/settings/components/SettingsSection";
+import { getPanelsScreens } from "@/core/ui/settings/data";
+import SettingsSection from "@/core/ui/components/SettingsSection";
 
 const screensModule = findByName("getScreens", false);
 const settingsModule = findByName("UserSettingsOverviewWrapper", false);
diff --git a/src/lib/ui/settings/patches/you.tsx b/src/core/ui/settings/patches/you.tsx
similarity index 98%
rename from src/lib/ui/settings/patches/you.tsx
rename to src/core/ui/settings/patches/you.tsx
index 9fe8f01..76f0059 100644
--- a/src/lib/ui/settings/patches/you.tsx
+++ b/src/core/ui/settings/patches/you.tsx
@@ -1,6 +1,6 @@
 import { findByProps } from "@metro/filters";
 import { after, before } from "@lib/api/patcher";
-import { getScreens, getYouData } from "@ui/settings/data";
+import { getScreens, getYouData } from "@/core/ui/settings/data";
 import { i18n } from "@lib/metro/common";
 import { Strings } from "@/core/i18n";
 
diff --git a/src/index.ts b/src/index.ts
index 8764865..435c2ef 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -4,7 +4,7 @@ import { initPlugins } from "@lib/managers/plugins";
 import { patchChatBackground } from "@lib/managers/themes";
 import { patchAssets } from "@/lib/api/assets";
 import initSafeMode from "@ui/safeMode";
-import initSettings from "@ui/settings";
+import initSettings from "@/core/ui/settings";
 import initFixes from "@/core/fixes";
 import logger from "@lib/utils/logger";
 import initWindowObject from "@lib/windowObject";
diff --git a/src/lib/ui/index.ts b/src/lib/ui/index.ts
index 239184b..38e5400 100644
--- a/src/lib/ui/index.ts
+++ b/src/lib/ui/index.ts
@@ -1,5 +1,5 @@
 export * as alerts from "./alerts";
 export * as color from "./color";
 export * as toasts from "./toasts";
-export * as settings from "./settings";
+export * as settings from "../../core/ui/settings";
 export * as components from "./components";
diff --git a/src/lib/ui/settings/index.ts b/src/lib/ui/settings/index.ts
deleted file mode 100644
index 8fd59b0..0000000
--- a/src/lib/ui/settings/index.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-import patchPanels from "@ui/settings/patches/panels";
-import patchYou from "@ui/settings/patches/you";
-
-export default function initSettings() {
-    const patches = [
-        patchPanels(),
-        patchYou(),
-    ]
-
-    return () => patches.forEach(p => p?.());
-}