Browse Source

added missing files to redux example

Guy Carmeli 8 years ago
parent
commit
41db854e89

+ 1
- 1
example-redux/android/app/react.gradle View File

41
             def jsBundleDir = elvisFile(config."$jsBundleDirConfigName") ?:
41
             def jsBundleDir = elvisFile(config."$jsBundleDirConfigName") ?:
42
                     file("$buildDir/intermediates/assets/${targetPath}")
42
                     file("$buildDir/intermediates/assets/${targetPath}")
43
 
43
 
44
-            def resourcesDirConfigName = "jsBundleDir${targetName}"
44
+            def resourcesDirConfigName = "resourcesDir${targetName}"
45
             def resourcesDir = elvisFile(config."${resourcesDirConfigName}") ?:
45
             def resourcesDir = elvisFile(config."${resourcesDirConfigName}") ?:
46
                     file("$buildDir/intermediates/res/merged/${targetPath}")
46
                     file("$buildDir/intermediates/res/merged/${targetPath}")
47
             def jsBundleFile = file("$jsBundleDir/$bundleAssetName")
47
             def jsBundleFile = file("$jsBundleDir/$bundleAssetName")

+ 3
- 3
example/android/app/build.gradle View File

120
 }
120
 }
121
 
121
 
122
 dependencies {
122
 dependencies {
123
-    compile fileTree(dir: "libs", include: ["*.jar"])
124
-    compile "com.android.support:appcompat-v7:23.0.1"
125
-    compile "com.facebook.react:react-native:+"  // From node_modules
123
+    compile fileTree(dir: 'libs', include: ['*.jar'])
124
+    compile 'com.android.support:appcompat-v7:23.0.1'
125
+    compile 'com.facebook.react:react-native:+'
126
         debugCompile project(path: ':react-native-navigation', configuration: 'libraryDebug')
126
         debugCompile project(path: ':react-native-navigation', configuration: 'libraryDebug')
127
         releaseCompile project(path: ':react-native-navigation', configuration: 'libraryRelease')
127
         releaseCompile project(path: ':react-native-navigation', configuration: 'libraryRelease')
128
 //    compile project(':react-native-navigation')
128
 //    compile project(':react-native-navigation')

+ 1
- 1
example/android/app/react.gradle View File

41
             def jsBundleDir = elvisFile(config."$jsBundleDirConfigName") ?:
41
             def jsBundleDir = elvisFile(config."$jsBundleDirConfigName") ?:
42
                     file("$buildDir/intermediates/assets/${targetPath}")
42
                     file("$buildDir/intermediates/assets/${targetPath}")
43
 
43
 
44
-            def resourcesDirConfigName = "jsBundleDir${targetName}"
44
+            def resourcesDirConfigName = "resourcesDir${targetName}"
45
             def resourcesDir = elvisFile(config."${resourcesDirConfigName}") ?:
45
             def resourcesDir = elvisFile(config."${resourcesDirConfigName}") ?:
46
                     file("$buildDir/intermediates/res/merged/${targetPath}")
46
                     file("$buildDir/intermediates/res/merged/${targetPath}")
47
             def jsBundleFile = file("$jsBundleDir/$bundleAssetName")
47
             def jsBundleFile = file("$jsBundleDir/$bundleAssetName")

+ 14
- 14
example/android/app/src/main/AndroidManifest.xml View File

1
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
1
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
2
-    package="com.example">
2
+          package="com.example">
3
 
3
 
4
     <uses-permission android:name="android.permission.INTERNET" />
4
     <uses-permission android:name="android.permission.INTERNET" />
5
 
5
 
6
     <application
6
     <application
7
-      android:allowBackup="true"
8
-      android:label="@string/app_name"
9
-      android:icon="@mipmap/ic_launcher"
10
-      android:theme="@style/AppTheme">
11
-      <activity
12
-        android:name=".MainActivity"
7
+        android:allowBackup="true"
13
         android:label="@string/app_name"
8
         android:label="@string/app_name"
14
-        android:configChanges="keyboard|keyboardHidden|orientation|screenSize">
15
-        <intent-filter>
16
-            <action android:name="android.intent.action.MAIN" />
17
-            <category android:name="android.intent.category.LAUNCHER" />
18
-        </intent-filter>
19
-      </activity>
20
-      <activity android:name="com.facebook.react.devsupport.DevSettingsActivity" />
9
+        android:icon="@mipmap/ic_launcher"
10
+        android:theme="@style/AppTheme">
11
+        <activity
12
+            android:name=".MainActivity"
13
+            android:label="@string/app_name"
14
+            android:configChanges="keyboard|keyboardHidden|orientation|screenSize">
15
+            <intent-filter>
16
+                <action android:name="android.intent.action.MAIN" />
17
+                <category android:name="android.intent.category.LAUNCHER" />
18
+            </intent-filter>
19
+        </activity>
20
+        <activity android:name="com.facebook.react.devsupport.DevSettingsActivity" />
21
     </application>
21
     </application>
22
 
22
 
23
 </manifest>
23
 </manifest>