From cda6ccdabf74882c5db48b7d255d70ead9d2de93 Mon Sep 17 00:00:00 2001
From: tibbi <tibor@kaputa.sk>
Date: Thu, 2 Apr 2020 11:24:19 +0200
Subject: [PATCH] refresh the recordings list after renaming an item

---
 .../adapters/RecordingsAdapter.kt             |  6 ++-
 .../voicerecorder/fragments/PlayerFragment.kt | 40 +++++++++++++------
 .../interfaces/RefreshRecordingsListener.kt   |  5 +++
 3 files changed, 37 insertions(+), 14 deletions(-)
 create mode 100644 app/src/main/kotlin/com/simplemobiletools/voicerecorder/interfaces/RefreshRecordingsListener.kt

diff --git a/app/src/main/kotlin/com/simplemobiletools/voicerecorder/adapters/RecordingsAdapter.kt b/app/src/main/kotlin/com/simplemobiletools/voicerecorder/adapters/RecordingsAdapter.kt
index 9ad52c0..6ebbe71 100644
--- a/app/src/main/kotlin/com/simplemobiletools/voicerecorder/adapters/RecordingsAdapter.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/voicerecorder/adapters/RecordingsAdapter.kt
@@ -14,12 +14,13 @@ import com.simplemobiletools.commons.views.MyRecyclerView
 import com.simplemobiletools.voicerecorder.R
 import com.simplemobiletools.voicerecorder.activities.SimpleActivity
 import com.simplemobiletools.voicerecorder.dialogs.RenameRecordingDialog
+import com.simplemobiletools.voicerecorder.interfaces.RefreshRecordingsListener
 import com.simplemobiletools.voicerecorder.models.Recording
 import kotlinx.android.synthetic.main.item_recording.view.*
 import java.util.*
 
