Skip to content

Commit 0a797be

Browse files
HappyMax0HappyMax0
committed
2.1.1
Add Google Play Services check
1 parent 5f191d4 commit 0a797be

File tree

7 files changed

+37
-3
lines changed

7 files changed

+37
-3
lines changed

‎app/build.gradle

+2-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ android {
1212
minSdk 26
1313
targetSdk 33
1414
versionCode 2
15-
versionName "2.1.0"
15+
versionName "2.1.1"
1616

1717
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
1818
}
@@ -38,6 +38,7 @@ dependencies {
3838
implementation 'androidx.appcompat:appcompat:1.6.1'
3939
implementation 'com.google.android.material:material:1.9.0'
4040
implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
41+
implementation 'com.google.android.gms:play-services-base:18.5.0'
4142
testImplementation 'junit:junit:4.13.2'
4243
androidTestImplementation 'androidx.test.ext:junit:1.1.5'
4344
androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'

‎app/src/main/java/com/happymax/fcmpushviewer/MainActivity.kt

+18
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package com.happymax.fcmpushviewer
22

3+
import android.app.AlertDialog
34
import android.content.ComponentName
45
import android.content.Intent
56
import android.content.SharedPreferences
@@ -17,6 +18,8 @@ import androidx.core.view.MenuItemCompat
1718
import androidx.recyclerview.widget.LinearLayoutManager
1819
import androidx.recyclerview.widget.RecyclerView
1920
import androidx.swiperefreshlayout.widget.SwipeRefreshLayout
21+
import com.google.android.gms.common.ConnectionResult
22+
import com.google.android.gms.common.GoogleApiAvailability
2023
import kotlin.concurrent.thread
2124

2225

@@ -39,6 +42,21 @@ class MainActivity : AppCompatActivity() {
3942
override fun onCreate(savedInstanceState: Bundle?) {
4043
super.onCreate(savedInstanceState)
4144

45+
val apiAvailability: GoogleApiAvailability = GoogleApiAvailability.getInstance()
46+
val resultCode: Int = apiAvailability.isGooglePlayServicesAvailable(this)
47+
if(resultCode != ConnectionResult.SUCCESS){
48+
val builder = AlertDialog.Builder(this@MainActivity)
49+
builder.setTitle(R.string.dialog_title_error)
50+
.setMessage(R.string.dialog_msg_missing_gms)
51+
.setPositiveButton(R.string.dialog_btn_ok) { dialog, which ->
52+
// OK button clicked
53+
this.finish()
54+
}
55+
56+
val dialog = builder.create()
57+
dialog.show()
58+
}
59+
4260
setContentView(R.layout.activity_main)
4361

4462
sharedPreferences = getSharedPreferences("settings", MODE_PRIVATE)

‎app/src/main/res/values-zh-rCN/strings.xml

+3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<resources>
33
<string name="app_name">FCM推送查看器</string>
4+
<string name="dialog_title_error">错误</string>
5+
<string name="dialog_btn_ok">确认</string>
6+
<string name="dialog_msg_missing_gms">请确保您的设备已安装谷歌服务</string>
47
<string name="toolbar_search">搜索</string>
58
<string name="toolbar_help">帮助</string>
69
<string name="toolbar_openGcmDiagnostics">打开FCM诊断</string>

‎app/src/main/res/values-zh-rHK/strings.xml

+4-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<resources>
3-
<string name="app_name">FCMPushViewer</string>
3+
<string name="app_name">FCM推送查看器</string>
4+
<string name="dialog_title_error">出錯</string>
5+
<string name="dialog_btn_ok">確認</string>
6+
<string name="dialog_msg_missing_gms">請確保您的設備已安裝谷歌服務</string>
47
<string name="toolbar_search">搜索</string>
58
<string name="toolbar_help">幫助</string>
69
<string name="toolbar_openGcmDiagnostics">打開FCM診斷</string>

‎app/src/main/res/values-zh-rMO/strings.xml

+4-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<resources>
3-
<string name="app_name">FCMPushViewer</string>
3+
<string name="app_name">FCM推送查看器</string>
4+
<string name="dialog_title_error">出錯</string>
5+
<string name="dialog_btn_ok">確認</string>
6+
<string name="dialog_msg_missing_gms">請確保您的設備已安裝谷歌服務</string>
47
<string name="toolbar_search">搜索</string>
58
<string name="toolbar_help">幫助</string>
69
<string name="toolbar_openGcmDiagnostics">打開FCM診斷</string>

‎app/src/main/res/values-zh-rTW/strings.xml

+3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<resources>
33
<string name="app_name">FCM推送查看器</string>
4+
<string name="dialog_title_error">出錯</string>
5+
<string name="dialog_btn_ok">確認</string>
6+
<string name="dialog_msg_missing_gms">請確保您的設備已安裝谷歌服務</string>
47
<string name="toolbar_search">搜索</string>
58
<string name="toolbar_help">幫助</string>
69
<string name="toolbar_openGcmDiagnostics">打開FCM診斷</string>

‎app/src/main/res/values/strings.xml

+3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
<resources>
22
<string name="app_name">FCM Viewer</string>
3+
<string name="dialog_title_error">Error</string>
4+
<string name="dialog_btn_ok">OK</string>
5+
<string name="dialog_msg_missing_gms">Please make sure your device has Google Play services installed</string>
36
<string name="toolbar_search">Search</string>
47
<string name="toolbar_help">Help</string>
58
<string name="toolbar_openGcmDiagnostics">FCM Diagnostics</string>

0 commit comments

Comments
 (0)