From 9dd07221284945b58d840affb9fee3619e8de4f0 Mon Sep 17 00:00:00 2001 From: Eric Bailey Date: Mon, 18 Dec 2023 21:33:01 -0600 Subject: [PATCH] Cleanup --- src/App.web.tsx | 8 ++++---- src/{view/nova => alf}/components/Box.tsx | 2 +- src/{view/nova => alf}/components/Button.tsx | 2 +- src/{view/nova => alf}/components/Typography.tsx | 4 ++-- src/alf/index.tsx | 4 ++++ src/{view/nova => alf}/lib/__tests__/system.test.tsx | 0 src/{view/nova => alf}/lib/__tests__/theme.test.ts | 0 src/{view/nova => alf}/lib/system.tsx | 0 src/{view/nova => alf}/lib/theme.ts | 0 src/{view/nova => alf}/system.ts | 0 src/{view/nova => alf}/themes.ts | 0 src/{view/nova => alf}/util/platform.ts | 0 src/{view/nova => alf}/util/useColorModeTheme.ts | 0 src/view/nova/index.tsx | 4 ---- src/view/screens/DebugNew.tsx | 2 +- 15 files changed, 13 insertions(+), 13 deletions(-) rename src/{view/nova => alf}/components/Box.tsx (61%) rename src/{view/nova => alf}/components/Button.tsx (76%) rename src/{view/nova => alf}/components/Typography.tsx (93%) create mode 100644 src/alf/index.tsx rename src/{view/nova => alf}/lib/__tests__/system.test.tsx (100%) rename src/{view/nova => alf}/lib/__tests__/theme.test.ts (100%) rename src/{view/nova => alf}/lib/system.tsx (100%) rename src/{view/nova => alf}/lib/theme.ts (100%) rename src/{view/nova => alf}/system.ts (100%) rename src/{view/nova => alf}/themes.ts (100%) rename src/{view/nova => alf}/util/platform.ts (100%) rename src/{view/nova => alf}/util/useColorModeTheme.ts (100%) delete mode 100644 src/view/nova/index.tsx diff --git a/src/App.web.tsx b/src/App.web.tsx index cdba2c61e2..1bdb3c208c 100644 --- a/src/App.web.tsx +++ b/src/App.web.tsx @@ -7,7 +7,7 @@ import {RootSiblingParent} from 'react-native-root-siblings' import 'view/icons' -import {ThemeProvider as Nova} from '#/view/nova' +import {ThemeProvider as Alf} from '#/alf' import {init as initPersistedState} from '#/state/persisted' import {useColorMode} from 'state/shell' import {Shell} from 'view/shell/index' @@ -29,7 +29,7 @@ import { } from 'state/session' import {Provider as UnreadNotifsProvider} from 'state/queries/notifications/unread' import * as persisted from '#/state/persisted' -import {useColorModeTheme} from '#/view/nova/util/useColorModeTheme' +import {useColorModeTheme} from '#/alf/util/useColorModeTheme' function InnerApp() { const {isInitialLoad, currentAccount} = useSession() @@ -47,7 +47,7 @@ function InnerApp() { if (isInitialLoad) return null return ( - + @@ -65,7 +65,7 @@ function InnerApp() { - + ) } diff --git a/src/view/nova/components/Box.tsx b/src/alf/components/Box.tsx similarity index 61% rename from src/view/nova/components/Box.tsx rename to src/alf/components/Box.tsx index 4743bff894..8f960aed73 100644 --- a/src/view/nova/components/Box.tsx +++ b/src/alf/components/Box.tsx @@ -1,3 +1,3 @@ import {View} from 'react-native' -import {styled} from '#/view/nova/system' +import {styled} from '#/alf/system' export const Box = styled(View) diff --git a/src/view/nova/components/Button.tsx b/src/alf/components/Button.tsx similarity index 76% rename from src/view/nova/components/Button.tsx rename to src/alf/components/Button.tsx index f7e504e900..4429046bb0 100644 --- a/src/view/nova/components/Button.tsx +++ b/src/alf/components/Button.tsx @@ -1,5 +1,5 @@ import {Pressable} from 'react-native' -import {styled} from '#/view/nova/system' +import {styled} from '#/alf/system' export const Button = styled(Pressable, { px: 'l', diff --git a/src/view/nova/components/Typography.tsx b/src/alf/components/Typography.tsx similarity index 93% rename from src/view/nova/components/Typography.tsx rename to src/alf/components/Typography.tsx index 16b72ed1a9..52a74ee61e 100644 --- a/src/view/nova/components/Typography.tsx +++ b/src/alf/components/Typography.tsx @@ -1,6 +1,6 @@ import {Text as RNText} from 'react-native' -import {styled} from '#/view/nova/system' -import {web} from '#/view/nova/util/platform' +import {styled} from '#/alf/system' +import {web} from '#/alf/util/platform' export const Text = styled(RNText, { color: 'l7', diff --git a/src/alf/index.tsx b/src/alf/index.tsx new file mode 100644 index 0000000000..fc4e308a9c --- /dev/null +++ b/src/alf/index.tsx @@ -0,0 +1,4 @@ +export * from '#/alf/system' +export * from '#/alf/components/Box' +export * from '#/alf/components/Typography' +export * from '#/alf/components/Button' diff --git a/src/view/nova/lib/__tests__/system.test.tsx b/src/alf/lib/__tests__/system.test.tsx similarity index 100% rename from src/view/nova/lib/__tests__/system.test.tsx rename to src/alf/lib/__tests__/system.test.tsx diff --git a/src/view/nova/lib/__tests__/theme.test.ts b/src/alf/lib/__tests__/theme.test.ts similarity index 100% rename from src/view/nova/lib/__tests__/theme.test.ts rename to src/alf/lib/__tests__/theme.test.ts diff --git a/src/view/nova/lib/system.tsx b/src/alf/lib/system.tsx similarity index 100% rename from src/view/nova/lib/system.tsx rename to src/alf/lib/system.tsx diff --git a/src/view/nova/lib/theme.ts b/src/alf/lib/theme.ts similarity index 100% rename from src/view/nova/lib/theme.ts rename to src/alf/lib/theme.ts diff --git a/src/view/nova/system.ts b/src/alf/system.ts similarity index 100% rename from src/view/nova/system.ts rename to src/alf/system.ts diff --git a/src/view/nova/themes.ts b/src/alf/themes.ts similarity index 100% rename from src/view/nova/themes.ts rename to src/alf/themes.ts diff --git a/src/view/nova/util/platform.ts b/src/alf/util/platform.ts similarity index 100% rename from src/view/nova/util/platform.ts rename to src/alf/util/platform.ts diff --git a/src/view/nova/util/useColorModeTheme.ts b/src/alf/util/useColorModeTheme.ts similarity index 100% rename from src/view/nova/util/useColorModeTheme.ts rename to src/alf/util/useColorModeTheme.ts diff --git a/src/view/nova/index.tsx b/src/view/nova/index.tsx deleted file mode 100644 index 34a7cdf5e2..0000000000 --- a/src/view/nova/index.tsx +++ /dev/null @@ -1,4 +0,0 @@ -export * from '#/view/nova/system' -export * from '#/view/nova/components/Box' -export * from '#/view/nova/components/Typography' -export * from '#/view/nova/components/Button' diff --git a/src/view/screens/DebugNew.tsx b/src/view/screens/DebugNew.tsx index da63c628bd..075fca3ed0 100644 --- a/src/view/screens/DebugNew.tsx +++ b/src/view/screens/DebugNew.tsx @@ -16,7 +16,7 @@ import { H4, H5, H6, -} from '#/view/nova' +} from '#/alf' function ThemeSelector() { const setColorMode = useSetColorMode()