Merge remote-tracking branch 'origin/desarrollo' into BRNDEV

.vscode/settings.json

@@ -1,3 +1,4 @@
 {
-  "dart.flutterSdkPath": ".fvm/versions/3.16.9"
+  "dart.flutterSdkPath": ".fvm/versions/3.16.9",
+  "java.configuration.updateBuildConfiguration": "interactive"
 }

android/gradle.properties

@@ -1,3 +1,4 @@
 org.gradle.jvmargs=-Xmx4G
 android.useAndroidX=true
 android.enableJetifier=true
+org.gradle.java.home=/opt/homebrew/Cellar/openjdk@17/17.0.14/libexec/openjdk.jdk/Contents/Home

android/gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,7 @@
+#Wed Feb 26 19:48:01 MST 2025
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-all.zip
+org.gradle.java.home=/opt/homebrew/Cellar/openjdk@17/17.0.14/libexec/openjdk.jdk/Contents/Home

devtools_options.yaml

@@ -0,0 +1 @@
+extensions:

lib/main.dart

@@ -2,6 +2,7 @@ import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:provider/provider.dart';
 import 'package:sqflite_common_ffi/sqflite_ffi.dart';
+import 'package:turquessa_mesas_hoster/mvvm/views/home/carrito/Recojer_screen.dart';
 import 'package:turquessa_mesas_hoster/mvvm/views/home/carrito/carrito_screen.dart';
 import 'package:turquessa_mesas_hoster/mvvm/views/home/perfil/perfil_screen.dart';
 import 'package:turquessa_mesas_hoster/mvvm/views/home/producto/producto_screen.dart';
@@ -91,6 +92,7 @@ class MyApp extends StatelessWidget {
             ProductScreen(product: Product.staticSandwich()),
         'carrito': (context) => const CarritoScreen(),
         'perfil': (context) => const PerfilScreen(),
+        'Recojer': (context) => const RecojerScreen(),
       },
     );
   }

lib/mvvm/views/home/carrito/Recojer_screen.dart

@@ -0,0 +1,126 @@
+import 'package:flutter/material.dart';
+
+class RecojerScreen extends StatefulWidget {
+  const RecojerScreen({super.key});
+
+  @override
+  State<RecojerScreen> createState() => _parallevarScreenState();
+}
+
+class _parallevarScreenState extends State<RecojerScreen> {
+  String seleccionado = "";
+  final List<Map<String, dynamic>> items = [
+  {
+    'nombre': 'Hamburguesa de res',
+    'precio': '\$ 120.00',
+    'imageUrl':
+        'https://cdn.pixabay.com/photo/2016/03/05/19/02/hamburger-1238246_960_720.jpg',
+  },
+  {
+    'nombre': 'Hamburguesa de pollo',
+    'precio': '\$ 100.00',
+    'imageUrl':
+        'https://cdn.pixabay.com/photo/2016/03/05/19/02/hamburger-1238246_960_720.jpg',
+  },
+  {
+    'nombre': 'Hamburguesa de res',
+    'precio': '\$ 120.00',
+    'imageUrl':
+        'https://cdn.pixabay.com/photo/2016/03/05/19/02/hamburger-1238246_960_720.jpg',
+  },
+  {
+    'nombre': 'Hamburguesa de pollo',
+    'precio': '\$ 100.00',
+    'imageUrl':
+        'https://cdn.pixabay.com/photo/2016/03/05/19/02/hamburger-1238246_960_720.jpg',
+  },
+  {
+    'nombre': 'Hamburguesa de pollo',
+    'precio': '\$ 100.00',
+    'imageUrl':
+        'https://cdn.pixabay.com/photo/2016/03/05/19/02/hamburger-1238246_960_720.jpg',
+  },
+ ];
+
+
+  
+  @override
+  Widget build(BuildContext context) {
+    return Scaffold(
+      backgroundColor: Colors.white,
+      appBar: AppBar(
+         actions: const [],
+        title: const Row(
+          mainAxisAlignment: MainAxisAlignment.spaceBetween,
+          children: [
+            Text('Atrás'),
+            Column(
+              children: [
+                Text(
+                  'Su carrito',
+                  style: TextStyle(fontSize: 17, color: Colors.black54),
+                ),
+                Text(
+                  style: TextStyle(fontSize: 20, fontWeight: FontWeight.w800),
+                  'MXN 69.00',
+                )
+              ],
+            )
+          ],
+        ),
+      ),
+      bottomNavigationBar: BottomAppBar(
+        height: 100,
+        color: Colors.transparent,
+        child: Padding(
+          padding: const EdgeInsets.all(10),
+          child: Row(
+            mainAxisAlignment: MainAxisAlignment.center,
+            children: [
+              TextButton(
+                style: TextButton.styleFrom(
+                  minimumSize: const Size(350, 50),
+                  backgroundColor: Colors.black,
+                  foregroundColor: Colors.white,
+                  shape: RoundedRectangleBorder(
+                  borderRadius: BorderRadius.circular(10),
+                  ),
+                ),
+                onPressed: (){},
+                child: const Row(
+                  children: [
+                    Padding(
+                      padding: EdgeInsets.only(left:8),
+                      child: Text(
+                        'Pedir (MXN 69.00)',
+                        textAlign: TextAlign.center,
+                        style: TextStyle(
+                          fontSize: 17,
+                        ),
+                      ),
+                    )
+                  ],
+                ),
+              ),
+              
+            ],
+          ),
+        ),
+      ),
+      body:
+       const Padding(
+        padding:  EdgeInsets.all(8.0),
+        child: Column(
+          children: [
+             Padding(
+              padding: EdgeInsets.all(5),
+            ),
+            Row(
+              mainAxisAlignment: MainAxisAlignment.spaceBetween,
+            ),
+          ],
+        ),
+      ),
+    );
+  }
+}

lib/mvvm/views/home/carrito/carrito_screen.dart

@@ -25,6 +25,21 @@ class CarritoScreen extends StatefulWidget {
 }
 
 class _CarritoScreenState extends State<CarritoScreen> {
+  int value = 1;
+
+  void increment(){
+    setState(() {
+      value++;
+      });
+  }
+
+  void decrement(){
+    setState(() {
+      if(value > 1){
+        value--;
+      }
+    });
+  }
   @override
   Widget build(BuildContext context) {
     return Scaffold(

lib/mvvm/views/home/home_screen.dart

@@ -3,6 +3,7 @@ import 'package:provider/provider.dart';
 import 'package:turquessa_mesas_hoster/core/models/producto_model.dart';
 import 'package:turquessa_mesas_hoster/mvvm/viewmodels/pedido_view_model.dart';
 import 'package:turquessa_mesas_hoster/mvvm/viewmodels/producto_view_model.dart';
+import 'package:turquessa_mesas_hoster/mvvm/views/home/carrito/carrito_screen.dart';
 import 'package:turquessa_mesas_hoster/utils/widgets/custom_appbar.dart';
 import 'package:turquessa_mesas_hoster/mvvm/views/home/categorias_navbar.dart';
 import 'package:turquessa_mesas_hoster/mvvm/viewmodels/home_view_model.dart';