Merge pull request #374 from hummingbird-me/develop

[6.7] Merge development into master.

.travis.yml

@@ -59,21 +59,22 @@ matrix:
       script:
         - cd android && ./gradlew clean
         - if [ "$TRAVIS_BRANCH" = "develop" ]; then
-            fastlane alpha_googleplay;
-            fastlane alpha_crashlytics;
+            travis_wait fastlane alpha_googleplay;
+            travis_wait fastlane alpha_crashlytics;
           fi
-        - if [ "$TRAVIS_BRANCH" = "master" ]; then fastlane release; fi
+        - if [ "$TRAVIS_BRANCH" = "master" ]; then travis_wait fastlane release; fi
 
     - language: objective-c
       os: osx
-      osx_image: xcode9.2
+      osx_image: xcode9.4
       node_js: false
       before_install:
         - nvm install 8.10.0
         - node --version
         - travis_retry npm install -g yarn
         - yarn -version
         - gem install fastlane --no-rdoc --no-ri --no-document --quiet
+        - pod repo update
         - openssl aes-256-cbc -K $encrypted_5a0bd94d6bee_key -iv $encrypted_5a0bd94d6bee_iv -in .deploy_key.enc -out ~/.ssh/deploy_key -d
         - echo -e "Host github.com\n\tHostName github.com\n\tUser git\n\tIdentityFile ~/.ssh/deploy_key\n" >> ~/.ssh/config
         - ssh-keyscan github.com >> ~/.ssh/known_hosts
@@ -83,5 +84,6 @@ matrix:
       script:
         - cd ios
         # We don't need to check for release branch here because alpha/beta are all handled in TestFlight
+        # NOTE: Applying `travis_wait` here seems to stall the travis builds ...
         - if [ "$TRAVIS_BRANCH" = "develop" ]; then fastlane alpha_testflight; fi
         - if [ "$TRAVIS_BRANCH" = "master" ]; then fastlane release; fi

README.md

