Purchase Page - Optimal Card + Other Benefits based on Purchase type

.gitignore

@@ -1,3 +1,6 @@
+# macOS
+.DS_Store
+
 # Gradle files
 .gradle/
 build/
@@ -28,6 +31,7 @@ render.experimental.xml
 
 # Google Services (e.g. APIs or Firebase)
 google-services.json
+secrets.properties
 
 # Android Profiling
 *.hprof

app/build.gradle

@@ -92,6 +92,7 @@ dependencies {
     implementation libs.androidx.annotation
     implementation libs.android.libraries.places.places
     implementation libs.maps.android.places.places.ktx
+    implementation libs.accompanist.permissions
 
     // Kotlin Dependencies
     implementation platform(libs.jetbrains.kotlin.bom)

app/src/main/java/edu/card/clarity/MainActivity.kt

@@ -2,18 +2,16 @@ package edu.card.clarity
 
 import android.Manifest
 import android.content.pm.PackageManager
-import android.os.Build
 import android.os.Bundle
 import android.util.Log
 import androidx.activity.ComponentActivity
 import androidx.activity.compose.setContent
 import androidx.activity.enableEdgeToEdge
 import androidx.activity.result.ActivityResultLauncher
 import androidx.activity.result.contract.ActivityResultContracts
-import androidx.activity.result.registerForActivityResult
 import androidx.core.app.ActivityCompat
-import androidx.core.app.NotificationManagerCompat
 import dagger.hilt.android.AndroidEntryPoint
+import edu.card.clarity.presentation.MainScreen
 import edu.card.clarity.ui.theme.CardClarityTheme
 
 @AndroidEntryPoint

app/src/main/java/edu/card/clarity/MainScreen.kt → app/src/main/java/edu/card/clarity/presentation/MainScreen.kt

@@ -1,4 +1,4 @@
-package edu.card.clarity
+package edu.card.clarity.presentation
 
 import android.annotation.SuppressLint
 import androidx.compose.foundation.layout.RowScope

app/src/main/java/edu/card/clarity/presentation/navigation/BottomNavGraph.kt

@@ -6,14 +6,16 @@ import androidx.navigation.NavType
 import androidx.navigation.compose.NavHost
 import androidx.navigation.compose.composable
 import androidx.navigation.navArgument
-import edu.card.clarity.presentation.PurchaseScreen
-import edu.card.clarity.presentation.addBenefitScreen.AddBenefitScreen
+import edu.card.clarity.enums.PurchaseType
 import edu.card.clarity.presentation.addCardScreen.AddCardScreen
+import edu.card.clarity.presentation.addBenefitScreen.AddBenefitScreen
+import edu.card.clarity.presentation.upcomingPaymentsScreen.UpcomingPaymentsScreen
 import edu.card.clarity.presentation.homeScreen.HomeScreen
 import edu.card.clarity.presentation.myBenefitsScreen.MyBenefitsScreen
 import edu.card.clarity.presentation.myCardScreen.MyCardsScreen
 import edu.card.clarity.presentation.myReceiptsScreen.MyReceiptsScreen
-import edu.card.clarity.presentation.upcomingPaymentsScreen.UpcomingPaymentsScreen
+import edu.card.clarity.presentation.purchaseBenefitsScreen.PurchaseOptimalBenefitsScreen
+import edu.card.clarity.presentation.purchaseBenefitsScreen.PurchaseScreen
 import edu.card.clarity.presentation.utils.ArgumentNames
 import edu.card.clarity.presentation.utils.Destinations
 
@@ -33,7 +35,7 @@ fun BottomNavGraph(navController: NavHostController) {
             MyReceiptsScreen()
         }
         composable(Destinations.PURCHASE) {
-            PurchaseScreen()
+            PurchaseScreen(navController)
         }
         composable(Destinations.MY_CARDS) {
             MyCardsScreen(navController)
@@ -89,5 +91,13 @@ fun BottomNavGraph(navController: NavHostController) {
 
             AddBenefitScreen(cardName, navController)
         }
+        composable(
+            route = "${Destinations.PURCHASE_OPTIMAL_BENEFITS}/{category}",
+            arguments = listOf(navArgument("category") { type = NavType.StringType })
+        ) { backStackEntry ->
+            val categoryString = backStackEntry.arguments?.getString("category")!!
+            val category = PurchaseType.valueOf(categoryString)
+            PurchaseOptimalBenefitsScreen(navController, category)
+        }
     }
 }

app/src/main/java/edu/card/clarity/presentation/purchaseBenefitsScreen/GeolocationPopup.kt

