diff --git a/src/components/SearchFilter/SearchFilter.tsx b/src/components/SearchFilter/SearchFilter.tsx index a489214..09c9b92 100644 --- a/src/components/SearchFilter/SearchFilter.tsx +++ b/src/components/SearchFilter/SearchFilter.tsx @@ -1,5 +1,12 @@ import React, { useEffect, useState } from 'react'; -import { Modal, ScrollView, Text, TouchableOpacity, View } from 'react-native'; +import { + Modal, + SafeAreaView, + ScrollView, + Text, + TouchableOpacity, + View, +} from 'react-native'; import { Checkbox } from '@/components/Checkbox/Checkbox'; import { Dropdown } from '@/components/Dropdown/Dropdown'; import { TreeSpeciesShape } from '@/types/tree_species'; @@ -154,152 +161,160 @@ export const SearchFilter: React.FC = ({ }; return ( - - - - - - Filter Trees - - Reset - - + + + + + + + Filter Trees + + Reset + + - - {/* Height */} - - Height - - - toggleHeightFilter('small')} - /> - Small (< 40') - - - toggleHeightFilter('medium')} - /> - Medium (40 - 60') - - - toggleHeightFilter('large')} - /> - Large (60' +) + + {/* Height */} + + Height + + + toggleHeightFilter('small')} + /> + Small (< 40') + + + toggleHeightFilter('medium')} + /> + Medium (40 - 60') + + + toggleHeightFilter('large')} + /> + Large (60' +) + - - {/* Tree Shape */} - - Tree Shape - - + {/* Tree Shape */} + + Tree Shape + + - {/* Litter Type */} - - Litter Type - - - toggleLitterFilter('wet')} - /> - Wet Fruit - - - toggleLitterFilter('dry')} - /> - Dry Fruit + {/* Litter Type */} + + Litter Type + + + toggleLitterFilter('wet')} + /> + Wet Fruit + + + toggleLitterFilter('dry')} + /> + Dry Fruit + - - {/* Water Use */} - - Water Use - - - toggleWaterFilter('low')} - /> - Low - - - toggleWaterFilter('moderate')} - /> - Moderate - - - toggleWaterFilter('high')} - /> - High + {/* Water Use */} + + Water Use + + + toggleWaterFilter('low')} + /> + Low + + + toggleWaterFilter('moderate')} + /> + Moderate + + + toggleWaterFilter('high')} + /> + High + - - {/* Other Properties */} - - Other Properties - - - toggleOtherFilter('californiaNative')} - /> - California native - - - toggleOtherFilter('evergreen')} - /> - Evergreen - - - toggleOtherFilter('powerlineFriendly')} - /> - Powerline friendly - - - toggleOtherFilter('lowRootDamage')} - /> - Low root damage + {/* Other Properties */} + + Other Properties + + + toggleOtherFilter('californiaNative')} + /> + California native + + + toggleOtherFilter('evergreen')} + /> + Evergreen + + + toggleOtherFilter('powerlineFriendly')} + /> + Powerline friendly + + + toggleOtherFilter('lowRootDamage')} + /> + Low root damage + - - + - {/* Complete Button */} - - Complete - + {/* Complete Button */} + + Complete + + - - + + ); }; diff --git a/src/screens/TreeSpeciesSearch/TreeSpeciesSearch.tsx b/src/screens/TreeSpeciesSearch/TreeSpeciesSearch.tsx index 67354c2..868b749 100644 --- a/src/screens/TreeSpeciesSearch/TreeSpeciesSearch.tsx +++ b/src/screens/TreeSpeciesSearch/TreeSpeciesSearch.tsx @@ -172,7 +172,7 @@ export const TreeSpeciesSearchScreen: React.FC< ); return ( - + {isUserAdmin ? 'All Trees' : 'Available Trees'} diff --git a/styles.ts b/styles.ts deleted file mode 100644 index 0139b29..0000000 --- a/styles.ts +++ /dev/null @@ -1,74 +0,0 @@ -import { Dimensions, StyleSheet } from 'react-native'; - -const { width } = Dimensions.get('window'); - -export const styles = StyleSheet.create({ - container: { - flex: 1, - flexDirection: 'column', - backgroundColor: 'white', - }, - - Heading4: { - color: 'white', - fontSize: 32, - fontWeight: '700', - paddingLeft: 29, - paddingBottom: 10, - textAlign: 'left', - }, - - imageContainer: { - width: '100%', - height: width * (8 / 9), - position: 'relative', - }, - - responsiveImage: { - width: '100%', - height: '100%', - resizeMode: 'cover', - }, - - overlay: { - position: 'absolute', - top: 0, - left: 0, - right: 0, - bottom: 0, - backgroundColor: 'rgba(0, 0, 0, 0.5)', - justifyContent: 'flex-end', - alignItems: 'flex-start', - paddingBottom: 30, - }, - - contactInfo: { - position: 'absolute', - top: 360, - bottom: 0, - left: 0, - right: 0, - justifyContent: 'center', - alignItems: 'center', - backgroundColor: 'white', - borderRadius: 20, - }, - - contactText: { - color: '#4F4F4F', - fontSize: 14, - marginBottom: 50, - }, - - managerText: { - color: '#4F4F4F', - fontSize: 14, - marginBottom: 10, - fontWeight: 'bold', - }, - - iconColor: { - color: '#446127', - marginBottom: 20, - }, -}); diff --git a/tsconfig.json b/tsconfig.json index d252c9a..fbb45c9 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -18,12 +18,6 @@ } }, "extends": "expo/tsconfig.base", - "include": [ - "src/**/*.ts", - "src/**/*.tsx", - "App.tsx", - "./graphics.d.ts", - "styles.ts" - ], + "include": ["src/**/*.ts", "src/**/*.tsx", "App.tsx", "./graphics.d.ts"], "exclude": ["node_modules", "./src/supabase/functions/*"] }