Implemented widget #3485 #3455 #3188 #2690 #2526 #2177 #1539 #1430 #1323

#906 #588 #496 #288 #134
fast4x · Sep 2, 2024 · f906ae6 · f906ae6
1 parent 3c79f16
commit f906ae6
Show file tree

Hide file tree

Showing 57 changed files with 561 additions and 187 deletions.
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -142,14 +142,14 @@
                 android:resource="@xml/shortcuts" />
         </activity>
 
-        <receiver android:name=".ui.widgets.PlayerEssentialReceiver"
+        <receiver android:name=".ui.widgets.PlayerVerticalWidgetReceiver"
             android:exported="true">
             <intent-filter>
                 <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
             </intent-filter>
             <meta-data
                 android:name="android.appwidget.provider"
-                android:resource="@xml/player_essential_widget_info" />
+                android:resource="@xml/player_vertical_widget_info" />
         </receiver>
 
         <service

diff --git a/app/src/main/kotlin/it/fast4x/rimusic/MainActivity.kt b/app/src/main/kotlin/it/fast4x/rimusic/MainActivity.kt
@@ -432,6 +432,9 @@ class MainActivity :
 
         val launchedFromNotification =
             intent?.extras?.getBoolean("expandPlayerBottomSheet") == true
+                    || intent?.extras?.getBoolean("fromWidget") == true
+
+        println("MainActivity.onCreate launchedFromNotification: $launchedFromNotification intent $intent.action")
 
         intentUriData = intent.data ?: intent.getStringExtra(Intent.EXTRA_TEXT)?.toUri()
 

diff --git a/app/src/main/kotlin/it/fast4x/rimusic/service/PlayerService.kt b/app/src/main/kotlin/it/fast4x/rimusic/service/PlayerService.kt
@@ -121,7 +121,7 @@ import it.fast4x.rimusic.models.asMediaItem
 import it.fast4x.rimusic.query
 import it.fast4x.rimusic.transaction
 import it.fast4x.rimusic.ui.components.themed.SmartMessage
-import it.fast4x.rimusic.ui.widgets.PlayerEssentialWidget
+import it.fast4x.rimusic.ui.widgets.PlayerVerticalWidget
 import it.fast4x.rimusic.utils.InvincibleService
 import it.fast4x.rimusic.utils.RingBuffer
 import it.fast4x.rimusic.utils.TimerJob
@@ -351,7 +351,7 @@ class PlayerService : InvincibleService(),
 
     private lateinit var notificationActionReceiver: NotificationActionReceiver
     //private lateinit var audioQualityFormat: AudioQualityFormat
-    private val playerEssentialWidget = PlayerEssentialWidget()
+    private val playerVerticalWidget = PlayerVerticalWidget()
 
     /*
     private val media = MutableStateFlow<MediaItem?>(null)
@@ -925,6 +925,8 @@ class PlayerService : InvincibleService(),
             updateMediaSessionQueue(player.currentTimeline)
         }
 
+        updateWidgets()
+
     }
 
     override fun onTimelineChanged(timeline: Timeline, reason: Int) {
@@ -2006,12 +2008,14 @@ class PlayerService : InvincibleService(),
 
 
     fun updateWidgets() {
-        val songName = player.mediaMetadata.title.toString()
+        val songTitle = player.mediaMetadata.title.toString()
+        val songArtist = player.mediaMetadata.artist.toString()
         val isPlaying = player.isPlaying
         coroutineScope.launch {
-            playerEssentialWidget.updateInfo(
+            playerVerticalWidget.updateInfo(
                 context = applicationContext,
-                songName = songName,
+                songTitle = songTitle,
+                songArtist = songArtist,
                 isPlaying = isPlaying,
                 bitmap = bitmapProvider.bitmap,
                 player = player

diff --git a/app/src/main/kotlin/it/fast4x/rimusic/ui/widgets/PlayerEssentialWidget.kt b/app/src/main/kotlin/it/fast4x/rimusic/ui/widgets/PlayerEssentialWidget.kt