diff --git a/app/src/main/java/com/deniscerri/ytdl/core/packages/Aria2c.kt b/app/src/main/java/com/deniscerri/ytdl/core/packages/Aria2c.kt index 6747ee3c..7cfb3bef 100644 --- a/app/src/main/java/com/deniscerri/ytdl/core/packages/Aria2c.kt +++ b/app/src/main/java/com/deniscerri/ytdl/core/packages/Aria2c.kt @@ -1,12 +1,12 @@ package com.deniscerri.ytdl.core.packages object Aria2c : PackageBase() { - override val executableName: String get() = "aria2c" - override val packageFolderName: String get() = "aria2c" - override val bundledZipName: String get() = "libaria2c.zip.so" + override val executableName: String = "aria2c" + override val packageFolderName: String = "aria2c" + override val bundledZipName: String = "libaria2c.zip.so" override val canUninstall: Boolean = false - override val bundledVersion: String get() = "v1.37.0" - override val githubRepo: String get() = "deniscerri/ytdlnis-packages" - override val githubPackageName: String get() = "aria2c" - override val apkPackage: String get() = "com.deniscerri.ytdl.aria2c" + override val bundledVersion: String = "v1.37.0" + override val githubRepo: String = "deniscerri/ytdlnis-packages" + override val githubPackageName: String = "aria2c" + override val apkPackage: String = "com.deniscerri.ytdl.aria2c" } \ No newline at end of file diff --git a/app/src/main/java/com/deniscerri/ytdl/core/packages/Deno.kt b/app/src/main/java/com/deniscerri/ytdl/core/packages/Deno.kt index 55d5c5b0..c6999b2b 100644 --- a/app/src/main/java/com/deniscerri/ytdl/core/packages/Deno.kt +++ b/app/src/main/java/com/deniscerri/ytdl/core/packages/Deno.kt @@ -1,12 +1,12 @@ package com.deniscerri.ytdl.core.packages object Deno : PackageBase() { - override val executableName: String get() = "deno" - override val packageFolderName: String get() = "deno" - override val bundledZipName: String get() = "libdeno.zip.so" + override val executableName: String = "deno" + override val packageFolderName: String = "deno" + override val bundledZipName: String = "libdeno.zip.so" override val canUninstall: Boolean = true - override val bundledVersion: String get() = "" - override val githubRepo: String get() = "deniscerri/ytdlnis-packages" - override val githubPackageName: String get() = "deno" - override val apkPackage: String get() = "com.deniscerri.ytdl.deno" + override val bundledVersion: String = "" + override val githubRepo: String = "deniscerri/ytdlnis-packages" + override val githubPackageName: String = "deno" + override val apkPackage: String = "com.deniscerri.ytdl.deno" } \ No newline at end of file diff --git a/app/src/main/java/com/deniscerri/ytdl/core/packages/FFmpeg.kt b/app/src/main/java/com/deniscerri/ytdl/core/packages/FFmpeg.kt index 61bb1df3..10eca420 100644 --- a/app/src/main/java/com/deniscerri/ytdl/core/packages/FFmpeg.kt +++ b/app/src/main/java/com/deniscerri/ytdl/core/packages/FFmpeg.kt @@ -1,12 +1,12 @@ package com.deniscerri.ytdl.core.packages object FFmpeg : PackageBase() { - override val executableName: String get() = "ffmpeg" - override val packageFolderName: String get() = "ffmpeg" - override val bundledZipName: String get() = "libffmpeg.zip.so" + override val executableName: String = "ffmpeg" + override val packageFolderName: String = "ffmpeg" + override val bundledZipName: String = "libffmpeg.zip.so" override val canUninstall: Boolean = false - override val bundledVersion: String get() = "v7.0.1" - override val githubRepo: String get() = "deniscerri/ytdlnis-packages" - override val githubPackageName: String get() = "ffmpeg" - override val apkPackage: String get() = "com.deniscerri.ytdl.ffmpeg" + override val bundledVersion: String = "v7.0.1" + override val githubRepo: String = "deniscerri/ytdlnis-packages" + override val githubPackageName: String = "ffmpeg" + override val apkPackage: String = "com.deniscerri.ytdl.ffmpeg" } \ No newline at end of file diff --git a/app/src/main/java/com/deniscerri/ytdl/core/packages/NodeJS.kt b/app/src/main/java/com/deniscerri/ytdl/core/packages/NodeJS.kt index e08e84ba..bdea9bd9 100644 --- a/app/src/main/java/com/deniscerri/ytdl/core/packages/NodeJS.kt +++ b/app/src/main/java/com/deniscerri/ytdl/core/packages/NodeJS.kt @@ -1,14 +1,14 @@ package com.deniscerri.ytdl.core.packages object NodeJS : PackageBase() { - override val executableName: String get() = "node" - override val packageFolderName: String get() = "node" - override val bundledZipName: String get() = "libnode.zip.so" + override val executableName: String = "node" + override val packageFolderName: String = "node" + override val bundledZipName: String = "libnode.zip.so" override val canUninstall: Boolean = true - override val bundledVersion: String get() = "" - override val githubRepo: String get() = "deniscerri/ytdlnis-packages" - override val githubPackageName: String get() = "nodejs" - override val apkPackage: String get() = "com.deniscerri.ytdl.nodejs" + override val bundledVersion: String = "" + override val githubRepo: String = "deniscerri/ytdlnis-packages" + override val githubPackageName: String = "nodejs" + override val apkPackage: String = "com.deniscerri.ytdl.nodejs" fun getDNSSetup() : String { return """ diff --git a/app/src/main/java/com/deniscerri/ytdl/core/packages/Python.kt b/app/src/main/java/com/deniscerri/ytdl/core/packages/Python.kt index 468f62bd..d0bc32f5 100644 --- a/app/src/main/java/com/deniscerri/ytdl/core/packages/Python.kt +++ b/app/src/main/java/com/deniscerri/ytdl/core/packages/Python.kt @@ -3,12 +3,12 @@ package com.deniscerri.ytdl.core.packages import com.deniscerri.ytdl.BuildConfig object Python : PackageBase() { - override val executableName: String get() = "python" - override val packageFolderName: String get() = "python" - override val bundledZipName: String get() = "libpython.zip.so" - override val bundledVersion: String get() = if (BuildConfig.FLAVOR == "izzy") "v3.12.11" else "v3.14.6" + override val executableName: String = "python" + override val packageFolderName: String = "python" + override val bundledZipName: String = "libpython.zip.so" + override val bundledVersion: String = if (BuildConfig.FLAVOR == "izzy") "v3.12.11" else "v3.14.6" override val canUninstall: Boolean = false - override val githubRepo: String get() = "deniscerri/ytdlnis-packages" - override val githubPackageName: String get() = "python" - override val apkPackage: String get() = "com.deniscerri.ytdl.python" + override val githubRepo: String = "deniscerri/ytdlnis-packages" + override val githubPackageName: String = "python" + override val apkPackage: String = "com.deniscerri.ytdl.python" } \ No newline at end of file diff --git a/app/src/main/java/com/deniscerri/ytdl/core/packages/QuickJS.kt b/app/src/main/java/com/deniscerri/ytdl/core/packages/QuickJS.kt index 1c583d51..02f89a01 100644 --- a/app/src/main/java/com/deniscerri/ytdl/core/packages/QuickJS.kt +++ b/app/src/main/java/com/deniscerri/ytdl/core/packages/QuickJS.kt @@ -1,12 +1,12 @@ package com.deniscerri.ytdl.core.packages object QuickJS : PackageBase() { - override val executableName: String get() = "qjs" - override val packageFolderName: String get() = "quickjs" - override val bundledZipName: String get() = "libqjs.zip.so" - override val bundledVersion: String get() = "2025-04-26" + override val executableName: String = "qjs" + override val packageFolderName: String = "quickjs" + override val bundledZipName: String = "libqjs.zip.so" + override val bundledVersion: String = "2025-04-26" override val canUninstall: Boolean = false - override val githubRepo: String get() = "" - override val githubPackageName: String get() = "" - override val apkPackage: String get() = "" + override val githubRepo: String = "" + override val githubPackageName: String = "" + override val apkPackage: String = "" } \ No newline at end of file diff --git a/app/src/main/java/com/deniscerri/ytdl/database/viewmodel/TerminalViewModel.kt b/app/src/main/java/com/deniscerri/ytdl/database/viewmodel/TerminalViewModel.kt index 26c58add..0163c2e4 100644 --- a/app/src/main/java/com/deniscerri/ytdl/database/viewmodel/TerminalViewModel.kt +++ b/app/src/main/java/com/deniscerri/ytdl/database/viewmodel/TerminalViewModel.kt @@ -59,7 +59,7 @@ class TerminalViewModel(private val application: Application) : AndroidViewModel terminal.setBackgroundColor(android.graphics.Color.TRANSPARENT) val zoom = PreferenceManager.getDefaultSharedPreferences(context) - .getFloat("terminal_zoom", 14f).coerceIn(10f, 30f) + .getFloat("terminal_text_zoom", 35f) terminal.setTextSize(zoom.toInt()) terminal.setTypeface(TerminalUtils.typeface) diff --git a/app/src/main/java/com/deniscerri/ytdl/ui/more/terminal/TerminalFragment.kt b/app/src/main/java/com/deniscerri/ytdl/ui/more/terminal/TerminalFragment.kt index 05119c3a..ec7ca215 100644 --- a/app/src/main/java/com/deniscerri/ytdl/ui/more/terminal/TerminalFragment.kt +++ b/app/src/main/java/com/deniscerri/ytdl/ui/more/terminal/TerminalFragment.kt @@ -128,11 +128,11 @@ class TerminalFragment : Fragment() { slider?.apply { valueFrom = 10f valueTo = 37f - value = sharedPreferences.getFloat("terminal_zoom", 35f) + value = sharedPreferences.getFloat("terminal_text_zoom", 35f) addOnChangeListener { _, value, _ -> terminalView.setTextSize(value.toInt()) - sharedPreferences.edit { putFloat("terminal_zoom", value) } + sharedPreferences.edit { putFloat("terminal_text_zoom", value) } } } @@ -289,42 +289,42 @@ class TerminalFragment : Fragment() { terminalView.doOnLayout { view -> if (!isAdded) return@doOnLayout - val termView = view as TerminalView - termView.setTextSize( - sharedPreferences.getFloat("terminal_zoom", 35f).toInt() - ) - termView.setTypeface(TerminalUtils.typeface) + termView.post { + val textSize = sharedPreferences.getFloat("terminal_text_zoom", 35f).toInt() + termView.setTextSize(if (textSize < 10) 10 else textSize) - termView.setTerminalViewClient(client) - termView.attachSession(session) + termView.setTypeface(TerminalUtils.typeface) + termView.setTerminalViewClient(client) + termView.attachSession(session) - termView.requestFocus() + termView.requestFocus() - val color = TerminalUtils.getViewColor(requireContext()) - val bgColor = TerminalUtils.getBackgroundColor(requireContext()) - termView.mEmulator?.mColors?.mCurrentColors?.apply { - set(256, color) - set(257, bgColor) - set(258, color) - } + val color = TerminalUtils.getViewColor(requireContext()) + val bgColor = TerminalUtils.getBackgroundColor(requireContext()) + termView.mEmulator?.mColors?.mCurrentColors?.apply { + set(256, color) + set(257, bgColor) + set(258, color) + } - terminalViewModel.virtualKeysView?.apply { - virtualKeysViewClient = terminalViewModel.terminalView?.mTermSession?.let { - VirtualKeysListener( - it - ) + terminalViewModel.virtualKeysView?.apply { + virtualKeysViewClient = terminalViewModel.terminalView?.mTermSession?.let { + VirtualKeysListener( + it + ) + } + buttonTextColor = TerminalUtils.getViewColor(requireContext()) + reload(VirtualKeysInfo(virtualKeys, "", VirtualKeysConstants.CONTROL_CHARS_ALIASES)) } - buttonTextColor = TerminalUtils.getViewColor(requireContext()) - reload(VirtualKeysInfo(virtualKeys, "", VirtualKeysConstants.CONTROL_CHARS_ALIASES)) - } - sessionShareURL?.apply { - CoroutineScope(Dispatchers.IO).launch { - delay(500) - withContext(Dispatchers.Main) { - session.write("yt-dlp \"$sessionShareURL\"") + sessionShareURL?.apply { + CoroutineScope(Dispatchers.IO).launch { + delay(500) + withContext(Dispatchers.Main) { + session.write("yt-dlp \"$sessionShareURL\"") + } } } } diff --git a/app/src/main/java/com/deniscerri/ytdl/util/BackupSettingsUtil.kt b/app/src/main/java/com/deniscerri/ytdl/util/BackupSettingsUtil.kt index f0bea32d..7853c42f 100644 --- a/app/src/main/java/com/deniscerri/ytdl/util/BackupSettingsUtil.kt +++ b/app/src/main/java/com/deniscerri/ytdl/util/BackupSettingsUtil.kt @@ -18,6 +18,7 @@ object BackupSettingsUtil { fun backupSettings(preferences: SharedPreferences) : JsonArray { runCatching { val prefs = preferences.all + prefs.remove("dlpVersion") prefs.remove("app_language") prefs.remove("cache_downloads") prefs.remove("use_alarm_for_scheduling")