From 1b52f820ca712d79c9b4817312a47bd4e9578541 Mon Sep 17 00:00:00 2001
From: Sergio De la torre <sergiodt@verdnatura.es>
Date: Fri, 16 Jun 2023 08:02:01 +0200
Subject: [PATCH] version 23.24Beta

---
 .idea/workspace.xml                           | 23 +++++++++----------
 app/alpha/release/output-metadata.json        |  4 ++--
 app/beta/release/output-metadata.json         |  4 ++--
 app/build.gradle                              |  4 ++--
 .../fragments/LogExpeditionFragment.kt        |  3 +--
 .../delivery/fragments/SummaryFragment.kt     |  2 +-
 .../feature/main/activity/MainActivity.kt     |  3 +++
 7 files changed, 22 insertions(+), 21 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index ff56ea90..7861b17d 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -83,15 +83,14 @@
     </select>
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="fa688d1c-dbee-4864-9e33-4d84ef9afca8" name="Default Changelist" comment="refs #5322 NaturePhotos">
+    <list default="true" id="fa688d1c-dbee-4864-9e33-4d84ef9afca8" name="Default Changelist" comment="version 23.24Beta">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/photos/fragment/PhotosFragment.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/photos/fragment/PhotosFragment.kt" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/src/main/res/layout/fragment_photos.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/res/layout/fragment_photos.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/src/main/res/values-es/strings.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/res/values-es/strings.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/src/main/res/values-fr/strings.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/res/values-fr/strings.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/src/main/res/values-pt/strings.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/res/values-pt/strings.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/src/main/res/values/dimens.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/res/values/dimens.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/src/main/res/values/strings.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/res/values/strings.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/alpha/release/output-metadata.json" beforeDir="false" afterPath="$PROJECT_DIR$/app/alpha/release/output-metadata.json" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/beta/release/output-metadata.json" beforeDir="false" afterPath="$PROJECT_DIR$/app/beta/release/output-metadata.json" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/build.gradle" beforeDir="false" afterPath="$PROJECT_DIR$/app/build.gradle" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/delivery/fragments/LogExpeditionFragment.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/delivery/fragments/LogExpeditionFragment.kt" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/delivery/fragments/SummaryFragment.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/delivery/fragments/SummaryFragment.kt" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/main/activity/MainActivity.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/main/activity/MainActivity.kt" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -102,7 +101,7 @@
   <component name="CodeInsightWorkspaceSettings">
     <option name="optimizeImportsOnTheFly" value="true" />
   </component>
-  <component name="ExecutionTargetManager" SELECTED_TARGET="device_and_snapshot_combo_box_target[JN5PH6MNXGOF99ZT]" />
+  <component name="ExecutionTargetManager" SELECTED_TARGET="device_and_snapshot_combo_box_target[C:\Users\sergiodt\.android\avd\Pixel_6_API_30.avd]" />
   <component name="ExportToHTMLSettings">
     <option name="OPEN_IN_BROWSER" value="true" />
     <option name="OUTPUT_DIRECTORY" value="C:\Program Files\Android\Android Studio\inspections" />
@@ -260,7 +259,7 @@
   },
   &quot;keyToStringList&quot;: {
     &quot;ExportApk.BuildVariants&quot;: [
-      &quot;generalRelease&quot;
+      &quot;betaRelease&quot;
     ],
     &quot;com.android.tools.idea.sqlite.queryhistory&quot;: [
       &quot;select * from  expedition e where e.addressFk= 34915&quot;,
@@ -857,7 +856,6 @@
   </component>
   <component name="VcsManagerConfiguration">
     <option name="ADD_EXTERNAL_FILES_SILENTLY" value="true" />
-    <MESSAGE value="refs #5430" />
     <MESSAGE value="refs #5442" />
     <MESSAGE value="version 23.18.2Beta - Solucionado doble pitido, fusionada pantalla sacador, filtro a ubicador, quitado baldas." />
     <MESSAGE value="version 23.18.3Beta solucionado fallo ubicador. Añadido bbdd" />
@@ -882,7 +880,8 @@
     <MESSAGE value="refs #4678" />
     <MESSAGE value="refs #5713" />
     <MESSAGE value="refs #5322 NaturePhotos" />
-    <option name="LAST_COMMIT_MESSAGE" value="refs #5322 NaturePhotos" />
+    <MESSAGE value="version 23.24Beta" />
+    <option name="LAST_COMMIT_MESSAGE" value="version 23.24Beta" />
   </component>
   <component name="XDebuggerManager">
     <breakpoint-manager>
diff --git a/app/alpha/release/output-metadata.json b/app/alpha/release/output-metadata.json
index 3fc43f4a..8179f88d 100644
--- a/app/alpha/release/output-metadata.json
+++ b/app/alpha/release/output-metadata.json
@@ -11,8 +11,8 @@
       "type": "SINGLE",
       "filters": [],
       "attributes": [],
-      "versionCode": 187,
-      "versionName": "23.20Beta",
+      "versionCode": 200,
+      "versionName": "23.22.1Beta",
       "outputFile": "app-alpha-release.apk"
     }
   ],
