Skip to content

Commit a832fd4

Browse files
mkw8263mkw8263
committed
import 정리
1 parent 38b04ec commit a832fd4

File tree

6 files changed

+233
-228
lines changed

6 files changed

+233
-228
lines changed

‎app/build.gradle‎

Lines changed: 15 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -19,15 +19,24 @@ android {
1919
buildConfigField "String", "BASE_URL", "\"${props['BASE_URL']}\""
2020
buildConfigField "String", "BASIC_AUTH_USER_NAME", "\"${props['BASIC_AUTH_USER_NAME']}\""
2121
buildConfigField "String", "BASIC_AUTH_USER_PASSWORD", "\"${props['BASIC_AUTH_USER_PASSWORD']}\""
22-
}
2322

23+
}
24+
signingConfigs {
25+
config {
26+
keyAlias SIGNED_KEY_ALIAS
27+
keyPassword SIGNED_KEY_PASSWORD
28+
storeFile file(SIGNED_STORE_FILE)
29+
storePassword SIGNED_STORE_PASSWORD
30+
}
31+
}
2432
buildTypes {
2533
release {
26-
minifyEnabled true
34+
minifyEnabled false
2735
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
36+
signingConfigs.config
2837
}
2938
debug {
30-
minifyEnabled true
39+
minifyEnabled false
3140
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
3241
}
3342
}
@@ -40,29 +49,26 @@ android {
4049
}
4150

4251
dependencies {
43-
implementation fileTree(dir: 'libs', include: ['*.jar'])
52+
implementation fileTree(include: ['*.jar'], dir: 'libs')
4453
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
4554
implementation 'androidx.appcompat:appcompat:1.1.0-alpha02'
4655
implementation 'androidx.constraintlayout:constraintlayout:2.0.0-alpha3'
47-
implementation "com.google.android.material:material:1.1.0-alpha03"
56+
implementation 'com.google.android.material:material:1.1.0-alpha03'
4857
testImplementation 'junit:junit:4.12'
4958
androidTestImplementation 'androidx.test:runner:1.1.1'
5059
androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.1'
51-
5260
// room
5361
def room_version = "2.1.0-alpha04"
5462
implementation "androidx.room:room-coroutines:$room_version"
5563
implementation "androidx.room:room-runtime:$room_version"
5664
kapt "androidx.room:room-compiler:$room_version"
57-
5865
// dagger2
5966
def dagger2_version = "2.21"
6067
implementation "com.google.dagger:dagger:$dagger2_version"
6168
implementation "com.google.dagger:dagger-android:$dagger2_version"
6269
implementation "com.google.dagger:dagger-android-support:$dagger2_version"
6370
kapt "com.google.dagger:dagger-android-processor:$dagger2_version"
6471
kapt "com.google.dagger:dagger-compiler:$dagger2_version"
65-
6672
// retrofit2
6773
implementation 'com.squareup.retrofit2:retrofit:2.5.0'
6874
implementation 'com.squareup.retrofit2:converter-gson:2.5.0'
@@ -73,10 +79,8 @@ dependencies {
7379
implementation 'com.google.code.gson:gson:2.8.5'
7480

7581
// aac viewModel
76-
implementation "androidx.lifecycle:lifecycle-extensions:2.0.0"
77-
82+
implementation 'androidx.lifecycle:lifecycle-extensions:2.0.0'
7883
// dataBinding kotlin option
7984
kapt "androidx.databinding:databinding-compiler:3.3.0"
80-
8185
implementation 'com.airbnb.android:lottie:3.0.0-beta2'
8286
}

‎app/src/main/java/com/ddd/attendance/check/vm/LoginViewModel.kt‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,8 @@ class LoginViewModel @Inject constructor(
6464
result.refreshToken
6565
)
6666
)
67-
}.run { _startActivity.postValue(MainActivity::class.java) }
67+
}
68+
_startActivity.postValue(MainActivity::class.java)
6869
} else {
6970
errorParsingDialog(response.errorBody()?.string())
7071
}

‎app/src/main/res/drawable/login_btn_possible.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<shape xmlns:android="http://schemas.android.com/apk/res/android"
33
android:shape="rectangle">
4-
<solid
5-
android:color="@android:color/black"/>
6-
<corners android:radius="6dp"/>
4+
<solid
5+
android:color="@android:color/black"/>
6+
<corners android:radius="6dp"/>
77
</shape>
88

‎app/src/main/res/layout/activity_login.xml‎

Lines changed: 57 additions & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -16,63 +16,63 @@
1616
tools:context=".ui.LoginActivity">
1717

1818
<TextView
19-
android:id="@+id/tvSpecialTitle"
20-
android:layout_width="wrap_content"
21-
android:layout_height="wrap_content"
22-
android:layout_marginTop="80dp"
23-
android:layout_marginBottom="16dp"
24-
android:text="@string/login_special_title"
25-
android:textColor="@color/login_special_title"
26-
android:textSize="26dp"
27-
app:layout_constraintBottom_toTopOf="@+id/tvMiddleTitle"
28-
app:layout_constraintLeft_toLeftOf="parent"
29-
app:layout_constraintTop_toTopOf="parent"
30-
app:layout_constraintVertical_bias="1"
31-
tools:ignore="SpUsage" />
19+
android:id="@+id/tvSpecialTitle"
20+
android:layout_width="wrap_content"
21+
android:layout_height="wrap_content"
22+
android:layout_marginTop="80dp"
23+
android:layout_marginBottom="16dp"
24+
android:text="@string/login_special_title"
25+
android:textColor="@color/login_special_title"
26+
android:textSize="26dp"
27+
app:layout_constraintBottom_toTopOf="@+id/tvMiddleTitle"
28+
app:layout_constraintLeft_toLeftOf="parent"
29+
app:layout_constraintTop_toTopOf="parent"
30+
app:layout_constraintVertical_bias="1"
31+
tools:ignore="SpUsage"/>
3232

