Skip to content

Commit 03af544

Browse files
committed
fix: various small fixes
1 parent 0fa6f66 commit 03af544

File tree

3 files changed

+34
-68
lines changed

3 files changed

+34
-68
lines changed

android/app/src/main/res/values/colors.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<resources>
22
<color name="splashscreen_background">#ffffff</color>
3-
<color name="colorPrimary">#023c69</color>
3+
<color name="colorPrimary">#8a8a8a</color>
44
<color name="colorPrimaryDark">#ffffff</color>
55
<color name="account_background_color">#ffffff</color>
66
<color name="link_background_color">#ffffff</color>

src/app/(screens)/food/[id].tsx

Lines changed: 25 additions & 66 deletions
Original file line numberDiff line numberDiff line change
@@ -508,31 +508,32 @@ export default function FoodDetail(): React.JSX.Element {
508508
{title}
509509
</Text>
510510
</View>
511-
{mealWithDate?.date && (
512-
<View style={styles.dateContainer}>
513-
<PlatformIcon
514-
ios={{
515-
name: 'calendar',
516-
variant: 'fill',
517-
size: 13
518-
}}
519-
android={{
520-
name: 'calendar_today',
521-
size: 15
522-
}}
523-
web={{
524-
name: 'Calendar',
525-
size: 15
526-
}}
527-
style={styles.dateIcon}
528-
/>
529-
<Text style={styles.dateText}>
530-
{formatFriendlyDate(mealWithDate.date)}
531-
</Text>
532-
</View>
533-
)}
534511

535512
<View style={styles.tagsContainer}>
513+
{mealWithDate?.date && (
514+
<View style={styles.tagContainer}>
515+
<PlatformIcon
516+
ios={{
517+
name: 'calendar',
518+
variant: 'fill',
519+
size: 13
520+
}}
521+
android={{
522+
name: 'calendar_today',
523+
size: 15
524+
}}
525+
web={{
526+
name: 'Calendar',
527+
size: 15
528+
}}
529+
style={styles.tagIcon}
530+
/>
531+
<Text style={styles.tagText}>
532+
{formatFriendlyDate(mealWithDate.date)}
533+
</Text>
534+
</View>
535+
)}
536+
536537
<View style={styles.tagContainer}>
537538
<PlatformIcon
538539
ios={{
@@ -552,26 +553,6 @@ export default function FoodDetail(): React.JSX.Element {
552553
/>
553554
<Text style={styles.tagText}>{humanLocation}</Text>
554555
</View>
555-
556-
<View style={styles.tagContainer}>
557-
<PlatformIcon
558-
ios={{
559-
name: 'tag',
560-
variant: 'outline',
561-
size: 13
562-
}}
563-
android={{
564-
name: 'sell',
565-
size: 15
566-
}}
567-
web={{
568-
name: 'Tag',
569-
size: 15
570-
}}
571-
style={styles.tagIcon}
572-
/>
573-
<Text style={styles.tagText}>{humanCategory}</Text>
574-
</View>
575556
</View>
576557

577558
{isPriceAvailable && (
@@ -734,33 +715,11 @@ const stylesheet = createStyleSheet((theme) => ({
734715
justifyContent: 'center',
735716
alignItems: 'center'
736717
},
737-
dateContainer: {
738-
flexDirection: 'row',
739-
alignItems: 'center',
740-
gap: 6,
741-
marginBottom: 8,
742-
backgroundColor: theme.colors.card,
743-
paddingHorizontal: 12,
744-
paddingVertical: 6,
745-
borderRadius: theme.radius.md,
746-
alignSelf: 'flex-start',
747-
marginTop: 8,
748-
borderWidth: StyleSheet.hairlineWidth,
749-
borderColor: theme.colors.border
750-
},
751-
dateIcon: {
752-
color: theme.colors.primary
753-
},
754-
dateText: {
755-
color: theme.colors.text,
756-
fontSize: 14,
757-
fontWeight: '500'
758-
},
759718
tagsContainer: {
760719
flexDirection: 'row',
761720
gap: 8,
762721
marginBottom: 16,
763-
flexWrap: 'wrap'
722+
alignItems: 'center'
764723
},
765724
tagContainer: {
766725
flexDirection: 'row',

src/components/Calendar/ExamsPage.tsx

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,9 @@ export default function ExamsPage({
7676
return (
7777
<View style={styles.container}>
7878
{isLoading ? (
79-
<LoadingIndicator />
79+
<View style={styles.loadingContainer}>
80+
<LoadingIndicator />
81+
</View>
8082
) : isError ? (
8183
<ErrorView
8284
title={error?.message ?? t('error.title')}
@@ -145,6 +147,11 @@ const stylesheet = createStyleSheet((theme) => ({
145147
flex: 1,
146148
width: '100%'
147149
},
150+
loadingContainer: {
151+
flex: 1,
152+
justifyContent: 'center',
153+
alignItems: 'center'
154+
},
148155
footerContainer: {
149156
marginVertical: 4,
150157
paddingBottom: theme.margins.bottomSafeArea

0 commit comments

Comments
 (0)