feat: support 128 x 128 or higher resolution skin image on 2D view

Author: gomsang

.idea/misc.xml

@@ -15,7 +15,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             app:halfview="true"
-            app:scale="32" />
+            app:scale="48" />
 
         <dev.storeforminecraft.skinviewandroid.library.twodimension.ui.FlatSkinView
             android:layout_width="wrap_content"
@@ -32,7 +32,8 @@
         <dev.storeforminecraft.skinviewandroid.library.twodimension.ui.FlatSkinView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            app:scale="32" />
+            app:scale="32"
+            app:skin="@raw/steve" />
 
         <dev.storeforminecraft.skinviewandroid.library.twodimension.ui.FlatSkinView
             android:layout_width="wrap_content"

app/src/main/res/layout/activity_flat_skin_view_test.xml

@@ -6,6 +6,7 @@ import dev.storeforminecraft.skinviewandroid.library.datas.ModelSourceTextureTyp
 
 data class SteveFrontTexture(
     val texType: ModelSourceTextureType,
+    val skinImageScale : Int = 1,
     var head: Bitmap,
     var hat: Bitmap,
     var torso: Bitmap,

library/src/main/java/dev/storeforminecraft/skinviewandroid/library/twodimension/texture/SteveFrontTexture.kt

@@ -1,31 +1,38 @@
 package dev.storeforminecraft.skinviewandroid.library.twodimension.texture
 
 import android.graphics.Bitmap
+import androidx.core.graphics.scale
 import dev.storeforminecraft.skinviewandroid.library.datas.ModelSourceTextureType
 
 object SteveTextureUtil {
     fun getSteveFrontTex(skin: Bitmap): SteveFrontTexture {
         val texType =
             if (skin.width == skin.height) ModelSourceTextureType.RATIO_1_1 else ModelSourceTextureType.RATIO_2_1
+
+        val scale =
+            if (skin.width >= 64 && texType == ModelSourceTextureType.RATIO_1_1) skin.width / 64 else 1
+
         val tex = if (texType == ModelSourceTextureType.RATIO_1_1) {
             SteveFrontTexture(
                 texType = texType,
-                head = Bitmap.createBitmap(skin, 8, 8, 8, 8),
-                hat = Bitmap.createBitmap(skin, 40, 8, 8, 8),
-                torso = Bitmap.createBitmap(skin, 20, 20, 8, 12),
-                torso2nd = Bitmap.createBitmap(skin, 20, 36, 8, 12),
-                leftArm = Bitmap.createBitmap(skin, 36, 52, 4, 12),
-                leftArm2nd = Bitmap.createBitmap(skin, 52, 52, 4, 12),
-                rightArm = Bitmap.createBitmap(skin, 44, 20, 4, 12),
-                rightArm2nd = Bitmap.createBitmap(skin, 44, 36, 4, 12),
-                leftLeg = Bitmap.createBitmap(skin, 20, 52, 4, 12),
-                leftLeg2nd = Bitmap.createBitmap(skin, 4, 52, 4, 12),
-                rightLeg = Bitmap.createBitmap(skin, 4, 20, 4, 12),
-                rightLeg2nd = Bitmap.createBitmap(skin, 4, 36, 4, 12)
+                skinImageScale = scale,
+                head = Bitmap.createBitmap(skin, 8 * scale, 8 * scale, 8 * scale, 8 * scale),
+                hat = Bitmap.createBitmap(skin, 40 * scale, 8 * scale, 8 * scale, 8 * scale),
+                torso = Bitmap.createBitmap(skin, 20 * scale, 20 * scale, 8 * scale, 12 * scale),
+                torso2nd = Bitmap.createBitmap(skin, 20 * scale, 36 * scale, 8 * scale, 12 * scale),
+                rightArm = Bitmap.createBitmap(skin, 36 * scale, 52 * scale, 4 * scale, 12 * scale),
+                rightArm2nd = Bitmap.createBitmap(skin, 52 * scale, 52 * scale, 4 * scale, 12 * scale),
+                leftArm = Bitmap.createBitmap(skin, 44 * scale, 20 * scale, 4 * scale, 12 * scale),
+                leftArm2nd = Bitmap.createBitmap(skin, 44 * scale, 36 * scale, 4 * scale, 12 * scale),
+                rightLeg = Bitmap.createBitmap(skin, 20 * scale, 52 * scale, 4 * scale, 12 * scale),
+                rightLeg2nd = Bitmap.createBitmap(skin, 4 * scale, 52 * scale, 4 * scale, 12 * scale),
+                leftLeg = Bitmap.createBitmap(skin, 4 * scale, 20 * scale, 4 * scale, 12 * scale),
+                leftLeg2nd = Bitmap.createBitmap(skin, 4 * scale, 36 * scale, 4 * scale, 12 * scale)
             )
         } else {
             SteveFrontTexture(
                 texType = texType,
+                skinImageScale = 1,
                 head = Bitmap.createBitmap(skin, 8, 8, 8, 8),
                 hat = Bitmap.createBitmap(skin, 40, 8, 8, 8),
                 torso = Bitmap.createBitmap(skin, 20, 20, 8, 12),

library/src/main/java/dev/storeforminecraft/skinviewandroid/library/twodimension/texture/SteveTextureUtil.kt

@@ -5,6 +5,7 @@ import android.graphics.*
 import android.util.AttributeSet
 import android.view.View
 import dev.storeforminecraft.skinviewandroid.library.R
+import dev.storeforminecraft.skinviewandroid.library.datas.ModelSourceTextureType
 import dev.storeforminecraft.skinviewandroid.library.twodimension.texture.SteveFrontTexture
 import dev.storeforminecraft.skinviewandroid.library.twodimension.texture.SteveTextureUtil
 import java.io.IOException
@@ -74,7 +75,7 @@ class FlatSkinView : View {
 
     fun renderSkin(bitmap: Bitmap) {
         steveFrontTex = SteveTextureUtil.getSteveFrontTex(bitmap).apply {
-            scale(scale)
+            scale(scale / skinImageScale)
         }
         bitmap.recycle()
         invalidate()
@@ -84,9 +85,15 @@ class FlatSkinView : View {
         super.onMeasure(widthMeasureSpec, heightMeasureSpec)
 
         if (halfSkinMode)
-            setMeasuredDimension(16 * scale + (offsetX * 2), 32 * scale / 2)
+            setMeasuredDimension(
+                16 * scale + (offsetX * 2),
+                32 * scale / 2
+            )
         else
-            setMeasuredDimension(16 * scale + (offsetX * 2), 32 * scale + (offsetY * 2))
+            setMeasuredDimension(
+                16 * scale + (offsetX * 2),
+                32 * scale + (offsetY * 2)
+            )
     }
 
     override fun onDraw(canvas: Canvas?) {