1.0.0

Signed-off-by: Shreyans Jain <[email protected]>
CodeWithShreyans · Nov 29, 2024 · ce298e5 · ce298e5
1 parent 719fcb6
commit ce298e5
Show file tree

Hide file tree

Showing 8 changed files with 229 additions and 274 deletions.
diff --git a/app/(tabs)/_layout.tsx b/app/(tabs)/_layout.tsx
@@ -54,9 +54,9 @@ export default function TabLayout() {
                         //     );
                         // },
 
-                        tabBarIcon() {
-                            return <Icon name="home-outline" size={27} />;
-                        },
+                        tabBarIcon: () => ({
+                            sfSymbol: "house",
+                        }),
                     }}
                 />
                 <Tabs.Screen
@@ -75,9 +75,9 @@ export default function TabLayout() {
                         //     );
                         // },
 
-                        tabBarIcon() {
-                            return <Icon name="plus-box-outline" size={27} />;
-                        },
+                        tabBarIcon: () => ({
+                            sfSymbol: "plus.app",
+                        }),
                     }}
                 />
                 <Tabs.Screen
@@ -92,9 +92,9 @@ export default function TabLayout() {
                         //     );
                         // },
 
-                        tabBarIcon() {
-                            return <Icon name="cog-outline" size={27} />;
-                        },
+                        tabBarIcon: () => ({
+                            sfSymbol: "gear",
+                        }),
                     }}
                 />
             </Tabs>

diff --git a/app/(tabs)/add/index.tsx b/app/(tabs)/add/index.tsx
@@ -2,6 +2,7 @@ import { Icon, MaterialIconName } from "@roninoss/icons";
 import { router } from "expo-router";
 import { PressableProps, View } from "react-native";
 import { useSafeAreaInsets } from "react-native-safe-area-context";
