From 08eb733c947232c4a47f7960a873e5e4bfd2871a Mon Sep 17 00:00:00 2001 From: deniscerri <64997243+deniscerri@users.noreply.github.com> Date: Sat, 22 Nov 2025 20:51:58 +0100 Subject: [PATCH] small stuff --- app/build.gradle | 2 +- .../database/viewmodel/SettingsViewModel.kt | 2 +- .../ytdl/util/extractors/ytdlp/YTDLPUtil.kt | 2 +- app/src/main/res/layout/fragment_terminal.xml | 3 +++ .../history_item_details_bottom_sheet.xml | 20 ++++++++++++++++++- .../main/res/layout/result_card_details.xml | 4 ++++ 6 files changed, 29 insertions(+), 4 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 4e0f17fd..ef60b5ad 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -155,7 +155,7 @@ dependencies { implementation "io.github.junkfood02.youtubedl-android:aria2c:0.18.1" // implementation "io.github.junkfood02.youtubedl-android:library:0.17.4" - implementation "io.github.junkfood02.youtubedl-android:ffmpeg:0.17.2" + implementation "io.github.junkfood02.youtubedl-android:ffmpeg:0.18.1" // implementation "io.github.junkfood02.youtubedl-android:aria2c:0.17.2" implementation "androidx.appcompat:appcompat:$appCompatVer" diff --git a/app/src/main/java/com/deniscerri/ytdl/database/viewmodel/SettingsViewModel.kt b/app/src/main/java/com/deniscerri/ytdl/database/viewmodel/SettingsViewModel.kt index a83cd451..6b050298 100644 --- a/app/src/main/java/com/deniscerri/ytdl/database/viewmodel/SettingsViewModel.kt +++ b/app/src/main/java/com/deniscerri/ytdl/database/viewmodel/SettingsViewModel.kt @@ -89,7 +89,7 @@ class SettingsViewModel(private val application: Application) : AndroidViewModel val saveFile = File("${dir.absolutePath}/YTDLnis_Backup_${BuildConfig.VERSION_NAME}_${currentTime.get( Calendar.YEAR)}-${currentTime.get(Calendar.MONTH) + 1}-${currentTime.get( - Calendar.DAY_OF_MONTH)}.json") + Calendar.DAY_OF_MONTH)}_${currentTime.get(Calendar.HOUR)}-${currentTime.get(Calendar.MINUTE)}-${currentTime.get(Calendar.SECOND)}.json") saveFile.delete() withContext(Dispatchers.IO) { diff --git a/app/src/main/java/com/deniscerri/ytdl/util/extractors/ytdlp/YTDLPUtil.kt b/app/src/main/java/com/deniscerri/ytdl/util/extractors/ytdlp/YTDLPUtil.kt index a8b72550..2f223fa2 100644 --- a/app/src/main/java/com/deniscerri/ytdl/util/extractors/ytdlp/YTDLPUtil.kt +++ b/app/src/main/java/com/deniscerri/ytdl/util/extractors/ytdlp/YTDLPUtil.kt @@ -1384,7 +1384,7 @@ class YTDLPUtil(private val context: Context, private val commandTemplateDao: Co } if (downloadItem.videoPreferences.embedSubs) { - if (sharedPreferences.getBoolean("no_keep_subs", false)) { + if (sharedPreferences.getBoolean("no_keep_subs", false) && (downloadItem.videoPreferences.writeSubs || downloadItem.videoPreferences.writeAutoSubs)) { request.addOption("--compat-options", "no-keep-subs") } diff --git a/app/src/main/res/layout/fragment_terminal.xml b/app/src/main/res/layout/fragment_terminal.xml index 94aaaeec..d509c3f8 100644 --- a/app/src/main/res/layout/fragment_terminal.xml +++ b/app/src/main/res/layout/fragment_terminal.xml @@ -81,6 +81,9 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/run_command" + android:elevation="0dp" + app:elevation="0dp" + android:stateListAnimator="@null" app:icon="@drawable/ic_baseline_keyboard_arrow_right_24" app:layout_anchor="@id/bottomAppBar" /> diff --git a/app/src/main/res/layout/history_item_details_bottom_sheet.xml b/app/src/main/res/layout/history_item_details_bottom_sheet.xml index e497598e..86d6ccf3 100644 --- a/app/src/main/res/layout/history_item_details_bottom_sheet.xml +++ b/app/src/main/res/layout/history_item_details_bottom_sheet.xml @@ -53,6 +53,7 @@ android:layout_height="wrap_content" android:layout_marginHorizontal="10dp" android:clickable="false" + android:stateListAnimator="@null" android:elevation="0dp" app:borderWidth="0dp" app:cornerRadius="10dp" @@ -66,7 +67,6 @@ @@ -85,6 +87,8 @@ android:clickable="true" android:minWidth="30dp" app:cornerRadius="10dp" + android:stateListAnimator="@null" + android:elevation="0dp" app:chipIcon="@drawable/ic_clock" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintStart_toStartOf="parent" @@ -100,6 +104,8 @@ android:minWidth="30dp" app:chipIcon="@drawable/ic_image" app:cornerRadius="10dp" + android:stateListAnimator="@null" + android:elevation="0dp" android:text="@string/thumbnail" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintStart_toStartOf="parent" @@ -113,6 +119,8 @@ android:clickable="false" android:minWidth="30dp" app:chipIcon="@drawable/ic_format" + android:stateListAnimator="@null" + android:elevation="0dp" app:cornerRadius="10dp" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintStart_toStartOf="parent" @@ -125,6 +133,8 @@ android:layout_height="wrap_content" android:clickable="false" android:minWidth="30dp" + android:stateListAnimator="@null" + android:elevation="0dp" app:cornerRadius="10dp" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintStart_toStartOf="parent" @@ -138,6 +148,8 @@ android:clickable="false" android:minWidth="30dp" app:cornerRadius="10dp" + android:stateListAnimator="@null" + android:elevation="0dp" app:chipIcon="@drawable/ic_code" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintStart_toStartOf="parent" @@ -150,6 +162,8 @@ android:layout_height="wrap_content" android:clickable="false" android:minWidth="30dp" + android:stateListAnimator="@null" + android:elevation="0dp" app:cornerRadius="10dp" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintStart_toStartOf="parent" @@ -163,6 +177,8 @@ android:clickable="false" android:minWidth="30dp" app:cornerRadius="10dp" + android:stateListAnimator="@null" + android:elevation="0dp" android:text="@string/command" app:chipIcon="@drawable/ic_baseline_keyboard_arrow_right_24" app:layout_constraintBottom_toBottomOf="parent" @@ -177,6 +193,8 @@ android:layout_height="wrap_content" android:clickable="false" android:minWidth="30dp" + android:stateListAnimator="@null" + android:elevation="0dp" app:cornerRadius="10dp" android:text="@string/location" app:chipIcon="@drawable/baseline_folder_24" diff --git a/app/src/main/res/layout/result_card_details.xml b/app/src/main/res/layout/result_card_details.xml index 8748253d..000fc236 100644 --- a/app/src/main/res/layout/result_card_details.xml +++ b/app/src/main/res/layout/result_card_details.xml @@ -83,6 +83,7 @@ android:id="@+id/title" android:layout_width="0dp" android:textStyle="bold" + android:layout_marginTop="10dp" android:layout_marginHorizontal="10dp" android:layout_height="wrap_content" android:ellipsize="end" @@ -119,6 +120,7 @@ app:elevation="0dp" android:elevation="0dp" app:borderWidth="0dp" + android:stateListAnimator="@null" android:contentDescription="@string/audio" android:layout_height="55dp" android:layout_marginHorizontal="5dp" @@ -132,6 +134,8 @@ android:layout_width="55dp" android:layout_height="55dp" app:elevation="0dp" + android:elevation="0dp" + android:stateListAnimator="@null" android:contentDescription="@string/video" android:layout_marginHorizontal="5dp" app:icon="@drawable/ic_video"