martin/databag
1
0
Fork 0
mirror of https://github.com/balzack/databag.git synced 2025-02-12 03:29:16 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

adjusting modal layout

Browse Source
This commit is contained in:
balzack 2023-09-12 22:52:45 -07:00
parent 04e4da7aa3
commit 8c1eb824e7
2 changed files with 19 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
app/mobile/src/session/settings/Settings.jsx
View File

@ -383,23 +383,21 @@ export function Settings() {
onChangeText={actions.setSealPassword} onChangeText={actions.setSealPassword}
/> />
<View style={styles.buttons}> { state.sealPassword && (
{ state.sealPassword && ( <TouchableOpacity style={styles.enabledButton} activeOpacity={1} onPress={() => sealAction(actions.unlockKey)}>
<TouchableOpacity style={styles.enabledButton} activeOpacity={1} onPress={() => sealAction(actions.unlockKey)}> { busy && (
{ busy && ( <ActivityIndicator style={styles.modalBusy} animating={true} color={Colors.primaryButtonText} />
<ActivityIndicator style={styles.modalBusy} animating={true} color={Colors.primaryButtonText} /> )}
)} { !busy && (
{ !busy && ( <Text style={styles.enabledButtonText}>{ state.strings.unlock }</Text>
<Text style={styles.enabledButtonText}>{ state.strings.unlock }</Text> )}
)} </TouchableOpacity>
</TouchableOpacity> )}
)} { !state.sealPassword && (
{ !state.sealPassword && ( <View style={styles.disabledButton}>
<View style={styles.disabledButton}> <Text style={styles.disabledButtonText}>{ state.strings.unlock }</Text>
<Text style={styles.disabledButtonText}>{ state.strings.unlock }</Text> </View>
</View> )}
)}
</View>
<TouchableOpacity activeOpacity={1} onPress={actions.showSealRemove}> <TouchableOpacity activeOpacity={1} onPress={actions.showSealRemove}>
<Text style={styles.dangerText}>{ state.strings.removeSeal }</Text> <Text style={styles.dangerText}>{ state.strings.removeSeal }</Text>
</TouchableOpacity> </TouchableOpacity>

8
app/mobile/src/session/settings/Settings.styled.js
View File

@ -192,7 +192,7 @@ export const styles = StyleSheet.create({
right: 16, right: 16,
}, },
enabledButton: { enabledButton: {
marginTop: 8, marginTop: 24,
marginBottom: 16, marginBottom: 16,
borderRadius: 4, borderRadius: 4,
backgroundColor: Colors.primaryButton, backgroundColor: Colors.primaryButton,
@ -207,7 +207,7 @@ export const styles = StyleSheet.create({
fontFamily: 'Roboto', fontFamily: 'Roboto',
}, },
disabledButton: { disabledButton: {
marginTop: 8, marginTop: 24,
marginBottom: 16, marginBottom: 16,
borderRadius: 4, borderRadius: 4,
backgroundColor: Colors.disabledButton, backgroundColor: Colors.disabledButton,
@ -222,7 +222,7 @@ export const styles = StyleSheet.create({
fontFamily: 'Roboto', fontFamily: 'Roboto',
}, },
dangerButton: { dangerButton: {
marginTop: 8, marginTop: 24,
marginBottom: 16, marginBottom: 16,
borderRadius: 4, borderRadius: 4,
backgroundColor: Colors.dangerButton, backgroundColor: Colors.dangerButton,
@ -253,7 +253,7 @@ export const styles = StyleSheet.create({
fontFamily: 'Roboto', fontFamily: 'Roboto',
}, },
cancelButton: { cancelButton: {
marginTop: 8, marginTop: 24,
marginBottom: 16, marginBottom: 16,
marginRight: 16, marginRight: 16,
borderRadius: 4, borderRadius: 4,