Fix/sprint3 adjustments

.kotlin/errors/errors-1729205467831.log

@@ -0,0 +1,4 @@
+kotlin version: 2.0.20
+error message: The daemon has terminated unexpectedly on startup attempt #1 with error code: 0. The daemon process output:
+    1. Kotlin compile daemon is ready
+

.kotlin/errors/errors-1730660052865.log

@@ -0,0 +1,4 @@
+kotlin version: 2.0.20
+error message: The daemon has terminated unexpectedly on startup attempt #1 with error code: 0. The daemon process output:
+    1. Kotlin compile daemon is ready
+

.kotlin/errors/errors-1730754361219.log

@@ -0,0 +1,4 @@
+kotlin version: 2.0.20
+error message: The daemon has terminated unexpectedly on startup attempt #1 with error code: 0. The daemon process output:
+    1. Kotlin compile daemon is ready
+

.kotlin/errors/errors-1731096633063.log

@@ -0,0 +1,4 @@
+kotlin version: 2.0.20
+error message: The daemon has terminated unexpectedly on startup attempt #1 with error code: 0. The daemon process output:
+    1. Kotlin compile daemon is ready
+

README.md

@@ -1,2 +1,4 @@
 ### Visit the android developers website
-[Compila apps adaptables con las nuevas APIs de Compose, ahora estables](https://developer.android.com/?hl=es-419#:~:text=Discover%20the%20latest%20app%20development%20tools,)
+# [Compila apps adaptables con las nuevas APIs de Compose, ahora estables](https://developer.android.com/?hl=es-419#:~:text=Discover%20the%20latest%20app%20development%20tools,)
+no olvides configurar el gradle para una exitosa ejecución,
+el apk será generado y compartido en su debido momento

app/build.gradle.kts

@@ -1,7 +1,10 @@
 plugins {
     id("com.android.application") version "8.6.1" // AGP version
-    id("org.jetbrains.kotlin.android") version "1.9.0" // Kotlin plugin for Android
-    id("org.jetbrains.kotlin.plugin.serialization") version "1.9.0" // Kotlin serialization plugin
+    id("org.jetbrains.kotlin.android") version "2.0.20" // Kotlin plugin for Android
+    id("org.jetbrains.kotlin.plugin.serialization") version "2.0.20" // Kotlin serialization plugin
+    id("org.jetbrains.kotlin.plugin.compose") version "2.0.20"
+    id("kotlin-kapt") // Asegúrate de que kapt esté habilitado
+    id("com.google.gms.google-services") // Plugin de Google Services
 }
 
 android {
@@ -30,19 +33,24 @@ android {
             )
         }
     }
+
     compileOptions {
         sourceCompatibility = JavaVersion.VERSION_1_8
         targetCompatibility = JavaVersion.VERSION_1_8
     }
+
     kotlinOptions {
         jvmTarget = "1.8"
     }
+
     buildFeatures {
         compose = true
     }
+
     composeOptions {
         kotlinCompilerExtensionVersion = "1.5.1"
     }
