From 2054f9d2cb7de852a7be0bc96bf7870e0eb18e4a Mon Sep 17 00:00:00 2001
From: GiuseppeS <g.scorrano@integry.it>
Date: Thu, 2 Jan 2020 11:29:11 +0100
Subject: [PATCH 1/2] Fix su append delle TextView

---
 .../core/ContenutoBancaleListAdapter.java                | 6 ++++--
 .../picking_libero/core/PickingLiberoListAdapter.java    | 6 ++++--
 .../core/adapter/RettificaGiacenzeMainListAdapter.java   | 8 ++++++--
 .../view/ArticoliInColloBottomSheetMtbColrAdapter.java   | 7 +++++--
 .../DialogChooseArtsFromListaArtsAdapter.java            | 9 +++++++--
 5 files changed, 26 insertions(+), 10 deletions(-)

diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/contenuto_bancale/core/ContenutoBancaleListAdapter.java b/app/src/main/java/it/integry/integrywmsnative/gest/contenuto_bancale/core/ContenutoBancaleListAdapter.java
index aac33a57..fe963a00 100644
--- a/app/src/main/java/it/integry/integrywmsnative/gest/contenuto_bancale/core/ContenutoBancaleListAdapter.java
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/contenuto_bancale/core/ContenutoBancaleListAdapter.java
@@ -40,11 +40,13 @@ public class ContenutoBancaleListAdapter extends RecyclerView.Adapter<ContenutoB
 
             //Setting qty with unt_mis
             if(!SettingsManager.iDB().isFlagForceAllToColli() && (mtbColr.getMtbAart() == null || mtbColr.getMtbAart().isFlagQtaCnfFissa())){
-                mViewDataBinding.qtaTextview.setText(UtilityNumber.decimalToString(mtbColr.getQtaCol()));
+                String text = UtilityNumber.decimalToString(mtbColr.getQtaCol());
 
                 if(mtbColr.getMtbAart() != null) {
-                    mViewDataBinding.qtaTextview.append(!UtilityString.isNullOrEmpty(mtbColr.getMtbAart().getUntMis()) ? "\n" + mtbColr.getMtbAart().getUntMis() : "");
+                    text += !UtilityString.isNullOrEmpty(mtbColr.getMtbAart().getUntMis()) ? "\n" + mtbColr.getMtbAart().getUntMis() : "";
                 }
+
+                mViewDataBinding.qtaTextview.setText(text);
             } else {
                 mViewDataBinding.qtaTextview.setText(UtilityNumber.decimalToString(mtbColr.getNumCnf()) + "\n" + UtilityResources.getString(R.string.unt_mis_col));
             }
diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/picking_libero/core/PickingLiberoListAdapter.java b/app/src/main/java/it/integry/integrywmsnative/gest/picking_libero/core/PickingLiberoListAdapter.java
index b02563ac..7bf62675 100644
--- a/app/src/main/java/it/integry/integrywmsnative/gest/picking_libero/core/PickingLiberoListAdapter.java
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/picking_libero/core/PickingLiberoListAdapter.java
@@ -37,11 +37,13 @@ public class PickingLiberoListAdapter extends RecyclerView.Adapter<PickingLibero
 
             //Setting qty with unt_mis
             if(!SettingsManager.iDB().isFlagForceAllToColli() && (mtbColr.getMtbAart() == null || mtbColr.getMtbAart().isFlagQtaCnfFissa())){
-                mViewDataBinding.qtaTextview.setText(UtilityNumber.decimalToString(mtbColr.getQtaCol()));
+                String text = UtilityNumber.decimalToString(mtbColr.getQtaCol());
 
                 if(mtbColr.getMtbAart() != null) {
-                    mViewDataBinding.qtaTextview.append(!UtilityString.isNullOrEmpty(mtbColr.getMtbAart().getUntMis()) ? "\n" + mtbColr.getMtbAart().getUntMis() : "");
+                    text += !UtilityString.isNullOrEmpty(mtbColr.getMtbAart().getUntMis()) ? "\n" + mtbColr.getMtbAart().getUntMis() : "";
                 }
+
+                mViewDataBinding.qtaTextview.setText(text);
             } else {
                 mViewDataBinding.qtaTextview.setText(UtilityNumber.decimalToString(mtbColr.getNumCnf()) + "\n" + UtilityResources.getString(R.string.unt_mis_col));
             }
diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/rettifica_giacenze/core/adapter/RettificaGiacenzeMainListAdapter.java b/app/src/main/java/it/integry/integrywmsnative/gest/rettifica_giacenze/core/adapter/RettificaGiacenzeMainListAdapter.java
index 9fec6a23..760af892 100644
--- a/app/src/main/java/it/integry/integrywmsnative/gest/rettifica_giacenze/core/adapter/RettificaGiacenzeMainListAdapter.java
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/rettifica_giacenze/core/adapter/RettificaGiacenzeMainListAdapter.java
@@ -67,11 +67,15 @@ public class RettificaGiacenzeMainListAdapter extends RecyclerView.Adapter<Retti
 
         //Setting qty with unt_mis
         if(!SettingsManager.iDB().isFlagForceAllToColli() && (mtbColr.getMtbAart() == null || mtbColr.getMtbAart().isFlagQtaCnfFissa())){
-            holder.mViewDataBinding.qtaTextview.setText(UtilityNumber.decimalToString(mtbColr.getQtaCol()));
+
+            String text = UtilityNumber.decimalToString(mtbColr.getQtaCol());
+
 
             if(mtbColr.getMtbAart() != null) {
-                holder.mViewDataBinding.qtaTextview.append(!UtilityString.isNullOrEmpty(mtbColr.getMtbAart().getUntMis()) ? "\n" + mtbColr.getMtbAart().getUntMis() : "");
+                text += !UtilityString.isNullOrEmpty(mtbColr.getMtbAart().getUntMis()) ? "\n" + mtbColr.getMtbAart().getUntMis() : "";
             }
+
+            holder.mViewDataBinding.qtaTextview.setText(text);
         } else {
             holder.mViewDataBinding.qtaTextview.setText(UtilityNumber.decimalToString(mtbColr.getNumCnf()) + "\n" + UtilityResources.getString(R.string.unt_mis_col));
         }
diff --git a/app/src/main/java/it/integry/integrywmsnative/view/bottomsheet/view/ArticoliInColloBottomSheetMtbColrAdapter.java b/app/src/main/java/it/integry/integrywmsnative/view/bottomsheet/view/ArticoliInColloBottomSheetMtbColrAdapter.java
index 3058f47e..8fe6d0d7 100644
--- a/app/src/main/java/it/integry/integrywmsnative/view/bottomsheet/view/ArticoliInColloBottomSheetMtbColrAdapter.java
+++ b/app/src/main/java/it/integry/integrywmsnative/view/bottomsheet/view/ArticoliInColloBottomSheetMtbColrAdapter.java
@@ -50,11 +50,14 @@ public class ArticoliInColloBottomSheetMtbColrAdapter extends BaseAdapter {
 
         //Setting qty with unt_mis
         if(!SettingsManager.iDB().isFlagForceAllToColli() && (mtbColr.getMtbAart() == null || mtbColr.getMtbAart().isFlagQtaCnfFissa())){
-            binding.qtaTextview.setText(UtilityNumber.decimalToString(mtbColr.getQtaCol()));
+            String text = UtilityNumber.decimalToString(mtbColr.getQtaCol());
+
 
             if(mtbColr.getMtbAart() != null) {
-                binding.qtaTextview.append(!UtilityString.isNullOrEmpty(mtbColr.getMtbAart().getUntMis()) ? "\n" + mtbColr.getMtbAart().getUntMis() : "");
+                text += !UtilityString.isNullOrEmpty(mtbColr.getMtbAart().getUntMis()) ? "\n" + mtbColr.getMtbAart().getUntMis() : "";
             }
+
+            binding.qtaTextview.setText(text);
         } else {
             binding.qtaTextview.setText(UtilityNumber.decimalToString(mtbColr.getNumCnf()) + "\n" + UtilityResources.getString(R.string.unt_mis_col));
         }
diff --git a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/choose_arts_from_lista_arts/DialogChooseArtsFromListaArtsAdapter.java b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/choose_arts_from_lista_arts/DialogChooseArtsFromListaArtsAdapter.java
index 46cae331..49e68c72 100644
--- a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/choose_arts_from_lista_arts/DialogChooseArtsFromListaArtsAdapter.java
+++ b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/choose_arts_from_lista_arts/DialogChooseArtsFromListaArtsAdapter.java
@@ -78,11 +78,16 @@ public class DialogChooseArtsFromListaArtsAdapter extends RecyclerView.Adapter<D
 
             //Setting qty with unt_mis
             if(!SettingsManager.iDB().isFlagForceAllToColli() && (mtbColr.getMtbAart() == null || mtbColr.getMtbAart().isFlagQtaCnfFissa())){
-                mViewDataBinding.qtaTextview.setText(UtilityNumber.decimalToString(mtbColr.getQtaCol()));
+                String text = UtilityNumber.decimalToString(mtbColr.getQtaCol());
+
 
                 if(mtbColr.getMtbAart() != null) {
-                    mViewDataBinding.qtaTextview.append(!UtilityString.isNullOrEmpty(mtbColr.getMtbAart().getUntMis()) ? "\n" + mtbColr.getMtbAart().getUntMis() : "");
+                    text += !UtilityString.isNullOrEmpty(mtbColr.getMtbAart().getUntMis()) ? "\n" + mtbColr.getMtbAart().getUntMis() : "";
                 }
+
+                mViewDataBinding.qtaTextview.setText(text);
+
+
             } else {
                 mViewDataBinding.qtaTextview.setText(UtilityNumber.decimalToString(mtbColr.getNumCnf()) + "\n" + UtilityResources.getString(R.string.unt_mis_col));
             }

From 0fb714f3114bf6605da30a0c9510f5558bf4d313 Mon Sep 17 00:00:00 2001
From: GiuseppeS <g.scorrano@integry.it>
Date: Thu, 2 Jan 2020 11:29:50 +0100
Subject: [PATCH 2/2] -> v1.10.13 (116)

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

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