🐛 dark mode configration change

woowacourse-teams · Oct 23, 2024 · 0bd3a6a · 0bd3a6a
1 parent ea5913d
commit 0bd3a6a
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 2 deletions.
diff --git a/android/app/src/main/java/net/pengcook/android/presentation/main/MainActivity.kt b/android/app/src/main/java/net/pengcook/android/presentation/main/MainActivity.kt
@@ -29,7 +29,9 @@ class MainActivity : AppCompatActivity() {
         super.onCreate(savedInstanceState)
         initializeSplashScreen()
         setContentView(binding.root)
-        initializeNavigation()
+        if (savedInstanceState == null) {
+            initializeNavigation()
+        }
     }
 
     private fun initializeSplashScreen() {

diff --git a/android/app/src/main/java/net/pengcook/android/presentation/step/RecipeStepFragment.kt b/android/app/src/main/java/net/pengcook/android/presentation/step/RecipeStepFragment.kt
@@ -58,10 +58,33 @@ class RecipeStepFragment : Fragment() {
         binding.vpStepRecipe.apply {
             adapter = recipeStepPagerRecyclerAdapter
             orientation = ViewPager2.ORIENTATION_HORIZONTAL
+            // ViewPager 설정 후 위치 복원
+            if (savedInstanceState != null) {
+                val position = savedInstanceState.getInt("current_step_position", 0)
+                setCurrentItem(position, false)
+            } else {
+                // ViewModel에서 위치 복원
+                setCurrentItem(viewModel.currentPosition, false)
+            }
         }
         observeViewModel()
 
         binding.dotsIndicator.attachTo(binding.vpStepRecipe)
+
+        // 페이지 변경 시 ViewModel에 위치 저장
+        binding.vpStepRecipe.registerOnPageChangeCallback(
+            object : ViewPager2.OnPageChangeCallback() {
+                override fun onPageSelected(position: Int) {
+                    super.onPageSelected(position)
+                    viewModel.currentPosition = position
+                }
+            },
+        )
+    }
+
+    override fun onSaveInstanceState(outState: Bundle) {
+        super.onSaveInstanceState(outState)
+        outState.putInt("current_step_position", binding.vpStepRecipe.currentItem)
     }
 
     override fun onDestroyView() {
@@ -85,6 +108,9 @@ class RecipeStepFragment : Fragment() {
     private fun observeRecipeSteps() {
         viewModel.recipeSteps.observe(viewLifecycleOwner) { recipeSteps ->
             recipeStepPagerRecyclerAdapter.updateList(recipeSteps)
+            // 데이터 로드 후 위치 복원
+            val position = viewModel.currentPosition
+            binding.vpStepRecipe.setCurrentItem(position, false)
         }
     }
 }
diff --git a/android/app/src/main/java/net/pengcook/android/presentation/step/RecipeStepViewModel.kt b/android/app/src/main/java/net/pengcook/android/presentation/step/RecipeStepViewModel.kt
@@ -23,11 +23,12 @@ class RecipeStepViewModel
         private var _recipeSteps: MutableLiveData<List<RecipeStep>> = MutableLiveData(emptyList())
         val recipeSteps: LiveData<List<RecipeStep>>
             get() = _recipeSteps
-
         private val _quitEvent = MutableLiveData<Event<Boolean>>()
         val quitEvent: LiveData<Event<Boolean>>
             get() = _quitEvent
 
+        var currentPosition: Int = 0
+
         fun fetchRecipeSteps() {
             viewModelScope.launch {
                 val response = feedRepository.fetchRecipeSteps(recipeId)