3333
<TextView
34-
android:id="@+id/tvMiddleTitle"
35-
android:layout_width="wrap_content"
36-
android:layout_height="wrap_content"
37-
android:layout_marginBottom="16dp"
38-
android:text="@string/login_middle_title"
39-
android:textColor="@color/login_sub_title"
40-
android:textSize="26dp"
41-
app:layout_constraintBottom_toTopOf="@+id/tvBottomTitle"
42-
app:layout_constraintLeft_toLeftOf="@+id/tvSpecialTitle"
43-
tools:ignore="SpUsage" />
34+
android:id="@+id/tvMiddleTitle"
35+
android:layout_width="wrap_content"
36+
android:layout_height="wrap_content"
37+
android:layout_marginBottom="16dp"
38+
android:text="@string/login_middle_title"
39+
android:textColor="@color/login_sub_title"
40+
android:textSize="26dp"
41+
app:layout_constraintBottom_toTopOf="@+id/tvBottomTitle"
42+
app:layout_constraintLeft_toLeftOf="@+id/tvSpecialTitle"
43+
tools:ignore="SpUsage"/>
4444

4545
<TextView
46-
android:id="@+id/tvBottomTitle"
47-
android:layout_width="wrap_content"
48-
android:layout_height="wrap_content"
49-
android:layout_marginBottom="82dp"
50-
android:text="@string/login_bottom_title"
51-
android:textColor="@color/login_sub_title"
52-
android:textSize="26dp"
53-
app:layout_constraintBottom_toTopOf="@+id/editIDLayout"
54-
app:layout_constraintLeft_toLeftOf="@+id/tvMiddleTitle"
55-
tools:ignore="SpUsage" />
46+
android:id="@+id/tvBottomTitle"
47+
android:layout_width="wrap_content"
48+
android:layout_height="wrap_content"
49+
android:layout_marginBottom="82dp"
50+
android:text="@string/login_bottom_title"
51+
android:textColor="@color/login_sub_title"
52+
android:textSize="26dp"
53+
app:layout_constraintBottom_toTopOf="@+id/editIDLayout"
54+
app:layout_constraintLeft_toLeftOf="@+id/tvMiddleTitle"
55+
tools:ignore="SpUsage"/>
5656
<com.google.android.material.textfield.TextInputLayout
57-
android:id="@+id/editIDLayout"
58-
android:layout_width="match_parent"
59-
android:layout_height="wrap_content"
60-
android:hint="@string/login_input_id_hint"
61-
android:textColor="@android:color/black"
62-
android:textColorHint="@color/login_edit_hint"
63-
android:theme="@style/LoginEditTheme"
64-
app:layout_constraintBottom_toBottomOf="parent"
65-
app:layout_constraintLeft_toLeftOf="parent"
66-
app:layout_constraintRight_toRightOf="parent"
67-
app:layout_constraintTop_toTopOf="parent">
68-
<androidx.appcompat.widget.AppCompatEditText
69-
android:id="@+id/editID"
57+
android:id="@+id/editIDLayout"
7058
android:layout_width="match_parent"
71-
android:onTextChanged="@{(text, start, before, count) -> loginViewModel.onIDTextChanged(text)}"
72-
android:text="@={loginViewModel.editID}"
7359
android:layout_height="wrap_content"
74-
android:textSize="12dp"
75-
tools:ignore="SpUsage" />
60+
android:hint="@string/login_input_id_hint"
61+
android:textColor="@android:color/black"
62+
android:textColorHint="@color/login_edit_hint"
63+
android:theme="@style/LoginEditTheme"
64+
app:layout_constraintBottom_toBottomOf="parent"
65+
app:layout_constraintLeft_toLeftOf="parent"
66+
app:layout_constraintRight_toRightOf="parent"
67+
app:layout_constraintTop_toTopOf="parent">
68+
<androidx.appcompat.widget.AppCompatEditText
69+
android:id="@+id/editID"
70+
android:layout_width="match_parent"
71+
android:onTextChanged="@{(text, start, before, count) -> loginViewModel.onIDTextChanged(text)}"
72+
android:text="@={loginViewModel.editID}"
73+
android:layout_height="wrap_content"
74+
android:textSize="12dp"
75+
tools:ignore="SpUsage"/>
7676
</com.google.android.material.textfield.TextInputLayout>
7777
<com.google.android.material.textfield.TextInputLayout
7878
android:id="@+id/editPWLayout"
@@ -87,13 +87,13 @@
8787
app:layout_constraintTop_toBottomOf="@+id/editIDLayout"
8888
android:layout_height="wrap_content">
8989
<androidx.appcompat.widget.AppCompatEditText
90-
android:id="@+id/editPW"
91-
android:onTextChanged="@{(text, start, before, count) -> loginViewModel.onPWTextChanged(text)}"
92-
android:text="@={loginViewModel.editPW}"
93-
android:layout_width="match_parent"
94-
android:layout_height="wrap_content"
95-
android:textSize="12dp"
96-
tools:ignore="SpUsage" />
90+
android:id="@+id/editPW"
91+
android:onTextChanged="@{(text, start, before, count) -> loginViewModel.onPWTextChanged(text)}"
92+
android:text="@={loginViewModel.editPW}"
93+
android:layout_width="match_parent"
94+
android:layout_height="wrap_content"
95+
android:textSize="12dp"
96+
tools:ignore="SpUsage"/>
9797
</com.google.android.material.textfield.TextInputLayout>
9898

9999

0 commit comments

Comments
 (0)