From a781fe31c726c26fcd2398d5524e1feceb9e151a Mon Sep 17 00:00:00 2001
From: Sergio De la torre <sergiodt@verdnatura.es>
Date: Mon, 27 Feb 2023 08:41:36 +0100
Subject: [PATCH] refs #4679

---
 .idea/workspace.xml                           | 59 ++++++++----------
 .../view/feature/delivery/InfoFragment.kt     |  4 +-
 .../view/feature/delivery/InfoViewModel.kt    |  5 +-
 .../feature/delivery/model/InfoCompany.kt     | 10 +--
 app/src/main/res/layout/fragment_info.xml     | 61 ++++++++-----------
 app/src/main/res/values-es/strings.xml        |  3 +
 app/src/main/res/values/strings.xml           |  5 +-
 7 files changed, 69 insertions(+), 78 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 6f656965..6d9ceddb 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -83,21 +83,12 @@
     </select>
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="fa688d1c-dbee-4864-9e33-4d84ef9afca8" name="Default Changelist" comment="refs #5054. Crashlytics. versionApp: 23.4">
-      <change afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/delivery/InfoFragment.kt" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/delivery/InfoViewModel.kt" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/delivery/model/InfoCompany.kt" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/app/src/main/res/drawable/expedition_find.xml" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/app/src/main/res/drawable/ic_info.xml" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/app/src/main/res/layout/fragment_info.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/assetWizardSettings.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/assetWizardSettings.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/misc.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/misc.xml" afterDir="false" />
+    <list default="true" id="fa688d1c-dbee-4864-9e33-4d84ef9afca8" name="Default Changelist" comment="Añadido QR a pantalla Ubicador-&gt;Añadir ítem (rayo y símbolo +)">
       <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/di/viewModelModule.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/di/viewModelModule.kt" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/domain/VerdnaturaService.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/domain/VerdnaturaService.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" />
-      <change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/pasillero/fragment/PasilleroFragment.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/pasillero/fragment/PasilleroFragment.kt" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/pasillero/fragment/PasilleroViewModel.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/pasillero/fragment/PasilleroViewModel.kt" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/delivery/InfoFragment.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/delivery/InfoFragment.kt" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/delivery/InfoViewModel.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/delivery/InfoViewModel.kt" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/delivery/model/InfoCompany.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/delivery/model/InfoCompany.kt" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/src/main/res/layout/fragment_info.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/res/layout/fragment_info.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>
@@ -110,7 +101,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" />
@@ -242,28 +233,28 @@
     <option name="showLibraryContents" value="true" />
     <option name="showMembers" value="true" />
   </component>