@@ -0,0 +1,116 @@
+package edu.card.clarity.presentation.purchaseBenefitsScreen
+
+import androidx.compose.foundation.layout.*
+import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.material3.*
+import androidx.compose.runtime.*
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.text.style.TextAlign
+import androidx.compose.ui.unit.dp
+import edu.card.clarity.location.GeolocationInference
+
+@Composable
+fun GeolocationPopup(
+    geolocationInference: GeolocationInference?,
+    onDismiss: () -> Unit,
+    onConfirm: () -> Unit
+) {
+    if (geolocationInference != null) {
+        AlertDialog(
+            onDismissRequest = onDismiss,
+            title = {
+                Text(
+                    text = "Nearby Merchant Detected",
+                    style = MaterialTheme.typography.headlineMedium,
+                    fontWeight = FontWeight.Bold,
+                    color = MaterialTheme.colorScheme.primary,
+                    textAlign = TextAlign.Center,
+                    modifier = Modifier.fillMaxWidth().padding(top = 16.dp)
+                )
+            },
+            text = {
+                Column(
+                    horizontalAlignment = Alignment.CenterHorizontally,
+                    verticalArrangement = Arrangement.Center,
+                    modifier = Modifier.padding(vertical = 16.dp)
+                ) {
+                    Text(
+                        text = "We detected that you're near ",
+                        style = MaterialTheme.typography.bodyLarge,
+                        textAlign = TextAlign.Center,
+                        modifier = Modifier.fillMaxWidth().padding(horizontal = 16.dp)
+                    )
+                    Text(
+                        text = geolocationInference.merchantName,
+                        style = MaterialTheme.typography.bodyLarge,
+                        fontWeight = FontWeight.Bold,
+                        textAlign = TextAlign.Center,
+                        modifier = Modifier.fillMaxWidth().padding(horizontal = 16.dp)
+                    )
+                    Spacer(modifier = Modifier.height(8.dp))
+                    Text(
+                        text = "Would you explore benefits in ${geolocationInference.purchaseType}?",
+                        style = MaterialTheme.typography.bodyLarge,
+                        textAlign = TextAlign.Center,
+                        modifier = Modifier.fillMaxWidth().padding(horizontal = 16.dp)
+                    )
+                }
+            },
+            confirmButton = {
+                Button(
+                    onClick = onConfirm,
+                    modifier = Modifier.fillMaxWidth().padding(8.dp)
+                ) {
+                    Text("Yes")
+                }
+            },
+            dismissButton = {
+                Button(
+                    onClick = onDismiss,
+                    modifier = Modifier.fillMaxWidth().padding(8.dp)
+                ) {
+                    Text("No")
+                }
+            },
+            shape = RoundedCornerShape(16.dp),
+            containerColor = MaterialTheme.colorScheme.background,
+            tonalElevation = 8.dp
+        )
+    } else {
+        AlertDialog(
+            onDismissRequest = onDismiss,
+            title = {
+                Text(
+                    text = "Loading",
+                    style = MaterialTheme.typography.headlineMedium,
+                    fontWeight = FontWeight.Bold,
+                    color = MaterialTheme.colorScheme.primary,
+                    textAlign = TextAlign.Center,
+                    modifier = Modifier.fillMaxWidth().padding(top = 16.dp)
+                )
+            },
+            text = {
+                Box(
+                    contentAlignment = Alignment.Center,
+                    modifier = Modifier.fillMaxWidth().padding(vertical = 16.dp)
+                ) {
+                    CircularProgressIndicator()
+                }
+            },
+            confirmButton = {
+                Button(
+                    onClick = onDismiss,
+                    modifier = Modifier.fillMaxWidth().padding(8.dp)
+                ) {
+                    Text("Dismiss")
+                }
+            },
+            dismissButton = {},
+            shape = RoundedCornerShape(16.dp),
+            containerColor = MaterialTheme.colorScheme.background,
+            tonalElevation = 8.dp
+        )
+    }
+}

app/src/main/java/edu/card/clarity/presentation/purchaseBenefitsScreen/GeolocationViewModel.kt

@@ -0,0 +1,33 @@
+package edu.card.clarity.presentation.purchaseBenefitsScreen
+
+import android.util.Log
+import androidx.lifecycle.ViewModel
+import androidx.lifecycle.viewModelScope
+import dagger.hilt.android.lifecycle.HiltViewModel
+import edu.card.clarity.location.GeolocationInference
+import edu.card.clarity.location.GeolocationInferenceService
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.StateFlow
+import kotlinx.coroutines.launch
+import javax.inject.Inject
+
+@HiltViewModel
+class GeolocationViewModel @Inject constructor(
+    private val geolocationInferenceService: GeolocationInferenceService
+) : ViewModel() {
+
+    private val _geolocationInference = MutableStateFlow<List<GeolocationInference>?>(null)
+    val geolocationInference: StateFlow<List<GeolocationInference>?> = _geolocationInference
+
+    fun fetchGeolocationInference() {
+        viewModelScope.launch {
+            try {
+                val inferences = geolocationInferenceService.getPurchaseTypeInference()
+                Log.d("Inferences", inferences.toString())
+                _geolocationInference.value = inferences
+            } catch (e: SecurityException) {
+                // Handle the case where permissions were not granted
+            }
+        }
+    }
+}