fixed and broke the theme again
This commit is contained in:
parent
424407faf3
commit
f62b49b5cf
5 changed files with 23 additions and 24 deletions
|
|
@ -9,6 +9,7 @@ import { useRouter } from "expo-router"
|
|||
import { useAuth } from '../../contexts/AuthContext';
|
||||
|
||||
export default function Page() {
|
||||
const backgroundColor = useThemeColor("backgroundColor")
|
||||
const router = useRouter()
|
||||
const {onLogout} = useAuth();
|
||||
const [plusShow, setPlusShow] = useState(true);
|
||||
|
|
@ -53,7 +54,7 @@ export default function Page() {
|
|||
|
||||
|
||||
return (
|
||||
<SafeAreaView style={{flex: 1}}>
|
||||
<SafeAreaView style={{flex: 1, backgroundColor: backgroundColor}}>
|
||||
{plusShow && <Plus onPress={()=>{
|
||||
router.push("/(tabs)/home/addItem")
|
||||
}}/>}
|
||||
|
|
|
|||
|
|
@ -35,7 +35,6 @@ export default function login() {
|
|||
placeholder={'Enter Password'}
|
||||
label='Password'
|
||||
leftIcon={<FontAwesome name="key" size={20} />}
|
||||
rightIcon={<FontAwesome name="key" size={20} />}
|
||||
onChangeHandler={setPassword}
|
||||
secure = {true}
|
||||
/>
|
||||
|
|
|
|||
|
|
@ -6,12 +6,11 @@ import { SIZES } from '../../../constants/theme';
|
|||
|
||||
type SearchBarProps = {placeholder: string} & ViewProps
|
||||
|
||||
|
||||
|
||||
export default function SearchBar(props: SearchBarProps) {
|
||||
const [isActive, setIsactive] = React.useState(false);
|
||||
|
||||
const backgroundColor = useThemeColor("backgroundColor");
|
||||
const textColor = useThemeColor("interactiveText")
|
||||
const backgroundColor = useThemeColor("containerColor");
|
||||
const handleChange = (text:string) : void => {
|
||||
if(text !== ""){
|
||||
if(!isActive){
|
||||
|
|
@ -46,7 +45,7 @@ const styles = StyleSheet.create({
|
|||
justifyContent: "center",
|
||||
alignItems: "center",
|
||||
height: 40,
|
||||
backgroundColor: "red", //tochange
|
||||
backgroundColor: backgroundColor,
|
||||
borderRadius: 10,
|
||||
paddingHorizontal: 10
|
||||
},
|
||||
|
|
|
|||
|
|
@ -34,11 +34,13 @@ export default function Welcome(props: WelcomeProps) {
|
|||
const onpress = props.onPress
|
||||
|
||||
const textcolor = useThemeColor("primaryText")
|
||||
//const backgroundColor: string = useThemeColor("backgroundColor")
|
||||
|
||||
return (
|
||||
<View style={{
|
||||
marginVertical: 20,
|
||||
marginHorizontal: MARGINS.normal,
|
||||
//backgroundColor: backgroundColor,
|
||||
}}>
|
||||
<View style={{
|
||||
flexDirection: "row",
|
||||
|
|
|
|||
|
|
@ -1,32 +1,30 @@
|
|||
export default {
|
||||
light: {
|
||||
primaryText: "#000000",
|
||||
secondaryText: "#404040",
|
||||
interactiveText: "#0645AD",
|
||||
secondaryText: "#9E9E9E",
|
||||
interactiveText: "#388BFF",
|
||||
|
||||
tabIconDefault: "#FFFFFF",
|
||||
tabIconSelected: "#EF6C00",
|
||||
|
||||
|
||||
tabIconDefault: "gray",
|
||||
tabIconSelected: "#ED7D31",
|
||||
color: "#000000",
|
||||
accentColor: "#ED7D31",
|
||||
backgroundColor: "#ffffff",
|
||||
tabBarColor: "gray",
|
||||
backgroundColor: "#FFFFFF",
|
||||
containerColor: "#F5F5F5",
|
||||
elementDefaultColor: "#E0E0E0",
|
||||
elementSelectedColor: "#9E9E9E",
|
||||
accentColor: "#EF6C00",
|
||||
},
|
||||
dark: {
|
||||
// Text
|
||||
primaryText: "#FFFFFF",
|
||||
secondaryText: "#B3B3B3",
|
||||
interactiveText: "#0645AD",
|
||||
interactiveText: "#388BFF",
|
||||
|
||||
// Tabs
|
||||
tabIconDefault: "#FFFFFF",
|
||||
tabIconSelected: "#ED7D31",
|
||||
tabIconSelected: "#EF6C00",
|
||||
|
||||
//
|
||||
color: "#FFFFFF",
|
||||
accentColor: "#ED7D31",
|
||||
backgroundColor: "#181818",
|
||||
tabBarColor: "#121212",
|
||||
backgroundColor: "#121212",
|
||||
containerColor: "#181818",
|
||||
elementDefaultColor: "#535353",
|
||||
elementSelectedColor: "#B3B3B3",
|
||||
accentColor: "#EF6C00",
|
||||
}
|
||||
}
|
||||
Reference in a new issue