wbrawner/Simple-Voice-Recorder
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Clean up IDs in TrashFragment for clarity

Browse source
This commit is contained in:
Ensar Sarajčić 2023-07-27 10:56:15 +02:00
parent a0278914ee
commit f0db5d72aa
2 changed files with 17 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
app/src/main/kotlin/com/simplemobiletools/voicerecorder/fragments/TrashFragment.kt
View file

@ -11,10 +11,10 @@ import com.simplemobiletools.voicerecorder.extensions.getAllRecordings
import com.simplemobiletools.voicerecorder.interfaces.RefreshRecordingsListener
import com.simplemobiletools.voicerecorder.models.Events
import com.simplemobiletools.voicerecorder.models.Recording
import kotlinx.android.synthetic.main.fragment_trash.view.player_holder
import kotlinx.android.synthetic.main.fragment_trash.view.recordings_fastscroller
import kotlinx.android.synthetic.main.fragment_trash.view.recordings_list
import kotlinx.android.synthetic.main.fragment_trash.view.recordings_placeholder
import kotlinx.android.synthetic.main.fragment_trash.view.trash_holder
import kotlinx.android.synthetic.main.fragment_trash.view.trash_fastscroller
import kotlinx.android.synthetic.main.fragment_trash.view.trash_list
import kotlinx.android.synthetic.main.fragment_trash.view.trash_placeholder
import org.greenrobot.eventbus.EventBus
import org.greenrobot.eventbus.Subscribe
import org.greenrobot.eventbus.ThreadMode
@ -60,8 +60,8 @@ class TrashFragment(context: Context, attributeSet: AttributeSet) : MyViewPagerF
override fun playRecording(recording: Recording, playOnPrepared: Boolean) {}
private fun setupAdapter(recordings: ArrayList<Recording>) {
recordings_fastscroller.beVisibleIf(recordings.isNotEmpty())
recordings_placeholder.beVisibleIf(recordings.isEmpty())
trash_fastscroller.beVisibleIf(recordings.isNotEmpty())
trash_placeholder.beVisibleIf(recordings.isEmpty())
if (recordings.isEmpty()) {
val stringId = if (lastSearchQuery.isEmpty()) {
R.string.recycle_bin_empty
@ -69,18 +69,18 @@ class TrashFragment(context: Context, attributeSet: AttributeSet) : MyViewPagerF
R.string.no_items_found
}
recordings_placeholder.text = context.getString(stringId)
trash_placeholder.text = context.getString(stringId)
}
val adapter = getRecordingsAdapter()
if (adapter == null) {
TrashAdapter(context as SimpleActivity, recordings, this, recordings_list)
TrashAdapter(context as SimpleActivity, recordings, this, trash_list)
.apply {
recordings_list.adapter = this
trash_list.adapter = this
}
if (context.areSystemAnimationsEnabled) {
recordings_list.scheduleLayoutAnimation()
trash_list.scheduleLayoutAnimation()
}
} else {
adapter.updateItems(recordings)
@ -99,7 +99,7 @@ class TrashFragment(context: Context, attributeSet: AttributeSet) : MyViewPagerF
setupAdapter(filtered)
}
private fun getRecordingsAdapter() = recordings_list.adapter as? TrashAdapter
private fun getRecordingsAdapter() = trash_list.adapter as? TrashAdapter
private fun storePrevPath() {
prevSavePath = context!!.config.saveRecordingsFolder
@ -107,8 +107,8 @@ class TrashFragment(context: Context, attributeSet: AttributeSet) : MyViewPagerF
private fun setupColors() {
val properPrimaryColor = context.getProperPrimaryColor()
recordings_fastscroller.updateColors(properPrimaryColor)
context.updateTextColors(player_holder)
trash_fastscroller.updateColors(properPrimaryColor)
context.updateTextColors(trash_holder)
}
fun finishActMode() = getRecordingsAdapter()?.finishActMode()

9
app/src/main/res/layout/fragment_trash.xml
View file

@ -1,12 +1,12 @@
<?xml version="1.0" encoding="utf-8"?>
<com.simplemobiletools.voicerecorder.fragments.TrashFragment xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:id="@+id/player_holder"
android:id="@+id/trash_holder"
android:layout_width="match_parent"
android:layout_height="match_parent">
<com.simplemobiletools.commons.views.MyTextView
android:id="@+id/recordings_placeholder"
android:id="@+id/trash_placeholder"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:alpha="0.8"
@ -19,14 +19,13 @@
android:visibility="visible" />
<com.qtalk.recyclerviewfastscroller.RecyclerViewFastScroller
android:id="@+id/recordings_fastscroller"
android:id="@+id/trash_fastscroller"
android:layout_width="match_parent"
android:layout_height="0dp"
app:layout_constraintBottom_toTopOf="@+id/player_controls_wrapper"
app:layout_constraintTop_toTopOf="parent">
<com.simplemobiletools.commons.views.MyRecyclerView
android:id="@+id/recordings_list"
android:id="@+id/trash_list"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:clipToPadding="false"