aiden
/
ytdl-android
mirror of https://github.com/deniscerri/ytdlnis
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' into fix-terminal-oom

Browse Source
pull/1352/head
deniscerri 2 weeks ago committed by GitHub
parent 7358829fc0 f025651bbd
commit 8f6b654d85
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
9 changed files with 73 additions and 75 deletions
Show Stats Download Patch File Download Diff File

14
app/src/main/java/com/deniscerri/ytdl/core/packages/Aria2c.kt
Unescape Escape View File

@ -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"
}

14
app/src/main/java/com/deniscerri/ytdl/core/packages/Deno.kt
Unescape Escape View File

@ -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"
}

14
app/src/main/java/com/deniscerri/ytdl/core/packages/FFmpeg.kt
Unescape Escape View File

@ -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"
}

14
app/src/main/java/com/deniscerri/ytdl/core/packages/NodeJS.kt
Unescape Escape View File

@ -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 """

14
app/src/main/java/com/deniscerri/ytdl/core/packages/Python.kt
Unescape Escape View File

@ -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"
}

14
app/src/main/java/com/deniscerri/ytdl/core/packages/QuickJS.kt
Unescape Escape View File

@ -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 = ""
}

2
app/src/main/java/com/deniscerri/ytdl/database/viewmodel/TerminalViewModel.kt
Unescape Escape View File

@ -59,7 +59,7 @@ class TerminalViewModel(private val application: Application) : AndroidViewModel
terminal.setBackgroundColor(android.graphics.Color.TRANSPARENT)
val storedZoom = PreferenceManager.getDefaultSharedPreferences(context)
.getFloat("terminal_zoom", 35f)
.getFloat("terminal_text_zoom", 35f)
val zoom = if (storedZoom.isFinite()) storedZoom.coerceIn(10f, 37f) else 35f
terminal.setTextSize(zoom.toInt())
terminal.setTypeface(TerminalUtils.typeface)

61
app/src/main/java/com/deniscerri/ytdl/ui/more/terminal/TerminalFragment.kt
Unescape Escape View File

@ -68,7 +68,7 @@ class TerminalFragment : Fragment() {
private var sessionId: String? = null
private fun terminalZoom(): Int {
val zoom = sharedPreferences.getFloat("terminal_zoom", 35f)
val zoom = sharedPreferences.getFloat("terminal_text_zoom", 35f)
return if (zoom.isFinite()) zoom.coerceIn(10f, 37f).toInt() else 35
}
@ -137,7 +137,7 @@ class TerminalFragment : Fragment() {
addOnChangeListener { _, value, _ ->
terminalView.setTextSize(value.toInt())
sharedPreferences.edit { putFloat("terminal_zoom", value) }
sharedPreferences.edit { putFloat("terminal_text_zoom", value) }
}
}
@ -294,44 +294,41 @@ class TerminalFragment : Fragment() {
terminalView.doOnLayout { view ->
if (!isAdded) return@doOnLayout
val termView = view as TerminalView
if (termView.width <= 0 || termView.height <= 0) return@doOnLayout
termView.setTextSize(
terminalZoom()
)
termView.setTypeface(TerminalUtils.typeface)
termView.post {
termView.setTextSize(terminalZoom())
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\"")
}
}
}
}

1
app/src/main/java/com/deniscerri/ytdl/util/BackupSettingsUtil.kt
Unescape Escape View File

@ -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")

Write Preview
Loading…
Cancel
Save