Merge pull request #12 from AliElDerawi/code_improvments

feat: Apply code improvements for Instructions classes
AliElDerawi · Jan 6, 2025 · eb9c604 · eb9c604
2 parents ed8bcfa + fb00365
commit eb9c604
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 11 deletions.
diff --git a/app/src/main/java/com/udacity/shoestore/features/onBoarding/view/InstructionsFragment.kt b/app/src/main/java/com/udacity/shoestore/features/onBoarding/view/InstructionsFragment.kt
@@ -58,12 +58,10 @@ class InstructionsFragment : BaseFragment() {
 
     private fun initViewPager() {
 
-        with(mBinding) {
-            boardingViewPager.adapter = OnBoardingAdapter(InstructionModel.getInstructionCallBack())
-            mViewModel.setLastPage(mViewModel.instructionListStateFlow.value.size - 1)
-        }
-
+        mBinding.boardingViewPager.adapter =
+            OnBoardingAdapter(InstructionModel.getInstructionCallBack())
         initBoardingViewPagerListener()
+
     }
 
 
@@ -78,7 +76,7 @@ class InstructionsFragment : BaseFragment() {
                 }
             }
 
-            goNextScreenLiveData.observe(mLifecycleOwner) {
+            goNextScreenSingleLiveData.observe(mLifecycleOwner) {
                 if (it) {
                     mSharedViewModel.apply {
                         updateNewUserValidation(false)
@@ -97,7 +95,7 @@ class InstructionsFragment : BaseFragment() {
             ViewPager2.OnPageChangeCallback() {
             override fun onPageSelected(position: Int) {
                 super.onPageSelected(position)
-                    mViewModel.onPageChange(position)
+                mViewModel.onPageChange(position)
             }
         })
     }

diff --git a/...rc/main/java/com/udacity/shoestore/features/onBoarding/viewModel/InstructionsViewModel.kt b/...rc/main/java/com/udacity/shoestore/features/onBoarding/viewModel/InstructionsViewModel.kt
@@ -22,7 +22,7 @@ class InstructionsViewModel(val app: Application) : BaseViewModel(app) {
         get() = _lastPageStateFlow
 
     private var _goNextScreenSingleLiveEvent = SingleLiveEvent<Boolean>()
-    val goNextScreenLiveData: LiveData<Boolean>
+    val goNextScreenSingleLiveData: LiveData<Boolean>
         get() = _goNextScreenSingleLiveEvent
 
     private var _instructionListStateFlow = MutableStateFlow<MutableList<InstructionModel>>(mutableListOf())
@@ -31,6 +31,7 @@ class InstructionsViewModel(val app: Application) : BaseViewModel(app) {
 
     init {
         _instructionListStateFlow.value.addAll(app.getInstruction())
+        setLastPage(instructionListStateFlow.value.size - 1)
     }
 
     private fun incrementPage() {
@@ -42,9 +43,6 @@ class InstructionsViewModel(val app: Application) : BaseViewModel(app) {
     }
 
     fun onPageChange(position: Int) {
-        if (position == 0 && currentPageLiveData.value != -1) {
-            return
-        }
         Timber.d("onPageChange: $position")
         _currentPageLiveData.value = position
     }