diff --git a/assets/CN-logo-hel-svart.png b/assets/CN-logo-hel-svart.png new file mode 100644 index 0000000..791e1b2 Binary files /dev/null and b/assets/CN-logo-hel-svart.png differ diff --git a/package-lock.json b/package-lock.json index d77a190..f579e7b 100644 --- a/package-lock.json +++ b/package-lock.json @@ -18,6 +18,7 @@ "@stripe/stripe-react-native": "0.28.0", "email-validator": "^2.0.4", "expo": "~49.0.5", + "expo-asset": "~8.10.1", "expo-status-bar": "~1.6.0", "graphql": "^15.8.0", "moment": "^2.29.4", diff --git a/package.json b/package.json index f3e132f..187411e 100644 --- a/package.json +++ b/package.json @@ -39,7 +39,8 @@ "redux": "^4.2.1", "redux-persist": "^6.0.0", "redux-thunk": "^2.4.2", - "styled-system": "^5.1.5" + "styled-system": "^5.1.5", + "expo-asset": "~8.10.1" }, "devDependencies": { "@babel/core": "^7.20.0", diff --git a/src/modules/about/About.js b/src/modules/about/About.js index 17542d4..1c0d42b 100644 --- a/src/modules/about/About.js +++ b/src/modules/about/About.js @@ -1,10 +1,22 @@ import React from 'react'; -import { Text, View, Platform, StyleSheet, Image, Linking, TouchableOpacity, ScrollView } from 'react-native'; +import { + Text, + View, + Platform, + StyleSheet, + Image, + Linking, + TouchableOpacity, + ScrollView, + Dimensions, +} from 'react-native'; import { SimpleLineIcons as SimpleIcon, FontAwesome5 as FAIcon } from '@expo/vector-icons'; import { Button } from 'react-native-ui-lib'; import theme from '../../theme'; +import logo from '../../../assets/CN-logo-hel-svart.png'; + const CHATEAU_NEUF_ADDRESS = 'Det Norske Studentersamfund, Slemdalsveien 15, 0369 Oslo'; const openFacebook = () => { @@ -60,11 +72,7 @@ const About = () => ( Det Norske Studentersamfund Linking.openURL('https://www.studentersamfundet.no/')}> - + Følg oss på @@ -160,11 +168,13 @@ const styles = StyleSheet.create({ featuredImage: { height: 230, width: null, + display: 'flex', }, logo: { - height: 128, - width: null, - marginBottom: 10, + margin: 10, + resizeMode: 'contain', + width: Dimensions.get('window').width * 0.8, // 80% of screen width + alignSelf: 'center', }, icon: { fontSize: 16,