Merge branch 'release/1.6.0'

.flowconfig

@@ -18,34 +18,35 @@
 ; For RN Apps installed via npm, "Libraries" folder is inside
 ; "node_modules/react-native" but in the source repo it is in the root
 .*/Libraries/react-native/React.js
-.*/Libraries/react-native/ReactNative.js
+
+; Ignore polyfills
+.*/Libraries/polyfills/.*
 
 [include]
 
 [libs]
 node_modules/react-native/Libraries/react-native/react-native-interface.js
-node_modules/react-native/flow
-flow/
+node_modules/react-native/flow/
 
 [options]
 module.system=haste
 
-experimental.strict_type_args=true
-
 munge_underscores=true
 
 module.name_mapper='^image![a-zA-Z0-9$_-]+$' -> 'GlobalImageStub'
 module.name_mapper='^[./a-zA-Z0-9$_-]+\.\(bmp\|gif\|jpg\|jpeg\|png\|psd\|svg\|webp\|m4v\|mov\|mp4\|mpeg\|mpg\|webm\|aac\|aiff\|caf\|m4a\|mp3\|wav\|html\|pdf\)$' -> 'RelativeImageStub'
 
 suppress_type=$FlowIssue
 suppress_type=$FlowFixMe
+suppress_type=$FlowFixMeProps
+suppress_type=$FlowFixMeState
 suppress_type=$FixMe
 
