Merge pull request #4 from DevelopDesignDayDay/dev

pie 버전 https 대응, ui 수정
DevelopDesignDayDay · Mar 31, 2019 · a14918e · a14918e
2 parents 3d8a19a + 0d6f6d5
commit a14918e
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 2 deletions.
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -5,6 +5,7 @@
     <uses-permission android:name="android.permission.INTERNET"/>
 
     <application
+            android:usesCleartextTraffic="true"
             android:name=".DDDApplication"
             android:allowBackup="false"
             android:icon="@drawable/icon"

diff --git a/app/src/main/java/com/ddd/attendance/check/ui/MainActivity.kt b/app/src/main/java/com/ddd/attendance/check/ui/MainActivity.kt
@@ -61,7 +61,7 @@ class MainActivity : DDDActivity<ActivityMainBinding, MainViewModel>() {
     }
 
     private fun btnAdminBackground(isAdmin: Boolean) {
-        val background = if (isAdmin) R.drawable.login_btn_impossible else R.drawable.login_btn_possible_admin
+        val background = if (isAdmin) R.drawable.login_btn_possible_admin else R.drawable.login_btn_impossible
         btnAdminAttendance.background = ContextCompat.getDrawable(this, background)
     }
 

diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml
@@ -20,6 +20,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="80dp"
+                android:textStyle="bold"
                 android:layout_marginBottom="16dp"
                 android:text="@string/login_special_title"
                 android:textColor="@color/login_special_title"
@@ -67,11 +68,13 @@
                 app:layout_constraintTop_toTopOf="parent">
             <androidx.appcompat.widget.AppCompatEditText
                     android:id="@+id/editID"
+                    android:maxLines="1"
                     android:layout_width="match_parent"
                     android:onTextChanged="@{(text, start, before, count) -> loginViewModel.onIDTextChanged(text)}"
                     android:text="@={loginViewModel.editID}"
                     android:layout_height="wrap_content"
                     android:textSize="12dp"
+                    android:inputType="text"
                     tools:ignore="SpUsage"/>
         </com.google.android.material.textfield.TextInputLayout>
         <com.google.android.material.textfield.TextInputLayout
@@ -93,6 +96,8 @@
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:textSize="12dp"
+                    android:inputType="textPassword"
+                    android:maxLines="1"
                     tools:ignore="SpUsage"/>
         </com.google.android.material.textfield.TextInputLayout>
 
@@ -105,6 +110,8 @@
                 android:enabled="@{safeUnbox(loginViewModel.btnEnableLogin)? true : false}"
                 android:onClick="@{()->loginViewModel.login()}"
                 android:text="@string/login"
+                android:shadowColor="#4c000000"
+                android:shadowRadius="50"
                 android:textColor="@android:color/white"
                 android:textSize="16dp"
                 app:layout_constraintTop_toBottomOf="@+id/editPWLayout"

diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
@@ -116,7 +116,7 @@
                 android:visibility="@{safeUnbox(mainViewModel.isAdmin)? View.VISIBLE : View.INVISIBLE}"
                 android:onClick="@{()->mainViewModel.attendance()}"
                 android:text="@{safeUnbox(mainViewModel.isAttendanceStart)? @string/attendance_end : @string/attendance_start}"
-                android:textColor="@{safeUnbox(mainViewModel.isAttendanceStart)? @color/white : @color/black}"
+                android:textColor="@{safeUnbox(mainViewModel.isAttendanceStart)? @color/black : @color/white}"
                 android:textSize="12dp"
                 app:layout_constraintBottom_toBottomOf="parent"
                 tools:ignore="SpUsage"/>