Fixed ShelfModal errors

Purdue-CS307-tsundoku · Feb 24, 2024 · 182254d · 182254d
1 parent 8a16457
commit 182254d
Show file tree

Hide file tree

Showing 2 changed files with 39 additions and 20 deletions.
diff --git a/mobile/Components/CarouselTabs/CarouselTabs.tsx b/mobile/Components/CarouselTabs/CarouselTabs.tsx
@@ -14,7 +14,11 @@ import Colors from "../../Constants/Colors";
 
 const Tab = createMaterialTopTabNavigator();
 
+let shelf = "Currently Reading";
+export { shelf };
+
 function MyTabBar({ state, descriptors, navigation, position }) {
+
   return (
     <View>
       <ScrollView
@@ -110,10 +114,22 @@ function CarouselTabs({ navigation }) {
       <Tab.Screen
         name="Currently Reading"
         component={CurrentlyReadingCarousel}
+        listeners={{
+          tabPress: e => { shelf = "Currently Reading"; }
+        }}
+      />
+      <Tab.Screen name="Want To Read" component={WantToReadCarousel} listeners={{
+          tabPress: e => { shelf = "Want To Read" }
+        }}
+      />
+      <Tab.Screen name="Read" component={ReadCarousel} listeners={{
+          tabPress: e => { shelf = "Read" }
+        }} 
+      />
+      <Tab.Screen name="Did Not Finish" component={DNFCarousel} listeners={{
+          tabPress: e => { shelf = "Did Not Finish" }
+        }}
       />
-      <Tab.Screen name="Want To Read" component={WantToReadCarousel} />
-      <Tab.Screen name="Read" component={ReadCarousel} />
-      <Tab.Screen name="Did Not Finish" component={DNFCarousel} />
     </Tab.Navigator>
   );
 }

diff --git a/mobile/Components/ShelfModal/ShelfModal.tsx b/mobile/Components/ShelfModal/ShelfModal.tsx
@@ -6,6 +6,7 @@ import BookSearchBar from "../BookSearchBar";
 import { Divider } from "@rneui/base";
 
 import { NavigationContext } from "../../Contexts";
+import { shelf } from "../CarouselTabs";
 
 const ShelfModal = ({
   isShelfModalVisible,
@@ -29,26 +30,26 @@ const ShelfModal = ({
   ];
 
   return (
-    <Modal
-      isVisible={isShelfModalVisible}
-      onSwipeComplete={() => { setShelfModalVisible(false); setSearch(""); Keyboard.dismiss }}
-      swipeDirection={["down"]}
-      style={{
-        marginBottom: 0,
-        marginRight: 0,
-        marginLeft: 0,
-      }}
-      propagateSwipe={true}
-      onBackdropPress={() => { setShelfModalVisible(false); setSearch("")}}
-      onSwipeCancel={Keyboard.dismiss}
-    >
+    // <Modal
+    //   isVisible={isShelfModalVisible}
+    //   onSwipeComplete={() => { setShelfModalVisible(false); setSearch(""); Keyboard.dismiss }}
+    //   swipeDirection={["down"]}
+    //   style={{
+    //     marginBottom: 0,
+    //     marginRight: 0,
+    //     marginLeft: 0,
+    //   }}
+    //   propagateSwipe={true}
+    //   onBackdropPress={() => { setShelfModalVisible(false); setSearch("")}}
+    //   onSwipeCancel={Keyboard.dismiss}
+    // >
 
       <View style={{
         justifyContent: "center",
         alignItems: "center",
         backgroundColor: "white",
         width: "100%",
-        height: "95%",
+        height: "100%",
         borderTopLeftRadius: 20,
         borderTopRightRadius: 20,
       }}
@@ -67,10 +68,12 @@ const ShelfModal = ({
       <View
         style={{
           position: "absolute",
-          top: 35,
+          top: 30,
           left: 20,
         }}>
-          <Text style={{fontWeight: 'bold', fontSize: 24}}>{currentShelf}</Text>
+          <TouchableWithoutFeedback onPress={() => Keyboard.dismiss}>
+            <Text style={{fontWeight: 'bold', fontSize: 30}}>{shelf}</Text>
+          </TouchableWithoutFeedback>
         </View>
         <View
           style={{
@@ -126,7 +129,7 @@ const ShelfModal = ({
               />
         </View>
       </View>
-    </Modal>
+    //</Modal>
   );
 };
 export default ShelfModal;