-class RecordingsAdapter(activity: SimpleActivity, var recordings: ArrayList<Recording>, recyclerView: MyRecyclerView, fastScroller: FastScroller,
-    itemClick: (Any) -> Unit) : MyRecyclerViewAdapter(activity, recyclerView, fastScroller, itemClick) {
+class RecordingsAdapter(activity: SimpleActivity, var recordings: ArrayList<Recording>, val refreshListener: RefreshRecordingsListener,
+                        recyclerView: MyRecyclerView, fastScroller: FastScroller, itemClick: (Any) -> Unit) : MyRecyclerViewAdapter(activity, recyclerView, fastScroller, itemClick) {
     var currRecordingId = 0
 
     init {
@@ -76,6 +77,7 @@ class RecordingsAdapter(activity: SimpleActivity, var recordings: ArrayList<Reco
         val recording = getItemWithKey(selectedKeys.first()) ?: return
         RenameRecordingDialog(activity, recording) {
             finishActMode()
+            refreshListener.refreshRecordings()
         }
     }
 
diff --git a/app/src/main/kotlin/com/simplemobiletools/voicerecorder/fragments/PlayerFragment.kt b/app/src/main/kotlin/com/simplemobiletools/voicerecorder/fragments/PlayerFragment.kt
index e3b0feb..2a05498 100644
--- a/app/src/main/kotlin/com/simplemobiletools/voicerecorder/fragments/PlayerFragment.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/voicerecorder/fragments/PlayerFragment.kt
@@ -17,12 +17,13 @@ import com.simplemobiletools.voicerecorder.R
 import com.simplemobiletools.voicerecorder.activities.SimpleActivity
 import com.simplemobiletools.voicerecorder.adapters.RecordingsAdapter
 import com.simplemobiletools.voicerecorder.extensions.config
+import com.simplemobiletools.voicerecorder.interfaces.RefreshRecordingsListener
 import com.simplemobiletools.voicerecorder.models.Recording
 import kotlinx.android.synthetic.main.fragment_player.view.*
 import java.util.*
 import kotlin.collections.ArrayList
 
-class PlayerFragment(context: Context, attributeSet: AttributeSet) : MyViewPagerFragment(context, attributeSet) {
+class PlayerFragment(context: Context, attributeSet: AttributeSet) : MyViewPagerFragment(context, attributeSet), RefreshRecordingsListener {
     private val FAST_FORWARD_SKIP_MS = 10000
 
     private var player: MediaPlayer? = null
@@ -45,24 +46,19 @@ class PlayerFragment(context: Context, attributeSet: AttributeSet) : MyViewPager
         super.onAttachedToWindow()
 
         setupColors()
-        val recordings = getRecordings()
-        val adapter = RecordingsAdapter(context as SimpleActivity, recordings, recordings_list, recordings_fastscroller) {
-            playRecording(it as Recording)
-            if (playedRecordingIDs.isEmpty() || playedRecordingIDs.peek() != it.id) {
-                playedRecordingIDs.push(it.id)
-            }
-        }.apply {
-            recordings_list.adapter = this
-        }
+        setupAdapter()
+        initMediaPlayer()
+        setupViews()
+    }
 
+    private fun setupViews() {
         recordings_fastscroller.setScrollToY(0)
         recordings_fastscroller.setViews(recordings_list) {
+            val adapter = getRecordingsAdapter() ?: return@setViews
             val item = adapter.recordings.getOrNull(it)
             recordings_fastscroller.updateBubbleText(item?.title ?: "")
         }
 
-        initMediaPlayer()
-
         play_pause_btn.setOnClickListener {
             if (playedRecordingIDs.empty() || player_progressbar.max == 0) {
                 next_btn.callOnClick()
@@ -84,6 +80,7 @@ class PlayerFragment(context: Context, attributeSet: AttributeSet) : MyViewPager
                 return@setOnClickListener
             }
 
+            val adapter = getRecordingsAdapter() ?: return@setOnClickListener
             var wantedRecordingID = playedRecordingIDs.pop()
             if (wantedRecordingID == adapter.currRecordingId && !playedRecordingIDs.isEmpty()) {
                 wantedRecordingID = playedRecordingIDs.pop()
@@ -95,6 +92,7 @@ class PlayerFragment(context: Context, attributeSet: AttributeSet) : MyViewPager
         }
 
         next_btn.setOnClickListener {
+            val adapter = getRecordingsAdapter() ?: return@setOnClickListener
             val oldRecordingIndex = adapter.recordings.indexOfFirst { it.id == adapter.currRecordingId }
             val newRecordingIndex = (oldRecordingIndex + 1) % adapter.recordings.size
             val newRecording = adapter.recordings.getOrNull(newRecordingIndex) ?: return@setOnClickListener
@@ -103,6 +101,22 @@ class PlayerFragment(context: Context, attributeSet: AttributeSet) : MyViewPager
         }
     }
 
+    override fun refreshRecordings() {
+        setupAdapter()
+    }
+
+    private fun setupAdapter() {
+        val recordings = getRecordings()
+        RecordingsAdapter(context as SimpleActivity, recordings, this, recordings_list, recordings_fastscroller) {
+            playRecording(it as Recording)
+            if (playedRecordingIDs.isEmpty() || playedRecordingIDs.peek() != it.id) {
+                playedRecordingIDs.push(it.id)
+            }
+        }.apply {
+            recordings_list.adapter = this
+        }
+    }
+
     @SuppressLint("InlinedApi")
     private fun getRecordings(): ArrayList<Recording> {
         val recordings = ArrayList<Recording>()
@@ -263,6 +277,8 @@ class PlayerFragment(context: Context, attributeSet: AttributeSet) : MyViewPager
 
     private fun getIsPlaying() = player?.isPlaying == true
 
+    private fun getRecordingsAdapter() = recordings_list.adapter as? RecordingsAdapter
+
     private fun setupColors() {
         recordings_fastscroller.updatePrimaryColor()
         recordings_fastscroller.updateBubbleColors()
diff --git a/app/src/main/kotlin/com/simplemobiletools/voicerecorder/interfaces/RefreshRecordingsListener.kt b/app/src/main/kotlin/com/simplemobiletools/voicerecorder/interfaces/RefreshRecordingsListener.kt
new file mode 100644
index 0000000..911b818
--- /dev/null
+++ b/app/src/main/kotlin/com/simplemobiletools/voicerecorder/interfaces/RefreshRecordingsListener.kt
@@ -0,0 +1,5 @@
+package com.simplemobiletools.voicerecorder.interfaces
+
+interface RefreshRecordingsListener {
+    fun refreshRecordings()
+}