diff --git a/App.tsx b/App.tsx index 592d50e..f24936d 100644 --- a/App.tsx +++ b/App.tsx @@ -26,7 +26,7 @@ const App = () => { /> */} - + ) => ( + + + +); +export default SvgBack; diff --git a/src/icons/CallBig.tsx b/src/icons/CallBig.tsx new file mode 100644 index 0000000..cc6f586 --- /dev/null +++ b/src/icons/CallBig.tsx @@ -0,0 +1,18 @@ +import type { SVGProps } from 'react'; +import * as React from 'react'; + +const SvgCallBig = (props: SVGProps) => ( + + + +); +export default SvgCallBig; diff --git a/src/icons/Scanner.tsx b/src/icons/Scanner.tsx index 62ca8ed..0b5b587 100644 --- a/src/icons/Scanner.tsx +++ b/src/icons/Scanner.tsx @@ -6,15 +6,15 @@ const SvgScanBarcode = (props: any) => ( xmlns="http://www.w3.org/2000/svg" width={37} height={37} - fill="none" + fill="#446127" {...props} > diff --git a/src/screens/Contact/styles.ts b/src/screens/Contact/styles.ts index 5a6e3c7..5e56673 100644 --- a/src/screens/Contact/styles.ts +++ b/src/screens/Contact/styles.ts @@ -134,6 +134,7 @@ export const styles = StyleSheet.create({ directoryHeader: { alignItems: 'center', justifyContent: 'center', + paddingBottom: 40, }, backButton: { diff --git a/src/screens/TreeSearch/TreeSearch.tsx b/src/screens/TreeSearch/TreeSearch.tsx index 88ce165..02f1697 100644 --- a/src/screens/TreeSearch/TreeSearch.tsx +++ b/src/screens/TreeSearch/TreeSearch.tsx @@ -1,11 +1,12 @@ import React, { useEffect, useState } from 'react'; -import { FlatList, ImageBackground, Text, View } from 'react-native'; +import { FlatList, ImageBackground, Pressable, Text, View } from 'react-native'; import { NativeStackScreenProps } from '@react-navigation/native-stack'; import QrCodeScanner from '@/components/QRCodeScanner/QRCodeScanner'; import Scanner from '@/icons/Scanner'; import { RootStackParamList } from '@/types/navigation'; import SearchBar from '../../components/searchBar'; import { supabase } from '../../supabase/client'; +import TreeInfo from '../TreeInfo/TreeInfo'; import { styles } from './styles'; type TreeSearchProps = NativeStackScreenProps; @@ -79,7 +80,12 @@ export default function TreeSearch({ navigation }: TreeSearchProps) { ); const renderTreeCard = ({ item }: { item: TreeItem }) => ( - + + navigation.navigate('TreeInfoPage', { treeId: item.tree_id.toString() }) + } + style={styles.treeCard} + > {item.stockCount} in stock - + ); return ( <> Trees Inventory - navigation.navigate('QRCodeScanner')} - /> + navigation.navigate('QRCodeScanner')} /> diff --git a/src/screens/TreeSearch/styles.ts b/src/screens/TreeSearch/styles.ts index f4456f9..8d2e1b9 100644 --- a/src/screens/TreeSearch/styles.ts +++ b/src/screens/TreeSearch/styles.ts @@ -15,15 +15,15 @@ export const styles = StyleSheet.create({ alignItems: 'center', }, - scannerIcon: { - height: 53, - width: 53, - borderRadius: 26.5, - backgroundColor: colors.primary_green, - justifyContent: 'center', - padding: 10, - alignItems: 'center', - }, + // scannerIcon: { + // height: 53, + // width: 53, + // borderRadius: 26.5, + // backgroundColor: colors.primary_green, + // justifyContent: 'center', + // padding: 10, + // alignItems: 'center', + // }, // Search Component