push git

rinkyn05 · Dec 2, 2024 · 48a5da0 · 48a5da0
1 parent e0f2bf3
commit 48a5da0
Show file tree

Hide file tree

Showing 21 changed files with 1,860 additions and 3,140 deletions.
diff --git a/android/app/build.gradle b/android/app/build.gradle
@@ -14,12 +14,12 @@ if (localPropertiesFile.exists()) {
 
 def flutterVersionCode = localProperties.getProperty('flutter.versionCode')
 if (flutterVersionCode == null) {
-    flutterVersionCode = '1'
+    flutterVersionCode = '2'
 }
 
 def flutterVersionName = localProperties.getProperty('flutter.versionName')
 if (flutterVersionName == null) {
-    flutterVersionName = '1.0'
+    flutterVersionName = '1.0.1'
 }
 
 android {
@@ -48,27 +48,39 @@ android {
         versionName flutterVersionName
     }
 
-    // Definir las propiedades del keystore
-    def keystoreProperties = new Properties()
-    def keystorePropertiesFile = rootProject.file("key.properties")
-    if (keystorePropertiesFile.exists()) {
-        keystoreProperties.load(new FileInputStream(keystorePropertiesFile))
-    }
-
-    // Configurar la firma para el modo release
+    // No necesitas la configuración del keystore local si usas Play App Signing
     signingConfigs {
-        release {
-            keyAlias keystoreProperties['keyAlias']
-            keyPassword keystoreProperties['keyPassword']
-            storeFile file(keystoreProperties['storeFile'])
-            storePassword keystoreProperties['storePassword']
-        }
+        // No se necesita esta sección si solo vas a usar Play App Signing
     }
+
     buildTypes {
         release {
-            signingConfig signingConfigs.release
+            // Google Play maneja la firma automáticamente
+            signingConfig null // No es necesario usar una firma local, ya que se usa la de Google Play
         }
     }
+
+    // Definir las propiedades del keystore
+    // def keystoreProperties = new Properties()
+    // def keystorePropertiesFile = rootProject.file("key.properties")
+    // if (keystorePropertiesFile.exists()) {
+    //     keystoreProperties.load(new FileInputStream(keystorePropertiesFile))
+    // }
+
+    // // Configurar la firma para el modo release
+    // signingConfigs {
+    //     release {
+    //         keyAlias keystoreProperties['keyAlias']
+    //         keyPassword keystoreProperties['keyPassword']
+    //         storeFile file(keystoreProperties['storeFile'])
+    //         storePassword keystoreProperties['storePassword']
+    //     }
+    // }
+    // buildTypes {
+    //     release {
+    //         signingConfig signingConfigs.release
+    //     }
+    // }
 }
 
 flutter {

diff --git a/android/app/google-services.json b/android/app/google-services.json
@@ -1,6 +1,7 @@
 {
   "project_info": {
     "project_number": "334278581961",
+    "firebase_url": "https://gabriel-coach-c7e30-default-rtdb.firebaseio.com",
     "project_id": "gabriel-coach-c7e30",
     "storage_bucket": "gabriel-coach-c7e30.appspot.com"
   },
@@ -13,6 +14,14 @@
         }
       },
       "oauth_client": [
+        {
+          "client_id": "334278581961-80cplf2n50kias5p0hvl5bbr5a5sgapq.apps.googleusercontent.com",
+          "client_type": 1,
+          "android_info": {
+            "package_name": "com.gabrielcoach.app",
+            "certificate_hash": "a634c3473ad20b0a38a126152f918a9a9c9ef806"
+          }
+        },
         {
           "client_id": "334278581961-hovn5qqv584210bfq7hcu0ce69h6r3p1.apps.googleusercontent.com",
           "client_type": 1,

diff --git a/assets/lang/en.json b/assets/lang/en.json
@@ -827,5 +827,7 @@
   "selectDescansoEntreSeriesTime": "Select rest time between sets",
   "metodoEntrenamiento": "Training Method",
   "cardioHiit": "Cardio/Hiit",
-  "selectCardioHiitTime": "Select Cardio/Hiit time"
+  "selectCardioHiitTime": "Select Cardio/Hiit time",
+  "filterTitle": "Search Filters",
+  "filter": "Filter"
 }
diff --git a/assets/lang/es.json b/assets/lang/es.json
@@ -836,5 +836,7 @@
   "selectDescansoEntreSeriesTime": "Seleccionar tiempo de descanso entre series",
   "metodoEntrenamiento": "Metodo de Entrenamiento",
   "cardioHiit": "Cardio/Hiit",
-  "selectCardioHiitTime": "Selecciona el tiempo para Cardio/Hiit"
+  "selectCardioHiitTime": "Selecciona el tiempo para Cardio/Hiit",
+  "filterTitle": "Filtros de Busqueda",
+  "filter": "Filtrar"
 }
diff --git a/lib/backend/calentamiento_fisico/add_calentameinto_f_screen copy.dart b/lib/backend/calentamiento_fisico/add_calentameinto_f_screen copy.dart