Merge pull request #419 from hummingbird-me/develop

6.10 into Master

android/app/build.gradle

@@ -119,7 +119,7 @@ android {
         targetSdkVersion 27
         missingDimensionStrategy "RNN.reactNativeVersion", "reactNative51"
         versionCode 1
-        versionName "6.9.2"
+        versionName "6.10"
         multiDexEnabled true
         ndk {
             abiFilters "armeabi-v7a", "x86"
@@ -202,7 +202,11 @@ dependencies {
     implementation "com.android.support:appcompat-v7:27.1.0"
     implementation "com.facebook.react:react-native:+"  // From node_modules
     implementation project(':react-native-navigation')
+    implementation (project(':react-native-admob')) {
+        exclude group: 'com.google.android.gms', module: 'play-services-ads'
+    }
 
+    compile 'com.google.android.gms:play-services-ads:15.0.0'
     compile 'com.android.support:multidex:1.0.1'
     compile "com.facebook.fresco:animated-gif:1.3.0"
     compile 'com.facebook.fresco:animated-webp:1.3.0'

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

@@ -4,13 +4,15 @@
 import android.os.Bundle;
 import com.crashlytics.android.Crashlytics;
 import io.fabric.sdk.android.Fabric;
+import com.google.android.gms.ads.MobileAds;
 
 public class MainActivity extends NavigationActivity {
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         Fabric.with(this, new Crashlytics());
+        MobileAds.initialize(this, "ca-app-pub-1730996169473196~3842160171");
     }
 
     /**

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

@@ -4,6 +4,7 @@
 import android.support.multidex.MultiDex;
 import android.content.Context;
 
+import com.sbugert.rnadmob.RNAdMobPackage;
 import io.sentry.RNSentryPackage;
 import com.airship.customwebview.CustomWebViewPackage;
 import com.dylanvann.fastimage.FastImageViewPackage;
@@ -84,6 +85,7 @@ protected List<ReactPackage> getPackages() {
     // Add additional packages you require here
     // No need to add RnnPackage and MainReactPackage
     return Arrays.<ReactPackage>asList(
+          new RNAdMobPackage(),
           new RNSentryPackage(MainApplication.this),
           new CustomWebViewPackage(),
           new FastImageViewPackage(),

android/build.gradle

@@ -32,11 +32,6 @@ allprojects {
         configurations.all {
             resolutionStrategy {
                 force 'com.facebook.android:facebook-android-sdk:4.28.0' // Temp fix for broken run-android (see goo.gl/v8u59r)
-
-                // One signal depends on these, however the new version 12.0 breaks builds
-                force 'com.google.android.gms:play-services-gcm:11.8.0'
-                force 'com.google.android.gms:play-services-analytics:11.8.0'
-                force 'com.google.android.gms:play-services-location:11.8.0'
             }
         }
     }

android/settings.gradle

@@ -1,4 +1,6 @@
 rootProject.name = 'kitsu_mobile'
+include ':react-native-admob'
+project(':react-native-admob').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-admob/android')
 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'

ios/Podfile

@@ -8,6 +8,7 @@ target 'kitsu_mobile' do
   # Pods for kitsu_mobile
   pod 'RSKImageCropper'
   pod 'QBImagePickerController'
+  pod 'Google-Mobile-Ads-SDK'
 end
 
 # Remove any React Dependencies so that we don't get clashes

ios/Podfile.lock

@@ -1,20 +1,24 @@
 PODS:
+  - Google-Mobile-Ads-SDK (7.29.0)
   - QBImagePickerController (3.4.0)
   - RSKImageCropper (2.0.0)
 
 DEPENDENCIES:
+  - Google-Mobile-Ads-SDK
   - QBImagePickerController
   - RSKImageCropper
 
 SPEC REPOS:
   https://github.com/cocoapods/specs.git:
+    - Google-Mobile-Ads-SDK
     - QBImagePickerController
     - RSKImageCropper
 
 SPEC CHECKSUMS:
+  Google-Mobile-Ads-SDK: 375bbb821b3df2106c37b74f6b0a97576ddc5f6b
   QBImagePickerController: d54cf93db6decf26baf6ed3472f336ef35cae022
   RSKImageCropper: d9a1acbc0600bf8decc8f0d21895872c99a9e4cf
 
-PODFILE CHECKSUM: 071e16becd46f793bfc779b2e8e371cfa05b39b9
+PODFILE CHECKSUM: 37945ddf970518caaf601c510c923862cf4aaa85
 
 COCOAPODS: 1.5.3

ios/kitsu_mobile.xcodeproj/project.pbxproj

@@ -5,7 +5,6 @@
 	};
 	objectVersion = 46;
 	objects = {
-
 /* Begin PBXBuildFile section */
 		00C302E51ABCBA2D00DB3ED1 /* libRCTActionSheet.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 00C302AC1ABCB8CE00DB3ED1 /* libRCTActionSheet.a */; };
 		00C302E71ABCBA2D00DB3ED1 /* libRCTGeolocation.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 00C302BA1ABCB90400DB3ED1 /* libRCTGeolocation.a */; };
@@ -14,6 +13,7 @@
 		00C302EA1ABCBA2D00DB3ED1 /* libRCTVibration.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 00C302E41ABCB9EE00DB3ED1 /* libRCTVibration.a */; };
 		00E356F31AD99517003FC87E /* kitsu_mobileTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 00E356F21AD99517003FC87E /* kitsu_mobileTests.m */; };
 		0A4FBAF16D644C4EBE2768F8 /* OpenSans-ExtraBold.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 3F5C99850F22455FAE4EDCEE /* OpenSans-ExtraBold.ttf */; };
