Merge branch 'main' into 24-styling-+-home-screen

calblueprint · Dec 4, 2024 · 940d89c · 940d89c
2 parents f08adcb + e9c1d1f
commit 940d89c
Show file tree

Hide file tree

Showing 4 changed files with 1 addition and 29 deletions.
diff --git a/src/navigation/types.tsx b/src/navigation/types.tsx
@@ -1,4 +1,3 @@
-// prettier-ignore
 import { BottomTabNavigationProp } from '@react-navigation/bottom-tabs';
 import { NativeStackScreenProps } from '@react-navigation/native-stack';
 import { VideoResource } from '@/types/types';

diff --git a/src/screens/HealingResources/HFHGuide/index.tsx b/src/screens/HealingResources/HFHGuide/index.tsx
@@ -63,20 +63,6 @@ export default function HFHGuide({
           <Text>Loading content...</Text>
         )}
       </ScrollView>
-      <View style={styles.nextButtonContainer}>
-        {nextId == null ? (
-          <View />
-        ) : (
-          <Pressable
-            style={styles.nextButton}
-            onPress={() =>
-              navigation.push('HopeForHealingGuide', { id: nextId })
-            }
-          >
-            <Text>Next</Text>
-          </Pressable>
-        )}
-      </View>
     </View>
   );
 }

diff --git a/src/screens/HealingResources/HFHGuide/styles.ts b/src/screens/HealingResources/HFHGuide/styles.ts
@@ -12,17 +12,4 @@ export default StyleSheet.create({
     fontFamily: 'Roboto Serif',
     color: '#444',
   },
-  nextButtonContainer: {
-    height: '10%',
-    display: 'flex',
-    alignItems: 'flex-end',
-    justifyContent: 'center',
-    paddingRight: 50,
-  },
-  nextButton: {
-    height: '50%',
-    width: '20%',
-    borderColor: 'black',
-    borderWidth: 1,
-  },
 });
diff --git a/src/screens/LegalRights/index.tsx b/src/screens/LegalRights/index.tsx
@@ -89,7 +89,7 @@ export default function LegalRights({
             }
           }}
         >
-          <Text style={styles.buttonText}>Spanish CC</Text>
+          <Text style={styles.buttonText}>Español CC</Text>
         </Pressable>
       </View>
       <ScrollView>