misc: sync some changes from main repo + remove config.os.pkgs

Author: Toni500github

app/src/main/java/org/toni/customfetch_android_lib/Config.kt

@@ -49,15 +49,6 @@ data class OsUptimeConfig(
     @SerialName("secs") var secondsFormat: String = " seconds"
 )
 
-@Serializable
-data class OsPkgsConfig(
-    @SerialName("pkg-managers") var pkgManagers: ArrayList<String> = arrayListOf("pacman", "dpkg", "flatpak"),
-    @SerialName("pacman-dirs") var pacmanDirs: ArrayList<String> = arrayListOf("/var/lib/pacman/local/"),
-    @SerialName("dpkg-files") var dpkgFiles: ArrayList<String> = arrayListOf("/var/lib/dpkg/status", "/data/data/com.termux/files/usr/var/lib/dpkg/status"),
-    @SerialName("flatpak-dirs") var flatpakDirs: ArrayList<String> = arrayListOf("/var/lib/flatpak/app/", "~/.local/share/flatpak/app/"),
-    @SerialName("apk-files") var apkFiles: ArrayList<String> = arrayListOf("/var/lib/apk/db/installed")
-)
-
 @Serializable
 data class GuiConfig(
     @SerialName("font") var font: String = "Monospace 12",
@@ -88,7 +79,6 @@ data class Config(
     @SerialName("config") val t: ConfigTable = ConfigTable(),
     @SerialName("auto.disk") val autoDisk: AutoDiskConfig = AutoDiskConfig(),
     @SerialName("os.uptime") val osUptime: OsUptimeConfig = OsUptimeConfig(),
-    @SerialName("os.pkgs") val osPkgs: OsPkgsConfig = OsPkgsConfig(),
     @SerialName("gui") val gui: GuiConfig = GuiConfig(),
 )
 

app/src/main/java/org/toni/customfetch_android_lib/LongFile.kt

@@ -497,27 +497,6 @@ hours = " hours"
 mins  = " mins"
 secs  = " seconds"
 
-# ${'$'}<os.pkgs> config
-[os.pkgs]
-# Ordered list of which packages installed count should be displayed in ${'$'}<os.pkgs>
-# remember to not enter the same name twice, else the world will finish
-# Choices: pacman, flatpak, dpkg, apk
-#
-# Pro-tip: if your package manager isn't listed here, yet,
-# use the bash command tag in the layout
-# e.g "Packages: ${'$'}(pacman -Q | wc -l) (pacman)"
-pkg-managers = ["pacman", "dpkg", "flatpak"]
-
-# Distros and package manager specific
-# package manager paths for getting the packages count from path.
-# They are arrays so you can add multiple paths.
-#
-# If you don't know what these ares, leave them by default settings
-pacman-dirs  = ["/var/lib/pacman/local/"]
-dpkg-files   = ["/var/lib/dpkg/status", "/data/data/com.termux/files/usr/var/lib/dpkg/status"]
-flatpak-dirs = ["/var/lib/flatpak/app/", "~/.local/share/flatpak/app/"]
-apk-files    = ["/var/lib/apk/db/installed"]
-
 # Desktop/Android app options
 [gui]
 
@@ -529,7 +508,7 @@ font = "Liberation Mono Normal 12"
 
 # These are the colors you can use in the GUI mode.
 # They overwrite the terminal colors from above.
-# They can only have hexcodes colors
+# They can only have hex codes colors
 black   = "!#000005"
 red     = "!#ff2000"
 green   = "!#00ff00"

app/src/main/java/org/toni/customfetch_android_lib/Main.kt

@@ -154,7 +154,7 @@ private fun manageConfigStuff(context: Context, config: Config) {
     config.autoDisk.displayTypes.let {
         if (it.contains("regular"))
             config.autoDisk.displayTypesInt = config.autoDisk.displayTypesInt or DiskVolumeType.REGULAR.value
-        if (it.contains("removable"))
+        if (it.contains("removable") || it.contains("external"))
             config.autoDisk.displayTypesInt = config.autoDisk.displayTypesInt or DiskVolumeType.EXTERNAL.value
         if (it.contains("hidden"))
             config.autoDisk.displayTypesInt = config.autoDisk.displayTypesInt or DiskVolumeType.HIDDEN.value
@@ -170,23 +170,6 @@ private fun detectDistroFile(config: Config): String {
     return "${config.t.dataDir}/ascii/android.txt"
 }
 
-fun mainRenderStr(context: Context, argsStr: String): String {
-    createConfig()
-    val args = argsStr.split(' ').toTypedArray()
-    val toml = Toml {
-        ignoreUnknownKeys = true
-    }
-    val tomlConfig = Paths.get(parseConfigArg(context, args)).readText()
-        .replace("\\e[", "\\u001B[") // Escape ANSI codes
-    val config: Config
-    try {
-        config = toml.decodeFromString(Config.serializer(), tomlConfig)
-    } catch (e: SerializationException) {
-        return e.message.toString()
-    }
-    return parseArgs(context, args, config)
-}
-
 private fun tokenizeUserCommand(input: String): Array<String> {
     val tokens = mutableListOf<String>()
     val current = StringBuilder()
@@ -220,6 +203,25 @@ private fun tokenizeUserCommand(input: String): Array<String> {
     return tokens.toTypedArray()
 }
 
+fun mainRenderStr(context: Context, argsStr: String): String {
+    createConfig()
+
+    val args = tokenizeUserCommand(argsStr)
+    val toml = Toml {
+        ignoreUnknownKeys = true
+    }
+    val tomlConfig = Paths.get(parseConfigArg(context, args)).readText()
+        .replace("\\e[", "\\u001B[") // Escape ANSI codes
+    val config: Config
+    try {
+        config = toml.decodeFromString(Config.serializer(), tomlConfig)
+    } catch (e: SerializationException) {
+        return e.message.toString()
+    }
+    return parseArgs(context, args, config)
+}
+
+
 fun mainRender(context: Context, appWidgetId: Int, argsStr: String): List<SpannableStringBuilder> {
     createConfig()