From 0597fa876cb0287dc5e849b32fb10c23fb81ea0b Mon Sep 17 00:00:00 2001 From: Alexander Capehart Date: Sat, 20 May 2023 11:28:14 -0600 Subject: [PATCH] detail: drop playlist resorting for now Don't really have the UI for it currently. It would require some kind of dialog instead of a popup menu, which is planned eventually. --- .../detail/list/PlaylistDetailListAdapter.kt | 20 ++++++------------- app/src/main/res/layout/item_edit_header.xml | 18 ++++++++--------- 2 files changed, 15 insertions(+), 23 deletions(-) diff --git a/app/src/main/java/org/oxycblt/auxio/detail/list/PlaylistDetailListAdapter.kt b/app/src/main/java/org/oxycblt/auxio/detail/list/PlaylistDetailListAdapter.kt index 69e0509d5..47737f7f7 100644 --- a/app/src/main/java/org/oxycblt/auxio/detail/list/PlaylistDetailListAdapter.kt +++ b/app/src/main/java/org/oxycblt/auxio/detail/list/PlaylistDetailListAdapter.kt @@ -24,7 +24,6 @@ import android.view.View import android.view.ViewGroup import androidx.annotation.StringRes import androidx.appcompat.widget.TooltipCompat -import androidx.core.view.isGone import androidx.core.view.isInvisible import androidx.core.view.isVisible import androidx.recyclerview.widget.RecyclerView @@ -148,7 +147,11 @@ class PlaylistDetailListAdapter(private val listener: Listener) : */ data class EditHeader(@StringRes override val titleRes: Int) : Header -/** Displays an [EditHeader] and it's actions. Use [from] to create an instance. */ +/** + * Displays an [EditHeader] and it's actions. Use [from] to create an instance. + * + * @author Alexander Capehart (OxygenCobalt) + */ private class EditHeaderViewHolder private constructor(private val binding: ItemEditHeaderBinding) : RecyclerView.ViewHolder(binding.root), PlaylistDetailListAdapter.ViewHolder { /** @@ -165,21 +168,10 @@ private class EditHeaderViewHolder private constructor(private val binding: Item TooltipCompat.setTooltipText(this, contentDescription) setOnClickListener { listener.onStartEdit() } } - binding.headerSort.apply { - TooltipCompat.setTooltipText(this, contentDescription) - setOnClickListener(listener::onOpenSortMenu) - } } override fun updateEditing(editing: Boolean) { - binding.headerEdit.apply { - isGone = editing - jumpDrawablesToCurrentState() - } - binding.headerSort.apply { - isGone = !editing - jumpDrawablesToCurrentState() - } + binding.headerEdit.isEnabled = !editing } companion object { diff --git a/app/src/main/res/layout/item_edit_header.xml b/app/src/main/res/layout/item_edit_header.xml index 02d528635..80659deca 100644 --- a/app/src/main/res/layout/item_edit_header.xml +++ b/app/src/main/res/layout/item_edit_header.xml @@ -28,14 +28,14 @@ app:icon="@drawable/ic_edit_24" app:layout_constraintEnd_toEndOf="parent" /> - + + + + + + + + + \ No newline at end of file