Some Bugs fixed of Notification.

HarshAndroid · HarshAndroid · commit f46162e214d5 · 2021-08-15T16:32:44.000+05:30
diff --git a/app/build.gradle b/app/build.gradle
@@ -11,8 +11,8 @@ android {
         applicationId "com.harshRajpurohit.musicPlayer"
         minSdkVersion 21
         targetSdkVersion 30
-        versionCode 1
-        versionName "1.0"
+        versionCode 2
+        versionName "2.0"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
diff --git a/app/src/main/java/com/harshRajpurohit/musicPlayer/MainActivity.kt b/app/src/main/java/com/harshRajpurohit/musicPlayer/MainActivity.kt
@@ -3,6 +3,7 @@ package com.harshRajpurohit.musicPlayer
 import android.annotation.SuppressLint
 import android.content.Intent
 import android.content.pm.PackageManager
+import android.content.res.Configuration
 import android.graphics.Color
 import android.net.Uri
 import android.os.Build
@@ -60,6 +61,10 @@ class MainActivity : AppCompatActivity() {
         binding.root.addDrawerListener(toggle)
         toggle.syncState()
         supportActionBar?.setDisplayHomeAsUpEnabled(true)
+        //checking for dark theme
+        if(themeIndex == 4 &&  resources.configuration.uiMode and Configuration.UI_MODE_NIGHT_MASK == Configuration.UI_MODE_NIGHT_NO)
+            Toast.makeText(this, "Black Theme Works Best in Dark Mode!!", Toast.LENGTH_LONG).show()
+
         if(requestRuntimePermission()){
             initializeLayout()
             //for retrieving favourites data using shared preferences
diff --git a/app/src/main/java/com/harshRajpurohit/musicPlayer/MusicService.kt b/app/src/main/java/com/harshRajpurohit/musicPlayer/MusicService.kt
@@ -18,6 +18,7 @@ class MusicService: Service(), AudioManager.OnAudioFocusChangeListener {
     private lateinit var mediaSession : MediaSessionCompat
     private lateinit var runnable: Runnable
     lateinit var audioManager: AudioManager
+    lateinit var playbackState: PlaybackStateCompat
 
     override fun onBind(intent: Intent?): IBinder {
         mediaSession = MediaSessionCompat(baseContext, "My Music")
@@ -29,7 +30,7 @@ class MusicService: Service(), AudioManager.OnAudioFocusChangeListener {
             return this@MusicService
         }
     }
-    fun showNotification(playPauseBtn: Int, playbackSpeed: Float){
+    fun showNotification(playPauseBtn: Int){
         val intent = Intent(baseContext, MainActivity::class.java)
         val contentIntent = PendingIntent.getActivity(this, 0, intent, 0)
 
@@ -69,13 +70,15 @@ class MusicService: Service(), AudioManager.OnAudioFocusChangeListener {
             .build()
 
         if(Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q){
+            val playbackSpeed = if(mediaPlayer!!.isPlaying) 0F else 1F
             mediaSession.setMetadata(MediaMetadataCompat.Builder()
                 .putLong(MediaMetadataCompat.METADATA_KEY_DURATION, mediaPlayer!!.duration.toLong())
                 .build())
-            mediaSession.setPlaybackState(PlaybackStateCompat.Builder()
+            val playBackState = PlaybackStateCompat.Builder()
                 .setState(PlaybackStateCompat.STATE_PLAYING, mediaPlayer!!.currentPosition.toLong(), playbackSpeed)
                 .setActions(PlaybackStateCompat.ACTION_SEEK_TO)
-                .build())
+                .build()
+            mediaSession.setPlaybackState(playBackState)
         }
 
         startForeground(13, notification)
@@ -87,7 +90,7 @@ class MusicService: Service(), AudioManager.OnAudioFocusChangeListener {
             PlayerActivity.musicService!!.mediaPlayer!!.setDataSource(PlayerActivity.musicListPA[PlayerActivity.songPosition].path)
             PlayerActivity.musicService!!.mediaPlayer!!.prepare()
             PlayerActivity.binding.playPauseBtnPA.setIconResource(R.drawable.pause_icon)
-            PlayerActivity.musicService!!.showNotification(R.drawable.pause_icon, 0F)
+            PlayerActivity.musicService!!.showNotification(R.drawable.pause_icon)
             PlayerActivity.binding.tvSeekBarStart.text = formatDuration(mediaPlayer!!.currentPosition.toLong())
             PlayerActivity.binding.tvSeekBarEnd.text = formatDuration(mediaPlayer!!.duration.toLong())
             PlayerActivity.binding.seekBarPA.progress = 0
@@ -110,15 +113,15 @@ class MusicService: Service(), AudioManager.OnAudioFocusChangeListener {
             //pause music
             PlayerActivity.binding.playPauseBtnPA.setIconResource(R.drawable.play_icon)
             NowPlaying.binding.playPauseBtnNP.setIconResource(R.drawable.play_icon)
-            showNotification(R.drawable.play_icon, 0F)
+            showNotification(R.drawable.play_icon)
             PlayerActivity.isPlaying = false
             mediaPlayer!!.pause()
         }
         else{
             //play music
             PlayerActivity.binding.playPauseBtnPA.setIconResource(R.drawable.pause_icon)
             NowPlaying.binding.playPauseBtnNP.setIconResource(R.drawable.pause_icon)
-            showNotification(R.drawable.pause_icon, 1F)
+            showNotification(R.drawable.pause_icon)
             PlayerActivity.isPlaying = true
            mediaPlayer!!.start()
         }
diff --git a/app/src/main/java/com/harshRajpurohit/musicPlayer/NotificationReceiver.kt b/app/src/main/java/com/harshRajpurohit/musicPlayer/NotificationReceiver.kt
@@ -20,15 +20,15 @@ class NotificationReceiver:BroadcastReceiver() {
     private fun playMusic(){
         PlayerActivity.isPlaying = true
         PlayerActivity.musicService!!.mediaPlayer!!.start()
-        PlayerActivity.musicService!!.showNotification(R.drawable.pause_icon, 1F)
+        PlayerActivity.musicService!!.showNotification(R.drawable.pause_icon)
         PlayerActivity.binding.playPauseBtnPA.setIconResource(R.drawable.pause_icon)
         NowPlaying.binding.playPauseBtnNP.setIconResource(R.drawable.pause_icon)
     }
 
     private fun pauseMusic(){
         PlayerActivity.isPlaying = false
         PlayerActivity.musicService!!.mediaPlayer!!.pause()
-        PlayerActivity.musicService!!.showNotification(R.drawable.play_icon, 0F)
+        PlayerActivity.musicService!!.showNotification(R.drawable.play_icon)
         PlayerActivity.binding.playPauseBtnPA.setIconResource(R.drawable.play_icon)
         NowPlaying.binding.playPauseBtnNP.setIconResource(R.drawable.play_icon)
     }
diff --git a/app/src/main/java/com/harshRajpurohit/musicPlayer/NowPlaying.kt b/app/src/main/java/com/harshRajpurohit/musicPlayer/NowPlaying.kt
@@ -35,7 +35,7 @@ class NowPlaying : Fragment() {
                 .apply(RequestOptions().placeholder(R.drawable.music_player_icon_slash_screen).centerCrop())
                 .into(binding.songImgNP)
             binding.songNameNP.text = PlayerActivity.musicListPA[PlayerActivity.songPosition].title
-            PlayerActivity.musicService!!.showNotification(R.drawable.pause_icon, 1F)
+            PlayerActivity.musicService!!.showNotification(R.drawable.pause_icon)
             playMusic()
         }
         binding.root.setOnClickListener {
@@ -65,14 +65,14 @@ class NowPlaying : Fragment() {
     private fun playMusic(){
         PlayerActivity.musicService!!.mediaPlayer!!.start()
         binding.playPauseBtnNP.setIconResource(R.drawable.pause_icon)
-        PlayerActivity.musicService!!.showNotification(R.drawable.pause_icon,1F)
+        PlayerActivity.musicService!!.showNotification(R.drawable.pause_icon)
         PlayerActivity.binding.nextBtnPA.setIconResource(R.drawable.pause_icon)
         PlayerActivity.isPlaying = true
     }
     private fun pauseMusic(){
         PlayerActivity.musicService!!.mediaPlayer!!.pause()
         binding.playPauseBtnNP.setIconResource(R.drawable.play_icon)
-        PlayerActivity.musicService!!.showNotification(R.drawable.play_icon, 0F)
+        PlayerActivity.musicService!!.showNotification(R.drawable.play_icon)
         PlayerActivity.binding.nextBtnPA.setIconResource(R.drawable.play_icon)
         PlayerActivity.isPlaying = false
     }
diff --git a/app/src/main/java/com/harshRajpurohit/musicPlayer/PlayerActivity.kt b/app/src/main/java/com/harshRajpurohit/musicPlayer/PlayerActivity.kt
@@ -73,7 +73,10 @@ class PlayerActivity : AppCompatActivity(), ServiceConnection, MediaPlayer.OnCom
         binding.nextBtnPA.setOnClickListener { prevNextSong(increment = true) }
         binding.seekBarPA.setOnSeekBarChangeListener(object : SeekBar.OnSeekBarChangeListener{
             override fun onProgressChanged(seekBar: SeekBar?, progress: Int, fromUser: Boolean) {
-                if(fromUser) musicService!!.mediaPlayer!!.seekTo(progress)
+                if(fromUser) {
+                    musicService!!.mediaPlayer!!.seekTo(progress)
+                    musicService!!.showNotification(if(isPlaying) R.drawable.pause_icon else R.drawable.play_icon)
+                }
             }
             override fun onStartTrackingTouch(seekBar: SeekBar?) = Unit
             override fun onStopTrackingTouch(seekBar: SeekBar?) = Unit
@@ -196,14 +199,14 @@ class PlayerActivity : AppCompatActivity(), ServiceConnection, MediaPlayer.OnCom
 
     private fun playMusic(){
         binding.playPauseBtnPA.setIconResource(R.drawable.pause_icon)
-        musicService!!.showNotification(R.drawable.pause_icon, 1F)
+        musicService!!.showNotification(R.drawable.pause_icon)
         isPlaying = true
         musicService!!.mediaPlayer!!.start()
     }
 
     private fun pauseMusic(){
         binding.playPauseBtnPA.setIconResource(R.drawable.play_icon)
-        musicService!!.showNotification(R.drawable.play_icon, 0F)
+        musicService!!.showNotification(R.drawable.play_icon)
         isPlaying = false
         musicService!!.mediaPlayer!!.pause()
     }
diff --git a/app/src/main/java/com/harshRajpurohit/musicPlayer/PlaylistViewAdapter.kt b/app/src/main/java/com/harshRajpurohit/musicPlayer/PlaylistViewAdapter.kt
@@ -28,7 +28,7 @@ class PlaylistViewAdapter(private val context: Context, private var playlistList
 
     override fun onBindViewHolder(holder: MyHolder, position: Int) {
         if(MainActivity.themeIndex == 4){
-            holder.root.setStrokeColor(ContextCompat.getColor(context, R.color.white))
+            holder.root.strokeColor = ContextCompat.getColor(context, R.color.white)
         }
         holder.name.text = playlistList[position].name
         holder.name.isSelected = true

Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@ class PlaylistViewAdapter(private val context: Context, private var playlistList`
`28`	`28`
`29`	`29`	`override fun onBindViewHolder(holder: MyHolder, position: Int) {`
`30`	`30`	`if(MainActivity.themeIndex == 4){`
`31`		`- holder.root.setStrokeColor(ContextCompat.getColor(context, R.color.white))`
	`31`	`+ holder.root.strokeColor = ContextCompat.getColor(context, R.color.white)`
`32`	`32`	`}`
`33`	`33`	`holder.name.text = playlistList[position].name`
`34`	`34`	`holder.name.isSelected = true`