diff --git a/android/app/build.gradle b/android/app/build.gradle index 2acb220..08fef9a 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -149,6 +149,7 @@ android { } dependencies { + implementation project(':react-native-splash-screen') implementation project(':react-native-linear-gradient') implementation project(':react-native-gesture-handler') implementation project(':react-native-vector-icons') diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml index f4b5203..b243030 100644 --- a/android/app/src/main/AndroidManifest.xml +++ b/android/app/src/main/AndroidManifest.xml @@ -9,20 +9,25 @@ + android:name=".SplashActivity" + android:theme="@style/SplashTheme" + android:label="@string/app_name"> + + diff --git a/android/app/src/main/java/com/mindcast/MainActivity.java b/android/app/src/main/java/com/mindcast/MainActivity.java index 0c2f3b1..84d3057 100644 --- a/android/app/src/main/java/com/mindcast/MainActivity.java +++ b/android/app/src/main/java/com/mindcast/MainActivity.java @@ -1,11 +1,18 @@ package com.mindcast; +import android.os.Bundle; import com.facebook.react.ReactActivity; import com.facebook.react.ReactActivityDelegate; import com.facebook.react.ReactRootView; import com.swmansion.gesturehandler.react.RNGestureHandlerEnabledRootView; +import org.devio.rn.splashscreen.SplashScreen; public class MainActivity extends ReactActivity { + @Override + protected void onCreate(Bundle savedInstanceState) { + SplashScreen.show(this); + super.onCreate(savedInstanceState); + } /** * Returns the name of the main component registered from JavaScript. diff --git a/android/app/src/main/java/com/mindcast/MainApplication.java b/android/app/src/main/java/com/mindcast/MainApplication.java index 403e067..1b30c7f 100644 --- a/android/app/src/main/java/com/mindcast/MainApplication.java +++ b/android/app/src/main/java/com/mindcast/MainApplication.java @@ -3,6 +3,7 @@ import android.app.Application; import com.facebook.react.ReactApplication; +import org.devio.rn.splashscreen.SplashScreenReactPackage; import com.BV.LinearGradient.LinearGradientPackage; import com.swmansion.gesturehandler.react.RNGestureHandlerPackage; import com.oblador.vectoricons.VectorIconsPackage; @@ -30,6 +31,7 @@ public boolean getUseDeveloperSupport() { protected List getPackages() { return Arrays.asList( new MainReactPackage(), + new SplashScreenReactPackage(), new LinearGradientPackage(), new RNGestureHandlerPackage(), new VectorIconsPackage(), diff --git a/android/app/src/main/java/com/mindcast/SplashActivity.java b/android/app/src/main/java/com/mindcast/SplashActivity.java new file mode 100644 index 0000000..85d5461 --- /dev/null +++ b/android/app/src/main/java/com/mindcast/SplashActivity.java @@ -0,0 +1,16 @@ +package com.mindcast; + +import android.content.Intent; +import android.os.Bundle; +import android.support.v7.app.AppCompatActivity; + +public class SplashActivity extends AppCompatActivity { + @Override + protected void onCreate(Bundle savedInstance) { + super.onCreate(savedInstance); + + Intent intent = new Intent(this, MainActivity.class); + startActivity(intent); + finish(); + } +} diff --git a/android/app/src/main/res/drawable-hdpi/icon.png b/android/app/src/main/res/drawable-hdpi/icon.png new file mode 100755 index 0000000..bd83b2c Binary files /dev/null and b/android/app/src/main/res/drawable-hdpi/icon.png differ diff --git a/android/app/src/main/res/drawable-ldpi/icon.png b/android/app/src/main/res/drawable-ldpi/icon.png new file mode 100755 index 0000000..8d3b7af Binary files /dev/null and b/android/app/src/main/res/drawable-ldpi/icon.png differ diff --git a/android/app/src/main/res/drawable-mdpi/icon.png b/android/app/src/main/res/drawable-mdpi/icon.png new file mode 100755 index 0000000..e889561 Binary files /dev/null and b/android/app/src/main/res/drawable-mdpi/icon.png differ diff --git a/android/app/src/main/res/drawable-xhdpi/icon.png b/android/app/src/main/res/drawable-xhdpi/icon.png new file mode 100755 index 0000000..ffeb2d5 Binary files /dev/null and b/android/app/src/main/res/drawable-xhdpi/icon.png differ diff --git a/android/app/src/main/res/drawable-xxhdpi/icon.png b/android/app/src/main/res/drawable-xxhdpi/icon.png new file mode 100755 index 0000000..84ec92e Binary files /dev/null and b/android/app/src/main/res/drawable-xxhdpi/icon.png differ diff --git a/android/app/src/main/res/drawable-xxxhdpi/icon.png b/android/app/src/main/res/drawable-xxxhdpi/icon.png new file mode 100755 index 0000000..9a61626 Binary files /dev/null and b/android/app/src/main/res/drawable-xxxhdpi/icon.png differ diff --git a/android/app/src/main/res/drawable/background_splash.xml b/android/app/src/main/res/drawable/background_splash.xml new file mode 100644 index 0000000..f998d14 --- /dev/null +++ b/android/app/src/main/res/drawable/background_splash.xml @@ -0,0 +1,10 @@ + + + + + diff --git a/android/app/src/main/res/drawable/icon.png b/android/app/src/main/res/drawable/icon.png new file mode 100755 index 0000000..ffeb2d5 Binary files /dev/null and b/android/app/src/main/res/drawable/icon.png differ diff --git a/android/app/src/main/res/drawable/splash_screen_icon.png b/android/app/src/main/res/drawable/splash_screen_icon.png new file mode 100755 index 0000000..9a61626 Binary files /dev/null and b/android/app/src/main/res/drawable/splash_screen_icon.png differ diff --git a/android/app/src/main/res/layout/launch_screen.xml b/android/app/src/main/res/layout/launch_screen.xml new file mode 100644 index 0000000..c1d3ff8 --- /dev/null +++ b/android/app/src/main/res/layout/launch_screen.xml @@ -0,0 +1,13 @@ + + + + diff --git a/android/app/src/main/res/mipmap-hdpi/ic_launcher.png b/android/app/src/main/res/mipmap-hdpi/ic_launcher.png deleted file mode 100644 index a2f5908..0000000 Binary files a/android/app/src/main/res/mipmap-hdpi/ic_launcher.png and /dev/null differ diff --git a/android/app/src/main/res/mipmap-hdpi/ic_launcher_round.png b/android/app/src/main/res/mipmap-hdpi/ic_launcher_round.png deleted file mode 100644 index 1b52399..0000000 Binary files a/android/app/src/main/res/mipmap-hdpi/ic_launcher_round.png and /dev/null differ diff --git a/android/app/src/main/res/mipmap-mdpi/ic_launcher.png b/android/app/src/main/res/mipmap-mdpi/ic_launcher.png deleted file mode 100644 index ff10afd..0000000 Binary files a/android/app/src/main/res/mipmap-mdpi/ic_launcher.png and /dev/null differ diff --git a/android/app/src/main/res/mipmap-mdpi/ic_launcher_round.png b/android/app/src/main/res/mipmap-mdpi/ic_launcher_round.png deleted file mode 100644 index 115a4c7..0000000 Binary files a/android/app/src/main/res/mipmap-mdpi/ic_launcher_round.png and /dev/null differ diff --git a/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png deleted file mode 100644 index dcd3cd8..0000000 Binary files a/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png and /dev/null differ diff --git a/android/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png b/android/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png deleted file mode 100644 index 459ca60..0000000 Binary files a/android/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png and /dev/null differ diff --git a/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png deleted file mode 100644 index 8ca12fe..0000000 Binary files a/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png and /dev/null differ diff --git a/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png b/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png deleted file mode 100644 index 8e19b41..0000000 Binary files a/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png and /dev/null differ diff --git a/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png deleted file mode 100644 index b824ebd..0000000 Binary files a/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png and /dev/null differ diff --git a/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png b/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png deleted file mode 100644 index 4c19a13..0000000 Binary files a/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png and /dev/null differ diff --git a/android/app/src/main/res/values/colors.xml b/android/app/src/main/res/values/colors.xml new file mode 100644 index 0000000..1206f0b --- /dev/null +++ b/android/app/src/main/res/values/colors.xml @@ -0,0 +1,5 @@ + + + #fff + #000 + diff --git a/android/app/src/main/res/values/strings.xml b/android/app/src/main/res/values/strings.xml index 016e3f7..523fe96 100644 --- a/android/app/src/main/res/values/strings.xml +++ b/android/app/src/main/res/values/strings.xml @@ -1,3 +1,3 @@ - mindCast + Mind Cast diff --git a/android/app/src/main/res/values/styles.xml b/android/app/src/main/res/values/styles.xml index 319eb0c..a71ea7e 100644 --- a/android/app/src/main/res/values/styles.xml +++ b/android/app/src/main/res/values/styles.xml @@ -1,8 +1,12 @@ - - + diff --git a/android/settings.gradle b/android/settings.gradle index e03f2ae..30a0b9d 100644 --- a/android/settings.gradle +++ b/android/settings.gradle @@ -1,4 +1,6 @@ rootProject.name = 'mindCast' +include ':react-native-splash-screen' +project(':react-native-splash-screen').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-splash-screen/android') include ':react-native-linear-gradient' project(':react-native-linear-gradient').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-linear-gradient/android') include ':react-native-gesture-handler' diff --git a/ios/mindCast.xcodeproj/project.pbxproj b/ios/mindCast.xcodeproj/project.pbxproj index 8e020d8..6eb8b9c 100644 --- a/ios/mindCast.xcodeproj/project.pbxproj +++ b/ios/mindCast.xcodeproj/project.pbxproj @@ -5,7 +5,6 @@ }; objectVersion = 46; objects = { - /* Begin PBXBuildFile section */ 00C302E51ABCBA2D00DB3ED1 /* libRCTActionSheet.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 00C302AC1ABCB8CE00DB3ED1 /* libRCTActionSheet.a */; }; 00C302E71ABCBA2D00DB3ED1 /* libRCTGeolocation.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 00C302BA1ABCB90400DB3ED1 /* libRCTGeolocation.a */; }; @@ -67,6 +66,7 @@ ED297163215061F000B7C4FE /* JavaScriptCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = ED297162215061F000B7C4FE /* JavaScriptCore.framework */; }; ED2971652150620600B7C4FE /* JavaScriptCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = ED2971642150620600B7C4FE /* JavaScriptCore.framework */; }; FF6F7470E16F464DAEDDD59A /* Modesta-Script.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 1D0088D82E2D4691AD56E66B /* Modesta-Script.ttf */; }; + 311B3768F1934CFFA5B884AD /* libSplashScreen.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 53E541D2BBA743E09A8FE23D /* libSplashScreen.a */; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ @@ -475,6 +475,8 @@ ED297162215061F000B7C4FE /* JavaScriptCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = JavaScriptCore.framework; path = System/Library/Frameworks/JavaScriptCore.framework; sourceTree = SDKROOT; }; ED2971642150620600B7C4FE /* JavaScriptCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = JavaScriptCore.framework; path = Platforms/AppleTVOS.platform/Developer/SDKs/AppleTVOS12.0.sdk/System/Library/Frameworks/JavaScriptCore.framework; sourceTree = DEVELOPER_DIR; }; EE454FF6EB304CD48F027C9A /* Entypo.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = Entypo.ttf; path = "../node_modules/react-native-vector-icons/Fonts/Entypo.ttf"; sourceTree = ""; }; + 343BD68EB9904B1DA8AAB2C9 /* SplashScreen.xcodeproj */ = {isa = PBXFileReference; name = "SplashScreen.xcodeproj"; path = "../node_modules/react-native-splash-screen/ios/SplashScreen.xcodeproj"; sourceTree = ""; fileEncoding = undefined; lastKnownFileType = wrapper.pb-project; explicitFileType = undefined; includeInIndex = 0; }; + 53E541D2BBA743E09A8FE23D /* libSplashScreen.a */ = {isa = PBXFileReference; name = "libSplashScreen.a"; path = "libSplashScreen.a"; sourceTree = ""; fileEncoding = undefined; lastKnownFileType = archive.ar; explicitFileType = undefined; includeInIndex = 0; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -509,6 +511,7 @@ DDEE0A36B62D4DD081129ACC /* libRNVectorIcons.a in Frameworks */, D6D1DB3205044A228FFFE064 /* libRNGestureHandler.a in Frameworks */, D40DEDA155EB404FB244C4E2 /* libBVLinearGradient.a in Frameworks */, + 311B3768F1934CFFA5B884AD /* libSplashScreen.a in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -731,6 +734,7 @@ 848FC80855F9421D8C5357C8 /* RNVectorIcons.xcodeproj */, 28473BFF97324F2E887A1493 /* RNGestureHandler.xcodeproj */, 5DE811C58D3844EB8C89CD8B /* BVLinearGradient.xcodeproj */, + 343BD68EB9904B1DA8AAB2C9 /* SplashScreen.xcodeproj */, ); name = Libraries; sourceTree = ""; @@ -1541,6 +1545,7 @@ "$(SRCROOT)/../node_modules/react-native-vector-icons/RNVectorIconsManager", "$(SRCROOT)/../node_modules/react-native-gesture-handler/ios/**", "$(SRCROOT)/../node_modules/react-native-linear-gradient/BVLinearGradient", + "$(SRCROOT)/../node_modules/react-native-splash-screen/ios", ); INFOPLIST_FILE = mindCastTests/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 9.0; @@ -1552,6 +1557,7 @@ "\"$(SRCROOT)/$(TARGET_NAME)\"", "\"$(SRCROOT)/$(TARGET_NAME)\"", "\"$(SRCROOT)/$(TARGET_NAME)\"", + "\"$(SRCROOT)/$(TARGET_NAME)\"", ); OTHER_LDFLAGS = ( "-ObjC", @@ -1574,6 +1580,7 @@ "$(SRCROOT)/../node_modules/react-native-vector-icons/RNVectorIconsManager", "$(SRCROOT)/../node_modules/react-native-gesture-handler/ios/**", "$(SRCROOT)/../node_modules/react-native-linear-gradient/BVLinearGradient", + "$(SRCROOT)/../node_modules/react-native-splash-screen/ios", ); INFOPLIST_FILE = mindCastTests/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 9.0; @@ -1585,6 +1592,7 @@ "\"$(SRCROOT)/$(TARGET_NAME)\"", "\"$(SRCROOT)/$(TARGET_NAME)\"", "\"$(SRCROOT)/$(TARGET_NAME)\"", + "\"$(SRCROOT)/$(TARGET_NAME)\"", ); OTHER_LDFLAGS = ( "-ObjC", @@ -1608,6 +1616,7 @@ "$(SRCROOT)/../node_modules/react-native-vector-icons/RNVectorIconsManager", "$(SRCROOT)/../node_modules/react-native-gesture-handler/ios/**", "$(SRCROOT)/../node_modules/react-native-linear-gradient/BVLinearGradient", + "$(SRCROOT)/../node_modules/react-native-splash-screen/ios", ); INFOPLIST_FILE = mindCast/Info.plist; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; @@ -1633,6 +1642,7 @@ "$(SRCROOT)/../node_modules/react-native-vector-icons/RNVectorIconsManager", "$(SRCROOT)/../node_modules/react-native-gesture-handler/ios/**", "$(SRCROOT)/../node_modules/react-native-linear-gradient/BVLinearGradient", + "$(SRCROOT)/../node_modules/react-native-splash-screen/ios", ); INFOPLIST_FILE = mindCast/Info.plist; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; @@ -1665,6 +1675,7 @@ "$(SRCROOT)/../node_modules/react-native-vector-icons/RNVectorIconsManager", "$(SRCROOT)/../node_modules/react-native-gesture-handler/ios/**", "$(SRCROOT)/../node_modules/react-native-linear-gradient/BVLinearGradient", + "$(SRCROOT)/../node_modules/react-native-splash-screen/ios", ); INFOPLIST_FILE = "mindCast-tvOS/Info.plist"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; @@ -1675,6 +1686,7 @@ "\"$(SRCROOT)/$(TARGET_NAME)\"", "\"$(SRCROOT)/$(TARGET_NAME)\"", "\"$(SRCROOT)/$(TARGET_NAME)\"", + "\"$(SRCROOT)/$(TARGET_NAME)\"", ); OTHER_LDFLAGS = ( "-ObjC", @@ -1706,6 +1718,7 @@ "$(SRCROOT)/../node_modules/react-native-vector-icons/RNVectorIconsManager", "$(SRCROOT)/../node_modules/react-native-gesture-handler/ios/**", "$(SRCROOT)/../node_modules/react-native-linear-gradient/BVLinearGradient", + "$(SRCROOT)/../node_modules/react-native-splash-screen/ios", ); INFOPLIST_FILE = "mindCast-tvOS/Info.plist"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; @@ -1716,6 +1729,7 @@ "\"$(SRCROOT)/$(TARGET_NAME)\"", "\"$(SRCROOT)/$(TARGET_NAME)\"", "\"$(SRCROOT)/$(TARGET_NAME)\"", + "\"$(SRCROOT)/$(TARGET_NAME)\"", ); OTHER_LDFLAGS = ( "-ObjC", @@ -1746,6 +1760,7 @@ "$(SRCROOT)/../node_modules/react-native-vector-icons/RNVectorIconsManager", "$(SRCROOT)/../node_modules/react-native-gesture-handler/ios/**", "$(SRCROOT)/../node_modules/react-native-linear-gradient/BVLinearGradient", + "$(SRCROOT)/../node_modules/react-native-splash-screen/ios", ); INFOPLIST_FILE = "mindCast-tvOSTests/Info.plist"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; @@ -1756,6 +1771,7 @@ "\"$(SRCROOT)/$(TARGET_NAME)\"", "\"$(SRCROOT)/$(TARGET_NAME)\"", "\"$(SRCROOT)/$(TARGET_NAME)\"", + "\"$(SRCROOT)/$(TARGET_NAME)\"", ); OTHER_LDFLAGS = ( "-ObjC", @@ -1786,6 +1802,7 @@ "$(SRCROOT)/../node_modules/react-native-vector-icons/RNVectorIconsManager", "$(SRCROOT)/../node_modules/react-native-gesture-handler/ios/**", "$(SRCROOT)/../node_modules/react-native-linear-gradient/BVLinearGradient", + "$(SRCROOT)/../node_modules/react-native-splash-screen/ios", ); INFOPLIST_FILE = "mindCast-tvOSTests/Info.plist"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; @@ -1796,6 +1813,7 @@ "\"$(SRCROOT)/$(TARGET_NAME)\"", "\"$(SRCROOT)/$(TARGET_NAME)\"", "\"$(SRCROOT)/$(TARGET_NAME)\"", + "\"$(SRCROOT)/$(TARGET_NAME)\"", ); OTHER_LDFLAGS = ( "-ObjC", diff --git a/package.json b/package.json index 546e4f0..37b42a8 100644 --- a/package.json +++ b/package.json @@ -37,6 +37,7 @@ "react-native-gesture-handler": "^1.0.16", "react-native-linear-gradient": "^2.5.3", "react-native-side-menu": "^1.1.3", + "react-native-splash-screen": "^3.2.0", "react-native-swipeout": "^2.3.6", "react-native-vector-icons": "^6.3.0", "react-native-video": "^4.4.0", diff --git a/src/components/common/interests/Interests.js b/src/components/common/interests/Interests.js index cdfa86a..c1c893d 100644 --- a/src/components/common/interests/Interests.js +++ b/src/components/common/interests/Interests.js @@ -39,9 +39,9 @@ const DEFAULT_INTERESTS = [ }, { isSelected: false, - title: 'LITERATURE', + title: 'BUSINESS', imageURL: - 'https://s3-sa-east-1.amazonaws.com/mind-cast/images/categories/literature/big.jpg', + 'https://s3-sa-east-1.amazonaws.com/mind-cast/images/categories/business/big.jpg', }, { isSelected: false, diff --git a/src/components/screens/StaterScreen.js b/src/components/screens/StaterScreen.js new file mode 100644 index 0000000..8668129 --- /dev/null +++ b/src/components/screens/StaterScreen.js @@ -0,0 +1,99 @@ +// @flow + +import React, { Component, Fragment } from 'react'; + +import SplashScreen from 'react-native-splash-screen'; +import FastImage from 'react-native-fast-image'; + +import { bindActionCreators } from 'redux'; +import { connect } from 'react-redux'; +import { Creators as PlayerCreators } from '~/store/ducks/player'; +import { Creators as LocalPodcastsManagerCreators } from '~/store/ducks/localPodcastsManager'; +import { Creators as PlaylistsCreators } from '~/store/ducks/playlist'; + +import CONSTANTS from '~/utils/CONSTANTS'; + +type Props = { + loadPodcastsRecentlyPlayed: Function, + setPodcastsDownloadedList: Function, + loadPlaylists: Function, + navigation: Object, +}; + +class StaterScreen extends Component { + componentDidMount() { + const { + loadPodcastsRecentlyPlayed, + setPodcastsDownloadedList, + loadPlaylists, + navigation, + } = this.props; + + setPodcastsDownloadedList(); + + loadPodcastsRecentlyPlayed(); + + loadPlaylists(); + + this.loadImages(); + + SplashScreen.hide(); + + navigation.navigate(CONSTANTS.ROUTES.ONBOARDING_INTRO); + } + + loadImages = (): void => { + FastImage.preload([ + { + uri: + 'https://s3-sa-east-1.amazonaws.com/mind-cast/images/categories/history/big.jpg', + }, + { + uri: + 'https://s3-sa-east-1.amazonaws.com/mind-cast/images/categories/pop-culture/big.jpg', + }, + { + uri: + 'https://s3-sa-east-1.amazonaws.com/mind-cast/images/categories/science/big.jpeg', + }, + { + uri: + 'https://s3-sa-east-1.amazonaws.com/mind-cast/images/categories/philosofy/big.jpg', + }, + { + uri: + 'https://s3-sa-east-1.amazonaws.com/mind-cast/images/categories/technology/big.jpg', + }, + { + uri: + 'https://s3-sa-east-1.amazonaws.com/mind-cast/images/categories/all/all.jpg', + }, + { + uri: + 'https://s3-sa-east-1.amazonaws.com/mind-cast/images/background-image.jpg', + }, + { + uri: + 'https://s3-sa-east-1.amazonaws.com/bon-appetit-resources/user-profile/user-profile.jpg', + }, + ]); + }; + + render() { + return ; + } +} + +const Creators = Object.assign( + {}, + LocalPodcastsManagerCreators, + PlaylistsCreators, + PlayerCreators, +); + +const mapDispatchToProps = dispatch => bindActionCreators(Creators, dispatch); + +export default connect( + null, + mapDispatchToProps, +)(StaterScreen); diff --git a/src/components/screens/search/components/subjects-list/SubjectList.js b/src/components/screens/search/components/subjects-list/SubjectList.js index 158c65f..5fd8626 100644 --- a/src/components/screens/search/components/subjects-list/SubjectList.js +++ b/src/components/screens/search/components/subjects-list/SubjectList.js @@ -24,12 +24,12 @@ const items = [ 'https://s3-sa-east-1.amazonaws.com/mind-cast/images/categories/philosofy/thumbnail.jpg', }, { - id: 'literature', - title: 'LITERATURE', + id: 'business', + title: 'BUSINESS', imageURL: - 'https://s3-sa-east-1.amazonaws.com/mind-cast/images/categories/literature/big.jpg', + 'https://s3-sa-east-1.amazonaws.com/mind-cast/images/categories/business/big.jpg', thumbnailImageURL: - 'https://s3-sa-east-1.amazonaws.com/mind-cast/images/categories/literature/thumbnail.jpg', + 'https://s3-sa-east-1.amazonaws.com/mind-cast/images/categories/business/thumbnail.jpg', }, { id: 'science', diff --git a/src/routes/index.js b/src/routes/index.js index 197f256..ccbfc56 100644 --- a/src/routes/index.js +++ b/src/routes/index.js @@ -4,17 +4,18 @@ import { createSwitchNavigator, createAppContainer } from 'react-navigation'; import { withTheme } from 'styled-components'; import OboardingIntro from '~/components/screens/oboarding-intro/OnboardingIntro'; +import StarterScreen from '~/components/screens/StaterScreen'; import Login from '~/components/screens/login/Login'; import CONSTANTS from '../utils/CONSTANTS'; import MainStack from './mainStack'; -export const ROUTE_NAMES = { - ONBOARDING_INTRO: 'ONBOARDING_INTRO', -}; - const InitialStack = createSwitchNavigator( { - [ROUTE_NAMES.ONBOARDING_INTRO]: { + [CONSTANTS.ROUTES.STARTER_SCREEN]: { + screen: StarterScreen, + }, + + [CONSTANTS.ROUTES.ONBOARDING_INTRO]: { screen: OboardingIntro, }, @@ -27,7 +28,7 @@ const InitialStack = createSwitchNavigator( }, }, { - initialRouteName: ROUTE_NAMES.ONBOARDING_INTRO, + initialRouteName: CONSTANTS.ROUTES.STARTER_SCREEN, }, ); diff --git a/src/utils/CONSTANTS.js b/src/utils/CONSTANTS.js index 6a46d05..b072239 100644 --- a/src/utils/CONSTANTS.js +++ b/src/utils/CONSTANTS.js @@ -1,6 +1,8 @@ const ROUTES = { + ONBOARDING_INTRO: 'ONBOARDING_INTRO', MAIN_STACK: 'MAIN_STACK', LOGIN: 'LOGIN', + STARTER_SCREEN: 'STARTER_SCREEN', SUBJECT_DETAIL: 'SUBJECT_DETAIL', PODCAST_DETAIL: 'PODCAST_DETAIL', AUTHOR_DETAIL: 'AUTHOR_DETAIL', diff --git a/yarn.lock b/yarn.lock index 8b237f6..7f61fa9 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5017,6 +5017,11 @@ react-native-side-menu@^1.1.3: dependencies: prop-types "^15.5.10" +react-native-splash-screen@^3.2.0: + version "3.2.0" + resolved "https://registry.yarnpkg.com/react-native-splash-screen/-/react-native-splash-screen-3.2.0.tgz#d47ec8557b1ba988ee3ea98d01463081b60fff45" + integrity sha512-Ls9qiNZzW/OLFoI25wfjjAcrf2DZ975hn2vr6U9gyuxi2nooVbzQeFoQS5vQcbCt9QX5NY8ASEEAtlLdIa6KVg== + react-native-swipeout@^2.3.6: version "2.3.6" resolved "https://registry.yarnpkg.com/react-native-swipeout/-/react-native-swipeout-2.3.6.tgz#47dac8a835825cf3f2eef9e495574a3d9ab6d3fa"