Merge branch 'dev'

CCIP-App · May 20, 2024 · 1c74605 · 1c74605
2 parents fb71fb1 + 594efc0
commit 1c74605
Show file tree

Hide file tree

Showing 8 changed files with 31 additions and 37 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -6,10 +6,10 @@ jobs:
         runs-on: ubuntu-latest
         steps:
             -   name: Checkout the code
-                uses: actions/checkout@v3
+                uses: actions/checkout@v4
 
             -   name: Setup JDK 17
-                uses: actions/setup-java@v3
+                uses: actions/setup-java@v4
                 with:
                     distribution: 'corretto'
                     java-version: 17
@@ -19,7 +19,7 @@ jobs:
                 run: ./gradlew assembleDebug
 
             -   name: Upload APK
-                uses: actions/upload-artifact@v3
+                uses: actions/upload-artifact@v4
                 with:
                     name: app_debug
                     path: app/build/outputs/apk/debug/app-debug.apk
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -12,8 +12,8 @@ android {
         applicationId = "app.opass.ccip"
         minSdk = 24
         targetSdk = 34
-        versionCode = 54
-        versionName = "3.4.0"
+        versionCode = 55
+        versionName = "3.5.0"
 
         manifestPlaceholders["manifestApplicationId"] = "$applicationId"
     }
