Fix some parameters for nav and right

Author: JiangoJ

.idea/gradle.xml

@@ -20,13 +20,15 @@ import androidx.navigation.NavController
 import com.cornellappdev.scoop.R
 import com.cornellappdev.scoop.ui.theme.Green
 import com.google.accompanist.pager.PagerState
+import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
 
 @OptIn(ExperimentalMaterialApi::class, com.google.accompanist.pager.ExperimentalPagerApi::class)
 @Composable
 fun NavHeader(
     title: String,
-    pagerState: PagerState,
+    backFunction: suspend () -> Unit,
     hasBackArrow: Boolean = false,
 ) {
     val scope = rememberCoroutineScope()
@@ -45,7 +47,9 @@ fun NavHeader(
                 Button(
                     onClick = {
                         scope.launch {
-                            pagerState.animateScrollToPage(pagerState.currentPage - 1)
+                            withContext(Dispatchers.IO){
+                                backFunction()
+                            }
                         }
                     },
                     colors = ButtonDefaults.buttonColors(backgroundColor = Color.White),

app/src/main/java/com/cornellappdev/scoop/ui/components/general/NavHeader.kt

@@ -1,5 +1,6 @@
 package com.cornellappdev.scoop.components
 
+import android.util.Log
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.height
@@ -19,12 +20,15 @@ import com.cornellappdev.scoop.ui.theme.DarkGray
 import com.cornellappdev.scoop.ui.theme.Gray
 import com.cornellappdev.scoop.ui.theme.Green
 import com.google.accompanist.pager.PagerState
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
 
 @OptIn(ExperimentalMaterialApi::class, com.google.accompanist.pager.ExperimentalPagerApi::class)
 @Composable
 fun RightArrow(
-    pagerState: PagerState,
+    nextFunction: suspend () -> Unit,
     isComplete : Boolean = false,
 ) {
     val scope = rememberCoroutineScope()
@@ -37,8 +41,11 @@ fun RightArrow(
         enabled = isComplete,
         backgroundColor = if (isComplete) Green else Gray,
         onClick = {
+            Log.d("PAGERSTATE", "button Clicked")
             scope.launch {
-                pagerState.animateScrollToPage(pagerState.currentPage + 1)
+                withContext(Dispatchers.IO) {
+                    nextFunction()
+                }
             }
         }
     ) {

app/src/main/java/com/cornellappdev/scoop/ui/components/general/RightArrow.kt

@@ -42,7 +42,7 @@ fun OnboardingProfile(pagerState: PagerState) {
         Modifier.background(Color.White)
     ) {
 
-        NavHeader(pagerState = pagerState, title = "Profile", hasBackArrow = true)
+        NavHeader(backFunction = suspend { pagerState.animateScrollToPage(pagerState.currentPage - 1) }, title = "Profile", hasBackArrow = false)
 
         Column(
             modifier = Modifier

app/src/main/java/com/cornellappdev/scoop/ui/onboarding/OnboardingProfile.kt

@@ -1,5 +1,6 @@
 package com.cornellappdev.scoop.ui.onboarding
 
+import android.util.Log
 import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.*
 import androidx.compose.runtime.Composable
@@ -31,7 +32,7 @@ fun OnboardingView2(pagerState: PagerState) {
     Column(
         Modifier.background(Color.White)
     ) {
-        NavHeader(pagerState = pagerState, title = "About You")
+        NavHeader(backFunction = suspend { pagerState.animateScrollToPage(pagerState.currentPage - 1) }, title = "Profile", hasBackArrow = false)
 
         Column(
             modifier = Modifier
@@ -101,7 +102,8 @@ fun OnboardingView2(pagerState: PagerState) {
                 horizontalArrangement  =  Arrangement.SpaceBetween
             ) {
                 BackArrow(pagerState)
-                RightArrow(pagerState, isComplete)
+                RightArrow( suspend { pagerState.animateScrollToPage(pagerState.currentPage + 1)
+                }, isComplete)
             }
             Spacer(modifier = Modifier.height(40.dp))
             Row(

app/src/main/java/com/cornellappdev/scoop/ui/onboarding/OnboardingView2.kt

@@ -29,7 +29,7 @@ fun OnboardingView3(pagerState: PagerState) {
     Column(
         Modifier.background(Color.White)
     ) {
-        NavHeader(pagerState = pagerState, title = "About You")
+        NavHeader(backFunction = suspend { pagerState.animateScrollToPage(pagerState.currentPage - 1) }, title = "Profile", hasBackArrow = false)
 
         Column(
             modifier = Modifier
@@ -59,7 +59,7 @@ fun OnboardingView3(pagerState: PagerState) {
                 horizontalArrangement  =  Arrangement.SpaceBetween
             ) {
                 BackArrow(pagerState)
-                RightArrow(pagerState, true)
+                RightArrow(suspend { pagerState.animateScrollToPage(pagerState.currentPage + 1) }, true)
             }
             Spacer(modifier = Modifier.height(40.dp))
             Row(

app/src/main/java/com/cornellappdev/scoop/ui/onboarding/OnboardingView3.kt

@@ -31,7 +31,7 @@ fun OnboardingView4(
         Modifier.background(Color.White)
     ) {
 
-        NavHeader(pagerState = pagerState, title = "During Roadtrips")
+        NavHeader(backFunction = suspend { pagerState.animateScrollToPage(pagerState.currentPage - 1) }, title = "Profile", hasBackArrow = false)
 
         Column(
             modifier = Modifier
@@ -79,7 +79,7 @@ fun OnboardingView4(
                 horizontalArrangement  =  Arrangement.SpaceBetween
             ) {
                 BackArrow(pagerState)
-                RightArrow(pagerState, true)
+                RightArrow(suspend { pagerState.animateScrollToPage(pagerState.currentPage + 1) }, true)
             }
             Spacer(modifier = Modifier.height(40.dp))
             Row(

app/src/main/java/com/cornellappdev/scoop/ui/onboarding/OnboardingView4.kt

@@ -28,8 +28,7 @@ fun OnboardingView5(pagerState: PagerState) {
 
             Column(
         Modifier.background(Color.White)
-    ) {
-        NavHeader(pagerState = pagerState, title = "Favorites")
+    ) { NavHeader(backFunction = suspend { pagerState.animateScrollToPage(pagerState.currentPage - 1) }, title = "Profile", hasBackArrow = false)
 
         Column(
             modifier = Modifier
@@ -87,7 +86,8 @@ fun OnboardingView5(pagerState: PagerState) {
                 horizontalArrangement  =  Arrangement.SpaceBetween
             ) {
                 BackArrow(pagerState)
-                RightArrow(pagerState, isComplete)
+                RightArrow( nextFunction = suspend { pagerState.animateScrollToPage(pagerState.currentPage + 1)
+                }, isComplete)
             }
             Spacer(modifier = Modifier.height(40.dp))
             Row(