+		0A678290235C47FAA7BE869A /* libRNAdMobManager.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 53F2BF4753CD42FE8F639F34 /* libRNAdMobManager.a */; };
 		0A6D63601F3DCC8C00181D81 /* libRCTCameraRoll.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 0A6D63431F3DCC5B00181D81 /* libRCTCameraRoll.a */; };
 		0D0FBDB10EA245D1875EF08F /* libRCTActionSheet.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 32B99BDC2D7D4547AD86C3AF /* libRCTActionSheet.a */; };
 		133E29F31AD74F7200F7D852 /* libRCTLinking.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 78C398B91ACF4ADC00677621 /* libRCTLinking.a */; };
@@ -397,6 +397,13 @@
 			remoteGlobalIDString = F886647B1F4ADB500036D01B;
 			remoteInfo = "CodePush-tvOS";
 		};
+		B4BD1700210C863D00613C44 /* PBXContainerItemProxy */ = {
+			isa = PBXContainerItemProxy;
+			containerPortal = BA6574B9F4FD46769DFF8618 /* RNAdMobManager.xcodeproj */;
+			proxyType = 2;
+			remoteGlobalIDString = A96DA7741C146D7200FC639B;
+			remoteInfo = RNAdMobManager;
+		};
 		B4D2A162204B9A6F0076C9CC /* PBXContainerItemProxy */ = {
 			isa = PBXContainerItemProxy;
 			containerPortal = 139FDEE61B06529A00C62182 /* RCTWebSocket.xcodeproj */;
@@ -542,6 +549,7 @@
 		40C1013E41074CFBA8034B60 /* libCodePush.a */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = archive.ar; path = libCodePush.a; sourceTree = "<group>"; };
 		4138ED52D35F41FA8AB2D1DF /* Asap-Bold.otf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = "Asap-Bold.otf"; path = "../src/assets/fonts/open-sans/Asap-Bold.otf"; sourceTree = "<group>"; };
 		4B8CEF8DEDF944FD91A270E0 /* FontAwesome.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = FontAwesome.ttf; path = "../node_modules/react-native-vector-icons/Fonts/FontAwesome.ttf"; sourceTree = "<group>"; };
+		53F2BF4753CD42FE8F639F34 /* libRNAdMobManager.a */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = archive.ar; path = libRNAdMobManager.a; sourceTree = "<group>"; };
 		57E39DD138074CFCA41A5D1A /* FastImage.xcodeproj */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = "wrapper.pb-project"; name = FastImage.xcodeproj; path = "../node_modules/react-native-fast-image/ios/FastImage.xcodeproj"; sourceTree = "<group>"; };
 		58A1A7A508704D6CAE65A165 /* RCTFBSDK.xcodeproj */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = "wrapper.pb-project"; name = RCTFBSDK.xcodeproj; path = "../node_modules/react-native-fbsdk/ios/RCTFBSDK.xcodeproj"; sourceTree = "<group>"; };
 		598A6C24D00143C7AA010E08 /* RNVectorIcons.xcodeproj */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = "wrapper.pb-project"; name = RNVectorIcons.xcodeproj; path = "../node_modules/react-native-vector-icons/RNVectorIcons.xcodeproj"; sourceTree = "<group>"; };
