Updates to playbar resume

Author: TheHollidayInn

app/src/main/java/com/koalatea/sedaily/playbar/PlaybarFragment.kt

@@ -8,6 +8,7 @@ import android.support.v4.media.MediaMetadataCompat
 import android.support.v4.media.session.MediaControllerCompat
 import android.support.v4.media.session.PlaybackStateCompat
 import android.text.format.DateUtils
+import android.util.Log
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
@@ -17,6 +18,7 @@ import androidx.fragment.app.Fragment
 import androidx.lifecycle.ViewModelProviders
 import com.koalatea.sedaily.R
 import io.reactivex.android.schedulers.AndroidSchedulers
+import io.reactivex.disposables.CompositeDisposable
 import io.reactivex.observers.DisposableObserver
 import io.reactivex.schedulers.Schedulers
 import kotlinx.android.synthetic.main.fragment_playback_controls.view.*
@@ -33,9 +35,7 @@ class PlaybarFragment: Fragment() {
     private var mScheduleFuture: ScheduledFuture<*>? = null
     private val mExecutorService = Executors.newSingleThreadScheduledExecutor()
     private val mUpdateProgressTask = { updateProgress() }
-    private var speedSubscription: DisposableObserver<Int>? = null
-    private var mediaItemSubscription: DisposableObserver<MediaMetadataCompat>? = null
-    private var playbackStateSub: DisposableObserver<PlaybackStateCompat>? = null
+    private var composeDispose: CompositeDisposable = CompositeDisposable()
 
     // @TODO: Change to binding
     private var rootView: View? = null
@@ -44,6 +44,21 @@ class PlaybarFragment: Fragment() {
                               savedInstanceState: Bundle?): View? {
         rootView = inflater.inflate(R.layout.fragment_playback_controls, container, false)
 
+        initDisplay()
+
+        return rootView
+    }
+
+    override fun onStart() {
+        super.onStart()
+
+        initListeners()
+        if (rootView != null) {
+            initDisplay()
+        }
+    }
+
+    fun initDisplay() {
         playbarViewModel = ViewModelProviders
                 .of(this)
                 .get(PlaybarViewModel::class.java)
@@ -87,11 +102,14 @@ class PlaybarFragment: Fragment() {
         setUpMediaChangeSubscription()
         setupPlaybackStateSub()
 
-        return rootView
+        val metaData = PodcastSessionStateManager
+                .getInstance().getMediaMetaData()
+        if (metaData != null) {
+            updateWithMeta(metaData)
+        }
     }
 
-    override fun onStart() {
-        super.onStart()
+    fun initListeners() {
         val currentPlayTime = PodcastSessionStateManager.getInstance().currentProgress
         mLastPlaybackState = PodcastSessionStateManager.getInstance().lastPlaybackState
 
@@ -101,26 +119,17 @@ class PlaybarFragment: Fragment() {
         rootView?.startText?.text = DateUtils.formatElapsedTime(currentPlayTime / 1000)
         setSpeedTextView()
 
-        speedSubscription?.isDisposed?.run {
+        composeDispose?.isDisposed?.run {
             setUpSpeedSubscription()
-        }
-
-        mediaItemSubscription?.isDisposed?.run {
             setUpMediaChangeSubscription()
-        }
-
-        playbackStateSub?.isDisposed?.run {
             setupPlaybackStateSub()
         }
     }
 
     override fun onStop() {
         super.onStop()
 
-        // @TODO: Use composite disposable - See Github Arch example
-        speedSubscription?.dispose()
-        mediaItemSubscription?.dispose()
-        playbackStateSub?.dispose()
+        composeDispose.clear()
 
         stopSeekbarUpdate()
     }
@@ -256,7 +265,7 @@ class PlaybarFragment: Fragment() {
     }
 
     private fun setUpSpeedSubscription() {
-        speedSubscription = object : DisposableObserver<Int>() {
+        val speedSubscription = object : DisposableObserver<Int>() {
             override fun onError(e: Throwable) {}
 
             override fun onComplete() {}
@@ -266,6 +275,8 @@ class PlaybarFragment: Fragment() {
             }
         }
 
+        composeDispose.addAll(speedSubscription)
+
         PodcastSessionStateManager
                 .getInstance()
                 .speedChanges
@@ -275,7 +286,7 @@ class PlaybarFragment: Fragment() {
     }
 
     private fun setupPlaybackStateSub() {
-        playbackStateSub = object : DisposableObserver<PlaybackStateCompat>() {
+        val playbackStateSub = object : DisposableObserver<PlaybackStateCompat>() {
             override fun onError(e: Throwable) {}
 
             override fun onComplete() {}
@@ -285,6 +296,8 @@ class PlaybarFragment: Fragment() {
             }
         }
 
+        composeDispose.addAll(playbackStateSub)
+
         PodcastSessionStateManager
                 .getInstance()
                 .playbackStateChanges
@@ -294,7 +307,7 @@ class PlaybarFragment: Fragment() {
     }
 
     private fun setUpMediaChangeSubscription() {
-        mediaItemSubscription = object : DisposableObserver<MediaMetadataCompat>() {
+        val mediaItemSubscription = object : DisposableObserver<MediaMetadataCompat>() {
             override fun onNext(mediaMetadataCompat: MediaMetadataCompat) {
                 updateDuration(mediaMetadataCompat)
                 updateWithMeta(mediaMetadataCompat)
@@ -309,6 +322,8 @@ class PlaybarFragment: Fragment() {
             }
         }
 
+        composeDispose.addAll(mediaItemSubscription)
+
         PodcastSessionStateManager
                 .getInstance()
                 .metadataChanges
@@ -327,7 +342,7 @@ class PlaybarFragment: Fragment() {
 
     private fun setSpeedText() {
         val currentSpeed = setSpeedTextView()
-
+        Log.v("keithtest", currentSpeed.toString());
         if (this.activity == null) return
         // @TODO: Make reactive
         playbarViewModel?.sendSpeedChangeIntent(currentSpeed, this.activity as Activity)

app/src/main/java/com/koalatea/sedaily/playbar/PodcastSessionStateManager.kt

@@ -66,6 +66,10 @@ class PodcastSessionStateManager private constructor() {
         }
     }
 
+    fun getMediaMetaData(): MediaMetadataCompat? {
+        return mediaMetadataCompat
+    }
+
     fun setMediaMetaData(mediaMetaData: MediaMetadataCompat) {
         this.mediaMetadataCompat = mediaMetaData
         mediaMetaDataChange.onNext(mediaMetaData)