-suppress_comment=\\(.\\|\n\\)*\\$FlowFixMe\\($\\|[^(]\\|(\\(>=0\\.\\(3[0-5]\\|[1-2][0-9]\\|[0-9]\\).[0-9]\\)? *\\(site=[a-z,_]*react_native[a-z,_]*\\)?)\\)
-suppress_comment=\\(.\\|\n\\)*\\$FlowIssue\\((\\(>=0\\.\\(3[0-5]\\|1[0-9]\\|[1-2][0-9]\\).[0-9]\\)? *\\(site=[a-z,_]*react_native[a-z,_]*\\)?)\\)?:? #[0-9]+
+suppress_comment=\\(.\\|\n\\)*\\$FlowFixMe\\($\\|[^(]\\|(\\(>=0\\.\\(5[0-7]\\|[1-4][0-9]\\|[0-9]\\).[0-9]\\)? *\\(site=[a-z,_]*react_native[a-z,_]*\\)?)\\)suppress_comment=\\(.\\|\n\\)*\\$FlowIssue\\((\\(>=0\\.\\(5[0-7]\\|[1-4][0-9]\\|[0-9]\\).[0-9]\\)? *\\(site=[a-z,_]*react_native[a-z,_]*\\)?)\\)?:? #[0-9]+
 suppress_comment=\\(.\\|\n\\)*\\$FlowFixedInNextDeploy
+suppress_comment=\\(.\\|\n\\)*\\$FlowExpectedError
 
 unsafe.enable_getters_and_setters=true
 
 [version]
-^0.35.0
+^0.57.0

.gitignore

@@ -7,6 +7,7 @@ yarn.lock
 Podfile
 ios/Pods
 ios/Podfile.lock
+config/
 
 # Logs
 logs

android/app/app.iml

@@ -183,7 +183,6 @@
     <orderEntry type="library" exported="" name="play-services-analytics-10.2.0" level="project" />
     <orderEntry type="library" exported="" name="imagepipeline-okhttp3-0.11.0" level="project" />
     <orderEntry type="library" exported="" name="animated-gif-0.11.0" level="project" />
-    <orderEntry type="module" module-name="react-native-share" exported="" />
     <orderEntry type="module" module-name="react-native-calendar-manager" exported="" />
     <orderEntry type="module" module-name="react-native-video" exported="" />
     <orderEntry type="module" module-name="react-native-maps" exported="" />

android/app/build.gradle

@@ -33,6 +33,13 @@ import com.android.build.OutputFile
  *   // bundleInPaidRelease: true,
  *   // bundleInBeta: true,
  *
+ *   // whether to disable dev mode in custom build variants (by default only disabled in release)
+ *   // for example: to disable dev mode in the staging build type (if configured)
+ *   devDisabledInStaging: true,
+ *   // The configuration property can be in the following formats
+ *   //         'devDisabledIn${productFlavor}${buildType}'
+ *   //         'devDisabledIn${buildType}'
+ *
  *   // the root of your project, i.e. where "package.json" lives
  *   root: "../../",
  *
@@ -58,13 +65,17 @@ import com.android.build.OutputFile
  *   inputExcludes: ["android/**", "ios/**"],
  *
  *   // override which node gets called and with what additional arguments
- *   nodeExecutableAndArgs: ["node"]
+ *   nodeExecutableAndArgs: ["node"],
  *
  *   // supply additional arguments to the packager
  *   extraPackagerArgs: []
  * ]
  */
 
+project.ext.react = [
+    entryFile: "index.js"
+]
+
 apply from: "../../node_modules/react-native/react.gradle"
 apply from: "../../node_modules/react-native-code-push/android/codepush.gradle"
 
@@ -88,15 +99,16 @@ android {
     buildToolsVersion "23.0.1"
 
     defaultConfig {
-        applicationId "com.shoutemapp"
+        applicationId 'com.shoutemapp'
         minSdkVersion 16
         targetSdkVersion 22
         versionCode 1
-        versionName "1.0"
+        versionName '5.0.0'
         multiDexEnabled true
 
         dexOptions {
         	jumboMode = true
+            javaMaxHeapSize "4g"
     	}
 
         ndk {
@@ -153,29 +165,43 @@ android {
     }
 }
 
+configurations.all {
+    resolutionStrategy {
+        force 'com.google.android.gms:play-services-base:10.2.4',
+          'com.google.android.gms:play-services-maps:10.2.4',
+          'com.google.android.gms:play-services-analytics:10.2.4',
+          'com.google.android.gms:play-services-gcm:10.2.4'
+    }
+}
+
 dependencies {
+    compile project(':@shoutem/ui-addons')
+    compile project(':@yfuks/react-native-action-sheet')
+    compile project(':react-native-code-push')
     compile project(':react-native-fbsdk')
-    // commented compile project lines are here to signal to react-native link
+    compile project(':react-native-image-picker')
+    compile project(':react-native-linear-gradient')
+    compile project(':react-native-photo-view')
+    compile project(':react-native-restart')
+    compile project(':react-native-splash-screen')
+    compile project(':react-native-vector-icons')
+    compile project(':react-native-video')
+
+    // commented compile project lines are here to signal react-native link
     // that this dependency has already been linked
+
     //    compile project(':react-native-google-analytics-bridge')
-    compile(project(':react-native-google-analytics-bridge')) {
-        exclude group: 'com.google.android.gms', module: 'play-services-analytics'
-    }
+    compile(project(':react-native-google-analytics-bridge'))
+
     //     compile project(':react-native-maps')
-    compile(project(':react-native-maps')) {
-        exclude group: 'com.google.android.gms', module: 'play-services-base'
-        exclude group: 'com.google.android.gms', module: 'play-services-maps'
-    }
+    compile(project(':react-native-maps'))
 
-    compile project(':react-native-code-push')
     compile fileTree(dir: "libs", include: ["*.jar"])
+
     compile "com.android.support:appcompat-v7:23.0.1"
-    compile "com.facebook.react:react-native:+"  // From node_modules
-    compile 'com.facebook.fresco:animated-gif:0.14.0'  // For animated GIF support
     compile 'com.android.support:multidex:1.0.1'
-    compile 'com.google.android.gms:play-services-base:10.2.1'
-    compile 'com.google.android.gms:play-services-maps:10.2.1'
-    compile 'com.google.android.gms:play-services-analytics:10.2.1'
+    compile 'com.facebook.fresco:animated-gif:0.14.0' // For animated GIFs
+    compile "com.facebook.react:react-native:+" // From node_modules
 }
 
 // Run this once to be able to run the application with BUCK
@@ -184,3 +210,5 @@ task copyDownloadableDepsToLibs(type: Copy) {
   from configurations.compile
   into 'libs'
 }
+
+apply plugin: "com.google.gms.google-services"

android/app/proguard-rules.pro

@@ -50,6 +50,10 @@
 
 -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

android/app/src/main/AndroidManifest.xml

@@ -1,31 +1,32 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.shoutemapp" xmlns:tools="http://schemas.android.com/tools">
+  package="com.shoutemapp" xmlns:tools="http://schemas.android.com/tools">
 
-    <uses-permission android:name="android.permission.INTERNET" />
-    <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW"/>
+  <uses-permission android:name="android.permission.INTERNET" />
+  <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW"/>
 
-    <application tools:replace="android:label"
-      android:name=".MainApplication"
-      android:allowBackup="true"
+  <application tools:replace="android:label"
+    android:name=".MainApplication"
+    android:allowBackup="true"
+    android:label="${appName}"
+    android:icon="@mipmap/ic_launcher"
+    android:theme="@style/AppTheme">
+
+    <activity
+      android:name=".MainActivity"
       android:label="${appName}"
-      android:icon="@mipmap/ic_launcher"
-      android:theme="@style/AppTheme">
-      <activity
-        android:name=".MainActivity"
-        android:label="${appName}"
-        android:launchMode="singleTask"
-        android:screenOrientation="portrait"
-        android:configChanges="keyboard|keyboardHidden|orientation|screenSize"
-        android:windowSoftInputMode="adjustPan">
-        <intent-filter>
-            <action android:name="android.intent.action.MAIN" />
-            <category android:name="android.intent.category.LAUNCHER" />
-        </intent-filter>
-      </activity>
-      <activity android:name="com.facebook.react.devsupport.DevSettingsActivity" />
-      <meta-data android:name="com.google.android.geo.API_KEY" android:value="AIzaSyBAefhRlXEH3vCko-zZTX6PHllTR6av4WI"/>
-      <meta-data android:name="com.facebook.sdk.ApplicationId" android:value="@string/facebook_app_id"/>
-      <meta-data android:name="com.facebook.sdk.AutoLogAppEventsEnabled" android:value="false"/>
-    </application>
+      android:launchMode="singleTask"
+      android:screenOrientation="portrait"
+      android:configChanges="keyboard|keyboardHidden|orientation|screenSize"
+      android:windowSoftInputMode="adjustPan">
+      <intent-filter>
+        <action android:name="android.intent.action.MAIN" />
+        <category android:name="android.intent.category.LAUNCHER" />
+      </intent-filter>
+    </activity>
+    <activity android:name="com.facebook.react.devsupport.DevSettingsActivity" />
+    <meta-data android:name="com.google.android.geo.API_KEY" android:value="AIzaSyBAefhRlXEH3vCko-zZTX6PHllTR6av4WI"/>
+    <meta-data android:name="com.facebook.sdk.ApplicationId" android:value="@string/facebook_app_id"/>
+    <meta-data android:name="com.facebook.sdk.AutoLogAppEventsEnabled" android:value="false"/>
+  </application>
 
 </manifest>

android/app/src/main/java/com/shoutemapp/MainApplication.java

@@ -2,17 +2,26 @@
 
 import android.support.multidex.MultiDexApplication;
 
-import com.facebook.react.ReactApplication;
-import com.microsoft.codepush.react.CodePush;
-import com.idehub.GoogleAnalyticsBridge.GoogleAnalyticsBridgePackage;
+import com.actionsheet.ActionSheetPackage;
 import com.airbnb.android.react.maps.MapsPackage;
+import com.avishayil.rnrestart.ReactNativeRestartPackage;
+import com.brentvatne.react.ReactVideoPackage;
+import com.BV.LinearGradient.LinearGradientPackage;
+import com.cboy.rn.splashscreen.SplashScreenReactPackage;
+import com.facebook.CallbackManager;
+import com.facebook.FacebookSdk;
+import com.facebook.react.ReactApplication;
 import com.facebook.react.ReactNativeHost;
 import com.facebook.react.ReactPackage;
 import com.facebook.react.shell.MainReactPackage;
-
-import com.facebook.CallbackManager;
-import com.facebook.FacebookSdk;
 import com.facebook.reactnative.androidsdk.FBSDKPackage;
+import com.facebook.soloader.SoLoader;
+import com.idehub.GoogleAnalyticsBridge.GoogleAnalyticsBridgePackage;
+import com.imagepicker.ImagePickerPackage;
+import com.microsoft.codepush.react.CodePush;
+import com.oblador.vectoricons.VectorIconsPackage;
+import com.reactnative.photoview.PhotoViewPackage;
+import com.shoutem.uiaddons.UiAddonsExtensionPackage;
 
 import java.util.Arrays;
 import java.util.List;
@@ -37,6 +46,15 @@ public boolean getUseDeveloperSupport() {
     protected List<ReactPackage> getPackages() {
       return Arrays.<ReactPackage>asList(
           new MainReactPackage(),
+            new ActionSheetPackage(),
+            new ImagePickerPackage(),
+            new LinearGradientPackage(),
+            new PhotoViewPackage(),
+            new ReactNativeRestartPackage(),
+            new ReactVideoPackage(),
+            new SplashScreenReactPackage(),
+            new UiAddonsExtensionPackage(),
+            new VectorIconsPackage(),
           new CodePush(null, getApplicationContext(), BuildConfig.DEBUG),
           new MapsPackage(),
           new GoogleAnalyticsBridgePackage(),
@@ -45,6 +63,11 @@ protected List<ReactPackage> getPackages() {
     }
   };
 
+  // @Override
+  protected String getJSMainModuleName() {
+    return "index";
+  }
+
   @Override
   public ReactNativeHost getReactNativeHost() {
       return mReactNativeHost;
@@ -57,6 +80,7 @@ protected static CallbackManager getCallbackManager() {
   @Override
   public void onCreate() {
     super.onCreate();
+    SoLoader.init(this, /* native exopackage */ false);
     FacebookSdk.sdkInitialize(getApplicationContext());
   }
 }

android/app/src/main/res/values/strings.xml

@@ -1,4 +1,5 @@
 <resources>
     <string moduleConfig="true" name="reactNativeCodePush_androidDeploymentKey"></string>
     <string name="app_name">ShoutemApp</string>
+    <string name="facebook_app_id">112233</string>
 </resources>

android/build.gradle

@@ -6,6 +6,7 @@ buildscript {
     }
     dependencies {
         classpath 'com.android.tools.build:gradle:2.2.3'
+        classpath 'com.google.gms:google-services:3.0.0'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files

android/settings.gradle

@@ -1,10 +1,46 @@
 rootProject.name = 'ShoutemApp'
+
+
+// packages above this line are added automatically when shoutem configure
+// is run - they should be discarded before pushing changes in this file
+
 include ':app'
+
+include ':@shoutem/ui-addons'
+project(':@shoutem/ui-addons').projectDir = new File(rootProject.projectDir, '../node_modules/@shoutem/ui-addons/android')
+
+include ':@yfuks/react-native-action-sheet'
+project(':@yfuks/react-native-action-sheet').projectDir = new File(rootProject.projectDir, '../node_modules/@yfuks/react-native-action-sheet/android')
+
+include ':react-native-code-push'
+project(':react-native-code-push').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-code-push/android/app')
+
+include ':react-native-fbsdk'
+project(':react-native-fbsdk').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-fbsdk/android')
+
 include ':react-native-google-analytics-bridge'
 project(':react-native-google-analytics-bridge').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-google-analytics-bridge/android')
+
+include ':react-native-image-picker'
+project(':react-native-image-picker').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-image-picker/android')
+
+include ':react-native-linear-gradient'
+project(':react-native-linear-gradient').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-linear-gradient/android')
+
 include ':react-native-maps'
-project(':react-native-maps').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-maps/android')
-include ':react-native-fbsdk'
-project(':react-native-fbsdk').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-fbsdk/android')
-include ':react-native-code-push'
-project(':react-native-code-push').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-code-push/android/app')
+project(':react-native-maps').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-maps/lib/android')
+
+include ':react-native-photo-view'
+project(':react-native-photo-view').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-photo-view/android')
+
+include ':react-native-restart'
+project(':react-native-restart').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-restart/android')
+
+include ':react-native-splash-screen'
+project(':react-native-splash-screen').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-splash-screen/android')
+
+include ':react-native-vector-icons'
+project(':react-native-vector-icons').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-vector-icons/android')
+
+include ':react-native-video'
+project(':react-native-video').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-video/android')