Skip to content

feat: Aligning headers #528

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
IamLRBA wants to merge 2 commits into from
Closed

feat: Aligning headers #528

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b6ac177
ui(formulus): align About/Help headers and rename Settings title
IamLRBA Mar 19, 2026
f7f4522
Merge branch 'dev' into UI-UX
IamLRBA Mar 19, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
49 changes: 17 additions & 32 deletions formulus/src/screens/AboutScreen.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
View,
Text,
StyleSheet,
Image,

Check failure on line 6 in formulus/src/screens/AboutScreen.tsx

View workflow job for this annotation

GitHub Actions / Formulus (React Native) 

'Image' is defined but never used. Allowed unused vars must match /^_/u
ScrollView,
Linking,
Pressable,
Expand All @@ -20,7 +20,7 @@
odeRadius,
odeScreenHeaderHeight,
} from '../theme/odeDesign';
import logo from '../../assets/images/logo.png';

Check failure on line 23 in formulus/src/screens/AboutScreen.tsx

View workflow job for this annotation

GitHub Actions / Formulus (React Native) 

'logo' is defined but never used. Allowed unused vars must match /^_/u

const FORUM_URL = 'https://forum.opendataensemble.org';

Expand Down Expand Up @@ -55,7 +55,7 @@
return (
<BlurredScreenBackground>
<SafeAreaView
style={[styles.container, { backgroundColor: 'transparent' }]}

Check warning on line 58 in formulus/src/screens/AboutScreen.tsx

View workflow job for this annotation

GitHub Actions / Formulus (React Native) 

Color literal: { backgroundColor: 'transparent' }
edges={['top']}>
<View
style={[
Expand All @@ -74,15 +74,6 @@
<ScrollView
style={styles.scrollTransparent}
contentContainerStyle={styles.content}>
<View style={styles.brandRow}>
<View style={styles.logoWrapper}>
<Image source={logo} style={styles.logo} resizeMode="contain" />
</View>
<Text style={[styles.appName, { color: themeColors.onSurface }]}>
ODE
</Text>
</View>

<View style={cardStyle}>
<Text style={[styles.cardTitle, { color: sectionColor }]}>
Formulus
Expand Down Expand Up @@ -149,7 +140,7 @@
container: {
flex: 1,
},
scrollTransparent: {

Check warning on line 143 in formulus/src/screens/AboutScreen.tsx

View workflow job for this annotation

GitHub Actions / Formulus (React Native) 

Color literal: { backgroundColor: 'transparent' }
backgroundColor: 'transparent',
},
header: {
Expand All @@ -164,41 +155,35 @@
borderRightWidth: 0,
borderRadius: 0,
},
title: {
fontSize: odeTypography.screenTitle,
fontWeight: 'bold',
marginBottom: odeSpacing.xs,
textAlign: 'left',
},
content: {
padding: odeSpacing.md,
paddingBottom: odeSpacing.xl,
},
brandRow: {
logoContainer: {
flexDirection: 'row',
alignItems: 'center',
marginBottom: odeSpacing.md,
gap: odeSpacing.xs,
justifyContent: 'flex-start',
},
logoWrapper: {

Check warning on line 163 in formulus/src/screens/AboutScreen.tsx

View workflow job for this annotation

GitHub Actions / Formulus (React Native) 

Color literal: { backgroundColor: 'transparent' }
width: 56,
height: 56,
borderRadius: 28,
width: 40,
height: 40,
borderRadius: 20,
borderWidth: 1,
borderColor: colors.brand.primary[500] as string,
justifyContent: 'center',
alignItems: 'center',
marginRight: 12,
overflow: 'hidden',
backgroundColor: 'transparent',
},
logo: {

Check warning on line 174 in formulus/src/screens/AboutScreen.tsx

View workflow job for this annotation

GitHub Actions / Formulus (React Native) 

Color literal: { backgroundColor: 'transparent' }
width: 56,
height: 56,
width: 40,
height: 40,
backgroundColor: 'transparent',
},
appName: {
fontSize: odeTypography.sectionTitle,
fontWeight: '700',
textAlign: 'center',
title: {
fontSize: odeTypography.screenTitle,
fontWeight: 'bold',
textAlign: 'left',
},
content: {
padding: odeSpacing.md,
paddingBottom: odeSpacing.xl,
},
version: {
marginTop: odeSpacing.xxs,
Expand Down
24 changes: 23 additions & 1 deletion formulus/src/screens/HelpScreen.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
ScrollView,
Linking,
Pressable,
Image,

Check failure on line 9 in formulus/src/screens/HelpScreen.tsx

View workflow job for this annotation

GitHub Actions / Formulus (React Native) 

'Image' is defined but never used. Allowed unused vars must match /^_/u
} from 'react-native';
import { SafeAreaView } from 'react-native-safe-area-context';
import colors from '../theme/colors';
Expand All @@ -18,6 +19,7 @@
odeRadius,
odeScreenHeaderHeight,
} from '../theme/odeDesign';
import logo from '../../assets/images/logo.png';

Check failure on line 22 in formulus/src/screens/HelpScreen.tsx

View workflow job for this annotation

GitHub Actions / Formulus (React Native) 

'logo' is defined but never used. Allowed unused vars must match /^_/u

const FORUM_URL = 'https://forum.opendataensemble.org';

Expand Down Expand Up @@ -128,10 +130,30 @@
borderRightWidth: 0,
borderRadius: 0,
},
logoContainer: {
flexDirection: 'row',
alignItems: 'center',
justifyContent: 'flex-start',
},
logoWrapper: {
width: 40,
height: 40,
borderRadius: 20,
borderWidth: 1,
justifyContent: 'center',
alignItems: 'center',
marginRight: 12,
overflow: 'hidden',
backgroundColor: 'transparent',
},
logo: {
width: 40,
height: 40,
backgroundColor: 'transparent',
},
title: {
fontSize: odeTypography.screenTitle,
fontWeight: 'bold',
marginBottom: odeSpacing.xs,
textAlign: 'left',
},
content: {
Expand Down
2 changes: 1 addition & 1 deletion formulus/src/screens/SettingsScreen.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -374,7 +374,7 @@ const SettingsScreen = () => {
<Image source={Logo} style={styles.logo} resizeMode="contain" />
</View>
<Text style={[styles.brandName, { color: themeColors.onPrimary }]}>
ODE
Settings
</Text>
</View>
</View>
Expand Down
Loading