From aa399ee5593877c9f741966e6d0e3d32e5edd137 Mon Sep 17 00:00:00 2001 From: Slava Date: Thu, 30 Jan 2025 13:09:53 +0600 Subject: [PATCH] =?UTF-8?q?Android=20app=20[+]=20=D0=94=D0=BE=D0=B1=D0=B0?= =?UTF-8?q?=D0=B2=D0=B8=D0=BB=20=D0=B0=D0=B9=D0=B4=D0=B8=D1=88=D0=BD=D0=B8?= =?UTF-8?q?=D0=BA=D0=B8=20=D0=B4=D0=BB=D1=8F=20=D1=80=D0=B5=D0=BA=D0=BB?= =?UTF-8?q?=D0=B0=D0=BC=D1=8B.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/build.gradle | 29 ++++++++++++++----- .../notebook/manager/ads/AdsIds.java | 7 +++-- .../presentation/adapters/NoteAdapter.java | 3 +- build.gradle | 4 +-- gradle/wrapper/gradle-wrapper.properties | 2 +- 5 files changed, 32 insertions(+), 13 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index ad65faa..8d054f1 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -4,16 +4,31 @@ plugins { } android { - compileSdk 34 + compileSdk 35 + + def localProperties = new Properties() + def localPropertiesFile = rootProject.file("local.properties") + + if (localPropertiesFile.exists()) { + localProperties.load(new FileInputStream(localPropertiesFile)) + } + + def noteScreenInterstitialAdsId = localProperties.getProperty("noteScreenInterstitialAdsId") + def openAdsId = localProperties.getProperty("openAdsId") + def nativeAdsId = localProperties.getProperty("nativeAdsId") defaultConfig { applicationId "ru.plumsoftware.notebook" minSdk 22 - targetSdk 34 - versionCode 30 - versionName "2.0.7" + targetSdk 35 + versionCode 31 + versionName "2.0.8" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" + + buildConfigField "String", "noteScreenInterstitialAdsId", "\"${noteScreenInterstitialAdsId}\"" + buildConfigField "String", "openAdsId", "\"${openAdsId}\"" + buildConfigField "String", "nativeAdsId", "\"${nativeAdsId}\"" } buildTypes { @@ -46,16 +61,16 @@ dependencies { androidTestImplementation 'androidx.test.espresso:espresso-core:3.6.1' //Yandex ads - implementation 'com.yandex.android:mobileads:7.6.0' + implementation 'com.yandex.android:mobileads:7.9.0' //Glide implementation 'com.github.bumptech.glide:glide:4.15.1' //Messaging - implementation 'com.google.firebase:firebase-messaging:24.0.3' + implementation 'com.google.firebase:firebase-messaging:24.1.0' //Analytics - implementation 'com.google.firebase:firebase-analytics:22.1.2' + implementation 'com.google.firebase:firebase-analytics:22.2.0' //Modules implementation project(':app-domain') diff --git a/app/src/main/java/ru/plumsoftware/notebook/manager/ads/AdsIds.java b/app/src/main/java/ru/plumsoftware/notebook/manager/ads/AdsIds.java index 7afc6c4..31bf735 100644 --- a/app/src/main/java/ru/plumsoftware/notebook/manager/ads/AdsIds.java +++ b/app/src/main/java/ru/plumsoftware/notebook/manager/ads/AdsIds.java @@ -1,6 +1,9 @@ package ru.plumsoftware.notebook.manager.ads; +import ru.plumsoftware.notebook.BuildConfig; + public class AdsIds { - public static final String OPEN_AD_UNIT_ID = "R-M-1957919-3"; - public static final String INTERSTITIAL_AD_UNIT_ID = "R-M-1957919-2"; + public static final String OPEN_AD_UNIT_ID = BuildConfig.openAdsId; + public static final String INTERSTITIAL_AD_UNIT_ID = BuildConfig.noteScreenInterstitialAdsId; + public static final String NATIVE_AD_UNIT_ID = BuildConfig.nativeAdsId; } diff --git a/app/src/main/java/ru/plumsoftware/notebook/presentation/adapters/NoteAdapter.java b/app/src/main/java/ru/plumsoftware/notebook/presentation/adapters/NoteAdapter.java index 7e02994..3251903 100644 --- a/app/src/main/java/ru/plumsoftware/notebook/presentation/adapters/NoteAdapter.java +++ b/app/src/main/java/ru/plumsoftware/notebook/presentation/adapters/NoteAdapter.java @@ -47,6 +47,7 @@ import ru.plumsoftware.data.database.SQLiteDatabaseManager; import ru.plumsoftware.data.model.database.DatabaseConstants; import ru.plumsoftware.data.model.ui.Note; +import ru.plumsoftware.notebook.manager.ads.AdsIds; import ru.plumsoftware.notebook.presentation.activities.note.view.AddNoteActivity; import ru.plumsoftware.notebook.presentation.activities.main.view.MainActivity; import ru.plumsoftware.notebook.presentation.dialogs.ProgressDialog; @@ -110,7 +111,7 @@ public void onInitializationCompleted() { //Load ad final NativeBulkAdLoader nativeBulkAdLoader = new NativeBulkAdLoader(context); - final NativeAdRequestConfiguration nativeAdRequestConfiguration = new NativeAdRequestConfiguration.Builder("R-M-1957919-1").build(); + final NativeAdRequestConfiguration nativeAdRequestConfiguration = new NativeAdRequestConfiguration.Builder(AdsIds.NATIVE_AD_UNIT_ID).build(); //final NativeAdRequestConfiguration nativeAdRequestConfiguration = new NativeAdRequestConfiguration.Builder("R-M-1769412-1").build(); //final NativeAdRequestConfiguration nativeAdRequestConfiguration = new NativeAdRequestConfiguration.Builder("R-M-1742395-1").build(); nativeBulkAdLoader.loadAds(nativeAdRequestConfiguration, 1); diff --git a/build.gradle b/build.gradle index 5782086..56f7edf 100644 --- a/build.gradle +++ b/build.gradle @@ -4,8 +4,8 @@ buildscript { } }// Top-level build file where you can add configuration options common to all sub-projects/modules. plugins { - id 'com.android.application' version '8.6.0' apply false - id 'com.android.library' version '8.6.0' apply false + id 'com.android.application' version '8.7.3' apply false + id 'com.android.library' version '8.7.3' apply false } tasks.register('clean', Delete) { diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index e8f7b1e..da06ae1 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ #Thu Sep 29 00:05:39 GMT+06:00 2022 distributionBase=GRADLE_USER_HOME -distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip distributionPath=wrapper/dists zipStorePath=wrapper/dists zipStoreBase=GRADLE_USER_HOME