From d8672e1c22cec5df88cd336a8fdcd783fbed5f23 Mon Sep 17 00:00:00 2001
From: GiuseppeS <g.scorrano@integry.it>
Date: Tue, 14 Mar 2023 15:51:06 +0100
Subject: [PATCH] Modifiche UI popup informativo situazione articolo

---
 app/src/main/res/drawable/ic_tag.xml          |  9 ++
 .../dialog_info_situazione_articolo.xml       | 12 +--
 ...ituazione_articolo_available_list_item.xml | 99 ++++++++++++++++---
 3 files changed, 98 insertions(+), 22 deletions(-)
 create mode 100644 app/src/main/res/drawable/ic_tag.xml

diff --git a/app/src/main/res/drawable/ic_tag.xml b/app/src/main/res/drawable/ic_tag.xml
new file mode 100644
index 00000000..77c315cd
--- /dev/null
+++ b/app/src/main/res/drawable/ic_tag.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M11.586,3.586l-9,9c-0.781,0.781 -0.781,2.047 0,2.828l6,6c0.781,0.781 2.047,0.781 2.828,0l9,-9C20.789,12.039 21,11.53 21,11V5c0,-1.105 -0.895,-2 -2,-2h-6C12.47,3 11.961,3.211 11.586,3.586zM17.5,8C16.672,8 16,7.328 16,6.5S16.672,5 17.5,5S19,5.672 19,6.5S18.328,8 17.5,8z"
+      android:fillColor="#5B5B5B"/>
+</vector>
diff --git a/app/src/main/res/layout/dialog_info_situazione_articolo.xml b/app/src/main/res/layout/dialog_info_situazione_articolo.xml
index b7e3db1a..e68036bd 100644
--- a/app/src/main/res/layout/dialog_info_situazione_articolo.xml
+++ b/app/src/main/res/layout/dialog_info_situazione_articolo.xml
@@ -18,12 +18,12 @@
             android:paddingHorizontal="16dp"
             android:paddingVertical="16dp">
 
-            <androidx.appcompat.widget.AppCompatImageView
-                style="@style/MaterialAlertDialog.Material3.Title.Icon.CenterStacked"
-                android:layout_width="36dp"
-                android:layout_height="36dp"
-                android:src="@drawable/ic_error_white_24dp"
-                app:tint="?colorPrimary" />
+<!--            <androidx.appcompat.widget.AppCompatImageView-->
+<!--                style="@style/MaterialAlertDialog.Material3.Title.Icon.CenterStacked"-->
+<!--                android:layout_width="36dp"-->
+<!--                android:layout_height="36dp"-->
+<!--                android:src="@drawable/ic_error_white_24dp"-->
+<!--                app:tint="?colorPrimary" />-->
 
 
             <androidx.appcompat.widget.AppCompatTextView
diff --git a/app/src/main/res/layout/dialog_info_situazione_articolo_available_list_item.xml b/app/src/main/res/layout/dialog_info_situazione_articolo_available_list_item.xml
index 5ea16b6a..ab32cb94 100644
--- a/app/src/main/res/layout/dialog_info_situazione_articolo_available_list_item.xml
+++ b/app/src/main/res/layout/dialog_info_situazione_articolo_available_list_item.xml
@@ -7,8 +7,11 @@
     <data>
 
         <import type="it.integry.integrywmsnative.core.utility.UtilityString" />
+
         <import type="it.integry.integrywmsnative.core.utility.UtilityDate" />
+
         <import type="it.integry.integrywmsnative.core.utility.UtilityNumber" />
+
         <import type="android.view.View" />
 
         <variable
@@ -21,16 +24,16 @@
     <RelativeLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:gravity="center_vertical"
         android:orientation="horizontal"
-        android:paddingVertical="8dp"
-        android:gravity="center_vertical">
+        android:paddingVertical="8dp">
 
         <androidx.appcompat.widget.LinearLayoutCompat
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:orientation="vertical"
+            android:layout_toStartOf="@id/qta_box"
             android:gravity="center_vertical"
-            android:layout_toStartOf="@id/qta_box">
+            android:orientation="vertical">
 
 
             <androidx.appcompat.widget.AppCompatTextView
@@ -42,17 +45,81 @@
                 tools:text="UL 109467 del 17 mar 2023" />
 
 
