From a47568156f59eba9e5062193780240d585529fbf Mon Sep 17 00:00:00 2001
From: Sergio De la torre <sergiodt@verdnatura.es>
Date: Fri, 24 Feb 2023 10:58:52 +0100
Subject: [PATCH] =?UTF-8?q?A=C3=B1adido=20QR=20a=20pantalla=20Ubicador->A?=
 =?UTF-8?q?=C3=B1adir=20=C3=ADtem=20(rayo=20y=20s=C3=ADmbolo=20+)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/workspace.xml                           | 24 +++++++-------
 app/build.gradle                              |  5 ++-
 .../fragment/AutomaticAddItemFragment.kt      | 30 +++++++++++++-----
 .../ubicador/fragment/UbicadorFragment.kt     | 31 +++++++++++++++++--
 .../component_custom_ubicador_dialog.xml      |  1 -
 5 files changed, 64 insertions(+), 27 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 2b2b18a1..a2ef4795 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -83,20 +83,13 @@
     </select>
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="fa688d1c-dbee-4864-9e33-4d84ef9afca8" name="Default Changelist" comment="Expandible recycler final">
-      <change afterPath="$PROJECT_DIR$/app/beta/app-beta.apk" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/app/beta/release/app-beta-release.apk" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/app/beta/release/output-metadata.json" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/app/general/release/output-metadata.json" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/app/general/release/vn-picking.apk" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.gitignore" beforeDir="false" afterPath="$PROJECT_DIR$/.gitignore" afterDir="false" />
+    <list default="true" id="fa688d1c-dbee-4864-9e33-4d84ef9afca8" name="Default Changelist" comment="Expandible recyclerViewer">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/beta/output-metadata.json" beforeDir="false" afterPath="$PROJECT_DIR$/app/beta/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/google-services.json" beforeDir="false" afterPath="$PROJECT_DIR$/app/google-services.json" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/release/output-metadata.json" beforeDir="false" afterPath="$PROJECT_DIR$/app/release/output-metadata.json" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/login/fragment/LoginFragment.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/login/fragment/LoginFragment.kt" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/build.gradle" beforeDir="false" afterPath="$PROJECT_DIR$/build.gradle" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/component/CustomDialogUbicador.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/component/CustomDialogUbicador.kt" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/ubicador/fragment/AutomaticAddItemFragment.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/ubicador/fragment/AutomaticAddItemFragment.kt" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/ubicador/fragment/UbicadorFragment.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/ubicador/fragment/UbicadorFragment.kt" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/src/main/res/layout/component_custom_ubicador_dialog.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/res/layout/component_custom_ubicador_dialog.xml" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -107,7 +100,7 @@
   <component name="CodeInsightWorkspaceSettings">
     <option name="optimizeImportsOnTheFly" value="true" />
   </component>
-  <component name="ExecutionTargetManager" SELECTED_TARGET="device_and_snapshot_combo_box_target[C:\Users\sergiodt\.android\avd\Pixel_2_API_24.avd]" />
+  <component name="ExecutionTargetManager" SELECTED_TARGET="device_and_snapshot_combo_box_target[21114523025303]" />
   <component name="ExportToHTMLSettings">
     <option name="OPEN_IN_BROWSER" value="true" />
     <option name="OUTPUT_DIRECTORY" value="C:\Program Files\Android\Android Studio\inspections" />