@@ -59,16 +59,16 @@ android {
 
 dependencies {
 
-    implementation("com.google.firebase:firebase-analytics-ktx:21.5.0")
-    implementation("com.onesignal:OneSignal:[4.0.0, 4.99.99]")
+    implementation("com.google.firebase:firebase-analytics-ktx:22.0.0")
+    implementation("com.onesignal:OneSignal:[5.0.0, 5.99.99]")
 
     implementation("androidx.appcompat:appcompat:1.6.1")
-    implementation("com.google.android.material:material:1.11.0")
+    implementation("com.google.android.material:material:1.12.0")
     implementation("androidx.recyclerview:recyclerview:1.3.2")
     implementation("androidx.cardview:cardview:1.0.0")
-    implementation("androidx.core:core-ktx:1.12.0")
-    implementation("androidx.fragment:fragment-ktx:1.6.2")
-    implementation("androidx.viewpager2:viewpager2:1.0.0")
+    implementation("androidx.core:core-ktx:1.13.1")
+    implementation("androidx.fragment:fragment-ktx:1.7.1")
+    implementation("androidx.viewpager2:viewpager2:1.1.0")
     implementation("androidx.constraintlayout:constraintlayout:2.1.4")
     implementation("com.google.android.flexbox:flexbox:3.0.0")
     implementation("com.google.code.gson:gson:2.10.1")
@@ -87,7 +87,7 @@ dependencies {
     implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:$coroutinesVersion")
 
     // Lifecycle
-    val lifecycleVersion = "2.7.0"
+    val lifecycleVersion = "2.8.0"
     implementation("androidx.lifecycle:lifecycle-viewmodel-ktx:$lifecycleVersion")
     implementation("androidx.lifecycle:lifecycle-livedata-ktx:$lifecycleVersion")
 

diff --git a/app/src/main/java/app/opass/ccip/CCIPApplication.kt b/app/src/main/java/app/opass/ccip/CCIPApplication.kt
@@ -1,14 +1,13 @@
 package app.opass.ccip
 
 import android.app.Application
-import app.opass.ccip.util.OSNotificationOpenedHandler
+import app.opass.ccip.util.NotificationClickListener
 import com.onesignal.OneSignal
 
 class CCIPApplication : Application() {
     override fun onCreate() {
         super.onCreate()
-        OneSignal.initWithContext(this);
-        OneSignal.setAppId("b6213f49-e356-4b48-aa9d-7cf10ce1904d");
-        OneSignal.setNotificationOpenedHandler(OSNotificationOpenedHandler(this))
+        OneSignal.initWithContext(this, "b6213f49-e356-4b48-aa9d-7cf10ce1904d")
+        OneSignal.Notifications.addClickListener(NotificationClickListener(this))
     }
 }
diff --git a/app/src/main/java/app/opass/ccip/ui/auth/TokenCheckFragment.kt b/app/src/main/java/app/opass/ccip/ui/auth/TokenCheckFragment.kt
@@ -20,9 +20,8 @@ import app.opass.ccip.network.CCIPClient
 import app.opass.ccip.util.PreferenceUtil
 import coil.load
 import com.onesignal.OneSignal
+import kotlinx.coroutines.GlobalScope
 import kotlinx.coroutines.launch
-import org.json.JSONException
-import org.json.JSONObject
 
 class TokenCheckFragment : AuthActivity.PageFragment() {
     private var hasRequestEnd = false
@@ -74,19 +73,15 @@ class TokenCheckFragment : AuthActivity.PageFragment() {
 
                         PreferenceUtil.setToken(mActivity, token)
                         PreferenceUtil.setRole(mActivity, attendee.role)
-                        try {
-                            JSONObject()
-                                .put(attendee.eventId + attendee.role, attendee.token)
-                                .let(OneSignal::sendTags)
-                        } catch (e: JSONException) {
-                            e.printStackTrace()
-                        }
+                        OneSignal.User.addTag(attendee.eventId + attendee.role, attendee.token)
 
                         val manager = mActivity.getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager
                         if (!manager.areNotificationsEnabled()) {
                             AlertDialog.Builder(mActivity)
                                 .setMessage(R.string.on_login_request_notification_permission)
-                                .setPositiveButton(android.R.string.ok) { _, _ -> OneSignal.promptForPushNotifications() }
+                                .setPositiveButton(android.R.string.ok) { _, _ -> GlobalScope.launch {
+                                    OneSignal.Notifications.requestPermission(true) }
+                                }
                                 .setNegativeButton(android.R.string.cancel) { _, _ -> }
                                 .show()
                         }

diff --git a/.../ccip/util/OSNotificationOpenedHandler.kt → ...ss/ccip/util/NotificationClickListener.kt b/.../ccip/util/OSNotificationOpenedHandler.kt → ...ss/ccip/util/NotificationClickListener.kt
@@ -4,12 +4,12 @@ import android.app.Application
 import android.content.Intent
 import android.net.Uri
 import app.opass.ccip.ui.MainActivity
-import com.onesignal.OSNotificationOpenedResult
-import com.onesignal.OneSignal
+import com.onesignal.notifications.INotificationClickListener
+import com.onesignal.notifications.INotificationClickEvent
 
-class OSNotificationOpenedHandler(private val context: Application) : OneSignal.OSNotificationOpenedHandler {
-    override fun notificationOpened(result: OSNotificationOpenedResult) {
-        val launchUrl = result.notification.launchURL
+class NotificationClickListener(private val context: Application) : INotificationClickListener {
+    override fun onClick(event: INotificationClickEvent) {
+        val launchUrl = event.result.url
         if (launchUrl != null) {
             context.startActivity(Intent(Intent.ACTION_VIEW, Uri.parse(launchUrl)).setFlags(Intent.FLAG_ACTIVITY_NEW_TASK))
         } else {

diff --git a/app/src/main/res/layout/item_wifi_network.xml b/app/src/main/res/layout/item_wifi_network.xml
@@ -16,7 +16,7 @@
         style="@style/TextAppearance.MaterialComponents.Body1"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:textColor="#000000"
+        android:textColor="@color/textColorPrimary"
         tools:text="SITCON_2020" />
 
     <TextView

diff --git a/build.gradle.kts b/build.gradle.kts
@@ -1,6 +1,6 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 plugins {
-    id("com.android.application") version "8.2.2" apply false
-    id("org.jetbrains.kotlin.android") version "1.9.22" apply false
-    id("com.google.gms.google-services") version "4.4.0" apply false
+    id("com.android.application") version "8.4.0" apply false
+    id("org.jetbrains.kotlin.android") version "1.9.24" apply false
+    id("com.google.gms.google-services") version "4.4.1" apply false
 }
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,8 +1,8 @@
 #Wed Jan 24 16:49:30 IST 2024
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionSha256Sum=9d926787066a081739e8200858338b4a69e837c3a821a33aca9db09dd4a41026
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
+distributionSha256Sum=9631d53cf3e74bfa726893aee1f8994fee4e060c401335946dba2156f440f24c
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME