Strings y serialNumber

.idea/workspace.xml

@@ -83,10 +83,15 @@
     </select>
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="fa688d1c-dbee-4864-9e33-4d84ef9afca8" name="Default Changelist" comment="refs #4765 Refactor">
+    <list default="true" id="fa688d1c-dbee-4864-9e33-4d84ef9afca8" name="Default Changelist" comment="refs #4830">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" 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/base/BaseFragment.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/base/BaseFragment.kt" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/ajustes/fragment/AjustesFragment.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/ajustes/fragment/AjustesFragment.kt" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/collection/fragment/CollectionFragment.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/collection/fragment/CollectionFragment.kt" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/src/main/res/layout/fragment_ajustes.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/res/layout/fragment_ajustes.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/strings.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/res/values/strings.xml" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -183,7 +188,7 @@
     </option>
     <option name="RECENT_BRANCH_BY_REPOSITORY">
       <map>
-        <entry key="$PROJECT_DIR$" value="testBeta_5336" />
+        <entry key="$PROJECT_DIR$" value="testBeta_embalajes_pantallas" />
       </map>
     </option>
     <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
@@ -398,13 +403,6 @@
       <option name="presentableId" value="Default" />
       <updated>1618825571576</updated>
     </task>
-    <task id="LOCAL-00076" summary="Version 9.1Beta- Filtro inventario">
-      <created>1663835246994</created>
-      <option name="number" value="00076" />
-      <option name="presentableId" value="LOCAL-00076" />
-      <option name="project" value="LOCAL" />
-      <updated>1663835246994</updated>
-    </task>
     <task id="LOCAL-00077" summary="Version 9.1Beta- Modificar original y originalQuantity">
       <created>1663849445751</created>
       <option name="number" value="00077" />
@@ -741,7 +739,14 @@
       <option name="project" value="LOCAL" />
       <updated>1681201009354</updated>
     </task>
-    <option name="localTasksCounter" value="125" />
+    <task id="LOCAL-00125" summary="refs #4830">
+      <created>1681292397190</created>
+      <option name="number" value="00125" />
+      <option name="presentableId" value="LOCAL-00125" />
+      <option name="project" value="LOCAL" />
+      <updated>1681292397191</updated>
+    </task>
+    <option name="localTasksCounter" value="126" />
     <servers />
   </component>
   <component name="Vcs.Log.History.Properties">
@@ -842,7 +847,6 @@
   </component>
   <component name="VcsManagerConfiguration">
     <option name="ADD_EXTERNAL_FILES_SILENTLY" value="true" />
-    <MESSAGE value="Version 9.6Beta en test: paletizadores" />
     <MESSAGE value="Version 9.6Beta. TEST5: imprimir ok, ubicador ok, no se cierra app sacador" />
     <MESSAGE value="Version 9.6Beta. TEST6-final: Modificando llamadas con clase" />
     <MESSAGE value="Version 9.6Beta. TEST6-final: Modificando llamadas a SilexCallback (AjustesFragment)" />
@@ -867,9 +871,19 @@
     <MESSAGE value="version 23.10.1 Modificar controlador orden" />
     <MESSAGE value="refs #4765" />
     <MESSAGE value="refs #4765 Refactor" />
-    <option name="LAST_COMMIT_MESSAGE" value="refs #4765 Refactor" />
+    <MESSAGE value="refs #4830" />
+    <option name="LAST_COMMIT_MESSAGE" value="refs #4830" />
   </component>
   <component name="XDebuggerManager">
+    <breakpoint-manager>
+      <breakpoints>
+        <line-breakpoint enabled="true" type="kotlin-line">
+          <url>file://$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/collection/fragment/CollectionFragment.kt</url>
+          <line>313</line>
+          <option name="timeStamp" value="5" />
+        </line-breakpoint>
+      </breakpoints>
+    </breakpoint-manager>
     <pin-to-top-manager>
       <pinned-members>
         <PinnedItemInfo parentTag="java.net.SocketException" memberName="detailMessage" />

