initial list state fixed (list was not scrolled to top before) & fixe…

…d the canBeDeleted check

app/src/main/java/org/y20k/escapepod/PlayerService.kt

@@ -91,7 +91,7 @@ class PlayerService(): MediaBrowserServiceCompat(), Player.EventListener, Corout
     override val coroutineContext: CoroutineContext get() = backgroundJob + Dispatchers.Main
 
 
-    /* Overrides onCreate */
+    /* Overrides onCreate from Service */
     override fun onCreate() {
         super.onCreate()
 
@@ -138,22 +138,22 @@ class PlayerService(): MediaBrowserServiceCompat(), Player.EventListener, Corout
     }
 
 
-    /* Overrides onStartCommand */
+    /* Overrides onStartCommand from Service */
     override fun onStartCommand(intent: Intent?, flags: Int, startId: Int): Int {
         super.onStartCommand(intent, flags, startId)
         MediaButtonReceiver.handleIntent(mediaSession, intent)
         return Service.START_STICKY
     }
 
 
-    /* Overrides onTaskRemoved */
+    /* Overrides onTaskRemoved from Service */
     override fun onTaskRemoved(rootIntent: Intent) {
         super.onTaskRemoved(rootIntent)
         stopSelf()
     }
 
 
-    /* Overrides onDestroy */
+    /* Overrides onDestroy from Service */
     override fun onDestroy() {
         // stop playback
         stopPlayback()
@@ -172,7 +172,7 @@ class PlayerService(): MediaBrowserServiceCompat(), Player.EventListener, Corout
     }
 
 
-    /* Overrides onGetRoot */ // todo: implement a hierarchical structure -> https://github.com/googlesamples/android-UniversalMusicPlayer/blob/47da058112cee0b70442bcd0370c1e46e830c66b/media/src/main/java/com/example/android/uamp/media/library/BrowseTree.kt
+    /* Overrides onGetRoot from MediaBrowserService */ // todo: implement a hierarchical structure -> https://github.com/googlesamples/android-UniversalMusicPlayer/blob/47da058112cee0b70442bcd0370c1e46e830c66b/media/src/main/java/com/example/android/uamp/media/library/BrowseTree.kt
     override fun onGetRoot(clientPackageName: String, clientUid: Int, rootHints: Bundle?): BrowserRoot {
         // Credit: https://github.com/googlesamples/android-UniversalMusicPlayer (->  MusicService)
         // LogHelper.d(TAG, "OnGetRoot: clientPackageName=$clientPackageName; clientUid=$clientUid ; rootHints=$rootHints")
@@ -199,7 +199,7 @@ class PlayerService(): MediaBrowserServiceCompat(), Player.EventListener, Corout
     }
 
 
-    /* Overrides onLoadChildren */
+    /* Overrides onLoadChildren from MediaBrowserService */
     override fun onLoadChildren(parentId: String, result: Result<MutableList<MediaBrowserCompat.MediaItem>>) {
         if (!collectionProvider.isInitialized()) {
             // use result.detach to allow calling result.sendResult from another thread:
@@ -218,7 +218,7 @@ class PlayerService(): MediaBrowserServiceCompat(), Player.EventListener, Corout
     }
 
 
-    /* Overrides onPlayerStateChanged (Player.EventListener) */
+    /* Overrides onPlayerStateChanged from Player.EventListener */
     override fun onPlayerStateChanged(playWhenReady: Boolean, playbackState: Int) {
         when (playWhenReady) {
             // CASE: playWhenReady = true

app/src/main/java/org/y20k/escapepod/PodcastPlayerActivity.kt

@@ -90,7 +90,7 @@ class PodcastPlayerActivity: AppCompatActivity(), CoroutineScope,
     override val coroutineContext: CoroutineContext get() = backgroundJob + Dispatchers.Main
 
 
-    /* Overrides onCreate */
+    /* Overrides onCreate from Activity*/
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
 
@@ -118,15 +118,15 @@ class PodcastPlayerActivity: AppCompatActivity(), CoroutineScope,
     }
 
 
-    /* Overrides onResume */
+    /* Overrides onResume from Activity */
     public override fun onStart() {
         super.onStart()
         // connect to PlayerService
         mediaBrowser.connect()
     }
 
 
-    /* Overrides onSaveInstanceState */
+    /* Overrides onSaveInstanceState from Activity */
     override fun onSaveInstanceState(outState: Bundle) {
         // save current state of podcast list
         listLayoutState = layout.layoutManager.onSaveInstanceState()
@@ -136,7 +136,7 @@ class PodcastPlayerActivity: AppCompatActivity(), CoroutineScope,
     }
 
 
-    /* Overrides onRestoreInstanceState */
+    /* Overrides onRestoreInstanceState from Activity */
     override fun onRestoreInstanceState(savedInstanceState: Bundle) {
         // always call the superclass so it can restore the view hierarchy
         super.onRestoreInstanceState(savedInstanceState)
@@ -145,7 +145,7 @@ class PodcastPlayerActivity: AppCompatActivity(), CoroutineScope,
     }
 
 
-    /* Overrides onResume */
+    /* Overrides onResume from Activity */
     override fun onResume() {
         super.onResume()
         // assign volume buttons to music volume
@@ -162,7 +162,7 @@ class PodcastPlayerActivity: AppCompatActivity(), CoroutineScope,
     }
 
 
-    /* Overrides onPause */
+    /* Overrides onPause from Activity */
     override fun onPause() {
         super.onPause()
         // save player state
@@ -177,7 +177,7 @@ class PodcastPlayerActivity: AppCompatActivity(), CoroutineScope,
     }
 
 
-    /* Overrides onStop */
+    /* Overrides onStop from Activity */
     public override fun onStop() {
         super.onStop()
         // (see "stay in sync with the MediaSession")
@@ -187,7 +187,7 @@ class PodcastPlayerActivity: AppCompatActivity(), CoroutineScope,
     }
 
 
-    /* Overrides onRequestPermissionsResult */
+    /* Overrides onRequestPermissionsResult from Activity */
     override fun onRequestPermissionsResult(requestCode: Int, permissions: Array<out String>, grantResults: IntArray) {
         super.onRequestPermissionsResult(requestCode, permissions, grantResults)
         when (requestCode) {
@@ -238,6 +238,12 @@ class PodcastPlayerActivity: AppCompatActivity(), CoroutineScope,
     }
 
 
+    /* Overrides onDataSetInitialized from CollectionAdapterListener */
+    override fun onDataSetInitialized() {
+        layout.recyclerView.scrollToPosition(0)
+    }
+
+
     /* Overrides onPlayButtonTapped from CollectionAdapterListener */
     override fun onPlayButtonTapped(mediaId: String, playbackState: Int) {
         when (playerState.playbackState) {

app/src/main/java/org/y20k/escapepod/collection/CollectionAdapter.kt

@@ -70,6 +70,7 @@ class CollectionAdapter(private val activity: Activity) : RecyclerView.Adapter<R
         fun onDeleteButtonTapped(episode: Episode)
         fun onDeleteAllButtonTapped()
         fun onAddNewButtonTapped()
+        fun onDataSetInitialized()
     }
 
 
@@ -398,6 +399,10 @@ class CollectionAdapter(private val activity: Activity) : RecyclerView.Adapter<R
         val diffResult = DiffUtil.calculateDiff(CollectionDiffCallback(oldCollection, newCollection), true)
         // inform this adapter about the changes
         diffResult.dispatchUpdatesTo(this@CollectionAdapter)
+        // notify activity that data set has been initialized - and scroll to top in activity
+        if (oldCollection.podcasts.size == 0) {
+            collectionAdapterListener.onDataSetInitialized()
+        }
         // update collection
         collection = newCollection
     }

app/src/main/java/org/y20k/escapepod/core/Episode.kt

@@ -86,12 +86,18 @@ data class Episode (@Expose var guid: String = "",
     }
 
 
-    /* Return if an eposide has been listened to end */
+    /* Return if an episode has been listened to end */
     fun isFinished(): Boolean {
         return playbackPosition >= duration
     }
 
 
+    /* Return if an episode has been started listening to */
+    fun hasBeenStarted(): Boolean {
+        return playbackPosition > 0L
+    }
+
+
     /* Creates a deep copy of an Episode */
     fun deepCopy(): Episode {
         return Episode(guid = guid,

app/src/main/java/org/y20k/escapepod/helpers/CollectionHelper.kt

@@ -530,8 +530,8 @@ object CollectionHelper {
         if (episode.getMediaId() == PreferencesHelper.loadUpNextMediaId(context)) {
             // episode is in Up Next queue
             return false
-        } else if (!episode.isFinished()) {
-            // episode not finished
+        } else if (episode.hasBeenStarted() && !episode.isFinished()) {
+            // episode has been started but not finished
             return false
         } else if (episode.playbackState != PlaybackStateCompat.STATE_STOPPED && !episode.isFinished()) {
             // episode is paused or playing

app/src/main/java/org/y20k/escapepod/ui/LayoutHolder.kt

@@ -17,7 +17,6 @@ package org.y20k.escapepod.ui
 import android.app.Activity
 import android.content.Context
 import android.net.Uri
-import android.os.Parcelable
 import android.os.Vibrator
 import android.support.v4.media.session.PlaybackStateCompat
 import android.view.View
@@ -400,20 +399,12 @@ data class LayoutHolder(var activity: Activity) {
 
 
     /*
-     * Inner class: custom LinearLayoutManager
+     * Inner class: Custom LinearLayoutManager
      */
     private inner class CustomLayoutManager(context: Context): LinearLayoutManager(context, VERTICAL, false) {
-        var listState: Parcelable? = null
         override fun supportsPredictiveItemAnimations(): Boolean {
             return true
         }
-//        override fun onLayoutCompleted(state: RecyclerView.State?) {
-//            if (state == null) scrollToPosition(0)
-//        }
-//        override fun onRestoreInstanceState(state: Parcelable?) {
-//            listState = state
-//            super.onRestoreInstanceState(state)
-//        }
     }
     /*
      * End of inner class