@@ -579,9 +587,11 @@
 		A82502C2E8A8471AA6303833 /* CodePush.xcodeproj */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = "wrapper.pb-project"; name = CodePush.xcodeproj; path = "../node_modules/react-native-code-push/ios/CodePush.xcodeproj"; sourceTree = "<group>"; };
 		AA6869EC232B47169CCD5CEE /* Octicons.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = Octicons.ttf; path = "../node_modules/react-native-vector-icons/Fonts/Octicons.ttf"; sourceTree = "<group>"; };
 		AF1612BF0E7648D38C63F6DF /* Asap-Regular.otf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = "Asap-Regular.otf"; path = "../src/assets/fonts/open-sans/Asap-Regular.otf"; sourceTree = "<group>"; };
+		B4408EA3210C835200C3972A /* GoogleMobileAds.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = GoogleMobileAds.framework; path = "Pods/Google-Mobile-Ads-SDK/Frameworks/frameworks/GoogleMobileAds.framework"; sourceTree = "<group>"; };
 		B609CFAFF3174D9C8F848129 /* Ionicons.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = Ionicons.ttf; path = "../node_modules/react-native-vector-icons/Fonts/Ionicons.ttf"; sourceTree = "<group>"; };
 		B8D22A387FA14855B2946DDB /* OpenSans-Light.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = "OpenSans-Light.ttf"; path = "../src/assets/fonts/open-sans/OpenSans-Light.ttf"; sourceTree = "<group>"; };
 		BA356B4F7C7040CCA1CAFC3A /* Apache License.txt */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = "Apache License.txt"; path = "../src/assets/fonts/open-sans/Apache License.txt"; sourceTree = "<group>"; };
+		BA6574B9F4FD46769DFF8618 /* RNAdMobManager.xcodeproj */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = "wrapper.pb-project"; name = RNAdMobManager.xcodeproj; path = "../node_modules/react-native-admob/ios/RNAdMobManager.xcodeproj"; sourceTree = "<group>"; };
 		BC5EE0241FEE84310004423C /* RCTPushNotification.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTPushNotification.xcodeproj; path = "../node_modules/react-native/Libraries/PushNotificationIOS/RCTPushNotification.xcodeproj"; sourceTree = "<group>"; };
 		C6A9134C1F3DE0F400722EA9 /* Fabric.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = Fabric.framework; sourceTree = "<group>"; };
 		C6A9134D1F3DE0F400722EA9 /* Crashlytics.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = Crashlytics.framework; sourceTree = "<group>"; };
@@ -653,6 +663,7 @@
 				24940E1320F2E312006A21B7 /* StoreKit.framework in Frameworks */,
 				AA46644B76F32772A1C0CC7A /* libPods-kitsu_mobile.a in Frameworks */,
 				CEDAE1A565284505B1D1BD1F /* libRNSentry.a in Frameworks */,
+				0A678290235C47FAA7BE869A /* libRNAdMobManager.a in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -875,6 +886,7 @@
 				C6A917611F45972700722EA9 /* Bolts.framework */,
 				80BDB36AC10F4D1799DC4612 /* libz.tbd */,
 				268CB22608FD87F20FCBC864 /* libPods-kitsu_mobile.a */,
+				B4408EA3210C835200C3972A /* GoogleMobileAds.framework */,
 			);
 			name = Frameworks;
 			sourceTree = "<group>";
@@ -980,6 +992,7 @@
 				2CA52D4C8B0D4B529A71B14A /* RCTWKWebView.xcodeproj */,
 				57E39DD138074CFCA41A5D1A /* FastImage.xcodeproj */,
 				83B1A0C828034CA594169087 /* RNSentry.xcodeproj */,
+				BA6574B9F4FD46769DFF8618 /* RNAdMobManager.xcodeproj */,
 			);
 			name = Libraries;
 			sourceTree = "<group>";
