diff options
| author | Ivan Chen <ivan@tagg.id> | 2021-03-26 22:40:00 -0400 |
|---|---|---|
| committer | Ivan Chen <ivan@tagg.id> | 2021-03-26 22:40:00 -0400 |
| commit | 64785e6527e521ce14e32edcc80adc6253b48657 (patch) | |
| tree | df42bdbe6810b589ec52c98fcd622cc7e2864879 /src/screens/badge | |
| parent | ed26661062a2e47df2662254eaddfcfa1de62d04 (diff) | |
renamed to UniversityType, applied to all
Diffstat (limited to 'src/screens/badge')
| -rw-r--r-- | src/screens/badge/BadgeScreenHeader.tsx | 13 | ||||
| -rw-r--r-- | src/screens/badge/BadgeSelection.tsx | 4 |
2 files changed, 12 insertions, 5 deletions
diff --git a/src/screens/badge/BadgeScreenHeader.tsx b/src/screens/badge/BadgeScreenHeader.tsx index 746e05d9..46c0c1c8 100644 --- a/src/screens/badge/BadgeScreenHeader.tsx +++ b/src/screens/badge/BadgeScreenHeader.tsx @@ -1,10 +1,10 @@ import React from 'react'; import {Image, StyleSheet, Text, View} from 'react-native'; -import { Universities } from 'src/types'; +import {UniversityType} from 'src/types'; import {getUniversityBadge, normalize} from '../../utils'; interface BadgeScreenHeaderProps { - university: Universities; + university: UniversityType; } const BadgeScreenHeader: React.FC<BadgeScreenHeaderProps> = ({university}) => { @@ -12,9 +12,12 @@ const BadgeScreenHeader: React.FC<BadgeScreenHeaderProps> = ({university}) => { <View style={styles.container}> <Image source={getUniversityBadge(university, 'Crest')} + style={styles.icon} /> <View style={styles.universityTextContainer}> - <Text style={styles.universityText}>{university} University Badges</Text> + <Text style={styles.universityText}> + {university} University Badges + </Text> </View> <View style={styles.searchTextContainer}> <Text style={styles.searchText}> @@ -44,6 +47,10 @@ const styles = StyleSheet.create({ lineHeight: normalize(17.9), color: 'white', }, + icon: { + aspectRatio: 675 / 750, + height: 40, + }, }); export default BadgeScreenHeader; diff --git a/src/screens/badge/BadgeSelection.tsx b/src/screens/badge/BadgeSelection.tsx index 08cad020..deaefb52 100644 --- a/src/screens/badge/BadgeSelection.tsx +++ b/src/screens/badge/BadgeSelection.tsx @@ -15,7 +15,7 @@ import {BACKGROUND_GRADIENT_MAP} from '../../constants'; import {BADGE_DATA} from '../../constants/badges'; import {ERROR_BADGES_EXCEED_LIMIT} from '../../constants/strings'; import {suggestedPeopleBadgesFinished} from '../../store/actions'; -import {BackgroundGradientType, Universities} from '../../types'; +import {BackgroundGradientType, UniversityType} from '../../types'; import {SCREEN_HEIGHT, StatusBarHeight} from '../../utils'; import BadgeList from './BadgeList'; import BadgeScreenHeader from './BadgeScreenHeader'; @@ -36,7 +36,7 @@ const BadgeSelection: React.FC<BadgeSelectionProps> = ({route}) => { const {editing} = route.params; const { user: {userId: loggedInUserId}, - profile: {university = Universities.brown}, + profile: {university}, } = useSelector((state: RootState) => state.user); const [selectedBadges, setSelectedBadges] = useState<string[]>([]); const dispatch = useDispatch(); |
