diff --git a/.idea/deploymentTargetDropDown.xml b/.idea/deploymentTargetDropDown.xml
index 401569e5..52cce6f8 100644
--- a/.idea/deploymentTargetDropDown.xml
+++ b/.idea/deploymentTargetDropDown.xml
@@ -7,11 +7,11 @@
-
+
-
+
\ No newline at end of file
diff --git a/app/src/main/java/umc/com/mobile/project/ui/home/HomeFragment.kt b/app/src/main/java/umc/com/mobile/project/ui/home/HomeFragment.kt
index ce980b49..6987dc85 100644
--- a/app/src/main/java/umc/com/mobile/project/ui/home/HomeFragment.kt
+++ b/app/src/main/java/umc/com/mobile/project/ui/home/HomeFragment.kt
@@ -61,6 +61,9 @@ class HomeFragment : Fragment() {
binding.layoutNextPlan.setOnClickListener {
navigate(R.id.action_fragment_home_to_planSettingFragment)
}
+ binding.constraintLayout3.setOnClickListener {
+ navigate(R.id.action_fragment_home_to_planSettingFragment)
+ }
}
private fun setupRecyclerView() {
@@ -87,11 +90,9 @@ class HomeFragment : Fragment() {
/**
* 기본 정보
*/
- binding.tvName.text = it?.result?.name
- binding.tvStdId.text = it?.result?.id.toString()
- binding.tvSchool.text = it?.result?.department
- binding.tvGrade.text = it?.result?.grade
- binding.tvStatus.text = it?.result?.status
+ binding.tvNameStdId.text = "${it?.result?.name} ${it?.result?.id.toString()}"
+ binding.tvSchool.text = "한성대학교 ${it?.result?.department}"
+ binding.tvGradeStatus.text = "${it?.result?.grade} ${it?.result?.status}"
binding.tvGraduateDday.text = it?.result?.dday.toString()
binding.tvCheeringWord.text = it?.result?.message
diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml
index 29b250bb..7b854dcb 100644
--- a/app/src/main/res/layout/activity_login.xml
+++ b/app/src/main/res/layout/activity_login.xml
@@ -74,7 +74,8 @@
android:paddingTop="18dp"
android:paddingBottom="18dp"
android:singleLine="true"
- android:text="@={vm.id}" />
+ android:text="@={vm.id}"
+ android:theme="@style/EditText.DarkMode" />
@@ -114,7 +115,8 @@
android:paddingTop="18dp"
android:paddingBottom="18dp"
android:singleLine="true"
- android:text="@={vm.pw}" />
+ android:text="@={vm.pw}"
+ android:theme="@style/EditText.DarkMode" />
diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml
index 315c3a26..f2c0a06e 100644
--- a/app/src/main/res/layout/fragment_home.xml
+++ b/app/src/main/res/layout/fragment_home.xml
@@ -107,7 +107,7 @@
-
-
-
-
+ app:layout_constraintTop_toBottomOf="@+id/tv_name_stdId" />
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index 676b1094..06dbe6fc 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -44,4 +44,9 @@
- @drawable/custom_dialog_background
- @android:color/transparent
+
+
+
\ No newline at end of file