app/build.gradle

@@ -13,8 +13,8 @@ android {
         applicationId "es.verdnatura"
         minSdkVersion 24 //21
         targetSdkVersion 33
-        versionCode 176
+        versionCode 177
-        versionName = "23.10"
+        versionName = "23.14Beta"
         //versionName = "23.10" versionCode 174
         //versionName = "23.10.2Beta" versionCode 174
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"

app/src/main/java/es/verdnatura/presentation/base/BaseFragment.kt

@@ -539,7 +539,7 @@ abstract class BaseFragment<T : ViewDataBinding, V : BaseViewModel>(viewModelCla
             "ENTRYTYPE" -> prefs.getString(name, "").toString()
             "ENTRYNUMBERIMAGES" -> prefs.getString(name, "0").toString()
             "ENTRYOBSERVATIONS" -> prefs.getString(name, "").toString()
-
+            "SERIALNUMBER" -> prefs.getString(name, "").toString()
 
             "base_url" -> {
                 val preferences = PreferenceManager.getDefaultSharedPreferences(context)

app/src/main/java/es/verdnatura/presentation/view/feature/ajustes/fragment/AjustesFragment.kt

@@ -15,7 +15,9 @@ import es.verdnatura.databinding.FragmentAjustesBinding
 import es.verdnatura.domain.notNull
 import es.verdnatura.presentation.base.BaseFragment
 import es.verdnatura.presentation.common.OnAjustesItemClickListener
+import es.verdnatura.presentation.common.hideKeyboard
 import es.verdnatura.presentation.view.component.CustomDialog
+import es.verdnatura.presentation.view.component.CustomDialogInput
 import es.verdnatura.presentation.view.feature.ajustes.adapter.AjustesAdapter
 import es.verdnatura.presentation.view.feature.ajustes.model.AjustesItemVO
 import es.verdnatura.presentation.view.feature.ajustes.model.Printers
@@ -28,6 +30,7 @@ class AjustesFragment :
     BaseFragment<FragmentAjustesBinding, AjustesViewModel>(AjustesViewModel::class) {
 
     private lateinit var customDialog: CustomDialog
+    private lateinit var customDialogInput: CustomDialogInput
     private var sectorListVO: List<SectorItemVO> = listOf()
     private var printersList: List<Printers> = listOf()
     private var trainsList: List<Train> = listOf()
@@ -44,11 +47,13 @@ class AjustesFragment :
     companion object {
         fun newInstance() = AjustesFragment()
     }
+
     override fun getLayoutId(): Int = R.layout.fragment_ajustes
 
     override fun onCreate(savedInstanceState: Bundle?) {
         prefs = requireActivity().getSharedPreferences(PREFS_USER, 0)
         customDialog = CustomDialog(requireContext())
+        customDialogInput = CustomDialogInput(requireContext())
         super.onCreate(savedInstanceState)
 
     }
@@ -65,11 +70,12 @@ class AjustesFragment :
             requireActivity().packageName,
             0
         ).versionName!!
-        binding.itemVersion.setText(versionName)
+        binding.itemVersion.text = versionName
+        binding.androididText.text = getData(ANDROID_ID)
+
+        // Tarea 4815
+        // binding.serialNumber.text = getData("SERIALNUMBER")
 
-        binding.androididText.setText(
-            getData(ANDROID_ID)
-        )
         binding.txtserver.setText(getData(getString(R.string.baseurl)))
         super.init()
 
@@ -80,6 +86,22 @@ class AjustesFragment :
     fun setEvents() {
         binding.androididText.setOnClickListener { copyanddrag(binding.androididText.text.toString()) }
         binding.androididText.setOnLongClickListener { copyanddrag(binding.androididText.text.toString()) }
+        binding.serialText.setOnLongClickListener {
+            customDialogInput.setTitle(getString(R.string.serialNumberDescrip))
+                .setDescription(getString(R.string.serialNumber))
+                .setOkButton(getString(R.string.save)) {
+                    saveData("SERIALNUMBER",customDialogInput.getValue())
+                    binding.serialNumber.text = customDialogInput.getValue()
+                    ma.hideKeyboard()
+                    customDialogInput.dismiss()
+                }.setKoButton(getString(R.string.cancel)){
+                    customDialogInput.dismiss()
+                }
+                .show()
+            customDialogInput.setFocusText()
+            true
+        }
+
     }
 
     override fun observeViewModel() {
@@ -91,7 +113,7 @@ class AjustesFragment :
                     if (item.action) {
 
                         if (item.id == 0) {
-                            binding.splashProgress.visibility =VISIBLE
+                            binding.splashProgress.visibility = VISIBLE
                             // viewModel.getSectors(getData(USER),getData(PASSWORD))
                             viewModel.getSectorsSalix()
                         } else if (item.id == 5) {
@@ -100,7 +122,7 @@ class AjustesFragment :
                             //Tarea 4351 quitar parte de mostrar los carros y quitar del layout el ">" del final
 
                             ma.messageWithSound(
-                                "El número de carros ahora solo se puede modificar por los encargados",
+                                getString(R.string.managerWagon),
                                 true,
                                 true,
                                 "Información",
@@ -125,7 +147,7 @@ class AjustesFragment :
                             )
 
                         } else if (item.id == 6) {
-                            binding.splashProgress.visibility=VISIBLE
+                            binding.splashProgress.visibility = VISIBLE
                             viewModel.train_get()
                         } else if (item.id == 7) {
                             viewModel.getItemPackingTypeSalix()
@@ -205,7 +227,7 @@ class AjustesFragment :
             }
             loadUpdatePacking.observe(viewLifecycleOwner) { event ->
                 event.getContentIfNotHandled().notNull {
-                binding.splashProgress.visibility=View.GONE
+                    binding.splashProgress.visibility = View.GONE
                 }
             }
 
@@ -218,16 +240,12 @@ class AjustesFragment :
                     if (it.isError) it.errorMessage else {
                         getString(R.string.itemUpdated)
                     }, it.isError, false
-                )}
+                )
+            }
 
             workerupdatePrinter.observe(viewLifecycleOwner) {
                 binding.splashProgress.visibility = View.GONE
 
-              /*  ma.messageWithSound(
-                    if (it.isError) it.errorMessage else {
-                        getString(R.string.printerUpdated)
-                    }, it.isError, false
-                )*/
             }
             isLoadingProgress.observe(viewLifecycleOwner) {
                 binding.splashProgress.visibility = it
@@ -429,7 +447,7 @@ class AjustesFragment :
                     editor.apply()
 
                     viewModel.ajustesitem[3].selected = it.name
-                    binding.splashProgress.visibility=VISIBLE
+                    binding.splashProgress.visibility = VISIBLE
                     viewModel.operator_updateTrain(
                         it.id!!
                     )

app/src/main/java/es/verdnatura/presentation/view/feature/collection/fragment/CollectionFragment.kt

@@ -309,6 +309,8 @@ class CollectionFragment(
                 if (!customDialogList.getValue().isEmpty()) {
                     ma.hideKeyboard(customDialogList.getEditText())
                     var saleGroupScanned = customDialogList.getValue()
+                    isScanned =
+                        event != null && event.action == ACTION_DOWN && event.keyCode == KeyEvent.KEYCODE_ENTER
                     markPrevia(saleGroupScanned)
                     customDialogList.dismiss()
                 }

app/src/main/res/layout/fragment_ajustes.xml

@@ -45,7 +45,7 @@
                 >
 
                 <TextView
-                    android:layout_width="wrap_content"
+                    android:layout_width="120dp"
                     android:layout_height="wrap_content"
                     android:layout_marginRight="@dimen/default_layout_margin"
                     android:text="@string/Versión"
@@ -58,7 +58,7 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:text=""
-                    android:layout_marginLeft="@dimen/layout_margin_8"
+                    android:layout_marginLeft="@dimen/layout_margin_4"
                     android:textColor="@color/verdnatura_white"
                     android:textSize="@dimen/body1"/>
 
@@ -70,7 +70,7 @@
                 android:orientation="horizontal">
 
                 <TextView
-                    android:layout_width="wrap_content"
+                    android:layout_width="120dp"
                     android:layout_height="wrap_content"
                     android:text="@string/Usuario"
                     android:textColor="@color/verdnatura_white"
@@ -83,7 +83,7 @@
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:text=""
-                    android:layout_marginLeft="@dimen/layout_margin_8"
+                    android:layout_marginLeft="@dimen/layout_margin_4"
                     android:textColor="@color/verdnatura_white"
                     android:textSize="@dimen/body1"/>
 
@@ -92,7 +92,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content">
                 <TextView
-                    android:layout_width="wrap_content"
+                    android:layout_width="120dp"
                     android:layout_height="wrap_content"
                     android:text="@string/Androidid"
                     android:textColor="@color/verdnatura_white"
@@ -105,11 +105,35 @@
                     android:layout_width="match_parent"
                     android:layout_height="match_parent"
                     android:text=""
-                    android:layout_marginLeft="@dimen/layout_margin_6"
+                    android:layout_marginLeft="@dimen/layout_margin_4"
                     android:tooltipText="@string/copied"
                     android:textColor="@color/verdnatura_white"
                     android:textSize="@dimen/body1"/>
             </LinearLayout>
+            <LinearLayout
+                android:visibility="gone"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content">
+
+                <TextView
+                    android:id="@+id/serial_text"
+                    android:layout_width="120dp"
+                    android:layout_height="match_parent"
+                    android:layout_marginRight="@dimen/default_layout_margin"
+                    android:text="@string/serialNumber"
+                    android:textColor="@color/verdnatura_white"
+                    android:textSize="@dimen/body1"
+                    android:textStyle="bold" />
+
+                <TextView
+                    android:id="@+id/serial_number"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:text=""
+                    android:layout_marginLeft="@dimen/layout_margin_4"
+                    android:textColor="@color/verdnatura_white"
+                    android:textSize="@dimen/body1"/>
+            </LinearLayout>
             <LinearLayout
                 android:visibility="gone"
                 android:layout_width="match_parent"

app/src/main/res/values-es/strings.xml

@@ -552,5 +552,8 @@
     <string name="errorInput">Elemento introducido no válido</string>
     <string name="titlePackingHolland">Packing Holanda</string>
     <string name="titlePackingHollandDescrip">Permite moficar el packing de los ítems de Holanda</string>
+    <string name="serialNumber">Número serie</string>
+    <string name="managerWagon">El número de carros ahora solo se puede modificar por los encargados</string>
+    <string name="serialNumberDescrip">Va a modificar el número de serie asociado a su dispositivo.</string>
 
 </resources>

app/src/main/res/values/strings.xml

@@ -134,6 +134,8 @@
     <string name="InTimed">From</string>
     <string name="OutTimed">Until</string>
     <string name="Androidid">Android_id</string>
+    <string name="serialNumber">Serial Number</string>
+    <string name="serialNumberDescrip">You are going to change the Serial Number. Be carefull</string>
     <string name="copied">Copied</string>
     <string name="typeTags">Tags type</string>
     <string name="deviceName">Device name :</string>
@@ -551,5 +553,6 @@
     <string name="modify">Modify</string>
     <string name="problemUpdate">It\'s not possible to update. Problem with the download of app</string>
     <string name="packingQuantity">"Introduce new packing for the item : "</string>
+    <string name="managerWagon">The number of wagons can now only be changed by managers</string>
 
 </resources>