From 981ceb41f9f35cec321426cbbf4e830474f35083 Mon Sep 17 00:00:00 2001 From: "lge6716@gmail.com" Date: Tue, 26 Mar 2024 21:12:53 +0900 Subject: [PATCH 1/2] =?UTF-8?q?fix:=20=EC=A7=84=EB=A3=8C=EA=B8=B0=EB=A1=9D?= =?UTF-8?q?=20=EB=A9=94=EB=89=B4=20=ED=81=B4=EB=A6=AD=20=EC=8B=9C=20?= =?UTF-8?q?=EB=8B=A4=EC=9D=B4=EC=96=BC=EB=A1=9C=EA=B7=B8=20=EB=9D=84?= =?UTF-8?q?=EC=9A=B0=EB=8F=84=EB=A1=9D=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/main/java/com/project/meongcare/MainActivity.kt | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/com/project/meongcare/MainActivity.kt b/app/src/main/java/com/project/meongcare/MainActivity.kt index 6e071ee0..5b06d693 100644 --- 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) } } } From 6f43fe7b426dae511370e8d84fc6c926beeebe7b Mon Sep 17 00:00:00 2001 From: "lge6716@gmail.com" Date: Tue, 26 Mar 2024 21:13:21 +0900 Subject: [PATCH 2/2] =?UTF-8?q?fix:=20=ED=99=88=20=ED=99=94=EB=A9=B4=20?= =?UTF-8?q?=EB=A1=9C=EB=94=A9=20=EC=8B=9C=20=EA=B0=80=EB=A1=9C=20=EB=8B=AC?= =?UTF-8?q?=EB=A0=A5=20=EB=82=98=ED=83=80=EB=82=98=EC=A7=80=20=EC=95=8A?= =?UTF-8?q?=EB=8A=94=20=ED=98=84=EC=83=81=20=ED=95=B4=EA=B2=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/project/meongcare/home/view/HomeFragment.kt | 5 +++++ 1 file changed, 5 insertions(+) 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 index 8d260126..f61e296b 100644 --- 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()