From 60756b08c338de790a2869c5e8677f6376faa342 Mon Sep 17 00:00:00 2001
From: GiuseppeS <g.scorrano@integry.it>
Date: Thu, 2 Jan 2020 17:31:38 +0100
Subject: [PATCH 1/3] Fix su calcolo num cnf in rettifica

---
 .../viewmodel/RettificaGiacenzeViewModel.java                | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/rettifica_giacenze/viewmodel/RettificaGiacenzeViewModel.java b/app/src/main/java/it/integry/integrywmsnative/gest/rettifica_giacenze/viewmodel/RettificaGiacenzeViewModel.java
index af4bf5b7..a2428ef3 100644
--- a/app/src/main/java/it/integry/integrywmsnative/gest/rettifica_giacenze/viewmodel/RettificaGiacenzeViewModel.java
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/rettifica_giacenze/viewmodel/RettificaGiacenzeViewModel.java
@@ -614,7 +614,9 @@ public class RettificaGiacenzeViewModel implements IRecyclerItemClicked<MtbColr>
                 .setQtaDisponibile(new BigDecimal(-1))
                 .setMtbAart(mtbColrToEditClone.getMtbAart())
                 .setCanPartitaMagBeChanged(false)
-                .setQtaTot(mtbColrToEditClone.getQtaCol());
+                .setQtaTot(mtbColrToEditClone.getQtaCol())
+                .setQtaCnf(mtbColrToEditClone.getQtaCnf())
+                .setNumCnf(mtbColrToEditClone.getNumCnf().intValue());
 
         DialogInputQuantity.makeBase(mContext, dto, true, value -> {
 
@@ -651,6 +653,7 @@ public class RettificaGiacenzeViewModel implements IRecyclerItemClicked<MtbColr>
 
                     mtbColrToEditClone
                             .setQtaCol(value.qtaTot.getBigDecimal())
+                            .setNumCnf(value.numCnf.getBigDecimal())
                             .setMtbAart(mtbColrToEdit.getMtbAart())
                             .setOperation(CommonModelConsts.OPERATION.NO_OP);
 

From f30edc53d5fe98d7898671fab3d5d8a3ef51720b Mon Sep 17 00:00:00 2001
From: GiuseppeS <g.scorrano@integry.it>
Date: Thu, 2 Jan 2020 17:32:08 +0100
Subject: [PATCH 2/3] -> v1.10.14 (117)

---
 app/build.gradle | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index d338e40d..d21fc5dc 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -17,8 +17,8 @@ apply plugin: 'com.google.gms.google-services'
 
 android {
 
-    def appVersionCode = 116
-    def appVersionName = '1.10.13'
+    def appVersionCode = 117
+    def appVersionName = '1.10.14'
 
     signingConfigs {
         release {

From 76214f709e1a2654185c62a911c947e5017e19bc Mon Sep 17 00:00:00 2001
From: GiuseppeS <g.scorrano@integry.it>
Date: Thu, 2 Jan 2020 18:01:09 +0100
Subject: [PATCH 3/3] Fix vari su layout di Rettifica Giacenze

---
 ...ragment_articoli_in_collo_bottom_sheet.xml |  4 +-
 .../fragment_main_rettifica_giacenze.xml      | 52 +++++++++++++------
 .../res/layout/fragment_picking_libero.xml    |  2 +-
 .../layout/lista_rettifica_giacenze_model.xml |  7 ++-
 4 files changed, 43 insertions(+), 22 deletions(-)

diff --git a/app/src/main/res/layout/fragment_articoli_in_collo_bottom_sheet.xml b/app/src/main/res/layout/fragment_articoli_in_collo_bottom_sheet.xml
index d586fdd7..e99be958 100644
--- a/app/src/main/res/layout/fragment_articoli_in_collo_bottom_sheet.xml
+++ b/app/src/main/res/layout/fragment_articoli_in_collo_bottom_sheet.xml
@@ -500,7 +500,7 @@
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         style="@style/AppTheme.NewMaterial.Text.Small"
-                        android:text="Modifica"/>
+                        android:text="@string/edit"/>
 
                 </LinearLayout>
 
@@ -528,7 +528,7 @@
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         style="@style/AppTheme.NewMaterial.Text.Small"
-                        android:text="Cancella"/>
+                        android:text="@string/delete"/>
 
                 </LinearLayout>
 
diff --git a/app/src/main/res/layout/fragment_main_rettifica_giacenze.xml b/app/src/main/res/layout/fragment_main_rettifica_giacenze.xml
index 87c1191c..7cc9bdcf 100644
--- a/app/src/main/res/layout/fragment_main_rettifica_giacenze.xml
+++ b/app/src/main/res/layout/fragment_main_rettifica_giacenze.xml
@@ -24,6 +24,7 @@
         <androidx.coordinatorlayout.widget.CoordinatorLayout
             android:layout_width="match_parent"
             android:layout_height="match_parent">
+
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
@@ -46,29 +47,29 @@
                             android:layout_height="wrap_content"
                             android:orientation="horizontal">
 
-                            <TextView
+                            <androidx.appcompat.widget.AppCompatTextView
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
                                 android:paddingStart="12dp"
                                 android:paddingEnd="12dp"
                                 android:paddingTop="8dp"
                                 android:paddingBottom="8dp"
-                                android:textSize="16sp"
                                 android:textColor="@android:color/white"
                                 android:textStyle="bold"
                                 android:background="@drawable/badge1_round_corner"
                                 android:text="@{viewmodel.mtbColt.get().numCollo.toString()}"
+                                style="@style/AppTheme.NewMaterial.Text.Medium"
                                 tools:text="2156"/>
 
-                            <TextView
+                            <androidx.appcompat.widget.AppCompatTextView
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
                                 android:layout_marginStart="12dp"
-                                android:textSize="16sp"
                                 android:textColor="@android:color/black"
                                 android:textStyle="bold"
                                 android:visibility="@{!UtilityString.isNullOrEmpty(viewmodel.mtbColt.get().posizione) ? View.VISIBLE : View.GONE}"
                                 android:text="@{viewmodel.mtbColt.get().posizione}"
+                                style="@style/AppTheme.NewMaterial.Text.Medium"
                                 tools:text="ME1FS032"/>
 
 
@@ -114,6 +115,7 @@
                                 android:layout_width="0dp"
                                 android:layout_height="wrap_content"
                                 app:hintTextAppearance="@style/hint_text"
+                                app:layout_constraintTop_toTopOf="parent"
                                 app:layout_constraintStart_toStartOf="parent"
                                 app:layout_constraintEnd_toStartOf="@id/guide_line_fornitore">
 
@@ -132,6 +134,7 @@
                                 android:layout_width="0dp"
                                 android:layout_height="wrap_content"
                                 app:hintTextAppearance="@style/hint_text"
+                                app:layout_constraintTop_toTopOf="parent"
                                 app:layout_constraintStart_toEndOf="@id/guide_line_fornitore"
                                 app:layout_constraintEnd_toEndOf="parent">
 
@@ -180,6 +183,7 @@
                                 android:layout_width="0dp"
                                 android:layout_height="wrap_content"
                                 app:hintTextAppearance="@style/hint_text"
+                                app:layout_constraintTop_toTopOf="parent"
                                 app:layout_constraintStart_toStartOf="parent"
                                 app:layout_constraintEnd_toEndOf="parent">
 
@@ -256,8 +260,8 @@
                                 android:layout_height="wrap_content"
                                 android:gravity="center_horizontal"
                                 android:textColor="@android:color/black"
-                                android:textSize="18sp"
-                                android:text="@string/no_item_text"/>
+                                android:text="@string/no_item_text"
+                                style="@style/AppTheme.NewMaterial.Text.Medium"/>
                         </LinearLayout>
 
                     </androidx.constraintlayout.widget.ConstraintLayout>
@@ -266,7 +270,10 @@
                         android:id="@+id/rettifica_giacenze_main_list"
                         android:layout_width="match_parent"
                         android:layout_height="match_parent"
-                        android:layout_marginTop="32dp"/>
+                        android:paddingTop="16dp"
+                        android:paddingBottom="80dp"
+                        android:clipToPadding="false"
+                        android:scrollbarStyle="outsideOverlay"/>
 
                     <com.google.android.material.floatingactionbutton.FloatingActionButton
                         android:id="@+id/rettifica_giacenze_main_fab"
@@ -294,6 +301,8 @@
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"/>
 
+
+
             <LinearLayout
                 android:id="@+id/bottom_sheet_actions"
                 android:layout_width="match_parent"
@@ -317,6 +326,7 @@
                         android:layout_height="wrap_content"
                         android:orientation="vertical"
                         android:layout_marginBottom="8dp"
+                        app:layout_constraintTop_toTopOf="parent"
                         app:layout_constraintEnd_toStartOf="@id/bottom_sheet_actions_quantity"
                         app:layout_constraintStart_toStartOf="parent">
 
@@ -326,30 +336,31 @@
                             android:layout_height="wrap_content"
                             tools:text="Descrizione articolo"
                             android:textColor="#444"
-                            android:textSize="18dp"
-                            android:maxLines="1"
+                            android:maxLines="2"
                             android:ellipsize="end"
-                            android:paddingRight="8dp"
-                            android:textStyle="bold" />
+                            android:paddingStart="0dp"
+                            android:paddingEnd="8dp"
+                            android:textStyle="bold"
+                            style="@style/AppTheme.NewMaterial.Text.Medium"/>
 
                         <androidx.appcompat.widget.AppCompatTextView
                             android:id="@+id/bottom_sheet_actions_subtitle"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             tools:text="ABF52IL"
-                            android:textSize="14dp"
-                            android:textStyle="bold" />
+                            style="@style/AppTheme.NewMaterial.Text.Small" />
 
                     </LinearLayout>
 
                     <TextView
                         android:id="@+id/bottom_sheet_actions_quantity"
                         android:layout_width="wrap_content"
-                        android:gravity="right"
+                        android:gravity="end"
                         android:layout_height="wrap_content"
                         android:textStyle="bold"
-                        android:textSize="15dp"
                         tools:text="250 PZ"
+                        style="@style/AppTheme.NewMaterial.Text.Small"
+                        app:layout_constraintTop_toTopOf="parent"
                         app:layout_constraintEnd_toEndOf="parent"/>
                 </androidx.constraintlayout.widget.ConstraintLayout>
 
@@ -370,6 +381,7 @@
                         android:layout_width="0dp"
                         android:layout_height="wrap_content"
                         android:orientation="vertical"
+                        app:layout_constraintTop_toTopOf="parent"
                         app:layout_constraintEnd_toStartOf="@id/guideline_action"
                         app:layout_constraintStart_toStartOf="parent"
                         android:gravity="center">
@@ -388,7 +400,8 @@
                         <androidx.appcompat.widget.AppCompatTextView
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
-                            android:text="Modifica"/>
+                            style="@style/AppTheme.NewMaterial.Text.Small"
+                            android:text="@string/edit"/>
 
                     </LinearLayout>
 
@@ -396,6 +409,7 @@
                         android:layout_width="0dp"
                         android:layout_height="wrap_content"
                         android:orientation="vertical"
+                        app:layout_constraintTop_toTopOf="parent"
                         app:layout_constraintEnd_toEndOf="parent"
                         app:layout_constraintStart_toStartOf="@id/guideline_action"
                         android:gravity="center">
@@ -414,7 +428,8 @@
                         <androidx.appcompat.widget.AppCompatTextView
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
-                            android:text="Cancella"/>
+                            style="@style/AppTheme.NewMaterial.Text.Small"
+                            android:text="@string/delete"/>
 
                     </LinearLayout>
 
@@ -423,6 +438,9 @@
 
             </LinearLayout>
 
+
+
+
         </androidx.coordinatorlayout.widget.CoordinatorLayout>
 
     </FrameLayout>
diff --git a/app/src/main/res/layout/fragment_picking_libero.xml b/app/src/main/res/layout/fragment_picking_libero.xml
index 2f28004e..1f014ceb 100644
--- a/app/src/main/res/layout/fragment_picking_libero.xml
+++ b/app/src/main/res/layout/fragment_picking_libero.xml
@@ -230,7 +230,7 @@
                     <androidx.appcompat.widget.AppCompatTextView
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:text="Cancella"/>
+                        android:text="@string/delete"/>
 
                 </LinearLayout>
 
diff --git a/app/src/main/res/layout/lista_rettifica_giacenze_model.xml b/app/src/main/res/layout/lista_rettifica_giacenze_model.xml
index 95383b45..523f10de 100644
--- a/app/src/main/res/layout/lista_rettifica_giacenze_model.xml
+++ b/app/src/main/res/layout/lista_rettifica_giacenze_model.xml
@@ -42,6 +42,7 @@
                     android:textColor="@color/colorPrimary"
                     android:textSize="14sp"
                     android:textStyle="bold"
+                    style="@style/AppTheme.NewMaterial.Text"
                     tools:text="COD MART" />
 
                 <androidx.appcompat.widget.AppCompatTextView
@@ -55,6 +56,7 @@
                     android:layout_marginStart="8dp"
                     android:layout_toEndOf="@id/cod_mart"
                     android:visibility="@{(mtbColr.mtbAart != null &amp;&amp; !UtilityString.isNullOrEmpty(mtbColr.mtbAart.diacod)) ? View.VISIBLE : View.GONE}"
+                    style="@style/AppTheme.NewMaterial.Text"
                     tools:text="(12345)" />
 
 
@@ -80,13 +82,12 @@
             <TextView
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_alignParentLeft="true"
-                android:layout_toLeftOf="@id/posizione_collo"
                 android:ellipsize="end"
                 android:maxLines="2"
                 android:text="@{mtbColr.getDescrizione()}"
                 android:textColor="@android:color/black"
                 android:textSize="16sp"
+                style="@style/AppTheme.NewMaterial.Text"
                 tools:text="Descrizione lunga articolo" />
 
 
@@ -96,6 +97,7 @@
                 android:text="@{`Lotto: ` + mtbColr.getPartitaMag()}"
                 android:textSize="14sp"
                 android:visibility="@{UtilityString.isNullOrEmpty(mtbColr.getPartitaMag()) ? View.GONE : View.VISIBLE}"
+                style="@style/AppTheme.NewMaterial.Text.Small"
                 tools:text="Lotto: ABCDE" />
 
         </LinearLayout>
@@ -125,6 +127,7 @@
                 android:textColor="@android:color/white"
                 android:textStyle="bold"
                 android:textAllCaps="true"
+                style="@style/AppTheme.NewMaterial.Text"
                 tools:text="280.45\nCONF" />
 
         </RelativeLayout>