+import { Button } from "~/components/nativewindui/Button";
 import { LargeTitleHeader } from "~/components/nativewindui/LargeTitleHeader";
 import {
     ESTIMATED_ITEM_HEIGHT,
@@ -18,10 +19,10 @@ import { useColorScheme } from "~/lib/useColorScheme";
 export default function SettingsIosStyleScreen() {
     return (
         <>
-            <LargeTitleHeader
+            {/* <LargeTitleHeader
                 title="Add"
                 // searchBar={{ iosHideWhenScrolling: true }}
-            />
+            /> */}
             <List
                 contentContainerClassName="pt-4"
                 contentInsetAdjustmentBehavior="automatic"
@@ -31,6 +32,7 @@ export default function SettingsIosStyleScreen() {
                 renderItem={renderItem}
                 keyExtractor={keyExtractor}
                 sectionHeaderAsGap
+                rootClassName="bg-background"
             />
         </>
     );
@@ -125,14 +127,6 @@ type MockData =
     | string;
 
 const DATA: MockData[] = [
-    "gap 1",
-    // {
-    //     id: "1",
-    //     title: "Donate",
-    //     leftView: <IconView name="heart-outline" className="bg-red-500" />,
-    //     onPress: () => router.push("/donate"),
-    // },
-    // "gap 2",
     {
         id: "1",
         title: "Request",
@@ -141,7 +135,6 @@ const DATA: MockData[] = [
         ),
         onPress: () => router.push("/request"),
     },
-    "gap 2",
     {
         id: "2",
         title: "Contribute",

diff --git a/app/(tabs)/index.tsx b/app/(tabs)/index.tsx
@@ -50,8 +50,8 @@ export default function HomeScreen() {
                     flex: 1,
                     flexDirection: "column",
                     alignItems: "flex-start",
-                    paddingTop: insets.top - 16,
                 }}
+                className="bg-background"
             >
                 <View className="w-full px-2">
                     <SearchInput

diff --git a/app/(tabs)/settings/index.tsx b/app/(tabs)/settings/index.tsx
@@ -30,6 +30,7 @@ export default function SettingsIosStyleScreen() {
                 renderItem={renderItem}
                 keyExtractor={keyExtractor}
                 sectionHeaderAsGap
+                rootClassName="bg-background"
             />
         </>
     );
@@ -124,14 +125,12 @@ type MockData =
     | string;
 
 const DATA: MockData[] = [
-    "gap 1",
     // {
     //     id: "1",
     //     title: "Donate",
     //     leftView: <IconView name="heart-outline" className="bg-red-500" />,
     //     onPress: () => router.push("/donate"),
     // },
-    // "gap 2",
     {
         id: "1",
         title: "About",

diff --git a/app/_layout.tsx b/app/_layout.tsx
@@ -19,17 +19,26 @@ import AsyncStorage from "@react-native-async-storage/async-storage";
 import deepEqual from "deep-equal";
 import { PortalHost } from "@rn-primitives/portal";
 import { KeyboardProvider } from "react-native-keyboard-controller";
+import {
+    BottomSheetModalProvider,
+    BottomSheetView,
+} from "@gorhom/bottom-sheet";
 
-export {
-    // Catch any errors thrown by the Layout component.
-    ErrorBoundary,
-} from "expo-router";
+export { ErrorBoundary } from "expo-router";
 
 export default function RootLayout() {
     useInitialAndroidBarSync();
     const { colorScheme, isDarkColorScheme } = useColorScheme();
 
+    // const bottomSheetModalRef = useSheetRef();
+
     useEffect(() => {
+        // AsyncStorage.getItem("firstLaunch").then((v) => {
+        //     if (v == null) {
+        //         bottomSheetModalRef.current?.present();
+        //     }
+        // });
+
         registerBackgroundFetchAsync();
 
         (async () => {
@@ -61,29 +70,47 @@ export default function RootLayout() {
                 key={`root-status-bar-${isDarkColorScheme ? "light" : "dark"}`}
                 style={isDarkColorScheme ? "light" : "dark"}
             />
-            <GestureHandlerRootView>
-                <KeyboardProvider statusBarTranslucent navigationBarTranslucent>
-                    <ThemeProvider value={NAV_THEME[colorScheme]}>
-                        <Stack
-                            screenOptions={{
-                                headerBackButtonDisplayMode: "minimal",
-                            }}
-                        >
-                            <Stack.Screen
-                                name="(tabs)"
-                                options={{ headerShown: false }}
+            <GestureHandlerRootView style={{ flex: 1 }}>
+                <BottomSheetModalProvider>
+                    <KeyboardProvider
+                        statusBarTranslucent
+                        navigationBarTranslucent
+                    >
+                        <ThemeProvider value={NAV_THEME[colorScheme]}>
+                            <Stack
+                                screenOptions={{
+                                    headerBackButtonDisplayMode: "minimal",
+                                }}
+                            >
+                                <Stack.Screen
+                                    name="(tabs)"
+                                    options={{ headerShown: false }}
+                                />
+                                <Stack.Screen name="+not-found" />
+                            </Stack>
+                            {/* <Sheet
+                                ref={bottomSheetModalRef}
+                                snapPoints={["75%"]}
+                            >
+                                <BottomSheetView className="flex p-4">
+                                    <Text
+                                        variant="largeTitle"
+                                        className="tracking-wider font-semibold"
+                                    >
+                                        Welcome to Guider!
+                                    </Text>
+                                </BottomSheetView>
+                            </Sheet> */}
+                            <Toaster
+                                theme={colorScheme}
+                                position="bottom-center"
+                                swipeToDismissDirection="left"
+                                richColors={true}
                             />
-                            <Stack.Screen name="+not-found" />
-                        </Stack>
-                        <Toaster
-                            theme={colorScheme}
-                            position="bottom-center"
-                            swipeToDismissDirection="left"
-                            richColors={true}
-                        />
-                        <PortalHost />
-                    </ThemeProvider>
-                </KeyboardProvider>
+                            <PortalHost />
+                        </ThemeProvider>
+                    </KeyboardProvider>
+                </BottomSheetModalProvider>
             </GestureHandlerRootView>
         </SafeAreaProvider>
     );

diff --git a/bun.lockb b/bun.lockb