@@ -1040,10 +1053,19 @@
 				74969B8DCCF9439185D3D9FD /* libRCTWKWebView.a */,
 				71D4F1A76AFF44AFAA0FE6AA /* libFastImage.a */,
 				70A749FBBAD6478F8AADA803 /* libRNSentry.a */,
+				53F2BF4753CD42FE8F639F34 /* libRNAdMobManager.a */,
 			);
 			name = "Recovered References";
 			sourceTree = "<group>";
 		};
+		B4BD16FD210C863D00613C44 /* Products */ = {
+			isa = PBXGroup;
+			children = (
+				B4BD1701210C863D00613C44 /* libRNAdMobManager.a */,
+			);
+			name = Products;
+			sourceTree = "<group>";
+		};
 		BC5EE0251FEE84310004423C /* Products */ = {
 			isa = PBXGroup;
 			children = (
@@ -1629,6 +1651,13 @@
 			remoteRef = B468CB9D20542EEF0081149C /* PBXContainerItemProxy */;
 			sourceTree = BUILT_PRODUCTS_DIR;
 		};
+		B4BD1701210C863D00613C44 /* libRNAdMobManager.a */ = {
+			isa = PBXReferenceProxy;
+			fileType = archive.ar;
+			path = libRNAdMobManager.a;
+			remoteRef = B4BD1700210C863D00613C44 /* PBXContainerItemProxy */;
+			sourceTree = BUILT_PRODUCTS_DIR;
+		};
 		B4D2A163204B9A6F0076C9CC /* libfishhook.a */ = {
 			isa = PBXReferenceProxy;
 			fileType = archive.ar;
@@ -1987,6 +2016,7 @@
 					"$(SRCROOT)/../node_modules/react-native-wkwebview-reborn/ios/RCTWKWebView",
 					"$(SRCROOT)/../node_modules/react-native-fast-image/ios/FastImage/**",
 					"$(SRCROOT)/../node_modules/react-native-sentry/ios/**",
+					"$(SRCROOT)/../node_modules/react-native-admob/ios",
 				);
 				INFOPLIST_FILE = kitsu_mobileTests/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
@@ -2026,6 +2056,7 @@
 					"$(SRCROOT)/../node_modules/react-native-wkwebview-reborn/ios/RCTWKWebView",
 					"$(SRCROOT)/../node_modules/react-native-fast-image/ios/FastImage/**",
 					"$(SRCROOT)/../node_modules/react-native-sentry/ios/**",
+					"$(SRCROOT)/../node_modules/react-native-admob/ios",
 				);
 				INFOPLIST_FILE = kitsu_mobileTests/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
@@ -2059,6 +2090,7 @@
 					"$(inherited)",
 					"$(PROJECT_DIR)",
 					"$(PROJECT_DIR)/Frameworks",
+					"$(PROJECT_DIR)/Pods/Google-Mobile-Ads-SDK/Frameworks/frameworks",
 				);
 				HEADER_SEARCH_PATHS = (
 					"$(inherited)",
@@ -2074,6 +2106,7 @@
 					"$(SRCROOT)/../node_modules/react-native-wkwebview-reborn/ios/RCTWKWebView",
 					"$(SRCROOT)/../node_modules/react-native-fast-image/ios/FastImage/**",
 					"$(SRCROOT)/../node_modules/react-native-sentry/ios/**",
+					"$(SRCROOT)/../node_modules/react-native-admob/ios",
 				);
 				INFOPLIST_FILE = kitsu_mobile/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
@@ -2107,6 +2140,7 @@
 					"$(inherited)",
 					"$(PROJECT_DIR)",
 					"$(PROJECT_DIR)/Frameworks",
+					"$(PROJECT_DIR)/Pods/Google-Mobile-Ads-SDK/Frameworks/frameworks",
 				);
 				HEADER_SEARCH_PATHS = (
 					"$(inherited)",
@@ -2122,6 +2156,7 @@
 					"$(SRCROOT)/../node_modules/react-native-wkwebview-reborn/ios/RCTWKWebView",
 					"$(SRCROOT)/../node_modules/react-native-fast-image/ios/FastImage/**",
 					"$(SRCROOT)/../node_modules/react-native-sentry/ios/**",
+					"$(SRCROOT)/../node_modules/react-native-admob/ios",
 				);
 				INFOPLIST_FILE = kitsu_mobile/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
