Skip to content

Commit

Permalink
Merge pull request #377 from SquareTable/325-make-text-clickable-in-l…
Browse files Browse the repository at this point in the history
…ogin-activity-settings

Login Activity Settings text is now clickable
  • Loading branch information
Sebastian-Webster authored Feb 2, 2024
2 parents b88d954 + e2aa6e4 commit 7dd668c
Showing 1 changed file with 12 additions and 12 deletions.
24 changes: 12 additions & 12 deletions screens/SecuritySettingsScreens/LoginActivitySettings.js
Original file line number Diff line number Diff line change
Expand Up @@ -197,12 +197,12 @@ const LoginActivitySettings = ({navigation, route}) => {
<View style={{justifyContent: 'center', alignItems: 'center'}}>
{
typeof currentSettings.getIP === 'boolean' ?
<View style={{flexDirection: 'row', alignItems: 'center'}}>
<TouchableOpacity onPress={() => {setCurrentSettings(settings => ({...settings, getIP: !settings.getIP}))}} style={{flexDirection: 'row', alignItems: 'center'}}>
<Text style={{fontSize: 30, fontWeight: 'bold', color: colors.tertiary, marginRight: 25}}>Store IP:</Text>
<TouchableOpacity onPress={() => {setCurrentSettings(settings => ({...settings, getIP: !settings.getIP}))}} style={{width: 40, height: 40, borderColor: colors.borderColor, borderWidth: 3, justifyContent: 'center', alignItems: 'center'}}>
<View style={{width: 40, height: 40, borderColor: colors.borderColor, borderWidth: 3, justifyContent: 'center', alignItems: 'center'}}>
<Text style={{color: colors.tertiary, fontSize: 18, textAlign: 'center', textAlignVertical: 'center'}}>{currentSettings.getIP ? '✓' : '✕'}</Text>
</TouchableOpacity>
</View>
</View>
</TouchableOpacity>
:
<>
<Text style={{fontSize: 30, fontWeight: 'bold', color: colors.tertiary}}>Store IP:</Text>
Expand All @@ -213,12 +213,12 @@ const LoginActivitySettings = ({navigation, route}) => {
<View style={{justifyContent: 'center', alignItems: 'center'}}>
{
typeof currentSettings.getDeviceType === 'boolean' ?
<View style={{flexDirection: 'row', alignItems: 'center'}}>
<TouchableOpacity onPress={() => {setCurrentSettings(settings => ({...settings, getDeviceType: !settings.getDeviceType}))}} style={{flexDirection: 'row', alignItems: 'center'}}>
<Text style={{fontSize: 30, fontWeight: 'bold', color: colors.tertiary, marginRight: 25}}>Store Device Type:</Text>
<TouchableOpacity onPress={() => {setCurrentSettings(settings => ({...settings, getDeviceType: !settings.getDeviceType}))}} style={{width: 40, height: 40, borderColor: colors.borderColor, borderWidth: 3, justifyContent: 'center', alignItems: 'center'}}>
<View style={{width: 40, height: 40, borderColor: colors.borderColor, borderWidth: 3, justifyContent: 'center', alignItems: 'center'}}>
<Text style={{color: colors.tertiary, fontSize: 18, textAlign: 'center', textAlignVertical: 'center'}}>{currentSettings.getDeviceType ? '✓' : '✕'}</Text>
</TouchableOpacity>
</View>
</View>
</TouchableOpacity>
:
<>
<Text style={{fontSize: 30, fontWeight: 'bold', color: colors.tertiary}}>Store Device Type:</Text>
Expand All @@ -230,12 +230,12 @@ const LoginActivitySettings = ({navigation, route}) => {
{
typeof currentSettings.getLocation === 'boolean' ?
<>
<View style={{flexDirection: 'row', alignItems: 'center'}}>
<TouchableOpacity onPress={() => {setCurrentSettings(settings => ({...settings, getLocation: !settings.getLocation}))}} style={{flexDirection: 'row', alignItems: 'center'}}>
<Text style={{fontSize: 30, fontWeight: 'bold', color: colors.tertiary, marginRight: 25}}>Store Location:</Text>
<TouchableOpacity onPress={() => {setCurrentSettings(settings => ({...settings, getLocation: !settings.getLocation}))}} style={{width: 40, height: 40, borderColor: colors.borderColor, borderWidth: 3, justifyContent: 'center', alignItems: 'center'}}>
<View style={{width: 40, height: 40, borderColor: colors.borderColor, borderWidth: 3, justifyContent: 'center', alignItems: 'center'}}>
<Text style={{color: colors.tertiary, fontSize: 18, textAlign: 'center', textAlignVertical: 'center'}}>{currentSettings.getLocation ? '✓' : '✕'}</Text>
</TouchableOpacity>
</View>
</View>
</TouchableOpacity>
<Text style={{fontSize: 14, color: colors.tertiary, textAlign: 'center', marginHorizontal: 10, marginTop: 10}}>(Location is derived from your IP address and SocialSquare does not use GPS data to get your location)</Text>
</>
:
Expand Down

0 comments on commit 7dd668c

Please sign in to comment.