Merge pull request #845 from andrew-bierman/fix/ui-updates-4-17

andrew-bierman · Apr 18, 2024 · 0ffc0b8 · 0ffc0b8
2 parents 2da83c7 + 78b5354
commit 0ffc0b8
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 5 deletions.
diff --git a/apps/vite/index.html b/apps/vite/index.html
@@ -4,7 +4,7 @@
     <meta charset="UTF-8" />
     <link rel="icon" type="image/svg+xml" href="/vite.svg" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <title>Vite + React + TS</title>
+    <title>PackRat</title>
   </head>
   <body>
     <div id="app"></div>

diff --git a/packages/app/components/feed/FeedCard.tsx b/packages/app/components/feed/FeedCard.tsx
@@ -116,7 +116,6 @@ export default function Card({
           <View
             style={{
               width: '100%',
-              maxWidth: 600,
               marginVertical: 'auto',
               borderRadius: 15,
               overflow: 'hidden',

diff --git a/packages/app/components/navigation/Navbar/Navbar.tsx b/packages/app/components/navigation/Navbar/Navbar.tsx
@@ -8,6 +8,7 @@ import { Drawer } from '../Drawer';
 import { useScrollTop } from 'app/hooks/common/useScrollTop';
 import { useScreenWidth } from 'app/hooks/common';
 import useTheme from 'app/hooks/useTheme';
+import { RImage } from '@packrat/ui';
 
 export const Navbar = () => {
   const { currentTheme } = useTheme();
@@ -23,7 +24,21 @@ export const Navbar = () => {
       <SafeAreaView style={styles.safeArea}>
         <Container>
           <View style={styles.container}>
-            <Text style={styles.logoText}>PackRat</Text>
+            <View style={styles.logoContainer}>
+              <RImage
+                source={{
+                  // TODO: Update this to use the PackRat logo from the assets folder
+                  uri: 'https://github.com/andrew-bierman/PackRat/blob/main/packages/app/assets/packrat_icon.png?raw=true',
+                  width: 40,
+                  height: 40,
+                }}
+                width={40}
+                height={40}
+                style={styles.logo}
+                alt="PackRat Logo"
+              />
+              <Text style={styles.logoText}>PackRat</Text>
+            </View>
             <Drawer />
           </View>
         </Container>
@@ -99,8 +114,8 @@ const loadStyles = (currentTheme, isScrolled, screenWidth) => {
       flexDirection: 'row',
       alignItems: 'center',
     },
-    logoWrapper: {
-      marginHorizontal: 10,
+    logo: {
+      marginRight: 10,
     },
     logoText: {
       color: currentTheme.colors.text,