diff --git a/App/Components/Button.js b/App/Components/Button.js index e7ffb943..acd18da9 100644 --- a/App/Components/Button.js +++ b/App/Components/Button.js @@ -160,8 +160,7 @@ const styles = StyleSheet.create({ borderRadius: 1.5 * PixelRatio.get(), borderWidth: 1 / PixelRatio.get(), borderColor: 'transparent', - flex: 1, - flexDirection: 'row', + alignItems: 'center', }, diff --git a/App/Components/SegmentedControl.js b/App/Components/SegmentedControl.js index 9249ee97..72c08202 100644 --- a/App/Components/SegmentedControl.js +++ b/App/Components/SegmentedControl.js @@ -83,7 +83,6 @@ var styles = StyleSheet.create({ padding: 10 }, control: { - flex: 1, flexDirection: 'row', borderColor: 'white', borderWidth: 1, @@ -95,7 +94,6 @@ var styles = StyleSheet.create({ button: { padding: 5, margin: 1, - flex: 1, justifyContent: 'center', alignItems: 'center', }, diff --git a/ios/Sample.xcodeproj/project.pbxproj b/ios/Sample.xcodeproj/project.pbxproj index 1093b62e..7320d892 100644 --- a/ios/Sample.xcodeproj/project.pbxproj +++ b/ios/Sample.xcodeproj/project.pbxproj @@ -8,24 +8,25 @@ /* Begin PBXBuildFile section */ 008F07F31AC5B25A0029DE68 /* main.jsbundle in Resources */ = {isa = PBXBuildFile; fileRef = 008F07F21AC5B25A0029DE68 /* main.jsbundle */; }; - 00C302E51ABCBA2D00DB3ED1 /* ReferenceProxy in Frameworks */ = {isa = PBXBuildFile; fileRef = 00C302AC1ABCB8CE00DB3ED1 /* libRCTActionSheet.a */; }; - 00C302E71ABCBA2D00DB3ED1 /* ReferenceProxy in Frameworks */ = {isa = PBXBuildFile; fileRef = 00C302BA1ABCB90400DB3ED1 /* libRCTGeolocation.a */; }; - 00C302E81ABCBA2D00DB3ED1 /* ReferenceProxy in Frameworks */ = {isa = PBXBuildFile; fileRef = 00C302C01ABCB91800DB3ED1 /* libRCTImage.a */; }; - 00C302E91ABCBA2D00DB3ED1 /* ReferenceProxy in Frameworks */ = {isa = PBXBuildFile; fileRef = 00C302DC1ABCB9D200DB3ED1 /* libRCTNetwork.a */; }; - 00C302EA1ABCBA2D00DB3ED1 /* ReferenceProxy in Frameworks */ = {isa = PBXBuildFile; fileRef = 00C302E41ABCB9EE00DB3ED1 /* libRCTVibration.a */; }; - 133E29F31AD74F7200F7D852 /* ReferenceProxy in Frameworks */ = {isa = PBXBuildFile; fileRef = 78C398B91ACF4ADC00677621 /* libRCTLinking.a */; }; - 139105C61AF99C1200B5F7CC /* ReferenceProxy in Frameworks */ = {isa = PBXBuildFile; fileRef = 139105C11AF99BAD00B5F7CC /* libRCTSettings.a */; }; - 139FDEF61B0652A700C62182 /* ReferenceProxy in Frameworks */ = {isa = PBXBuildFile; fileRef = 139FDEF41B06529B00C62182 /* libRCTWebSocket.a */; }; + 00C302E51ABCBA2D00DB3ED1 /* libRCTActionSheet.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 00C302AC1ABCB8CE00DB3ED1 /* libRCTActionSheet.a */; }; + 00C302E71ABCBA2D00DB3ED1 /* libRCTGeolocation.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 00C302BA1ABCB90400DB3ED1 /* libRCTGeolocation.a */; }; + 00C302E81ABCBA2D00DB3ED1 /* libRCTImage.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 00C302C01ABCB91800DB3ED1 /* libRCTImage.a */; }; + 00C302E91ABCBA2D00DB3ED1 /* libRCTNetwork.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 00C302DC1ABCB9D200DB3ED1 /* libRCTNetwork.a */; }; + 00C302EA1ABCBA2D00DB3ED1 /* libRCTVibration.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 00C302E41ABCB9EE00DB3ED1 /* libRCTVibration.a */; }; + 133E29F31AD74F7200F7D852 /* libRCTLinking.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 78C398B91ACF4ADC00677621 /* libRCTLinking.a */; }; + 139105C61AF99C1200B5F7CC /* libRCTSettings.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 139105C11AF99BAD00B5F7CC /* libRCTSettings.a */; }; + 139FDEF61B0652A700C62182 /* libRCTWebSocket.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 139FDEF41B06529B00C62182 /* libRCTWebSocket.a */; }; 13B07FBC1A68108700A75B9A /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 13B07FB01A68108700A75B9A /* AppDelegate.m */; }; 13B07FBD1A68108700A75B9A /* LaunchScreen.xib in Resources */ = {isa = PBXBuildFile; fileRef = 13B07FB11A68108700A75B9A /* LaunchScreen.xib */; }; 13B07FBF1A68108700A75B9A /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 13B07FB51A68108700A75B9A /* Images.xcassets */; }; 13B07FC11A68108700A75B9A /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 13B07FB71A68108700A75B9A /* main.m */; }; - 146834051AC3E58100842450 /* ReferenceProxy in Frameworks */ = {isa = PBXBuildFile; fileRef = 146834041AC3E56700842450 /* libReact.a */; }; + 146834051AC3E58100842450 /* libReact.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 146834041AC3E56700842450 /* libReact.a */; }; 3D74A9A83D1AEF3D69F69B19 /* libPods-Sample.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3765187F1730E17E74E7CC6C /* libPods-Sample.a */; }; - 832341BD1AAA6AB300B99B32 /* ReferenceProxy in Frameworks */ = {isa = PBXBuildFile; fileRef = 832341B51AAA6A8300B99B32 /* libRCTText.a */; }; + 832341BD1AAA6AB300B99B32 /* libRCTText.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 832341B51AAA6A8300B99B32 /* libRCTText.a */; }; D36840121BEA726800A9B3F4 /* TestRunnerManager.m in Sources */ = {isa = PBXBuildFile; fileRef = D36840111BEA726800A9B3F4 /* TestRunnerManager.m */; }; - D374ADC51BA929C500453203 /* ReferenceProxy in Frameworks */ = {isa = PBXBuildFile; fileRef = D374ADC41BA929BA00453203 /* libRNKeychain.a */; }; + D374ADC51BA929C500453203 /* libRNKeychain.a in Frameworks */ = {isa = PBXBuildFile; fileRef = D374ADC41BA929BA00453203 /* libRNKeychain.a */; }; D374ADD31BA9336E00453203 /* EnvironmentManager.m in Sources */ = {isa = PBXBuildFile; fileRef = D374ADD21BA9336E00453203 /* EnvironmentManager.m */; }; + D3CEA0301DEF7B9000C1BF37 /* libRCTAnimation.a in Frameworks */ = {isa = PBXBuildFile; fileRef = D3CEA00E1DEF7B8600C1BF37 /* libRCTAnimation.a */; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ @@ -106,6 +107,69 @@ remoteGlobalIDString = 5D82366F1B0CE05B005A9EF3; remoteInfo = RNKeychain; }; + D3CEA00D1DEF7B8600C1BF37 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = D3CEA0071DEF7B8600C1BF37 /* RCTAnimation.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 134814201AA4EA6300B7C361; + remoteInfo = RCTAnimation; + }; + D3CEA00F1DEF7B8600C1BF37 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = D3CEA0071DEF7B8600C1BF37 /* RCTAnimation.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 2D2A28201D9B03D100D4039D; + remoteInfo = "RCTAnimation-tvOS"; + }; + D3CEA0141DEF7B8600C1BF37 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 00C302BB1ABCB91800DB3ED1 /* RCTImage.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 2D2A283A1D9B042B00D4039D; + remoteInfo = "RCTImage-tvOS"; + }; + D3CEA0181DEF7B8600C1BF37 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 78C398B01ACF4ADC00677621 /* RCTLinking.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 2D2A28471D9B043800D4039D; + remoteInfo = "RCTLinking-tvOS"; + }; + D3CEA01C1DEF7B8600C1BF37 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 00C302D31ABCB9D200DB3ED1 /* RCTNetwork.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 2D2A28541D9B044C00D4039D; + remoteInfo = "RCTNetwork-tvOS"; + }; + D3CEA0201DEF7B8600C1BF37 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 139105B61AF99BAD00B5F7CC /* RCTSettings.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 2D2A28611D9B046600D4039D; + remoteInfo = "RCTSettings-tvOS"; + }; + D3CEA0241DEF7B8600C1BF37 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 832341B01AAA6A8300B99B32 /* RCTText.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 2D2A287B1D9B048500D4039D; + remoteInfo = "RCTText-tvOS"; + }; + D3CEA0291DEF7B8600C1BF37 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 139FDEE61B06529A00C62182 /* RCTWebSocket.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 2D2A28881D9B049200D4039D; + remoteInfo = "RCTWebSocket-tvOS"; + }; + D3CEA02D1DEF7B8600C1BF37 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 146833FF1AC3E56700842450 /* React.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 2D2A28131D9B038B00D4039D; + remoteInfo = "React-tvOS"; + }; /* End PBXContainerItemProxy section */ /* Begin PBXFileReference section */ @@ -134,6 +198,7 @@ D36DCDA01BD4A92600B3EB2F /* Debug.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = Debug.xcconfig; sourceTree = ""; }; D374ADB51BA929B900453203 /* RNKeychain.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RNKeychain.xcodeproj; path = "../node_modules/react-native-keychain/RNKeychain.xcodeproj"; sourceTree = ""; }; D374ADD21BA9336E00453203 /* EnvironmentManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = EnvironmentManager.m; path = Sample/EnvironmentManager.m; sourceTree = ""; }; + D3CEA0071DEF7B8600C1BF37 /* RCTAnimation.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTAnimation.xcodeproj; path = "../node_modules/react-native/Libraries/NativeAnimation/RCTAnimation.xcodeproj"; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -141,17 +206,18 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - D374ADC51BA929C500453203 /* ReferenceProxy in Frameworks */, - 146834051AC3E58100842450 /* ReferenceProxy in Frameworks */, - 00C302E51ABCBA2D00DB3ED1 /* ReferenceProxy in Frameworks */, - 00C302E71ABCBA2D00DB3ED1 /* ReferenceProxy in Frameworks */, - 00C302E81ABCBA2D00DB3ED1 /* ReferenceProxy in Frameworks */, - 133E29F31AD74F7200F7D852 /* ReferenceProxy in Frameworks */, - 00C302E91ABCBA2D00DB3ED1 /* ReferenceProxy in Frameworks */, - 139105C61AF99C1200B5F7CC /* ReferenceProxy in Frameworks */, - 832341BD1AAA6AB300B99B32 /* ReferenceProxy in Frameworks */, - 00C302EA1ABCBA2D00DB3ED1 /* ReferenceProxy in Frameworks */, - 139FDEF61B0652A700C62182 /* ReferenceProxy in Frameworks */, + D3CEA0301DEF7B9000C1BF37 /* libRCTAnimation.a in Frameworks */, + D374ADC51BA929C500453203 /* libRNKeychain.a in Frameworks */, + 146834051AC3E58100842450 /* libReact.a in Frameworks */, + 00C302E51ABCBA2D00DB3ED1 /* libRCTActionSheet.a in Frameworks */, + 00C302E71ABCBA2D00DB3ED1 /* libRCTGeolocation.a in Frameworks */, + 00C302E81ABCBA2D00DB3ED1 /* libRCTImage.a in Frameworks */, + 133E29F31AD74F7200F7D852 /* libRCTLinking.a in Frameworks */, + 00C302E91ABCBA2D00DB3ED1 /* libRCTNetwork.a in Frameworks */, + 139105C61AF99C1200B5F7CC /* libRCTSettings.a in Frameworks */, + 832341BD1AAA6AB300B99B32 /* libRCTText.a in Frameworks */, + 00C302EA1ABCBA2D00DB3ED1 /* libRCTVibration.a in Frameworks */, + 139FDEF61B0652A700C62182 /* libRCTWebSocket.a in Frameworks */, 3D74A9A83D1AEF3D69F69B19 /* libPods-Sample.a in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; @@ -179,6 +245,7 @@ isa = PBXGroup; children = ( 00C302C01ABCB91800DB3ED1 /* libRCTImage.a */, + D3CEA0151DEF7B8600C1BF37 /* libRCTImage-tvOS.a */, ); name = Products; sourceTree = ""; @@ -187,6 +254,7 @@ isa = PBXGroup; children = ( 00C302DC1ABCB9D200DB3ED1 /* libRCTNetwork.a */, + D3CEA01D1DEF7B8600C1BF37 /* libRCTNetwork-tvOS.a */, ); name = Products; sourceTree = ""; @@ -210,6 +278,7 @@ isa = PBXGroup; children = ( 139105C11AF99BAD00B5F7CC /* libRCTSettings.a */, + D3CEA0211DEF7B8600C1BF37 /* libRCTSettings-tvOS.a */, ); name = Products; sourceTree = ""; @@ -218,6 +287,7 @@ isa = PBXGroup; children = ( 139FDEF41B06529B00C62182 /* libRCTWebSocket.a */, + D3CEA02A1DEF7B8600C1BF37 /* libRCTWebSocket-tvOS.a */, ); name = Products; sourceTree = ""; @@ -243,6 +313,7 @@ isa = PBXGroup; children = ( 146834041AC3E56700842450 /* libReact.a */, + D3CEA02E1DEF7B8600C1BF37 /* libReact-tvOS.a */, ); name = Products; sourceTree = ""; @@ -251,6 +322,7 @@ isa = PBXGroup; children = ( 78C398B91ACF4ADC00677621 /* libRCTLinking.a */, + D3CEA0191DEF7B8600C1BF37 /* libRCTLinking-tvOS.a */, ); name = Products; sourceTree = ""; @@ -258,6 +330,7 @@ 832341AE1AAA6A7D00B99B32 /* Libraries */ = { isa = PBXGroup; children = ( + D3CEA0071DEF7B8600C1BF37 /* RCTAnimation.xcodeproj */, D374ADB51BA929B900453203 /* RNKeychain.xcodeproj */, 146833FF1AC3E56700842450 /* React.xcodeproj */, 00C302A71ABCB8CE00DB3ED1 /* RCTActionSheet.xcodeproj */, @@ -277,6 +350,7 @@ isa = PBXGroup; children = ( 832341B51AAA6A8300B99B32 /* libRCTText.a */, + D3CEA0251DEF7B8600C1BF37 /* libRCTText-tvOS.a */, ); name = Products; sourceTree = ""; @@ -320,6 +394,15 @@ name = Products; sourceTree = ""; }; + D3CEA0081DEF7B8600C1BF37 /* Products */ = { + isa = PBXGroup; + children = ( + D3CEA00E1DEF7B8600C1BF37 /* libRCTAnimation.a */, + D3CEA0101DEF7B8600C1BF37 /* libRCTAnimation-tvOS.a */, + ); + name = Products; + sourceTree = ""; + }; E72C5A0E6306E5CEB6A71D5C /* Frameworks */ = { isa = PBXGroup; children = ( @@ -387,6 +470,10 @@ ProductGroup = 00C302A81ABCB8CE00DB3ED1 /* Products */; ProjectRef = 00C302A71ABCB8CE00DB3ED1 /* RCTActionSheet.xcodeproj */; }, + { + ProductGroup = D3CEA0081DEF7B8600C1BF37 /* Products */; + ProjectRef = D3CEA0071DEF7B8600C1BF37 /* RCTAnimation.xcodeproj */; + }, { ProductGroup = 00C302B61ABCB90400DB3ED1 /* Products */; ProjectRef = 00C302B51ABCB90400DB3ED1 /* RCTGeolocation.xcodeproj */; @@ -513,6 +600,69 @@ remoteRef = D374ADC31BA929BA00453203 /* PBXContainerItemProxy */; sourceTree = BUILT_PRODUCTS_DIR; }; + D3CEA00E1DEF7B8600C1BF37 /* libRCTAnimation.a */ = { + isa = PBXReferenceProxy; + fileType = archive.ar; + path = libRCTAnimation.a; + remoteRef = D3CEA00D1DEF7B8600C1BF37 /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + D3CEA0101DEF7B8600C1BF37 /* libRCTAnimation-tvOS.a */ = { + isa = PBXReferenceProxy; + fileType = archive.ar; + path = "libRCTAnimation-tvOS.a"; + remoteRef = D3CEA00F1DEF7B8600C1BF37 /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + D3CEA0151DEF7B8600C1BF37 /* libRCTImage-tvOS.a */ = { + isa = PBXReferenceProxy; + fileType = archive.ar; + path = "libRCTImage-tvOS.a"; + remoteRef = D3CEA0141DEF7B8600C1BF37 /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + D3CEA0191DEF7B8600C1BF37 /* libRCTLinking-tvOS.a */ = { + isa = PBXReferenceProxy; + fileType = archive.ar; + path = "libRCTLinking-tvOS.a"; + remoteRef = D3CEA0181DEF7B8600C1BF37 /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + D3CEA01D1DEF7B8600C1BF37 /* libRCTNetwork-tvOS.a */ = { + isa = PBXReferenceProxy; + fileType = archive.ar; + path = "libRCTNetwork-tvOS.a"; + remoteRef = D3CEA01C1DEF7B8600C1BF37 /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + D3CEA0211DEF7B8600C1BF37 /* libRCTSettings-tvOS.a */ = { + isa = PBXReferenceProxy; + fileType = archive.ar; + path = "libRCTSettings-tvOS.a"; + remoteRef = D3CEA0201DEF7B8600C1BF37 /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + D3CEA0251DEF7B8600C1BF37 /* libRCTText-tvOS.a */ = { + isa = PBXReferenceProxy; + fileType = archive.ar; + path = "libRCTText-tvOS.a"; + remoteRef = D3CEA0241DEF7B8600C1BF37 /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + D3CEA02A1DEF7B8600C1BF37 /* libRCTWebSocket-tvOS.a */ = { + isa = PBXReferenceProxy; + fileType = archive.ar; + path = "libRCTWebSocket-tvOS.a"; + remoteRef = D3CEA0291DEF7B8600C1BF37 /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + D3CEA02E1DEF7B8600C1BF37 /* libReact-tvOS.a */ = { + isa = PBXReferenceProxy; + fileType = archive.ar; + path = "libReact-tvOS.a"; + remoteRef = D3CEA02D1DEF7B8600C1BF37 /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; /* End PBXReferenceProxy section */ /* Begin PBXResourcesBuildPhase section */ diff --git a/package.json b/package.json index 122177cb..75a66033 100644 --- a/package.json +++ b/package.json @@ -23,8 +23,8 @@ "keymirror": "0.1.1", "moment-timezone": "0.4.1", "object-assign": "4.0.1", - "react": "15.3.1", - "react-native": "0.33.0", + "react": "15.4.0", + "react-native": "0.38.0", "react-native-keychain": "0.2.6", "react-native-mock": "0.2.7", "react-timer-mixin": "0.13.3",