From 48d4a2fa9faa3f1485569c8918688f9c6bd6428d Mon Sep 17 00:00:00 2001 From: deniscerri <64997243+deniscerri@users.noreply.github.com> Date: Sun, 17 Sep 2023 11:44:01 +0200 Subject: [PATCH] 1.6.7 --- app/build.gradle | 4 +-- .../main/java/com/deniscerri/ytdlnis/App.kt | 7 +++-- .../database/viewmodel/DownloadViewModel.kt | 2 +- .../com/deniscerri/ytdlnis/util/InfoUtil.kt | 6 ++-- .../ytdlnis/util/NotificationUtil.kt | 5 ++-- .../deniscerri/ytdlnis/work/DownloadWorker.kt | 3 +- app/src/main/res/layout/format_item.xml | 2 +- app/src/main/res/values-night/themes.xml | 1 + app/src/main/res/values-sq-rAL/strings.xml | 3 +- app/src/main/res/values/arrays.xml | 10 +++---- app/src/main/res/values/strings.xml | 2 +- app/src/main/res/values/themes.xml | 1 + .../android/en-US/changelogs/10670.txt | 30 +++++++++++++++++++ 13 files changed, 54 insertions(+), 22 deletions(-) create mode 100644 fastlane/metadata/android/en-US/changelogs/10670.txt diff --git a/app/build.gradle b/app/build.gradle index 3e9fb912..f7029470 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -9,8 +9,8 @@ plugins { def properties = new Properties() def versionMajor = 1 def versionMinor = 6 -def versionPatch = 6 -def versionBuild = 3 // bump for dogfood builds, public betas, etc. +def versionPatch = 7 +def versionBuild = 0 // bump for dogfood builds, public betas, etc. def versionExt = "" if (versionBuild > 0){ diff --git a/app/src/main/java/com/deniscerri/ytdlnis/App.kt b/app/src/main/java/com/deniscerri/ytdlnis/App.kt index 1fbf7f9a..d16049ab 100644 --- a/app/src/main/java/com/deniscerri/ytdlnis/App.kt +++ b/app/src/main/java/com/deniscerri/ytdlnis/App.kt @@ -32,12 +32,15 @@ class App : Application() { override fun onCreate() { super.onCreate() instance = this - createNotificationChannels() - val sharedPreferences = PreferenceManager.getDefaultSharedPreferences(this) + + val sharedPreferences = PreferenceManager.getDefaultSharedPreferences(this@App) setDefaultValues() + applicationScope = CoroutineScope(SupervisorJob()) applicationScope.launch((Dispatchers.IO)) { try { + createNotificationChannels() + initLibraries() val appVer = sharedPreferences.getString("version", "")!! if(appVer.isEmpty() || appVer != BuildConfig.VERSION_NAME){ diff --git a/app/src/main/java/com/deniscerri/ytdlnis/database/viewmodel/DownloadViewModel.kt b/app/src/main/java/com/deniscerri/ytdlnis/database/viewmodel/DownloadViewModel.kt index 08f69d59..658f9871 100644 --- a/app/src/main/java/com/deniscerri/ytdlnis/database/viewmodel/DownloadViewModel.kt +++ b/app/src/main/java/com/deniscerri/ytdlnis/database/viewmodel/DownloadViewModel.kt @@ -453,7 +453,7 @@ class DownloadViewModel(application: Application) : AndroidViewModel(application val videoFormats = resources.getStringArray(R.array.video_formats_values) val formats = mutableListOf() val containerPreference = sharedPreferences.getString("video_format", "") - videoFormats.forEach { formats.add(Format(it, containerPreference!!,"Default","", "",0, it)) } + videoFormats.forEach { formats.add(Format(it, containerPreference!!,"Default","", "",0, it.split("_")[0])) } formatIDPreference.forEach { formats.add(Format(it, containerPreference!!,"Default","", "",1, it)) } return formats } diff --git a/app/src/main/java/com/deniscerri/ytdlnis/util/InfoUtil.kt b/app/src/main/java/com/deniscerri/ytdlnis/util/InfoUtil.kt index 3f3ccff0..8d83519e 100644 --- a/app/src/main/java/com/deniscerri/ytdlnis/util/InfoUtil.kt +++ b/app/src/main/java/com/deniscerri/ytdlnis/util/InfoUtil.kt @@ -653,7 +653,7 @@ class InfoUtil(private val context: Context) { urls = urlList.joinToString("\n") } - val url = if (jsonObject.has("url")){ + val url = if (jsonObject.has("url") && results.size > 1){ jsonObject.getString("url") }else{ if (Patterns.WEB_URL.matcher(query).matches()){ @@ -1201,7 +1201,7 @@ class InfoUtil(private val context: Context) { //format logic - val defaultFormats = context.resources.getStringArray(R.array.video_formats) + val defaultFormats = context.resources.getStringArray(R.array.video_formats_values) var usingGenericFormat = false var videof = downloadItem.format.format_id @@ -1211,7 +1211,7 @@ class InfoUtil(private val context: Context) { }else if (videof == context.resources.getString(R.string.worst_quality) || videof == "worst") { videof = "worst" }else if (defaultFormats.contains(videof)) { - videof = "bestvideo[height<="+videof.substring(0, videof.length -1)+"]" + videof = "bestvideo[height<="+videof.split("_")[0].dropLast(1)+"]" } val preferredFormatIDs = sharedPreferences.getString("format_id", "").toString() diff --git a/app/src/main/java/com/deniscerri/ytdlnis/util/NotificationUtil.kt b/app/src/main/java/com/deniscerri/ytdlnis/util/NotificationUtil.kt index 21176eb6..44d50a81 100644 --- a/app/src/main/java/com/deniscerri/ytdlnis/util/NotificationUtil.kt +++ b/app/src/main/java/com/deniscerri/ytdlnis/util/NotificationUtil.kt @@ -173,10 +173,9 @@ class NotificationUtil(var context: Context) { } fun createDownloadFinished(title: String?, - filepath: List?, - channel: String + filepath: List? ) { - val notificationBuilder = getBuilder(channel) + val notificationBuilder = getBuilder(DOWNLOAD_FINISHED_CHANNEL_ID) notificationBuilder .setContentTitle("${context.getString(R.string.downloaded)} $title") diff --git a/app/src/main/java/com/deniscerri/ytdlnis/work/DownloadWorker.kt b/app/src/main/java/com/deniscerri/ytdlnis/work/DownloadWorker.kt index 4b33d3fc..e328d647 100644 --- a/app/src/main/java/com/deniscerri/ytdlnis/work/DownloadWorker.kt +++ b/app/src/main/java/com/deniscerri/ytdlnis/work/DownloadWorker.kt @@ -202,8 +202,7 @@ class DownloadWorker( notificationUtil.cancelDownloadNotification(downloadItem.id.toInt()) notificationUtil.createDownloadFinished( - downloadItem.title, if (finalPaths?.first().equals(context.getString(R.string.unfound_file))) null else finalPaths, - NotificationUtil.DOWNLOAD_FINISHED_CHANNEL_ID + downloadItem.title, if (finalPaths?.first().equals(context.getString(R.string.unfound_file))) null else finalPaths ) if (wasQuickDownloaded){ diff --git a/app/src/main/res/layout/format_item.xml b/app/src/main/res/layout/format_item.xml index 334882bc..544d94b3 100644 --- a/app/src/main/res/layout/format_item.xml +++ b/app/src/main/res/layout/format_item.xml @@ -47,7 +47,7 @@ false @style/Preference.SwitchPreferenceCompat.Material3 @style/snackBarStyle + @style/PreferenceTheme