diff options
| author | anderklander <anderklander@gmail.com> | 2017-12-14 13:43:38 +0100 |
|---|---|---|
| committer | Erik Larkö <erik@mullvad.net> | 2017-12-22 13:52:19 +0100 |
| commit | d3d1df97a9de4e9d3938eacc9ccdc0fc9fad9238 (patch) | |
| tree | d09997d34f184767121775c8f74ec809a730b014 /app | |
| parent | 77db271e9eff71ddb9f2d4ceb5bce3090861dd95 (diff) | |
| download | mullvadvpn-d3d1df97a9de4e9d3938eacc9ccdc0fc9fad9238.tar.xz mullvadvpn-d3d1df97a9de4e9d3938eacc9ccdc0fc9fad9238.zip | |
Put CustomScrollbars back
Removed while testing for android and forgot to put back.
Diffstat (limited to 'app')
| -rw-r--r-- | app/components/Settings.js | 82 |
1 files changed, 46 insertions, 36 deletions
diff --git a/app/components/Settings.js b/app/components/Settings.js index 5c991978e9..bf675ef2db 100644 --- a/app/components/Settings.js +++ b/app/components/Settings.js @@ -50,39 +50,49 @@ export default class Settings extends Component { <Text style={styles.settings__title}>Settings</Text> </View> - <View style={styles.settings__content}> - <View style={styles.settings__main}> - {/* show account options when logged in */} - {isLoggedIn ? ( - <View style={styles.settings_account} testName="settings__account"> - <Button onPress={ this.props.onViewAccount } testName="settings__view_account"> - <View style={styles.settings__cell}> - <Text style={styles.settings__cell_label}>Account</Text> - <View style={styles.settings__cell_value}> - {isOutOfTime ? ( - <Text style={styles.settings__account_paid_until_label__error} testName="settings__account_paid_until_label">OUT OF TIME</Text> - ) : ( - <Text style={styles.settings__account_paid_until_label} testName="settings__account_paid_until_label">{formattedExpiry}</Text> - )} + <CustomScrollbars autoHide={ true }> + + <View style={styles.settings__content}> + <View style={styles.settings__main}> + {/* show account options when logged in */} + {isLoggedIn ? ( + <View style={styles.settings_account} testName="settings__account"> + <Button onPress={ this.props.onViewAccount } testName="settings__view_account"> + <View style={styles.settings__cell}> + <Text style={styles.settings__cell_label}>Account</Text> + <View style={styles.settings__cell_value}> + {isOutOfTime ? ( + <Text style={styles.settings__account_paid_until_label__error} testName="settings__account_paid_until_label">OUT OF TIME</Text> + ) : ( + <Text style={styles.settings__account_paid_until_label} testName="settings__account_paid_until_label">{formattedExpiry}</Text> + )} + </View> + <Img style={styles.settings__cell_disclosure} source="icon-chevron"/> </View> - <Img style={styles.settings__cell_disclosure} source="icon-chevron" tintColor="currentColor"/> + </Button> + <View style={styles.settings__cell_spacer} /> + </View> + ) : null} + + {isLoggedIn ? ( + <Button onPress={ this.props.onViewAdvancedSettings }> + <View style={styles.settings__cell}> + <Text style={styles.settings__cell_label}>Advanced</Text> + <Img style={styles.settings__cell_disclosure} source="icon-chevron" tintColor="currentColor" /> </View> + <View style={styles.settings__cell_spacer}></View> </Button> - <View style={styles.settings__cell_spacer} /> - </View> - ) : null} - - {isLoggedIn ? ( - <Button onPress={ this.props.onViewAdvancedSettings }> - <View style={styles.settings__cell}> - <Text style={styles.settings__cell_label}>Advanced</Text> - <Img style={styles.settings__cell_disclosure} source="icon-chevron" tintColor="currentColor"/> - </View> - <View style={styles.settings__cell_spacer}></View> - </Button> - ) : null} + ) : null} - <View style={styles.settings__external} testName="settings__external"> + {isLoggedIn ? ( + <Button onPress={ this.props.onViewAdvancedSettings }> + <View style={styles.settings__cell}> + <Text style={styles.settings__cell_label}>Advanced</Text> + <Img style={styles.settings__cell_disclosure} source="icon-chevron" tintColor="currentColor"/> + </View> + <View style={styles.settings__cell_spacer}></View> + </Button> + ) : null} <Button onPress={ this.props.onExternalLink.bind(this, "faq") } testName="settings__external_link"> <View style={styles.settings__cell}> @@ -105,18 +115,18 @@ export default class Settings extends Component { </View> </Button> + </View> </View> - </View> - <View style={styles.settings__footer}> - <Button style={styles.settings__footer_button} onPress={this.props.onQuit} testName="settings__quit"> - <Text style={styles.settings__footer_button_label}>Quit app</Text> - </Button> + <View style={styles.settings__footer}> + <Button style={styles.settings__footer_button} onPress={this.props.onQuit} testName="settings__quit"> + <Text style={styles.settings__footer_button_label}>Quit app</Text> + </Button> + </View> </View> - </View> + </CustomScrollbars> </View> </View> ->>>>>>> Settings in reactxp </Container> </Layout> ); |