chore: 使皮肤头像、披风预览绘制更清晰

Author: MovTery

ZalithLauncher/src/main/java/com/movtery/zalithlauncher/ui/screens/content/elements/AccountElements.kt

@@ -89,6 +89,7 @@ import androidx.compose.ui.graphics.Color.Companion.Transparent
 import androidx.compose.ui.graphics.asImageBitmap
 import androidx.compose.ui.graphics.graphicsLayer
 import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.platform.LocalDensity
 import androidx.compose.ui.platform.LocalFocusManager
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
@@ -101,6 +102,8 @@ import androidx.compose.ui.text.input.PasswordVisualTransformation
 import androidx.compose.ui.text.input.VisualTransformation
 import androidx.compose.ui.text.withStyle
 import androidx.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.unit.Density
+import androidx.compose.ui.unit.Dp
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.viewinterop.AndroidView
 import androidx.compose.ui.window.Dialog
@@ -137,7 +140,6 @@ import com.movtery.zalithlauncher.ui.components.PlayerSkin
 import com.movtery.zalithlauncher.ui.components.RadioCard
 import com.movtery.zalithlauncher.ui.components.SimpleAlertDialog
 import com.movtery.zalithlauncher.ui.components.SimpleListDialog
-import com.movtery.zalithlauncher.ui.components.SimpleListItem
 import com.movtery.zalithlauncher.ui.components.SingleLineTextCheck
 import com.movtery.zalithlauncher.ui.components.fadeEdge
 import com.movtery.zalithlauncher.ui.screens.main.control_editor.InfoLayoutTextItem
