From 1f83e9b492bbea84c88070b5d6821fbc46323b60 Mon Sep 17 00:00:00 2001
From: GiuseppeS <g.scorrano@integry.it>
Date: Mon, 13 Jan 2020 10:38:52 +0100
Subject: [PATCH 1/2] Fix su posizionamento pulsanti in DialogChooseArts

---
 .../DialogChooseArtsFromListaArts.java        |  8 +--
 ...log_choose_arts_from_lista_arts_layout.xml | 61 ++++++++++---------
 2 files changed, 37 insertions(+), 32 deletions(-)

diff --git a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/choose_arts_from_lista_arts/DialogChooseArtsFromListaArts.java b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/choose_arts_from_lista_arts/DialogChooseArtsFromListaArts.java
index 2c06d63e..f7a97c76 100644
--- a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/choose_arts_from_lista_arts/DialogChooseArtsFromListaArts.java
+++ b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/choose_arts_from_lista_arts/DialogChooseArtsFromListaArts.java
@@ -98,6 +98,10 @@ public class DialogChooseArtsFromListaArts {
         mDialog.setCanceledOnTouchOutside(false);
         mDialog.getWindow().setBackgroundDrawable(new ColorDrawable(Color.TRANSPARENT));
 
+        mDialog.setOnCancelListener(dialog -> {
+            if(this.mOnAbort != null) this.mOnAbort.run();
+        });
+
         UtilityDialog.setTo90PercentSize(context, mDialog);
 
 
@@ -137,8 +141,6 @@ public class DialogChooseArtsFromListaArts {
     }
 
     private void setupBarcode() {
-
-        final boolean prevBarcodeStatus = BarcodeManager.isEnabled();
         BarcodeManager.enable();
 
         int barcodeIstanceID = BarcodeManager.addCallback(new BarcodeCallbackDTO()
@@ -147,8 +149,6 @@ public class DialogChooseArtsFromListaArts {
 
         mDialog.setOnDismissListener(dialog -> {
             BarcodeManager.removeCallback(barcodeIstanceID);
-//            if(prevBarcodeStatus) BarcodeManager.enable();
-//            else BarcodeManager.disable();
         });
 
     }
diff --git a/app/src/main/res/layout/dialog_choose_arts_from_lista_arts_layout.xml b/app/src/main/res/layout/dialog_choose_arts_from_lista_arts_layout.xml
index beb10b38..568167a9 100644
--- a/app/src/main/res/layout/dialog_choose_arts_from_lista_arts_layout.xml
+++ b/app/src/main/res/layout/dialog_choose_arts_from_lista_arts_layout.xml
@@ -20,37 +20,29 @@
         app:cardCornerRadius="12dp"
         app:cardElevation="0dp">
 
-        <LinearLayout
+        <androidx.constraintlayout.widget.ConstraintLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:orientation="vertical">
 
-            <!--<RelativeLayout-->
-                <!--android:id="@+id/title_container"-->
-                <!--android:layout_width="match_parent"-->
-                <!--android:layout_height="wrap_content"-->
-                <!--android:background="@color/light_blue_300"-->
-                <!--android:gravity="center_horizontal">-->
-
-                <!--<androidx.appcompat.widget.AppCompatImageView-->
-                    <!--android:id="@+id/title_icon"-->
-                    <!--android:layout_width="wrap_content"-->
-                    <!--android:layout_height="wrap_content"-->
-                    <!--android:src="@drawable/ic_error_white_24dp"-->
-                    <!--android:layout_margin="24dp"/>-->
-
-            <!--</RelativeLayout>-->
 
 
-
-            <LinearLayout
+            <androidx.constraintlayout.widget.ConstraintLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:orientation="vertical"
                 android:paddingTop="24dp"
                 android:paddingBottom="8dp"
                 android:paddingStart="8dp"
-                android:paddingEnd="8dp">
+                android:paddingEnd="8dp"
+                app:layout_constraintBottom_toTopOf="@+id/buttons"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintHeight_default="wrap"
+                app:layout_constraintHorizontal_chainStyle="packed"
+                app:layout_constraintLeft_toLeftOf="parent"
+                app:layout_constraintRight_toRightOf="parent"
+                app:layout_constraintStart_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent" >
 
                 <TextView
                     android:id="@+id/title_text"
@@ -58,7 +50,10 @@
                     android:layout_height="wrap_content"
                     style="@style/TextViewMaterial.DialogTitle"
                     android:text="@string/dialog_choose_arts_from_lista_art"
-                    android:gravity="center_horizontal"/>
+                    android:gravity="center_horizontal"
+                    app:layout_constraintTop_toTopOf="parent"
+                    app:layout_constraintLeft_toLeftOf="parent"
+                    app:layout_constraintRight_toRightOf="parent"/>
 
 
 
@@ -73,20 +68,25 @@
                     app:strokeColor="@color/red_400"
                     android:layout_gravity="center_horizontal"
                     android:visibility="@{filterStatus.get() ? View.VISIBLE : View.GONE}"
-                    android:text="@string/remove_filter_button"/>
+                    android:text="@string/remove_filter_button"
+                    app:layout_constraintTop_toBottomOf="@id/title_text"
+                    app:layout_constraintLeft_toLeftOf="parent"
+                    app:layout_constraintRight_toRightOf="parent"/>
 
 
 
                 <RelativeLayout
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_marginTop="8dp">
+                    android:layout_marginTop="8dp"
+                    app:layout_constraintTop_toBottomOf="@id/button_remove_filter"
+                    app:layout_constraintLeft_toLeftOf="parent"
+                    app:layout_constraintRight_toRightOf="parent">
 
-                    <LinearLayout
+                    <RelativeLayout
                         android:id="@+id/empty_view"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        android:orientation="vertical"
                         android:gravity="center"
                         android:padding="16dp"
                         android:layout_marginTop="16dp"
@@ -101,7 +101,7 @@
                             android:gravity="center"
                             android:textColor="@color/empty_view_gray"/>
 
-                    </LinearLayout>
+                    </RelativeLayout>
 
                     <androidx.recyclerview.widget.RecyclerView
                         android:id="@+id/dialog_choose_arts_from_lista_art__main_list"
@@ -112,7 +112,7 @@
 
 
 
-            </LinearLayout>
+            </androidx.constraintlayout.widget.ConstraintLayout>
 
 
             <androidx.constraintlayout.widget.ConstraintLayout
@@ -122,7 +122,12 @@
                 android:layout_marginTop="8dp"
                 android:layout_marginStart="4dp"
                 android:layout_marginEnd="4dp"
-                android:paddingBottom="8dp">
+                android:paddingBottom="8dp"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintLeft_toLeftOf="parent"
+                app:layout_constraintRight_toRightOf="parent"
+                app:layout_constraintStart_toStartOf="parent">
 
                 <androidx.constraintlayout.widget.Guideline
                     android:id="@+id/center_guideline"
@@ -162,7 +167,7 @@
 
             </androidx.constraintlayout.widget.ConstraintLayout>
 
-        </LinearLayout>
+        </androidx.constraintlayout.widget.ConstraintLayout>
 
 
     </androidx.cardview.widget.CardView>

From 06951e303d7726684323a1ea2e386317c4bc477b Mon Sep 17 00:00:00 2001
From: GiuseppeS <g.scorrano@integry.it>
Date: Mon, 13 Jan 2020 10:39:46 +0100
Subject: [PATCH 2/2] -> v1.11.6 (125)

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

diff --git a/app/build.gradle b/app/build.gradle
index 0a3d0777..c1d857c2 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -17,8 +17,8 @@ apply plugin: 'com.google.gms.google-services'
 
 android {
 
-    def appVersionCode = 124
-    def appVersionName = '1.11.5'
+    def appVersionCode = 125
+    def appVersionName = '1.11.6'
 
     signingConfigs {
         release {