Skip to content

Android app #6

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jan 30, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 22 additions & 7 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down Expand Up @@ -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')
Expand Down
Original file line number Diff line number Diff line change
@@ -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;
}
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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);
Expand Down
4 changes: 2 additions & 2 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -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