Skip to content

Commit f004785

Browse files
committed
Добавил гугл отправку уведомлений и сообщений внутри приложения. Повысил версии библиотек.
1 parent 42a0a62 commit f004785

File tree

11 files changed

+118
-8
lines changed

11 files changed

+118
-8
lines changed

app/build.gradle

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
plugins {
22
id 'com.android.application'
3+
id 'com.google.gms.google-services'
34
}
45

56
android {
@@ -8,10 +9,10 @@ android {
89

910
defaultConfig {
1011
applicationId "ru.plumsoftware.robloxclicker"
11-
minSdk 22
12+
minSdk 23
1213
targetSdk 36
13-
versionCode 20
14-
versionName "16.0.2"
14+
versionCode 21
15+
versionName "16.0.3"
1516

1617
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
1718
}
@@ -37,9 +38,12 @@ dependencies {
3738
implementation 'androidx.appcompat:appcompat:1.7.0'
3839
implementation 'com.google.android.material:material:1.12.0'
3940
implementation 'androidx.constraintlayout:constraintlayout:2.2.0'
41+
implementation 'com.google.firebase:firebase-messaging:25.0.0'
42+
implementation 'com.google.firebase:firebase-inappmessaging-display:22.0.0'
43+
implementation 'com.google.firebase:firebase-config:23.0.0'
4044
testImplementation 'junit:junit:4.13.2'
4145
// androidTestImplementation 'androidx.test.ext:junit:1.2.1'
4246
// androidTestImplementation 'androidx.test.espresso:espresso-core:3.6.1'
4347

44-
implementation 'com.yandex.android:mobileads:7.14.1'
48+
implementation 'com.yandex.android:mobileads:7.15.0'
4549
}

app/google-services.json

Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,48 @@
1+
{
2+
"project_info": {
3+
"project_number": "99813304340",
4+
"project_id": "games-6af99",
5+
"storage_bucket": "games-6af99.firebasestorage.app"
6+
},
7+
"client": [
8+
{
9+
"client_info": {
10+
"mobilesdk_app_id": "1:99813304340:android:1508d3773d7bc34b0e9f01",
11+
"android_client_info": {
12+
"package_name": "ru.plumsoftware.game"
13+
}
14+
},
15+
"oauth_client": [],
16+
"api_key": [
17+
{
18+
"current_key": "AIzaSyDyTBFSAuABY0pdN3jTWWC4YijCz0jYSTE"
19+
}
20+
],
21+
"services": {
22+
"appinvite_service": {
23+
"other_platform_oauth_client": []
24+
}
25+
}
26+
},
27+
{
28+
"client_info": {
29+
"mobilesdk_app_id": "1:99813304340:android:fbfd05680a2c77090e9f01",
30+
"android_client_info": {
31+
"package_name": "ru.plumsoftware.robloxclicker"
32+
}
33+
},
34+
"oauth_client": [],
35+
"api_key": [
36+
{
37+
"current_key": "AIzaSyDyTBFSAuABY0pdN3jTWWC4YijCz0jYSTE"
38+
}
39+
],
40+
"services": {
41+
"appinvite_service": {
42+
"other_platform_oauth_client": []
43+
}
44+
}
45+
}
46+
],
47+
"configuration_version": "1"
48+
}

app/release/app-release.apk

3.82 MB
Binary file not shown.
5.21 KB
Binary file not shown.
5.1 KB
Binary file not shown.

app/release/output-metadata.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111
"type": "SINGLE",
1212
"filters": [],
1313
"attributes": [],
14-
"versionCode": 19,
15-
"versionName": "16.0.1",
14+
"versionCode": 21,
15+
"versionName": "16.0.3",
1616
"outputFile": "app-release.apk"
1717
}
1818
],
@@ -33,5 +33,5 @@
3333
]
3434
}
3535
],
36-
"minSdkVersionForDexing": 22
36+
"minSdkVersionForDexing": 23
3737
}

app/src/main/AndroidManifest.xml

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,13 @@
22
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
33
xmlns:tools="http://schemas.android.com/tools">
44

5+
<uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
56
<uses-permission android:name="android.permission.INTERNET" />
67
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
7-
<uses-permission android:name="com.google.android.gms.permission.AD_ID" />
8+
<uses-permission android:name="android.permission.WAKE_LOCK" />
9+
<uses-permission
10+
android:name="com.google.android.gms.permission.AD_ID"
11+
tools:node="remove" />
812

913
<application
1014
android:allowBackup="true"
@@ -41,6 +45,14 @@
4145
<meta-data
4246
android:name="com.yandex.mobile.ads.AUTOMATIC_SDK_INITIALIZATION"
4347
android:value="false" />
48+
49+
<meta-data
50+
android:name="com.google.firebase.messaging.default_notification_icon"
51+
android:resource="@drawable/baseline_notifications_active_24" />
52+
53+
<meta-data
54+
android:name="com.google.firebase.messaging.default_notification_color"
55+
android:resource="@color/default_notification_color" />
4456
</application>
4557

4658
</manifest>

