Merge pull request #96 from FOR-GRAD/14-커리어

14 커리어
FOR-GRAD · Feb 18, 2024 · b047dbc · b047dbc
2 parents 2b42d91 + f428c94
commit b047dbc
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 6 deletions.
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
@@ -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) {

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
@@ -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("서버 응답이 올바르지 않습니다.")

diff --git 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">
 
     <androidx.appcompat.widget.LinearLayoutCompat
         android:layout_width="match_parent"

diff --git a/app/src/main/res/layout/fragment_grad_date.xml b/app/src/main/res/layout/fragment_grad_date.xml
@@ -14,7 +14,7 @@
     <androidx.core.widget.NestedScrollView
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        tools:context=".ui.setting.SettingFragment">
+        tools:context=".ui.board.GradDateFragment">
 
         <androidx.constraintlayout.widget.ConstraintLayout
             android:layout_width="match_parent"