rawalcher/interaktive-systeme
Archived
1
0
Fork 0
Code Issues 5 Pull requests 2 Projects Releases 14 Packages Wiki Activity Actions

Merge branch '55-correct-colours' into 'main'

Browse source 
Draft: Resolve "correct colours"

Closes #55

See merge request thschleicher/interaktive-systeme!42
This commit is contained in:
carolinai 2024-01-03 23:57:09 +00:00
commit 0bf9a6965e
4 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/(tabs)/_layout.tsx
View file

@ -15,7 +15,7 @@ export default function Layout() {
backgroundColor: colors.containerColor, backgroundColor: colors.containerColor,
}, },
tabBar: { tabBar: {
backgroundColor: colors.backgroundColor, backgroundColor: colors.containerColor,
borderTopColor: colors.backgroundColor borderTopColor: colors.backgroundColor
} }
}); });

2
app/(tabs)/budget/index.tsx
View file

@ -10,7 +10,7 @@ import { useTheme } from '../../contexts/ThemeContext';
export default function Page() { export default function Page() {
const {colors} = useTheme() const {colors} = useTheme()
const containerColor = colors.containerColor; const containerColor = colors.backgroundColor;
const [selectedPage, setSelectedPage] = useState("noPageLoaded"); const [selectedPage, setSelectedPage] = useState("noPageLoaded");

2
app/(tabs)/home/index.tsx
View file

@ -72,7 +72,7 @@ export default function Page() {
return ( return (
<SafeAreaView edges={["left", "right", "top"]} style={[styles.safeAreaViewStyle, {backgroundColor: colors.containerColor}]}> <SafeAreaView edges={["left", "right", "top"]} style={[styles.safeAreaViewStyle, {backgroundColor: colors.backgroundColor}]}>
{plusShow && <Plus onPress={()=>{ {plusShow && <Plus onPress={()=>{
// router.push("/(tabs)/home/addItem"); // router.push("/(tabs)/home/addItem");

4
components/home/expenseItem.tsx
View file

@ -10,7 +10,7 @@ export default function ExpenseItem(itemProps : ExpenseItemProps) {
return ( return (
<CustomCard> <CustomCard>
<View style={[styles.colorTip, {backgroundColor: itemProps.color}]}></View> <View style={[styles.colorTip, {backgroundColor: itemProps.color}]}></View>
<View style={[styles.textSection, {backgroundColor: colors.backgroundColor}]}> <View style={[styles.textSection, {backgroundColor: colors.containerColor}]}>
<Text style={{ <Text style={{
fontSize: SIZES.normal, fontSize: SIZES.normal,
color: colors.primaryText color: colors.primaryText
@ -24,7 +24,7 @@ export default function ExpenseItem(itemProps : ExpenseItemProps) {
color: colors.primaryText color: colors.primaryText
}} numberOfLines={1}>{itemProps.date}</Text> }} numberOfLines={1}>{itemProps.date}</Text>
</View> </View>
<View style={[styles.valueSection, {backgroundColor: colors.backgroundColor}]}> <View style={[styles.valueSection, {backgroundColor: colors.containerColor}]}>
<Text style={{ <Text style={{
fontSize: SIZES.xxLarge, fontSize: SIZES.xxLarge,
color: colors.primaryText color: colors.primaryText