Skip to content

refactor: Drop rn-app-intro in favor of react-native-swiper #493

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Oct 19, 2017
Merged

refactor: Drop rn-app-intro in favor of react-native-swiper #493

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7a7ad1f
refactor: Drop rn-app-intro in favor of react-native-swiper
machour Oct 17, 2017
09f15ab
Merge branch 'master' into replace-app-intro
andrewda Oct 18, 2017
346aab8
fix: Don't embed swiper in a View, so that it works on Android
machour Oct 18, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,7 @@
"react-native-photo-view": "^1.5.2",
"react-native-safari-view": "^2.0.0",
"react-native-search-bar": "^3.0.0",
"react-native-swiper": "^1.5.13",
"react-native-syntax-highlighter": "^1.2.1",
"react-native-table-component": "^1.0.5",
"react-native-vector-icons": "^4.4.0",
Expand All @@ -87,7 +88,6 @@
"redux-persist-transform-encrypt": "^1.0.2",
"redux-thunk": "^2.2.0",
"reselect": "^3.0.1",
"rn-app-intro": "^0.0.4",
"styled-components": "^2.2.1"
},
"devDependencies": {
Expand Down
230 changes: 117 additions & 113 deletions src/auth/screens/login.screen.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import {
Modal,
} from 'react-native';
import { Button, Icon } from 'react-native-elements';
import AppIntro from 'rn-app-intro';
import Swiper from 'react-native-swiper';
import queryString from 'query-string';

import { ViewContainer } from 'components';
Expand Down Expand Up @@ -99,6 +99,14 @@ const styles = StyleSheet.create({
justifyContent: 'center',
alignItems: 'center',
},
signInContainer: {
position: 'absolute',
right: 0,
left: 0,
bottom: 80,
justifyContent: 'center',
alignItems: 'center',
},
slide: {
flex: 1,
justifyContent: 'center',
Expand Down Expand Up @@ -219,6 +227,12 @@ class Login extends Component {
}
};

shouldDisplayIntro() {
const { isLoggingIn, isAuthenticated } = this.props;

return !isAuthenticated && !isLoggingIn && this.state.asyncStorageChecked;
}

renderLoading() {
return (
<View style={styles.browserLoader}>
Expand All @@ -229,130 +243,120 @@ class Login extends Component {
}

render() {
const { locale, isLoggingIn, isAuthenticated } = this.props;
const { locale, isLoggingIn } = this.props;

return (
<ViewContainer barColor="light">
{!isAuthenticated &&
!isLoggingIn &&
this.state.asyncStorageChecked && (
<View style={styles.container}>
<Modal
animationType="slide"
onRequestClose={() => null}
visible={this.state.modalVisible}
style={styles.container}
>
<View style={styles.modalContainer}>
<View style={styles.browserSection}>
<WebView
source={{
uri: `https://github.com/login/oauth/authorize?response_type=token&client_id=${CLIENT_ID}&redirect_uri=gitpoint://welcome&scope=user%20repo&state=${stateRandom}`,
}}
onLoadStart={e => this.toggleCancelButton(e, true)}
onLoadEnd={e => this.toggleCancelButton(e, false)}
onNavigationStateChange={e =>
this.onNavigationStateChange(e)}
renderLoading={() => this.renderLoading()}
startInLoadingState
/>
</View>
<View style={styles.miniSection}>
<Button
title={translate('auth.login.cancel', locale)}
buttonStyle={styles.button}
disabled={this.state.cancelDisabled}
textStyle={styles.buttonText}
onPress={() =>
this.setModalVisible(!this.state.modalVisible)}
/>
</View>
</View>
</Modal>
<View style={styles.miniSection}>
<Image
style={styles.logo}
source={require('../../assets/logo.png')}
{this.shouldDisplayIntro() && (
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

How about moving the code to a separate component, such as Intro?

{this.shouldDisplayIntro() && <Intro />}

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm not sure about this, it would be used only for the login screen (+comment below)

<Swiper
loop={false}
dotColor="#FFFFFF55"
activeDotColor={colors.white}
>
<View style={[styles.slide, styles.slide1]}>
<Image
style={styles.logo}
source={require('../../assets/logo.png')}
/>
<Text style={styles.title}>
{translate('auth.login.welcomeTitle', locale)}
</Text>
<Text style={styles.message}>
{translate('auth.login.welcomeMessage', locale)}
</Text>
</View>
<View style={[styles.slide, styles.slide2]}>
<Icon
style={styles.icon}
color={colors.white}
size={85}
name="bell"
type="octicon"
/>
<Text style={styles.title}>
{translate('auth.login.notificationsTitle', locale)}
</Text>
<Text style={styles.message}>
{translate('auth.login.notificationsMessage', locale)}
</Text>
</View>
<View style={[styles.slide, styles.slide3]}>
<Icon
containerStyle={styles.iconMargin}
style={styles.icon}
color={colors.white}
size={85}
name="repo"
type="octicon"
/>
<Text style={styles.title}>
{translate('auth.login.reposTitle', locale)}
</Text>
<Text style={styles.message}>
{translate('auth.login.reposMessage', locale)}
</Text>
</View>
<View style={[styles.slide, styles.slide4]}>
<Icon
containerStyle={styles.iconMargin}
style={styles.icon}
color={colors.white}
size={85}
name="git-pull-request"
type="octicon"
/>
<Text style={styles.title}>
{translate('auth.login.issuesTitle', locale)}
</Text>
<Text style={styles.message}>
{translate('auth.login.issuesMessage', locale)}
</Text>
</View>
</Swiper>
)}
{this.shouldDisplayIntro() && (
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why this check? Can we combine into one?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We sadly cannot, <Swiper> don't work at all in Android when nested into a view, that's why I need these multiple checks/rendering

<View style={styles.signInContainer}>
<Button
raised
title={translate('auth.login.signInButton', locale)}
buttonStyle={styles.button}
textStyle={styles.buttonText}
onPress={() => this.setModalVisible(true)}
/>
</View>
)}
{this.shouldDisplayIntro() && (
<Modal
animationType="slide"
onRequestClose={() => null}
visible={this.state.modalVisible}
style={styles.container}
>
<View style={styles.modalContainer}>
<View style={styles.browserSection}>
<WebView
source={{
uri: `https://github.com/login/oauth/authorize?response_type=token&client_id=${CLIENT_ID}&redirect_uri=gitpoint://welcome&scope=user%20repo&state=${stateRandom}`,
}}
onLoadStart={e => this.toggleCancelButton(e, true)}
onLoadEnd={e => this.toggleCancelButton(e, false)}
onNavigationStateChange={e => this.onNavigationStateChange(e)}
renderLoading={() => this.renderLoading()}
startInLoadingState
/>
</View>
<View style={styles.contentSection}>
<AppIntro
activeDotColor={colors.white}
showSkipButton={false}
showDoneButton={false}
>
<View style={[styles.slide, styles.slide1]}>
<Image
style={styles.logo}
source={require('../../assets/logo.png')}
/>
<Text style={styles.title}>
{translate('auth.login.welcomeTitle', locale)}
</Text>
<Text style={styles.message}>
{translate('auth.login.welcomeMessage', locale)}
</Text>
</View>
<View style={[styles.slide, styles.slide2]}>
<Icon
style={styles.icon}
color={colors.white}
size={85}
name="bell"
type="octicon"
/>
<Text style={styles.title}>
{translate('auth.login.notificationsTitle', locale)}
</Text>
<Text style={styles.message}>
{translate('auth.login.notificationsMessage', locale)}
</Text>
</View>
<View style={[styles.slide, styles.slide3]}>
<Icon
containerStyle={styles.iconMargin}
style={styles.icon}
color={colors.white}
size={85}
name="repo"
type="octicon"
/>
<Text style={styles.title}>
{translate('auth.login.reposTitle', locale)}
</Text>
<Text style={styles.message}>
{translate('auth.login.reposMessage', locale)}
</Text>
</View>
<View style={[styles.slide, styles.slide4]}>
<Icon
containerStyle={styles.iconMargin}
style={styles.icon}
color={colors.white}
size={85}
name="git-pull-request"
type="octicon"
/>
<Text style={styles.title}>
{translate('auth.login.issuesTitle', locale)}
</Text>
<Text style={styles.message}>
{translate('auth.login.issuesMessage', locale)}
</Text>
</View>
</AppIntro>
</View>
<View style={styles.miniSection}>
<Button
raised
title={translate('auth.login.signInButton', locale)}
title={translate('auth.login.cancel', locale)}
buttonStyle={styles.button}
disabled={this.state.cancelDisabled}
textStyle={styles.buttonText}
onPress={() => this.setModalVisible(true)}
onPress={() => this.setModalVisible(!this.state.modalVisible)}
/>
</View>
</View>
)}
</Modal>
)}
{isLoggingIn && (
<View style={styles.browserLoader}>
<Text style={styles.browserLoadingLabel}>
Expand Down
34 changes: 5 additions & 29 deletions yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -320,18 +320,6 @@ assert-plus@^0.2.0:
version "0.2.0"
resolved "https://registry.yarnpkg.com/assert-plus/-/assert-plus-0.2.0.tgz#d74e1b87e7affc0db8aadb7021f3fe48101ab234"

assign-deep@^0.4.5:
version "0.4.6"
resolved "https://registry.yarnpkg.com/assign-deep/-/assign-deep-0.4.6.tgz#2192a989354843093a03eff941c9473a9bc58a1d"
dependencies:
assign-symbols "^0.1.1"
is-primitive "^2.0.0"
kind-of "^5.0.2"

assign-symbols@^0.1.1:
version "0.1.1"
resolved "https://registry.yarnpkg.com/assign-symbols/-/assign-symbols-0.1.1.tgz#cb025944ef4ec8a3693f086e9e112c74e3a0fed9"

ast-types-flow@0.0.7:
version "0.0.7"
resolved "https://registry.yarnpkg.com/ast-types-flow/-/ast-types-flow-0.0.7.tgz#f70b735c6bca1a5c9c22d982c3e39e7feba3bdad"
Expand Down Expand Up @@ -3998,10 +3986,6 @@ kind-of@^4.0.0:
dependencies:
is-buffer "^1.1.5"

kind-of@^5.0.2:
version "5.0.2"
resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-5.0.2.tgz#f57bec933d9a2209ffa96c5c08343607b7035fda"

klaw@^1.0.0:
version "1.3.1"
resolved "https://registry.yarnpkg.com/klaw/-/klaw-1.3.1.tgz#4088433b46b3b1ba259d78785d8e96f73ba02439"
Expand Down Expand Up @@ -5438,11 +5422,11 @@ react-native-side-menu@^0.20.1:
version "0.20.3"
resolved "https://registry.yarnpkg.com/react-native-side-menu/-/react-native-side-menu-0.20.3.tgz#5dffe3e237018360ed081433d505ea454cba9ca4"

"react-native-swiper@git+https://github.com/FuYaoDe/react-native-swiper.git":
version "1.4.4"
resolved "git+https://github.com/FuYaoDe/react-native-swiper.git#a6417ff41a8b2d490bdcc4541015ab35736d4595"
react-native-swiper@^1.5.13:
version "1.5.13"
resolved "https://registry.yarnpkg.com/react-native-swiper/-/react-native-swiper-1.5.13.tgz#fa695cd4ab77b9a9df2d2bfee38ea7274dd07a2e"
dependencies:
react-timer-mixin "^0.13.3"
prop-types "^15.5.10"

react-native-syntax-highlighter@^1.2.1:
version "1.2.3"
Expand Down Expand Up @@ -5613,7 +5597,7 @@ react-test-renderer@16.0.0-alpha.6:
fbjs "^0.8.9"
object-assign "^4.1.0"

react-timer-mixin@^0.13.2, react-timer-mixin@^0.13.3:
react-timer-mixin@^0.13.2:
version "0.13.3"
resolved "https://registry.yarnpkg.com/react-timer-mixin/-/react-timer-mixin-0.13.3.tgz#0da8b9f807ec07dc3e854d082c737c65605b3d22"

Expand Down Expand Up @@ -6045,14 +6029,6 @@ rimraf@~2.2.6:
version "2.2.8"
resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.2.8.tgz#e439be2aaee327321952730f99a8929e4fc50582"

rn-app-intro@^0.0.4:
version "0.0.4"
resolved "https://registry.yarnpkg.com/rn-app-intro/-/rn-app-intro-0.0.4.tgz#c094d36fa0f2c437799d5c11c89d5fbf4cc961c5"
dependencies:
assign-deep "^0.4.5"
prop-types "^15.5.10"
react-native-swiper "git+https://github.com/FuYaoDe/react-native-swiper.git"

rn-host-detect@^1.1.3:
version "1.1.3"
resolved "https://registry.yarnpkg.com/rn-host-detect/-/rn-host-detect-1.1.3.tgz#242d76e2fa485c48d751416e65b7cce596969e91"
Expand Down