Skip to content

Commit 098196e

Browse files
committed
android widget (misc): use popular version numbers instead of SDK + fix colors not being displayed in some cases + fix default ascii logo creation
1 parent 015ef23 commit 098196e

File tree

4 files changed

+7
-11
lines changed

4 files changed

+7
-11
lines changed

android/app/src/main/java/org/toni/customfetch_android_lib/Display.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ fun render(context: Context, appWidgetId: Int, config: Config, asciiFile: File):
1717

1818
val mimeType = Files.probeContentType(asciiFile.toPath())
1919
if (!mimeType.startsWith("text/"))
20-
die(context, "Customfetch android app does not support images as logos")
20+
die(context, "Customfetch widget app does not support images as logos")
2121

2222
for (i in 1..config.t.logoPaddingTop) {
2323
pureAsciiArtLens.add(0)

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -223,7 +223,7 @@ fun mainRender(context: Context, appWidgetId: Int, argsStr: String): List<Spanna
223223

224224
var filePath = File(path)
225225
if (!filePath.exists()) {
226-
filePath = File.createTempFile("prefix", "suffix")
226+
filePath = File.createTempFile("customfetch-ascii-logo_", ".txt")
227227
filePath.writeText("""
228228
${'$'}{green} ;, ,;
229229
${'$'}{green} ';,.-----.,;'
@@ -232,6 +232,7 @@ fun mainRender(context: Context, appWidgetId: Int, argsStr: String): List<Spanna
232232
${'$'}{green}| |
233233
${'$'}{green}'-----------------'
234234
""".trimIndent())
235+
filePath.deleteOnExit()
235236
}
236237

237238
Cpu.clearCache()

android/app/src/main/java/org/toni/customfetch_android_lib/Parse.kt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -475,6 +475,7 @@ object ParserFunctions {
475475
}
476476
}
477477
}
478+
currentSpans = null
478479

479480
return result
480481
}
@@ -637,7 +638,7 @@ fun addValueFromModuleMember(moduleName: String, moduleMemberName: String, parse
637638
"kernel" -> sysInfoInsert(querySystem.kernelName + " " + querySystem.kernelVersion)
638639
"kernel_name" -> sysInfoInsert(querySystem.kernelName)
639640
"kernel_version" -> sysInfoInsert(querySystem.kernelVersion)
640-
"packages", "pkgs" -> sysInfoInsert(querySystem.pkgsInstalled(config))
641+
"packages", "pkgs" -> sysInfoInsert(MAGIC_LINE)
641642
"initsys_name" -> sysInfoInsert(querySystem.osInitsysName)
642643
"initsys_version" -> sysInfoInsert(querySystem.osInitsysVersion)
643644
"hostname" -> sysInfoInsert(querySystem.hostname)

android/app/src/main/java/org/toni/customfetch_android_lib/query/System.kt

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ package org.toni.customfetch_android_lib.query
33
import android.os.Build
44
import android.os.SystemClock
55
import java.lang.System.getProperty
6-
import org.toni.customfetch_android_lib.Config
76
import org.toni.customfetch_android_lib.UNKNOWN
87

98
class System {
@@ -56,11 +55,6 @@ class System {
5655
val hostVendor: String get() = mSystemInfos.hostVendor
5756
val hostVersion: String get() = mSystemInfos.hostVersion
5857

59-
fun pkgsInstalled(config: Config): String {
60-
// implementation
61-
return mSystemInfos.pkgsInstalled
62-
}
63-
6458
init {
6559
if (!mBInit)
6660
mSystemInfos = getSystemInfos()
@@ -76,9 +70,9 @@ class System {
7670
hostname = "localhost",
7771
arch = Build.SUPPORTED_ABIS[0],
7872
uptime = SystemClock.uptimeMillis() / 1000,
79-
osVersionId = Build.VERSION.SDK_INT.toString(),
73+
osVersionId = Build.VERSION.RELEASE,
8074
osVersionCodename = Build.VERSION.CODENAME,
81-
osPrettyName = "Android " + Build.VERSION.CODENAME + " " + Build.VERSION.SDK_INT,
75+
osPrettyName = "Android " + Build.VERSION.CODENAME + " " + Build.VERSION.RELEASE,
8276
hostModelname = Build.BOARD,
8377
hostVendor = Build.MANUFACTURER,
8478
hostVersion = Build.MODEL,

0 commit comments

Comments
 (0)