diff --git a/app/beta/release/output-metadata.json b/app/beta/release/output-metadata.json
index 49f51179..cfa0802f 100644
--- a/app/beta/release/output-metadata.json
+++ b/app/beta/release/output-metadata.json
@@ -11,8 +11,8 @@
       "type": "SINGLE",
       "filters": [],
       "attributes": [],
-      "versionCode": 200,
-      "versionName": "23.22.1Beta",
+      "versionCode": 201,
+      "versionName": "23.24Beta",
       "outputFile": "app-beta-release.apk"
     }
   ],
diff --git a/app/build.gradle b/app/build.gradle
index 9c68420c..ce4e2a68 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -13,8 +13,8 @@ android {
         applicationId "es.verdnatura"
         minSdkVersion 24 //21
         targetSdkVersion 33
-        versionCode 200
-        versionName = "23.22.1Beta"
+        versionCode 201
+        versionName = "23.24Beta"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
 
diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/delivery/fragments/LogExpeditionFragment.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/delivery/fragments/LogExpeditionFragment.kt
index 8b3a0a35..dc5e2c44 100644
--- a/app/src/main/java/es/verdnatura/presentation/view/feature/delivery/fragments/LogExpeditionFragment.kt
+++ b/app/src/main/java/es/verdnatura/presentation/view/feature/delivery/fragments/LogExpeditionFragment.kt
@@ -73,8 +73,7 @@ class LogExpeditionFragment(
 
                     when (item) {
                         iconDelivery.drawable -> {
-                            openAppDelivery()
-                            requireActivity().finish()
+                            ma.openSummaryFragment(binding.route.text.toString().toInt(),"ON_DELIVERY")
                         }
                     }
                 }
diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/delivery/fragments/SummaryFragment.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/delivery/fragments/SummaryFragment.kt
index d064d428..832bd399 100644
--- a/app/src/main/java/es/verdnatura/presentation/view/feature/delivery/fragments/SummaryFragment.kt
+++ b/app/src/main/java/es/verdnatura/presentation/view/feature/delivery/fragments/SummaryFragment.kt
@@ -126,7 +126,7 @@ class SummaryFragment(
                         }
 
                         iconExit.drawable -> {
-                            ma.onBackPressed()
+                           requireActivity().finish()
 
                         }
                     }
diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/main/activity/MainActivity.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/main/activity/MainActivity.kt
index 74a8aa2a..8c7226da 100644
--- a/app/src/main/java/es/verdnatura/presentation/view/feature/main/activity/MainActivity.kt
+++ b/app/src/main/java/es/verdnatura/presentation/view/feature/main/activity/MainActivity.kt
@@ -887,6 +887,9 @@ class MainActivity : BaseActivity<ActivityMainBinding>(), OnPasillerosItemClickL
         // addFragmentOnTop(ControlVehiculoFragment.newInstance(tag))
     }
 
+    fun openSummaryFragment( route: Int, state: String) {
+        addFragmentOnTop(SummaryFragment.newInstance(getString(R.string.titleDeliverySummary),state,route))
+    }
     fun openFragmentPickers(delete: Boolean) {
         //delete_Fragments()
         fm.popBackStack(null, FragmentManager.POP_BACK_STACK_INCLUSIVE)