From 5e9f98bd9aed34a1bb0b33c360510e429356395d Mon Sep 17 00:00:00 2001 From: Simo-2004 Date: Mon, 24 Nov 2025 18:28:20 +0100 Subject: [PATCH 1/4] [#179] Added option to always enter "Now Playing" when tapping notification --- CHANGELOG.md | 8 ++++++- .../musicplayer/activities/MainActivity.kt | 22 ++++++++++++++++++- .../musicplayer/playback/player/Player.kt | 9 +++++++- 3 files changed, 36 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 11e2763f..5809eeb1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] +## [1.7.0] - 2025-11-24 +### Added +- Option to always enter "Now Playing" when tapping notification ([#179]) + ## [1.6.0] - 2025-11-09 ### Changed - Player now respects play/pause state when seeking ([#97]) @@ -90,6 +94,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 [#47]: https://github.com/FossifyOrg/Music-Player/issues/47 [#65]: https://github.com/FossifyOrg/Music-Player/issues/65 [#97]: https://github.com/FossifyOrg/Music-Player/issues/97 +[#179]: https://github.com/FossifyOrg/Music-Player/issues/179 [#206]: https://github.com/FossifyOrg/Music-Player/issues/206 [#209]: https://github.com/FossifyOrg/Music-Player/issues/209 [#228]: https://github.com/FossifyOrg/Music-Player/issues/228 @@ -98,7 +103,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 [#269]: https://github.com/FossifyOrg/Music-Player/issues/269 [#298]: https://github.com/FossifyOrg/Music-Player/issues/298 -[Unreleased]: https://github.com/FossifyOrg/Music-Player/compare/1.6.0...HEAD +[Unreleased]: https://github.com/FossifyOrg/Music-Player/compare/1.7.0...HEAD +[1.7.0]: https://github.com/FossifyOrg/Music-Player/compare/1.6.0...1.7.0 [1.6.0]: https://github.com/FossifyOrg/Music-Player/compare/1.5.1...1.6.0 [1.5.1]: https://github.com/FossifyOrg/Music-Player/compare/1.5.0...1.5.1 [1.5.0]: https://github.com/FossifyOrg/Music-Player/compare/1.4.0...1.5.0 diff --git a/app/src/main/kotlin/org/fossify/musicplayer/activities/MainActivity.kt b/app/src/main/kotlin/org/fossify/musicplayer/activities/MainActivity.kt index 7c4c4ffa..7f9fa442 100644 --- a/app/src/main/kotlin/org/fossify/musicplayer/activities/MainActivity.kt +++ b/app/src/main/kotlin/org/fossify/musicplayer/activities/MainActivity.kt @@ -10,6 +10,7 @@ import android.os.Bundle import android.widget.Toast import androidx.viewpager.widget.ViewPager import me.grantland.widget.AutofitHelper +import me.grantland.widget.BuildConfig import org.fossify.commons.databinding.BottomTablayoutItemBinding import org.fossify.commons.dialogs.FilePickerDialog import org.fossify.commons.dialogs.RadioGroupDialog @@ -18,7 +19,6 @@ import org.fossify.commons.helpers.* import org.fossify.commons.models.FAQItem import org.fossify.commons.models.RadioItem import org.fossify.commons.models.Release -import org.fossify.musicplayer.BuildConfig import org.fossify.musicplayer.R import org.fossify.musicplayer.adapters.ViewPagerAdapter import org.fossify.musicplayer.databinding.ActivityMainBinding @@ -80,12 +80,14 @@ class MainActivity : SimpleMusicActivity() { override fun onResume() { super.onResume() + handleNotificationIntent(intent) if (storedShowTabs != config.showTabs) { config.lastUsedViewPagerPage = 0 System.exit(0) return } + updateMenuColors() updateTextColors(binding.mainHolder) setupTabColors() @@ -105,6 +107,13 @@ class MainActivity : SimpleMusicActivity() { } } + override fun onNewIntent(intent: Intent) { + super.onNewIntent(intent) + setIntent(intent) + handleNotificationIntent(intent) + } + + override fun onPause() { super.onPause() storeStateVariables() @@ -549,4 +558,15 @@ class MainActivity : SimpleMusicActivity() { checkWhatsNew(this, BuildConfig.VERSION_CODE) } } + + private fun handleNotificationIntent(intent: Intent) { + val shouldOpenPlayer = intent.getBooleanExtra("OPEN_PLAYER", false) + + if (shouldOpenPlayer) { + intent.removeExtra("OPEN_PLAYER") + Intent(this, TrackActivity::class.java).apply { + startActivity(this) + } + } + } } diff --git a/app/src/main/kotlin/org/fossify/musicplayer/playback/player/Player.kt b/app/src/main/kotlin/org/fossify/musicplayer/playback/player/Player.kt index 746f9c82..226689b1 100644 --- a/app/src/main/kotlin/org/fossify/musicplayer/playback/player/Player.kt +++ b/app/src/main/kotlin/org/fossify/musicplayer/playback/player/Player.kt @@ -69,10 +69,17 @@ private fun PlaybackService.initializePlayer( } private fun Context.getSessionActivityIntent(): PendingIntent { + //add openplayer + val intent = Intent(this, MainActivity::class.java).apply { + putExtra("OPEN_PLAYER", true) + // Questi flag aiutano a gestire il comportamento se l'app è già aperta + flags = Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TOP or Intent.FLAG_ACTIVITY_SINGLE_TOP + } + return PendingIntent.getActivity( this, 0, - Intent(this, MainActivity::class.java), + intent, PendingIntent.FLAG_IMMUTABLE or PendingIntent.FLAG_UPDATE_CURRENT ) } From 5b89262f178b3e62b77994a654fee65ba7ef87df Mon Sep 17 00:00:00 2001 From: Simo-2004 Date: Wed, 26 Nov 2025 12:40:43 +0100 Subject: [PATCH 2/4] [#179] Tapping notification now launches the "Now playing" screen - Code reviewed --- CHANGELOG.md | 7 +++---- .../org/fossify/musicplayer/activities/MainActivity.kt | 8 +++----- .../kotlin/org/fossify/musicplayer/helpers/Constants.kt | 2 ++ .../org/fossify/musicplayer/playback/player/Player.kt | 7 ++++--- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5809eeb1..64d2922f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,8 +7,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] ## [1.7.0] - 2025-11-24 -### Added -- Option to always enter "Now Playing" when tapping notification ([#179]) +### Changed +- Tapping notification now launches the "Now playing" screen ([#179]) ## [1.6.0] - 2025-11-09 ### Changed @@ -103,8 +103,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 [#269]: https://github.com/FossifyOrg/Music-Player/issues/269 [#298]: https://github.com/FossifyOrg/Music-Player/issues/298 -[Unreleased]: https://github.com/FossifyOrg/Music-Player/compare/1.7.0...HEAD -[1.7.0]: https://github.com/FossifyOrg/Music-Player/compare/1.6.0...1.7.0 +[Unreleased]: https://github.com/FossifyOrg/Music-Player/compare/1.6.0...HEAD [1.6.0]: https://github.com/FossifyOrg/Music-Player/compare/1.5.1...1.6.0 [1.5.1]: https://github.com/FossifyOrg/Music-Player/compare/1.5.0...1.5.1 [1.5.0]: https://github.com/FossifyOrg/Music-Player/compare/1.4.0...1.5.0 diff --git a/app/src/main/kotlin/org/fossify/musicplayer/activities/MainActivity.kt b/app/src/main/kotlin/org/fossify/musicplayer/activities/MainActivity.kt index 7f9fa442..9865320b 100644 --- a/app/src/main/kotlin/org/fossify/musicplayer/activities/MainActivity.kt +++ b/app/src/main/kotlin/org/fossify/musicplayer/activities/MainActivity.kt @@ -10,7 +10,7 @@ import android.os.Bundle import android.widget.Toast import androidx.viewpager.widget.ViewPager import me.grantland.widget.AutofitHelper -import me.grantland.widget.BuildConfig +import org.fossify.musicplayer.BuildConfig import org.fossify.commons.databinding.BottomTablayoutItemBinding import org.fossify.commons.dialogs.FilePickerDialog import org.fossify.commons.dialogs.RadioGroupDialog @@ -87,7 +87,6 @@ class MainActivity : SimpleMusicActivity() { return } - updateMenuColors() updateTextColors(binding.mainHolder) setupTabColors() @@ -113,7 +112,6 @@ class MainActivity : SimpleMusicActivity() { handleNotificationIntent(intent) } - override fun onPause() { super.onPause() storeStateVariables() @@ -560,10 +558,10 @@ class MainActivity : SimpleMusicActivity() { } private fun handleNotificationIntent(intent: Intent) { - val shouldOpenPlayer = intent.getBooleanExtra("OPEN_PLAYER", false) + val shouldOpenPlayer = intent.getBooleanExtra(EXTRA_OPEN_PLAYER, false) if (shouldOpenPlayer) { - intent.removeExtra("OPEN_PLAYER") + intent.removeExtra(EXTRA_OPEN_PLAYER) Intent(this, TrackActivity::class.java).apply { startActivity(this) } diff --git a/app/src/main/kotlin/org/fossify/musicplayer/helpers/Constants.kt b/app/src/main/kotlin/org/fossify/musicplayer/helpers/Constants.kt index efda382d..ad918088 100644 --- a/app/src/main/kotlin/org/fossify/musicplayer/helpers/Constants.kt +++ b/app/src/main/kotlin/org/fossify/musicplayer/helpers/Constants.kt @@ -16,6 +16,8 @@ const val FOLDER = "folder" const val GENRE = "genre" const val PATH = "org.fossify.musicplayer.action." + +const val EXTRA_OPEN_PLAYER = "org.fossify.musicplayer.OPEN_PLAYER" val artworkUri = "content://media/external/audio/albumart".toUri() const val PREVIOUS = PATH + "PREVIOUS" diff --git a/app/src/main/kotlin/org/fossify/musicplayer/playback/player/Player.kt b/app/src/main/kotlin/org/fossify/musicplayer/playback/player/Player.kt index 226689b1..a620a2c7 100644 --- a/app/src/main/kotlin/org/fossify/musicplayer/playback/player/Player.kt +++ b/app/src/main/kotlin/org/fossify/musicplayer/playback/player/Player.kt @@ -15,6 +15,7 @@ import org.fossify.musicplayer.extensions.broadcastUpdateWidgetState import org.fossify.musicplayer.extensions.config import org.fossify.musicplayer.extensions.currentMediaItems import org.fossify.musicplayer.extensions.setRepeatMode +import org.fossify.musicplayer.helpers.EXTRA_OPEN_PLAYER import org.fossify.musicplayer.helpers.SEEK_INTERVAL_MS import org.fossify.musicplayer.playback.PlaybackService import org.fossify.musicplayer.playback.PlaybackService.Companion.updatePlaybackInfo @@ -69,10 +70,10 @@ private fun PlaybackService.initializePlayer( } private fun Context.getSessionActivityIntent(): PendingIntent { - //add openplayer val intent = Intent(this, MainActivity::class.java).apply { - putExtra("OPEN_PLAYER", true) - // Questi flag aiutano a gestire il comportamento se l'app è già aperta + + putExtra(EXTRA_OPEN_PLAYER, true) + flags = Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TOP or Intent.FLAG_ACTIVITY_SINGLE_TOP } From 21122fba2bb0209c2cbbe1b12572c86cc656a75b Mon Sep 17 00:00:00 2001 From: Simo-2004 Date: Wed, 26 Nov 2025 12:59:25 +0100 Subject: [PATCH 3/4] [#179] Tapping notification now launches the "Now playing" screen - Code reviewed --- .../kotlin/org/fossify/musicplayer/playback/player/Player.kt | 2 -- 1 file changed, 2 deletions(-) diff --git a/app/src/main/kotlin/org/fossify/musicplayer/playback/player/Player.kt b/app/src/main/kotlin/org/fossify/musicplayer/playback/player/Player.kt index a620a2c7..14adaf78 100644 --- a/app/src/main/kotlin/org/fossify/musicplayer/playback/player/Player.kt +++ b/app/src/main/kotlin/org/fossify/musicplayer/playback/player/Player.kt @@ -71,9 +71,7 @@ private fun PlaybackService.initializePlayer( private fun Context.getSessionActivityIntent(): PendingIntent { val intent = Intent(this, MainActivity::class.java).apply { - putExtra(EXTRA_OPEN_PLAYER, true) - flags = Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TOP or Intent.FLAG_ACTIVITY_SINGLE_TOP } From b3206388adb50f834001c698147be38f1d8a7841 Mon Sep 17 00:00:00 2001 From: Naveen Singh <36371707+naveensingh@users.noreply.github.com> Date: Wed, 26 Nov 2025 17:40:44 +0530 Subject: [PATCH 4/4] docs(changelog): remove version bump --- CHANGELOG.md | 2 -- 1 file changed, 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 64d2922f..90d0cc50 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,8 +5,6 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). ## [Unreleased] - -## [1.7.0] - 2025-11-24 ### Changed - Tapping notification now launches the "Now playing" screen ([#179])