Merge pull request #55 from marukami/fixed-android-animated

Fixed crash and Upgrade React
Thinkmill · May 18, 2017 · b56d951 · b56d951
2 parents c75e54c + 720c54c
commit b56d951
Show file tree

Hide file tree

Showing 9 changed files with 716 additions and 121 deletions.
diff --git a/.buckconfig b/.buckconfig
@@ -0,0 +1,6 @@
+
+[android]
+  target = Google Inc.:Google APIs:23
+
+[maven_repositories]
+  central = https://repo1.maven.org/maven2
diff --git a/.gitattributes b/.gitattributes
diff --git a/.watchmanconfig b/.watchmanconfig
diff --git a/android/app/build.gradle b/android/app/build.gradle
@@ -84,13 +84,13 @@ def enableSeparateBuildPerCPUArchitecture = false
 def enableProguardInReleaseBuilds = false
 
 android {
-    compileSdkVersion 23
-    buildToolsVersion "23.0.1"
+    compileSdkVersion 25
+    buildToolsVersion "25.0.3"
 
     defaultConfig {
         applicationId "com.reactconf2017"
         minSdkVersion 16
-        targetSdkVersion 22
+        targetSdkVersion 25
         versionCode 8
         versionName "1.0.16"
         ndk {

diff --git a/app/ReactConf2017.js b/app/ReactConf2017.js
@@ -1,6 +1,7 @@
 // @flow
 import React, { Component } from 'react';
-import { AppState, Navigator, StatusBar, StyleSheet } from 'react-native';
+import { Navigator } from 'react-native-deprecated-custom-components';
+import { AppState, StatusBar, StyleSheet } from 'react-native';
 import codePush from 'react-native-code-push';
 
 import theme from './theme';
@@ -69,18 +70,14 @@ class ReactConf2017 extends Component {
         configureScene={configureScene}
         initialRoute={{ scene: DEFAULT_VIEW, index: 0 }}
         renderScene={renderScene}
-        sceneStyle={styles.scenes}
+        sceneStyle={rawStyles.scenes}
         style={styles.navigator}
       />
     );
   }
 }
 
-const styles = StyleSheet.create({
-  navigator: {
-    backgroundColor: 'black',
-    flex: 1,
-  },
+const rawStyles = {
   scenes: {
     backgroundColor: theme.color.sceneBg,
     overflow: 'visible',
@@ -89,6 +86,13 @@ const styles = StyleSheet.create({
     shadowOpacity: 0.33,
     shadowRadius: 5,
   },
+};
+
+const styles = StyleSheet.create({
+  navigator: {
+    backgroundColor: 'black',
+    flex: 1,
+  },
 });
 
 module.exports = ReactConf2017;
diff --git a/app/scenes/Talk/components/Pane/index.js b/app/scenes/Talk/components/Pane/index.js
@@ -107,6 +107,10 @@ class TalkPreviewNext extends React.Component {
     onPress: Function,
   };
 
+  state = {
+    animValue: 0,
+  };
+
   render() {
     let { talk, isEngaged, onPress } = this.props;
     let preview = <TalkPreview talk={talk} isEngaged={isEngaged} />;

diff --git a/ios/ReactConf2017.xcodeproj/xcshareddata/xcschemes/ReactConf2017.xcscheme b/ios/ReactConf2017.xcodeproj/xcshareddata/xcschemes/ReactConf2017.xcscheme
@@ -0,0 +1,91 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Scheme
+   LastUpgradeVersion = "0830"
+   version = "1.3">
+   <BuildAction
+      parallelizeBuildables = "YES"
+      buildImplicitDependencies = "YES">
+      <BuildActionEntries>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "13B07F861A680F5B00A75B9A"
+               BuildableName = "ReactConf2017.app"
+               BlueprintName = "ReactConf2017"
+               ReferencedContainer = "container:ReactConf2017.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
+      </BuildActionEntries>
+   </BuildAction>
+   <TestAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      shouldUseLaunchSchemeArgsEnv = "YES">
+      <Testables>
+      </Testables>
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "13B07F861A680F5B00A75B9A"
+            BuildableName = "ReactConf2017.app"
+            BlueprintName = "ReactConf2017"
+            ReferencedContainer = "container:ReactConf2017.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
+      <AdditionalOptions>
+      </AdditionalOptions>
+   </TestAction>
+   <LaunchAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      launchStyle = "0"
+      useCustomWorkingDirectory = "NO"
+      ignoresPersistentStateOnLaunch = "NO"
+      debugDocumentVersioning = "YES"
+      debugServiceExtension = "internal"
+      allowLocationSimulation = "YES">
+      <BuildableProductRunnable
+         runnableDebuggingMode = "0">
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "13B07F861A680F5B00A75B9A"
+            BuildableName = "ReactConf2017.app"
+            BlueprintName = "ReactConf2017"
+            ReferencedContainer = "container:ReactConf2017.xcodeproj">
+         </BuildableReference>
+      </BuildableProductRunnable>
+      <AdditionalOptions>
+      </AdditionalOptions>
+   </LaunchAction>
+   <ProfileAction
+      buildConfiguration = "Release"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      savedToolIdentifier = ""
+      useCustomWorkingDirectory = "NO"
+      debugDocumentVersioning = "YES">
+      <BuildableProductRunnable
+         runnableDebuggingMode = "0">
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "13B07F861A680F5B00A75B9A"
+            BuildableName = "ReactConf2017.app"
+            BlueprintName = "ReactConf2017"
+            ReferencedContainer = "container:ReactConf2017.xcodeproj">
+         </BuildableReference>
+      </BuildableProductRunnable>
+   </ProfileAction>
+   <AnalyzeAction
+      buildConfiguration = "Debug">
+   </AnalyzeAction>
+   <ArchiveAction
+      buildConfiguration = "Release"
+      revealArchiveInOrganizer = "YES">
+   </ArchiveAction>
+</Scheme>
diff --git a/package.json b/package.json
@@ -13,10 +13,11 @@
   "dependencies": {
     "moment": "^2.17.1",
     "moment-timezone": "^0.5.11",
-    "react": "15.4.2",
-    "react-native": "^0.42.0",
+    "react": "16.0.0-alpha.6",
+    "react-native": "^0.44.0",
     "react-native-blur": "^2.0.0",
-    "react-native-code-push": "^1.17.0-beta",
+    "react-native-code-push": "^2.0.3-beta",
+    "react-native-deprecated-custom-components": "^0.1.0",
     "react-native-linear-gradient": "^2.0.0",
     "react-native-maps": "airbnb/react-native-maps",
     "react-native-smart-splash-screen": "^2.3.3",