Merge branch 'main' into adi/setting-style

calblueprint · Dec 2, 2023 · 5bc8ba4 · 5bc8ba4
2 parents 054978b + 66f9faf
commit 5bc8ba4
Show file tree

Hide file tree

Showing 10 changed files with 335 additions and 96 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/src/app/(tabs)/author/index.tsx b/src/app/(tabs)/author/index.tsx
@@ -6,6 +6,7 @@ import { SafeAreaView } from 'react-native-safe-area-context';
 
 import styles from './styles';
 import BackButton from '../../../components/BackButton/BackButton';
+import ContentCard from '../../../components/ContentCard/ContentCard';
 import HorizontalLine from '../../../components/HorizontalLine/HorizontalLine';
 import PreviewCard from '../../../components/PreviewCard/PreviewCard';
 import {

diff --git a/src/app/(tabs)/home/index.tsx b/src/app/(tabs)/home/index.tsx
@@ -54,7 +54,9 @@ function HomeScreen() {
     });
   }, [user]);
   return (
-    <SafeAreaView style={[globalStyles.container, { marginHorizontal: -8 }]}>
+    <SafeAreaView
+      style={[globalStyles.container, { marginLeft: -8, marginRight: -32 }]}
+    >
       {loading && (
         <View style={styles.loading}>
           <Text>Loading</Text>
@@ -82,7 +84,7 @@ function HomeScreen() {
             <Text style={[globalStyles.body1, styles.featuredDescription]}>
               {featuredStoriesDescription}
             </Text>
-            <View>
+            <View style={{ marginRight: 24 }}>
               {featuredStories.map(story => (
                 <PreviewCard
                   key={story.title}

diff --git a/src/app/(tabs)/home/styles.ts b/src/app/(tabs)/home/styles.ts
@@ -29,10 +29,12 @@ const styles = StyleSheet.create({
     alignItems: 'center',
     marginTop: 24,
     marginBottom: 12,
+    marginRight: 24,
   },
   featuredDescription: {
     marginBottom: 16,
     marginTop: 8,
+    marginRight: 24,
   },
 });