[skip ci] Formatting

2026-01-31 07:54:19 +01:00 · 2024-09-03 21:37:18 -04:00
parent e968a2195a
commit 6c1fbfa63b
220 changed files with 2493 additions and 2519 deletions
--- a/AndroidCompat/src/main/java/xyz/nulldev/androidcompat/config/ApplicationInfoConfigModule.kt
+++ b/AndroidCompat/src/main/java/xyz/nulldev/androidcompat/config/ApplicationInfoConfigModule.kt
@@ -8,7 +8,9 @@ import xyz.nulldev.ts.config.ConfigModule
 * Application info config.
 */

-class ApplicationInfoConfigModule(getConfig: () -> Config) : ConfigModule(getConfig) {
+class ApplicationInfoConfigModule(
+    getConfig: () -> Config,
+) : ConfigModule(getConfig) {
    val packageName: String by getConfig()
    val debug: Boolean by getConfig()

--- a/AndroidCompat/src/main/java/xyz/nulldev/androidcompat/config/FilesConfigModule.kt
+++ b/AndroidCompat/src/main/java/xyz/nulldev/androidcompat/config/FilesConfigModule.kt
@@ -8,7 +8,9 @@ import xyz.nulldev.ts.config.ConfigModule
 * Files configuration modules. Specifies where to store the Android files.
 */

-class FilesConfigModule(getConfig: () -> Config) : ConfigModule(getConfig) {
+class FilesConfigModule(
+    getConfig: () -> Config,
+) : ConfigModule(getConfig) {
    val dataDir: String by getConfig()
    val filesDir: String by getConfig()
    val noBackupFilesDir: String by getConfig()
--- a/AndroidCompat/src/main/java/xyz/nulldev/androidcompat/config/SystemConfigModule.kt
+++ b/AndroidCompat/src/main/java/xyz/nulldev/androidcompat/config/SystemConfigModule.kt
@@ -4,7 +4,9 @@ import com.typesafe.config.Config
 import io.github.config4k.getValue
 import xyz.nulldev.ts.config.ConfigModule

-class SystemConfigModule(val getConfig: () -> Config) : ConfigModule(getConfig) {
+class SystemConfigModule(
+    val getConfig: () -> Config,
+) : ConfigModule(getConfig) {
    val isDebuggable: Boolean by getConfig()

    val propertyPrefix = "properties."
--- a/AndroidCompat/src/main/java/xyz/nulldev/androidcompat/db/ScrollableResultSet.kt
+++ b/AndroidCompat/src/main/java/xyz/nulldev/androidcompat/db/ScrollableResultSet.kt
@@ -19,7 +19,9 @@ import java.sql.Timestamp
 import java.util.Calendar

@Suppress("UNCHECKED_CAST")
-class ScrollableResultSet(val parent: ResultSet) : ResultSet by parent {
+class ScrollableResultSet(
+    val parent: ResultSet,
+) : ResultSet by parent {
    private val cachedContent = mutableListOf<ResultSetEntry>()
    private val columnCache = mutableMapOf<String, Int>()
    private var lastReturnWasNull = false
@@ -29,9 +31,10 @@ class ScrollableResultSet(val parent: ResultSet) : ResultSet by parent {
    val parentMetadata = parent.metaData
    val columnCount = parentMetadata.columnCount
    val columnLabels =
-        (1..columnCount).map {
-            parentMetadata.getColumnLabel(it)
-        }.toTypedArray()
+        (1..columnCount)
+            .map {
+                parentMetadata.getColumnLabel(it)
+            }.toTypedArray()

    init {
        val columnCount = columnCount
@@ -45,20 +48,17 @@ class ScrollableResultSet(val parent: ResultSet) : ResultSet by parent {
        while (parent.next()) {
            cachedContent +=
                ResultSetEntry().apply {
-                    for (i in 1..columnCount)
+                    for (i in 1..columnCount) {
                        data += parent.getObject(i)
+                    }
                }
            resultSetLength++
        }
    }

-    private fun notImplemented(): Nothing {
-        throw UnsupportedOperationException("This class currently does not support this operation!")
-    }
+    private fun notImplemented(): Nothing = throw UnsupportedOperationException("This class currently does not support this operation!")

-    private fun cursorValid(): Boolean {
-        return isAfterLast || isBeforeFirst
-    }
+    private fun cursorValid(): Boolean = isAfterLast || isBeforeFirst

    private fun internalMove(row: Int) {
        if (cursor < 0) {
@@ -76,22 +76,16 @@ class ScrollableResultSet(val parent: ResultSet) : ResultSet by parent {
        return obj
    }

-    private fun obj(column: String?): Any? {
-        return obj(cachedFindColumn(column))
-    }
+    private fun obj(column: String?): Any? = obj(cachedFindColumn(column))

    private fun cachedFindColumn(column: String?) =
        columnCache.getOrPut(column!!, {
            findColumn(column)
        })

-    override fun getNClob(columnIndex: Int): NClob {
-        return obj(columnIndex) as NClob
-    }
+    override fun getNClob(columnIndex: Int): NClob = obj(columnIndex) as NClob

-    override fun getNClob(columnLabel: String?): NClob {
-        return obj(columnLabel) as NClob
-    }
+    override fun getNClob(columnLabel: String?): NClob = obj(columnLabel) as NClob

    override fun updateNString(
        columnIndex: Int,
@@ -260,17 +254,11 @@ class ScrollableResultSet(val parent: ResultSet) : ResultSet by parent {
        notImplemented()
    }

-    override fun getBoolean(columnIndex: Int): Boolean {
-        return obj(columnIndex) as Boolean
-    }
+    override fun getBoolean(columnIndex: Int): Boolean = obj(columnIndex) as Boolean

-    override fun getBoolean(columnLabel: String?): Boolean {
-        return obj(columnLabel) as Boolean
-    }
+    override fun getBoolean(columnLabel: String?): Boolean = obj(columnLabel) as Boolean

-    override fun isFirst(): Boolean {
-        return cursor - 1 < resultSetLength
-    }
+    override fun isFirst(): Boolean = cursor - 1 < resultSetLength

    override fun getBigDecimal(
        columnIndex: Int,
@@ -288,13 +276,9 @@ class ScrollableResultSet(val parent: ResultSet) : ResultSet by parent {
        notImplemented()
    }

-    override fun getBigDecimal(columnIndex: Int): BigDecimal {
-        return obj(columnIndex) as BigDecimal
-    }
+    override fun getBigDecimal(columnIndex: Int): BigDecimal = obj(columnIndex) as BigDecimal

-    override fun getBigDecimal(columnLabel: String?): BigDecimal {
-        return obj(columnLabel) as BigDecimal
-    }
+    override fun getBigDecimal(columnLabel: String?): BigDecimal = obj(columnLabel) as BigDecimal

    override fun updateBytes(
        columnIndex: Int,
@@ -310,9 +294,7 @@ class ScrollableResultSet(val parent: ResultSet) : ResultSet by parent {
        notImplemented()
    }

-    override fun isLast(): Boolean {
-        return cursor == resultSetLength
-    }
+    override fun isLast(): Boolean = cursor == resultSetLength

    override fun insertRow() {
        notImplemented()
@@ -351,9 +333,7 @@ class ScrollableResultSet(val parent: ResultSet) : ResultSet by parent {
        return cursorValid()
    }

-    override fun isAfterLast(): Boolean {
-        return cursor > resultSetLength
-    }
+    override fun isAfterLast(): Boolean = cursor > resultSetLength

    override fun relative(rows: Int): Boolean {
        internalMove(cursor + rows)
@@ -365,8 +345,9 @@ class ScrollableResultSet(val parent: ResultSet) : ResultSet by parent {
            internalMove(row)
        } else {
            last()
-            for (i in 1..row)
+            for (i in 1..row) {
                previous()
+            }
        }
        return cursorValid()
    }
@@ -394,19 +375,13 @@ class ScrollableResultSet(val parent: ResultSet) : ResultSet by parent {
        return cursorValid()
    }

-    override fun getFloat(columnIndex: Int): Float {
-        return obj(columnIndex) as Float
-    }
+    override fun getFloat(columnIndex: Int): Float = obj(columnIndex) as Float

-    override fun getFloat(columnLabel: String?): Float {
-        return obj(columnLabel) as Float
-    }
+    override fun getFloat(columnLabel: String?): Float = obj(columnLabel) as Float

    override fun wasNull() = lastReturnWasNull

-    override fun getRow(): Int {
-        return cursor
-    }
+    override fun getRow(): Int = cursor

    override fun first(): Boolean {
        internalMove(1)
@@ -459,13 +434,9 @@ class ScrollableResultSet(val parent: ResultSet) : ResultSet by parent {
        notImplemented()
    }

-    override fun getURL(columnIndex: Int): URL {
-        return obj(columnIndex) as URL
-    }
+    override fun getURL(columnIndex: Int): URL = obj(columnIndex) as URL

-    override fun getURL(columnLabel: String?): URL {
-        return obj(columnLabel) as URL
-    }
+    override fun getURL(columnLabel: String?): URL = obj(columnLabel) as URL

    override fun updateShort(
        columnIndex: Int,
@@ -643,21 +614,13 @@ class ScrollableResultSet(val parent: ResultSet) : ResultSet by parent {
        notImplemented()
    }

-    override fun getByte(columnIndex: Int): Byte {
-        return obj(columnIndex) as Byte
-    }
+    override fun getByte(columnIndex: Int): Byte = obj(columnIndex) as Byte

-    override fun getByte(columnLabel: String?): Byte {
-        return obj(columnLabel) as Byte
-    }
+    override fun getByte(columnLabel: String?): Byte = obj(columnLabel) as Byte

-    override fun getString(columnIndex: Int): String? {
-        return obj(columnIndex) as String?
-    }
+    override fun getString(columnIndex: Int): String? = obj(columnIndex) as String?

-    override fun getString(columnLabel: String?): String? {
-        return obj(columnLabel) as String?
-    }
+    override fun getString(columnLabel: String?): String? = obj(columnLabel) as String?

    override fun updateSQLXML(
        columnIndex: Int,
@@ -687,13 +650,9 @@ class ScrollableResultSet(val parent: ResultSet) : ResultSet by parent {
        notImplemented()
    }

-    override fun getObject(columnIndex: Int): Any? {
-        return obj(columnIndex)
-    }
+    override fun getObject(columnIndex: Int): Any? = obj(columnIndex)

-    override fun getObject(columnLabel: String?): Any? {
-        return obj(columnLabel)
-    }
+    override fun getObject(columnLabel: String?): Any? = obj(columnLabel)

    override fun getObject(
        columnIndex: Int,
@@ -714,16 +673,12 @@ class ScrollableResultSet(val parent: ResultSet) : ResultSet by parent {
    override fun <T : Any?> getObject(
        columnIndex: Int,
        type: Class<T>?,
-    ): T {
-        return obj(columnIndex) as T
-    }
+    ): T = obj(columnIndex) as T

    override fun <T : Any?> getObject(
        columnLabel: String?,
        type: Class<T>?,
-    ): T {
-        return obj(columnLabel) as T
-    }
+    ): T = obj(columnLabel) as T

    override fun previous(): Boolean {
        internalMove(cursor - 1)
@@ -756,13 +711,9 @@ class ScrollableResultSet(val parent: ResultSet) : ResultSet by parent {
        }
    }

-    override fun getLong(columnIndex: Int): Long {
-        return castToLong(obj(columnIndex))
-    }
+    override fun getLong(columnIndex: Int): Long = castToLong(obj(columnIndex))

-    override fun getLong(columnLabel: String?): Long {
-        return castToLong(obj(columnLabel))
-    }
+    override fun getLong(columnLabel: String?): Long = castToLong(obj(columnLabel))

    override fun getClob(columnIndex: Int): Clob {
        // TODO Maybe?
@@ -840,13 +791,9 @@ class ScrollableResultSet(val parent: ResultSet) : ResultSet by parent {
        notImplemented()
    }

-    override fun getNString(columnIndex: Int): String {
-        return obj(columnIndex) as String
-    }
+    override fun getNString(columnIndex: Int): String = obj(columnIndex) as String

-    override fun getNString(columnLabel: String?): String {
-        return obj(columnLabel) as String
-    }
+    override fun getNString(columnLabel: String?): String = obj(columnLabel) as String

    override fun getArray(columnIndex: Int): Array {
        // TODO Maybe?
@@ -880,17 +827,11 @@ class ScrollableResultSet(val parent: ResultSet) : ResultSet by parent {
        notImplemented()
    }

-    override fun getCharacterStream(columnIndex: Int): Reader {
-        return getNCharacterStream(columnIndex)
-    }
+    override fun getCharacterStream(columnIndex: Int): Reader = getNCharacterStream(columnIndex)

-    override fun getCharacterStream(columnLabel: String?): Reader {
-        return getNCharacterStream(columnLabel)
-    }
+    override fun getCharacterStream(columnLabel: String?): Reader = getNCharacterStream(columnLabel)

-    override fun isBeforeFirst(): Boolean {
-        return cursor - 1 < resultSetLength
-    }
+    override fun isBeforeFirst(): Boolean = cursor - 1 < resultSetLength

    override fun updateBoolean(
        columnIndex: Int,
@@ -926,21 +867,13 @@ class ScrollableResultSet(val parent: ResultSet) : ResultSet by parent {
        notImplemented()
    }

-    override fun getShort(columnIndex: Int): Short {
-        return obj(columnIndex) as Short
-    }
+    override fun getShort(columnIndex: Int): Short = obj(columnIndex) as Short

-    override fun getShort(columnLabel: String?): Short {
-        return obj(columnLabel) as Short
-    }
+    override fun getShort(columnLabel: String?): Short = obj(columnLabel) as Short

-    override fun getAsciiStream(columnIndex: Int): InputStream {
-        return getBinaryStream(columnIndex)
-    }
+    override fun getAsciiStream(columnIndex: Int): InputStream = getBinaryStream(columnIndex)

-    override fun getAsciiStream(columnLabel: String?): InputStream {
-        return getBinaryStream(columnLabel)
-    }
+    override fun getAsciiStream(columnLabel: String?): InputStream = getBinaryStream(columnLabel)

    override fun updateTime(
        columnIndex: Int,
@@ -1008,13 +941,9 @@ class ScrollableResultSet(val parent: ResultSet) : ResultSet by parent {
        notImplemented()
    }

-    override fun getNCharacterStream(columnIndex: Int): Reader {
-        return getBinaryStream(columnIndex).reader()
-    }
+    override fun getNCharacterStream(columnIndex: Int): Reader = getBinaryStream(columnIndex).reader()

-    override fun getNCharacterStream(columnLabel: String?): Reader {
-        return getBinaryStream(columnLabel).reader()
-    }
+    override fun getNCharacterStream(columnLabel: String?): Reader = getBinaryStream(columnLabel).reader()

    override fun updateArray(
        columnIndex: Int,
@@ -1030,45 +959,27 @@ class ScrollableResultSet(val parent: ResultSet) : ResultSet by parent {
        notImplemented()
    }

-    override fun getBytes(columnIndex: Int): ByteArray {
-        return obj(columnIndex) as ByteArray
-    }
+    override fun getBytes(columnIndex: Int): ByteArray = obj(columnIndex) as ByteArray

-    override fun getBytes(columnLabel: String?): ByteArray {
-        return obj(columnLabel) as ByteArray
-    }
+    override fun getBytes(columnLabel: String?): ByteArray = obj(columnLabel) as ByteArray

-    override fun getDouble(columnIndex: Int): Double {
-        return obj(columnIndex) as Double
-    }
+    override fun getDouble(columnIndex: Int): Double = obj(columnIndex) as Double

-    override fun getDouble(columnLabel: String?): Double {
-        return obj(columnLabel) as Double
-    }
+    override fun getDouble(columnLabel: String?): Double = obj(columnLabel) as Double

-    override fun getUnicodeStream(columnIndex: Int): InputStream {
-        return getBinaryStream(columnIndex)
-    }
+    override fun getUnicodeStream(columnIndex: Int): InputStream = getBinaryStream(columnIndex)

-    override fun getUnicodeStream(columnLabel: String?): InputStream {
-        return getBinaryStream(columnLabel)
-    }
+    override fun getUnicodeStream(columnLabel: String?): InputStream = getBinaryStream(columnLabel)

    override fun rowInserted() = false

    private fun thisIsWrapperFor(iface: Class<*>?) = this.javaClass.isInstance(iface)

-    override fun isWrapperFor(iface: Class<*>?): Boolean {
-        return thisIsWrapperFor(iface) || parent.isWrapperFor(iface)
-    }
+    override fun isWrapperFor(iface: Class<*>?): Boolean = thisIsWrapperFor(iface) || parent.isWrapperFor(iface)

-    override fun getInt(columnIndex: Int): Int {
-        return obj(columnIndex) as Int
-    }
+    override fun getInt(columnIndex: Int): Int = obj(columnIndex) as Int

-    override fun getInt(columnLabel: String?): Int {
-        return obj(columnLabel) as Int
-    }
+    override fun getInt(columnLabel: String?): Int = obj(columnLabel) as Int

    override fun updateNull(columnIndex: Int) {
        notImplemented()
@@ -1088,8 +999,8 @@ class ScrollableResultSet(val parent: ResultSet) : ResultSet by parent {
        notImplemented()
    }

-    override fun getMetaData(): ResultSetMetaData {
-        return object : ResultSetMetaData by parentMetadata {
+    override fun getMetaData(): ResultSetMetaData =
+        object : ResultSetMetaData by parentMetadata {
            override fun isReadOnly(column: Int) = true

            override fun isWritable(column: Int) = false
@@ -1098,19 +1009,12 @@ class ScrollableResultSet(val parent: ResultSet) : ResultSet by parent {

            override fun getColumnCount() = this@ScrollableResultSet.columnCount

-            override fun getColumnLabel(column: Int): String {
-                return columnLabels[column - 1]
-            }
+            override fun getColumnLabel(column: Int): String = columnLabels[column - 1]
        }
-    }

-    override fun getBinaryStream(columnIndex: Int): InputStream {
-        return (obj(columnIndex) as ByteArray).inputStream()
-    }
+    override fun getBinaryStream(columnIndex: Int): InputStream = (obj(columnIndex) as ByteArray).inputStream()

-    override fun getBinaryStream(columnLabel: String?): InputStream {
-        return (obj(columnLabel) as ByteArray).inputStream()
-    }
+    override fun getBinaryStream(columnLabel: String?): InputStream = (obj(columnLabel) as ByteArray).inputStream()

    override fun updateCharacterStream(
        columnIndex: Int,
--- a/AndroidCompat/src/main/java/xyz/nulldev/androidcompat/info/ApplicationInfoImpl.kt
+++ b/AndroidCompat/src/main/java/xyz/nulldev/androidcompat/info/ApplicationInfoImpl.kt
@@ -8,7 +8,10 @@ import org.kodein.di.instance
 import xyz.nulldev.androidcompat.config.ApplicationInfoConfigModule
 import xyz.nulldev.ts.config.ConfigManager

-class ApplicationInfoImpl(override val di: DI = DI.global) : ApplicationInfo(), DIAware {
+class ApplicationInfoImpl(
+    override val di: DI = DI.global,
+) : ApplicationInfo(),
+    DIAware {
    val configManager: ConfigManager by di.instance()

    val appInfoConfig: ApplicationInfoConfigModule
--- a/AndroidCompat/src/main/java/xyz/nulldev/androidcompat/io/AndroidFiles.kt
+++ b/AndroidCompat/src/main/java/xyz/nulldev/androidcompat/io/AndroidFiles.kt
@@ -8,7 +8,9 @@ import java.io.File
 /**
 * Android file constants.
 */
-class AndroidFiles(val configManager: ConfigManager = GlobalConfigManager) {
+class AndroidFiles(
+    val configManager: ConfigManager = GlobalConfigManager,
+) {
    val filesConfig: FilesConfigModule
        get() = configManager.module()

@@ -30,9 +32,8 @@ class AndroidFiles(val configManager: ConfigManager = GlobalConfigManager) {

    val packagesDir: File get() = registerFile(filesConfig.packageDir)

-    fun registerFile(file: String): File {
-        return File(file).apply {
+    fun registerFile(file: String): File =
+        File(file).apply {
            mkdirs()
        }
-    }
 }
--- a/AndroidCompat/src/main/java/xyz/nulldev/androidcompat/io/sharedprefs/JavaSharedPreferences.kt
+++ b/AndroidCompat/src/main/java/xyz/nulldev/androidcompat/io/sharedprefs/JavaSharedPreferences.kt
@@ -30,7 +30,9 @@ import kotlin.io.path.inputStream
 import kotlin.io.path.outputStream

@OptIn(ExperimentalSerializationApi::class, ExperimentalSettingsApi::class)
-class JavaSharedPreferences(key: String) : SharedPreferences {
+class JavaSharedPreferences(
+    key: String,
+) : SharedPreferences {
    companion object {
        private val logger = KotlinLogging.logger {}
    }
@@ -72,20 +74,17 @@ class JavaSharedPreferences(key: String) : SharedPreferences {
    private val listeners = mutableMapOf<SharedPreferences.OnSharedPreferenceChangeListener, (String) -> Unit>()

    // TODO: 2021-05-29 Need to find a way to get this working with all pref types
-    override fun getAll(): MutableMap<String, *> {
-        return preferences.keys.associateWith { preferences.getStringOrNull(it) }.toMutableMap()
-    }
+    override fun getAll(): MutableMap<String, *> = preferences.keys.associateWith { preferences.getStringOrNull(it) }.toMutableMap()

    override fun getString(
        key: String,
        defValue: String?,
-    ): String? {
-        return if (defValue != null) {
+    ): String? =
+        if (defValue != null) {
            preferences.getString(key, defValue)
        } else {
            preferences.getStringOrNull(key)
        }
-    }

    override fun getStringSet(
        key: String,
@@ -105,50 +104,48 @@ class JavaSharedPreferences(key: String) : SharedPreferences {
    override fun getInt(
        key: String,
        defValue: Int,
-    ): Int {
-        return preferences.getInt(key, defValue)
-    }
+    ): Int = preferences.getInt(key, defValue)

    override fun getLong(
        key: String,
        defValue: Long,
-    ): Long {
-        return preferences.getLong(key, defValue)
-    }
+    ): Long = preferences.getLong(key, defValue)

    override fun getFloat(
        key: String,
        defValue: Float,
-    ): Float {
-        return preferences.getFloat(key, defValue)
-    }
+    ): Float = preferences.getFloat(key, defValue)

    override fun getBoolean(
        key: String,
        defValue: Boolean,
-    ): Boolean {
-        return preferences.getBoolean(key, defValue)
-    }
+    ): Boolean = preferences.getBoolean(key, defValue)

-    override fun contains(key: String): Boolean {
-        return key in preferences.keys
-    }
+    override fun contains(key: String): Boolean = key in preferences.keys

-    override fun edit(): SharedPreferences.Editor {
-        return Editor(preferences) { key ->
+    override fun edit(): SharedPreferences.Editor =
+        Editor(preferences) { key ->
            listeners.forEach { (_, listener) ->
                listener(key)
            }
        }
-    }

-    class Editor(private val preferences: Settings, private val notify: (String) -> Unit) : SharedPreferences.Editor {
+    class Editor(
+        private val preferences: Settings,
+        private val notify: (String) -> Unit,
+    ) : SharedPreferences.Editor {
        private val actions = mutableListOf<Action>()

        private sealed class Action {
-            data class Add(val key: String, val value: Any) : Action()
+            data class Add(
+                val key: String,
+                val value: Any,
+            ) : Action()
+
+            data class Remove(
+                val key: String,
+            ) : Action()

-            data class Remove(val key: String) : Action()
            data object Clear : Action()
        }

--- a/AndroidCompat/src/main/java/xyz/nulldev/androidcompat/pm/InstalledPackage.kt
+++ b/AndroidCompat/src/main/java/xyz/nulldev/androidcompat/pm/InstalledPackage.kt
@@ -14,7 +14,9 @@ import java.io.File
 import javax.imageio.ImageIO
 import javax.xml.parsers.DocumentBuilderFactory

-data class InstalledPackage(val root: File) {
+data class InstalledPackage(
+    val root: File,
+) {
    val apk = File(root, "package.apk")
    val jar = File(root, "translated.jar")
    val icon = File(root, "icon.png")
@@ -34,18 +36,21 @@ data class InstalledPackage(val root: File) {
                    Bundle().apply {
                        val appTag = doc.getElementsByTagName("application").item(0)

-                        appTag?.childNodes?.toList()?.filter {
-                            it.nodeType == Node.ELEMENT_NODE
-                        }?.map {
-                            it as Element
-                        }?.filter {
-                            it.tagName == "meta-data"
-                        }?.map {
-                            putString(
-                                it.attributes.getNamedItem("android:name").nodeValue,
-                                it.attributes.getNamedItem("android:value").nodeValue,
-                            )
-                        }
+                        appTag
+                            ?.childNodes
+                            ?.toList()
+                            ?.filter {
+                                it.nodeType == Node.ELEMENT_NODE
+                            }?.map {
+                                it as Element
+                            }?.filter {
+                                it.tagName == "meta-data"
+                            }?.map {
+                                putString(
+                                    it.attributes.getNamedItem("android:name").nodeValue,
+                                    it.attributes.getNamedItem("android:value").nodeValue,
+                                )
+                            }
                    }

                it.signatures =
@@ -53,12 +58,14 @@ data class InstalledPackage(val root: File) {
                        parsed.apkSingers.flatMap { it.certificateMetas }
                        // + parsed.apkV2Singers.flatMap { it.certificateMetas }
                    ) // Blocked by: https://github.com/hsiafan/apk-parser/issues/72
-                        .map { Signature(it.data) }.toTypedArray()
+                        .map { Signature(it.data) }
+                        .toTypedArray()
            }

    fun verify(): Boolean {
        val res =
-            ApkVerifier.Builder(apk)
+            ApkVerifier
+                .Builder(apk)
                .build()
                .verify()

@@ -70,11 +77,14 @@ data class InstalledPackage(val root: File) {
            val icons = ApkFile(apk).allIcons

            val read =
-                icons.filter { it.isFile }.map {
-                    it.data.inputStream().use {
-                        ImageIO.read(it)
-                    }
-                }.sortedByDescending { it.width * it.height }.firstOrNull() ?: return
+                icons
+                    .filter { it.isFile }
+                    .map {
+                        it.data.inputStream().use {
+                            ImageIO.read(it)
+                        }
+                    }.sortedByDescending { it.width * it.height }
+                    .firstOrNull() ?: return

            ImageIO.write(read, "png", icon)
        } catch (e: Exception) {
@@ -94,8 +104,9 @@ data class InstalledPackage(val root: File) {
        fun NodeList.toList(): List<Node> {
            val out = mutableListOf<Node>()

-            for (i in 0 until length)
+            for (i in 0 until length) {
                out += item(i)
+            }

            return out
        }
--- a/AndroidCompat/src/main/java/xyz/nulldev/androidcompat/pm/PackageController.kt
+++ b/AndroidCompat/src/main/java/xyz/nulldev/androidcompat/pm/PackageController.kt
@@ -57,13 +57,15 @@ class PackageController {
        }
    }

-    fun listInstalled(): List<InstalledPackage> {
-        return androidFiles.packagesDir.listFiles().orEmpty().filter {
-            it.isDirectory
-        }.map {
-            InstalledPackage(it)
-        }
-    }
+    fun listInstalled(): List<InstalledPackage> =
+        androidFiles.packagesDir
+            .listFiles()
+            .orEmpty()
+            .filter {
+                it.isDirectory
+            }.map {
+                InstalledPackage(it)
+            }

    fun deletePackage(pack: InstalledPackage) {
        if (!pack.root.exists()) error("Package was never installed!")
--- a/AndroidCompat/src/main/java/xyz/nulldev/androidcompat/pm/PackageUtil.kt
+++ b/AndroidCompat/src/main/java/xyz/nulldev/androidcompat/pm/PackageUtil.kt
@@ -6,18 +6,19 @@ import android.content.pm.PackageInfo
 import net.dongliu.apk.parser.bean.ApkMeta
 import java.io.File

-fun ApkMeta.toPackageInfo(apk: File): PackageInfo {
-    return PackageInfo().also {
+fun ApkMeta.toPackageInfo(apk: File): PackageInfo =
+    PackageInfo().also {
        it.packageName = packageName
        it.versionCode = versionCode.toInt()
        it.versionName = versionName

        it.reqFeatures =
-            usesFeatures.map {
-                FeatureInfo().apply {
-                    name = it.name
-                }
-            }.toTypedArray()
+            usesFeatures
+                .map {
+                    FeatureInfo().apply {
+                        name = it.name
+                    }
+                }.toTypedArray()

        it.applicationInfo =
            ApplicationInfo().apply {
@@ -26,4 +27,3 @@ fun ApkMeta.toPackageInfo(apk: File): PackageInfo {
                sourceDir = apk.absolutePath
            }
    }
-}
--- a/AndroidCompat/src/main/java/xyz/nulldev/androidcompat/res/DrawableResource.kt
+++ b/AndroidCompat/src/main/java/xyz/nulldev/androidcompat/res/DrawableResource.kt
@@ -1,6 +1,8 @@
 package xyz.nulldev.androidcompat.res

-class DrawableResource(val location: String) : Resource {
+class DrawableResource(
+    val location: String,
+) : Resource {
    override fun getType() = DrawableResource::class.java

    override fun getValue() = javaClass.getResourceAsStream(location)
--- a/AndroidCompat/src/main/java/xyz/nulldev/androidcompat/res/StringResource.kt
+++ b/AndroidCompat/src/main/java/xyz/nulldev/androidcompat/res/StringResource.kt
@@ -19,7 +19,9 @@ package xyz.nulldev.androidcompat.res
 /**
 * String resource.
 */
-class StringResource(val string: String) : Resource {
+class StringResource(
+    val string: String,
+) : Resource {
    override fun getValue() = string

    override fun getType() = StringResource::class.java
--- a/AndroidCompat/src/main/java/xyz/nulldev/androidcompat/util/KodeinGlobalHelper.kt
+++ b/AndroidCompat/src/main/java/xyz/nulldev/androidcompat/util/KodeinGlobalHelper.kt
@@ -29,8 +29,8 @@ object KodeinGlobalHelper {
    fun <T : Any> instance(
        type: Class<T>,
        kodein: DI? = null,
-    ): T {
-        return when (type) {
+    ): T =
+        when (type) {
            AndroidFiles::class.java -> {
                val instance: AndroidFiles by (kodein ?: kodein()).instance()
                instance as T
@@ -61,10 +61,7 @@ object KodeinGlobalHelper {
            }
            else -> throw IllegalArgumentException("Kodein instance not found")
        }
-    }

    @JvmStatic
-    fun <T : Any> instance(type: Class<T>): T {
-        return instance(type, null)
-    }
+    fun <T : Any> instance(type: Class<T>): T = instance(type, null)
 }
--- a/AndroidCompat/src/main/java/xyz/nulldev/androidcompat/webkit/CookieManagerImpl.kt
+++ b/AndroidCompat/src/main/java/xyz/nulldev/androidcompat/webkit/CookieManagerImpl.kt
@@ -18,9 +18,7 @@ class CookieManagerImpl : CookieManager() {
        acceptCookie = accept
    }

-    override fun acceptCookie(): Boolean {
-        return acceptCookie
-    }
+    override fun acceptCookie(): Boolean = acceptCookie

    override fun setAcceptThirdPartyCookies(
        webview: WebView?,
@@ -29,9 +27,7 @@ class CookieManagerImpl : CookieManager() {
        acceptThirdPartyCookies = accept
    }

-    override fun acceptThirdPartyCookies(webview: WebView?): Boolean {
-        return acceptThirdPartyCookies
-    }
+    override fun acceptThirdPartyCookies(webview: WebView?): Boolean = acceptThirdPartyCookies

    override fun setCookie(
        url: String,
@@ -65,7 +61,8 @@ class CookieManagerImpl : CookieManager() {
            } else {
                URI("http://$url")
            }
-        return cookieHandler.cookieStore.get(uri)
+        return cookieHandler.cookieStore
+            .get(uri)
            .joinToString("; ") { "${it.name}=${it.value}" }
    }

@@ -87,15 +84,11 @@ class CookieManagerImpl : CookieManager() {
        callback?.onReceiveValue(removedCookies)
    }

-    override fun hasCookies(): Boolean {
-        return cookieHandler.cookieStore.cookies.isNotEmpty()
-    }
+    override fun hasCookies(): Boolean = cookieHandler.cookieStore.cookies.isNotEmpty()

    override fun flush() {}

-    override fun allowFileSchemeCookiesImpl(): Boolean {
-        return allowFileSchemeCookies
-    }
+    override fun allowFileSchemeCookiesImpl(): Boolean = allowFileSchemeCookies

    override fun setAcceptFileSchemeCookiesImpl(accept: Boolean) {
        allowFileSchemeCookies = acceptCookie