kavin/LibreTube
1
0
Fork 0
mirror of https://github.com/libre-tube/LibreTube.git synced 2025-04-29 16:30:31 +05:30
Code Issues Projects Releases Wiki Activity

Merge pull request #6314 from nik-conder/ui-downloads

Browse Source 
fix: visibility of UI elements in Downloads
This commit is contained in:
Bnyro 2024-08-10 13:36:24 +02:00 committed by GitHub
commit c30311d068
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 29 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
app/src/main/java/com/github/libretube/ui/fragments/DownloadsFragment.kt
View File

@ -12,7 +12,6 @@ import android.view.View
import android.view.ViewGroup import android.view.ViewGroup
import androidx.core.content.ContextCompat import androidx.core.content.ContextCompat
import androidx.core.view.isGone import androidx.core.view.isGone
import androidx.core.view.isInvisible
import androidx.core.view.isVisible import androidx.core.view.isVisible
import androidx.lifecycle.lifecycleScope import androidx.lifecycle.lifecycleScope
import androidx.recyclerview.widget.GridLayoutManager import androidx.recyclerview.widget.GridLayoutManager
@ -87,7 +86,6 @@ class DownloadsFragment : DynamicLayoutManagerFragment() {
override fun onViewCreated(view: View, savedInstanceState: Bundle?) { override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
super.onViewCreated(view, savedInstanceState) super.onViewCreated(view, savedInstanceState)
binding.deleteAll.isInvisible = true
var selectedSortType = var selectedSortType =
PreferenceHelper.getInt(PreferenceKeys.SELECTED_DOWNLOAD_SORT_TYPE, 0) PreferenceHelper.getInt(PreferenceKeys.SELECTED_DOWNLOAD_SORT_TYPE, 0)
val filterOptions = resources.getStringArray(R.array.downloadSortOptions) val filterOptions = resources.getStringArray(R.array.downloadSortOptions)
@ -166,25 +164,31 @@ class DownloadsFragment : DynamicLayoutManagerFragment() {
object : RecyclerView.AdapterDataObserver() { object : RecyclerView.AdapterDataObserver() {
override fun onItemRangeRemoved(positionStart: Int, itemCount: Int) { override fun onItemRangeRemoved(positionStart: Int, itemCount: Int) {
super.onItemRangeRemoved(positionStart, itemCount) super.onItemRangeRemoved(positionStart, itemCount)
val binding = _binding ?: return toggleButtonsVisibility()
if (binding.downloads.adapter?.itemCount == 0) {
binding.downloads.isGone = true
binding.downloadsEmpty.isVisible = true
}
} }
} }
) )
if (dbDownloads.isNotEmpty()) { toggleButtonsVisibility()
binding.deleteAll.isVisible = true
binding.shuffleBackground.setOnClickListener {
BackgroundHelper.playOnBackgroundOffline(requireContext(), null)
}
binding.deleteAll.setOnClickListener { binding.deleteAll.setOnClickListener {
showDeleteAllDialog(binding.root.context, adapter) showDeleteAllDialog(binding.root.context, adapter)
} }
} }
binding.shuffleBackground.setOnClickListener { private fun toggleButtonsVisibility() {
BackgroundHelper.playOnBackgroundOffline(requireContext(), null) val binding = _binding ?: return
}
val isEmpty = binding.downloads.adapter?.itemCount == 0
binding.downloadsEmpty.isVisible = isEmpty
binding.downloads.isGone = isEmpty
binding.sortType.isGone = isEmpty
binding.deleteAll.isGone = isEmpty
binding.shuffleBackground.isGone = isEmpty
} }
private fun sortDownloadList(sortType: Int, previousSortType: Int? = null) { private fun sortDownloadList(sortType: Int, previousSortType: Int? = null) {

20
app/src/main/res/layout/fragment_downloads.xml
View File

@ -11,19 +11,19 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginEnd="10dp" android:layout_marginEnd="10dp"
android:paddingVertical="5dp" android:clickable="true"
android:drawablePadding="10dp"
android:focusable="true" android:focusable="true"
android:fontFamily="@font/roboto" android:fontFamily="@font/roboto"
android:paddingVertical="5dp"
android:text="@string/sort_by" android:text="@string/sort_by"
android:clickable="true"
android:textSize="15sp" android:textSize="15sp"
android:textStyle="bold" android:textStyle="bold"
android:drawablePadding="10dp" android:visibility="gone"
app:drawableEndCompat="@drawable/ic_sort" app:drawableEndCompat="@drawable/ic_sort"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
/> app:layout_constraintTop_toTopOf="parent"
tools:visibility="visible" />
<LinearLayout <LinearLayout
android:id="@+id/downloads_empty" android:id="@+id/downloads_empty"
@ -70,9 +70,11 @@
android:contentDescription="@string/shuffle" android:contentDescription="@string/shuffle"
android:src="@drawable/ic_delete" android:src="@drawable/ic_delete"
android:tooltipText="@string/delete" android:tooltipText="@string/delete"
android:visibility="gone"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
tools:targetApi="o" /> tools:targetApi="o"
tools:visibility="visible" />
<com.google.android.material.floatingactionbutton.FloatingActionButton <com.google.android.material.floatingactionbutton.FloatingActionButton
android:id="@+id/shuffle_background" android:id="@+id/shuffle_background"
@ -83,8 +85,10 @@
android:contentDescription="@string/shuffle" android:contentDescription="@string/shuffle"
android:src="@drawable/ic_shuffle" android:src="@drawable/ic_shuffle"
android:tooltipText="@string/shuffle" android:tooltipText="@string/shuffle"
android:visibility="gone"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
tools:targetApi="o" /> tools:targetApi="o"
tools:visibility="visible" />
</androidx.constraintlayout.widget.ConstraintLayout> </androidx.constraintlayout.widget.ConstraintLayout>