From 87a5ea27ef710f90b3e9389eb414a634b908ee07 Mon Sep 17 00:00:00 2001 From: Yu Jin Date: Thu, 22 Aug 2024 00:28:56 +0900 Subject: [PATCH 1/2] =?UTF-8?q?feat:=20TabLayout=20=EC=8B=9C=EA=B0=84?= =?UTF-8?q?=EB=8C=80=20=EC=84=A4=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../eatssu/android/ui/main/ViewPager2Adapter.kt | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/com/eatssu/android/ui/main/ViewPager2Adapter.kt b/app/src/main/java/com/eatssu/android/ui/main/ViewPager2Adapter.kt index d7eebc2e..d7f6d361 100644 --- a/app/src/main/java/com/eatssu/android/ui/main/ViewPager2Adapter.kt +++ b/app/src/main/java/com/eatssu/android/ui/main/ViewPager2Adapter.kt @@ -1,11 +1,11 @@ package com.eatssu.android.ui.main -import android.util.Log import androidx.fragment.app.Fragment import androidx.fragment.app.FragmentActivity import androidx.viewpager2.adapter.FragmentStateAdapter import com.eatssu.android.data.enums.Time import com.eatssu.android.ui.main.menu.MenuFragment +import java.time.LocalTime class ViewPager2Adapter(fragmentActivity: FragmentActivity) : FragmentStateAdapter(fragmentActivity) { @@ -36,6 +36,16 @@ class ViewPager2Adapter(fragmentActivity: FragmentActivity) : fun getDefaultFragmentPosition(): Int { // 여기에서 디폴트로 노출할 Fragment의 위치를 반환해줍니다. // 예를 들어, 첫 번째 Fragment를 디폴트로 설정하려면 0을 반환합니다. - return 1 + + val time = LocalTime.now() + var selectedIndex: Int + + when (time.hour) { + in 0..10 -> selectedIndex = 0 + in 10..16 -> selectedIndex = 1 + in 16..24 -> selectedIndex = 2 + else -> selectedIndex = 1 + } + return selectedIndex } } From f22de7e52495a80e33f1c1e4cbf9358f7178af7a Mon Sep 17 00:00:00 2001 From: Yu Jin Date: Thu, 22 Aug 2024 00:31:23 +0900 Subject: [PATCH 2/2] =?UTF-8?q?feat:=20TabLayout=20=EC=8B=9C=EA=B0=84?= =?UTF-8?q?=EB=8C=80=20=EC=84=A4=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/eatssu/android/ui/main/ViewPager2Adapter.kt | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/app/src/main/java/com/eatssu/android/ui/main/ViewPager2Adapter.kt b/app/src/main/java/com/eatssu/android/ui/main/ViewPager2Adapter.kt index d7f6d361..e74b602f 100644 --- a/app/src/main/java/com/eatssu/android/ui/main/ViewPager2Adapter.kt +++ b/app/src/main/java/com/eatssu/android/ui/main/ViewPager2Adapter.kt @@ -38,13 +38,12 @@ class ViewPager2Adapter(fragmentActivity: FragmentActivity) : // 예를 들어, 첫 번째 Fragment를 디폴트로 설정하려면 0을 반환합니다. val time = LocalTime.now() - var selectedIndex: Int - when (time.hour) { - in 0..10 -> selectedIndex = 0 - in 10..16 -> selectedIndex = 1 - in 16..24 -> selectedIndex = 2 - else -> selectedIndex = 1 + val selectedIndex: Int = when (time.hour) { + in 0..10 -> 0 //아침 + in 10..16 -> 1 //점심 + in 16..24 -> 2 //저녁 + else -> 1 } return selectedIndex }