+
     packaging {
         resources {
             excludes += "/META-INF/{AL2.0,LGPL2.1}"
@@ -51,8 +59,6 @@ android {
 }
 
 dependencies {
-
-
     // Supabase dependencies
     implementation(platform("io.github.jan-tennert.supabase:bom:3.0.0"))
     implementation("io.github.jan-tennert.supabase:postgrest-kt")
@@ -65,20 +71,48 @@ dependencies {
 
     // Compose dependencies
     implementation(platform("androidx.compose:compose-bom:2024.09.03"))
-    implementation("androidx.compose.ui:ui")
-    implementation("androidx.compose.ui:ui-graphics")
-    implementation("androidx.compose.ui:ui-tooling-preview")
-    implementation("androidx.compose.material3:material3:1.3.0")
+    implementation("androidx.compose.material3:material3")
+    implementation("androidx.navigation:navigation-compose:2.8.2")
+    implementation("androidx.biometric:biometric:1.1.0")
+    implementation("androidx.fragment:fragment-ktx:1.8.4")
+    implementation("com.google.android.libraries.places:places:4.0.0")
+    implementation("androidx.appcompat:appcompat:1.7.0")
+    implementation("com.google.maps.android:maps-compose:2.2.0")
+    implementation("com.google.accompanist:accompanist-flowlayout:0.28.0")
+    implementation("androidx.compose.runtime:runtime-livedata:1.7.4")
+
+    // Google Play Services
+    implementation("com.google.android.gms:play-services-maps")
+    implementation("com.google.android.gms:play-services-measurement-api")
+    implementation("com.google.android.gms:play-services-measurement-sdk")
+
+    // Room and Kapt
+    implementation("androidx.room:room-runtime:2.5.1")
+    kapt("androidx.room:room-compiler:2.5.1")
+
+    // Glide
+    implementation("com.github.bumptech.glide:glide:4.12.0")
+    kapt("com.github.bumptech.glide:compiler:4.12.0")
+
+    // Coil
+    implementation("io.coil-kt:coil-compose:2.0.0")
 
     // Testing dependencies
     testImplementation("junit:junit:4.13.2")
     androidTestImplementation("androidx.test.ext:junit:1.2.1")
     androidTestImplementation("androidx.test.espresso:espresso-core:3.6.1")
-    androidTestImplementation(platform("androidx.compose:compose-bom:2024.09.03"))
     androidTestImplementation("androidx.compose.ui:ui-test-junit4")
+    testImplementation("org.jetbrains.kotlinx:kotlinx-coroutines-test:1.6.0")
+    testImplementation("io.mockk:mockk:1.13.3")
 
     // Debug dependencies
     debugImplementation("androidx.compose.ui:ui-tooling")
     debugImplementation("androidx.compose.ui:ui-test-manifest")
 
-}
+    // Firebase dependencies (using BOM for version management)
+    implementation(platform("com.google.firebase:firebase-bom:32.1.0"))
+    implementation("com.google.firebase:firebase-analytics-ktx")
+    implementation("com.google.firebase:firebase-firestore-ktx")
+    implementation("com.google.firebase:firebase-storage-ktx")
+    implementation("com.google.firebase:firebase-messaging-ktx") // Notificaciones push
+}

app/google-services.json

@@ -0,0 +1,29 @@
+{
+  "project_info": {
+    "project_number": "631169455352",
+    "project_id": "ecobitesandroid",
+    "storage_bucket": "ecobitesandroid.firebasestorage.app"
+  },
+  "client": [
+    {
+      "client_info": {
+        "mobilesdk_app_id": "1:631169455352:android:d850824d325ecaea7bd70d",
+        "android_client_info": {
+          "package_name": "com.uniandes.ecobites"
+        }
+      },
+      "oauth_client": [],
+      "api_key": [
+        {
+          "current_key": "AIzaSyAKofhygTp6LyG_fZ2wLT0lpUlP-40ZH8A"
+        }
+      ],
+      "services": {
+        "appinvite_service": {
+          "other_platform_oauth_client": []
+        }
+      }
+    }
+  ],
+  "configuration_version": "1"
+}

app/src/main/AndroidManifest.xml

@@ -2,6 +2,13 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools">
     <uses-permission android:name="android.permission.INTERNET" />
+    <uses-permission android:name="android.permission.USE_BIOMETRIC" />
+
+    <uses-permission android:name="android.permission.USE_FINGERPRINT" />
+    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
+    <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
+
+
     <application
         android:allowBackup="true"
         android:dataExtractionRules="@xml/data_extraction_rules"
@@ -12,6 +19,10 @@
         android:supportsRtl="true"
         android:theme="@style/Theme.EcoBites"
         tools:targetApi="31">
+        <!-- Clave de la API de Google Maps -->
+        <meta-data
+            android:name="com.google.android.geo.API_KEY"
+            android:value="AIzaSyCTHkA6PG3Zr_nhxq8N7dlX-vrmEM4mltY"/>
         <activity
             android:name=".MainActivity"
             android:exported="true"

app/src/main/java/com/uniandes/ecobites/MainActivity.kt

@@ -8,75 +8,47 @@ import androidx.compose.foundation.layout.padding
 import androidx.compose.material3.Scaffold
 import androidx.compose.runtime.*
 import androidx.compose.ui.Modifier
-import com.uniandes.ecobites.ui.screens.ProfileScreen
-import com.uniandes.ecobites.ui.screens.CartScreen
-import com.uniandes.ecobites.ui.screens.home.HomeScreen
-import com.uniandes.ecobites.ui.theme.AppTheme
-import com.uniandes.ecobites.ui.components.NavBar
+import androidx.navigation.compose.rememberNavController
 import com.uniandes.ecobites.ui.SplashScreen
-import com.uniandes.ecobites.ui.screens.LoginScreen
-import io.github.jan.supabase.createSupabaseClient
+import com.uniandes.ecobites.ui.components.BiometricAuth
+import com.uniandes.ecobites.ui.navigation.NavigationHost
+import com.uniandes.ecobites.ui.theme.AppTheme
 import kotlinx.coroutines.delay
-import io.github.jan.supabase.auth.Auth
-import io.github.jan.supabase.postgrest.Postgrest
-
-val supabase = createSupabaseClient(
-    supabaseUrl = "https://nlhcaanwwchxdzdiyizf.supabase.co",
-    supabaseKey = "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJzdXBhYmFzZSIsInJlZiI6Im5saGNhYW53d2NoeGR6ZGl5aXpmIiwicm9sZSI6ImFub24iLCJpYXQiOjE3Mjc5MDc0OTQsImV4cCI6MjA0MzQ4MzQ5NH0.LrcRGkVH1qjPE09xDngX7wrtrUmfIYbTGrgbPKarTeM"
-) {
-    install(Auth)
-    install(Postgrest)
-    //install other modules
-}
+import com.google.firebase.FirebaseApp
+import com.google.firebase.analytics.FirebaseAnalytics
+import com.google.firebase.firestore.FirebaseFirestore
 
 class MainActivity : ComponentActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
+        val biometricAuth = BiometricAuth(this)
+        FirebaseApp.initializeApp(this)
+        // Opcional: Inicializar Firebase Analytics
+        val firebaseAnalytics = FirebaseAnalytics.getInstance(this)
+        // Inicialización de Firestore
+        val firestore = FirebaseFirestore.getInstance()
         setContent {
             AppTheme {
-                MyApp()
+                MyApp(biometricAuth)
             }
         }
     }
 }
 
 @Composable