@@ -243,6 +236,8 @@
   &quot;keyToString&quot;: {
     &quot;ApkExportedModule&quot;: &quot;Gestor_Almacén.app&quot;,
     &quot;ExportApk.ApkPathForGestor_Almacén.app&quot;: &quot;C:\\Users\\sergiodt\\AndroidStudioProjects\\vn-warehouseManager\\app&quot;,
+    &quot;RunOnceActivity.OpenProjectViewOnStart&quot;: &quot;true&quot;,
+    &quot;RunOnceActivity.ShowReadmeOnStart&quot;: &quot;true&quot;,
     &quot;RunOnceActivity.cidr.known.project.marker&quot;: &quot;true&quot;,
     &quot;cidr.known.project.marker&quot;: &quot;true&quot;,
     &quot;com.google.services.firebase.aqiPopupShown&quot;: &quot;true&quot;,
@@ -903,6 +898,9 @@
         <watch expression="t" />
         <watch expression="t" />
       </configuration>
+      <inline-watch fileUrl="file://$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/common/itemScanned.kt" line="57">
+        <watch expression="table" language="kotlin" />
+      </inline-watch>
     </watches-manager>
   </component>
 </project>
\ No newline at end of file
diff --git a/app/build.gradle b/app/build.gradle
index 05c4714c..478bf0b0 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -13,9 +13,8 @@ android {
         applicationId "es.verdnatura"
         minSdkVersion 24 //21
         targetSdkVersion 33
-        versionCode 161
-        //versionName = "23.4" versionCode 157
-        versionName = "23.4Beta"
+        versionCode 162
+        versionName = "23.6Beta"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
 
diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/ubicador/fragment/AutomaticAddItemFragment.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/ubicador/fragment/AutomaticAddItemFragment.kt
index 4a2721d6..60efaaa9 100644
--- a/app/src/main/java/es/verdnatura/presentation/view/feature/ubicador/fragment/AutomaticAddItemFragment.kt
+++ b/app/src/main/java/es/verdnatura/presentation/view/feature/ubicador/fragment/AutomaticAddItemFragment.kt
@@ -8,9 +8,9 @@ import es.verdnatura.R
 import es.verdnatura.databinding.FragmentAutomaticAddItemBinding
 import es.verdnatura.presentation.base.BaseFragment
 import es.verdnatura.presentation.common.OnAutomaticItemClickListener
+import es.verdnatura.presentation.common.itemScanValue
 import es.verdnatura.presentation.view.feature.ubicador.adapter.AutomaticAdapter
 import es.verdnatura.presentation.view.feature.ubicador.model.ItemEscanerVO
-import java.lang.Boolean.FALSE
 import java.lang.Boolean.TRUE
 
 
@@ -71,12 +71,26 @@ class AutomaticAddItemFragment(
     private fun setEvents() {
         binding.editMatricula.requestFocus()
         binding.editMatricula.setOnEditorActionListener { v, actionId, event ->
+
             if (actionId == EditorInfo.IME_ACTION_SEARCH || actionId == EditorInfo.IME_ACTION_DONE || actionId == 0 || actionId == 5) {
                 if (!binding.editMatricula.text.toString().isNullOrEmpty()) {
                     contador += 1
                     setSubtitle()
-                    listItems.add(0, ItemEscanerVO(binding.editMatricula.text.toString().toInt()))
-                    adapter!!.notifyDataSetChanged()
+                    try {
+                        listItems.add(
+                            0, ItemEscanerVO(
+                                itemScanValue(
+
+                                    binding.editMatricula.text.toString(),
+                                    "buy",
+                                    "more"
+                                ).toString().toInt()
+                            )
+                        )
+                        adapter!!.notifyDataSetChanged()
+                    } catch (ex: Exception) {
+                        ma.messageWithSound(ex.message.toString(), true, true)
+                    }
                 }
                 binding.editMatricula.setText("")
                 ma.hideKeyboard(binding.editMatricula)
@@ -104,11 +118,11 @@ class AutomaticAddItemFragment(
                     getDataInt(WAREHOUSEFK)
                 )
             } else {
-               /* viewModel.itemShelving_addList(
-                    shelvingFk,
-                    "" + listInt + "",
-                    FALSE,
-                    getDataInt(WAREHOUSEFK))*/
+                /* viewModel.itemShelving_addList(
+                     shelvingFk,
+                     "" + listInt + "",
+                     FALSE,
+                     getDataInt(WAREHOUSEFK))*/
                 viewModel.itemShelvingMake_multi(
                     shelvingFk,
                     listString,
diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/ubicador/fragment/UbicadorFragment.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/ubicador/fragment/UbicadorFragment.kt
index 492f4cdc..7eeb8ddb 100644
--- a/app/src/main/java/es/verdnatura/presentation/view/feature/ubicador/fragment/UbicadorFragment.kt
+++ b/app/src/main/java/es/verdnatura/presentation/view/feature/ubicador/fragment/UbicadorFragment.kt
@@ -6,6 +6,7 @@ import android.graphics.drawable.Drawable
 import android.media.MediaPlayer
 import android.os.Build
 import android.os.Bundle
+import android.util.Log
 import android.view.View
 import android.view.View.GONE
 import android.view.View.VISIBLE
@@ -492,9 +493,9 @@ class UbicadorFragment(
                             }
                         }
 
-                        if (!binding.mainToolbar.switchButton.isChecked && listItems.isNotEmpty()){
+                        if (!binding.mainToolbar.switchButton.isChecked && listItems.isNotEmpty()) {
 
-                            listItems=  listItems.asReversed()
+                            listItems = listItems.asReversed()
                         }
                         adapter = UbicadorAdapter(
                             listItems.sortedBy { it.isChecked },
@@ -706,6 +707,32 @@ class UbicadorFragment(
             false
         }
 
+        customDialogUbicador.getEditItem().setOnEditorActionListener { v, actionId, event ->
+            if (actionId == EditorInfo.IME_ACTION_SEARCH || actionId == EditorInfo.IME_ACTION_DONE || actionId == 0) {
+
+                if (!customDialogUbicador.getItemValue().isNullOrEmpty()) {
+                    try {
+
+                        customDialogUbicador.setItemValue(
+                            itemScanValue(
+                                customDialogUbicador.getItemValue(),
+                                "buy",
+                                "more"
+                            ).toString()
+                        )
+
+                    } catch (ex:Exception){
+                        ma.messageWithSound(ex.message.toString(), true, true)
+                        customDialogUbicador.setItemValue("")
+                    }
+                }
+
+                return@setOnEditorActionListener false
+            }
+
+            customDialogUbicador.getPackingItem().requestFocus()
+        }
+
         customDialogUbicador.getEtiquetaItem().setOnEditorActionListener { v, actionId, event ->
             if (actionId == EditorInfo.IME_ACTION_SEARCH || actionId == EditorInfo.IME_ACTION_DONE || actionId == 0) {
                 var packingUpdate = false
diff --git a/app/src/main/res/layout/component_custom_ubicador_dialog.xml b/app/src/main/res/layout/component_custom_ubicador_dialog.xml
index 2300d149..8822e67f 100644
--- a/app/src/main/res/layout/component_custom_ubicador_dialog.xml
+++ b/app/src/main/res/layout/component_custom_ubicador_dialog.xml
@@ -42,7 +42,6 @@
                 android:layout_width="match_parent"
                 android:backgroundTint="@android:color/white"
                 android:hint="ItemFk"
-                android:inputType="number"
                 android:lines="1"
                 android:maxLines="1"
                 android:textColor="@color/verdnatura_white"