diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 61f3c27..bb6dca9 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -5,6 +5,7 @@ () { } 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 index eea1e77..b2d4c86 100644 --- 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"> @@ -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 index 6d4c131..3b53e56 100644 --- 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"/>