app/src/main/java/ru/plumsoftware/robloxclicker/activities/MainActivity.java

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,17 @@
44
import androidx.annotation.Nullable;
55
import androidx.appcompat.app.AppCompatActivity;
66
import androidx.cardview.widget.CardView;
7+
import androidx.core.app.ActivityCompat;
8+
import androidx.core.content.ContextCompat;
79

10+
import android.Manifest;
811
import android.annotation.SuppressLint;
912
import android.app.Activity;
1013
import android.content.Context;
1114
import android.content.Intent;
1215
import android.content.SharedPreferences;
16+
import android.content.pm.PackageManager;
17+
import android.os.Build;
1318
import android.os.Bundle;
1419
import android.os.CountDownTimer;
1520
import android.os.Handler;
@@ -25,6 +30,9 @@
2530
import android.widget.TextView;
2631
import android.widget.Toast;
2732

33+
import com.google.firebase.FirebaseApp;
34+
import com.google.firebase.remoteconfig.FirebaseRemoteConfig;
35+
import com.google.firebase.remoteconfig.FirebaseRemoteConfigSettings;
2836
import com.yandex.mobile.ads.appopenad.AppOpenAd;
2937
import com.yandex.mobile.ads.appopenad.AppOpenAdEventListener;
3038
import com.yandex.mobile.ads.appopenad.AppOpenAdLoadListener;
@@ -74,6 +82,8 @@ public class MainActivity extends AppCompatActivity {
7482

7583
private final double TABLET_SCREEN_SIZE_THRESHOLD = 7.0;
7684

85+
private FirebaseRemoteConfig mFirebaseRemoteConfig;
86+
7787

7888
@SuppressLint("SetTextI18n")
7989
@Override
@@ -105,6 +115,16 @@ protected void onCreate(Bundle savedInstanceState) {
105115
MobileAds.initialize(this, () -> {
106116

107117
});
118+
FirebaseApp.initializeApp(this);
119+
120+
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
121+
if (ContextCompat.checkSelfPermission(this, Manifest.permission.POST_NOTIFICATIONS)
122+
!= PackageManager.PERMISSION_GRANTED) {
123+
ActivityCompat.requestPermissions(this,
124+
new String[]{Manifest.permission.POST_NOTIFICATIONS},
125+
1001);
126+
}
127+
}
108128

109129
BannerAdView mBannerAdView = (BannerAdView) findViewById(R.id.ad_banner_view);
110130
DisplayMetrics displayMetrics = new DisplayMetrics();
@@ -468,6 +488,16 @@ public boolean onTouch(View v, MotionEvent event) {
468488
// endregion
469489
}
470490

491+
@Override
492+
protected void onResume() {
493+
super.onResume();
494+
495+
mFirebaseRemoteConfig = FirebaseRemoteConfig.getInstance();
496+
FirebaseRemoteConfigSettings configSettings = new FirebaseRemoteConfigSettings.Builder()
497+
.setMinimumFetchIntervalInSeconds(3600)
498+
.build();
499+
mFirebaseRemoteConfig.setConfigSettingsAsync(configSettings);
500+
}
471501

472502
@Override
473503
protected void onDestroy() {
@@ -479,4 +509,12 @@ protected void onDestroy() {
479509

480510
sharedPreferences.edit().putBoolean("isShowAppOpen", true).apply();
481511
}
512+
513+
@Override
514+
public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults) {
515+
super.onRequestPermissionsResult(requestCode, permissions, grantResults);
516+
if (requestCode == 1001) {
517+
if (grantResults.length > 0 && grantResults[0] == PackageManager.PERMISSION_GRANTED) {} else {}
518+
}
519+
}
482520
}
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
<vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="24dp" android:tint="#FFFFFF" android:viewportHeight="24" android:viewportWidth="24" android:width="24dp">
2+
3+
<path android:fillColor="@android:color/white" android:pathData="M7.58,4.08L6.15,2.65C3.75,4.48 2.17,7.3 2.03,10.5h2c0.15,-2.65 1.51,-4.97 3.55,-6.42zM19.97,10.5h2c-0.15,-3.2 -1.73,-6.02 -4.12,-7.85l-1.42,1.43c2.02,1.45 3.39,3.77 3.54,6.42zM18,11c0,-3.07 -1.64,-5.64 -4.5,-6.32L13.5,4c0,-0.83 -0.67,-1.5 -1.5,-1.5s-1.5,0.67 -1.5,1.5v0.68C7.63,5.36 6,7.92 6,11v5l-2,2v1h16v-1l-2,-2v-5zM12,22c0.14,0 0.27,-0.01 0.4,-0.04 0.65,-0.14 1.18,-0.58 1.44,-1.18 0.1,-0.24 0.15,-0.5 0.15,-0.78h-4c0.01,1.1 0.9,2 2.01,2z"/>
4+
5+
</vector>

app/src/main/res/values/colors.xml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,4 +13,6 @@
1313
<color name="color_3">#35FF23</color>
1414
<color name="color_4">#C9B976</color>
1515
<color name="color_5">#6A6A6A</color>
16+
17+
<color name="default_notification_color">#0079BA</color>
1618
</resources>

0 commit comments

Comments
 (0)