diff --git a/IAP5Helper/build.gradle b/IAP5Helper/build.gradle index 333d65e..4febbb5 100644 --- a/IAP5Helper/build.gradle +++ b/IAP5Helper/build.gradle @@ -1,7 +1,7 @@ apply plugin: 'com.android.library' android { compileSdkVersion 28 - buildToolsVersion '28.0.2' + buildToolsVersion '28.0.3' defaultConfig { minSdkVersion 14 diff --git a/app/build.gradle b/app/build.gradle index 2a06d20..2e5acd3 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -44,10 +44,14 @@ android { } } buildTypes { + debug { + resValue "string", "adbmob_ad_unit_id", "ca-app-pub-3940256099942544/6300978111" + } release { minifyEnabled true proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' signingConfig signingConfigs.release + resValue "string", "adbmob_ad_unit_id", "ca-app-pub-3319579963502409/4464724664" } } flavorDimensions "platform" @@ -98,5 +102,10 @@ dependencies { implementation 'io.reactivex.rxjava2:rxandroid:2.1.0' implementation 'io.reactivex.rxjava2:rxjava:2.2.6' implementation "ch.acra:acra-http:$acraVersion" + implementation 'com.google.firebase:firebase-core:16.0.7' + implementation 'com.google.firebase:firebase-ads:17.1.3' + implementation 'com.android.billingclient:billing:1.2' samsungImplementation project(":IAP5Helper") } + +apply plugin: 'com.google.gms.google-services' diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 84b1d32..5ab0178 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -17,6 +17,10 @@ android:theme="@style/AppTheme" tools:ignore="AllowBackup" tools:targetApi="n"> + + - + android:layout_height="match_parent" + xmlns:app="http://schemas.android.com/apk/res-auto"> + android:layout_height="0dp" + app:layout_constraintTop_toTopOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintBottom_toTopOf="@+id/adView"> - + + + diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 6522f5e..7827f1e 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -1,6 +1,9 @@ Simple Markdown Markdown + + ca-app-pub-3319579963502409~4576405307 + Settings Help Edit diff --git a/build.gradle b/build.gradle index 8553826..50c26da 100644 --- a/build.gradle +++ b/build.gradle @@ -7,8 +7,7 @@ buildscript { } dependencies { classpath 'com.android.tools.build:gradle:3.3.1' - // NOTE: Do not place your application dependencies here; they belong - // in the individual module build.gradle files + classpath 'com.google.gms:google-services:4.2.0' } }