Upgrade AdMob library
This commit is contained in:
parent
0b3dee5fa2
commit
fbe12e5038
|
|
@ -83,17 +83,17 @@ dependencies {
|
|||
implementation "net.openid:appauth:0.7.0"
|
||||
implementation "com.squareup.okio:okio:1.15.0"
|
||||
|
||||
freeImplementation 'com.google.android.gms:play-services-base:15.0.1'
|
||||
fullImplementation 'com.google.android.gms:play-services-base:15.0.1'
|
||||
freeImplementation 'com.google.android.gms:play-services-analytics:16.0.1'
|
||||
fullImplementation 'com.google.android.gms:play-services-analytics:16.0.1'
|
||||
freeImplementation 'com.google.android.gms:play-services-base:16.0.1'
|
||||
fullImplementation 'com.google.android.gms:play-services-base:16.0.1'
|
||||
freeImplementation 'com.google.android.gms:play-services-analytics:16.0.4'
|
||||
fullImplementation 'com.google.android.gms:play-services-analytics:16.0.4'
|
||||
//freeImplementation 'com.google.android.gms:play-services-wearable:15.0.1'
|
||||
//fullImplementation 'com.google.android.gms:play-services-wearable:15.0.1'
|
||||
freeImplementation 'com.google.android.gms:play-services-appinvite:16.0.1'
|
||||
fullImplementation 'com.google.android.gms:play-services-appinvite:16.0.1'
|
||||
freeImplementation 'com.google.android.gms:play-services-fitness:15.0.1'
|
||||
fullImplementation 'com.google.android.gms:play-services-fitness:15.0.1'
|
||||
freeImplementation 'com.google.android.gms:play-services-ads:15.0.1'
|
||||
freeImplementation 'com.google.android.gms:play-services-appinvite:16.0.4'
|
||||
fullImplementation 'com.google.android.gms:play-services-appinvite:16.0.4'
|
||||
freeImplementation 'com.google.android.gms:play-services-fitness:16.0.1'
|
||||
fullImplementation 'com.google.android.gms:play-services-fitness:16.0.1'
|
||||
freeImplementation 'com.google.android.gms:play-services-ads:17.0.0'
|
||||
//noinspection GradleDynamicVersion
|
||||
implementation 'ch.acra:acra-http:5.1.3'
|
||||
implementation 'com.github.amlcurran.showcaseview:library:5.4.3'
|
||||
|
|
|
|||
|
|
@ -1,35 +1,37 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<manifest
|
||||
package="sh.ftp.rocketninelabs.meditationassistant"
|
||||
xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
xmlns:tools="http://schemas.android.com/tools">
|
||||
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
xmlns:tools="http://schemas.android.com/tools"
|
||||
package="sh.ftp.rocketninelabs.meditationassistant">
|
||||
|
||||
<application>
|
||||
|
||||
<meta-data
|
||||
android:name="com.google.android.backup.api_key"
|
||||
android:value="AEdPqrEAAAAIqq_HCa56eFzfQpNSwYUIIytAyO6bh4fFUFUcYA"/>
|
||||
android:value="AEdPqrEAAAAIqq_HCa56eFzfQpNSwYUIIytAyO6bh4fFUFUcYA" />
|
||||
|
||||
<meta-data
|
||||
android:name="com.google.android.gms.version"
|
||||
android:value="@integer/google_play_services_version"/>
|
||||
android:value="@integer/google_play_services_version" />
|
||||
|
||||
<meta-data
|
||||
android:name="com.google.android.gms.analytics.globalConfigResource"
|
||||
android:resource="@xml/analytics"/>
|
||||
android:resource="@xml/analytics" />
|
||||
|
||||
<receiver
|
||||
android:name="com.google.android.gms.analytics.AnalyticsReceiver"
|
||||
android:enabled="true"
|
||||
tools:ignore="ExportedReceiver">
|
||||
<intent-filter>
|
||||
<action android:name="com.google.android.gms.analytics.ANALYTICS_DISPATCH"/>
|
||||
<action android:name="com.google.android.gms.analytics.ANALYTICS_DISPATCH" />
|
||||
</intent-filter>
|
||||
</receiver>
|
||||
<service
|
||||
android:name="com.google.android.gms.analytics.AnalyticsService"
|
||||
android:enabled="true"
|
||||
android:exported="false"/>
|
||||
android:exported="false" />
|
||||
|
||||
<meta-data
|
||||
android:name="com.google.android.gms.ads.APPLICATION_ID"
|
||||
android:value="ca-app-pub-6158454562572132~3051388356" />
|
||||
|
||||
<!-- Register Wear data layer service
|
||||
<service android:name=".WearListenerService">
|
||||
|
|
@ -42,7 +44,7 @@
|
|||
<activity
|
||||
android:name="com.google.android.gms.ads.AdActivity"
|
||||
android:configChanges="keyboard|keyboardHidden|orientation|screenLayout|uiMode|screenSize|smallestScreenSize"
|
||||
android:theme="@android:style/Theme.Translucent"/>
|
||||
android:theme="@android:style/Theme.Translucent" />
|
||||
|
||||
</application>
|
||||
|
||||
|
|
|
|||
|
|
@ -1,35 +1,34 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<manifest
|
||||
package="sh.ftp.rocketninelabs.meditationassistant"
|
||||
xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
xmlns:tools="http://schemas.android.com/tools">
|
||||
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
xmlns:tools="http://schemas.android.com/tools"
|
||||
package="sh.ftp.rocketninelabs.meditationassistant">
|
||||
|
||||
<application>
|
||||
|
||||
<meta-data
|
||||
android:name="com.google.android.backup.api_key"
|
||||
android:value="AEdPqrEAAAAImiscQeePK7-fr6JMj14zZX47kvR0lSKdCgjnXQ"/>
|
||||
android:value="AEdPqrEAAAAImiscQeePK7-fr6JMj14zZX47kvR0lSKdCgjnXQ" />
|
||||
|
||||
<meta-data
|
||||
android:name="com.google.android.gms.version"
|
||||
android:value="@integer/google_play_services_version"/>
|
||||
android:value="@integer/google_play_services_version" />
|
||||
|
||||
<meta-data
|
||||
android:name="com.google.android.gms.analytics.globalConfigResource"
|
||||
android:resource="@xml/analytics"/>
|
||||
android:resource="@xml/analytics" />
|
||||
|
||||
<receiver
|
||||
android:name="com.google.android.gms.analytics.AnalyticsReceiver"
|
||||
android:enabled="true"
|
||||
tools:ignore="ExportedReceiver">
|
||||
<intent-filter>
|
||||
<action android:name="com.google.android.gms.analytics.ANALYTICS_DISPATCH"/>
|
||||
<action android:name="com.google.android.gms.analytics.ANALYTICS_DISPATCH" />
|
||||
</intent-filter>
|
||||
</receiver>
|
||||
<service
|
||||
android:name="com.google.android.gms.analytics.AnalyticsService"
|
||||
android:enabled="true"
|
||||
android:exported="false"/>
|
||||
android:exported="false" />
|
||||
|
||||
<!-- Register Wear data layer service
|
||||
<service android:name=".WearListenerService">
|
||||
|
|
@ -55,23 +54,23 @@
|
|||
android:name=".MeditationProvider2"
|
||||
android:label="@string/widget2x1">
|
||||
<intent-filter>
|
||||
<action android:name="android.appwidget.action.APPWIDGET_UPDATE"/>
|
||||
<action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
|
||||
</intent-filter>
|
||||
|
||||
<meta-data
|
||||
android:name="android.appwidget.provider"
|
||||
android:resource="@xml/widget_2"/>
|
||||
android:resource="@xml/widget_2" />
|
||||
</receiver>
|
||||
<receiver
|
||||
android:name=".MeditationProvider3"
|
||||
android:label="@string/widget3x1">
|
||||
<intent-filter>
|
||||
<action android:name="android.appwidget.action.APPWIDGET_UPDATE"/>
|
||||
<action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
|
||||
</intent-filter>
|
||||
|
||||
<meta-data
|
||||
android:name="android.appwidget.provider"
|
||||
android:resource="@xml/widget_3"/>
|
||||
android:resource="@xml/widget_3" />
|
||||
</receiver>
|
||||
|
||||
</application>
|
||||
|
|
|
|||
|
|
@ -1,17 +1,32 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<manifest
|
||||
package="sh.ftp.rocketninelabs.meditationassistant"
|
||||
xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
xmlns:tools="http://schemas.android.com/tools">
|
||||
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
xmlns:tools="http://schemas.android.com/tools"
|
||||
package="sh.ftp.rocketninelabs.meditationassistant">
|
||||
|
||||
<uses-permission tools:node="replace" android:name="android.permission.READ_EXTERNAL_STORAGE"/>
|
||||
<uses-permission tools:node="replace" android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
|
||||
<uses-permission tools:node="replace" android:name="android.permission.WAKE_LOCK"/>
|
||||
<uses-permission tools:node="replace" android:name="android.permission.INTERNET"/>
|
||||
<uses-permission tools:node="replace" android:name="android.permission.ACCESS_NETWORK_STATE"/>
|
||||
<uses-permission tools:node="replace" android:name="android.permission.ACCESS_NOTIFICATION_POLICY"/>
|
||||
<uses-permission tools:node="replace" android:name="android.permission.VIBRATE"/>
|
||||
<uses-permission tools:node="replace" android:name="android.permission.RECEIVE_BOOT_COMPLETED"/>
|
||||
<uses-permission
|
||||
android:name="android.permission.READ_EXTERNAL_STORAGE"
|
||||
tools:node="replace" />
|
||||
<uses-permission
|
||||
android:name="android.permission.WRITE_EXTERNAL_STORAGE"
|
||||
tools:node="replace" />
|
||||
<uses-permission
|
||||
android:name="android.permission.WAKE_LOCK"
|
||||
tools:node="replace" />
|
||||
<uses-permission
|
||||
android:name="android.permission.INTERNET"
|
||||
tools:node="replace" />
|
||||
<uses-permission
|
||||
android:name="android.permission.ACCESS_NETWORK_STATE"
|
||||
tools:node="replace" />
|
||||
<uses-permission
|
||||
android:name="android.permission.ACCESS_NOTIFICATION_POLICY"
|
||||
tools:node="replace" />
|
||||
<uses-permission
|
||||
android:name="android.permission.VIBRATE"
|
||||
tools:node="replace" />
|
||||
<uses-permission
|
||||
android:name="android.permission.RECEIVE_BOOT_COMPLETED"
|
||||
tools:node="replace" />
|
||||
|
||||
<application
|
||||
android:name="sh.ftp.rocketninelabs.meditationassistant.MeditationAssistant"
|
||||
|
|
@ -31,14 +46,14 @@
|
|||
<intent-filter>
|
||||
<action android:name="sh.ftp.rocketninelabs.meditationassistant.DAILY_NOTIFICATION"></action>
|
||||
<action android:name="sh.ftp.rocketninelabs.meditationassistant.DAILY_NOTIFICATION_UPDATED"></action>
|
||||
<action android:name="android.intent.action.EXTERNAL_APPLICATIONS_AVAILABLE"/>
|
||||
<action android:name="android.intent.action.BOOT_COMPLETED"/>
|
||||
<action android:name="android.intent.action.EXTERNAL_APPLICATIONS_AVAILABLE" />
|
||||
<action android:name="android.intent.action.BOOT_COMPLETED" />
|
||||
</intent-filter>
|
||||
<intent-filter>
|
||||
<action android:name="android.intent.action.PACKAGE_REPLACED"/>
|
||||
<action android:name="android.intent.action.PACKAGE_REPLACED" />
|
||||
<data
|
||||
android:path="${applicationId}"
|
||||
android:scheme="package"/>
|
||||
android:scheme="package" />
|
||||
</intent-filter>
|
||||
</receiver>
|
||||
|
||||
|
|
@ -60,8 +75,8 @@
|
|||
android:label="@string/appNameShort"
|
||||
android:launchMode="singleTask">
|
||||
<intent-filter>
|
||||
<action android:name="android.intent.action.MAIN"/>
|
||||
<category android:name="android.intent.category.LAUNCHER"/>
|
||||
<action android:name="android.intent.action.MAIN" />
|
||||
<category android:name="android.intent.category.LAUNCHER" />
|
||||
</intent-filter>
|
||||
<intent-filter>
|
||||
<action android:name="sh.ftp.rocketninelabs.meditationassistant.ALARM"></action>
|
||||
|
|
@ -76,7 +91,7 @@
|
|||
tools:ignore="UnusedAttribute">
|
||||
<meta-data
|
||||
android:name="android.support.PARENT_ACTIVITY"
|
||||
android:value="sh.ftp.rocketninelabs.meditationassistant.MainActivity"/>
|
||||
android:value="sh.ftp.rocketninelabs.meditationassistant.MainActivity" />
|
||||
</activity>
|
||||
<activity
|
||||
android:name="sh.ftp.rocketninelabs.meditationassistant.AuthResultActivity"
|
||||
|
|
@ -85,7 +100,7 @@
|
|||
android:launchMode="singleTop">
|
||||
<meta-data
|
||||
android:name="android.support.PARENT_ACTIVITY"
|
||||
android:value="sh.ftp.rocketninelabs.meditationassistant.MainActivity"/>
|
||||
android:value="sh.ftp.rocketninelabs.meditationassistant.MainActivity" />
|
||||
</activity>
|
||||
<activity
|
||||
android:name="sh.ftp.rocketninelabs.meditationassistant.MediNETActivity"
|
||||
|
|
@ -94,7 +109,7 @@
|
|||
android:launchMode="singleTop">
|
||||
<meta-data
|
||||
android:name="android.support.PARENT_ACTIVITY"
|
||||
android:value="sh.ftp.rocketninelabs.meditationassistant.MainActivity"/>
|
||||
android:value="sh.ftp.rocketninelabs.meditationassistant.MainActivity" />
|
||||
</activity>
|
||||
<activity
|
||||
android:name="sh.ftp.rocketninelabs.meditationassistant.CompleteActivity"
|
||||
|
|
@ -102,7 +117,7 @@
|
|||
android:label="@string/sessioncomplete">
|
||||
<meta-data
|
||||
android:name="android.support.PARENT_ACTIVITY"
|
||||
android:value="sh.ftp.rocketninelabs.meditationassistant.MainActivity"/>
|
||||
android:value="sh.ftp.rocketninelabs.meditationassistant.MainActivity" />
|
||||
</activity>
|
||||
<activity
|
||||
android:name="sh.ftp.rocketninelabs.meditationassistant.AboutActivity"
|
||||
|
|
@ -110,7 +125,7 @@
|
|||
android:label="@string/about">
|
||||
<meta-data
|
||||
android:name="android.support.PARENT_ACTIVITY"
|
||||
android:value="sh.ftp.rocketninelabs.meditationassistant.MainActivity"/>
|
||||
android:value="sh.ftp.rocketninelabs.meditationassistant.MainActivity" />
|
||||
</activity>
|
||||
<activity
|
||||
android:name="sh.ftp.rocketninelabs.meditationassistant.ProgressActivity"
|
||||
|
|
@ -118,15 +133,15 @@
|
|||
android:label="@string/progress">
|
||||
<meta-data
|
||||
android:name="android.support.PARENT_ACTIVITY"
|
||||
android:value="sh.ftp.rocketninelabs.meditationassistant.MainActivity"/>
|
||||
android:value="sh.ftp.rocketninelabs.meditationassistant.MainActivity" />
|
||||
</activity>
|
||||
<activity
|
||||
android:name="com.nononsenseapps.filepicker.FilePickerActivity"
|
||||
android:label="@string/appNameShort"
|
||||
android:theme="@style/FilePickerTheme">
|
||||
<intent-filter>
|
||||
<action android:name="android.intent.action.GET_CONTENT"/>
|
||||
<category android:name="android.intent.category.DEFAULT"/>
|
||||
<action android:name="android.intent.action.GET_CONTENT" />
|
||||
<category android:name="android.intent.category.DEFAULT" />
|
||||
</intent-filter>
|
||||
</activity>
|
||||
</application>
|
||||
|
|
|
|||
|
|
@ -1,13 +1,12 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<manifest
|
||||
package="sh.ftp.rocketninelabs.meditationassistant"
|
||||
xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
package="sh.ftp.rocketninelabs.meditationassistant">
|
||||
|
||||
<application>
|
||||
|
||||
<meta-data
|
||||
android:name="com.google.android.backup.api_key"
|
||||
android:value="AEdPqrEAAAAIAUEb3SC2bBJt6pLanNwm7yB1Qy2WFS_nm7pHuw"/>
|
||||
android:value="AEdPqrEAAAAIAUEb3SC2bBJt6pLanNwm7yB1Qy2WFS_nm7pHuw" />
|
||||
|
||||
<!-- Widgets -->
|
||||
<!--
|
||||
|
|
@ -26,23 +25,23 @@
|
|||
android:name=".MeditationProvider2"
|
||||
android:label="@string/widget2x1">
|
||||
<intent-filter>
|
||||
<action android:name="android.appwidget.action.APPWIDGET_UPDATE"/>
|
||||
<action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
|
||||
</intent-filter>
|
||||
|
||||
<meta-data
|
||||
android:name="android.appwidget.provider"
|
||||
android:resource="@xml/widget_2"/>
|
||||
android:resource="@xml/widget_2" />
|
||||
</receiver>
|
||||
<receiver
|
||||
android:name=".MeditationProvider3"
|
||||
android:label="@string/widget3x1">
|
||||
<intent-filter>
|
||||
<action android:name="android.appwidget.action.APPWIDGET_UPDATE"/>
|
||||
<action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
|
||||
</intent-filter>
|
||||
|
||||
<meta-data
|
||||
android:name="android.appwidget.provider"
|
||||
android:resource="@xml/widget_3"/>
|
||||
android:resource="@xml/widget_3" />
|
||||
</receiver>
|
||||
|
||||
</application>
|
||||
|
|
|
|||
Loading…
Reference in New Issue