Skip to content

Commit

Permalink
Merge pull request #1912 from ever-co/bug/timer-width-change-when-run…
Browse files Browse the repository at this point in the history
…ning

fixed the timer width
  • Loading branch information
evereq authored Nov 30, 2023
2 parents 243e34d + 06e69ad commit 0f714a2
Showing 1 changed file with 8 additions and 6 deletions.
14 changes: 8 additions & 6 deletions apps/mobile/app/components/TimerCard.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,10 @@ const TimerCard: FC<Props> = observer(() => {
return (
<View style={[styles.mainContainer, { borderTopColor: colors.border }]}>
<View style={styles.horizontal}>
<View style={styles.timeAndProgressBarWrapper}>
<Text style={[styles.timerText, { color: colors.primary }]}>
<View
style={[styles.timeAndProgressBarWrapper, { borderRightColor: colors.border, borderRightWidth: 2 }]}
>
<Text style={[styles.timerText, { color: colors.primary }]} numberOfLines={1}>
{pad(hours)}:{pad(minutes)}:{pad(seconds)}
<Text style={{ fontSize: screenWidth * 0.03, fontWeight: '600' }}>:{pad(ms_p)}</Text>
</Text>
Expand All @@ -56,7 +58,6 @@ const TimerCard: FC<Props> = observer(() => {
/>
</View>
</View>
<View style={{ height: '100%', width: 2, backgroundColor: colors.border }} />
<View style={[styles.timerBtn, { borderLeftColor: colors.border }]}>
<TimerButton />
</View>
Expand Down Expand Up @@ -84,7 +85,8 @@ const styles = EStyleSheet.create({
flexDirection: 'column',
justifyContent: 'space-between',
height: 70,
paddingBottom: 0
paddingBottom: 0,
flex: 0.9
},
horizontal: {
flexDirection: 'row',
Expand All @@ -101,10 +103,10 @@ const styles = EStyleSheet.create({
timerText: {
fontWeight: '600',
fontSize: screenWidth * 0.082,
color: '#1B005D',
marginTop: 0,
paddingTop: 0,
fontFamily: typography.fonts.PlusJakartaSans.semiBold
fontFamily: typography.fonts.PlusJakartaSans.semiBold,
width: '100%'
}
});

Expand Down

0 comments on commit 0f714a2

Please sign in to comment.