Skip to content

Commit 157fb15

Browse files
authored
Update MainActivity.kt
1 parent 08bea77 commit 157fb15

File tree

1 file changed

+8
-5
lines changed

1 file changed

+8
-5
lines changed

app/src/main/java/com/rabimi/javaskinchanger/MainActivity.kt

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ class MainActivity : Activity() {
5353
switchModel = findViewById(R.id.switchModel)
5454
lblModel = findViewById(R.id.lblModel)
5555
progressBar = findViewById(R.id.progressBar)
56-
skinView = findViewById(R.id.imgSkin) // ImageView に接続
56+
skinView = findViewById(R.id.imgSkin)
5757

5858
setupUI()
5959
checkLogin()
@@ -66,7 +66,6 @@ class MainActivity : Activity() {
6666
btnUpload.visibility = View.GONE
6767
progressBar.visibility = View.GONE
6868

69-
// モデル切替(ラベルのみ変更、画像は同じ)
7069
switchModel.setOnCheckedChangeListener { _, isChecked ->
7170
lblModel.text = if (isChecked) "モデル: Alex" else "モデル: Steve"
7271
}
@@ -106,7 +105,7 @@ class MainActivity : Activity() {
106105

107106
scope.launch {
108107
val skinBitmap = fetchMinecraftSkin(mcToken)
109-
val bmp = skinBitmap ?: Bitmap.createBitmap(64, 64, Bitmap.Config.ARGB_8888).apply { eraseColor(0xFFFF0000.toInt()) }
108+
val bmp = resizeTo64(skinBitmap ?: Bitmap.createBitmap(64, 64, Bitmap.Config.ARGB_8888).apply { eraseColor(0xFFFF0000.toInt()) })
110109
currentSkinBitmap = bmp
111110
skinView.setImageBitmap(bmp)
112111
}
@@ -132,13 +131,17 @@ class MainActivity : Activity() {
132131
skinConn.readTimeout = 10000
133132
val bmp = BitmapFactory.decodeStream(skinConn.inputStream) ?: return@withContext null
134133

135-
Bitmap.createScaledBitmap(bmp, 64, 64, true)
134+
resizeTo64(bmp)
136135
} catch (e: Exception) {
137136
e.printStackTrace()
138137
null
139138
}
140139
}
141140

141+
private fun resizeTo64(bitmap: Bitmap): Bitmap {
142+
return Bitmap.createScaledBitmap(bitmap.copy(Bitmap.Config.ARGB_8888, true), 64, 64, true)
143+
}
144+
142145
private fun selectSkinImage() {
143146
val intent = Intent(Intent.ACTION_GET_CONTENT).apply { type = "image/*" }
144147
startActivityForResult(Intent.createChooser(intent, "スキンを選択"), REQUEST_SKIN_PICK)
@@ -150,7 +153,7 @@ class MainActivity : Activity() {
150153
val uri = data?.data ?: return
151154
try {
152155
val orig = MediaStore.Images.Media.getBitmap(contentResolver, uri)
153-
val bmp = Bitmap.createScaledBitmap(orig.copy(Bitmap.Config.ARGB_8888, true), 64, 64, true)
156+
val bmp = resizeTo64(orig)
154157
currentSkinBitmap = bmp
155158
skinView.setImageBitmap(bmp)
156159

0 commit comments

Comments
 (0)