Fixed android build issue and added android x support

android/app/build.gradle

@@ -153,15 +153,15 @@ configurations.all {
 }
 
 dependencies {
-    implementation project(':react-native-iap')
     implementation project(':@react-native-community_netinfo')
+    implementation project(':react-native-image-crop-picker')
+    implementation project(':react-native-fast-image')
+    implementation project(':react-native-iap')
     implementation project(':react-native-navigation-bar-color')
     implementation project(':bugsnag-react-native')
     implementation project(':react-native-version-number')
     implementation project(':react-native-code-push')
     implementation project(':realm')
-    implementation project(':react-native-fast-image')
-    implementation project(':react-native-image-crop-picker')
     implementation project(':appcenter-push')
     implementation project(':react-native-view-overflow')
     implementation project(':react-native-vector-icons')
@@ -173,7 +173,7 @@ dependencies {
     implementation 'com.microsoft.appcenter:appcenter-push:1.11.2'
     implementation 'com.facebook.fresco:animated-gif:1.10.0'
     implementation fileTree(dir: "libs", include: ["*.jar"])
-    implementation "com.android.support:appcompat-v7:${rootProject.ext.supportLibVersion}"
+    implementation 'androidx.appcompat:appcompat:1.1.0-rc01'
     implementation "com.facebook.react:react-native:+"  // From node_modules
 }
 

android/app/src/main/java/app/esteem/mobile/android/MainApplication.java

@@ -3,15 +3,15 @@ package app.esteem.mobile.android;
 import android.app.Application;
 
 import com.facebook.react.ReactApplication;
-import com.dooboolab.RNIap.RNIapPackage;
 import com.reactnativecommunity.netinfo.NetInfoPackage;
+import com.reactnative.ivpusic.imagepicker.PickerPackage;
+import com.dylanvann.fastimage.FastImageViewPackage;
+import com.dooboolab.RNIap.RNIapPackage;
 import com.thebylito.navigationbarcolor.NavigationBarColorPackage;
 import com.bugsnag.BugsnagReactNative;
 import com.apsl.versionnumber.RNVersionNumberPackage;
 import com.microsoft.codepush.react.CodePush;
 import io.realm.react.RealmReactPackage;
-import com.dylanvann.fastimage.FastImageViewPackage;
-import com.reactnative.ivpusic.imagepicker.PickerPackage;
 import com.microsoft.appcenter.reactnative.push.AppCenterReactNativePushPackage;
 import com.entria.views.RNViewOverflowPackage;
 import com.oblador.vectoricons.VectorIconsPackage;
@@ -24,7 +24,6 @@ import com.facebook.react.ReactNativeHost;
 import com.facebook.react.ReactPackage;
 import com.facebook.react.shell.MainReactPackage;
 import com.facebook.soloader.SoLoader;
-import com.facebook.react.BuildConfig;
 
 import java.util.Arrays;
 import java.util.List;
@@ -47,15 +46,15 @@ public class MainApplication extends Application implements ReactApplication {
     protected List<ReactPackage> getPackages() {
       return Arrays.<ReactPackage>asList(
           new MainReactPackage(),
-            new RNIapPackage(),
             new NetInfoPackage(),
+            new PickerPackage(),
+            new FastImageViewPackage(),
+            new RNIapPackage(),
             new NavigationBarColorPackage(),
             BugsnagReactNative.getPackage(),
             new RNVersionNumberPackage(),
             new CodePush(getResources().getString(R.string.reactNativeCodePush_androidDeploymentKey), getApplicationContext(), BuildConfig.DEBUG),
             new RealmReactPackage(),
-            new FastImageViewPackage(),
-            new PickerPackage(),
             new AppCenterReactNativePushPackage(MainApplication.this),
             new RNViewOverflowPackage(),
             new VectorIconsPackage(),

android/gradle.properties

@@ -16,3 +16,5 @@
 # This option should only be used with decoupled projects. More details, visit
 # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
 # org.gradle.parallel=true
+android.enableJetifier=true
+android.useAndroidX=true

android/settings.gradle

@@ -1,8 +1,12 @@
 rootProject.name = 'eSteem'
-include ':react-native-iap'
-project(':react-native-iap').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-iap/android')
 include ':@react-native-community_netinfo'
 project(':@react-native-community_netinfo').projectDir = new File(rootProject.projectDir, '../node_modules/@react-native-community/netinfo/android')
+include ':react-native-image-crop-picker'
+project(':react-native-image-crop-picker').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-image-crop-picker/android')
+include ':react-native-fast-image'
+project(':react-native-fast-image').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-fast-image/android')
+include ':react-native-iap'
+project(':react-native-iap').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-iap/android')
 include ':react-native-navigation-bar-color'
 project(':react-native-navigation-bar-color').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-navigation-bar-color/android')
 include ':bugsnag-react-native'
@@ -13,10 +17,6 @@ include ':react-native-code-push'
 project(':react-native-code-push').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-code-push/android/app')
 include ':realm'
 project(':realm').projectDir = new File(rootProject.projectDir, '../node_modules/realm/android')
-include ':react-native-fast-image'
-project(':react-native-fast-image').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-fast-image/android')
-include ':react-native-image-crop-picker'
-project(':react-native-image-crop-picker').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-image-crop-picker/android')
 include ':appcenter-push'
 project(':appcenter-push').projectDir = new File(rootProject.projectDir, '../node_modules/appcenter-push/android')
 include ':react-native-view-overflow'

ios/Podfile

@@ -32,9 +32,7 @@ target 'eSteem' do
 
   pod 'CodePush', :path => '../node_modules/react-native-code-push'
 
-  pod 'react-native-fast-image', :path => '../node_modules/react-native-fast-image'
 
-  pod 'RNImageCropPicker', :path => '../node_modules/react-native-image-crop-picker'
 
   pod 'react-native-version-number', :path => '../node_modules/react-native-version-number'
 
@@ -42,9 +40,14 @@ target 'eSteem' do
 
   pod 'RNIap', :path => '../node_modules/react-native-iap'
 
-  pod 'react-native-netinfo', :path => '../node_modules/@react-native-community/netinfo'
 
 
+  pod 'RNFastImage', :path => '../node_modules/react-native-fast-image'
+
+  pod 'RNImageCropPicker', :path => '../node_modules/react-native-image-crop-picker'
+
+  pod 'react-native-netinfo', :path => '../node_modules/@react-native-community/netinfo'
+
   target 'eSteemTests' do
     inherit! :search_paths
     # Pods for testing

package.json

@@ -23,8 +23,8 @@
   "dependencies": {
     "@babel/runtime": "^7.1.2",
     "@esteemapp/esteem-render-helpers": "^1.0.9",
-    "@react-native-community/netinfo": "3.2.1",
     "@ptomasroos/react-native-multi-slider": "^1.0.0",
+    "@react-native-community/netinfo": "3.2.1",
     "appcenter": "^1.10.0",
     "appcenter-analytics": "^1.10.0",
     "appcenter-crashes": "^1.10.0",
@@ -50,9 +50,9 @@
     "react-native-config": "^0.11.5",
     "react-native-datepicker": "^1.7.2",
     "react-native-extended-stylesheet": "^0.10.0",
-    "react-native-fast-image": "^4.0.14",
+    "react-native-fast-image": "^7.0.2",
     "react-native-iap": "^3.3.0",
-    "react-native-image-crop-picker": "^0.21.3",
+    "react-native-image-crop-picker": "^0.25.0",
     "react-native-keyboard-aware-scroll-view": "^0.8.0",
     "react-native-linear-gradient": "^2.4.2",
     "react-native-modal-dropdown": "^0.6.2",
@@ -95,6 +95,7 @@
     "eslint-plugin-react": "^7.13.0",
     "eslint-plugin-react-native": "^3.7.0",
     "jest": "^24.8.0",
+    "jetifier": "^1.6.3",
     "lint-staged": "^7.2.0",
     "metro-react-native-babel-preset": "^0.54.0",
     "prettier": "^1.17.0",

yarn.lock

@@ -5411,6 +5411,11 @@ jest@^24.8.0:
     import-local "^2.0.0"
     jest-cli "^24.8.0"
 
+jetifier@^1.6.3:
+  version "1.6.3"
+  resolved "https://registry.yarnpkg.com/jetifier/-/jetifier-1.6.3.tgz#61a95b29aefddfe3b6d81ee956f5e99f8b9cba19"
+  integrity sha512-i0rb2nHVPZDPzFhgs9+yYxEDMh2z0iSHRD3vBQmvn98wlgWKwhmU2F3MUEEXfK+MLnKwLKqsCTvlcS1+CpDTUg==
+
 js-tokens@^3.0.0, js-tokens@^3.0.2:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-3.0.2.tgz#9866df395102130e38f7f996bceb65443209c25b"
@@ -7331,7 +7336,7 @@ prop-types@15.6.2:
     loose-envify "^1.3.1"
     object-assign "^4.1.1"
 
-prop-types@^15.5.10, prop-types@^15.5.6, prop-types@^15.5.8, prop-types@^15.6.0, prop-types@^15.6.1, prop-types@^15.6.2, prop-types@^15.7.2:
+prop-types@^15.5.6, prop-types@^15.5.8, prop-types@^15.6.0, prop-types@^15.6.1, prop-types@^15.6.2, prop-types@^15.7.2:
   version "15.7.2"
   resolved "https://registry.yarnpkg.com/prop-types/-/prop-types-15.7.2.tgz#52c41e75b8c87e72b9d9360e0206b99dcbffa6c5"
   integrity sha512-8QQikdH7//R2vurIJSutZ1smHYTcLpRWEOlHnzcWHmBYrOGUysKwSsrC89BCiFj3CbrfJ/nXFdJepOVrY1GCHQ==
@@ -7568,12 +7573,10 @@ react-native-extended-stylesheet@^0.10.0:
     css-mediaquery "^0.1.2"
     object-resolve-path "^1.1.0"
 
-react-native-fast-image@^4.0.14:
+react-native-fast-image@^7.0.2:
-  version "4.0.14"
+  version "7.0.2"
-  resolved "https://registry.yarnpkg.com/react-native-fast-image/-/react-native-fast-image-4.0.14.tgz#1e84c9a01b1471793e294ef4e7c3cc20e09562a0"
+  resolved "https://registry.yarnpkg.com/react-native-fast-image/-/react-native-fast-image-7.0.2.tgz#e06b21f42f4a9786eaa86f3db35d919070fb8403"
-  integrity sha512-MeRgL70JxoY/hn8ZRGBsDED9SGvTEeznneL//fWZyLaG0CM+w2CH4QXAMvADnIvu2RFd8WQWNii6c6VOpVe4Tg==
+  integrity sha512-MfuzJbC0RjYobR2gFCdqe1I7jvNOCfDkjQ7VGOHXniqjohhULMkcWNBE9Umovi9Dx93lJ6t5utcE2wf/09zvlg==
-  dependencies:
-    prop-types "^15.5.10"
 
 react-native-iap@^3.3.0:
   version "3.3.0"
@@ -7582,10 +7585,10 @@ react-native-iap@^3.3.0:
   dependencies:
     dooboolab-welcome "^1.1.0"
 
-react-native-image-crop-picker@^0.21.3:
+react-native-image-crop-picker@^0.25.0:
-  version "0.21.3"
+  version "0.25.0"
-  resolved "https://registry.yarnpkg.com/react-native-image-crop-picker/-/react-native-image-crop-picker-0.21.3.tgz#04457a3f2a888949f51be4a670dcf2520b9994f8"
+  resolved "https://registry.yarnpkg.com/react-native-image-crop-picker/-/react-native-image-crop-picker-0.25.0.tgz#858fa6fdc857255fe5250252a38d58db347f9067"
-  integrity sha512-qzY8aSYZxH4L9XYRk4V1n8x1gfq+ykNG0Kc0a9ne+JWwAQkf2P8aTKeNd4noNFZEOSJBiD4XXE/pbX55dQ5F3g==
+  integrity sha512-SpT8/zRUW+d/girR78Rc9FzqCOwuARRTJX91hENKJ8LPzVos1fthNOJO0LGGvVFYggbtLsLugrPRDRP2MiuGlQ==
 
 react-native-iphone-x-helper@^1.0.3:
   version "1.2.1"