From 43c1046f022b99957a7012cf894eac80ddd908fb Mon Sep 17 00:00:00 2001 From: tateisu Date: Mon, 22 Nov 2021 08:20:21 +0900 Subject: [PATCH] =?UTF-8?q?=E3=82=AB=E3=83=A9=E3=83=BC=E3=83=94=E3=83=83?= =?UTF-8?q?=E3=82=AB=E3=83=BC=E3=81=AE=E6=96=87=E5=AD=97=E5=88=97=E8=A7=A3?= =?UTF-8?q?=E9=87=88=E3=82=92=E5=A4=89=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../androidTest/java/jp/juggler/subwaytooter/TestColorString.kt | 2 +- .../main/java/com/jrummyapps/android/colorpicker/ColorString.kt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/src/androidTest/java/jp/juggler/subwaytooter/TestColorString.kt b/app/src/androidTest/java/jp/juggler/subwaytooter/TestColorString.kt index 674dd933..c50d909c 100644 --- a/app/src/androidTest/java/jp/juggler/subwaytooter/TestColorString.kt +++ b/app/src/androidTest/java/jp/juggler/subwaytooter/TestColorString.kt @@ -17,7 +17,7 @@ class TestColorString { } a("", Color.BLACK) a("8", Color.BLACK or 0x88_88_88) - a("56", Color.BLACK or 0x55_66_00) + a("56", Color.BLACK or 0x55_66_80) a("123", Color.BLACK or 0x11_22_33) a("1234", 0x11_22_33_44) a("12345", Color.BLACK or 0x12_34_55) diff --git a/colorpicker/src/main/java/com/jrummyapps/android/colorpicker/ColorString.kt b/colorpicker/src/main/java/com/jrummyapps/android/colorpicker/ColorString.kt index 77b33a9a..501ba04a 100644 --- a/colorpicker/src/main/java/com/jrummyapps/android/colorpicker/ColorString.kt +++ b/colorpicker/src/main/java/com/jrummyapps/android/colorpicker/ColorString.kt @@ -15,7 +15,7 @@ fun parseColorString(src: String): Int { return when (src.length - start) { 0 -> Color.BLACK 1 -> Color.argb(255, c1(0), c1(0), c1(0)) - 2 -> Color.argb(255, c1(0), c1(1), 0) + 2 -> Color.argb(255, c1(0), c1(1), 0x80) 3 -> Color.argb(255, c1(0), c1(1), c1(2)) 4 -> Color.argb(c1(0), c1(1), c1(2), c1(3)) 5 -> Color.argb(255, c2(0), c2(2), c1(4))