From 27380e57da28ec9a8228fbb7fd59ab3cc4288e42 Mon Sep 17 00:00:00 2001
From: Adrian Castro <22133246+castdrian@users.noreply.github.com>
Date: Tue, 5 Mar 2024 21:27:20 +0100
Subject: [PATCH] feat: restructure internal tab stuff to make more sense

---
 apps/expo/src/app/(tabs)/_layout.tsx          |  4 +-
 apps/expo/src/app/(tabs)/index.tsx            | 50 ++-----------------
 apps/expo/src/app/(tabs)/search.tsx           |  7 +++
 .../HomeScreenContent.tsx}                    |  6 +--
 .../ui}/SearchTabContext.tsx                  |  0
 .../search => components/ui}/Searchbar.tsx    |  2 +-
 6 files changed, 16 insertions(+), 53 deletions(-)
 create mode 100644 apps/expo/src/app/(tabs)/search.tsx
 rename apps/expo/src/{app/(tabs)/search/_layout.tsx => components/HomeScreenContent.tsx} (97%)
 rename apps/expo/src/{app/(tabs)/search => components/ui}/SearchTabContext.tsx (100%)
 rename apps/expo/src/{app/(tabs)/search => components/ui}/Searchbar.tsx (97%)

diff --git a/apps/expo/src/app/(tabs)/_layout.tsx b/apps/expo/src/app/(tabs)/_layout.tsx
index 7c8d16e..7bde24d 100644
--- a/apps/expo/src/app/(tabs)/_layout.tsx
+++ b/apps/expo/src/app/(tabs)/_layout.tsx
@@ -9,7 +9,7 @@ import Colors from "@movie-web/tailwind-config/colors";
 import { MovieWebSvg } from "~/components/Icon";
 import SvgTabBarIcon from "~/components/SvgTabBarIcon";
 import TabBarIcon from "~/components/TabBarIcon";
-import SearchTabContext from "./search/SearchTabContext";
+import SearchTabContext from "../../components/ui/SearchTabContext";
 
 export default function TabLayout() {
   // eslint-disable-next-line @typescript-eslint/no-empty-function
@@ -79,7 +79,7 @@ export default function TabLayout() {
         <Tabs.Screen
           name="search"
           options={{
-            title: "Search",
+            title: "Home",
             tabBarLabel: "",
             tabBarIcon: ({ focused }) => (
               <View
diff --git a/apps/expo/src/app/(tabs)/index.tsx b/apps/expo/src/app/(tabs)/index.tsx
index fd1216f..cd1dceb 100644
--- a/apps/expo/src/app/(tabs)/index.tsx
+++ b/apps/expo/src/app/(tabs)/index.tsx
@@ -1,51 +1,7 @@
-import { ScrollView, View } from "react-native";
-import { useSharedValue, withTiming } from "react-native-reanimated";
+import React from "react";
 
-import {
-  bookmarks,
-  ItemListSection,
-  watching,
-} from "~/components/item/ItemListSection";
-import ScreenLayout from "~/components/layout/ScreenLayout";
-import { Text } from "~/components/ui/Text";
+import HomeScreenContent from "~/components/HomeScreenContent";
 
 export default function HomeScreen() {
-  const fadeAnim = useSharedValue(1);
-
-  const handleScrollBegin = () => {
-    fadeAnim.value = withTiming(0, {
-      duration: 100,
-    });
-  };
-
-  const handleScrollEnd = () => {
-    fadeAnim.value = withTiming(1, {
-      duration: 100,
-    });
-  };
-
-  return (
-    <View style={{ flex: 1 }}>
-      <ScrollView
-        onScrollBeginDrag={handleScrollBegin}
-        onMomentumScrollEnd={handleScrollEnd}
-        scrollEnabled={
-          bookmarks.length > 0 || watching.length > 0 ? true : false
-        }
-        keyboardDismissMode="on-drag"
-        keyboardShouldPersistTaps="handled"
-      >
-        <ScreenLayout
-          title={
-            <View className="flex-row items-center">
-              <Text className="text-2xl font-bold">Home</Text>
-            </View>
-          }
-        >
-          <ItemListSection title="Bookmarks" items={bookmarks} />
-          <ItemListSection title="Continue Watching" items={watching} />
-        </ScreenLayout>
-      </ScrollView>
-    </View>
-  );
+  return <HomeScreenContent />;
 }
diff --git a/apps/expo/src/app/(tabs)/search.tsx b/apps/expo/src/app/(tabs)/search.tsx
new file mode 100644
index 0000000..237088a
--- /dev/null
+++ b/apps/expo/src/app/(tabs)/search.tsx
@@ -0,0 +1,7 @@
+import React from "react";
+
+import HomeScreenContent from "~/components/HomeScreenContent";
+
+export default function SearchScreen() {
+  return <HomeScreenContent />;
+}
diff --git a/apps/expo/src/app/(tabs)/search/_layout.tsx b/apps/expo/src/components/HomeScreenContent.tsx
similarity index 97%
rename from apps/expo/src/app/(tabs)/search/_layout.tsx
rename to apps/expo/src/components/HomeScreenContent.tsx
index 71b3159..9c0c5da 100644
--- a/apps/expo/src/app/(tabs)/search/_layout.tsx
+++ b/apps/expo/src/components/HomeScreenContent.tsx
@@ -18,10 +18,10 @@ import {
   watching,
 } from "~/components/item/ItemListSection";
 import ScreenLayout from "~/components/layout/ScreenLayout";
+import { SearchBar } from "~/components/ui/Searchbar";
 import { Text } from "~/components/ui/Text";
-import Searchbar from "./Searchbar";
 
-export default function SearchScreen() {
+export default function HomeScreenContent() {
   const [query, setQuery] = useState("");
   const translateY = useSharedValue(0);
   const fadeAnim = useSharedValue(1);
@@ -146,7 +146,7 @@ export default function SearchScreen() {
           animatedStyle,
         ]}
       >
-        <Searchbar onSearchChange={setQuery} />
+        <SearchBar onSearchChange={setQuery} />
       </Animated.View>
     </View>
   );
diff --git a/apps/expo/src/app/(tabs)/search/SearchTabContext.tsx b/apps/expo/src/components/ui/SearchTabContext.tsx
similarity index 100%
rename from apps/expo/src/app/(tabs)/search/SearchTabContext.tsx
rename to apps/expo/src/components/ui/SearchTabContext.tsx
diff --git a/apps/expo/src/app/(tabs)/search/Searchbar.tsx b/apps/expo/src/components/ui/Searchbar.tsx
similarity index 97%
rename from apps/expo/src/app/(tabs)/search/Searchbar.tsx
rename to apps/expo/src/components/ui/Searchbar.tsx
index a662ec8..337f47e 100644
--- a/apps/expo/src/app/(tabs)/search/Searchbar.tsx
+++ b/apps/expo/src/components/ui/Searchbar.tsx
@@ -7,7 +7,7 @@ import Colors from "@movie-web/tailwind-config/colors";
 
 import SearchTabContext from "./SearchTabContext";
 
-export default function Searchbar({
+export function SearchBar({
   onSearchChange,
 }: {
   onSearchChange: (text: string) => void;