diff --git a/src/elements/Screen/Body.tsx b/src/elements/Screen/Body.tsx index afc12e8c..c05b505b 100644 --- a/src/elements/Screen/Body.tsx +++ b/src/elements/Screen/Body.tsx @@ -24,7 +24,7 @@ export const Body: React.FC = ({ ? {} : { style: { flex: 1 }, behavior: Platform.OS === "ios" ? "padding" : "height" })} > - + {scroll ? {children} : children} diff --git a/src/elements/Screen/BottomView.tsx b/src/elements/Screen/BottomView.tsx index 01c9da88..13c27be2 100644 --- a/src/elements/Screen/BottomView.tsx +++ b/src/elements/Screen/BottomView.tsx @@ -23,7 +23,7 @@ export const BottomView: React.FC = ({ children, darkMode }) => }} pointerEvents="none" /> - + {children} diff --git a/src/elements/Screen/FloatingHeader.tsx b/src/elements/Screen/FloatingHeader.tsx index 9096ffd7..6e4d819c 100644 --- a/src/elements/Screen/FloatingHeader.tsx +++ b/src/elements/Screen/FloatingHeader.tsx @@ -28,6 +28,7 @@ export const FloatingHeader: React.FC = ({ py={1} flexDirection="row" alignItems="center" + backgroundColor="background" {...flexProps} > diff --git a/src/elements/Screen/Header.tsx b/src/elements/Screen/Header.tsx index 370b3008..2daf24b4 100644 --- a/src/elements/Screen/Header.tsx +++ b/src/elements/Screen/Header.tsx @@ -46,7 +46,7 @@ export const Header: React.FC = ({ flexDirection="row" px={2} zIndex={ZINDEX.header} - backgroundColor="white100" + backgroundColor="background" alignItems="center" > diff --git a/src/elements/Screen/ScreenBase.tsx b/src/elements/Screen/ScreenBase.tsx index 648a044c..f39125c9 100644 --- a/src/elements/Screen/ScreenBase.tsx +++ b/src/elements/Screen/ScreenBase.tsx @@ -16,12 +16,7 @@ export const ScreenBase: React.FC = ({ return ( - + {children} @@ -40,7 +35,6 @@ const SafeAreaCover: React.FC<{ safeArea: boolean }> = ({ safeArea }) => { right={0} top={safeArea ? -insets.top : 0} height={insets.top} - backgroundColor="white100" /> ) } diff --git a/src/elements/Screen/StickySubHeader.tsx b/src/elements/Screen/StickySubHeader.tsx index ea50ec6f..135b8e94 100644 --- a/src/elements/Screen/StickySubHeader.tsx +++ b/src/elements/Screen/StickySubHeader.tsx @@ -68,7 +68,7 @@ export const StickySubHeader: React.FC = ({ handleLayout(event)} position="absolute" - backgroundColor="white100" + backgroundColor="background" zIndex={-1000} style={sharedStyles} > diff --git a/src/elements/Tabs/TabFlashList.tsx b/src/elements/Tabs/TabFlashList.tsx index 612468b1..58ad8ab3 100644 --- a/src/elements/Tabs/TabFlashList.tsx +++ b/src/elements/Tabs/TabFlashList.tsx @@ -1,12 +1,14 @@ import { FlashListProps } from "@shopify/flash-list" import { Tabs } from "react-native-collapsible-tab-view" import { useListenForTabContentScroll } from "./hooks/useListenForTabContentScroll" +import { useColor } from "../../utils/hooks" import { useSpace } from "../../utils/hooks/useSpace" export function TabFlashList(props: FlashListProps) { useListenForTabContentScroll() const space = useSpace() + const color = useColor() const contentContainerStyle = (props.contentContainerStyle ?? {}) as object @@ -14,6 +16,7 @@ export function TabFlashList(props: FlashListProps) { (props: FlatListProps) { useListenForTabContentScroll() const space = useSpace() + const color = useColor() const contentContainerStyle = (props.contentContainerStyle ?? {}) as object @@ -14,6 +16,7 @@ export function TabFlatList(props: FlatListProps) { ( @@ -12,6 +13,7 @@ export function TabMasonry( useListenForTabContentScroll() const space = useSpace() + const color = useColor() const contentContainerStyle = (props.contentContainerStyle ?? {}) as object @@ -19,6 +21,7 @@ export function TabMasonry( = (props) => { useListenForTabContentScroll() const space = useSpace() + const color = useColor() const contentContainerStyle = (props.contentContainerStyle ?? {}) as object @@ -18,6 +20,7 @@ export const TabScrollView: React.FC = (props) => { accessibilityTraits={undefined} contentContainerStyle={{ marginHorizontal: space(2), + backgroundColor: color("background"), ...contentContainerStyle, }} {...props} diff --git a/src/elements/Tabs/TabsContainer.tsx b/src/elements/Tabs/TabsContainer.tsx index 427898f7..3a3fc88d 100644 --- a/src/elements/Tabs/TabsContainer.tsx +++ b/src/elements/Tabs/TabsContainer.tsx @@ -49,7 +49,7 @@ export const TabsContainer: React.FC = ({ shadowOpacity: 0, shadowRadius: 0, elevation: 0, - backgroundColor: color("white100"), + backgroundColor: color("background"), }} initialTabName={initialTabName} containerStyle={{ diff --git a/src/svgs/Icon.tsx b/src/svgs/Icon.tsx index d31bee44..39f9cff2 100644 --- a/src/svgs/Icon.tsx +++ b/src/svgs/Icon.tsx @@ -54,7 +54,7 @@ export const Icon = styled(ScaledSvg)` Icon.defaultProps = { // @ts-ignore - fill: "black", + fill: "black100", height: DEFAULT_SIZE, width: DEFAULT_SIZE, } diff --git a/src/tokens.ts b/src/tokens.ts index 4ba3f8ad..7ebf184e 100644 --- a/src/tokens.ts +++ b/src/tokens.ts @@ -111,8 +111,14 @@ const v3dark: ThemeWithDarkModeType = { ...v3, colors: { ...THEME_DARK.colors, + black10: v3.colors.black60, + black30: v3.colors.black60, + black60: v3.colors.black30, + blue100: "#5E6EFF", + red100: "#E44738", + green100: "#16C193", devpurple: "rgb(136, 82, 237)", - background: THEME_DARK.colors.black100, + background: "#121212", onBackground: THEME_DARK.colors.white100, onBackgroundHigh: THEME_DARK.colors.white100, onBackgroundMedium: THEME_DARK.colors.black30,