diff options
| author | Ivan Chen <ivan@tagg.id> | 2021-04-22 14:32:15 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-04-22 14:32:15 -0400 |
| commit | f0cff95cfa612b295caf68552bc3d29a7fb23a42 (patch) | |
| tree | dd3df697478a19048cd4bf6d0b499a91c1a93eb3 /src/screens/badge | |
| parent | 4e8e1c0d58424e6b63cfb8470fc0a73c0e6b102b (diff) | |
| parent | 33c172cc31957966b14321520c56816ba044db14 (diff) | |
Merge pull request #374 from IvanIFChen/hotfix-linting-fixup
[HOTFIX] Linter fixup
Diffstat (limited to 'src/screens/badge')
| -rw-r--r-- | src/screens/badge/BadgeItem.tsx | 14 | ||||
| -rw-r--r-- | src/screens/badge/BadgeSelection.tsx | 12 |
2 files changed, 11 insertions, 15 deletions
diff --git a/src/screens/badge/BadgeItem.tsx b/src/screens/badge/BadgeItem.tsx index 3141e662..1051d4a7 100644 --- a/src/screens/badge/BadgeItem.tsx +++ b/src/screens/badge/BadgeItem.tsx @@ -34,7 +34,7 @@ const BadgeItem: React.FC<BadgeItemProps> = ({ style={styles.border}> <TouchableOpacity onPress={() => onSelection(title)} - style={{alignSelf: 'center', marginTop: 3}}> + style={styles.button}> <LinearGradient colors={index === 0 ? BADGE_GRADIENT_FIRST : BADGE_GRADIENT_REST} // BACKGROUND_GRADIENT_MAP @@ -74,14 +74,6 @@ const styles = StyleSheet.create({ borderRadius: 8, borderColor: 'transparent', }, - selectedDetailContainer: { - flexGrow: 1, - justifyContent: 'center', - alignItems: 'center', - borderWidth: 3, - borderColor: 'white', - borderRadius: 8, - }, imageStyles: { width: 40, height: 40, @@ -96,6 +88,10 @@ const styles = StyleSheet.create({ color: 'white', marginHorizontal: '2%', }, + button: { + alignSelf: 'center', + marginTop: 3, + }, }); export default BadgeItem; diff --git a/src/screens/badge/BadgeSelection.tsx b/src/screens/badge/BadgeSelection.tsx index 2fec8ea3..91617377 100644 --- a/src/screens/badge/BadgeSelection.tsx +++ b/src/screens/badge/BadgeSelection.tsx @@ -1,26 +1,26 @@ import {RouteProp} from '@react-navigation/core'; +import {useNavigation} from '@react-navigation/native'; import React, {useEffect, useState} from 'react'; import {Alert, SafeAreaView, StatusBar, StyleSheet, View} from 'react-native'; import {Text} from 'react-native-animatable'; import {TouchableOpacity} from 'react-native-gesture-handler'; import LinearGradient from 'react-native-linear-gradient'; import {useDispatch, useSelector} from 'react-redux'; +import {BACKGROUND_GRADIENT_MAP} from '../../constants'; +import {BADGE_DATA} from '../../constants/badges'; +import {ERROR_BADGES_EXCEED_LIMIT} from '../../constants/strings'; import {MainStackParams} from '../../routes'; import { addBadgesService, getSuggestedPeopleProfile, updateBadgesService, } from '../../services'; -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, UniversityType} from '../../types'; +import {RootState} from '../../store/rootReducer'; +import {BackgroundGradientType} from '../../types'; import {SCREEN_HEIGHT, StatusBarHeight} from '../../utils'; import BadgeList from './BadgeList'; import BadgeScreenHeader from './BadgeScreenHeader'; -import {useNavigation} from '@react-navigation/native'; -import {RootState} from '../../store/rootReducer'; /** * Home Screen for displaying Tagg Badge Selections |
