Merge pull request #171 from Semoban/feature/fix_medical_record_menu

fix: Bottom Navigation 진료기록 메뉴 클릭 시 다이얼로그 표시
Semoban · Mar 26, 2024 · acf5d33 · acf5d33
2 parents 89a6fa4 + 6f43fe7
commit acf5d33
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/app/src/main/java/com/project/meongcare/MainActivity.kt b/app/src/main/java/com/project/meongcare/MainActivity.kt
@@ -71,7 +71,8 @@ class MainActivity : AppCompatActivity() {
                             fragmentContainerView.findNavController().navigate(R.id.homeFragment)
                         }
                         else -> {
-                            fragmentContainerView.findNavController().navigate(R.id.medicalRecordFragment)
+                            showUpdateDialog()
+//                            fragmentContainerView.findNavController().navigate(R.id.medicalRecordFragment)
                         }
                     }
 
@@ -81,7 +82,8 @@ class MainActivity : AppCompatActivity() {
                     if (menuItem.itemId == R.id.menuMainBottomNavHome) {
                         fragmentContainerView.findNavController().navigate(R.id.homeFragment)
                     } else {
-                        fragmentContainerView.findNavController().navigate(R.id.medicalRecordFragment)
+                        showUpdateDialog()
+//                        fragmentContainerView.findNavController().navigate(R.id.medicalRecordFragment)
                     }
                 }
             }

diff --git a/app/src/main/java/com/project/meongcare/home/view/HomeFragment.kt b/app/src/main/java/com/project/meongcare/home/view/HomeFragment.kt
@@ -30,6 +30,8 @@ import com.project.meongcare.onboarding.model.data.local.DateSubmitListener
 import com.project.meongcare.snackbar.view.CustomSnackBar
 import com.project.meongcare.weight.model.entities.WeightPostRequest
 import dagger.hilt.android.AndroidEntryPoint
+import java.time.LocalDate
+import java.time.ZoneId
 import java.util.Date
 
 @AndroidEntryPoint
@@ -60,6 +62,9 @@ class HomeFragment : Fragment(), DateSubmitListener, DogProfileClickListener, Ho
 
         getAccessToken()
 
+        val currentDate = LocalDate.now()
+        setSelectedDate(Date.from(currentDate.atStartOfDay(ZoneId.systemDefault()).toInstant()))
+
         initCalendarImageView()
         initAlarmImageView()
         initProfileImageView()