From 93d6eb9b177eb488a6ef6d3a34bed70e9075cb08 Mon Sep 17 00:00:00 2001 From: Jarne Demeulemeester Date: Fri, 21 Jan 2022 18:28:06 +0100 Subject: [PATCH] Fix delete button sometimes not visible --- .../jdtech/jellyfin/fragments/EpisodeBottomSheetFragment.kt | 4 ++-- .../java/dev/jdtech/jellyfin/fragments/MediaInfoFragment.kt | 2 +- app/src/main/res/layout/episode_bottom_sheet.xml | 5 +++-- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/app/src/main/java/dev/jdtech/jellyfin/fragments/EpisodeBottomSheetFragment.kt b/app/src/main/java/dev/jdtech/jellyfin/fragments/EpisodeBottomSheetFragment.kt index 73daefef..42db8aae 100644 --- a/app/src/main/java/dev/jdtech/jellyfin/fragments/EpisodeBottomSheetFragment.kt +++ b/app/src/main/java/dev/jdtech/jellyfin/fragments/EpisodeBottomSheetFragment.kt @@ -111,13 +111,13 @@ class EpisodeBottomSheetFragment : BottomSheetDialogFragment() { //binding.progressDownload.isVisible = true } - binding.deleteButton.isVisible = false - viewModel.loadEpisode(episodeId) } else { val playerItem = args.playerItem!! viewModel.loadEpisode(playerItem) + binding.deleteButton.isVisible = true + binding.deleteButton.setOnClickListener { viewModel.deleteEpisode() dismiss() diff --git a/app/src/main/java/dev/jdtech/jellyfin/fragments/MediaInfoFragment.kt b/app/src/main/java/dev/jdtech/jellyfin/fragments/MediaInfoFragment.kt index f3863e0d..531cc015 100644 --- a/app/src/main/java/dev/jdtech/jellyfin/fragments/MediaInfoFragment.kt +++ b/app/src/main/java/dev/jdtech/jellyfin/fragments/MediaInfoFragment.kt @@ -170,11 +170,11 @@ class MediaInfoFragment : Fragment() { binding.downloadButton.setImageResource(R.drawable.ic_download_filled) } - binding.deleteButton.isVisible = false } else { binding.favoriteButton.isVisible = false binding.checkButton.isVisible = false binding.downloadButton.isVisible = false + binding.deleteButton.isVisible = true binding.deleteButton.setOnClickListener { viewModel.deleteItem() diff --git a/app/src/main/res/layout/episode_bottom_sheet.xml b/app/src/main/res/layout/episode_bottom_sheet.xml index 85345e22..5be04eca 100644 --- a/app/src/main/res/layout/episode_bottom_sheet.xml +++ b/app/src/main/res/layout/episode_bottom_sheet.xml @@ -44,9 +44,9 @@ android:layout_marginEnd="8dp" android:background="@drawable/circle_background" android:backgroundTint="?attr/colorError" + android:visibility="gone" app:layout_constraintEnd_toEndOf="@id/episode_image" app:layout_constraintTop_toTopOf="@id/episode_image" - android:visibility="gone" tools:visibility="visible"> + android:src="@drawable/ic_trash" + android:visibility="gone" />