From b51fbc49159d68cc085d3ff7fbd601340b0e5309 Mon Sep 17 00:00:00 2001 From: Azalea <22280294+hykilpikonna@users.noreply.github.com> Date: Sun, 26 Oct 2025 14:30:31 +0800 Subject: [PATCH] [O] Imports --- .../src/main/java/aza/instant/AddressUtil.kt | 6 +++--- .../app/src/main/java/aza/instant/SvgUtil.kt | 6 +----- .../src/main/java/aza/instant/UploadWorker.kt | 1 - .../java/aza/instant/network/BackendClient.kt | 20 +++++++++++-------- .../main/java/aza/instant/ui/theme/Theme.kt | 1 - 5 files changed, 16 insertions(+), 18 deletions(-) diff --git a/android/app/src/main/java/aza/instant/AddressUtil.kt b/android/app/src/main/java/aza/instant/AddressUtil.kt index 9c23488..5017d98 100644 --- a/android/app/src/main/java/aza/instant/AddressUtil.kt +++ b/android/app/src/main/java/aza/instant/AddressUtil.kt @@ -2,15 +2,15 @@ package aza.instant -import io.ktor.client.* +import io.ktor.client.HttpClient import io.ktor.client.call.body import io.ktor.client.engine.cio.CIO -import io.ktor.client.plugins.contentnegotiation.* +import io.ktor.client.plugins.contentnegotiation.ContentNegotiation import io.ktor.client.request.get import io.ktor.client.request.header import io.ktor.client.request.parameter import io.ktor.http.HttpHeaders -import io.ktor.serialization.kotlinx.json.* +import io.ktor.serialization.kotlinx.json.json import kotlinx.serialization.InternalSerializationApi import kotlinx.serialization.Serializable import kotlinx.serialization.json.Json diff --git a/android/app/src/main/java/aza/instant/SvgUtil.kt b/android/app/src/main/java/aza/instant/SvgUtil.kt index fc681e1..846bc68 100644 --- a/android/app/src/main/java/aza/instant/SvgUtil.kt +++ b/android/app/src/main/java/aza/instant/SvgUtil.kt @@ -1,9 +1,6 @@ package aza.instant import android.content.Context -import android.graphics.Bitmap -import android.graphics.Canvas -import android.graphics.Color import android.graphics.Picture import android.graphics.Typeface import androidx.core.content.res.ResourcesCompat @@ -12,7 +9,6 @@ import com.caverock.androidsvg.SVGExternalFileResolver import qrcode.QRCode import qrcode.raw.ErrorCorrectionLevel import java.io.ByteArrayOutputStream -import java.io.File import java.util.Base64 import kotlin.io.path.Path import kotlin.io.path.readBytes @@ -60,5 +56,5 @@ class FontResolver(private val context: Context) : SVGExternalFileResolver() { fun renderSvgAndroid(context: Context, svg: String): Picture? { SVG.registerExternalFileResolver(FontResolver(context)) - return SVG.getFromString(svg).renderToPicture(6192 / 6, 4128 / 6) + return SVG.getFromString(svg).renderToPicture(7133 / 2, 4904 / 2) } diff --git a/android/app/src/main/java/aza/instant/UploadWorker.kt b/android/app/src/main/java/aza/instant/UploadWorker.kt index dbffc27..84f5c54 100644 --- a/android/app/src/main/java/aza/instant/UploadWorker.kt +++ b/android/app/src/main/java/aza/instant/UploadWorker.kt @@ -3,7 +3,6 @@ package aza.instant import android.app.NotificationChannel import android.app.NotificationManager import android.content.Context -import android.os.Build import androidx.core.app.NotificationCompat import androidx.work.CoroutineWorker import androidx.work.WorkerParameters diff --git a/android/app/src/main/java/aza/instant/network/BackendClient.kt b/android/app/src/main/java/aza/instant/network/BackendClient.kt index bae571a..8ea4aae 100644 --- a/android/app/src/main/java/aza/instant/network/BackendClient.kt +++ b/android/app/src/main/java/aza/instant/network/BackendClient.kt @@ -1,15 +1,19 @@ package aza.instant.network -import io.ktor.client.* -import io.ktor.client.engine.cio.* +import io.ktor.client.HttpClient +import io.ktor.client.engine.cio.CIO import io.ktor.client.plugins.HttpTimeoutConfig -import io.ktor.client.plugins.contentnegotiation.* +import io.ktor.client.plugins.contentnegotiation.ContentNegotiation import io.ktor.client.plugins.timeout -import io.ktor.client.request.* -import io.ktor.client.request.forms.* -import io.ktor.client.statement.* -import io.ktor.http.* -import io.ktor.serialization.kotlinx.json.* +import io.ktor.client.request.forms.MultiPartFormDataContent +import io.ktor.client.request.forms.append +import io.ktor.client.request.forms.formData +import io.ktor.client.request.headers +import io.ktor.client.request.post +import io.ktor.client.request.setBody +import io.ktor.client.statement.HttpResponse +import io.ktor.http.ContentType +import io.ktor.serialization.kotlinx.json.json import kotlinx.serialization.json.Json import java.io.File diff --git a/android/app/src/main/java/aza/instant/ui/theme/Theme.kt b/android/app/src/main/java/aza/instant/ui/theme/Theme.kt index 5c34126..f9059ad 100644 --- a/android/app/src/main/java/aza/instant/ui/theme/Theme.kt +++ b/android/app/src/main/java/aza/instant/ui/theme/Theme.kt @@ -1,6 +1,5 @@ package aza.instant.ui.theme -import android.app.Activity import android.os.Build import androidx.compose.foundation.isSystemInDarkTheme import androidx.compose.material3.MaterialTheme