Skip to content

Commit 3723bfb

Browse files
authored
feat(formulus): Making Formulus UI a Banger (#598)
* Update sync card labels * Fix sync status and observation icons to ODE green
1 parent 3b1f7ed commit 3723bfb

File tree

3 files changed

+14
-5
lines changed

3 files changed

+14
-5
lines changed

formulus/src/components/common/ObservationCard.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ const ObservationCard: React.FC<ObservationCardProps> = ({
6666
size={24}
6767
color={
6868
isSynced
69-
? (themeColors.primary as string)
69+
? (colors.brand.primary['500'] as string)
7070
: colors.semantic.warning[500]
7171
}
7272
/>

formulus/src/screens/ObservationDetailScreen.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -340,7 +340,7 @@ const ObservationDetailScreen: React.FC<ObservationDetailScreenProps> = ({
340340
size={16}
341341
color={
342342
isSynced
343-
? (themeColors.primary as string)
343+
? (colors.brand.primary['500'] as string)
344344
: (colors.semantic.warning[500] as unknown as string)
345345
}
346346
/>

formulus/src/screens/SyncScreen.tsx

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -366,13 +366,22 @@ const SyncScreen = () => {
366366
};
367367

368368
const observationStatus = getObservationStatusText();
369+
/** Check icon on idle success uses ODE brand green; status text still follows app theme primary. */
370+
const odeStatusIconGreen = colors.brand.primary['500'] as string;
369371
const observationStatusColor = isObservationSyncActive
370372
? themeColors.primary
371373
: syncState.error
372374
? colors.semantic.error[500]
373375
: pendingObservations > 0 || pendingUploads.count > 0
374376
? colors.semantic.warning[500]
375377
: (themeColors.primary as string);
378+
const observationStatusIconColor = isObservationSyncActive
379+
? themeColors.primary
380+
: syncState.error
381+
? colors.semantic.error[500]
382+
: pendingObservations > 0 || pendingUploads.count > 0
383+
? colors.semantic.warning[500]
384+
: odeStatusIconGreen;
376385

377386
useEffect(() => {
378387
const unsubscribeStatus = syncService.subscribeToStatusUpdates(() => {});
@@ -629,14 +638,14 @@ const SyncScreen = () => {
629638
: 'check-circle'
630639
}
631640
size={20}
632-
color={observationStatusColor as string}
641+
color={observationStatusIconColor as string}
633642
/>
634643
<Text
635644
style={[
636645
styles.statusCardTitle,
637646
{ color: themeColors.onSurface as string },
638647
]}>
639-
Observation status
648+
Status
640649
</Text>
641650
</View>
642651
<Text
@@ -679,7 +688,7 @@ const SyncScreen = () => {
679688
styles.statusCardTitle,
680689
{ color: themeColors.onSurface as string },
681690
]}>
682-
Last observation sync
691+
Last Sync
683692
</Text>
684693
</View>
685694
<Text

0 commit comments

Comments
 (0)