From 1454e75a9b437cd4a6059c9b9fbaad7075f619da Mon Sep 17 00:00:00 2001 From: Max Jakobitsch Date: Thu, 15 May 2025 18:22:40 +0200 Subject: [PATCH] fix: disable cut for live videos on tap show snackbar "cutting live videos is unsupported" --- .../ui/downloadcard/DownloadAudioFragment.kt | 3 +++ .../ui/downloadcard/DownloadVideoFragment.kt | 3 +++ .../java/com/deniscerri/ytdl/util/UiUtil.kt | 20 ++++++++----------- app/src/main/res/values/strings.xml | 1 + 4 files changed, 15 insertions(+), 12 deletions(-) diff --git a/app/src/main/java/com/deniscerri/ytdl/ui/downloadcard/DownloadAudioFragment.kt b/app/src/main/java/com/deniscerri/ytdl/ui/downloadcard/DownloadAudioFragment.kt index 973a7c76..82e0fa33 100644 --- a/app/src/main/java/com/deniscerri/ytdl/ui/downloadcard/DownloadAudioFragment.kt +++ b/app/src/main/java/com/deniscerri/ytdl/ui/downloadcard/DownloadAudioFragment.kt @@ -337,6 +337,9 @@ class DownloadAudioFragment(private var resultItem: ResultItem? = null, private if(isUpdatingData){ val snack = Snackbar.make(view, context.getString(R.string.please_wait), Snackbar.LENGTH_SHORT) snack.show() + }else if (downloadItem.duration=="0:00"){ + val snack = Snackbar.make(view, context.getString(R.string.cut_live_unsupported), Snackbar.LENGTH_SHORT) + snack.show() }else if (!nonSpecific){ val snack = Snackbar.make(view, context.getString(R.string.cut_unavailable), Snackbar.LENGTH_SHORT) snack.setAction(R.string.update){ diff --git a/app/src/main/java/com/deniscerri/ytdl/ui/downloadcard/DownloadVideoFragment.kt b/app/src/main/java/com/deniscerri/ytdl/ui/downloadcard/DownloadVideoFragment.kt index 2bb22f56..69b56c23 100644 --- a/app/src/main/java/com/deniscerri/ytdl/ui/downloadcard/DownloadVideoFragment.kt +++ b/app/src/main/java/com/deniscerri/ytdl/ui/downloadcard/DownloadVideoFragment.kt @@ -367,6 +367,9 @@ class DownloadVideoFragment(private var resultItem: ResultItem? = null, private if(isUpdatingData){ val snack = Snackbar.make(view, context.getString(R.string.please_wait), Snackbar.LENGTH_SHORT) snack.show() + }else if (downloadItem.duration=="0:00"){ + val snack = Snackbar.make(view, context.getString(R.string.cut_live_unsupported), Snackbar.LENGTH_SHORT) + snack.show() }else if (!nonSpecific){ val snack = Snackbar.make(view, context.getString(R.string.cut_unavailable), Snackbar.LENGTH_SHORT) snack.setAction(R.string.update){ diff --git a/app/src/main/java/com/deniscerri/ytdl/util/UiUtil.kt b/app/src/main/java/com/deniscerri/ytdl/util/UiUtil.kt index 920d2dcb..e1f86987 100644 --- a/app/src/main/java/com/deniscerri/ytdl/util/UiUtil.kt +++ b/app/src/main/java/com/deniscerri/ytdl/util/UiUtil.kt @@ -1520,8 +1520,8 @@ object UiUtil { if (items.size > 1 || items.first().url.isEmpty()) cut.isVisible = false else{ cut.setOnClickListener(null) - val invalidDuration = items[0].duration == "-1" - if(items[0].duration.isNotEmpty() && !invalidDuration){ + val duration = items[0].duration + if(duration.isNotEmpty() && duration != "-1" && duration != "0:00"){ val downloadItem = items[0] cut.alpha = 1f if (downloadItem.downloadSections.isNotBlank()) cut.text = downloadItem.downloadSections @@ -1560,10 +1560,8 @@ object UiUtil { } }else{ cut.alpha = 0.3f - if (!invalidDuration) { - cut.setOnClickListener { - cutDisabledClicked() - } + cut.setOnClickListener { + cutDisabledClicked() } } } @@ -1686,8 +1684,8 @@ object UiUtil { else{ cut.setOnClickListener(null) val downloadItem = items[0] - val invalidDuration = downloadItem.duration == "-1" - if (downloadItem.duration.isNotEmpty() && !invalidDuration){ + val duration = downloadItem.duration + if (duration.isNotEmpty() && duration != "-1" && duration != "0:00"){ cut.alpha = 1f if (downloadItem.downloadSections.isNotBlank()) cut.text = downloadItem.downloadSections val cutVideoListener = object : VideoCutListener { @@ -1717,10 +1715,8 @@ object UiUtil { }else{ cut.alpha = 0.3f - if (!invalidDuration) { - cut.setOnClickListener { - cutDisabledClicked() - } + cut.setOnClickListener { + cutDisabledClicked() } } } diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 428b024b..0e91458d 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -476,4 +476,5 @@ Re-generate * By enabling this, you need to disable cookies Custom + Cutting live videos is not supported