4.0.5

[+] Добавил кодогенерацию значений из local.properties.
[+] Добавил конфиг для рекламы.

app/build.gradle

@@ -6,21 +6,43 @@ plugins {
 android {
     compileSdk 35
 
+    def localProperties = new Properties()
+    def localPropertiesFile = rootProject.file("local.properties")
+
+    if (localPropertiesFile.exists()) {
+        localProperties.load(new FileInputStream(localPropertiesFile))
+    }
+
+    def mainBannerAdsId = localProperties.getProperty("mainScreenBannerId")
+    def eventScreenBannerId = localProperties.getProperty("eventScreenBannerId")
+    def openAdsId = localProperties.getProperty("openAdsId")
+    def interstitialAdsId = localProperties.getProperty("interstitialAdsId")
+
     defaultConfig {
         applicationId "com.plumsoftware.rucalendar"
         minSdk 21
         targetSdk 35
-        versionCode 50
-        versionName "4.0.4"
+        versionCode 51
+        versionName "4.0.5"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         multiDexEnabled true
+
+        buildConfigField "String", "mainScreenBannerId", "\"${mainBannerAdsId}\""
+        buildConfigField "String", "openAdsId", "\"${openAdsId}\""
+        buildConfigField "String", "interstitialAdsId", "\"${interstitialAdsId}\""
+        buildConfigField "String", "eventScreenBannerId", "\"${eventScreenBannerId}\""
     }
 
     buildTypes {
         release {
             minifyEnabled false
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
+
+            buildConfigField "String", "mainScreenBannerId", "\"${mainBannerAdsId}\""
+            buildConfigField "String", "openAdsId", "\"${openAdsId}\""
+            buildConfigField "String", "interstitialAdsId", "\"${interstitialAdsId}\""
+            buildConfigField "String", "eventScreenBannerId", "\"${eventScreenBannerId}\""
         }
     }
     compileOptions {
@@ -105,6 +127,9 @@ android {
             checkDependencies false
             disable 'MobileAdsSdkOutdatedVersion'
         }
+        buildFeatures {
+            buildConfig true
+        }
     }
 }
 
@@ -114,6 +139,7 @@ dependencies {
     implementation 'com.google.android.material:material:1.8.0'
     implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
     implementation 'com.google.firebase:firebase-messaging:23.1.2'
+    implementation 'androidx.core:core-ktx:1.15.0'
     testImplementation 'junit:junit:4.13.2'
     androidTestImplementation 'androidx.test.ext:junit:1.1.5'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
@@ -126,7 +152,7 @@ dependencies {
 
 
     //noinspection MobileAdsSdkVersion
-    implementation 'com.yandex.android:mobileads:7.8.0'
+    implementation 'com.yandex.android:mobileads:7.9.0'
 
     //Animations
     implementation 'io.noties:tumbleweed-android:2.0.0'

app/src/main/java/com/plumsoftware/rucalendar/activities/EventActivity.java

@@ -16,6 +16,7 @@
 import android.widget.TextView;
 import android.widget.Toast;
 
+import com.plumsoftware.rucalendar.config.AdsConfig;
 import com.plumsoftware.rucalendar.events.CelebrationItem;
 import com.plumsoftware.rucalendar.dialog.ProgressDialog;
 import com.plumsoftware.rucalendar.R;
@@ -65,7 +66,7 @@ protected void onCreate(Bundle savedInstanceState) {
         androidx.appcompat.widget.Toolbar toolbar = findViewById(R.id.toolbar2);
         mBannerAdView = (BannerAdView) findViewById(R.id.adView);
 
-        mBannerAdView.setAdUnitId("R-M-2215793-1"); //RuStore
+        mBannerAdView.setAdUnitId(AdsConfig.BANNER_EVENT_SCREEN_AD);
         mBannerAdView.setAdSize(BannerAdSize.inlineSize(EventActivity.this, screenWidth, 50));
 
 //         Создание объекта таргетирования рекламы.
@@ -176,7 +177,7 @@ public void onBackPressed() {
         progressDialog.showDialog(EventActivity.this);
         if (mInterstitialAdLoader != null) {
             final AdRequestConfiguration adRequestConfiguration =
-                    new AdRequestConfiguration.Builder("R-M-2215793-2").build(); //RuStore
+                    new AdRequestConfiguration.Builder(AdsConfig.INTERSTITIAL_AD).build(); //RuStore
             mInterstitialAdLoader.loadAd(adRequestConfiguration);
         }
     }

app/src/main/java/com/plumsoftware/rucalendar/activities/MainActivity.java

@@ -28,6 +28,7 @@
 import com.airbnb.lottie.LottieAnimationView;
 import com.google.android.material.appbar.AppBarLayout;
 import com.plumsoftware.rucalendar.adapters.CelebrationAdapter;
+import com.plumsoftware.rucalendar.config.AdsConfig;
 import com.plumsoftware.rucalendar.dialog.ProgressDialog;
 import com.plumsoftware.rucalendar.events.CelebrationItem;
 import com.plumsoftware.rucalendar.events.Celebrations;
@@ -137,7 +138,6 @@ protected void onCreate(Bundle savedInstanceState) {
         setContentView(R.layout.menu_layout);
 
         MobileAds.initialize(this, () -> {
-
         });
 
         Context context = MainActivity.this;
@@ -147,7 +147,7 @@ protected void onCreate(Bundle savedInstanceState) {
 //        region::App open Ads
         progressDialog.showDialog(context);
         final AppOpenAdLoader appOpenAdLoader = new AppOpenAdLoader(context);
-        final String AD_UNIT_ID = "R-M-2215793-4"; //RuStore
+        final String AD_UNIT_ID = AdsConfig.OPEN_MAIN_SCREEN_AD;
         final AdRequestConfiguration adRequestConfiguration = new AdRequestConfiguration.Builder(AD_UNIT_ID).build();
 
         AppOpenAdEventListener appOpenAdEventListener = new AppOpenAdEventListener() {
@@ -183,9 +183,7 @@ public void onAdImpression(@Nullable final ImpressionData impressionData) {
             @Override
             public void onAdLoaded(@NonNull final AppOpenAd appOpenAd) {
                 mAppOpenAd = appOpenAd;
-                if (mAppOpenAd != null) {
-                    mAppOpenAd.setAdEventListener(appOpenAdEventListener);
-                }
+                mAppOpenAd.setAdEventListener(appOpenAdEventListener);
                 progressDialog.dismiss();
                 showAppOpenAd();
             }
@@ -248,7 +246,7 @@ public void onAdFailedToLoad(@NonNull final AdRequestError adRequestError) {
             bannerHeight = (int) (screenHeight * 0.036);
         }
         BannerAdView mBannerAdView = (BannerAdView) findViewById(R.id.adView);
-        mBannerAdView.setAdUnitId("R-M-2215793-1");
+        mBannerAdView.setAdUnitId(AdsConfig.BANNER_MAIN_SCREEN_AD);
         mBannerAdView.setAdSize(BannerAdSize.inlineSize(context, screenWidth, bannerHeight));
 
         final AdRequest adRequest = new AdRequest.Builder().build();

app/src/main/java/com/plumsoftware/rucalendar/config/AdsConfig.java

@@ -0,0 +1,10 @@
+package com.plumsoftware.rucalendar.config;
+
+import com.plumsoftware.rucalendar.BuildConfig;
+
+public final class AdsConfig {
+    public static String BANNER_MAIN_SCREEN_AD = BuildConfig.mainScreenBannerId;
+    public static String BANNER_EVENT_SCREEN_AD = BuildConfig.eventScreenBannerId;
+    public static String OPEN_MAIN_SCREEN_AD = BuildConfig.openAdsId;
+    public static String INTERSTITIAL_AD = BuildConfig.interstitialAdsId;
+}

build.gradle

@@ -1,11 +1,18 @@
 buildscript {
+    ext {
+        kotlin_version = '1.9.24'
+    }
     dependencies {
         classpath 'com.google.gms:google-services:4.4.2'
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
+    }
+    repositories {
+        mavenCentral()
     }
 }// Top-level build file where you can add configuration options common to all sub-projects/modules.
 plugins {
-    id 'com.android.application' version '8.6.1' apply false
-    id 'com.android.library' version '8.6.1' 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) {

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 #Thu Oct 20 20:41:15 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