@@ -2169,6 +2204,7 @@
 					"$(SRCROOT)/../node_modules/react-native-wkwebview-reborn/ios/RCTWKWebView",
 					"$(SRCROOT)/../node_modules/react-native-fast-image/ios/FastImage/**",
 					"$(SRCROOT)/../node_modules/react-native-sentry/ios/**",
+					"$(SRCROOT)/../node_modules/react-native-admob/ios",
 				);
 				INFOPLIST_FILE = "kitsu_mobile-tvOS/Info.plist";
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
@@ -2217,6 +2253,7 @@
 					"$(SRCROOT)/../node_modules/react-native-wkwebview-reborn/ios/RCTWKWebView",
 					"$(SRCROOT)/../node_modules/react-native-fast-image/ios/FastImage/**",
 					"$(SRCROOT)/../node_modules/react-native-sentry/ios/**",
+					"$(SRCROOT)/../node_modules/react-native-admob/ios",
 				);
 				INFOPLIST_FILE = "kitsu_mobile-tvOS/Info.plist";
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";

ios/kitsu_mobile/AppDelegate.m

@@ -21,6 +21,7 @@
 #import <FBSDKCoreKit/FBSDKCoreKit.h>
 #import <Fabric/Fabric.h>
 #import <Crashlytics/Crashlytics.h>
+@import GoogleMobileAds;
 
 
 @implementation AppDelegate
@@ -42,7 +43,7 @@ - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(
                                                         // enable this to cancel auto prompt for permission
                                                          kOSSettingsKeyAutoPrompt: @false
                                                       }];
-
+  [GADMobileAds configureWithApplicationID:@"ca-app-pub-1730996169473196~3598617596"];
   return YES;
 }
 

ios/kitsu_mobile/Info.plist

@@ -17,7 +17,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>6.9.2</string>
+	<string>6.10</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleURLTypes</key>
@@ -70,7 +70,7 @@
 	<key>NSCameraUsageDescription</key>
 	<string>Kitsu needs to access your camera to let you upload photos.</string>
 	<key>NSLocationWhenInUseUsageDescription</key>
-	<string></string>
+	<string/>
 	<key>NSPhotoLibraryUsageDescription</key>
 	<string>Kitsu needs to access your photo library to let you upload photos.</string>
 	<key>UIAppFonts</key>

package.json

@@ -1,6 +1,6 @@
 {
   "name": "kitsu_mobile",
-  "version": "6.9.2",
+  "version": "6.10",
   "private": true,
   "scripts": {
     "debug": "REACT_DEBUGGER=\"rndebugger-open --open --port 8081\" yarn start",
@@ -26,6 +26,7 @@
     "react-instantsearch": "^4.5.1",
     "react-native": "0.53.0",
     "react-native-actionsheet": "^2.3.0",
+    "react-native-admob": "^2.0.0-beta.5",
     "react-native-android-fullscreen-webview": "hummingbird-me/react-native-android-fullscreen-webview",
     "react-native-animatable": "^1.2.4",
     "react-native-animated-progress-bar": "^1.1.0",

src/config/api.js

@@ -27,6 +27,7 @@ Kitsu.define(
     email: '',
     avatar: '',
     about: '',
+    aoPro: '',
     createdAt: '',
     website: '',
     birthday: '',

src/config/env.js

@@ -12,7 +12,7 @@ export const kitsuConfig = {
   assetsUrl: `${kitsuUrl}/images`,
   baseUrl: apiUrl,
   uploadUrl: `${apiUrl}/edge/uploads/_bulk`,
-  version: '6.9.2',
+  version: '6.10',
   stream: {
     API_KEY: 'eb6dvmba4ct3',
     API_SECRET:

src/constants/app.js

@@ -63,3 +63,8 @@ export const ACCEPTED_UPLOAD_TYPES = [
   'image/png',
   'image/gif',
 ];
+
+export const ADMOB_AD_UNITS = Object.freeze({
+  ios: 'ca-app-pub-1730996169473196/8847607677',
+  android: 'ca-app-pub-1730996169473196/9641281765',
+});