Skip to content

Commit f0548bb

Browse files
rupy1014rupy1014
committed
bio card style update, submodule version update, gradle version update
1 parent 5d0f1e9 commit f0548bb

File tree

7 files changed

+48
-33
lines changed

7 files changed

+48
-33
lines changed

‎bootpay/build.gradle‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ android {
2525
}
2626

2727
dependencies {
28-
api 'com.google.android.material:material:1.0.0'
29-
implementation 'androidx.appcompat:appcompat:1.0.0'
28+
api 'com.google.android.material:material:1.4.0'
29+
implementation 'androidx.appcompat:appcompat:1.3.1'
3030
// implementation 'com.android.support:appcompat-v7:26.1.0'
3131
// https://mvnrepository.com/artifact/org.jetbrains.kotlin/kotlin-stdlib
3232

@@ -42,11 +42,11 @@ dependencies {
4242
// jitpack 배포시 아래 주석을 풀어서 사용
4343
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.3.31" // build for use kotlin in unity development
4444

45-
implementation 'com.google.code.gson:gson:2.8.5'
46-
implementation 'com.squareup.retrofit2:retrofit:2.6.0'
47-
implementation 'com.squareup.retrofit2:converter-gson:2.6.0'
48-
implementation 'com.squareup.retrofit2:converter-moshi:2.6.0'
49-
implementation 'com.squareup.retrofit2:adapter-rxjava2:2.6.0'
45+
implementation 'com.google.code.gson:gson:2.8.6'
46+
implementation 'com.squareup.retrofit2:retrofit:2.9.0'
47+
implementation 'com.squareup.retrofit2:converter-gson:2.9.0'
48+
implementation 'com.squareup.retrofit2:converter-moshi:2.9.0'
49+
implementation 'com.squareup.retrofit2:adapter-rxjava2:2.9.0'
5050

5151
implementation 'com.squareup.okhttp3:okhttp:4.9.0'
5252
implementation 'com.squareup.okhttp3:logging-interceptor:4.0.0'
@@ -58,9 +58,9 @@ dependencies {
5858

5959
implementation 'dev.samstevens.totp:totp:1.7'
6060
implementation 'androidx.biometric:biometric:1.0.1'
61-
implementation "androidx.constraintlayout:constraintlayout:2.0.0"
61+
implementation "androidx.constraintlayout:constraintlayout:2.1.3"
6262

63-
implementation "com.github.skydoves:powerspinner:1.1.5"
63+
implementation "com.github.skydoves:powerspinner:1.1.9"
6464
}
6565

6666
repositories {

‎bootpay/src/main/java/kr/co/bootpay/bio/CardCode.java‎

Lines changed: 21 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -37,41 +37,43 @@ public class CardCode {
3737
public static int getColorText(String code) {
3838
switch (code) {
3939
case BC:
40+
case SH:
41+
case HD:
4042
return R.color.card_bc;
4143
case KB:
4244
case HN:
4345
case SS:
4446
return R.color.white;
45-
case SH:
46-
return R.color.card_sh;
47-
case HD:
48-
return R.color.black;
4947
case LT:
50-
return R.color.card_lt;
48+
return R.color.white;
5149
case CT:
5250
return R.color.card_ct;
5351
case NH:
5452
return R.color.white;
5553
case SH2:
56-
return R.color.card_sh2;
54+
return R.color.white;
5755
case SH3:
58-
return R.color.card_sh3;
56+
return R.color.white;
5957
case GJ:
6058
return R.color.white;
59+
// case JB:
60+
// return R.color.card_jb;
6161
case JB:
62-
return R.color.card_jb;
6362
case JJ:
6463
case SHCPT:
65-
return R.color.card_jj;
64+
return R.color.card_bc;
65+
// return R.color.card_jj;
66+
// case GVS:
67+
// return R.color.card_gvs;
6668
case GVS:
67-
return R.color.card_gvs;
6869
case GMST:
6970
case GDNS:
70-
return R.color.card_gjcb;
71+
return R.color.card_bc;
7172
case GAMX:
7273
case GJCB:
7374
return R.color.white;
7475
case SKOK:
76+
return R.color.card_bc;
7577
case POST:
7678
return R.color.white;
7779
case SM:
@@ -94,38 +96,37 @@ public static int getColorText(String code) {
9496
public static int getColorBackground(String code) {
9597
switch (code) {
9698
case BC:
97-
return R.drawable.rounded_white;
99+
case SH:
100+
case HD:
101+
return R.drawable.card_bc;
98102
case KB:
99103
return R.drawable.card_kb;
100104
case HN:
101105
return R.drawable.card_hn;
102106
case SS:
103107
return R.drawable.card_ss;
104-
case SH:
105-
case HD:
106-
return R.drawable.rounded_white;
107108
case LT:
108-
return R.color.card_default;
109+
return R.drawable.card_lt;
109110
case CT:
110111
case SH2:
111112
case SH3:
112-
return R.drawable.rounded_white;
113+
return R.drawable.card_sh2;
113114
case GJ:
114115
return R.drawable.card_gj;
115116
case JB:
116117
case JJ:
117118
case SHCPT:
118-
return R.drawable.rounded_white;
119+
return R.color.card_bc;
119120
case GVS:
120121
case GMST:
121122
case GDNS:
122-
return R.drawable.card_default;
123+
return R.color.card_bc;
123124
case GAMX:
124125
return R.drawable.card_gamx;
125126
case GJCB:
126127
return R.drawable.card_gjcb;
127128
case SKOK:
128-
return R.drawable.card_default;
129+
return R.color.card_bc;
129130
case POST:
130131
return R.drawable.card_post;
131132
case SM:

‎bootpay/src/main/res/drawable/card_bc.xml‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<shape xmlns:android="http://schemas.android.com/apk/res/android">
3+
<stroke android:width="1dp" android:color="#22000000" />
4+
<solid android:color="#E4E3dE" />
5+
<corners android:radius="5dp"/>
6+
<padding android:left="10dp" android:top="10dp" android:right="10dp" android:bottom="10dp" />
7+
</shape>

‎bootpay/src/main/res/drawable/card_lt.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<shape xmlns:android="http://schemas.android.com/apk/res/android">
33
<stroke android:width="1dp" android:color="#22000000" />
4-
<solid android:color="#d91822" />
4+
<solid android:color="#F03760" />
55
<corners android:radius="5dp"/>
66
<padding android:left="10dp" android:top="10dp" android:right="10dp" android:bottom="10dp" />
77
</shape>

‎bootpay/src/main/res/drawable/card_sh2.xml‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<shape xmlns:android="http://schemas.android.com/apk/res/android">
3+
<stroke android:width="1dp" android:color="#22000000" />
4+
<solid android:color="#172A65" />
5+
<corners android:radius="5dp"/>
6+
<padding android:left="10dp" android:top="10dp" android:right="10dp" android:bottom="10dp" />
7+
</shape>

‎gradle/wrapper/gradle-wrapper.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-all.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-all.zip

‎local.properties‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,6 @@
44
# Location of the SDK. This is only used by Gradle.
55
# For customization when using a Version Control System, please read the
66
# header note.
7-
#Mon Feb 21 09:02:22 KST 2022
8-
sdk.dir=/Users/taesupyoon/Library/Android/sdk
7+
#Wed Apr 06 09:14:09 KST 2022
8+
sdk.dir=/Users/bootpay/Library/Android/sdk
99
ndk.dir=/Users/ehowlsla/Library/Android/sdk/ndk-bundle

0 commit comments

Comments
 (0)