diff --git a/.flowconfig b/.flowconfig index c693a48..b38ea97 100644 --- a/.flowconfig +++ b/.flowconfig @@ -22,8 +22,6 @@ node_modules/react-native/flow flow/ [options] -emoji=true - module.system=haste experimental.strict_type_args=true @@ -36,11 +34,11 @@ suppress_type=$FlowIssue suppress_type=$FlowFixMe suppress_type=$FixMe -suppress_comment=\\(.\\|\n\\)*\\$FlowFixMe\\($\\|[^(]\\|(\\(>=0\\.\\(3[0-8]\\|[1-2][0-9]\\|[0-9]\\).[0-9]\\)? *\\(site=[a-z,_]*react_native[a-z,_]*\\)?)\\) -suppress_comment=\\(.\\|\n\\)*\\$FlowIssue\\((\\(>=0\\.\\(3[0-8]\\|1[0-9]\\|[1-2][0-9]\\).[0-9]\\)? *\\(site=[a-z,_]*react_native[a-z,_]*\\)?)\\)?:? #[0-9]+ +suppress_comment=\\(.\\|\n\\)*\\$FlowFixMe\\($\\|[^(]\\|(\\(>=0\\.\\(3[0-7]\\|[1-2][0-9]\\|[0-9]\\).[0-9]\\)? *\\(site=[a-z,_]*react_native[a-z,_]*\\)?)\\) +suppress_comment=\\(.\\|\n\\)*\\$FlowIssue\\((\\(>=0\\.\\(3[0-7]\\|1[0-9]\\|[1-2][0-9]\\).[0-9]\\)? *\\(site=[a-z,_]*react_native[a-z,_]*\\)?)\\)?:? #[0-9]+ suppress_comment=\\(.\\|\n\\)*\\$FlowFixedInNextDeploy unsafe.enable_getters_and_setters=true [version] -^0.38.0 +^0.37.0 diff --git a/.gitignore b/.gitignore index 10be197..8fce639 100644 --- a/.gitignore +++ b/.gitignore @@ -39,6 +39,7 @@ yarn-error.log # BUCK buck-out/ \.buckd/ +android/app/libs *.keystore # fastlane diff --git a/android/app/build.gradle b/android/app/build.gradle index 0e148bd..273ebda 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -1,5 +1,4 @@ apply plugin: "com.android.application" -apply from: "../../node_modules/react-native-vector-icons/fonts.gradle" import com.android.build.OutputFile @@ -127,6 +126,7 @@ android { } dependencies { + compile project(':react-native-vector-icons') compile fileTree(dir: "libs", include: ["*.jar"]) compile "com.android.support:appcompat-v7:23.0.1" compile "com.facebook.react:react-native:+" // From node_modules diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml index 9d35a7b..6598951 100644 --- a/android/app/src/main/AndroidManifest.xml +++ b/android/app/src/main/AndroidManifest.xml @@ -19,8 +19,7 @@ + android:configChanges="keyboard|keyboardHidden|orientation|screenSize"> diff --git a/android/app/src/main/assets/fonts/Entypo.ttf b/android/app/src/main/assets/fonts/Entypo.ttf new file mode 100644 index 0000000..1c8f5e9 Binary files /dev/null and b/android/app/src/main/assets/fonts/Entypo.ttf differ diff --git a/android/app/src/main/assets/fonts/EvilIcons.ttf b/android/app/src/main/assets/fonts/EvilIcons.ttf new file mode 100644 index 0000000..b270f98 Binary files /dev/null and b/android/app/src/main/assets/fonts/EvilIcons.ttf differ diff --git a/android/app/src/main/assets/fonts/FontAwesome.ttf b/android/app/src/main/assets/fonts/FontAwesome.ttf new file mode 100644 index 0000000..35acda2 Binary files /dev/null and b/android/app/src/main/assets/fonts/FontAwesome.ttf differ diff --git a/android/app/src/main/assets/fonts/Foundation.ttf b/android/app/src/main/assets/fonts/Foundation.ttf new file mode 100644 index 0000000..6cce217 Binary files /dev/null and b/android/app/src/main/assets/fonts/Foundation.ttf differ diff --git a/android/app/src/main/assets/fonts/Ionicons.ttf b/android/app/src/main/assets/fonts/Ionicons.ttf new file mode 100644 index 0000000..307ad88 Binary files /dev/null and b/android/app/src/main/assets/fonts/Ionicons.ttf differ diff --git a/android/app/src/main/assets/fonts/MaterialCommunityIcons.ttf b/android/app/src/main/assets/fonts/MaterialCommunityIcons.ttf new file mode 100644 index 0000000..fb79695 Binary files /dev/null and b/android/app/src/main/assets/fonts/MaterialCommunityIcons.ttf differ diff --git a/android/app/src/main/assets/fonts/MaterialIcons.ttf b/android/app/src/main/assets/fonts/MaterialIcons.ttf new file mode 100644 index 0000000..7015564 Binary files /dev/null and b/android/app/src/main/assets/fonts/MaterialIcons.ttf differ diff --git a/android/app/src/main/assets/fonts/Octicons.ttf b/android/app/src/main/assets/fonts/Octicons.ttf new file mode 100644 index 0000000..5b1f7d6 Binary files /dev/null and b/android/app/src/main/assets/fonts/Octicons.ttf differ diff --git a/android/app/src/main/assets/fonts/SimpleLineIcons.ttf b/android/app/src/main/assets/fonts/SimpleLineIcons.ttf new file mode 100644 index 0000000..6ecb686 Binary files /dev/null and b/android/app/src/main/assets/fonts/SimpleLineIcons.ttf differ diff --git a/android/app/src/main/assets/fonts/Zocial.ttf b/android/app/src/main/assets/fonts/Zocial.ttf new file mode 100644 index 0000000..e4ae46c Binary files /dev/null and b/android/app/src/main/assets/fonts/Zocial.ttf differ diff --git a/android/app/src/main/java/com/upstart/MainApplication.java b/android/app/src/main/java/com/upstart/MainApplication.java index 5122588..27d052f 100644 --- a/android/app/src/main/java/com/upstart/MainApplication.java +++ b/android/app/src/main/java/com/upstart/MainApplication.java @@ -1,8 +1,11 @@ package com.upstart; import android.app.Application; +import android.util.Log; import com.facebook.react.ReactApplication; +import com.oblador.vectoricons.VectorIconsPackage; +import com.facebook.react.ReactInstanceManager; import com.facebook.react.ReactNativeHost; import com.facebook.react.ReactPackage; import com.facebook.react.shell.MainReactPackage; @@ -22,7 +25,8 @@ public boolean getUseDeveloperSupport() { @Override protected List getPackages() { return Arrays.asList( - new MainReactPackage() + new MainReactPackage(), + new VectorIconsPackage() ); } }; diff --git a/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png new file mode 100644 index 0000000..19f8f95 Binary files /dev/null and b/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png differ diff --git a/android/build.gradle b/android/build.gradle index eed9972..fcba4c5 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -5,7 +5,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:2.2.3' + classpath 'com.android.tools.build:gradle:1.3.1' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files diff --git a/android/gradle/wrapper/gradle-wrapper.properties b/android/gradle/wrapper/gradle-wrapper.properties index dbdc05d..b9fbfab 100644 --- a/android/gradle/wrapper/gradle-wrapper.properties +++ b/android/gradle/wrapper/gradle-wrapper.properties @@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-2.4-all.zip diff --git a/android/gradlew.bat b/android/gradlew.bat index 8a0b282..aec9973 100644 --- a/android/gradlew.bat +++ b/android/gradlew.bat @@ -1,90 +1,90 @@ -@if "%DEBUG%" == "" @echo off -@rem ########################################################################## -@rem -@rem Gradle startup script for Windows -@rem -@rem ########################################################################## - -@rem Set local scope for the variables with windows NT shell -if "%OS%"=="Windows_NT" setlocal - -@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -set DEFAULT_JVM_OPTS= - -set DIRNAME=%~dp0 -if "%DIRNAME%" == "" set DIRNAME=. -set APP_BASE_NAME=%~n0 -set APP_HOME=%DIRNAME% - -@rem Find java.exe -if defined JAVA_HOME goto findJavaFromJavaHome - -set JAVA_EXE=java.exe -%JAVA_EXE% -version >NUL 2>&1 -if "%ERRORLEVEL%" == "0" goto init - -echo. -echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. - -goto fail - -:findJavaFromJavaHome -set JAVA_HOME=%JAVA_HOME:"=% -set JAVA_EXE=%JAVA_HOME%/bin/java.exe - -if exist "%JAVA_EXE%" goto init - -echo. -echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. - -goto fail - -:init -@rem Get command-line arguments, handling Windowz variants - -if not "%OS%" == "Windows_NT" goto win9xME_args -if "%@eval[2+2]" == "4" goto 4NT_args - -:win9xME_args -@rem Slurp the command line arguments. -set CMD_LINE_ARGS= -set _SKIP=2 - -:win9xME_args_slurp -if "x%~1" == "x" goto execute - -set CMD_LINE_ARGS=%* -goto execute - -:4NT_args -@rem Get arguments from the 4NT Shell from JP Software -set CMD_LINE_ARGS=%$ - -:execute -@rem Setup the command line - -set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar - -@rem Execute Gradle -"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS% - -:end -@rem End local scope for the variables with windows NT shell -if "%ERRORLEVEL%"=="0" goto mainEnd - -:fail -rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of -rem the _cmd.exe /c_ return code! -if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 -exit /b 1 - -:mainEnd -if "%OS%"=="Windows_NT" endlocal - -:omega +@if "%DEBUG%" == "" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS= + +set DIRNAME=%~dp0 +if "%DIRNAME%" == "" set DIRNAME=. +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if "%ERRORLEVEL%" == "0" goto init + +echo. +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto init + +echo. +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:init +@rem Get command-line arguments, handling Windowz variants + +if not "%OS%" == "Windows_NT" goto win9xME_args +if "%@eval[2+2]" == "4" goto 4NT_args + +:win9xME_args +@rem Slurp the command line arguments. +set CMD_LINE_ARGS= +set _SKIP=2 + +:win9xME_args_slurp +if "x%~1" == "x" goto execute + +set CMD_LINE_ARGS=%* +goto execute + +:4NT_args +@rem Get arguments from the 4NT Shell from JP Software +set CMD_LINE_ARGS=%$ + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS% + +:end +@rem End local scope for the variables with windows NT shell +if "%ERRORLEVEL%"=="0" goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 +exit /b 1 + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/android/settings.gradle b/android/settings.gradle index 0bfb537..b138c09 100644 --- a/android/settings.gradle +++ b/android/settings.gradle @@ -1,3 +1,5 @@ rootProject.name = 'Upstart' +include ':react-native-vector-icons' +project(':react-native-vector-icons').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-vector-icons/android') include ':app' diff --git a/app.json b/app.json new file mode 100644 index 0000000..b8217d1 --- /dev/null +++ b/app.json @@ -0,0 +1,4 @@ +{ + "name": "Upstart", + "displayName": "Upstart" +} \ No newline at end of file diff --git a/index.ios.js b/index.ios.js index c835027..d089a5c 100644 --- a/index.ios.js +++ b/index.ios.js @@ -1,53 +1,6 @@ -/** - * Sample React Native App - * https://github.com/facebook/react-native - * @flow - */ - -import React, { Component } from 'react'; import { - AppRegistry, - StyleSheet, - Text, - View + AppRegistry } from 'react-native'; +import App from './src/app'; -export default class Upstart extends Component { - render() { - return ( - - - Welcome to React Native! - - - To get started, edit index.ios.js - - - Press Cmd+R to reload,{'\n'} - Cmd+D or shake for dev menu - - - ); - } -} - -const styles = StyleSheet.create({ - container: { - flex: 1, - justifyContent: 'center', - alignItems: 'center', - backgroundColor: '#F5FCFF', - }, - welcome: { - fontSize: 20, - textAlign: 'center', - margin: 10, - }, - instructions: { - textAlign: 'center', - color: '#333333', - marginBottom: 5, - }, -}); - -AppRegistry.registerComponent('Upstart', () => Upstart); +AppRegistry.registerComponent('Upstart', () => App); diff --git a/ios/Upstart.xcodeproj/project.pbxproj b/ios/Upstart.xcodeproj/project.pbxproj index 1ba8ec6..842318e 100644 --- a/ios/Upstart.xcodeproj/project.pbxproj +++ b/ios/Upstart.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 */; }; @@ -36,6 +35,17 @@ 2DCD954D1E0B4F2C00145EB5 /* UpstartTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 00E356F21AD99517003FC87E /* UpstartTests.m */; }; 5E9157361DD0AC6A00FF2AA8 /* libRCTAnimation.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5E9157331DD0AC6500FF2AA8 /* libRCTAnimation.a */; }; 832341BD1AAA6AB300B99B32 /* libRCTText.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 832341B51AAA6A8300B99B32 /* libRCTText.a */; }; + 6EB94C43156A4536A476FF87 /* libRNVectorIcons.a in Frameworks */ = {isa = PBXBuildFile; fileRef = D0400F8D30E04FCDA2B39D1A /* libRNVectorIcons.a */; }; + 3547B43FDDD64182B34A9B2F /* Entypo.ttf in Resources */ = {isa = PBXBuildFile; fileRef = DBEB7C8601EC40BE81109709 /* Entypo.ttf */; }; + A03C4A9F2DC04724B8F57083 /* EvilIcons.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 95906887D85F433AB43581F1 /* EvilIcons.ttf */; }; + 056F0DD2EF40409B8EF99F1D /* FontAwesome.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 25FCE16695604C8788B59549 /* FontAwesome.ttf */; }; + 3C33A46649DF4F03A7840571 /* Foundation.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 496C55F496864370B4365C89 /* Foundation.ttf */; }; + 09362C3CA2424FF0BE90CA3A /* Ionicons.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 872258A4E7D542EFB636F909 /* Ionicons.ttf */; }; + CA9646435F4A4E7FA2132638 /* MaterialCommunityIcons.ttf in Resources */ = {isa = PBXBuildFile; fileRef = C3F15B23E3AF41199A9A9D8F /* MaterialCommunityIcons.ttf */; }; + B5A51C7D1E814922BA172761 /* MaterialIcons.ttf in Resources */ = {isa = PBXBuildFile; fileRef = C68856617F514F7A80EAB1B9 /* MaterialIcons.ttf */; }; + 3AB945472E744D5D843D17B7 /* Octicons.ttf in Resources */ = {isa = PBXBuildFile; fileRef = BB473659583846439A6BCD59 /* Octicons.ttf */; }; + DA8D3A025E0945A7B3FE1597 /* SimpleLineIcons.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 17833194A2B54F09BA6C901E /* SimpleLineIcons.ttf */; }; + 451EC67D8524469292F072F2 /* Zocial.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 827477D69A364A829169A662 /* Zocial.ttf */; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ @@ -255,6 +265,18 @@ 5E91572D1DD0AC6500FF2AA8 /* RCTAnimation.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTAnimation.xcodeproj; path = "../node_modules/react-native/Libraries/NativeAnimation/RCTAnimation.xcodeproj"; sourceTree = ""; }; 78C398B01ACF4ADC00677621 /* RCTLinking.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTLinking.xcodeproj; path = "../node_modules/react-native/Libraries/LinkingIOS/RCTLinking.xcodeproj"; sourceTree = ""; }; 832341B01AAA6A8300B99B32 /* RCTText.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTText.xcodeproj; path = "../node_modules/react-native/Libraries/Text/RCTText.xcodeproj"; sourceTree = ""; }; + ECDEC7C518A845A69441D04D /* RNVectorIcons.xcodeproj */ = {isa = PBXFileReference; name = "RNVectorIcons.xcodeproj"; path = "../node_modules/react-native-vector-icons/RNVectorIcons.xcodeproj"; sourceTree = ""; fileEncoding = undefined; lastKnownFileType = wrapper.pb-project; explicitFileType = undefined; includeInIndex = 0; }; + D0400F8D30E04FCDA2B39D1A /* libRNVectorIcons.a */ = {isa = PBXFileReference; name = "libRNVectorIcons.a"; path = "libRNVectorIcons.a"; sourceTree = ""; fileEncoding = undefined; lastKnownFileType = archive.ar; explicitFileType = undefined; includeInIndex = 0; }; + DBEB7C8601EC40BE81109709 /* Entypo.ttf */ = {isa = PBXFileReference; name = "Entypo.ttf"; path = "../node_modules/react-native-vector-icons/Fonts/Entypo.ttf"; sourceTree = ""; fileEncoding = undefined; lastKnownFileType = unknown; explicitFileType = undefined; includeInIndex = 0; }; + 95906887D85F433AB43581F1 /* EvilIcons.ttf */ = {isa = PBXFileReference; name = "EvilIcons.ttf"; path = "../node_modules/react-native-vector-icons/Fonts/EvilIcons.ttf"; sourceTree = ""; fileEncoding = undefined; lastKnownFileType = unknown; explicitFileType = undefined; includeInIndex = 0; }; + 25FCE16695604C8788B59549 /* FontAwesome.ttf */ = {isa = PBXFileReference; name = "FontAwesome.ttf"; path = "../node_modules/react-native-vector-icons/Fonts/FontAwesome.ttf"; sourceTree = ""; fileEncoding = undefined; lastKnownFileType = unknown; explicitFileType = undefined; includeInIndex = 0; }; + 496C55F496864370B4365C89 /* Foundation.ttf */ = {isa = PBXFileReference; name = "Foundation.ttf"; path = "../node_modules/react-native-vector-icons/Fonts/Foundation.ttf"; sourceTree = ""; fileEncoding = undefined; lastKnownFileType = unknown; explicitFileType = undefined; includeInIndex = 0; }; + 872258A4E7D542EFB636F909 /* Ionicons.ttf */ = {isa = PBXFileReference; name = "Ionicons.ttf"; path = "../node_modules/react-native-vector-icons/Fonts/Ionicons.ttf"; sourceTree = ""; fileEncoding = undefined; lastKnownFileType = unknown; explicitFileType = undefined; includeInIndex = 0; }; + C3F15B23E3AF41199A9A9D8F /* MaterialCommunityIcons.ttf */ = {isa = PBXFileReference; name = "MaterialCommunityIcons.ttf"; path = "../node_modules/react-native-vector-icons/Fonts/MaterialCommunityIcons.ttf"; sourceTree = ""; fileEncoding = undefined; lastKnownFileType = unknown; explicitFileType = undefined; includeInIndex = 0; }; + C68856617F514F7A80EAB1B9 /* MaterialIcons.ttf */ = {isa = PBXFileReference; name = "MaterialIcons.ttf"; path = "../node_modules/react-native-vector-icons/Fonts/MaterialIcons.ttf"; sourceTree = ""; fileEncoding = undefined; lastKnownFileType = unknown; explicitFileType = undefined; includeInIndex = 0; }; + BB473659583846439A6BCD59 /* Octicons.ttf */ = {isa = PBXFileReference; name = "Octicons.ttf"; path = "../node_modules/react-native-vector-icons/Fonts/Octicons.ttf"; sourceTree = ""; fileEncoding = undefined; lastKnownFileType = unknown; explicitFileType = undefined; includeInIndex = 0; }; + 17833194A2B54F09BA6C901E /* SimpleLineIcons.ttf */ = {isa = PBXFileReference; name = "SimpleLineIcons.ttf"; path = "../node_modules/react-native-vector-icons/Fonts/SimpleLineIcons.ttf"; sourceTree = ""; fileEncoding = undefined; lastKnownFileType = unknown; explicitFileType = undefined; includeInIndex = 0; }; + 827477D69A364A829169A662 /* Zocial.ttf */ = {isa = PBXFileReference; name = "Zocial.ttf"; path = "../node_modules/react-native-vector-icons/Fonts/Zocial.ttf"; sourceTree = ""; fileEncoding = undefined; lastKnownFileType = unknown; explicitFileType = undefined; includeInIndex = 0; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -281,6 +303,7 @@ 832341BD1AAA6AB300B99B32 /* libRCTText.a in Frameworks */, 00C302EA1ABCBA2D00DB3ED1 /* libRCTVibration.a in Frameworks */, 139FDEF61B0652A700C62182 /* libRCTWebSocket.a in Frameworks */, + 6EB94C43156A4536A476FF87 /* libRNVectorIcons.a in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -447,6 +470,7 @@ 832341B01AAA6A8300B99B32 /* RCTText.xcodeproj */, 00C302DF1ABCB9EE00DB3ED1 /* RCTVibration.xcodeproj */, 139FDEE61B06529A00C62182 /* RCTWebSocket.xcodeproj */, + ECDEC7C518A845A69441D04D /* RNVectorIcons.xcodeproj */, ); name = Libraries; sourceTree = ""; @@ -467,6 +491,7 @@ 832341AE1AAA6A7D00B99B32 /* Libraries */, 00E356EF1AD99517003FC87E /* UpstartTests */, 83CBBA001A601CBA00E9B192 /* Products */, + F5EB2E1D37DD4FA78ACA94F3 /* Resources */, ); indentWidth = 2; sourceTree = ""; @@ -483,6 +508,24 @@ name = Products; sourceTree = ""; }; + F5EB2E1D37DD4FA78ACA94F3 /* Resources */ = { + isa = PBXGroup; + children = ( + DBEB7C8601EC40BE81109709 /* Entypo.ttf */, + 95906887D85F433AB43581F1 /* EvilIcons.ttf */, + 25FCE16695604C8788B59549 /* FontAwesome.ttf */, + 496C55F496864370B4365C89 /* Foundation.ttf */, + 872258A4E7D542EFB636F909 /* Ionicons.ttf */, + C3F15B23E3AF41199A9A9D8F /* MaterialCommunityIcons.ttf */, + C68856617F514F7A80EAB1B9 /* MaterialIcons.ttf */, + BB473659583846439A6BCD59 /* Octicons.ttf */, + 17833194A2B54F09BA6C901E /* SimpleLineIcons.ttf */, + 827477D69A364A829169A662 /* Zocial.ttf */, + ); + name = Resources; + path = ""; + sourceTree = ""; + }; /* End PBXGroup section */ /* Begin PBXNativeTarget section */ @@ -564,7 +607,7 @@ 83CBB9F71A601CBA00E9B192 /* Project object */ = { isa = PBXProject; attributes = { - LastUpgradeCheck = 0610; + LastUpgradeCheck = 610; ORGANIZATIONNAME = Facebook; TargetAttributes = { 00E356ED1AD99517003FC87E = { @@ -841,6 +884,16 @@ files = ( 13B07FBF1A68108700A75B9A /* Images.xcassets in Resources */, 13B07FBD1A68108700A75B9A /* LaunchScreen.xib in Resources */, + 3547B43FDDD64182B34A9B2F /* Entypo.ttf in Resources */, + A03C4A9F2DC04724B8F57083 /* EvilIcons.ttf in Resources */, + 056F0DD2EF40409B8EF99F1D /* FontAwesome.ttf in Resources */, + 3C33A46649DF4F03A7840571 /* Foundation.ttf in Resources */, + 09362C3CA2424FF0BE90CA3A /* Ionicons.ttf in Resources */, + CA9646435F4A4E7FA2132638 /* MaterialCommunityIcons.ttf in Resources */, + B5A51C7D1E814922BA172761 /* MaterialIcons.ttf in Resources */, + 3AB945472E744D5D843D17B7 /* Octicons.ttf in Resources */, + DA8D3A025E0945A7B3FE1597 /* SimpleLineIcons.ttf in Resources */, + 451EC67D8524469292F072F2 /* Zocial.ttf in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -972,6 +1025,10 @@ ); PRODUCT_NAME = "$(TARGET_NAME)"; TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Upstart.app/Upstart"; + LIBRARY_SEARCH_PATHS = ( + "$(inherited)", + "\"$(SRCROOT)/$(TARGET_NAME)\"", + ); }; name = Debug; }; @@ -989,6 +1046,10 @@ ); PRODUCT_NAME = "$(TARGET_NAME)"; TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Upstart.app/Upstart"; + LIBRARY_SEARCH_PATHS = ( + "$(inherited)", + "\"$(SRCROOT)/$(TARGET_NAME)\"", + ); }; name = Release; }; @@ -1050,6 +1111,10 @@ SDKROOT = appletvos; TARGETED_DEVICE_FAMILY = 3; TVOS_DEPLOYMENT_TARGET = 9.2; + LIBRARY_SEARCH_PATHS = ( + "$(inherited)", + "\"$(SRCROOT)/$(TARGET_NAME)\"", + ); }; name = Debug; }; @@ -1076,6 +1141,10 @@ SDKROOT = appletvos; TARGETED_DEVICE_FAMILY = 3; TVOS_DEPLOYMENT_TARGET = 9.2; + LIBRARY_SEARCH_PATHS = ( + "$(inherited)", + "\"$(SRCROOT)/$(TARGET_NAME)\"", + ); }; name = Release; }; @@ -1097,6 +1166,10 @@ SDKROOT = appletvos; TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Upstart-tvOS.app/Upstart-tvOS"; TVOS_DEPLOYMENT_TARGET = 10.1; + LIBRARY_SEARCH_PATHS = ( + "$(inherited)", + "\"$(SRCROOT)/$(TARGET_NAME)\"", + ); }; name = Debug; }; @@ -1118,6 +1191,10 @@ SDKROOT = appletvos; TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Upstart-tvOS.app/Upstart-tvOS"; TVOS_DEPLOYMENT_TARGET = 10.1; + LIBRARY_SEARCH_PATHS = ( + "$(inherited)", + "\"$(SRCROOT)/$(TARGET_NAME)\"", + ); }; name = Release; }; diff --git a/ios/Upstart/Info.plist b/ios/Upstart/Info.plist index 2fb6a11..97c9b05 100644 --- a/ios/Upstart/Info.plist +++ b/ios/Upstart/Info.plist @@ -1,54 +1,68 @@ - - CFBundleDevelopmentRegion - en - CFBundleExecutable - $(EXECUTABLE_NAME) - CFBundleIdentifier - org.reactjs.native.example.$(PRODUCT_NAME:rfc1034identifier) - CFBundleInfoDictionaryVersion - 6.0 - CFBundleName - $(PRODUCT_NAME) - CFBundlePackageType - APPL - CFBundleShortVersionString - 1.0 - CFBundleSignature - ???? - CFBundleVersion - 1 - LSRequiresIPhoneOS - - UILaunchStoryboardName - LaunchScreen - UIRequiredDeviceCapabilities - - armv7 - - UISupportedInterfaceOrientations - - UIInterfaceOrientationPortrait - UIInterfaceOrientationLandscapeLeft - UIInterfaceOrientationLandscapeRight - - UIViewControllerBasedStatusBarAppearance - - NSLocationWhenInUseUsageDescription - - NSAppTransportSecurity - - - NSExceptionDomains - - localhost - - NSExceptionAllowsInsecureHTTPLoads - - - - - - + + CFBundleDevelopmentRegion + en + CFBundleDisplayName + Upstart + CFBundleExecutable + $(EXECUTABLE_NAME) + CFBundleIdentifier + org.reactjs.native.example.$(PRODUCT_NAME:rfc1034identifier) + CFBundleInfoDictionaryVersion + 6.0 + CFBundleName + $(PRODUCT_NAME) + CFBundlePackageType + APPL + CFBundleShortVersionString + 1.0 + CFBundleSignature + ???? + CFBundleVersion + 1 + LSRequiresIPhoneOS + + UILaunchStoryboardName + LaunchScreen + UIRequiredDeviceCapabilities + + armv7 + + UISupportedInterfaceOrientations + + UIInterfaceOrientationPortrait + UIInterfaceOrientationLandscapeLeft + UIInterfaceOrientationLandscapeRight + + UIViewControllerBasedStatusBarAppearance + + NSLocationWhenInUseUsageDescription + + NSAppTransportSecurity + + NSExceptionDomains + + localhost + + NSExceptionAllowsInsecureHTTPLoads + + + + + UIAppFonts + + Entypo.ttf + EvilIcons.ttf + FontAwesome.ttf + Foundation.ttf + Ionicons.ttf + MaterialCommunityIcons.ttf + MaterialIcons.ttf + Octicons.ttf + SimpleLineIcons.ttf + Zocial.ttf + + + \ No newline at end of file diff --git a/package.json b/package.json index fee032e..4277190 100644 --- a/package.json +++ b/package.json @@ -1,47 +1,51 @@ { - "name": "Upstart", - "version": "0.0.1", - "private": true, - "scripts": { - "start": "node node_modules/react-native/local-cli/cli.js start", - "test": "jest" - }, - "dependencies": { - "firebase": "^3.6.9", - "react": "~15.4.1", - "react-native": "0.42.0", - "react-native-animatable": "^1.1.0", - "react-native-camera-roll-picker": "^1.1.9", - "react-native-code-push": "1.17.0-beta", - "react-native-elements": "^0.9.7", - "react-native-fetch-blob": "0.10.2-beta.8", - "react-native-gifted-chat": "0.1.1", - "react-native-google-analytics-bridge": "^5.0.0", - "react-native-image-picker": "^0.25.1", - "react-native-keyboard-aware-scroll-view": "^0.2.6", - "react-native-lightbox": "^0.6.0", - "react-native-loading-spinner-overlay": "^0.4.1", - "react-native-material-kit": "^0.4.1", - "react-native-mobx": "^0.3.1", - "react-native-modal-picker": "^0.0.16", - "react-native-onesignal": "^3.0.0", - "react-native-router-flux": "^3.37.0", - "react-native-scrollable-tab-view": "^0.7.2", - "react-native-share": "1.0.19", - "react-native-vector-icons": "^4.0.0", - "react-redux": "^5.0.2", - "redux": "^3.6.0", - "redux-thunk": "^2.2.0" - }, - "devDependencies": { - "babel-jest": "19.0.0", - "babel-preset-es2015": "^6.18.0", - "babel-preset-react-native": "1.9.1", - "eslint-config-rallycoding": "^3.1.0", - "jest": "19.0.2", - "react-test-renderer": "~15.4.1" - }, - "jest": { - "preset": "react-native" - } + "name": "Upstart", + "version": "0.0.1", + "private": true, + "scripts": { + "start": "node node_modules/react-native/local-cli/cli.js start", + "test": "jest" + }, + "dependencies": { + "firebase": "^3.6.9", + "moment": "^2.14.1", + "react": "~15.4.0", + "react-dom": "~15.4.0", + "react-native": "0.41.2", + "react-native-config": "0.0.7", + "react-native-elements": "^0.9.7", + "react-native-image-picker": "^0.21.2", + "react-native-invertible-scroll-view": "^1.0.0", + "react-native-keyboard-aware-scroll-view": "^0.1.2", + "react-native-keyboard-spacer": "^0.3.0", + "react-native-loading-spinner-overlay": "^0.4.1", + "react-native-material-kit": "^0.4.1", + "react-native-mobx": "^0.3.1", + "react-native-modal-picker": "^0.0.16", + "react-native-navbar": "^1.5.0", + "react-native-onesignal": "^3.0.0", + "react-native-picker": "^3.0.5", + "react-native-progress-bar": "^0.1.2", + "react-native-router-flux": "^3.38.1", + "react-native-scrollable-tab-view": "^0.7.2", + "react-native-selectme": "^1.2.0", + "react-native-share": "^1.0.19", + "react-native-tab-navigator": "^0.3.3", + "react-native-vector-icons": "^4.0.0", + "react-redux": "^5.0.2", + "react-static-container": "^1.0.1", + "redux": "^3.6.0", + "redux-thunk": "^2.2.0", + "underscore": "^1.8.3" + }, + "devDependencies": { + "babel-jest": "^19.0.0", + "babel-preset-react-native": "^1.9.1", + "jest": "^19.0.2", + "eslint-config-rallycoding": "^3.1.0", + "react-test-renderer": "~15.4.0" + }, + "jest": { + "preset": "react-native" + } } diff --git a/src/Router.js b/src/Router.js index 4a3879e..2e0b9ff 100644 --- a/src/Router.js +++ b/src/Router.js @@ -1,10 +1,10 @@ import React from 'react'; -import { Scene, Router, Actions } from 'react-native-router-flux'; -import LoginForm from './components/LoginForm'; -import Overview from './components/overview'; -import PoolList from './components/PoolList'; -import SignUp from './components/signupfrom'; -import Sliders from './components/DepositPage'; +import { Scene, Router } from 'react-native-router-flux'; +import LoginForm from './User/LoginForm'; +import PoolList from './Views/PoolList'; +import SignUp from './User/signupfrom'; +import Sliders from './Views/DepositPage'; +import MainPage from './main'; const RouterComponent = () => { return ( @@ -14,9 +14,9 @@ const RouterComponent = () => { - - - + + + ); diff --git a/src/components/LoginForm.js b/src/User/LoginForm.js similarity index 81% rename from src/components/LoginForm.js rename to src/User/LoginForm.js index 2dc9ae8..ac0ac70 100644 --- a/src/components/LoginForm.js +++ b/src/User/LoginForm.js @@ -5,7 +5,7 @@ import { connect } from 'react-redux'; import { Actions } from 'react-native-router-flux'; import { Button } from 'react-native-elements'; import { emailChanged, passwordChanged, loginUser } from '../actions'; -import { Card, CardSection, Input, Spinner } from './common'; +import { Card, CardSection, Input, Spinner } from '../components/common'; class LoginForm extends Component { onEmailChange(text) { @@ -25,12 +25,13 @@ import { Card, CardSection, Input, Spinner } from './common'; if (this.props.loading) { return ; } - return (