diff --git a/apps/user-ui/app/(drawer)/(tabs)/home/index.tsx b/apps/user-ui/app/(drawer)/(tabs)/home/index.tsx index 834e02a..f4692fa 100755 --- a/apps/user-ui/app/(drawer)/(tabs)/home/index.tsx +++ b/apps/user-ui/app/(drawer)/(tabs)/home/index.tsx @@ -11,7 +11,8 @@ import { LoadingDialog, AppContainer, MyTouchableOpacity, - MyText, MyTextInput, SearchBar, useStatusBarStore + MyText, MyTextInput, SearchBar, useStatusBarStore, + colors } from "common-ui"; import dayjs from "dayjs"; @@ -73,7 +74,7 @@ const RenderStore = ({ {item.name.replace(/^The\s+/i, "")} @@ -82,9 +83,8 @@ const RenderStore = ({ ); }; -// const headerColor = '#fedf89' -// const headerColor = '#444ce7' -const headerColor = '#f81260' + +const headerColor = colors.secondaryPink; export default function Dashboard() { const router = useRouter(); @@ -199,24 +199,8 @@ export default function Dashboard() { }); const handleScroll = (event: any) => { - // const scrollY = event.nativeEvent.contentOffset.y; - // const stickyBarBottom = stickyBarLayout.y + stickyBarLayout.height; - // const whiteSectionTop = whiteSectionLayout.y; - - // const shouldBeWhite = scrollY + stickyBarBottom >= whiteSectionTop; - - // if (shouldBeWhite) { - // updateStatusBarColor('dark', '#ffffff'); - // } else { - // updateStatusBarColor('light', headerColor); - // } }; - // React.useFocu(() => { - // // Initial status bar color - // return () => updateStatusBarColor('dark', '#ffffff'); - // }, []); - if (isLoading || isLoadingConsts) { return ( @@ -332,11 +316,11 @@ export default function Dashboard() { Our Stores - + Fresh from our locations diff --git a/apps/user-ui/components/AddressSelector.tsx b/apps/user-ui/components/AddressSelector.tsx index 8183ecc..663beef 100644 --- a/apps/user-ui/components/AddressSelector.tsx +++ b/apps/user-ui/components/AddressSelector.tsx @@ -126,15 +126,16 @@ const AddressSelector: React.FC = ({ to {name} @@ -146,7 +147,7 @@ const AddressSelector: React.FC = ({ /> */} {address} diff --git a/packages/ui/src/lib/status-bar-store.ts b/packages/ui/src/lib/status-bar-store.ts index 345e603..cd94e3a 100644 --- a/packages/ui/src/lib/status-bar-store.ts +++ b/packages/ui/src/lib/status-bar-store.ts @@ -1,5 +1,6 @@ import { create } from 'zustand'; import { StatusBarStyle } from 'expo-status-bar'; +import { colors } from './theme-colors'; interface StatusBarState { barStyle: StatusBarStyle; @@ -9,7 +10,8 @@ interface StatusBarState { export const useStatusBarStore = create((set) => ({ barStyle: 'light', - backgroundColor: '#f81260', + // backgroundColor: '#FFD6D9', + backgroundColor: colors.secondaryPink, updateStatusBarColor: (barStyle, backgroundColor) => set({ barStyle, backgroundColor }), })); diff --git a/packages/ui/src/lib/theme-colors.ts b/packages/ui/src/lib/theme-colors.ts index 5ab36ad..ebb4c9a 100755 --- a/packages/ui/src/lib/theme-colors.ts +++ b/packages/ui/src/lib/theme-colors.ts @@ -52,6 +52,7 @@ export const colors = { gray700: "#414651", gray800: "#252B37", gray900: "#101828", + secondaryPink: '#fff', get error() { return this.red1; }, // alias, not hardcoded }