From 42ff87b3b3e5b87c8414da368e3a797def11fd04 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ga=C3=ABtan=20Renaudeau?= <renaudeau.gaetan@gmail.com>
Date: Thu, 15 Sep 2016 21:13:00 +0200
Subject: [PATCH] port example to RN 0.33

---
 example/android/app/app.iml                   | 21 ++++++++++---------
 .../main/java/com/example/MainActivity.java   |  9 --------
 example/package.json                          |  6 +++---
 example/src/AdvancedEffects/Intro.js          |  2 +-
 example/src/Simple/index.js                   | 10 +++++----
 example/src/Tests/index.js                    |  8 +++----
 6 files changed, 25 insertions(+), 31 deletions(-)

diff --git a/example/android/app/app.iml b/example/android/app/app.iml
index cc8ba30..0c7b926 100644
--- a/example/android/app/app.iml
+++ b/example/android/app/app.iml
@@ -64,14 +64,6 @@
       <sourceFolder url="file://$MODULE_DIR$/src/main/jni" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/rs" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/shaders" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
@@ -80,6 +72,14 @@
       <sourceFolder url="file://$MODULE_DIR$/src/test/jni" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/builds" />
@@ -95,7 +95,7 @@
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.facebook.fresco/imagepipeline-base/0.11.0/jars" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.facebook.fresco/imagepipeline-okhttp3/0.11.0/jars" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.facebook.fresco/imagepipeline/0.11.0/jars" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.facebook.react/react-native/0.32.0/jars" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.facebook.react/react-native/0.33.0/jars" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.facebook.soloader/soloader/0.1.0/jars" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/org.webkit/android-jsc/r174650/jars" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
@@ -126,17 +126,18 @@
     <orderEntry type="library" exported="" name="fresco-0.11.0" level="project" />
     <orderEntry type="library" exported="" name="drawee-0.11.0" level="project" />
     <orderEntry type="library" exported="" name="soloader-0.1.0" level="project" />
+    <orderEntry type="library" exported="" name="javax.inject-1" level="project" />
     <orderEntry type="library" exported="" name="jsr305-3.0.0" level="project" />
     <orderEntry type="library" exported="" name="jackson-core-2.2.3" level="project" />
     <orderEntry type="library" exported="" name="bolts-tasks-1.4.0" level="project" />
     <orderEntry type="library" exported="" name="recyclerview-v7-23.0.1" level="project" />
     <orderEntry type="library" exported="" name="okhttp-urlconnection-3.4.1" level="project" />
     <orderEntry type="library" exported="" name="okhttp-ws-3.4.1" level="project" />
+    <orderEntry type="library" exported="" name="react-native-0.33.0" level="project" />
     <orderEntry type="library" exported="" name="android-jsc-r174650" level="project" />
     <orderEntry type="library" exported="" name="okhttp-3.4.1" level="project" />
     <orderEntry type="library" exported="" name="support-v4-23.2.1" level="project" />
     <orderEntry type="library" exported="" name="imagepipeline-okhttp3-0.11.0" level="project" />
-    <orderEntry type="library" exported="" name="react-native-0.32.0" level="project" />
     <orderEntry type="library" exported="" name="support-annotations-23.2.1" level="project" />
     <orderEntry type="library" exported="" name="appcompat-v7-23.0.1" level="project" />
     <orderEntry type="library" exported="" name="fbcore-0.11.0" level="project" />
diff --git a/example/android/app/src/main/java/com/example/MainActivity.java b/example/android/app/src/main/java/com/example/MainActivity.java
index af8dd8a..af05dfe 100644
--- a/example/android/app/src/main/java/com/example/MainActivity.java
+++ b/example/android/app/src/main/java/com/example/MainActivity.java
@@ -20,13 +20,4 @@ public class MainActivity extends ReactActivity {
     protected String getMainComponentName() {
         return "example";
     }
-
-    /**
-     * Returns whether dev mode should be enabled.
-     * This enables e.g. the dev menu.
-     */
-    @Override
-    protected boolean getUseDeveloperSupport() {
-        return BuildConfig.DEBUG;
-    }
 }
diff --git a/example/package.json b/example/package.json
index 3233e6f..cbc62c9 100644
--- a/example/package.json
+++ b/example/package.json
@@ -7,12 +7,12 @@
   },
   "dependencies": {
     "crypto": "0.0.3",
-    "gl-react": "2.2.4",
+    "gl-react": "2.2.6",
     "gl-react-blur": "^1.3.0",
     "gl-react-native": "file:..",
     "glsl-transitions": "^2016.2.15",
-    "react": "15.3.0",
-    "react-native": "0.32.0",
+    "react": "15.3.1",
+    "react-native": "0.33.0",
     "react-native-fs": "1.5.1",
     "react-native-material-kit": "PyYoshi/react-native-material-kit#rn-0.25.1",
     "seedrandom": "gre/seedrandom#released"
diff --git a/example/src/AdvancedEffects/Intro.js b/example/src/AdvancedEffects/Intro.js
index 8494efe..44e468c 100644
--- a/example/src/AdvancedEffects/Intro.js
+++ b/example/src/AdvancedEffects/Intro.js
@@ -55,7 +55,7 @@ class Intro extends React.Component {
           moving: 1
         }}>
         <GL.Uniform name="texture">
-          <View style={{ flex: 1, justifyContent: "center", backgroundColor: "#111" }}>
+          <View key="root" style={{ flex: 1, justifyContent: "center", backgroundColor: "#111" }}>
             <Text style={{ color: "#00BDF3", fontSize: 32, letterSpacing: -1.0 }}>
               GL REACT NATIVE
             </Text>
diff --git a/example/src/Simple/index.js b/example/src/Simple/index.js
index 8aa63ca..a3da3c8 100644
--- a/example/src/Simple/index.js
+++ b/example/src/Simple/index.js
@@ -166,9 +166,11 @@ class Simple extends Component {
         <Demo id={3} current={current} title="3. Hue Rotate on Text+Image">
           <Surface autoRedraw width={256} height={180}>
             <HueRotate hue={hue}>
-              <Image style={{ width: 256, height: 244 }} source={{ uri: "http://i.imgur.com/qVxHrkY.jpg" }}/>
-              <Text style={styles.demoText1}>Throw me to the wolves</Text>
-              <Text style={styles.demoText2}>{text}</Text>
+              <View key="hue" style={{ width: 256, height: 180 }}>
+                <Image style={{ width: 256, height: 244 }} source={{ uri: "http://i.imgur.com/qVxHrkY.jpg" }}/>
+                <Text style={styles.demoText1}>Throw me to the wolves</Text>
+                <Text style={styles.demoText2}>{text}</Text>
+              </View>
             </HueRotate>
           </Surface>
           <Slider
@@ -241,7 +243,7 @@ class Simple extends Component {
             visibleContent>
             <HueRotate hue={-switch1 + 2 * switch2 + 4 * switch3}>
               <Blur factor={factor}>
-                <View style={{ width: 256, height: 160, padding: 10, backgroundColor: "#f9f9f9" }}>
+                <View key="blur" style={{ width: 256, height: 160, padding: 10, backgroundColor: "#f9f9f9" }}>
                   <Slider
                     style={{ height: 80 }}
                     max={1}
diff --git a/example/src/Tests/index.js b/example/src/Tests/index.js
index e42bcae..6bc0ef0 100644
--- a/example/src/Tests/index.js
+++ b/example/src/Tests/index.js
@@ -35,7 +35,7 @@ class Tests extends React.Component {
       <HelloGL width={64} height={64} />;
 
     const txt =
-      <View style={{ width: 400, height: 400, position: "relative", backgroundColor: "transparent" }}>
+      <View key="txt" style={{ width: 400, height: 400, position: "relative", backgroundColor: "transparent" }}>
         {[0,1,2,3].map(i => <Text key={i} style={{
           position: "absolute",
           top: 20+100*i,
@@ -86,12 +86,12 @@ class Tests extends React.Component {
       <View style={{ flexDirection: "row", flexWrap: "wrap" }}>
 
         <NativeLayer width={debugSize} height={debugSize}>
-          <Image source={{ uri: "http://i.imgur.com/S22HNaU.png" }} width={debugSize} height={debugSize} />
-          <Image source={{ uri: "http://i.imgur.com/mp79p5T.png" }} width={debugSize} height={debugSize} />
+          <Image key={0} source={{ uri: "http://i.imgur.com/S22HNaU.png" }} width={debugSize} height={debugSize} />
+          <Image key={1} source={{ uri: "http://i.imgur.com/mp79p5T.png" }} width={debugSize} height={debugSize} />
         </NativeLayer>
 
         <NativeLayer width={debugSize} height={debugSize}>
-          <Image source={{ uri: "http://i.imgur.com/S22HNaU.png" }} width={debugSize} height={debugSize} />
+          <Image key={0} source={{ uri: "http://i.imgur.com/S22HNaU.png" }} width={debugSize} height={debugSize} />
           <Surface width={debugSize} height={debugSize} backgroundColor="transparent">
             <Copy last>
               <Copy>
-- 
2.26.2