diff --git a/formulus/src/screens/AboutScreen.tsx b/formulus/src/screens/AboutScreen.tsx index 8806f6d99..691e2f80b 100644 --- a/formulus/src/screens/AboutScreen.tsx +++ b/formulus/src/screens/AboutScreen.tsx @@ -74,15 +74,6 @@ const AboutScreen: React.FC = () => { - - - - - - ODE - - - Formulus @@ -164,41 +155,35 @@ const styles = StyleSheet.create({ 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: { - 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: { - 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, diff --git a/formulus/src/screens/HelpScreen.tsx b/formulus/src/screens/HelpScreen.tsx index c87c273aa..9c2bd816e 100644 --- a/formulus/src/screens/HelpScreen.tsx +++ b/formulus/src/screens/HelpScreen.tsx @@ -6,6 +6,7 @@ import { ScrollView, Linking, Pressable, + Image, } from 'react-native'; import { SafeAreaView } from 'react-native-safe-area-context'; import colors from '../theme/colors'; @@ -18,6 +19,7 @@ import { odeRadius, odeScreenHeaderHeight, } from '../theme/odeDesign'; +import logo from '../../assets/images/logo.png'; const FORUM_URL = 'https://forum.opendataensemble.org'; @@ -128,10 +130,30 @@ const styles = StyleSheet.create({ 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: { diff --git a/formulus/src/screens/SettingsScreen.tsx b/formulus/src/screens/SettingsScreen.tsx index 5116061a3..c7969cf8e 100644 --- a/formulus/src/screens/SettingsScreen.tsx +++ b/formulus/src/screens/SettingsScreen.tsx @@ -374,7 +374,7 @@ const SettingsScreen = () => { - ODE + Settings