@@ -25,7 +25,6 @@ If you run **OSX** then download the [iOS FacebookSDK](https://developers.facebo
 1. Run `yarn install`
 2. Run `react-native link`
 3. Run `cd ios && pod install` 
-4. Because of weird bug, react native does not have btoa and atob functions, but it is needed in auth library, for that we need to import btoa and atob in that library. (this is temporary solution, I will create PR to support react-native to that library). For now, you can run the app by enabling Remote debug mode, and app will work as it should.
 
 ### Debugging
 - Install [react-native-debugger](https://github.com/jhen0409/react-native-debugger/releases)

android/app/build.gradle

@@ -118,7 +118,7 @@ android {
         minSdkVersion 16
         targetSdkVersion 27
         versionCode 1
-        versionName "6.6"
+        versionName "6.7"
         multiDexEnabled true
         ndk {
             abiFilters "armeabi-v7a", "x86"
@@ -173,9 +173,10 @@ android {
 }
 
 dependencies {
+    compile project(':react-native-sentry')
+    compile project(':react-native-android-fullscreen-webview')
     compile project(':react-native-fast-image')
     compile project(':react-native-image-crop-picker')
-    compile project(':react-native-sentry')
     compile project(':react-native-onesignal')
     compile project(':react-native-youtube')
     compile project(':react-native-linear-gradient')

android/app/src/main/AndroidManifest.xml

@@ -16,6 +16,7 @@
       android:allowBackup="true"
       android:label="@string/app_name"
       android:icon="@mipmap/ic_launcher"
+      android:roundIcon="@mipmap/ic_launcher"
       android:theme="@style/AppTheme"
       android:largeHeap="true">
 
@@ -46,8 +47,9 @@
         android:label="@string/app_name"
         android:launchMode="singleTop"
         android:screenOrientation="portrait"
-        android:configChanges="keyboard|keyboardHidden|screenSize"
+        android:configChanges="keyboard|keyboardHidden|screenSize|orientation"
         android:windowSoftInputMode="adjustPan"
+        android:hardwareAccelerated="true"
         android:largeHeap="true">
       <intent-filter>
         <action android:name="android.intent.action.MAIN" />

android/app/src/main/java/com/everfox/animetrackerandroid/MainApplication.java

@@ -4,6 +4,8 @@
 import android.support.multidex.MultiDexApplication;
 
 import com.facebook.react.ReactApplication;
+import io.sentry.RNSentryPackage;
+import com.airship.customwebview.CustomWebViewPackage;
 import com.dylanvann.fastimage.FastImageViewPackage;
 import com.reactnative.ivpusic.imagepicker.PickerPackage;
 import com.geektime.rnonesignalandroid.ReactNativeOneSignalPackage;
@@ -51,6 +53,8 @@ public boolean getUseDeveloperSupport() {
     protected List<ReactPackage> getPackages() {
       return Arrays.<ReactPackage>asList(
           new MainReactPackage(),
+            new RNSentryPackage(MainApplication.this),
+            new CustomWebViewPackage(),
             new FastImageViewPackage(),
             new PickerPackage(),
             new ReactNativeOneSignalPackage(),

android/app/src/main/res/drawable/ic_launcher_foreground.xml

@@ -0,0 +1,15 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="108dp"
+        android:height="108dp"
+        android:viewportWidth="639.86017"
+        android:viewportHeight="639.86017">
+    <group android:translateX="180.46776"
+            android:translateY="167.43007">
+        <path
+            android:pathData="M208.8,66.4c-9.3,-3.5 -19.2,-5.5 -29.6,-6c-17.3,-0.8 -33.8,3 -48.3,10.3c-0.8,0.4 -1.7,0.9 -2.7,1.4V75v46.8c0,0.7 0,3.2 -0.4,5.4c-1,5.1 -3.9,9.5 -8.2,12.4c-3.5,2.4 -7.7,3.6 -12,3.4c-0.8,0 -1.7,-0.1 -2.5,-0.3c-2.2,-0.4 -4.5,-1.3 -5.2,-1.5c-1.9,-0.7 -29.7,-11.5 -43.1,-16.7c-1.7,-0.6 -3,-1.2 -4.1,-1.6c-16,13.5 -32.7,29.6 -48.4,48.5c-0.1,0.2 -0.8,0.9 -0.9,1.1c-2.1,2.9 -2.2,6.9 -0.1,10.1c1.6,2.4 4.2,3.7 6.9,3.8c1.8,0.1 3.7,-0.4 5.3,-1.5c0.2,-0.1 0.3,-0.2 0.5,-0.4l0,0c16.7,-12 34.9,-21.7 54.2,-29.4c1.4,-0.7 3,-1.1 4.5,-1c2.1,0.1 4.3,1 5.9,2.6c3.1,3.2 3.3,8.2 0.6,11.6l0,0c-1,1.6 -2.1,3.2 -3.1,4.9c-10.4,16.9 -18.7,35.2 -24.9,54.5c-0.2,0.5 -0.3,1 -0.5,1.5v0.1c-0.5,2.3 -0.1,4.8 1.3,6.9c1.6,2.4 4.2,3.7 6.9,3.8c1.8,0.1 3.7,-0.4 5.4,-1.5c0.7,-0.5 1.3,-1.1 1.9,-1.7c0,0 0,0 0.1,-0.1c0.2,-0.3 0.4,-0.6 0.6,-0.8l0,0c6.8,-9.7 14.3,-18.8 22.4,-27.3c35.9,-38.4 83.4,-65.6 136.7,-76.2l0,0c0.4,-0.1 0.8,-0.1 1.2,-0.1c3,0.1 5.3,2.7 5.2,5.7c-0.1,2.6 -1.9,4.6 -4.4,5.1c-49.5,10.5 -138.6,69.3 -107.4,154.5c0.5,1.3 0.9,2.2 1.7,3.4c1.6,2.4 4.2,3.7 6.9,3.8c1.5,0.1 5.8,-0.5 8.3,-5.1c5.1,-9.5 14.6,-20.2 42.2,-31.6c76.7,-31.8 89.4,-77.1 90.7,-105.8c0,-0.6 0.1,-1.1 0.1,-1.7C273.6,117.8 247,80.5 208.8,66.4zM131.9,291.2c-7.1,-21.1 -6.5,-41.6 1.9,-61.1c16,25.8 43.8,28 43.8,28C149,269.9 137.8,281.7 131.9,291.2z"
+            android:fillColor="#FD7A61"/>
+        <path
+            android:pathData="M2.2,69.2c0.2,0.2 0.3,0.5 0.5,0.7l0,0c7.2,9.8 15.4,18.5 24.3,26c0.1,0.1 0.2,0.2 0.3,0.3c5.7,4.8 16.6,12 24.6,14.9c0.1,0 49.2,19 51.9,20c1,0.4 2.3,0.8 3,0.9c2.2,0.4 4.6,0 6.6,-1.4s3.2,-3.4 3.7,-5.6c0.2,-0.8 0.2,-2.1 0.2,-3.2V66.2c0.1,-8.5 -2.6,-21.2 -5,-28.3c0,-0.1 -0.1,-0.3 -0.1,-0.4c-3.9,-11 -9.1,-21.8 -15.5,-32l0,0c-0.1,-0.3 -0.3,-0.5 -0.5,-0.8l-0.1,-0.2C93.3,0.6 87.9,-0.3 84,2.4c-0.6,0.4 -1.2,0.9 -1.6,1.4l0,0c-0.4,0.5 -0.7,1 -1,1.5c-8.7,12.6 -12.2,28.1 -10,43.2c-4.5,2.3 -9.3,5.5 -9.8,5.9h-0.1c0,0 0,0 -0.1,0c-0.6,0.4 -5.3,3.7 -9.1,7.1c-13.2,-7.5 -29,-9.8 -43.9,-6.2c-0.6,0.1 -1.2,0.3 -1.8,0.4l0,0c-0.7,0.2 -1.3,0.6 -1.9,1c-4,2.7 -5,8.1 -2.4,12.1L2.2,69.2L2.2,69.2zM88.8,14.6c4.6,7.7 8.6,15.8 11.7,24.2c-6.2,1 -12.4,2.7 -18.4,5C81.2,33.6 83.5,23.4 88.8,14.6zM43.7,70.1c-4.3,4.8 -8.1,10 -11.3,15.4C25.7,79.6 19.6,73 14,65.9C24.1,64.2 34.4,65.6 43.7,70.1z"
+            android:fillColor="#FD7A61"/>
+    </group>
+</vector>

android/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+    <background android:drawable="@color/ic_launcher_background"/>
+    <foreground android:drawable="@drawable/ic_launcher_foreground"/>
+</adaptive-icon>

android/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+    <background android:drawable="@color/ic_launcher_background"/>
+    <foreground android:drawable="@drawable/ic_launcher_foreground"/>
+</adaptive-icon>

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

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <color name="ic_launcher_background">#4B3C4A</color>
+</resources>

android/settings.gradle

@@ -1,10 +1,12 @@
 rootProject.name = 'kitsu_mobile'
+include ':react-native-sentry'
+project(':react-native-sentry').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-sentry/android')
+include ':react-native-android-fullscreen-webview'
+project(':react-native-android-fullscreen-webview').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-android-fullscreen-webview/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 ':react-native-sentry'
-project(':react-native-sentry').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-sentry/android')
 include ':react-native-onesignal'
 project(':react-native-onesignal').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-onesignal/android')
 include ':react-native-youtube'

ios/Podfile

@@ -4,9 +4,17 @@ platform :ios, '9.0'
 target 'kitsu_mobile' do
   # Uncomment the next line if you're using Swift or would like to use dynamic frameworks
   # use_frameworks!
-
+  
   # Pods for kitsu_mobile
   pod 'RSKImageCropper'
   pod 'QBImagePickerController'
+end
 
+# Remove any React Dependencies so that we don't get clashes
+post_install do |installer|
+  installer.pods_project.targets.each do |target|
+    if target.name == "React"
+      target.remove_from_project
+    end
+  end
 end

ios/Podfile.lock

@@ -6,10 +6,15 @@ DEPENDENCIES:
   - QBImagePickerController
   - RSKImageCropper
 
+SPEC REPOS:
+  https://github.com/cocoapods/specs.git:
+    - QBImagePickerController
+    - RSKImageCropper
+
 SPEC CHECKSUMS:
   QBImagePickerController: d54cf93db6decf26baf6ed3472f336ef35cae022
   RSKImageCropper: d9a1acbc0600bf8decc8f0d21895872c99a9e4cf
 
-PODFILE CHECKSUM: c409099998033bd556a80b8ba0d44eb41aa184a1
+PODFILE CHECKSUM: 5effe5ff74f049d1a27b91df714ddd9291059a54
 
-COCOAPODS: 1.4.0
+COCOAPODS: 1.5.3

ios/fastlane/Fastfile

@@ -122,7 +122,10 @@ platform :ios do
     build()
 
     # Auto submit for alpha testers
-    pilot()
+    pilot(
+      skip_submission: true,
+      skip_waiting_for_build_processing: true,
+    )
   end
 
   desc "Deploy a new version to the App Store"