-            <androidx.appcompat.widget.AppCompatTextView
-                style="@style/TextAppearance.AppCompat.Small"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:ellipsize="end"
-                android:maxLines="2"
-                android:text="@{UtilityString.isNull(item.descrizioneEstesa, &quot;Nessuna descrizione&quot;)}"
-                tools:text="Descrizione lunga articolo" />
-        </androidx.appcompat.widget.LinearLayoutCompat>
+<!--            <androidx.appcompat.widget.AppCompatTextView-->
+<!--                style="@style/TextAppearance.AppCompat.Small"-->
+<!--                android:layout_width="match_parent"-->
+<!--                android:layout_height="wrap_content"-->
+<!--                android:ellipsize="end"-->
+<!--                android:maxLines="2"-->
+<!--                android:text="@{UtilityString.isNull(item.descrizioneEstesa, &quot;Nessuna descrizione&quot;)}"-->
+<!--                tools:text="Descrizione lunga articolo" />-->
 
 
+            <androidx.appcompat.widget.LinearLayoutCompat
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:orientation="horizontal">
+
+                <androidx.appcompat.widget.LinearLayoutCompat
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="4dp"
+                    android:background="@drawable/badge_round_corner"
+                    android:backgroundTint="@color/light_blue_500"
+                    android:gravity="center_vertical"
+                    android:orientation="horizontal"
+                    android:visibility="@{item.posizione != null ? View.VISIBLE : View.GONE}">
+
+                    <androidx.appcompat.widget.AppCompatImageView
+                        android:layout_width="12dp"
+                        android:layout_height="12dp"
+                        android:src="@drawable/ic_location_24"
+                        android:tint="@color/white" />
+
+                    <androidx.appcompat.widget.AppCompatTextView
+                        style="@style/AppTheme.NewMaterial.Text.Small"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginStart="4dp"
+                        android:text="@{item.posizione}"
+                        android:textColor="@android:color/white"
+                        android:textStyle="bold"
+                        tools:text="POSIZIONE" />
+
+                </androidx.appcompat.widget.LinearLayoutCompat>
+
+                <androidx.appcompat.widget.LinearLayoutCompat
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="4dp"
+                    android:layout_marginStart="4dp"
+                    android:background="@drawable/badge_round_corner"
+                    android:backgroundTint="@color/red_300"
+                    android:gravity="center_vertical"
+                    android:orientation="horizontal"
+                    android:visibility="@{item.codJcom != null ? View.VISIBLE : View.GONE}">
+
+                    <androidx.appcompat.widget.AppCompatImageView
+                        android:layout_width="12dp"
+                        android:layout_height="12dp"
+                        android:src="@drawable/ic_tag"
+                        android:tint="@color/white" />
+
+                    <androidx.appcompat.widget.AppCompatTextView
+                        style="@style/AppTheme.NewMaterial.Text.Small"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginStart="4dp"
+                        android:text="@{item.codJcom}"
+                        android:textColor="@android:color/white"
+                        android:textStyle="bold"
+                        tools:text="COMMESSA" />
+
+                </androidx.appcompat.widget.LinearLayoutCompat>
+            </androidx.appcompat.widget.LinearLayoutCompat>
+
+        </androidx.appcompat.widget.LinearLayoutCompat>
+
 
         <androidx.appcompat.widget.LinearLayoutCompat
             android:id="@+id/qta_box"
@@ -61,15 +128,16 @@
             android:layout_alignParentEnd="true"
             android:layout_centerVertical="true"
             android:layout_marginStart="8dp"
-            android:padding="6dp"
             android:background="@drawable/badge_round_corner"
             android:backgroundTint="@color/colorPrimary"
             android:gravity="center_horizontal"
             android:orientation="vertical"
+            android:padding="6dp"
             android:visibility="@{item.qtaCol != null ? View.VISIBLE : View.GONE}">
 
 
             <androidx.appcompat.widget.AppCompatTextView
+                style="@style/TextAppearance.AppCompat.Small"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:backgroundTint="@color/colorPrimary"
@@ -78,10 +146,10 @@
                 android:textAllCaps="true"
                 android:textColor="@android:color/white"
                 android:textStyle="bold"
-                style="@style/TextAppearance.AppCompat.Small"
                 tools:text="280.45" />
 
             <androidx.appcompat.widget.AppCompatTextView
+                style="@style/TextAppearance.AppCompat.Small"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:gravity="center"
@@ -89,7 +157,6 @@
                 android:textAllCaps="true"
                 android:textColor="@android:color/white"
                 android:textStyle="bold"
-                style="@style/TextAppearance.AppCompat.Small"
                 tools:text="CONF" />
 
         </androidx.appcompat.widget.LinearLayoutCompat>