Fixed notification

maxrave-dev · Mar 27, 2024 · ad5d8eb · ad5d8eb
1 parent 4a2c905
commit ad5d8eb
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 6 deletions.
diff --git a/app/src/main/java/com/maxrave/simpmusic/service/test/notification/NotificationHandler.kt b/app/src/main/java/com/maxrave/simpmusic/service/test/notification/NotificationHandler.kt
@@ -15,6 +15,7 @@ import androidx.core.app.ActivityCompat
 import androidx.core.app.NotificationCompat
 import androidx.core.app.NotificationManagerCompat
 import androidx.core.graphics.drawable.toBitmap
+import androidx.core.net.toUri
 import androidx.media3.common.util.UnstableApi
 import androidx.navigation.NavDeepLinkBuilder
 import coil.ImageLoader
@@ -34,11 +35,14 @@ object NotificationHandler {
         noti: NotificationModel,
     ) {
         //  No back-stack when launched
-        val pendingIntent = NavDeepLinkBuilder(context)
-            .setGraph(R.navigation.nav_bottom_navigation)
-            .setDestination(R.id.notificationFragment)
-            .setComponentName(MainActivity::class.java)
-            .createPendingIntent()
+        val action = Intent(context, MainActivity::class.java)
+        action.flags = Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TOP
+        action.data = "simpmusic://notification".toUri()
+        var pendingIntent =
+            PendingIntent.getActivity(
+                context, 0, action,
+                PendingIntent.FLAG_IMMUTABLE
+            )
 
         val bitmap =
             runBlocking {

diff --git a/app/src/main/java/com/maxrave/simpmusic/ui/MainActivity.kt b/app/src/main/java/com/maxrave/simpmusic/ui/MainActivity.kt
@@ -585,6 +585,10 @@ class MainActivity : AppCompatActivity() {
                             data = intent.data ?: intent.getStringExtra(Intent.EXTRA_TEXT)?.toUri()
                             Log.d("MainActivity", "onCreate: $data")
                             if (data != null) {
+                                if (data == Uri.parse("simpmusic://notification")) {
+                                    navController.navigateSafe(R.id.action_global_notificationFragment)
+                                } else {
+                                    Log.d("MainActivity", "onCreate: $data")
                                 when (val path = data!!.pathSegments.firstOrNull()) {
                                     "playlist" ->
                                         data!!.getQueryParameter("list")
@@ -677,6 +681,7 @@ class MainActivity : AppCompatActivity() {
                                                 )
                                             }
                                         }
+                                    }
                                 }
                             }
                         }

diff --git a/app/src/main/res/navigation/nav_bottom_navigation.xml b/app/src/main/res/navigation/nav_bottom_navigation.xml
@@ -16,7 +16,8 @@
             app:enterAnim="@anim/bottom_to_top"
             app:exitAnim="@anim/top_to_bottom"
             app:popEnterAnim="@anim/bottom_to_top"
-            app:popExitAnim="@anim/top_to_bottom"></action>
+            app:popExitAnim="@anim/top_to_bottom">
+        </action>
     </fragment>
     <fragment
         android:id="@+id/bottom_navigation_item_library"