diff --git a/README.md b/README.md index 9ac492de0..f48a9c0fd 100644 --- a/README.md +++ b/README.md @@ -6,11 +6,11 @@ #### v4 is based on [React Navigation v2.x](https://reactnavigation.org/). See [this branch](https://github.com/aksonov/react-native-router-flux/tree/v3) and [docs](https://github.com/aksonov/react-native-router-flux/blob/master/README3.md) for v3 based on deprecated React Native Experimental Navigation API. It is not supported and may not work with latest React Native versions. -#### v4.0.0-beta.x is based on [React Navigation v1.5.x](https://reactnavigation.org/). It is also not supported and may not work with the latest React Native versions. +#### v4.0.0-beta.x is based on [React Navigation v1.5.x](https://reactnavigation.org/). See [this branch](https://github.com/aksonov/react-native-router-flux/tree/v4.0.0-beta) for this version. It is also not supported and may not work with the latest React Native versions. ___ -* [Example](#try-the-example-app) +* [Examples](#try-the-example-apps) * [Motivation](https://gist.github.com/aksonov/e2d7454421e44b1c4c72214d14053410) * [v4 Features](#v4-features) * [API](/docs/API.md) @@ -51,22 +51,20 @@ Actions.refresh({param1: 'hello', param2: 'world'}) For a full listing of the API, [view the API docs](https://github.com/aksonov/react-native-router-flux/blob/master/docs/API.md). -## Try the [example app](https://github.com/aksonov/react-native-router-flux/tree/master/Example) +## Try the [example apps](https://github.com/aksonov/react-native-router-flux/tree/master/examples) ![rnrf](https://user-images.githubusercontent.com/3681859/27937441-ef61d932-626b-11e7-885f-1db7dc74b32e.gif) ```bash # Get the code git clone https://github.com/aksonov/react-native-router-flux.git -cd react-native-router-flux/Example +cd react-native-router-flux/examples/[expo|react-native|redux] # Installing dependencies yarn -or -npm i # Run it -react-native run-ios +yarn start ``` ## v4 Features diff --git a/ReduxExample/android/app/proguard-rules.pro b/ReduxExample/android/app/proguard-rules.pro deleted file mode 100644 index 6e8516c8d..000000000 --- a/ReduxExample/android/app/proguard-rules.pro +++ /dev/null @@ -1,70 +0,0 @@ -# Add project specific ProGuard rules here. -# By default, the flags in this file are appended to flags specified -# in /usr/local/Cellar/android-sdk/24.3.3/tools/proguard/proguard-android.txt -# You can edit the include path and order by changing the proguardFiles -# directive in build.gradle. -# -# For more details, see -# http://developer.android.com/guide/developing/tools/proguard.html - -# Add any project specific keep options here: - -# If your project uses WebView with JS, uncomment the following -# and specify the fully qualified class name to the JavaScript interface -# class: -#-keepclassmembers class fqcn.of.javascript.interface.for.webview { -# public *; -#} - -# Disabling obfuscation is useful if you collect stack traces from production crashes -# (unless you are using a system that supports de-obfuscate the stack traces). --dontobfuscate - -# React Native - -# Keep our interfaces so they can be used by other ProGuard rules. -# See http://sourceforge.net/p/proguard/bugs/466/ --keep,allowobfuscation @interface com.facebook.proguard.annotations.DoNotStrip --keep,allowobfuscation @interface com.facebook.proguard.annotations.KeepGettersAndSetters --keep,allowobfuscation @interface com.facebook.common.internal.DoNotStrip - -# Do not strip any method/class that is annotated with @DoNotStrip --keep @com.facebook.proguard.annotations.DoNotStrip class * --keep @com.facebook.common.internal.DoNotStrip class * --keepclassmembers class * { - @com.facebook.proguard.annotations.DoNotStrip *; - @com.facebook.common.internal.DoNotStrip *; -} - --keepclassmembers @com.facebook.proguard.annotations.KeepGettersAndSetters class * { - void set*(***); - *** get*(); -} - --keep class * extends com.facebook.react.bridge.JavaScriptModule { *; } --keep class * extends com.facebook.react.bridge.NativeModule { *; } --keepclassmembers,includedescriptorclasses class * { native ; } --keepclassmembers class * { @com.facebook.react.uimanager.UIProp ; } --keepclassmembers class * { @com.facebook.react.uimanager.annotations.ReactProp ; } --keepclassmembers class * { @com.facebook.react.uimanager.annotations.ReactPropGroup ; } - --dontwarn com.facebook.react.** - -# TextLayoutBuilder uses a non-public Android constructor within StaticLayout. -# See libs/proxy/src/main/java/com/facebook/fbui/textlayoutbuilder/proxy for details. --dontwarn android.text.StaticLayout - -# okhttp - --keepattributes Signature --keepattributes *Annotation* --keep class okhttp3.** { *; } --keep interface okhttp3.** { *; } --dontwarn okhttp3.** - -# okio - --keep class sun.misc.Unsafe { *; } --dontwarn java.nio.file.* --dontwarn org.codehaus.mojo.animal_sniffer.IgnoreJRERequirement --dontwarn okio.** diff --git a/ReduxExample/android/app/src/main/res/mipmap-hdpi/ic_launcher.png b/ReduxExample/android/app/src/main/res/mipmap-hdpi/ic_launcher.png deleted file mode 100644 index cde69bccc..000000000 Binary files a/ReduxExample/android/app/src/main/res/mipmap-hdpi/ic_launcher.png and /dev/null differ diff --git a/ReduxExample/android/app/src/main/res/mipmap-mdpi/ic_launcher.png b/ReduxExample/android/app/src/main/res/mipmap-mdpi/ic_launcher.png deleted file mode 100644 index c133a0cbd..000000000 Binary files a/ReduxExample/android/app/src/main/res/mipmap-mdpi/ic_launcher.png and /dev/null differ diff --git a/ReduxExample/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/ReduxExample/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png deleted file mode 100644 index bfa42f0e7..000000000 Binary files a/ReduxExample/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png and /dev/null differ diff --git a/ReduxExample/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/ReduxExample/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png deleted file mode 100644 index 324e72cdd..000000000 Binary files a/ReduxExample/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png and /dev/null differ diff --git a/ReduxExample/android/app/src/main/res/values/strings.xml b/ReduxExample/android/app/src/main/res/values/strings.xml deleted file mode 100644 index 8454c70f9..000000000 --- a/ReduxExample/android/app/src/main/res/values/strings.xml +++ /dev/null @@ -1,3 +0,0 @@ - - rnrfSample - diff --git a/ReduxExample/android/build.gradle b/ReduxExample/android/build.gradle deleted file mode 100644 index ec28a84e6..000000000 --- a/ReduxExample/android/build.gradle +++ /dev/null @@ -1,61 +0,0 @@ -// Top-level build file where you can add configuration options common to all sub-projects/modules. - -buildscript { - repositories { - jcenter() - google() - } - dependencies { - classpath 'com.android.tools.build:gradle:3.0.0' - - // NOTE: Do not place your application dependencies here; they belong - // in the individual module build.gradle files - } -} - -task clean(type: Delete) { - delete rootProject.buildDir -} - -allprojects { - repositories { - mavenLocal() - jcenter() - google() - maven { url "https://maven.google.com" } - maven { - // All of React Native (JS, Obj-C sources, Android binaries) is installed from npm - url "$rootDir/../node_modules/react-native/android" - } - } -} - -ext { - googlePlayServicesVersion = "12.0.1" - buildToolsVersion = "26.0.2" - minSdkVersion = 16 - compileSdkVersion = 26 - targetSdkVersion = 26 - supportLibVersion = "27.1.0" -} - - -subprojects { - project.configurations.all { - resolutionStrategy.eachDependency { details -> - if (details.requested.group == 'com.android.support' - && !details.requested.name.contains('multidex') ) { - details.useVersion rootProject.ext.supportLibVersion - } - } - } - - afterEvaluate { - project -> if (project.hasProperty("android")) { - android { - compileSdkVersion rootProject.ext.compileSdkVersion - buildToolsVersion rootProject.ext.buildToolsVersion - } - } - } -} diff --git a/ReduxExample/android/settings.gradle b/ReduxExample/android/settings.gradle deleted file mode 100644 index a4ef4e77d..000000000 --- a/ReduxExample/android/settings.gradle +++ /dev/null @@ -1,3 +0,0 @@ -rootProject.name = 'rnrfSample' - -include ':app' diff --git a/ReduxExample/ios/rnrfSample/AppDelegate.h b/ReduxExample/ios/rnrfSample/AppDelegate.h deleted file mode 100644 index a9654d5e0..000000000 --- a/ReduxExample/ios/rnrfSample/AppDelegate.h +++ /dev/null @@ -1,16 +0,0 @@ -/** - * Copyright (c) 2015-present, Facebook, Inc. - * All rights reserved. - * - * This source code is licensed under the BSD-style license found in the - * LICENSE file in the root directory of this source tree. An additional grant - * of patent rights can be found in the PATENTS file in the same directory. - */ - -#import - -@interface AppDelegate : UIResponder - -@property (nonatomic, strong) UIWindow *window; - -@end diff --git a/Example/.buckconfig b/examples/react-native/.buckconfig similarity index 100% rename from Example/.buckconfig rename to examples/react-native/.buckconfig diff --git a/Example/.flowconfig b/examples/react-native/.flowconfig similarity index 100% rename from Example/.flowconfig rename to examples/react-native/.flowconfig diff --git a/Example/.gitattributes b/examples/react-native/.gitattributes similarity index 100% rename from Example/.gitattributes rename to examples/react-native/.gitattributes diff --git a/Example/.gitignore b/examples/react-native/.gitignore similarity index 100% rename from Example/.gitignore rename to examples/react-native/.gitignore diff --git a/Example/.npmignore b/examples/react-native/.npmignore similarity index 100% rename from Example/.npmignore rename to examples/react-native/.npmignore diff --git a/Example/.watchmanconfig b/examples/react-native/.watchmanconfig similarity index 100% rename from Example/.watchmanconfig rename to examples/react-native/.watchmanconfig diff --git a/Example/Example.js b/examples/react-native/Example.js similarity index 96% rename from Example/Example.js rename to examples/react-native/Example.js index a4d4b3e11..13e666632 100644 --- a/Example/Example.js +++ b/examples/react-native/Example.js @@ -1,6 +1,6 @@ import React from 'react'; import { Platform, StyleSheet, Text, View } from 'react-native'; -import CardStackStyleInterpolator from 'react-navigation-stack/dist/views/StackView/StackViewStyleInterpolator'; +import { StackViewStyleInterpolator } from 'react-navigation-stack'; import { Scene, Router, Actions, Reducer, ActionConst, Overlay, Tabs, Modal, Drawer, Stack, Lightbox } from 'react-native-router-flux'; import Launch from './components/Launch'; import Register from './components/Register'; @@ -56,10 +56,15 @@ const getSceneStyle = () => ({ // on Android, the URI prefix typically contains a host in addition to scheme const prefix = Platform.OS === 'android' ? 'mychat://mychat/' : 'mychat://'; +const transitionConfig = () => ({ + screenInterpolator: + StackViewStyleInterpolator.forFadeFromBottomAndroid, +}); + const Example = () => ( - ({ screenInterpolator: CardStackStyleInterpolator.forFadeFromBottomAndroid })}> + navigation.state.key} /> diff --git a/Example/README.md b/examples/react-native/README.md similarity index 100% rename from Example/README.md rename to examples/react-native/README.md diff --git a/Example/android/app/BUCK b/examples/react-native/android/app/BUCK similarity index 100% rename from Example/android/app/BUCK rename to examples/react-native/android/app/BUCK diff --git a/Example/android/app/build.gradle b/examples/react-native/android/app/build.gradle similarity index 100% rename from Example/android/app/build.gradle rename to examples/react-native/android/app/build.gradle diff --git a/Example/android/app/proguard-rules.pro b/examples/react-native/android/app/proguard-rules.pro similarity index 100% rename from Example/android/app/proguard-rules.pro rename to examples/react-native/android/app/proguard-rules.pro diff --git a/Example/android/app/react.gradle b/examples/react-native/android/app/react.gradle similarity index 100% rename from Example/android/app/react.gradle rename to examples/react-native/android/app/react.gradle diff --git a/Example/android/app/src/main/AndroidManifest.xml b/examples/react-native/android/app/src/main/AndroidManifest.xml similarity index 100% rename from Example/android/app/src/main/AndroidManifest.xml rename to examples/react-native/android/app/src/main/AndroidManifest.xml diff --git a/Example/android/app/src/main/java/com/example/MainActivity.java b/examples/react-native/android/app/src/main/java/com/example/MainActivity.java similarity index 100% rename from Example/android/app/src/main/java/com/example/MainActivity.java rename to examples/react-native/android/app/src/main/java/com/example/MainActivity.java diff --git a/Example/android/app/src/main/java/com/example/MainApplication.java b/examples/react-native/android/app/src/main/java/com/example/MainApplication.java similarity index 100% rename from Example/android/app/src/main/java/com/example/MainApplication.java rename to examples/react-native/android/app/src/main/java/com/example/MainApplication.java diff --git a/Example/android/app/src/main/res/mipmap-hdpi/ic_launcher.png b/examples/react-native/android/app/src/main/res/mipmap-hdpi/ic_launcher.png similarity index 100% rename from Example/android/app/src/main/res/mipmap-hdpi/ic_launcher.png rename to examples/react-native/android/app/src/main/res/mipmap-hdpi/ic_launcher.png diff --git a/Example/android/app/src/main/res/mipmap-mdpi/ic_launcher.png b/examples/react-native/android/app/src/main/res/mipmap-mdpi/ic_launcher.png similarity index 100% rename from Example/android/app/src/main/res/mipmap-mdpi/ic_launcher.png rename to examples/react-native/android/app/src/main/res/mipmap-mdpi/ic_launcher.png diff --git a/Example/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/examples/react-native/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png similarity index 100% rename from Example/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png rename to examples/react-native/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png diff --git a/Example/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/examples/react-native/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png similarity index 100% rename from Example/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png rename to examples/react-native/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png diff --git a/Example/android/app/src/main/res/values/strings.xml b/examples/react-native/android/app/src/main/res/values/strings.xml similarity index 100% rename from Example/android/app/src/main/res/values/strings.xml rename to examples/react-native/android/app/src/main/res/values/strings.xml diff --git a/Example/android/app/src/main/res/values/styles.xml b/examples/react-native/android/app/src/main/res/values/styles.xml similarity index 100% rename from Example/android/app/src/main/res/values/styles.xml rename to examples/react-native/android/app/src/main/res/values/styles.xml diff --git a/Example/android/build.gradle b/examples/react-native/android/build.gradle similarity index 100% rename from Example/android/build.gradle rename to examples/react-native/android/build.gradle diff --git a/Example/android/gradle.properties b/examples/react-native/android/gradle.properties similarity index 100% rename from Example/android/gradle.properties rename to examples/react-native/android/gradle.properties diff --git a/Example/android/gradle/wrapper/gradle-wrapper.jar b/examples/react-native/android/gradle/wrapper/gradle-wrapper.jar similarity index 100% rename from Example/android/gradle/wrapper/gradle-wrapper.jar rename to examples/react-native/android/gradle/wrapper/gradle-wrapper.jar diff --git a/Example/android/gradle/wrapper/gradle-wrapper.properties b/examples/react-native/android/gradle/wrapper/gradle-wrapper.properties similarity index 100% rename from Example/android/gradle/wrapper/gradle-wrapper.properties rename to examples/react-native/android/gradle/wrapper/gradle-wrapper.properties diff --git a/Example/android/gradlew b/examples/react-native/android/gradlew similarity index 100% rename from Example/android/gradlew rename to examples/react-native/android/gradlew diff --git a/Example/android/gradlew.bat b/examples/react-native/android/gradlew.bat similarity index 100% rename from Example/android/gradlew.bat rename to examples/react-native/android/gradlew.bat diff --git a/Example/android/keystores/BUCK b/examples/react-native/android/keystores/BUCK similarity index 100% rename from Example/android/keystores/BUCK rename to examples/react-native/android/keystores/BUCK diff --git a/Example/android/keystores/debug.keystore.properties b/examples/react-native/android/keystores/debug.keystore.properties similarity index 100% rename from Example/android/keystores/debug.keystore.properties rename to examples/react-native/android/keystores/debug.keystore.properties diff --git a/Example/android/settings.gradle b/examples/react-native/android/settings.gradle similarity index 100% rename from Example/android/settings.gradle rename to examples/react-native/android/settings.gradle diff --git a/Example/app.json b/examples/react-native/app.json similarity index 100% rename from Example/app.json rename to examples/react-native/app.json diff --git a/Example/babel.config.js b/examples/react-native/babel.config.js similarity index 100% rename from Example/babel.config.js rename to examples/react-native/babel.config.js diff --git a/Example/components/CustomNavBar.js b/examples/react-native/components/CustomNavBar.js similarity index 100% rename from Example/components/CustomNavBar.js rename to examples/react-native/components/CustomNavBar.js diff --git a/Example/components/CustomNavBar2.js b/examples/react-native/components/CustomNavBar2.js similarity index 100% rename from Example/components/CustomNavBar2.js rename to examples/react-native/components/CustomNavBar2.js diff --git a/Example/components/CustomNavBarView.js b/examples/react-native/components/CustomNavBarView.js similarity index 100% rename from Example/components/CustomNavBarView.js rename to examples/react-native/components/CustomNavBarView.js diff --git a/Example/components/EchoView.js b/examples/react-native/components/EchoView.js similarity index 100% rename from Example/components/EchoView.js rename to examples/react-native/components/EchoView.js diff --git a/Example/components/Error.js b/examples/react-native/components/Error.js similarity index 100% rename from Example/components/Error.js rename to examples/react-native/components/Error.js diff --git a/Example/components/Home.js b/examples/react-native/components/Home.js similarity index 100% rename from Example/components/Home.js rename to examples/react-native/components/Home.js diff --git a/Example/components/Launch.js b/examples/react-native/components/Launch.js similarity index 100% rename from Example/components/Launch.js rename to examples/react-native/components/Launch.js diff --git a/Example/components/Login.js b/examples/react-native/components/Login.js similarity index 100% rename from Example/components/Login.js rename to examples/react-native/components/Login.js diff --git a/Example/components/Login2.js b/examples/react-native/components/Login2.js similarity index 100% rename from Example/components/Login2.js rename to examples/react-native/components/Login2.js diff --git a/Example/components/Login3.js b/examples/react-native/components/Login3.js similarity index 100% rename from Example/components/Login3.js rename to examples/react-native/components/Login3.js diff --git a/Example/components/MessageBar.js b/examples/react-native/components/MessageBar.js similarity index 100% rename from Example/components/MessageBar.js rename to examples/react-native/components/MessageBar.js diff --git a/Example/components/Register.js b/examples/react-native/components/Register.js similarity index 100% rename from Example/components/Register.js rename to examples/react-native/components/Register.js diff --git a/Example/components/TabIcon.js b/examples/react-native/components/TabIcon.js similarity index 100% rename from Example/components/TabIcon.js rename to examples/react-native/components/TabIcon.js diff --git a/Example/components/TabView.js b/examples/react-native/components/TabView.js similarity index 100% rename from Example/components/TabView.js rename to examples/react-native/components/TabView.js diff --git a/Example/components/drawer/DrawerContent.js b/examples/react-native/components/drawer/DrawerContent.js similarity index 100% rename from Example/components/drawer/DrawerContent.js rename to examples/react-native/components/drawer/DrawerContent.js diff --git a/Example/components/lightbox/BaseLightbox.js b/examples/react-native/components/lightbox/BaseLightbox.js similarity index 100% rename from Example/components/lightbox/BaseLightbox.js rename to examples/react-native/components/lightbox/BaseLightbox.js diff --git a/Example/components/lightbox/DemoLightbox.js b/examples/react-native/components/lightbox/DemoLightbox.js similarity index 100% rename from Example/components/lightbox/DemoLightbox.js rename to examples/react-native/components/lightbox/DemoLightbox.js diff --git a/Example/components/modal/BaseModal.js b/examples/react-native/components/modal/BaseModal.js similarity index 100% rename from Example/components/modal/BaseModal.js rename to examples/react-native/components/modal/BaseModal.js diff --git a/Example/components/modal/ErrorModal.js b/examples/react-native/components/modal/ErrorModal.js similarity index 100% rename from Example/components/modal/ErrorModal.js rename to examples/react-native/components/modal/ErrorModal.js diff --git a/Example/images/back_chevron.png b/examples/react-native/images/back_chevron.png similarity index 100% rename from Example/images/back_chevron.png rename to examples/react-native/images/back_chevron.png diff --git a/Example/images/menu_burger.png b/examples/react-native/images/menu_burger.png similarity index 100% rename from Example/images/menu_burger.png rename to examples/react-native/images/menu_burger.png diff --git a/Example/index.android.js b/examples/react-native/index.android.js similarity index 100% rename from Example/index.android.js rename to examples/react-native/index.android.js diff --git a/Example/index.ios.js b/examples/react-native/index.ios.js similarity index 100% rename from Example/index.ios.js rename to examples/react-native/index.ios.js diff --git a/Example/ios/Example-tvOS/Info.plist b/examples/react-native/ios/Example-tvOS/Info.plist similarity index 100% rename from Example/ios/Example-tvOS/Info.plist rename to examples/react-native/ios/Example-tvOS/Info.plist diff --git a/Example/ios/Example-tvOSTests/Info.plist b/examples/react-native/ios/Example-tvOSTests/Info.plist similarity index 100% rename from Example/ios/Example-tvOSTests/Info.plist rename to examples/react-native/ios/Example-tvOSTests/Info.plist diff --git a/Example/ios/Example.xcodeproj/project.pbxproj b/examples/react-native/ios/Example.xcodeproj/project.pbxproj similarity index 100% rename from Example/ios/Example.xcodeproj/project.pbxproj rename to examples/react-native/ios/Example.xcodeproj/project.pbxproj diff --git a/Example/ios/Example.xcodeproj/xcshareddata/xcschemes/Example-tvOS.xcscheme b/examples/react-native/ios/Example.xcodeproj/xcshareddata/xcschemes/Example-tvOS.xcscheme similarity index 100% rename from Example/ios/Example.xcodeproj/xcshareddata/xcschemes/Example-tvOS.xcscheme rename to examples/react-native/ios/Example.xcodeproj/xcshareddata/xcschemes/Example-tvOS.xcscheme diff --git a/Example/ios/Example.xcodeproj/xcshareddata/xcschemes/Example.xcscheme b/examples/react-native/ios/Example.xcodeproj/xcshareddata/xcschemes/Example.xcscheme similarity index 100% rename from Example/ios/Example.xcodeproj/xcshareddata/xcschemes/Example.xcscheme rename to examples/react-native/ios/Example.xcodeproj/xcshareddata/xcschemes/Example.xcscheme diff --git a/Example/ios/Example/AppDelegate.h b/examples/react-native/ios/Example/AppDelegate.h similarity index 100% rename from Example/ios/Example/AppDelegate.h rename to examples/react-native/ios/Example/AppDelegate.h diff --git a/Example/ios/Example/AppDelegate.m b/examples/react-native/ios/Example/AppDelegate.m similarity index 100% rename from Example/ios/Example/AppDelegate.m rename to examples/react-native/ios/Example/AppDelegate.m diff --git a/Example/ios/Example/Base.lproj/LaunchScreen.xib b/examples/react-native/ios/Example/Base.lproj/LaunchScreen.xib similarity index 100% rename from Example/ios/Example/Base.lproj/LaunchScreen.xib rename to examples/react-native/ios/Example/Base.lproj/LaunchScreen.xib diff --git a/Example/ios/Example/Images.xcassets/AppIcon.appiconset/Contents.json b/examples/react-native/ios/Example/Images.xcassets/AppIcon.appiconset/Contents.json similarity index 100% rename from Example/ios/Example/Images.xcassets/AppIcon.appiconset/Contents.json rename to examples/react-native/ios/Example/Images.xcassets/AppIcon.appiconset/Contents.json diff --git a/Example/ios/Example/Info.plist b/examples/react-native/ios/Example/Info.plist similarity index 100% rename from Example/ios/Example/Info.plist rename to examples/react-native/ios/Example/Info.plist diff --git a/Example/ios/Example/main.m b/examples/react-native/ios/Example/main.m similarity index 100% rename from Example/ios/Example/main.m rename to examples/react-native/ios/Example/main.m diff --git a/Example/ios/ExampleTests/ExampleTests.m b/examples/react-native/ios/ExampleTests/ExampleTests.m similarity index 100% rename from Example/ios/ExampleTests/ExampleTests.m rename to examples/react-native/ios/ExampleTests/ExampleTests.m diff --git a/Example/ios/ExampleTests/Info.plist b/examples/react-native/ios/ExampleTests/Info.plist similarity index 100% rename from Example/ios/ExampleTests/Info.plist rename to examples/react-native/ios/ExampleTests/Info.plist diff --git a/Example/package.json b/examples/react-native/package.json similarity index 81% rename from Example/package.json rename to examples/react-native/package.json index 4c939cd8b..38892262b 100644 --- a/Example/package.json +++ b/examples/react-native/package.json @@ -5,7 +5,7 @@ "scripts": { "start": "node node_modules/react-native/local-cli/cli.js start", "test": "jest", - "postinstall": "rm -rf node_modules/react-native-router-flux/node_modules node_modules/react-native-router-flux/Example node_modules/react-native-router-flux/ReduxExample" + "postinstall": "node_modules/.bin/rnrf dedup" }, "resolutions": { "*/@babel/cli": "7.0.0-beta.47", @@ -20,8 +20,10 @@ "react-native": "0.56.0", "react-native-button": "^2.3.0", "react-native-message-bar": "^2.0.10", - "react-native-router-flux": "file:..", - "react-navigation": "2.13.x" + "react-native-router-flux": "file:../..", + "react-native-router-flux-cli": "file:../../packages/react-native-router-flux-cli", + "react-navigation": "2.13.x", + "react-navigation-stack": "^0.4.0" }, "devDependencies": { "@babel/code-frame": "7.0.0-beta.47", diff --git a/Example/test/setup.js b/examples/react-native/test/setup.js similarity index 100% rename from Example/test/setup.js rename to examples/react-native/test/setup.js diff --git a/Example/yarn.lock b/examples/react-native/yarn.lock similarity index 99% rename from Example/yarn.lock rename to examples/react-native/yarn.lock index 90955dff2..077ce05d6 100644 --- a/Example/yarn.lock +++ b/examples/react-native/yarn.lock @@ -4449,6 +4449,11 @@ react-native-message-bar@^2.0.10: version "2.0.10" resolved "https://registry.yarnpkg.com/react-native-message-bar/-/react-native-message-bar-2.0.10.tgz#34632bdf2cbfe0f51ae4f1e9a91c42b4394a11c2" +"react-native-router-flux-cli@file:../packages/react-native-router-flux-cli": + version "0.0.1" + dependencies: + rimraf "^2.6.2" + "react-native-router-flux@file:..": version "4.0.2-dev" dependencies: @@ -4464,6 +4469,10 @@ react-native-safe-area-view@^0.9.0: dependencies: hoist-non-react-statics "^2.3.1" +react-native-screens@^1.0.0-alpha.8: + version "1.0.0-alpha.9" + resolved "https://registry.yarnpkg.com/react-native-screens/-/react-native-screens-1.0.0-alpha.9.tgz#0d036192e248d454cb7601b659e7630fd0e37e9d" + react-native-tab-view@^0.0.77: version "0.0.77" resolved "https://registry.yarnpkg.com/react-native-tab-view/-/react-native-tab-view-0.0.77.tgz#11ceb8e7c23100d07e628dc151b57797524d00d4" @@ -4548,6 +4557,12 @@ react-navigation-stack@0.3.0: version "0.3.0" resolved "https://registry.yarnpkg.com/react-navigation-stack/-/react-navigation-stack-0.3.0.tgz#cdd056771e5fd12114811824653b1ec7e9ae5de1" +react-navigation-stack@^0.4.0: + version "0.4.0" + resolved "https://registry.yarnpkg.com/react-navigation-stack/-/react-navigation-stack-0.4.0.tgz#6e1f0800c086ceedfb38005ae20d50c4877396ef" + dependencies: + react-native-screens "^1.0.0-alpha.8" + react-navigation-tabs@0.7.0: version "0.7.0" resolved "https://registry.yarnpkg.com/react-navigation-tabs/-/react-navigation-tabs-0.7.0.tgz#c89d41e501043f7fdb38550de85814452c3e6104" @@ -4848,7 +4863,7 @@ right-align@^0.1.1: dependencies: align-text "^0.1.1" -rimraf@^2.5.4, rimraf@^2.6.1: +rimraf@^2.5.4, rimraf@^2.6.1, rimraf@^2.6.2: version "2.6.2" resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.6.2.tgz#2ed8150d24a16ea8651e6d6ef0f47c4158ce7a36" dependencies: diff --git a/ReduxExample/.buckconfig b/examples/redux/.buckconfig similarity index 100% rename from ReduxExample/.buckconfig rename to examples/redux/.buckconfig diff --git a/ReduxExample/.flowconfig b/examples/redux/.flowconfig similarity index 100% rename from ReduxExample/.flowconfig rename to examples/redux/.flowconfig diff --git a/ReduxExample/.gitattributes b/examples/redux/.gitattributes similarity index 100% rename from ReduxExample/.gitattributes rename to examples/redux/.gitattributes diff --git a/ReduxExample/.gitignore b/examples/redux/.gitignore similarity index 100% rename from ReduxExample/.gitignore rename to examples/redux/.gitignore diff --git a/ReduxExample/.watchmanconfig b/examples/redux/.watchmanconfig similarity index 100% rename from ReduxExample/.watchmanconfig rename to examples/redux/.watchmanconfig diff --git a/ReduxExample/android/app/BUCK b/examples/redux/android/app/BUCK similarity index 95% rename from ReduxExample/android/app/BUCK rename to examples/redux/android/app/BUCK index a5d319691..c04b97f33 100644 --- a/ReduxExample/android/app/BUCK +++ b/examples/redux/android/app/BUCK @@ -45,12 +45,12 @@ android_library( android_build_config( name = "build_config", - package = "com.rnrfsample", + package = "com.rnrfreduxsample", ) android_resource( name = "res", - package = "com.rnrfsample", + package = "com.rnrfreduxsample", res = "src/main/res", ) diff --git a/ReduxExample/android/app/build.gradle b/examples/redux/android/app/build.gradle similarity index 98% rename from ReduxExample/android/app/build.gradle rename to examples/redux/android/app/build.gradle index 734695650..7b5c213fb 100644 --- a/ReduxExample/android/app/build.gradle +++ b/examples/redux/android/app/build.gradle @@ -72,6 +72,10 @@ import com.android.build.OutputFile * ] */ +project.ext.react = [ + entryFile: "index.js" +] + apply from: "../../node_modules/react-native/react.gradle" /** @@ -94,7 +98,7 @@ android { buildToolsVersion rootProject.ext.buildToolsVersion defaultConfig { - applicationId "com.rnrfsample" + applicationId "com.rnrfreduxsample" minSdkVersion rootProject.ext.minSdkVersion targetSdkVersion rootProject.ext.targetSdkVersion versionCode 1 diff --git a/examples/redux/android/app/proguard-rules.pro b/examples/redux/android/app/proguard-rules.pro new file mode 100644 index 000000000..a92fa177e --- /dev/null +++ b/examples/redux/android/app/proguard-rules.pro @@ -0,0 +1,17 @@ +# Add project specific ProGuard rules here. +# By default, the flags in this file are appended to flags specified +# in /usr/local/Cellar/android-sdk/24.3.3/tools/proguard/proguard-android.txt +# You can edit the include path and order by changing the proguardFiles +# directive in build.gradle. +# +# For more details, see +# http://developer.android.com/guide/developing/tools/proguard.html + +# Add any project specific keep options here: + +# If your project uses WebView with JS, uncomment the following +# and specify the fully qualified class name to the JavaScript interface +# class: +#-keepclassmembers class fqcn.of.javascript.interface.for.webview { +# public *; +#} diff --git a/ReduxExample/android/app/src/main/AndroidManifest.xml b/examples/redux/android/app/src/main/AndroidManifest.xml similarity index 81% rename from ReduxExample/android/app/src/main/AndroidManifest.xml rename to examples/redux/android/app/src/main/AndroidManifest.xml index 9822984cc..54f8097be 100644 --- a/ReduxExample/android/app/src/main/AndroidManifest.xml +++ b/examples/redux/android/app/src/main/AndroidManifest.xml @@ -1,20 +1,14 @@ + package="com.rnrfreduxsample"> - - getPackages() { new MainReactPackage() ); } + + @Override + protected String getJSMainModuleName() { + return "index"; + } }; @Override diff --git a/examples/redux/android/app/src/main/res/mipmap-hdpi/ic_launcher.png b/examples/redux/android/app/src/main/res/mipmap-hdpi/ic_launcher.png new file mode 100644 index 000000000..a2f590828 Binary files /dev/null and b/examples/redux/android/app/src/main/res/mipmap-hdpi/ic_launcher.png differ diff --git a/examples/redux/android/app/src/main/res/mipmap-hdpi/ic_launcher_round.png b/examples/redux/android/app/src/main/res/mipmap-hdpi/ic_launcher_round.png new file mode 100644 index 000000000..1b5239980 Binary files /dev/null and b/examples/redux/android/app/src/main/res/mipmap-hdpi/ic_launcher_round.png differ diff --git a/examples/redux/android/app/src/main/res/mipmap-mdpi/ic_launcher.png b/examples/redux/android/app/src/main/res/mipmap-mdpi/ic_launcher.png new file mode 100644 index 000000000..ff10afd6e Binary files /dev/null and b/examples/redux/android/app/src/main/res/mipmap-mdpi/ic_launcher.png differ diff --git a/examples/redux/android/app/src/main/res/mipmap-mdpi/ic_launcher_round.png b/examples/redux/android/app/src/main/res/mipmap-mdpi/ic_launcher_round.png new file mode 100644 index 000000000..115a4c768 Binary files /dev/null and b/examples/redux/android/app/src/main/res/mipmap-mdpi/ic_launcher_round.png differ diff --git a/examples/redux/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/examples/redux/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png new file mode 100644 index 000000000..dcd3cd808 Binary files /dev/null and b/examples/redux/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png differ diff --git a/examples/redux/android/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png b/examples/redux/android/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png new file mode 100644 index 000000000..459ca609d Binary files /dev/null and b/examples/redux/android/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png differ diff --git a/examples/redux/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/examples/redux/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png new file mode 100644 index 000000000..8ca12fe02 Binary files /dev/null and b/examples/redux/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png differ diff --git a/examples/redux/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png b/examples/redux/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png new file mode 100644 index 000000000..8e19b410a Binary files /dev/null and b/examples/redux/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png differ diff --git a/examples/redux/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/examples/redux/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png new file mode 100644 index 000000000..b824ebdd4 Binary files /dev/null and b/examples/redux/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png differ diff --git a/examples/redux/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png b/examples/redux/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png new file mode 100644 index 000000000..4c19a13c2 Binary files /dev/null and b/examples/redux/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png differ diff --git a/examples/redux/android/app/src/main/res/values/strings.xml b/examples/redux/android/app/src/main/res/values/strings.xml new file mode 100644 index 000000000..4504f309a --- /dev/null +++ b/examples/redux/android/app/src/main/res/values/strings.xml @@ -0,0 +1,3 @@ + + RNRF Redux Sample + diff --git a/ReduxExample/android/app/src/main/res/values/styles.xml b/examples/redux/android/app/src/main/res/values/styles.xml similarity index 100% rename from ReduxExample/android/app/src/main/res/values/styles.xml rename to examples/redux/android/app/src/main/res/values/styles.xml diff --git a/examples/redux/android/build.gradle b/examples/redux/android/build.gradle new file mode 100644 index 000000000..49569e4db --- /dev/null +++ b/examples/redux/android/build.gradle @@ -0,0 +1,40 @@ +// Top-level build file where you can add configuration options common to all sub-projects/modules. + +buildscript { + repositories { + jcenter() + maven { + url 'https://maven.google.com/' + name 'Google' + } + } + dependencies { + classpath 'com.android.tools.build:gradle:2.3.3' + + // NOTE: Do not place your application dependencies here; they belong + // in the individual module build.gradle files + } +} + +allprojects { + repositories { + mavenLocal() + jcenter() + maven { + // All of React Native (JS, Obj-C sources, Android binaries) is installed from npm + url "$rootDir/../node_modules/react-native/android" + } + maven { + url 'https://maven.google.com/' + name 'Google' + } + } +} + +ext { + buildToolsVersion = "26.0.3" + minSdkVersion = 16 + compileSdkVersion = 26 + targetSdkVersion = 26 + supportLibVersion = "26.1.0" +} diff --git a/ReduxExample/android/gradle.properties b/examples/redux/android/gradle.properties similarity index 88% rename from ReduxExample/android/gradle.properties rename to examples/redux/android/gradle.properties index 9cf708c38..1fd964e90 100644 --- a/ReduxExample/android/gradle.properties +++ b/examples/redux/android/gradle.properties @@ -17,8 +17,4 @@ # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects # org.gradle.parallel=true -org.gradle.daemon=false -org.gradle.parallel=false -org.gradle.configureondemand=false android.useDeprecatedNdk=true -android.enableAapt2=false diff --git a/ReduxExample/android/gradle/wrapper/gradle-wrapper.jar b/examples/redux/android/gradle/wrapper/gradle-wrapper.jar similarity index 100% rename from ReduxExample/android/gradle/wrapper/gradle-wrapper.jar rename to examples/redux/android/gradle/wrapper/gradle-wrapper.jar diff --git a/ReduxExample/android/gradle/wrapper/gradle-wrapper.properties b/examples/redux/android/gradle/wrapper/gradle-wrapper.properties similarity index 92% rename from ReduxExample/android/gradle/wrapper/gradle-wrapper.properties rename to examples/redux/android/gradle/wrapper/gradle-wrapper.properties index b6517bb1d..81a86e213 100644 --- a/ReduxExample/android/gradle/wrapper/gradle-wrapper.properties +++ b/examples/redux/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-4.4-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-3.5.1-all.zip diff --git a/ReduxExample/android/gradlew b/examples/redux/android/gradlew similarity index 100% rename from ReduxExample/android/gradlew rename to examples/redux/android/gradlew diff --git a/ReduxExample/android/gradlew.bat b/examples/redux/android/gradlew.bat similarity index 100% rename from ReduxExample/android/gradlew.bat rename to examples/redux/android/gradlew.bat diff --git a/ReduxExample/android/keystores/BUCK b/examples/redux/android/keystores/BUCK similarity index 100% rename from ReduxExample/android/keystores/BUCK rename to examples/redux/android/keystores/BUCK diff --git a/ReduxExample/android/keystores/debug.keystore.properties b/examples/redux/android/keystores/debug.keystore.properties similarity index 100% rename from ReduxExample/android/keystores/debug.keystore.properties rename to examples/redux/android/keystores/debug.keystore.properties diff --git a/examples/redux/android/settings.gradle b/examples/redux/android/settings.gradle new file mode 100644 index 000000000..7bce06a69 --- /dev/null +++ b/examples/redux/android/settings.gradle @@ -0,0 +1,3 @@ +rootProject.name = 'rnrfReduxSample' + +include ':app' diff --git a/examples/redux/app.json b/examples/redux/app.json new file mode 100644 index 000000000..4200c64fb --- /dev/null +++ b/examples/redux/app.json @@ -0,0 +1,4 @@ +{ + "displayName": "RNRF Redux Sample", + "name": "rnrfReduxSample" +} \ No newline at end of file diff --git a/ReduxExample/babel.config.js b/examples/redux/babel.config.js similarity index 100% rename from ReduxExample/babel.config.js rename to examples/redux/babel.config.js diff --git a/ReduxExample/index.android.js b/examples/redux/index.android.js similarity index 55% rename from ReduxExample/index.android.js rename to examples/redux/index.android.js index ec0af0ea6..0f39ec512 100644 --- a/ReduxExample/index.android.js +++ b/examples/redux/index.android.js @@ -1,4 +1,4 @@ import { AppRegistry } from 'react-native'; import App from './src/app'; -AppRegistry.registerComponent('rnrfSample', () => App); \ No newline at end of file +AppRegistry.registerComponent('rnrfReduxSample', () => App); \ No newline at end of file diff --git a/ReduxExample/index.ios.js b/examples/redux/index.ios.js similarity index 55% rename from ReduxExample/index.ios.js rename to examples/redux/index.ios.js index ec0af0ea6..0f39ec512 100644 --- a/ReduxExample/index.ios.js +++ b/examples/redux/index.ios.js @@ -1,4 +1,4 @@ import { AppRegistry } from 'react-native'; import App from './src/app'; -AppRegistry.registerComponent('rnrfSample', () => App); \ No newline at end of file +AppRegistry.registerComponent('rnrfReduxSample', () => App); \ No newline at end of file diff --git a/ReduxExample/ios/rnrfSample-tvOS/Info.plist b/examples/redux/ios/rnrfReduxSample-tvOS/Info.plist similarity index 100% rename from ReduxExample/ios/rnrfSample-tvOS/Info.plist rename to examples/redux/ios/rnrfReduxSample-tvOS/Info.plist diff --git a/ReduxExample/ios/rnrfSample-tvOSTests/Info.plist b/examples/redux/ios/rnrfReduxSample-tvOSTests/Info.plist similarity index 100% rename from ReduxExample/ios/rnrfSample-tvOSTests/Info.plist rename to examples/redux/ios/rnrfReduxSample-tvOSTests/Info.plist diff --git a/ReduxExample/ios/rnrfSample.xcodeproj/project.pbxproj b/examples/redux/ios/rnrfReduxSample.xcodeproj/project.pbxproj similarity index 75% rename from ReduxExample/ios/rnrfSample.xcodeproj/project.pbxproj rename to examples/redux/ios/rnrfReduxSample.xcodeproj/project.pbxproj index 03f6fdbf6..9ebb73e94 100644 --- a/ReduxExample/ios/rnrfSample.xcodeproj/project.pbxproj +++ b/examples/redux/ios/rnrfReduxSample.xcodeproj/project.pbxproj @@ -12,7 +12,7 @@ 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 */; }; - 00E356F31AD99517003FC87E /* rnrfSampleTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 00E356F21AD99517003FC87E /* rnrfSampleTests.m */; }; + 00E356F31AD99517003FC87E /* rnrfReduxSampleTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 00E356F21AD99517003FC87E /* rnrfReduxSampleTests.m */; }; 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 */; }; @@ -25,17 +25,19 @@ 2D02E4BC1E0B4A80006451C7 /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 13B07FB01A68108700A75B9A /* AppDelegate.m */; }; 2D02E4BD1E0B4A84006451C7 /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 13B07FB51A68108700A75B9A /* Images.xcassets */; }; 2D02E4BF1E0B4AB3006451C7 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 13B07FB71A68108700A75B9A /* main.m */; }; - 2D02E4C21E0B4AEC006451C7 /* libRCTAnimation-tvOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5E9157351DD0AC6500FF2AA8 /* libRCTAnimation-tvOS.a */; }; + 2D02E4C21E0B4AEC006451C7 /* libRCTAnimation.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5E9157351DD0AC6500FF2AA8 /* libRCTAnimation.a */; }; 2D02E4C31E0B4AEC006451C7 /* libRCTImage-tvOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3DAD3E841DF850E9000B6D8A /* libRCTImage-tvOS.a */; }; 2D02E4C41E0B4AEC006451C7 /* libRCTLinking-tvOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3DAD3E881DF850E9000B6D8A /* libRCTLinking-tvOS.a */; }; 2D02E4C51E0B4AEC006451C7 /* libRCTNetwork-tvOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3DAD3E8C1DF850E9000B6D8A /* libRCTNetwork-tvOS.a */; }; 2D02E4C61E0B4AEC006451C7 /* libRCTSettings-tvOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3DAD3E901DF850E9000B6D8A /* libRCTSettings-tvOS.a */; }; 2D02E4C71E0B4AEC006451C7 /* libRCTText-tvOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3DAD3E941DF850E9000B6D8A /* libRCTText-tvOS.a */; }; 2D02E4C81E0B4AEC006451C7 /* libRCTWebSocket-tvOS.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3DAD3E991DF850E9000B6D8A /* libRCTWebSocket-tvOS.a */; }; - 2D02E4C91E0B4AEC006451C7 /* libReact.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3DAD3EA31DF850E9000B6D8A /* libReact.a */; }; - 2DCD954D1E0B4F2C00145EB5 /* rnrfSampleTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 00E356F21AD99517003FC87E /* rnrfSampleTests.m */; }; + 2D16E6881FA4F8E400B85C8A /* libReact.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 2D16E6891FA4F8E400B85C8A /* libReact.a */; }; + 2DCD954D1E0B4F2C00145EB5 /* rnrfReduxSampleTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 00E356F21AD99517003FC87E /* rnrfReduxSampleTests.m */; }; + 2DF0FFEE2056DD460020B375 /* libReact.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3DAD3EA31DF850E9000B6D8A /* libReact.a */; }; 5E9157361DD0AC6A00FF2AA8 /* libRCTAnimation.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5E9157331DD0AC6500FF2AA8 /* libRCTAnimation.a */; }; 832341BD1AAA6AB300B99B32 /* libRCTText.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 832341B51AAA6A8300B99B32 /* libRCTText.a */; }; + ADBDB9381DFEBF1600ED6528 /* libRCTBlob.a in Frameworks */ = {isa = PBXBuildFile; fileRef = ADBDB9271DFEBF0700ED6528 /* libRCTBlob.a */; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ @@ -79,7 +81,7 @@ containerPortal = 83CBB9F71A601CBA00E9B192 /* Project object */; proxyType = 1; remoteGlobalIDString = 13B07F861A680F5B00A75B9A; - remoteInfo = rnrfSample; + remoteInfo = rnrfReduxSample; }; 139105C01AF99BAD00B5F7CC /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; @@ -107,7 +109,84 @@ containerPortal = 83CBB9F71A601CBA00E9B192 /* Project object */; proxyType = 1; remoteGlobalIDString = 2D02E47A1E0B4A5D006451C7; - remoteInfo = "rnrfSample-tvOS"; + remoteInfo = "rnrfReduxSample-tvOS"; + }; + 2D16E6711FA4F8DC00B85C8A /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = ADBDB91F1DFEBF0600ED6528 /* RCTBlob.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = ADD01A681E09402E00F6D226; + remoteInfo = "RCTBlob-tvOS"; + }; + 2D16E6831FA4F8DC00B85C8A /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 139FDEE61B06529A00C62182 /* RCTWebSocket.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 3DBE0D001F3B181A0099AA32; + remoteInfo = fishhook; + }; + 2D16E6851FA4F8DC00B85C8A /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 139FDEE61B06529A00C62182 /* RCTWebSocket.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 3DBE0D0D1F3B181C0099AA32; + remoteInfo = "fishhook-tvOS"; + }; + 2DF0FFDE2056DD460020B375 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 146833FF1AC3E56700842450 /* React.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = EBF21BDC1FC498900052F4D5; + remoteInfo = jsinspector; + }; + 2DF0FFE02056DD460020B375 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 146833FF1AC3E56700842450 /* React.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = EBF21BFA1FC4989A0052F4D5; + remoteInfo = "jsinspector-tvOS"; + }; + 2DF0FFE22056DD460020B375 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 146833FF1AC3E56700842450 /* React.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 139D7ECE1E25DB7D00323FB7; + remoteInfo = "third-party"; + }; + 2DF0FFE42056DD460020B375 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 146833FF1AC3E56700842450 /* React.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 3D383D3C1EBD27B6005632C8; + remoteInfo = "third-party-tvOS"; + }; + 2DF0FFE62056DD460020B375 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 146833FF1AC3E56700842450 /* React.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 139D7E881E25C6D100323FB7; + remoteInfo = "double-conversion"; + }; + 2DF0FFE82056DD460020B375 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 146833FF1AC3E56700842450 /* React.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 3D383D621EBD27B9005632C8; + remoteInfo = "double-conversion-tvOS"; + }; + 2DF0FFEA2056DD460020B375 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 146833FF1AC3E56700842450 /* React.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 9936F3131F5F2E4B0010BF04; + remoteInfo = privatedata; + }; + 2DF0FFEC2056DD460020B375 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 146833FF1AC3E56700842450 /* React.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 9936F32F1F5F2E5B0010BF04; + remoteInfo = "privatedata-tvOS"; }; 3DAD3E831DF850E9000B6D8A /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; @@ -228,6 +307,13 @@ remoteGlobalIDString = 58B5119B1A9E6C1200147676; remoteInfo = RCTText; }; + ADBDB9261DFEBF0700ED6528 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = ADBDB91F1DFEBF0600ED6528 /* RCTBlob.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 358F4ED71D1E81A9004DF814; + remoteInfo = RCTBlob; + }; /* End PBXContainerItemProxy section */ /* Begin PBXFileReference section */ @@ -237,24 +323,26 @@ 00C302BB1ABCB91800DB3ED1 /* RCTImage.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTImage.xcodeproj; path = "../node_modules/react-native/Libraries/Image/RCTImage.xcodeproj"; sourceTree = ""; }; 00C302D31ABCB9D200DB3ED1 /* RCTNetwork.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTNetwork.xcodeproj; path = "../node_modules/react-native/Libraries/Network/RCTNetwork.xcodeproj"; sourceTree = ""; }; 00C302DF1ABCB9EE00DB3ED1 /* RCTVibration.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTVibration.xcodeproj; path = "../node_modules/react-native/Libraries/Vibration/RCTVibration.xcodeproj"; sourceTree = ""; }; - 00E356EE1AD99517003FC87E /* rnrfSampleTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = rnrfSampleTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; + 00E356EE1AD99517003FC87E /* rnrfReduxSampleTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = rnrfReduxSampleTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; 00E356F11AD99517003FC87E /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; - 00E356F21AD99517003FC87E /* rnrfSampleTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = rnrfSampleTests.m; sourceTree = ""; }; + 00E356F21AD99517003FC87E /* rnrfReduxSampleTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = rnrfReduxSampleTests.m; sourceTree = ""; }; 139105B61AF99BAD00B5F7CC /* RCTSettings.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTSettings.xcodeproj; path = "../node_modules/react-native/Libraries/Settings/RCTSettings.xcodeproj"; sourceTree = ""; }; 139FDEE61B06529A00C62182 /* RCTWebSocket.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTWebSocket.xcodeproj; path = "../node_modules/react-native/Libraries/WebSocket/RCTWebSocket.xcodeproj"; sourceTree = ""; }; - 13B07F961A680F5B00A75B9A /* rnrfSample.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = rnrfSample.app; sourceTree = BUILT_PRODUCTS_DIR; }; - 13B07FAF1A68108700A75B9A /* AppDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AppDelegate.h; path = rnrfSample/AppDelegate.h; sourceTree = ""; }; - 13B07FB01A68108700A75B9A /* AppDelegate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = AppDelegate.m; path = rnrfSample/AppDelegate.m; sourceTree = ""; }; + 13B07F961A680F5B00A75B9A /* rnrfReduxSample.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = rnrfReduxSample.app; sourceTree = BUILT_PRODUCTS_DIR; }; + 13B07FAF1A68108700A75B9A /* AppDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AppDelegate.h; path = rnrfReduxSample/AppDelegate.h; sourceTree = ""; }; + 13B07FB01A68108700A75B9A /* AppDelegate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = AppDelegate.m; path = rnrfReduxSample/AppDelegate.m; sourceTree = ""; }; 13B07FB21A68108700A75B9A /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/LaunchScreen.xib; sourceTree = ""; }; - 13B07FB51A68108700A75B9A /* Images.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; name = Images.xcassets; path = rnrfSample/Images.xcassets; sourceTree = ""; }; - 13B07FB61A68108700A75B9A /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = Info.plist; path = rnrfSample/Info.plist; sourceTree = ""; }; - 13B07FB71A68108700A75B9A /* main.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = main.m; path = rnrfSample/main.m; sourceTree = ""; }; + 13B07FB51A68108700A75B9A /* Images.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; name = Images.xcassets; path = rnrfReduxSample/Images.xcassets; sourceTree = ""; }; + 13B07FB61A68108700A75B9A /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = Info.plist; path = rnrfReduxSample/Info.plist; sourceTree = ""; }; + 13B07FB71A68108700A75B9A /* main.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = main.m; path = rnrfReduxSample/main.m; sourceTree = ""; }; 146833FF1AC3E56700842450 /* React.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = React.xcodeproj; path = "../node_modules/react-native/React/React.xcodeproj"; sourceTree = ""; }; - 2D02E47B1E0B4A5D006451C7 /* rnrfSample-tvOS.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "rnrfSample-tvOS.app"; sourceTree = BUILT_PRODUCTS_DIR; }; - 2D02E4901E0B4A5D006451C7 /* rnrfSample-tvOSTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = "rnrfSample-tvOSTests.xctest"; sourceTree = BUILT_PRODUCTS_DIR; }; + 2D02E47B1E0B4A5D006451C7 /* rnrfReduxSample-tvOS.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "rnrfReduxSample-tvOS.app"; sourceTree = BUILT_PRODUCTS_DIR; }; + 2D02E4901E0B4A5D006451C7 /* rnrfReduxSample-tvOSTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = "rnrfReduxSample-tvOSTests.xctest"; sourceTree = BUILT_PRODUCTS_DIR; }; + 2D16E6891FA4F8E400B85C8A /* libReact.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = libReact.a; sourceTree = BUILT_PRODUCTS_DIR; }; 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 = ""; }; + ADBDB91F1DFEBF0600ED6528 /* RCTBlob.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTBlob.xcodeproj; path = "../node_modules/react-native/Libraries/Blob/RCTBlob.xcodeproj"; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -270,6 +358,8 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + ADBDB9381DFEBF1600ED6528 /* libRCTBlob.a in Frameworks */, + 5E9157361DD0AC6A00FF2AA8 /* libRCTAnimation.a in Frameworks */, 146834051AC3E58100842450 /* libReact.a in Frameworks */, 5E9157361DD0AC6A00FF2AA8 /* libRCTAnimation.a in Frameworks */, 00C302E51ABCBA2D00DB3ED1 /* libRCTActionSheet.a in Frameworks */, @@ -288,8 +378,8 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 2D02E4C91E0B4AEC006451C7 /* libReact.a in Frameworks */, - 2D02E4C21E0B4AEC006451C7 /* libRCTAnimation-tvOS.a in Frameworks */, + 2D16E6881FA4F8E400B85C8A /* libReact.a in Frameworks */, + 2D02E4C21E0B4AEC006451C7 /* libRCTAnimation.a in Frameworks */, 2D02E4C31E0B4AEC006451C7 /* libRCTImage-tvOS.a in Frameworks */, 2D02E4C41E0B4AEC006451C7 /* libRCTLinking-tvOS.a in Frameworks */, 2D02E4C51E0B4AEC006451C7 /* libRCTNetwork-tvOS.a in Frameworks */, @@ -303,6 +393,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + 2DF0FFEE2056DD460020B375 /* libReact.a in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -351,13 +442,13 @@ name = Products; sourceTree = ""; }; - 00E356EF1AD99517003FC87E /* rnrfSampleTests */ = { + 00E356EF1AD99517003FC87E /* rnrfReduxSampleTests */ = { isa = PBXGroup; children = ( - 00E356F21AD99517003FC87E /* rnrfSampleTests.m */, + 00E356F21AD99517003FC87E /* rnrfReduxSampleTests.m */, 00E356F01AD99517003FC87E /* Supporting Files */, ); - path = rnrfSampleTests; + path = rnrfReduxSampleTests; sourceTree = ""; }; 00E356F01AD99517003FC87E /* Supporting Files */ = { @@ -382,11 +473,13 @@ children = ( 139FDEF41B06529B00C62182 /* libRCTWebSocket.a */, 3DAD3E991DF850E9000B6D8A /* libRCTWebSocket-tvOS.a */, + 2D16E6841FA4F8DC00B85C8A /* libfishhook.a */, + 2D16E6861FA4F8DC00B85C8A /* libfishhook-tvOS.a */, ); name = Products; sourceTree = ""; }; - 13B07FAE1A68108700A75B9A /* rnrfSample */ = { + 13B07FAE1A68108700A75B9A /* rnrfReduxSample */ = { isa = PBXGroup; children = ( 008F07F21AC5B25A0029DE68 /* main.jsbundle */, @@ -397,7 +490,7 @@ 13B07FB11A68108700A75B9A /* LaunchScreen.xib */, 13B07FB71A68108700A75B9A /* main.m */, ); - name = rnrfSample; + name = rnrfReduxSample; sourceTree = ""; }; 146834001AC3E56700842450 /* Products */ = { @@ -411,15 +504,31 @@ 3DAD3EAB1DF850E9000B6D8A /* libcxxreact.a */, 3DAD3EAD1DF850E9000B6D8A /* libjschelpers.a */, 3DAD3EAF1DF850E9000B6D8A /* libjschelpers.a */, + 2DF0FFDF2056DD460020B375 /* libjsinspector.a */, + 2DF0FFE12056DD460020B375 /* libjsinspector-tvOS.a */, + 2DF0FFE32056DD460020B375 /* libthird-party.a */, + 2DF0FFE52056DD460020B375 /* libthird-party.a */, + 2DF0FFE72056DD460020B375 /* libdouble-conversion.a */, + 2DF0FFE92056DD460020B375 /* libdouble-conversion.a */, + 2DF0FFEB2056DD460020B375 /* libprivatedata.a */, + 2DF0FFED2056DD460020B375 /* libprivatedata-tvOS.a */, ); name = Products; sourceTree = ""; }; + 2D16E6871FA4F8E400B85C8A /* Frameworks */ = { + isa = PBXGroup; + children = ( + 2D16E6891FA4F8E400B85C8A /* libReact.a */, + ); + name = Frameworks; + sourceTree = ""; + }; 5E91572E1DD0AC6500FF2AA8 /* Products */ = { isa = PBXGroup; children = ( 5E9157331DD0AC6500FF2AA8 /* libRCTAnimation.a */, - 5E9157351DD0AC6500FF2AA8 /* libRCTAnimation-tvOS.a */, + 5E9157351DD0AC6500FF2AA8 /* libRCTAnimation.a */, ); name = Products; sourceTree = ""; @@ -439,6 +548,7 @@ 5E91572D1DD0AC6500FF2AA8 /* RCTAnimation.xcodeproj */, 146833FF1AC3E56700842450 /* React.xcodeproj */, 00C302A71ABCB8CE00DB3ED1 /* RCTActionSheet.xcodeproj */, + ADBDB91F1DFEBF0600ED6528 /* RCTBlob.xcodeproj */, 00C302B51ABCB90400DB3ED1 /* RCTGeolocation.xcodeproj */, 00C302BB1ABCB91800DB3ED1 /* RCTImage.xcodeproj */, 78C398B01ACF4ADC00677621 /* RCTLinking.xcodeproj */, @@ -463,22 +573,33 @@ 83CBB9F61A601CBA00E9B192 = { isa = PBXGroup; children = ( - 13B07FAE1A68108700A75B9A /* rnrfSample */, + 13B07FAE1A68108700A75B9A /* rnrfReduxSample */, 832341AE1AAA6A7D00B99B32 /* Libraries */, - 00E356EF1AD99517003FC87E /* rnrfSampleTests */, + 00E356EF1AD99517003FC87E /* rnrfReduxSampleTests */, 83CBBA001A601CBA00E9B192 /* Products */, + 2D16E6871FA4F8E400B85C8A /* Frameworks */, ); indentWidth = 2; sourceTree = ""; tabWidth = 2; + usesTabs = 0; }; 83CBBA001A601CBA00E9B192 /* Products */ = { isa = PBXGroup; children = ( - 13B07F961A680F5B00A75B9A /* rnrfSample.app */, - 00E356EE1AD99517003FC87E /* rnrfSampleTests.xctest */, - 2D02E47B1E0B4A5D006451C7 /* rnrfSample-tvOS.app */, - 2D02E4901E0B4A5D006451C7 /* rnrfSample-tvOSTests.xctest */, + 13B07F961A680F5B00A75B9A /* rnrfReduxSample.app */, + 00E356EE1AD99517003FC87E /* rnrfReduxSampleTests.xctest */, + 2D02E47B1E0B4A5D006451C7 /* rnrfReduxSample-tvOS.app */, + 2D02E4901E0B4A5D006451C7 /* rnrfReduxSample-tvOSTests.xctest */, + ); + name = Products; + sourceTree = ""; + }; + ADBDB9201DFEBF0600ED6528 /* Products */ = { + isa = PBXGroup; + children = ( + ADBDB9271DFEBF0700ED6528 /* libRCTBlob.a */, + 2D16E6721FA4F8DC00B85C8A /* libRCTBlob-tvOS.a */, ); name = Products; sourceTree = ""; @@ -486,9 +607,9 @@ /* End PBXGroup section */ /* Begin PBXNativeTarget section */ - 00E356ED1AD99517003FC87E /* rnrfSampleTests */ = { + 00E356ED1AD99517003FC87E /* rnrfReduxSampleTests */ = { isa = PBXNativeTarget; - buildConfigurationList = 00E357021AD99517003FC87E /* Build configuration list for PBXNativeTarget "rnrfSampleTests" */; + buildConfigurationList = 00E357021AD99517003FC87E /* Build configuration list for PBXNativeTarget "rnrfReduxSampleTests" */; buildPhases = ( 00E356EA1AD99517003FC87E /* Sources */, 00E356EB1AD99517003FC87E /* Frameworks */, @@ -499,14 +620,14 @@ dependencies = ( 00E356F51AD99517003FC87E /* PBXTargetDependency */, ); - name = rnrfSampleTests; - productName = rnrfSampleTests; - productReference = 00E356EE1AD99517003FC87E /* rnrfSampleTests.xctest */; + name = rnrfReduxSampleTests; + productName = rnrfReduxSampleTests; + productReference = 00E356EE1AD99517003FC87E /* rnrfReduxSampleTests.xctest */; productType = "com.apple.product-type.bundle.unit-test"; }; - 13B07F861A680F5B00A75B9A /* rnrfSample */ = { + 13B07F861A680F5B00A75B9A /* rnrfReduxSample */ = { isa = PBXNativeTarget; - buildConfigurationList = 13B07F931A680F5B00A75B9A /* Build configuration list for PBXNativeTarget "rnrfSample" */; + buildConfigurationList = 13B07F931A680F5B00A75B9A /* Build configuration list for PBXNativeTarget "rnrfReduxSample" */; buildPhases = ( 13B07F871A680F5B00A75B9A /* Sources */, 13B07F8C1A680F5B00A75B9A /* Frameworks */, @@ -517,14 +638,14 @@ ); dependencies = ( ); - name = rnrfSample; + name = rnrfReduxSample; productName = "Hello World"; - productReference = 13B07F961A680F5B00A75B9A /* rnrfSample.app */; + productReference = 13B07F961A680F5B00A75B9A /* rnrfReduxSample.app */; productType = "com.apple.product-type.application"; }; - 2D02E47A1E0B4A5D006451C7 /* rnrfSample-tvOS */ = { + 2D02E47A1E0B4A5D006451C7 /* rnrfReduxSample-tvOS */ = { isa = PBXNativeTarget; - buildConfigurationList = 2D02E4BA1E0B4A5E006451C7 /* Build configuration list for PBXNativeTarget "rnrfSample-tvOS" */; + buildConfigurationList = 2D02E4BA1E0B4A5E006451C7 /* Build configuration list for PBXNativeTarget "rnrfReduxSample-tvOS" */; buildPhases = ( 2D02E4771E0B4A5D006451C7 /* Sources */, 2D02E4781E0B4A5D006451C7 /* Frameworks */, @@ -535,14 +656,14 @@ ); dependencies = ( ); - name = "rnrfSample-tvOS"; - productName = "rnrfSample-tvOS"; - productReference = 2D02E47B1E0B4A5D006451C7 /* rnrfSample-tvOS.app */; + name = "rnrfReduxSample-tvOS"; + productName = "rnrfReduxSample-tvOS"; + productReference = 2D02E47B1E0B4A5D006451C7 /* rnrfReduxSample-tvOS.app */; productType = "com.apple.product-type.application"; }; - 2D02E48F1E0B4A5D006451C7 /* rnrfSample-tvOSTests */ = { + 2D02E48F1E0B4A5D006451C7 /* rnrfReduxSample-tvOSTests */ = { isa = PBXNativeTarget; - buildConfigurationList = 2D02E4BB1E0B4A5E006451C7 /* Build configuration list for PBXNativeTarget "rnrfSample-tvOSTests" */; + buildConfigurationList = 2D02E4BB1E0B4A5E006451C7 /* Build configuration list for PBXNativeTarget "rnrfReduxSample-tvOSTests" */; buildPhases = ( 2D02E48C1E0B4A5D006451C7 /* Sources */, 2D02E48D1E0B4A5D006451C7 /* Frameworks */, @@ -553,9 +674,9 @@ dependencies = ( 2D02E4921E0B4A5D006451C7 /* PBXTargetDependency */, ); - name = "rnrfSample-tvOSTests"; - productName = "rnrfSample-tvOSTests"; - productReference = 2D02E4901E0B4A5D006451C7 /* rnrfSample-tvOSTests.xctest */; + name = "rnrfReduxSample-tvOSTests"; + productName = "rnrfReduxSample-tvOSTests"; + productReference = 2D02E4901E0B4A5D006451C7 /* rnrfReduxSample-tvOSTests.xctest */; productType = "com.apple.product-type.bundle.unit-test"; }; /* End PBXNativeTarget section */ @@ -582,7 +703,7 @@ }; }; }; - buildConfigurationList = 83CBB9FA1A601CBA00E9B192 /* Build configuration list for PBXProject "rnrfSample" */; + buildConfigurationList = 83CBB9FA1A601CBA00E9B192 /* Build configuration list for PBXProject "rnrfReduxSample" */; compatibilityVersion = "Xcode 3.2"; developmentRegion = English; hasScannedForEncodings = 0; @@ -602,6 +723,10 @@ ProductGroup = 5E91572E1DD0AC6500FF2AA8 /* Products */; ProjectRef = 5E91572D1DD0AC6500FF2AA8 /* RCTAnimation.xcodeproj */; }, + { + ProductGroup = ADBDB9201DFEBF0600ED6528 /* Products */; + ProjectRef = ADBDB91F1DFEBF0600ED6528 /* RCTBlob.xcodeproj */; + }, { ProductGroup = 00C302B61ABCB90400DB3ED1 /* Products */; ProjectRef = 00C302B51ABCB90400DB3ED1 /* RCTGeolocation.xcodeproj */; @@ -641,10 +766,10 @@ ); projectRoot = ""; targets = ( - 13B07F861A680F5B00A75B9A /* rnrfSample */, - 00E356ED1AD99517003FC87E /* rnrfSampleTests */, - 2D02E47A1E0B4A5D006451C7 /* rnrfSample-tvOS */, - 2D02E48F1E0B4A5D006451C7 /* rnrfSample-tvOSTests */, + 13B07F861A680F5B00A75B9A /* rnrfReduxSample */, + 00E356ED1AD99517003FC87E /* rnrfReduxSampleTests */, + 2D02E47A1E0B4A5D006451C7 /* rnrfReduxSample-tvOS */, + 2D02E48F1E0B4A5D006451C7 /* rnrfReduxSample-tvOSTests */, ); }; /* End PBXProject section */ @@ -706,6 +831,83 @@ remoteRef = 146834031AC3E56700842450 /* PBXContainerItemProxy */; sourceTree = BUILT_PRODUCTS_DIR; }; + 2D16E6721FA4F8DC00B85C8A /* libRCTBlob-tvOS.a */ = { + isa = PBXReferenceProxy; + fileType = archive.ar; + path = "libRCTBlob-tvOS.a"; + remoteRef = 2D16E6711FA4F8DC00B85C8A /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 2D16E6841FA4F8DC00B85C8A /* libfishhook.a */ = { + isa = PBXReferenceProxy; + fileType = archive.ar; + path = libfishhook.a; + remoteRef = 2D16E6831FA4F8DC00B85C8A /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 2D16E6861FA4F8DC00B85C8A /* libfishhook-tvOS.a */ = { + isa = PBXReferenceProxy; + fileType = archive.ar; + path = "libfishhook-tvOS.a"; + remoteRef = 2D16E6851FA4F8DC00B85C8A /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 2DF0FFDF2056DD460020B375 /* libjsinspector.a */ = { + isa = PBXReferenceProxy; + fileType = archive.ar; + path = libjsinspector.a; + remoteRef = 2DF0FFDE2056DD460020B375 /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 2DF0FFE12056DD460020B375 /* libjsinspector-tvOS.a */ = { + isa = PBXReferenceProxy; + fileType = archive.ar; + path = "libjsinspector-tvOS.a"; + remoteRef = 2DF0FFE02056DD460020B375 /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 2DF0FFE32056DD460020B375 /* libthird-party.a */ = { + isa = PBXReferenceProxy; + fileType = archive.ar; + path = "libthird-party.a"; + remoteRef = 2DF0FFE22056DD460020B375 /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 2DF0FFE52056DD460020B375 /* libthird-party.a */ = { + isa = PBXReferenceProxy; + fileType = archive.ar; + path = "libthird-party.a"; + remoteRef = 2DF0FFE42056DD460020B375 /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 2DF0FFE72056DD460020B375 /* libdouble-conversion.a */ = { + isa = PBXReferenceProxy; + fileType = archive.ar; + path = "libdouble-conversion.a"; + remoteRef = 2DF0FFE62056DD460020B375 /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 2DF0FFE92056DD460020B375 /* libdouble-conversion.a */ = { + isa = PBXReferenceProxy; + fileType = archive.ar; + path = "libdouble-conversion.a"; + remoteRef = 2DF0FFE82056DD460020B375 /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 2DF0FFEB2056DD460020B375 /* libprivatedata.a */ = { + isa = PBXReferenceProxy; + fileType = archive.ar; + path = libprivatedata.a; + remoteRef = 2DF0FFEA2056DD460020B375 /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 2DF0FFED2056DD460020B375 /* libprivatedata-tvOS.a */ = { + isa = PBXReferenceProxy; + fileType = archive.ar; + path = "libprivatedata-tvOS.a"; + remoteRef = 2DF0FFEC2056DD460020B375 /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; 3DAD3E841DF850E9000B6D8A /* libRCTImage-tvOS.a */ = { isa = PBXReferenceProxy; fileType = archive.ar; @@ -804,10 +1006,10 @@ remoteRef = 5E9157321DD0AC6500FF2AA8 /* PBXContainerItemProxy */; sourceTree = BUILT_PRODUCTS_DIR; }; - 5E9157351DD0AC6500FF2AA8 /* libRCTAnimation-tvOS.a */ = { + 5E9157351DD0AC6500FF2AA8 /* libRCTAnimation.a */ = { isa = PBXReferenceProxy; fileType = archive.ar; - path = "libRCTAnimation-tvOS.a"; + path = libRCTAnimation.a; remoteRef = 5E9157341DD0AC6500FF2AA8 /* PBXContainerItemProxy */; sourceTree = BUILT_PRODUCTS_DIR; }; @@ -825,6 +1027,13 @@ remoteRef = 832341B41AAA6A8300B99B32 /* PBXContainerItemProxy */; sourceTree = BUILT_PRODUCTS_DIR; }; + ADBDB9271DFEBF0700ED6528 /* libRCTBlob.a */ = { + isa = PBXReferenceProxy; + fileType = archive.ar; + path = libRCTBlob.a; + remoteRef = ADBDB9261DFEBF0700ED6528 /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; /* End PBXReferenceProxy section */ /* Begin PBXResourcesBuildPhase section */ @@ -897,7 +1106,7 @@ isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( - 00E356F31AD99517003FC87E /* rnrfSampleTests.m in Sources */, + 00E356F31AD99517003FC87E /* rnrfReduxSampleTests.m in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -923,7 +1132,7 @@ isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( - 2DCD954D1E0B4F2C00145EB5 /* rnrfSampleTests.m in Sources */, + 2DCD954D1E0B4F2C00145EB5 /* rnrfReduxSampleTests.m in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -932,12 +1141,12 @@ /* Begin PBXTargetDependency section */ 00E356F51AD99517003FC87E /* PBXTargetDependency */ = { isa = PBXTargetDependency; - target = 13B07F861A680F5B00A75B9A /* rnrfSample */; + target = 13B07F861A680F5B00A75B9A /* rnrfReduxSample */; targetProxy = 00E356F41AD99517003FC87E /* PBXContainerItemProxy */; }; 2D02E4921E0B4A5D006451C7 /* PBXTargetDependency */ = { isa = PBXTargetDependency; - target = 2D02E47A1E0B4A5D006451C7 /* rnrfSample-tvOS */; + target = 2D02E47A1E0B4A5D006451C7 /* rnrfReduxSample-tvOS */; targetProxy = 2D02E4911E0B4A5D006451C7 /* PBXContainerItemProxy */; }; /* End PBXTargetDependency section */ @@ -949,7 +1158,7 @@ 13B07FB21A68108700A75B9A /* Base */, ); name = LaunchScreen.xib; - path = rnrfSample; + path = rnrfReduxSample; sourceTree = ""; }; /* End PBXVariantGroup section */ @@ -963,15 +1172,15 @@ "DEBUG=1", "$(inherited)", ); - INFOPLIST_FILE = rnrfSampleTests/Info.plist; - IPHONEOS_DEPLOYMENT_TARGET = 8.0; + INFOPLIST_FILE = rnrfReduxSampleTests/Info.plist; + IPHONEOS_DEPLOYMENT_TARGET = 9.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; OTHER_LDFLAGS = ( "-ObjC", "-lc++", ); PRODUCT_NAME = "$(TARGET_NAME)"; - TEST_HOST = "$(BUILT_PRODUCTS_DIR)/rnrfSample.app/rnrfSample"; + TEST_HOST = "$(BUILT_PRODUCTS_DIR)/rnrfReduxSample.app/rnrfReduxSample"; }; name = Debug; }; @@ -980,15 +1189,15 @@ buildSettings = { BUNDLE_LOADER = "$(TEST_HOST)"; COPY_PHASE_STRIP = NO; - INFOPLIST_FILE = rnrfSampleTests/Info.plist; - IPHONEOS_DEPLOYMENT_TARGET = 8.0; + INFOPLIST_FILE = rnrfReduxSampleTests/Info.plist; + IPHONEOS_DEPLOYMENT_TARGET = 9.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; OTHER_LDFLAGS = ( "-ObjC", "-lc++", ); PRODUCT_NAME = "$(TARGET_NAME)"; - TEST_HOST = "$(BUILT_PRODUCTS_DIR)/rnrfSample.app/rnrfSample"; + TEST_HOST = "$(BUILT_PRODUCTS_DIR)/rnrfReduxSample.app/rnrfReduxSample"; }; name = Release; }; @@ -998,14 +1207,14 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CURRENT_PROJECT_VERSION = 1; DEAD_CODE_STRIPPING = NO; - INFOPLIST_FILE = rnrfSample/Info.plist; + INFOPLIST_FILE = rnrfReduxSample/Info.plist; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; OTHER_LDFLAGS = ( "$(inherited)", "-ObjC", "-lc++", ); - PRODUCT_NAME = rnrfSample; + PRODUCT_NAME = rnrfReduxSample; VERSIONING_SYSTEM = "apple-generic"; }; name = Debug; @@ -1015,14 +1224,14 @@ buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CURRENT_PROJECT_VERSION = 1; - INFOPLIST_FILE = rnrfSample/Info.plist; + INFOPLIST_FILE = rnrfReduxSample/Info.plist; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; OTHER_LDFLAGS = ( "$(inherited)", "-ObjC", "-lc++", ); - PRODUCT_NAME = rnrfSample; + PRODUCT_NAME = rnrfReduxSample; VERSIONING_SYSTEM = "apple-generic"; }; name = Release; @@ -1039,13 +1248,13 @@ DEBUG_INFORMATION_FORMAT = dwarf; ENABLE_TESTABILITY = YES; GCC_NO_COMMON_BLOCKS = YES; - INFOPLIST_FILE = "rnrfSample-tvOS/Info.plist"; + INFOPLIST_FILE = "rnrfReduxSample-tvOS/Info.plist"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; OTHER_LDFLAGS = ( "-ObjC", "-lc++", ); - PRODUCT_BUNDLE_IDENTIFIER = "com.facebook.REACT.rnrfSample-tvOS"; + PRODUCT_BUNDLE_IDENTIFIER = "com.facebook.REACT.rnrfReduxSample-tvOS"; PRODUCT_NAME = "$(TARGET_NAME)"; SDKROOT = appletvos; TARGETED_DEVICE_FAMILY = 3; @@ -1065,13 +1274,13 @@ COPY_PHASE_STRIP = NO; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; GCC_NO_COMMON_BLOCKS = YES; - INFOPLIST_FILE = "rnrfSample-tvOS/Info.plist"; + INFOPLIST_FILE = "rnrfReduxSample-tvOS/Info.plist"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; OTHER_LDFLAGS = ( "-ObjC", "-lc++", ); - PRODUCT_BUNDLE_IDENTIFIER = "com.facebook.REACT.rnrfSample-tvOS"; + PRODUCT_BUNDLE_IDENTIFIER = "com.facebook.REACT.rnrfReduxSample-tvOS"; PRODUCT_NAME = "$(TARGET_NAME)"; SDKROOT = appletvos; TARGETED_DEVICE_FAMILY = 3; @@ -1090,12 +1299,16 @@ DEBUG_INFORMATION_FORMAT = dwarf; ENABLE_TESTABILITY = YES; GCC_NO_COMMON_BLOCKS = YES; - INFOPLIST_FILE = "rnrfSample-tvOSTests/Info.plist"; + INFOPLIST_FILE = "rnrfReduxSample-tvOSTests/Info.plist"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; - PRODUCT_BUNDLE_IDENTIFIER = "com.facebook.REACT.rnrfSample-tvOSTests"; + OTHER_LDFLAGS = ( + "-ObjC", + "-lc++", + ); + PRODUCT_BUNDLE_IDENTIFIER = "com.facebook.REACT.rnrfReduxSample-tvOSTests"; PRODUCT_NAME = "$(TARGET_NAME)"; SDKROOT = appletvos; - TEST_HOST = "$(BUILT_PRODUCTS_DIR)/rnrfSample-tvOS.app/rnrfSample-tvOS"; + TEST_HOST = "$(BUILT_PRODUCTS_DIR)/rnrfReduxSample-tvOS.app/rnrfReduxSample-tvOS"; TVOS_DEPLOYMENT_TARGET = 10.1; }; name = Debug; @@ -1111,12 +1324,16 @@ COPY_PHASE_STRIP = NO; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; GCC_NO_COMMON_BLOCKS = YES; - INFOPLIST_FILE = "rnrfSample-tvOSTests/Info.plist"; + INFOPLIST_FILE = "rnrfReduxSample-tvOSTests/Info.plist"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; - PRODUCT_BUNDLE_IDENTIFIER = "com.facebook.REACT.rnrfSample-tvOSTests"; + OTHER_LDFLAGS = ( + "-ObjC", + "-lc++", + ); + PRODUCT_BUNDLE_IDENTIFIER = "com.facebook.REACT.rnrfReduxSample-tvOSTests"; PRODUCT_NAME = "$(TARGET_NAME)"; SDKROOT = appletvos; - TEST_HOST = "$(BUILT_PRODUCTS_DIR)/rnrfSample-tvOS.app/rnrfSample-tvOS"; + TEST_HOST = "$(BUILT_PRODUCTS_DIR)/rnrfReduxSample-tvOS.app/rnrfReduxSample-tvOS"; TVOS_DEPLOYMENT_TARGET = 10.1; }; name = Release; @@ -1155,7 +1372,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 8.0; + IPHONEOS_DEPLOYMENT_TARGET = 9.0; MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = YES; SDKROOT = iphoneos; @@ -1190,7 +1407,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 8.0; + IPHONEOS_DEPLOYMENT_TARGET = 9.0; MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = iphoneos; VALIDATE_PRODUCT = YES; @@ -1200,7 +1417,7 @@ /* End XCBuildConfiguration section */ /* Begin XCConfigurationList section */ - 00E357021AD99517003FC87E /* Build configuration list for PBXNativeTarget "rnrfSampleTests" */ = { + 00E357021AD99517003FC87E /* Build configuration list for PBXNativeTarget "rnrfReduxSampleTests" */ = { isa = XCConfigurationList; buildConfigurations = ( 00E356F61AD99517003FC87E /* Debug */, @@ -1209,7 +1426,7 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - 13B07F931A680F5B00A75B9A /* Build configuration list for PBXNativeTarget "rnrfSample" */ = { + 13B07F931A680F5B00A75B9A /* Build configuration list for PBXNativeTarget "rnrfReduxSample" */ = { isa = XCConfigurationList; buildConfigurations = ( 13B07F941A680F5B00A75B9A /* Debug */, @@ -1218,7 +1435,7 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - 2D02E4BA1E0B4A5E006451C7 /* Build configuration list for PBXNativeTarget "rnrfSample-tvOS" */ = { + 2D02E4BA1E0B4A5E006451C7 /* Build configuration list for PBXNativeTarget "rnrfReduxSample-tvOS" */ = { isa = XCConfigurationList; buildConfigurations = ( 2D02E4971E0B4A5E006451C7 /* Debug */, @@ -1227,7 +1444,7 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - 2D02E4BB1E0B4A5E006451C7 /* Build configuration list for PBXNativeTarget "rnrfSample-tvOSTests" */ = { + 2D02E4BB1E0B4A5E006451C7 /* Build configuration list for PBXNativeTarget "rnrfReduxSample-tvOSTests" */ = { isa = XCConfigurationList; buildConfigurations = ( 2D02E4991E0B4A5E006451C7 /* Debug */, @@ -1236,7 +1453,7 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - 83CBB9FA1A601CBA00E9B192 /* Build configuration list for PBXProject "rnrfSample" */ = { + 83CBB9FA1A601CBA00E9B192 /* Build configuration list for PBXProject "rnrfReduxSample" */ = { isa = XCConfigurationList; buildConfigurations = ( 83CBBA201A601CBA00E9B192 /* Debug */, diff --git a/ReduxExample/ios/rnrfSample.xcodeproj/xcshareddata/xcschemes/rnrfSample-tvOS.xcscheme b/examples/redux/ios/rnrfReduxSample.xcodeproj/xcshareddata/xcschemes/rnrfReduxSample-tvOS.xcscheme similarity index 78% rename from ReduxExample/ios/rnrfSample.xcodeproj/xcshareddata/xcschemes/rnrfSample-tvOS.xcscheme rename to examples/redux/ios/rnrfReduxSample.xcodeproj/xcshareddata/xcschemes/rnrfReduxSample-tvOS.xcscheme index ab27e78af..03867b918 100644 --- a/ReduxExample/ios/rnrfSample.xcodeproj/xcshareddata/xcschemes/rnrfSample-tvOS.xcscheme +++ b/examples/redux/ios/rnrfReduxSample.xcodeproj/xcshareddata/xcschemes/rnrfReduxSample-tvOS.xcscheme @@ -29,9 +29,9 @@ + BuildableName = "rnrfReduxSample-tvOS.app" + BlueprintName = "rnrfReduxSample-tvOS" + ReferencedContainer = "container:rnrfReduxSample.xcodeproj"> + BuildableName = "rnrfReduxSample-tvOSTests.xctest" + BlueprintName = "rnrfReduxSample-tvOSTests" + ReferencedContainer = "container:rnrfReduxSample.xcodeproj"> @@ -61,9 +61,9 @@ + BuildableName = "rnrfReduxSample-tvOSTests.xctest" + BlueprintName = "rnrfReduxSample-tvOSTests" + ReferencedContainer = "container:rnrfReduxSample.xcodeproj"> @@ -71,9 +71,9 @@ + BuildableName = "rnrfReduxSample-tvOS.app" + BlueprintName = "rnrfReduxSample-tvOS" + ReferencedContainer = "container:rnrfReduxSample.xcodeproj"> @@ -94,9 +94,9 @@ + BuildableName = "rnrfReduxSample-tvOS.app" + BlueprintName = "rnrfReduxSample-tvOS" + ReferencedContainer = "container:rnrfReduxSample.xcodeproj"> @@ -113,9 +113,9 @@ + BuildableName = "rnrfReduxSample-tvOS.app" + BlueprintName = "rnrfReduxSample-tvOS" + ReferencedContainer = "container:rnrfReduxSample.xcodeproj"> diff --git a/ReduxExample/ios/rnrfSample.xcodeproj/xcshareddata/xcschemes/rnrfSample.xcscheme b/examples/redux/ios/rnrfReduxSample.xcodeproj/xcshareddata/xcschemes/rnrfReduxSample.xcscheme similarity index 78% rename from ReduxExample/ios/rnrfSample.xcodeproj/xcshareddata/xcschemes/rnrfSample.xcscheme rename to examples/redux/ios/rnrfReduxSample.xcodeproj/xcshareddata/xcschemes/rnrfReduxSample.xcscheme index a8ac2cb62..0521c6824 100644 --- a/ReduxExample/ios/rnrfSample.xcodeproj/xcshareddata/xcschemes/rnrfSample.xcscheme +++ b/examples/redux/ios/rnrfReduxSample.xcodeproj/xcshareddata/xcschemes/rnrfReduxSample.xcscheme @@ -29,9 +29,9 @@ + BuildableName = "rnrfReduxSample.app" + BlueprintName = "rnrfReduxSample" + ReferencedContainer = "container:rnrfReduxSample.xcodeproj"> + BuildableName = "rnrfReduxSampleTests.xctest" + BlueprintName = "rnrfReduxSampleTests" + ReferencedContainer = "container:rnrfReduxSample.xcodeproj"> @@ -61,9 +61,9 @@ + BuildableName = "rnrfReduxSampleTests.xctest" + BlueprintName = "rnrfReduxSampleTests" + ReferencedContainer = "container:rnrfReduxSample.xcodeproj"> @@ -71,9 +71,9 @@ + BuildableName = "rnrfReduxSample.app" + BlueprintName = "rnrfReduxSample" + ReferencedContainer = "container:rnrfReduxSample.xcodeproj"> @@ -94,9 +94,9 @@ + BuildableName = "rnrfReduxSample.app" + BlueprintName = "rnrfReduxSample" + ReferencedContainer = "container:rnrfReduxSample.xcodeproj"> @@ -113,9 +113,9 @@ + BuildableName = "rnrfReduxSample.app" + BlueprintName = "rnrfReduxSample" + ReferencedContainer = "container:rnrfReduxSample.xcodeproj"> diff --git a/examples/redux/ios/rnrfReduxSample/AppDelegate.h b/examples/redux/ios/rnrfReduxSample/AppDelegate.h new file mode 100644 index 000000000..d4f2580b1 --- /dev/null +++ b/examples/redux/ios/rnrfReduxSample/AppDelegate.h @@ -0,0 +1,14 @@ +/** + * Copyright (c) 2015-present, Facebook, Inc. + * + * This source code is licensed under the MIT license found in the + * LICENSE file in the root directory of this source tree. + */ + +#import + +@interface AppDelegate : UIResponder + +@property (nonatomic, strong) UIWindow *window; + +@end diff --git a/ReduxExample/ios/rnrfSample/AppDelegate.m b/examples/redux/ios/rnrfReduxSample/AppDelegate.m similarity index 76% rename from ReduxExample/ios/rnrfSample/AppDelegate.m rename to examples/redux/ios/rnrfReduxSample/AppDelegate.m index db24ef4ac..64a186da2 100644 --- a/ReduxExample/ios/rnrfSample/AppDelegate.m +++ b/examples/redux/ios/rnrfReduxSample/AppDelegate.m @@ -1,10 +1,8 @@ /** * Copyright (c) 2015-present, Facebook, Inc. - * All rights reserved. * - * This source code is licensed under the BSD-style license found in the - * LICENSE file in the root directory of this source tree. An additional grant - * of patent rights can be found in the PATENTS file in the same directory. + * This source code is licensed under the MIT license found in the + * LICENSE file in the root directory of this source tree. */ #import "AppDelegate.h" @@ -18,10 +16,10 @@ - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:( { NSURL *jsCodeLocation; - jsCodeLocation = [[RCTBundleURLProvider sharedSettings] jsBundleURLForBundleRoot:@"index.ios" fallbackResource:nil]; + jsCodeLocation = [[RCTBundleURLProvider sharedSettings] jsBundleURLForBundleRoot:@"index" fallbackResource:nil]; RCTRootView *rootView = [[RCTRootView alloc] initWithBundleURL:jsCodeLocation - moduleName:@"rnrfSample" + moduleName:@"rnrfReduxSample" initialProperties:nil launchOptions:launchOptions]; rootView.backgroundColor = [[UIColor alloc] initWithRed:1.0f green:1.0f blue:1.0f alpha:1]; diff --git a/ReduxExample/ios/rnrfSample/Base.lproj/LaunchScreen.xib b/examples/redux/ios/rnrfReduxSample/Base.lproj/LaunchScreen.xib similarity index 93% rename from ReduxExample/ios/rnrfSample/Base.lproj/LaunchScreen.xib rename to examples/redux/ios/rnrfReduxSample/Base.lproj/LaunchScreen.xib index 327c3ed3a..aef43b3f7 100644 --- a/ReduxExample/ios/rnrfSample/Base.lproj/LaunchScreen.xib +++ b/examples/redux/ios/rnrfReduxSample/Base.lproj/LaunchScreen.xib @@ -18,7 +18,7 @@ -