@@ -242,8 +244,8 @@ sealed interface OtherLoginOperation {
 @Composable
 fun AccountAvatar(
     modifier: Modifier = Modifier,
-    avatarSize: Int = 64,
     account: Account?,
+    avatarSize: Dp = 64.dp,
     refreshKey: Any? = null,
     onClick: () -> Unit = {}
 ) {
@@ -294,19 +296,18 @@ fun AccountAvatar(
 fun PlayerFace(
     modifier: Modifier = Modifier,
     account: Account,
-    avatarSize: Int = 64,
+    avatarSize: Dp = 64.dp,
     refreshKey: Any? = null
 ) {
     val context = LocalContext.current
+    val density = LocalDensity.current
     val refreshWardrobe by AccountsManager.refreshWardrobe.collectAsStateWithLifecycle()
-    val avatarBitmap = remember(account, refreshKey, refreshWardrobe) {
-        getSkinAvatarFromAccount(context, account, avatarSize).asImageBitmap()
+    val avatarBitmap = remember(account, refreshKey, refreshWardrobe, density) {
+        getSkinAvatarFromAccount(context, account, avatarSize, density).asImageBitmap()
     }
 
-    val newAvatarSize = avatarBitmap.width.dp
-
     Image(
-        modifier = modifier.size(newAvatarSize),
+        modifier = modifier.size(avatarSize),
         bitmap = avatarBitmap,
         contentDescription = null
     )
@@ -317,6 +318,7 @@ fun AccountItem(
     modifier: Modifier = Modifier,
     currentAccount: Account?,
     account: Account,
+    avatarSize: Dp = 46.dp,
     color: Color = itemColor(),
     contentColor: Color = onItemColor(),
     enabled: Boolean = true,
@@ -360,7 +362,7 @@ fun AccountItem(
             PlayerFace(
                 modifier = Modifier.align(Alignment.CenterVertically),
                 account = account,
-                avatarSize = 46,
+                avatarSize = avatarSize,
                 refreshKey = refreshKey
             )
             Spacer(modifier = Modifier.width(18.dp))
@@ -1516,9 +1518,12 @@ fun SelectCapeDialog(
     capes: List<PlayerProfile.Cape>,
     selectedCape: PlayerProfile.Cape?,
     onSelected: (PlayerProfile.Cape, translatedName: String) -> Unit,
-    onDismiss: () -> Unit
+    onDismiss: () -> Unit,
+    capeSize: Dp = 32.dp,
 ) {
     val context = LocalContext.current
+    val density = LocalDensity.current
+
     val capeLocals = remember(capes) {
         buildMap {
             capes.forEach { cape ->
@@ -1543,27 +1548,15 @@ fun SelectCapeDialog(
         },
         current = selectedCape,
         itemLayout = { cape, isCurrent, text, onClick ->
-            val avatar = remember(cape) {
-                if (cape != EmptyCape) {
-                    getCapeAvatar(cape = cape, size = 32)
-                } else null
-            }
-            if (avatar != null) {
-                CapeListItem(
-                    selected = isCurrent,
-                    name = text,
-                    avatar = avatar,
-                    modifier = Modifier.fillMaxWidth(),
-                    onClick = onClick
-                )
-            } else {
-                SimpleListItem(
-                    selected = isCurrent,
-                    itemName = text,
-                    modifier = Modifier.fillMaxWidth(),
-                    onClick = onClick
-                )
-            }
+            CapeListItem(
+                modifier = Modifier.fillMaxWidth(),
+                selected = isCurrent,
+                cape = cape,
+                name = text,
+                size = capeSize,
+                density = density,
+                onClick = onClick,
+            )
         },
         onDismissRequest = { selected ->
             if (!selected) {
@@ -1577,10 +1570,22 @@ fun SelectCapeDialog(
 fun CapeListItem(
     modifier: Modifier = Modifier,
     selected: Boolean,
+    cape: PlayerProfile.Cape,
     name: String,
-    avatar: Bitmap,
-    onClick: () -> Unit = {}
+    size: Dp,
+    density: Density,
+    onClick: () -> Unit,
 ) {
+    val avatar = remember(cape, density) {
+        if (cape != EmptyCape) {
+            getCapeAvatar(
+                cape = cape,
+                size = size,
+                density = density
+            )?.asImageBitmap()
+        } else null
+    }
+
     Row(
         modifier = modifier
             .clip(shape = MaterialTheme.shapes.large)
@@ -1592,19 +1597,19 @@ fun CapeListItem(
             onClick = onClick
         )
 
-        val avatarBitmap = remember(avatar) {
-            avatar.asImageBitmap()
-        }
-
-        Image(
-            modifier = Modifier
-                .width(avatarBitmap.width.dp)
-                .height(avatarBitmap.height.dp),
-            bitmap = avatarBitmap,
-            contentDescription = null
-        )
+        if (avatar != null) {
+            val displayWidth = with(density) { avatar.width.toDp() }
+            val displayHeight = with(density) { avatar.height.toDp() }
+            Image(
+                modifier = Modifier
+                    .width(displayWidth)
+                    .height(displayHeight),
+                bitmap = avatar,
+                contentDescription = null
+            )
 
-        Spacer(Modifier.width(12.dp))
+            Spacer(Modifier.width(12.dp))
+        }
 
         Column(
             verticalArrangement = Arrangement.spacedBy(4.dp)
@@ -1617,14 +1622,18 @@ fun CapeListItem(
     }
 }
 
-private fun getCapeAvatar(cape: PlayerProfile.Cape, size: Int): Bitmap? {
+private fun getCapeAvatar(
+    cape: PlayerProfile.Cape,
+    size: Dp,
+    density: Density
+): Bitmap? {
     val capeFile = cape.getFile(PathManager.DIR_ACCOUNT_CAPE)
     if (capeFile.exists()) {
         runCatching {
-            Files.newInputStream(capeFile.toPath()).use { `is` ->
-                val bitmap = BitmapFactory.decodeStream(`is`)
+            Files.newInputStream(capeFile.toPath()).use { stream ->
+                val bitmap = BitmapFactory.decodeStream(stream)
                     ?: throw IOException("Failed to read the cape picture and try to parse it to a bitmap")
-                return getCapeAvatar(bitmap, size)
+                return getCapeAvatar(bitmap, size, density)
             }
         }.onFailure { e ->
             Logger.error(TAG, "Failed to load cape avatar from locally!", e)
@@ -1633,42 +1642,66 @@ private fun getCapeAvatar(cape: PlayerProfile.Cape, size: Int): Bitmap? {
     return null
 }
 
-private fun getCapeAvatar(cape: Bitmap, size: Int): Bitmap {
+private fun getCapeAvatar(
+    cape: Bitmap,
+    size: Dp,
+    density: Density
+): Bitmap {
+    val pixelSize = with(density) { size.roundToPx() }
     val scaleFactor = cape.width / 64.0f
     val start = scaleFactor.roundToInt()
     val capeWidth = (10 * scaleFactor).roundToInt()
     val capeHeight = (16 * scaleFactor).roundToInt()
     val capeBitmap = Bitmap.createBitmap(cape, start, start, capeWidth, capeHeight, null, false)
-    val scale = size.toFloat() / capeHeight
+    val scale = pixelSize.toFloat() / capeHeight
     val matrix = Matrix()
     matrix.postScale(scale, scale)
     return Bitmap.createBitmap(capeBitmap, 0, 0, capeBitmap.width, capeBitmap.height, matrix, false)
 }
 
-private fun getSkinAvatarFromAccount(context: Context, account: Account, size: Int): Bitmap {
+private fun getSkinAvatarFromAccount(
+    context: Context,
+    account: Account,
+    size: Dp,
+    density: Density
+): Bitmap {
     val skin = account.getSkinFile()
     if (skin.exists()) {
         runCatching {
-            Files.newInputStream(skin.toPath()).use { `is` ->
-                val bitmap = BitmapFactory.decodeStream(`is`)
+            Files.newInputStream(skin.toPath()).use { stream ->
+                val bitmap = BitmapFactory.decodeStream(stream)
                     ?: throw IOException("Failed to read the skin picture and try to parse it to a bitmap")
-                return getSkinAvatar(bitmap, size)
+                return getSkinAvatar(bitmap, size, density)
             }
         }.onFailure { e ->
             Logger.error(TAG, "Failed to load skin avatar from locally!", e)
         }
     }
-    return getDefaultAvatar(context, size)
+    return getDefaultAvatar(context, size, density)
 }
 
 @Throws(Exception::class)
-private fun getDefaultAvatar(context: Context, size: Int): Bitmap {
-    val `is` = context.assets.open("steve.png")
-    return getSkinAvatar(BitmapFactory.decodeStream(`is`), size)
+private fun getDefaultAvatar(
+    context: Context,
+    size: Dp,
+    density: Density
+): Bitmap {
+    return getSkinAvatar(
+        skin = BitmapFactory.decodeStream(
+            context.assets.open("steve.png")
+        ),
+        size = size,
+        density = density
+    )
 }
 
-private fun getSkinAvatar(skin: Bitmap, size: Int): Bitmap {
-    val faceOffset = (size / 18.0).roundToInt().toFloat()
+private fun getSkinAvatar(
+    skin: Bitmap,
+    size: Dp,
+    density: Density
+): Bitmap {
+    val pixelSize = with(density) { size.roundToPx() }
+    val faceOffset = (pixelSize / 18.0).roundToInt().toFloat()
     val scaleFactor = skin.width / 64.0f
     val faceSize = (8 * scaleFactor).roundToInt()
     val faceBitmap = Bitmap.createBitmap(skin, faceSize, faceSize, faceSize, faceSize, null, false)
@@ -1681,17 +1714,18 @@ private fun getSkinAvatar(skin: Bitmap, size: Int): Bitmap {
         null,
         false
     )
-    val avatar = createBitmap(size, size)
+    val avatar = createBitmap(pixelSize, pixelSize)
     val canvas = android.graphics.Canvas(avatar)
-    val faceScale = ((size - 2 * faceOffset) / faceSize)
-    val hatScale = (size.toFloat() / faceSize)
+    val faceScale = ((pixelSize - 2 * faceOffset) / faceSize)
+    val hatScale = (pixelSize.toFloat() / faceSize)
+    val paint = Paint().apply { isFilterBitmap = false }
     var matrix = Matrix()
     matrix.postScale(faceScale, faceScale)
     val newFaceBitmap = Bitmap.createBitmap(faceBitmap, 0, 0, faceSize, faceSize, matrix, false)
     matrix = Matrix()
     matrix.postScale(hatScale, hatScale)
     val newHatBitmap = Bitmap.createBitmap(hatBitmap, 0, 0, faceSize, faceSize, matrix, false)
-    canvas.drawBitmap(newFaceBitmap, faceOffset, faceOffset, Paint(Paint.ANTI_ALIAS_FLAG))
-    canvas.drawBitmap(newHatBitmap, 0f, 0f, Paint(Paint.ANTI_ALIAS_FLAG))
+    canvas.drawBitmap(newFaceBitmap, faceOffset, faceOffset, paint)
+    canvas.drawBitmap(newHatBitmap, 0f, 0f, paint)
     return avatar
 }