diff --git a/src/auth/screens/auth-profile.screen.js b/src/auth/screens/auth-profile.screen.js index acd763d2b..fb6011148 100644 --- a/src/auth/screens/auth-profile.screen.js +++ b/src/auth/screens/auth-profile.screen.js @@ -3,8 +3,6 @@ import styled from 'styled-components/native'; import { connect } from 'react-redux'; import { bindActionCreators } from 'redux'; import { - StyleSheet, - Text, RefreshControl, View, ActivityIndicator, @@ -44,30 +42,17 @@ const mapDispatchToProps = dispatch => dispatch ); -const styles = StyleSheet.create({ - update: { - flex: 1, - alignItems: 'center', - marginVertical: 40, - }, - updateText: { - color: colors.greyDark, - ...fonts.fontPrimary, - }, - updateTextSub: { - fontSize: normalize(11), - }, - note: { - fontSize: normalize(11), - color: colors.primaryDark, - ...fonts.fontPrimaryLight, - textAlign: 'center', - padding: 10, - }, - noteLink: { - ...fonts.fontPrimarySemiBold, - }, -}); +const Note = styled.Text` + font-size: ${normalize(11)}; + color: ${colors.primaryDark}; + ${fonts.fontPrimaryLight}; + text-align: center; + padding: 10px; +`; + +const NoteLink = styled.Text` + ${fonts.fontPrimarySemiBold}; +`; const BioListItem = styled(ListItem).attrs({ containerStyle: { @@ -193,11 +178,10 @@ class AuthProfile extends Component { navigation={navigation} /> ))} - + {translate('auth.profile.orgsRequestApprovalTop', locale)} {'\n'} - openURLInView('https://github.com/settings/applications')} > @@ -205,8 +189,8 @@ class AuthProfile extends Component { 'auth.profile.orgsRequestApprovalBottom', locale )} - - + + )} diff --git a/src/auth/screens/privacy-policy.screen.js b/src/auth/screens/privacy-policy.screen.js index 674e5b896..a15dff8f8 100644 --- a/src/auth/screens/privacy-policy.screen.js +++ b/src/auth/screens/privacy-policy.screen.js @@ -1,43 +1,47 @@ import React, { Component } from 'react'; -import { StyleSheet, ScrollView, View, Text } from 'react-native'; +import styled from 'styled-components/native'; +import { ScrollView } from 'react-native'; import { ViewContainer } from 'components'; import { translate } from 'utils'; import { colors, fonts, normalize } from 'config'; import { v3 } from 'api'; -const styles = StyleSheet.create({ - container: { - flex: 1, - padding: 15, - }, - title: { - fontSize: normalize(14), - color: colors.primaryDark, - ...fonts.fontPrimarySemiBold, - marginBottom: 15, - }, - section: { - borderTopColor: colors.greyLight, - borderTopWidth: 3, - paddingVertical: 15, - }, - sectionTitle: { - fontSize: normalize(12), - color: colors.primaryDark, - ...fonts.fontPrimaryBold, - marginBottom: 15, - }, - text: { - fontSize: normalize(12), - color: colors.primaryDark, - ...fonts.fontPrimary, - marginBottom: 15, - }, - link: { - ...fonts.fontPrimarySemiBold, - }, -}); +const Container = styled.View` + flex: 1; + padding: 15px; +`; + +const Title = styled.Text` + font-size: ${normalize(14)}; + color: ${colors.primaryDark}; + ${fonts.fontPrimarySemiBold}; + margin-bottom: 15; +`; + +const Section = styled.View` + border-top-color: ${colors.greyLight}; + border-top-width: 3; + padding-vertical: 15; +`; + +const SectionTitle = styled.Text` + font-size: ${normalize(12)}; + color: ${colors.primaryDark}; + ${fonts.fontPrimaryBold}; + margin-bottom: 15; +`; + +const StyledText = styled.Text` + font-size: ${normalize(12)}; + color: ${colors.primaryDark}; + ${fonts.fontPrimary}; + margin-bottom: 15; +`; + +const Link = styled.Text` + ${fonts.fontPrimarySemiBold}; +`; export class PrivacyPolicyScreen extends Component { props: { @@ -51,82 +55,81 @@ export class PrivacyPolicyScreen extends Component { return ( - - + + {translate('auth.privacyPolicy.effectiveDate', locale)} - </Text> + - - +
+ {translate('auth.privacyPolicy.introduction', locale)} - - + +
- - +
+ {translate('auth.privacyPolicy.userDataTitle', locale)} - + - + {translate('auth.privacyPolicy.userData1', locale)} - + - + {translate('auth.privacyPolicy.userData2', locale)} - - + +
- - +
+ {translate('auth.privacyPolicy.analyticsInfoTitle', locale)} - + - + {translate('auth.privacyPolicy.analyticsInfo1', locale)} - + - + {translate('auth.privacyPolicy.analyticsInfo2', locale)} - - + +
- - +
+ {translate('auth.privacyPolicy.openSourceTitle', locale)} - + - + {translate('auth.privacyPolicy.openSource1', locale)} - + - + {translate('auth.privacyPolicy.openSource2', locale)} - - + +
- - +
+ {translate('auth.privacyPolicy.contactTitle', locale)} - + - + {translate('auth.privacyPolicy.contact1', locale)} - + - + {translate('auth.privacyPolicy.contact2', locale)}{' '} - navigation.navigate('Repository', { repositoryUrl: `${v3.root}/repos/gitpoint/git-point`, })} > {translate('auth.privacyPolicy.contactLink', locale)} - - - - + + +
+
); diff --git a/src/auth/screens/splash.screen.js b/src/auth/screens/splash.screen.js index f0f02cbd8..634fa0684 100644 --- a/src/auth/screens/splash.screen.js +++ b/src/auth/screens/splash.screen.js @@ -1,6 +1,6 @@ import React, { Component } from 'react'; +import styled from 'styled-components/native'; import { connect } from 'react-redux'; -import { StyleSheet, View, Image } from 'react-native'; import { colors } from 'config'; import { resetNavigationTo } from 'utils'; @@ -9,18 +9,17 @@ const mapStateToProps = state => ({ isAuthenticated: state.auth.isAuthenticated, }); -const styles = StyleSheet.create({ - logoContainer: { - backgroundColor: colors.white, - flex: 1, - justifyContent: 'center', - alignItems: 'center', - }, - logo: { - width: 100, - height: 100, - }, -}); +const LogoContainer = styled.View` + background-color: ${colors.white}; + flex: 1; + justify-content: center; + align-items: center; +`; + +const Logo = styled.View` + width: 100; + height: 100; +`; class Splash extends Component { props: { @@ -40,12 +39,9 @@ class Splash extends Component { render() { return ( - - - + + + ); } } diff --git a/src/auth/screens/user-options.screen.js b/src/auth/screens/user-options.screen.js index 13113cbf8..e51246037 100644 --- a/src/auth/screens/user-options.screen.js +++ b/src/auth/screens/user-options.screen.js @@ -3,14 +3,7 @@ import React, { Component } from 'react'; import styled from 'styled-components/native'; import { connect } from 'react-redux'; import { bindActionCreators } from 'redux'; -import { - ScrollView, - StyleSheet, - FlatList, - Text, - TouchableOpacity, - View, -} from 'react-native'; +import { ScrollView, FlatList } from 'react-native'; import { ListItem } from 'react-native-elements'; import { NavigationActions } from 'react-navigation'; import CookieManager from 'react-native-cookies'; @@ -42,31 +35,34 @@ const mapDispatchToProps = dispatch => dispatch ); -const styles = StyleSheet.create({ - listTitle: { - color: colors.black, - ...fonts.fontPrimary, - }, - update: { - flex: 1, - alignItems: 'center', - marginVertical: 40, - }, - updateText: { - color: colors.greyDark, - ...fonts.fontPrimary, - }, - updateTextSub: { - fontSize: normalize(11), - }, - language: { - flexDirection: 'row', - }, - flag: { - paddingRight: 7, - color: colors.black, // random any color for the correct display emoji - }, -}); +const ListTitle = styled.Text` + color: ${colors.black}; + ${fonts.fontPrimary}; +`; + +const Update = styled.TouchableOpacity` + flex: 1; + align-items: center; + margin-vertical: 40; +`; + +const UpdateText = styled.Text` + color: ${colors.greyDark}; + ${fonts.fontPrimary}; +`; + +const UpdateTextSub = UpdateText.extend` + font-size: ${normalize(11)}; +`; + +const Language = styled.View` + flex-direction: row; +`; + +const Flag = styled.Text` + padding-right: 7; + color: ${colors.black}; // random any color for the correct display emoji +`; const StyledListItem = styled(ListItem).attrs({ containerStyle: { @@ -168,12 +164,10 @@ class UserOptions extends Component { return ( - - {emojifyText(item.emojiCode)} - - {item.name} - + + {emojifyText(item.emojiCode)} + {item.name} + } hideChevron={locale !== item.code} rightIcon={{ name: 'check' }} @@ -213,12 +207,10 @@ class UserOptions extends Component { /> - - GitPoint v{version} - - {this.state.updateText} - - + + GitPoint v{version} + {this.state.updateText} + ); diff --git a/src/auth/screens/welcome.screen.js b/src/auth/screens/welcome.screen.js index b8acc8e25..c5d53f707 100644 --- a/src/auth/screens/welcome.screen.js +++ b/src/auth/screens/welcome.screen.js @@ -1,6 +1,7 @@ import React, { Component } from 'react'; +import styled from 'styled-components/native'; import { connect } from 'react-redux'; -import { StyleSheet, View, Text, ActivityIndicator } from 'react-native'; +import { ActivityIndicator } from 'react-native'; import { ViewContainer } from 'components'; import { colors, fonts, normalize } from 'config'; @@ -11,20 +12,19 @@ const mapStateToProps = state => ({ isLoggingIn: state.auth.isLoggingIn, }); -const styles = StyleSheet.create({ - container: { - flex: 1, - justifyContent: 'center', - alignItems: 'center', - backgroundColor: colors.githubDark, - }, - welcomeMessage: { - color: colors.white, - paddingBottom: 20, - fontSize: normalize(24), - ...fonts.fontPrimary, - }, -}); +const Container = styled.View` + flex: 1; + justify-content: center; + align-items: center; + background-color: ${colors.githubDark}; +`; + +const WelcomeMessage = styled.Text` + color: ${colors.white}; + padding-bottom: 20; + font-size: ${normalize(24)}; + ${fonts.fontPrimary}; +`; class Welcome extends Component { props: { @@ -37,12 +37,12 @@ class Welcome extends Component { return ( - - + + {translate('auth.welcome.welcomeTitle', locale)} - + - + ); }