-  <component name="PropertiesComponent"><![CDATA[{
-  "keyToString": {
-    "ApkExportedModule": "Gestor_Almacén.app",
-    "ExportApk.ApkPathForGestor_Almacén.app": "C:\\Users\\sergiodt\\AndroidStudioProjects\\vn-warehouseManager\\app",
-    "RunOnceActivity.OpenProjectViewOnStart": "true",
-    "RunOnceActivity.ShowReadmeOnStart": "true",
-    "RunOnceActivity.cidr.known.project.marker": "true",
-    "cidr.known.project.marker": "true",
-    "com.google.services.firebase.aqiPopupShown": "true",
-    "last_opened_file_path": "C:/Users/sergiodt/AndroidStudioProjects/vn-warehouseManager/app/src/main/res/layout",
-    "project.structure.last.edited": "Modules",
-    "project.structure.proportion": "0.17",
-    "project.structure.side.proportion": "0.2",
-    "run.code.analysis.last.selected.profile": "pProject Default",
-    "settings.editor.selected.configurable": "reference.settingsdialog.project.gradle"
+  <component name="PropertiesComponent">{
+  &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;,
+    &quot;last_opened_file_path&quot;: &quot;C:/Users/sergiodt/AndroidStudioProjects/vn-warehouseManager/app/src/main/res/layout&quot;,
+    &quot;project.structure.last.edited&quot;: &quot;Modules&quot;,
+    &quot;project.structure.proportion&quot;: &quot;0.17&quot;,
+    &quot;project.structure.side.proportion&quot;: &quot;0.2&quot;,
+    &quot;run.code.analysis.last.selected.profile&quot;: &quot;pProject Default&quot;,
+    &quot;settings.editor.selected.configurable&quot;: &quot;reference.settingsdialog.project.gradle&quot;
   },
-  "keyToStringList": {
-    "ExportApk.BuildVariants": [
-      "generalRelease"
+  &quot;keyToStringList&quot;: {
+    &quot;ExportApk.BuildVariants&quot;: [
+      &quot;generalRelease&quot;
     ]
   }
-}]]></component>
+}</component>
   <component name="PsdUISettings">
     <option name="MODULE_TAB" value="Default Config" />
     <option name="LAST_EDITED_SIGNING_CONFIG" value="debug" />
diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/delivery/InfoFragment.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/delivery/InfoFragment.kt
index ccacda33..2295ce68 100644
--- a/app/src/main/java/es/verdnatura/presentation/view/feature/delivery/InfoFragment.kt
+++ b/app/src/main/java/es/verdnatura/presentation/view/feature/delivery/InfoFragment.kt
@@ -49,11 +49,11 @@ class InfoFragment(var title: String) :
     override fun observeViewModel() {
         with(viewModel) {
 
-
             companyInfo.observe(viewLifecycleOwner) {
                 binding.splashProgress.visibility = View.GONE
 
-                d("VERDNATURA::", "" + it.toString())
+                d("VERDNATURA::", "" + it.name)
+
                 //saveDataInt(NUMBEROFWAGONS, it.response!!)
 
             }
diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/delivery/InfoViewModel.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/delivery/InfoViewModel.kt
index 370730f1..ae8b41b9 100644
--- a/app/src/main/java/es/verdnatura/presentation/view/feature/delivery/InfoViewModel.kt
+++ b/app/src/main/java/es/verdnatura/presentation/view/feature/delivery/InfoViewModel.kt
@@ -14,7 +14,8 @@ class InfoViewModel(val context: Context) : BaseViewModel(context) {
 
 
     private val _companyInfo by lazy { MutableLiveData<DeliveryInfo>() }
-    val companyInfo: LiveData<DeliveryInfo> = _companyInfo
+    val companyInfo: LiveData<DeliveryInfo>
+    get() = _companyInfo
 
     fun getInfoCompany(
          userId:Int
@@ -26,7 +27,7 @@ class InfoViewModel(val context: Context) : BaseViewModel(context) {
                 override fun onSuccess(response: Response<DeliveryInfo?>) {
 
                     _companyInfo.value =
-                        DeliveryInfo(response.body()!!)
+                       response.body()!!
 
                 }
 
diff --git a/app/src/main/java/es/verdnatura/presentation/view/feature/delivery/model/InfoCompany.kt b/app/src/main/java/es/verdnatura/presentation/view/feature/delivery/model/InfoCompany.kt
index b240055a..76000e1d 100644
--- a/app/src/main/java/es/verdnatura/presentation/view/feature/delivery/model/InfoCompany.kt
+++ b/app/src/main/java/es/verdnatura/presentation/view/feature/delivery/model/InfoCompany.kt
@@ -2,9 +2,9 @@ package es.verdnatura.presentation.view.feature.delivery.model
 
 
 class DeliveryInfo(
-    private val name: DeliveryInfo? = null,
-    private val street: String? = null,
-    private val city: String? = null,
-    private val nif: String? = null,
-    private val postCode: String? = null
+    var name: String = "",
+    var street: String = "",
+    var city: String = "",
+    var nif: String = "",
+    var postCode: String = ""
 )
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_info.xml b/app/src/main/res/layout/fragment_info.xml
index 007814c5..0b696317 100644
--- a/app/src/main/res/layout/fragment_info.xml
+++ b/app/src/main/res/layout/fragment_info.xml
@@ -3,19 +3,18 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
    >
+    <data>
+        <variable
+            name="item"
+            type="es.verdnatura.presentation.view.feature.delivery.model.DeliveryInfo" />
+    </data>
 
     <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:background="@color/verdnatura_black">
 
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            app:layout_constraintTop_toBottomOf="@+id/main_toolbar">
 
-
-        </LinearLayout>
         <View
             android:id="@+id/divider"
             android:layout_width="match_parent"
@@ -45,22 +44,24 @@
                 >
 
                 <TextView
-                    android:layout_width="wrap_content"
+                    android:layout_width="100dp"
                     android:layout_height="wrap_content"
                     android:layout_marginRight="@dimen/default_layout_margin"
-                    android:text="@string/Versión"
+                    android:text="@string/company"
                     android:textColor="@color/verdnatura_white"
                     android:textSize="@dimen/body1"
                     android:textStyle="bold" />
 
                 <TextView
-                    android:id="@+id/item_version"
-                    android:layout_width="wrap_content"
+                    android:id="@+id/item_name"
+                    android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:text=""
-                    android:layout_marginLeft="@dimen/layout_margin_8"
+                    android:text="@{item.name}"
+                    android:layout_marginLeft="@dimen/layout_margin_6"
                     android:textColor="@color/verdnatura_white"
-                    android:textSize="@dimen/body1"/>
+                    android:textSize="@dimen/body1"
+                    tools:text="@string/company"
+                    />
 
             </LinearLayout>
 
@@ -70,45 +71,47 @@
                 android:orientation="horizontal">
 
                 <TextView
-                    android:layout_width="wrap_content"
+                    android:layout_width="100dp"
                     android:layout_height="wrap_content"
-                    android:text="@string/Usuario"
+                    android:text="@string/nif"
                     android:textColor="@color/verdnatura_white"
                     android:textSize="@dimen/body1"
                     android:textStyle="bold"
                     android:layout_marginRight="@dimen/default_layout_margin"/>
 
                 <TextView
-                    android:id="@+id/user_text"
+                    android:id="@+id/item_nif"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:text=""
-                    android:layout_marginLeft="@dimen/layout_margin_8"
+                    android:text="@{item.nif}"
+                    android:layout_marginLeft="@dimen/layout_margin_6"
                     android:textColor="@color/verdnatura_white"
-                    android:textSize="@dimen/body1"/>
+                    android:textSize="@dimen/body1"
+                    tools:text="@string/nif"/>
 
             </LinearLayout>
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content">
                 <TextView
-                    android:layout_width="wrap_content"
+                    android:layout_width="100dp"
                     android:layout_height="wrap_content"
-                    android:text="@string/Androidid"
+                    android:text="@string/adress"
                     android:textColor="@color/verdnatura_white"
                     android:textSize="@dimen/body1"
                     android:textStyle="bold"
                     android:layout_marginRight="@dimen/default_layout_margin"/>
 
                 <TextView
-                    android:id="@+id/androidid_text"
+                    android:id="@+id/item_adress"
                     android:layout_width="match_parent"
                     android:layout_height="match_parent"
-                    android:text=""
+                    android:text="@{item.street}"
                     android:layout_marginLeft="@dimen/layout_margin_6"
                     android:tooltipText="@string/copied"
                     android:textColor="@color/verdnatura_white"
-                    android:textSize="@dimen/body1"/>
+                    android:textSize="@dimen/body1"
+                    tools:text="@string/adress"/>
             </LinearLayout>
             <LinearLayout
                 android:visibility="gone"
@@ -154,16 +157,6 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent" />
 
-        <androidx.recyclerview.widget.RecyclerView
-            android:id="@+id/ajustess_items"
-            android:layout_width="0dp"
-            android:layout_height="0dp"
-            android:layout_marginTop="8dp"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintHorizontal_bias="0.6"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/linearLayout" />
 
         <LinearLayout
             android:id="@+id/splash_progress"
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index 2ac3f691..f1ca27f8 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -535,5 +535,8 @@
     <string name="titleInfoDescription">Ver datos empresa</string>
     <string name="titleInfo">Muestra información empresa</string>
     <string name="titleLog">Log y ruta de una expedición</string>
+    <string name="nif">NIF</string>
+    <string name="adress">Dirección</string>
+    <string name="company">Empresa</string>
 
 </resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index e6b142a1..c37c2e01 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -30,6 +30,8 @@
     <string name="Recordarusuarioycontraseña">Remember username and password</string>
     <string name="titleFaults">Foults</string>
     <string name="Versión">Version</string>
+    <string name="name">Company</string>
+    <string name="nif">NIF</string>
     <string name="Usuario">User</string>
     <string name="Escaneaetiqueta">Scan label</string>
     <string name="Filtro">Filter</string>
@@ -507,7 +509,7 @@
     <string name="workFormDescrip">Give a name and urls of the servers</string>
     <string name="silexServer">Server Silex</string>
     <string name="salixServer">Server Salix</string>
-    <string name="name">Name</string>
+    <string name="company">Company</string>
     <string name="deleteWorkForm">Delete work form</string>
     <string name="deleteWorkFormConfirmation">¿Do you remove definitely?</string>
     <string name="noAssigned">Not assigned</string>
@@ -534,5 +536,6 @@
     <string name="errorQuantity">Insert the amount correctly</string>
     <string name="operationSuccessful">Operación realizada correctamente</string>
     <string name="selfConsumption">Self-consumption</string>
+    <string name="adress">Address</string>
 
 </resources>