Implemented check-in pop up feature flag

Author: melissavelasquezz

app/.idea/.gitignore

@@ -21,8 +21,8 @@ android {
         applicationId "com.cornellappdev.uplift"
         minSdk 28
         targetSdk 35
-        versionCode 12
-        versionName "1.4-backend-fix"
+        versionCode 16
+        versionName "1.6-capacity-reminders"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         vectorDrawables {
@@ -40,6 +40,7 @@ android {
                     "GOOGLE_AUTH_CLIENT_ID", secretsProperties["GOOGLE_AUTH_CLIENT_ID"]
             )
             buildConfigField("boolean", "ONBOARDING_FLAG", "true")
+            buildConfigField("boolean", "CHECK_IN_FLAG", "true")
             signingConfig signingConfigs.debug
         }
         release {
@@ -48,6 +49,7 @@ android {
             buildConfigField("String", "GOOGLE_AUTH_CLIENT_ID", secretsProperties["GOOGLE_AUTH_CLIENT_ID"])
             buildConfigField("String", "BACKEND_URL", secretsProperties['PROD_ENDPOINT'])
             buildConfigField("boolean", "ONBOARDING_FLAG", "false")
+            buildConfigField("boolean", "CHECK_IN_FLAG", "false")
         }
         debug {
             buildConfigField("String", "BACKEND_URL", secretsProperties['DEV_ENDPOINT'])
@@ -57,6 +59,7 @@ android {
             )
             signingConfig signingConfigs.debug
             buildConfigField("boolean", "ONBOARDING_FLAG", "false")
+            buildConfigField("boolean", "CHECK_IN_FLAG", "false")
         }
     }
     compileOptions {

app/.idea/AndroidProjectSystem.xml

@@ -8,9 +8,11 @@ import androidx.activity.compose.setContent
 import androidx.activity.viewModels
 import androidx.core.splashscreen.SplashScreen.Companion.installSplashScreen
 import com.cornellappdev.uplift.data.repositories.DatastoreRepository
+import com.cornellappdev.uplift.data.repositories.LocationRepository
 import com.cornellappdev.uplift.ui.MainNavigationWrapper
 import com.cornellappdev.uplift.ui.theme.UpliftTheme
 import com.cornellappdev.uplift.ui.viewmodels.profile.CheckInViewModel
+import com.cornellappdev.uplift.util.CHECK_IN_FLAG
 import com.cornellappdev.uplift.util.LockScreenOrientation
 import dagger.hilt.android.AndroidEntryPoint
 import javax.inject.Inject
@@ -41,11 +43,17 @@ class MainActivity : ComponentActivity() {
 
     override fun onResume() {
         super.onResume()
-        checkInViewModel.startLocationUpdates(this)
+        LocationRepository.startLocationUpdates(this)
+        if (CHECK_IN_FLAG == true){
+            checkInViewModel.startLocationUpdates(this)
+        }
     }
 
     override fun onPause() {
         super.onPause()
-        checkInViewModel.stopLocationUpdates()
+        LocationRepository.stopLocationUpdates()
+        if (CHECK_IN_FLAG == true){
+            checkInViewModel.stopLocationUpdates()
+        }
     }
 }

app/.idea/caches/deviceStreaming.xml

@@ -55,9 +55,11 @@ import com.cornellappdev.uplift.ui.screens.report.ReportSubmittedScreen
 import com.cornellappdev.uplift.ui.viewmodels.classes.ClassDetailViewModel
 import com.cornellappdev.uplift.ui.viewmodels.gyms.GymDetailViewModel
 import com.cornellappdev.uplift.ui.viewmodels.nav.RootNavigationViewModel
+import com.cornellappdev.uplift.ui.viewmodels.profile.CheckInUiState
 import com.cornellappdev.uplift.ui.viewmodels.profile.CheckInViewModel
 import com.cornellappdev.uplift.util.ONBOARDING_FLAG
 import com.cornellappdev.uplift.ui.viewmodels.profile.ConfettiViewModel
+import com.cornellappdev.uplift.util.CHECK_IN_FLAG
 import com.cornellappdev.uplift.util.PRIMARY_BLACK
 import com.cornellappdev.uplift.util.PRIMARY_YELLOW
 import com.cornellappdev.uplift.util.montserratFamily
@@ -81,16 +83,18 @@ fun MainNavigationWrapper(
 
     ) {
 
-    val confettiViewModel: ConfettiViewModel = hiltViewModel()
-    val checkInViewModel: CheckInViewModel = hiltViewModel()
     val rootNavigationUiState = rootNavigationViewModel.collectUiStateValue()
     val startDestination = rootNavigationUiState.startDestination
 
     val navController = rememberNavController()
     val systemUiController: SystemUiController = rememberSystemUiController()
 
-    val checkInUiState = checkInViewModel.collectUiStateValue()
-    val confettiUiState = confettiViewModel.collectUiStateValue()
+    val checkInViewModel: CheckInViewModel? =
+        if (CHECK_IN_FLAG) hiltViewModel() else null
+    val confettiViewModel: ConfettiViewModel? =
+        if (CHECK_IN_FLAG) hiltViewModel() else null
+    val checkInUiState = checkInViewModel?.collectUiStateValue() ?: CheckInUiState()
+    val confettiUiState = confettiViewModel?.collectUiStateValue()
 
     val yourShimmerTheme = defaultShimmerTheme.copy(
         shaderColors = listOf(
@@ -261,37 +265,41 @@ fun MainNavigationWrapper(
             }
 
             Box(modifier = Modifier.fillMaxSize()){
-                AnimatedVisibility(
-                    visible = checkInUiState.showPopUp && isMainScreen(),
-                    modifier = Modifier
-                        .align(Alignment.BottomCenter)
-                        .fillMaxWidth()
-                        .padding(
-                            start = 10.dp,
-                            end = 9.dp,
-                            bottom = it.calculateBottomPadding() + 13.dp
-                        )
-                ){
-                    Box(
-                        modifier = Modifier.onGloballyPositioned { coords ->
-                            confettiViewModel.setConfettiBounds(coords.boundsInRoot())
-                        }
+                if(CHECK_IN_FLAG){
+                    AnimatedVisibility(
+                        visible = checkInUiState.showPopUp && isMainScreen(),
+                        modifier = Modifier
+                            .align(Alignment.BottomCenter)
+                            .fillMaxWidth()
+                            .padding(
+                                start = 10.dp,
+                                end = 9.dp,
+                                bottom = it.calculateBottomPadding() + 13.dp
+                            )
                     ){
-                        CheckInPopUp(
-                            gymName = checkInUiState.gymName,
-                            currentTimeText = checkInUiState.timeText,
-                            onDismiss = checkInViewModel::onDismiss,
-                            onCheckIn = checkInViewModel::onCheckIn,
-                            onClosePopUp = checkInViewModel::onClose,
-                            mode = checkInUiState.mode,
+                        Box(
+                            modifier = Modifier.onGloballyPositioned { coords ->
+                                confettiViewModel?.setConfettiBounds(coords.boundsInRoot())
+                            }
+                        ){
+                            CheckInPopUp(
+                                gymName = checkInUiState.gymName,
+                                currentTimeText = checkInUiState.timeText,
+                                onDismiss = { checkInViewModel?.onDismiss() },
+                                onCheckIn = { checkInViewModel?.onCheckIn() },
+                                onClosePopUp = { checkInViewModel?.onClose() },
+                                mode = checkInUiState.mode,
+                            )
+                        }
+                    }
+                    if(confettiViewModel != null){
+                        ConfettiBurst(
+                            confettiViewModel = confettiViewModel,
+                            particleSpawningBounds = confettiUiState?.confettiBounds,
+                            modifier = Modifier
                         )
                     }
                 }
-                ConfettiBurst(
-                    confettiViewModel = confettiViewModel,
-                    particleSpawningBounds = confettiUiState.confettiBounds,
-                    modifier = Modifier
-                )
             }
 
         }