From 973074c02fc1bda226586803381fb423a21c51cf Mon Sep 17 00:00:00 2001 From: kimyujin-com <80165026+kimyujin-com@users.noreply.github.com> Date: Sun, 18 Feb 2024 11:08:31 +0900 Subject: [PATCH 1/3] =?UTF-8?q?Remove:=20=EC=A1=B8=EC=97=85=20=EC=98=88?= =?UTF-8?q?=EC=A0=95=EC=9D=BC=20=ED=86=A0=EC=8A=A4=ED=8A=B8=20=EB=A9=94?= =?UTF-8?q?=EC=8B=9C=EC=A7=80=20=EC=82=AD=EC=A0=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/umc/com/mobile/project/ui/board/GradDateFragment.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/java/umc/com/mobile/project/ui/board/GradDateFragment.kt b/app/src/main/java/umc/com/mobile/project/ui/board/GradDateFragment.kt index f7e6487..06265c9 100644 --- a/app/src/main/java/umc/com/mobile/project/ui/board/GradDateFragment.kt +++ b/app/src/main/java/umc/com/mobile/project/ui/board/GradDateFragment.kt @@ -69,7 +69,7 @@ class GradDateFragment : Fragment() { val date = originalFormat.parse(dateString) val formattedDate = targetFormat.format(date) viewModel.updateDateInfo(formattedDate) - Toast.makeText(context, "저장되었습니다.", Toast.LENGTH_LONG).show() + //Toast.makeText(context, "저장되었습니다.", Toast.LENGTH_LONG).show() navigate(R.id.action_fragment_date_to_fragment_home) viewModel.onEditButtonClick() } catch (e: ParseException) { From 18ed985a2a09d919533537b466e10a8f122c9bd8 Mon Sep 17 00:00:00 2001 From: kimyujin-com <80165026+kimyujin-com@users.noreply.github.com> Date: Sun, 18 Feb 2024 11:17:28 +0900 Subject: [PATCH 2/3] =?UTF-8?q?Fix:=20=EC=A1=B8=EC=97=85=20=EC=98=88?= =?UTF-8?q?=EC=A0=95=EC=9D=BC,=20=EC=BB=A4=EB=A6=AC=EC=96=B4=20xml=20conte?= =?UTF-8?q?xt=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/main/res/layout/fragment_career.xml | 2 +- app/src/main/res/layout/fragment_grad_date.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/src/main/res/layout/fragment_career.xml b/app/src/main/res/layout/fragment_career.xml index 0cac486..2076eee 100644 --- a/app/src/main/res/layout/fragment_career.xml +++ b/app/src/main/res/layout/fragment_career.xml @@ -4,7 +4,7 @@ xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="match_parent" - tools:context=".ui.setting.SettingFragment"> + tools:context="ui.career.CareerFragment"> + tools:context=".ui.board.GradDateFragment"> Date: Sun, 18 Feb 2024 11:29:07 +0900 Subject: [PATCH 3/3] =?UTF-8?q?Remove:=20=EC=A1=B8=EC=97=85=EC=98=88?= =?UTF-8?q?=EC=A0=95=EC=9D=BC=20=EB=B6=88=ED=95=84=EC=9A=94=20=EC=BD=94?= =?UTF-8?q?=EB=93=9C=20=EC=82=AD=EC=A0=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/mobile/project/ui/board/viewmodel/GradDateViewModel.kt | 3 --- 1 file changed, 3 deletions(-) diff --git a/app/src/main/java/umc/com/mobile/project/ui/board/viewmodel/GradDateViewModel.kt b/app/src/main/java/umc/com/mobile/project/ui/board/viewmodel/GradDateViewModel.kt index cceeef1..70e8fdd 100644 --- a/app/src/main/java/umc/com/mobile/project/ui/board/viewmodel/GradDateViewModel.kt +++ b/app/src/main/java/umc/com/mobile/project/ui/board/viewmodel/GradDateViewModel.kt @@ -126,9 +126,6 @@ class GradDateViewModel : ViewModel() { val formattedDate = targetFormat.format(date) _selectedDateRequest.value = formattedDate } - if (_dateResponse2.value != null && _dateResponse2.value!!.result != null) { - _selectedDate.value = _dateResponse2.value!!.result.gradDate - } Log.d("gradDate", "${response.body()}") } else { _error.postValue("서버 응답이 올바르지 않습니다.")