-fun MyApp() {
+fun MyApp(biometricAuth: BiometricAuth) {
+    val navController = rememberNavController()  // Create the NavController
     var showSplashScreen by remember { mutableStateOf(true) }
-    var isLoggedIn by remember { mutableStateOf(false) } // Track login state
 
-    // Show splash screen for 3 seconds before navigating to the main content
+    // Show splash screen for 1.5 seconds before navigating to the main content
     LaunchedEffect(Unit) {
-        delay(3000) // 3 seconds delay
-        showSplashScreen = false // Hide splash screen after the delay
+        delay(1500)
+        showSplashScreen = false
     }
 
     if (showSplashScreen) {
-        SplashScreen() // Show splash screen
-    } else if (!isLoggedIn) {
-        LoginScreen(onLoginSuccess = { isLoggedIn = true }) // Pass a callback to update isLoggedIn
+        SplashScreen()
     } else {
-        MainContent() // Show main content if logged in
-    }
-}
-
-
-@Composable
-fun MainContent() {
-    var selectedTab by remember { mutableIntStateOf(0) }
-
-    Scaffold(
-        bottomBar = {
-            NavBar(selectedTab = selectedTab, onTabSelected = { tab -> selectedTab = tab })
-        }
-    ) { innerPadding ->
-        Box(modifier = Modifier.padding(innerPadding)) {
-            when (selectedTab) {
-                0 -> HomeScreen()
-                1 -> CartScreen()
-                3 -> ProfileScreen()
-            }
-        }
+        NavigationHost(navController = navController, biometricAuth = biometricAuth)  // Pass the NavController here
     }
 }
-

app/src/main/java/com/uniandes/ecobites/MenuCategory.kt

@@ -0,0 +1,8 @@
+package com.uniandes.ecobites
+
+import kotlinx.serialization.Serializable
+
+@Serializable
+class MenuCategory(
+    val menu: List<String>
+)