From 4b19129a2fe00677699b829c19073c006cc853fe Mon Sep 17 00:00:00 2001
From: GiuseppeS <g.scorrano@integry.it>
Date: Mon, 28 Feb 2022 09:52:23 +0100
Subject: [PATCH] Fix su bindings in dialogInputQuantity. Piccolo refactoring
 UI di activity di ordine di acquisto.

---
 .../DialogInputQuantityV2View.java            |   6 +-
 .../activity_pv_ordine_acquisto_edit.xml      | 445 +++++++++---------
 build.gradle                                  |   2 +-
 3 files changed, 233 insertions(+), 220 deletions(-)

diff --git a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/input_quantity_v2/DialogInputQuantityV2View.java b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/input_quantity_v2/DialogInputQuantityV2View.java
index 1917853a..cd26fd90 100644
--- a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/input_quantity_v2/DialogInputQuantityV2View.java
+++ b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/input_quantity_v2/DialogInputQuantityV2View.java
@@ -209,10 +209,10 @@ public class DialogInputQuantityV2View extends BaseDialogFragment implements Dia
     public void onStart() {
         super.onStart();
 
-        if(!mFirstStart) {
+//        if(!mFirstStart) {
             this.init();
-            mFirstStart = false;
-        }
+//            mFirstStart = false;
+//        }
 
         int onNumCnfInputChanged = SettingsManager.iDB().getOnNumCnfInputChanged();
 
diff --git a/app/src/main/res/layout/activity_pv_ordine_acquisto_edit.xml b/app/src/main/res/layout/activity_pv_ordine_acquisto_edit.xml
index b893d79e..4f504331 100644
--- a/app/src/main/res/layout/activity_pv_ordine_acquisto_edit.xml
+++ b/app/src/main/res/layout/activity_pv_ordine_acquisto_edit.xml
@@ -1,12 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 
-<layout xmlns:tools="http://schemas.android.com/tools"
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:fab="http://schemas.android.com/apk/res-auto">
+    xmlns:fab="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools">
+
     <data>
 
         <import type="android.view.View" />
+
         <variable
             name="viewModel"
             type="it.integry.integrywmsnative.gest.pv_ordine_acquisto_edit.PVOrdineAcquistoEditActivity" />
@@ -18,241 +20,252 @@
         android:layout_height="match_parent">
 
 
-        <LinearLayout
-            android:id="@+id/linearLayout2"
+        <androidx.constraintlayout.widget.ConstraintLayout
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:background="@color/full_white"
-            android:orientation="vertical"
-            android:descendantFocusability="blocksDescendants"
-            >
+            android:descendantFocusability="blocksDescendants">
 
-            <LinearLayout
+            <it.integry.integrywmsnative.ui.ElevatedToolbar
+                android:id="@+id/elevated_toolbar"
                 android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:background="@color/full_white"
-                android:orientation="vertical"
-                android:paddingTop="8dp"
-                tools:context=".gest.contenuto_bancale.ContenutoBancaleActivity">
+                android:layout_height="wrap_content"
+                app:layout_constraintTop_toTopOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintEnd_toEndOf="parent">
 
-                <it.integry.integrywmsnative.ui.ElevatedToolbar
-                    android:id="@+id/elevated_toolbar"
+                <androidx.appcompat.widget.Toolbar
+                    android:id="@+id/toolbar"
                     android:layout_width="match_parent"
-                    android:layout_height="wrap_content">
-
-                    <androidx.appcompat.widget.Toolbar
-                        android:id="@+id/toolbar"
-                        android:layout_width="match_parent"
-                        android:layout_height="?actionBarSize">
-                        <androidx.appcompat.widget.AppCompatTextView
-                            android:id="@+id/toolbar_title"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            tools:text="modifica ordine"
-                            style="@style/TextAppearance.AppCompat.Widget.ActionBar.Title"
-                            android:layout_gravity="start" />
-
-                        <androidx.appcompat.widget.AppCompatImageButton
-                            android:id="@+id/add_extra_items_toolbar"
-                            android:layout_width="wrap_content"
-                            android:layout_height="50dp"
-                            android:layout_gravity="end"
-                            android:background="@drawable/ripple_effect"
-                            android:adjustViewBounds="true"
-                            android:src="@drawable/ic_search_black_24dp"
-                            android:onClick="@{()->viewModel.manualSearch()}"
-                            android:tint="@color/colorPrimaryGray"/>
-                    </androidx.appcompat.widget.Toolbar>
-
-                </it.integry.integrywmsnative.ui.ElevatedToolbar>
-
-                <LinearLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_marginLeft="8dp"
-                    android:layout_marginRight="8dp"
-                    android:background="@drawable/gray_detail_background_round8"
-                    android:orientation="vertical"
-                    android:padding="16dp">
-
-                    <LinearLayout
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:orientation="horizontal">
-
-                        <androidx.appcompat.widget.AppCompatTextView
-                            style="@style/AppTheme.NewMaterial.Text.Small"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:text="ordine: "
-                            android:textColor="@android:color/black"
-                            android:textSize="16sp" />
-
-                        <androidx.appcompat.widget.AppCompatTextView
-                            android:id="@+id/order_identifier"
-                            style="@style/AppTheme.NewMaterial.Text.Small"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:textColor="@android:color/black"
-                            android:textSize="16sp"
-                            android:textStyle="bold"
-                            tools:text="22 ottobre 2018" />
-                    </LinearLayout>
-
-                    <LinearLayout
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:orientation="horizontal">
-
-                        <androidx.appcompat.widget.AppCompatTextView
-                            style="@style/AppTheme.NewMaterial.Text.Small"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:text="Griglia "
-                            android:textColor="@android:color/black" />
-
-                        <androidx.appcompat.widget.AppCompatTextView
-                            android:id="@+id/cod_alis"
-                            style="@style/AppTheme.NewMaterial.Text.Small"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:textColor="@android:color/black"
-                            android:textStyle="italic"
-                            tools:text="4SECCO" />
-                    </LinearLayout>
-
-
-                    <LinearLayout
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:layout_marginTop="12dp"
-                        android:orientation="horizontal">
-
-                        <androidx.appcompat.widget.AppCompatTextView
-                            style="@style/AppTheme.NewMaterial.Text.Small"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:text="N. articoli "
-                            android:textColor="@android:color/black" />
-
-                        <androidx.appcompat.widget.AppCompatTextView
-                            android:id="@+id/count_art_ord"
-                            style="@style/AppTheme.NewMaterial.Text.Small"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:textColor="@android:color/black"
-                            android:textStyle="bold"
-                            tools:text="10" />
-                    </LinearLayout>
-
-
-                </LinearLayout>
-
-
-                <androidx.recyclerview.widget.RecyclerView
-                    android:id="@+id/articoli_ordine_list"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_marginTop="16dp"
-                    android:layout_marginBottom="92dp"
-                    android:paddingStart="2dp"
-                    android:paddingEnd="2dp" />
-                <LinearLayout
-                    android:id="@+id/scan_art_spinner"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="center_horizontal"
-                    android:layout_marginTop="24dp"
-                    android:visibility="visible"
-                    android:orientation="horizontal">
-
-
-                    <ProgressBar
-                        android:id="@+id/progressBar"
-                        style="?android:attr/progressBarStyle"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"/>
+                    android:layout_height="?actionBarSize">
 
                     <androidx.appcompat.widget.AppCompatTextView
+                        android:id="@+id/toolbar_title"
+                        style="@style/TextAppearance.AppCompat.Widget.ActionBar.Title"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
+                        android:layout_gravity="start"
+                        tools:text="modifica ordine" />
+
+                    <androidx.appcompat.widget.AppCompatImageButton
+                        android:id="@+id/add_extra_items_toolbar"
+                        android:layout_width="wrap_content"
+                        android:layout_height="50dp"
+                        android:layout_gravity="end"
+                        android:adjustViewBounds="true"
+                        android:background="@drawable/ripple_effect"
+                        android:onClick="@{()->viewModel.manualSearch()}"
+                        android:src="@drawable/ic_search_black_24dp"
+                        android:tint="@color/colorPrimaryGray" />
+                </androidx.appcompat.widget.Toolbar>
+
+            </it.integry.integrywmsnative.ui.ElevatedToolbar>
+
+            <androidx.appcompat.widget.LinearLayoutCompat
+                android:id="@+id/header_content"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="8dp"
+                android:layout_marginRight="8dp"
+                android:background="@drawable/gray_detail_background_round8"
+                android:orientation="vertical"
+                app:layout_constraintTop_toBottomOf="@id/elevated_toolbar"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintEnd_toEndOf="parent"
+                android:padding="16dp">
+
+                <androidx.appcompat.widget.LinearLayoutCompat
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:orientation="horizontal">
+
+                    <androidx.appcompat.widget.AppCompatTextView
+                        style="@style/AppTheme.NewMaterial.Text.Small"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="ordine:"
+                        android:textColor="@android:color/black"
+                        android:textSize="16sp" />
+
+                    <androidx.appcompat.widget.AppCompatTextView
+                        android:id="@+id/order_identifier"
+                        style="@style/AppTheme.NewMaterial.Text.Small"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginStart="4dp"
+                        android:textColor="@android:color/black"
                         android:textSize="16sp"
-                        android:layout_marginStart="8dp"
-                        android:layout_marginEnd="12dp"
-                        android:layout_gravity="center_vertical"
-                        android:gravity="center_horizontal"
-                        style="@style/AppTheme.NewMaterial.Text"
-                        android:text="@string/scan_item"/>
-                </LinearLayout>
+                        android:textStyle="bold"
+                        tools:text="22 ottobre 2018" />
+                </androidx.appcompat.widget.LinearLayoutCompat>
 
-            </LinearLayout>
+                <androidx.appcompat.widget.LinearLayoutCompat
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:orientation="horizontal">
 
-        </LinearLayout>
+                    <androidx.appcompat.widget.AppCompatTextView
+                        style="@style/AppTheme.NewMaterial.Text.Small"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="Griglia"
+                        android:textColor="@android:color/black" />
+
+                    <androidx.appcompat.widget.AppCompatTextView
+                        android:id="@+id/cod_alis"
+                        style="@style/AppTheme.NewMaterial.Text.Small"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginStart="4dp"
+                        android:paddingEnd="2dp"
+                        android:textColor="@android:color/black"
+                        android:textStyle="italic"
+                        tools:text="4SAPORIV" />
+                </androidx.appcompat.widget.LinearLayoutCompat>
+
+                <androidx.appcompat.widget.LinearLayoutCompat
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="12dp"
+                    android:orientation="horizontal">
+
+                    <androidx.appcompat.widget.AppCompatTextView
+                        style="@style/AppTheme.NewMaterial.Text.Small"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="N. articoli "
+                        android:textColor="@android:color/black" />
+
+                    <androidx.appcompat.widget.AppCompatTextView
+                        android:id="@+id/count_art_ord"
+                        style="@style/AppTheme.NewMaterial.Text.Small"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:textColor="@android:color/black"
+                        android:textStyle="bold"
+                        tools:text="10" />
+                </androidx.appcompat.widget.LinearLayoutCompat>
 
 
-        <com.github.clans.fab.FloatingActionMenu
-            android:id="@+id/close_activity_fab"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            app:layout_anchor="@+id/linearLayout2"
-            app:layout_anchorGravity="center"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:menu_icon="@drawable/ic_check_white_24dp"
-            fab:menu_animationDelayPerItem="50"
-            fab:menu_backgroundColor="@color/white_bg_alpha"
-            fab:menu_buttonSpacing="0dp"
-            fab:menu_colorNormal="@color/success_color"
-            fab:menu_colorPressed="@color/green_400"
-            fab:menu_labels_colorNormal="@color/white"
-            fab:menu_labels_colorPressed="@color/white_pressed"
-            fab:menu_labels_colorRipple="#66FFFFFF"
-            fab:menu_labels_cornerRadius="3dp"
-            fab:menu_labels_hideAnimation="@anim/fab_slide_out_to_right"
-            fab:menu_labels_margin="0dp"
-            fab:menu_labels_padding="8dp"
-            fab:menu_labels_paddingBottom="4dp"
-            fab:menu_labels_paddingLeft="8dp"
-            fab:menu_labels_paddingRight="8dp"
-            fab:menu_labels_paddingTop="4dp"
-            fab:menu_labels_position="left"
-            fab:menu_labels_showAnimation="@anim/fab_slide_in_from_right"
-            fab:menu_labels_showShadow="true"
-            fab:menu_labels_textColor="@color/black_semi_transparent"
-            fab:menu_labels_textSize="18sp"
-            fab:menu_openDirection="up"
-            fab:menu_shadowColor="#66000000"
-            fab:menu_shadowRadius="4dp"
-            fab:menu_shadowXOffset="1dp"
-            fab:menu_shadowYOffset="3dp"
-            fab:menu_showShadow="true">
+            </androidx.appcompat.widget.LinearLayoutCompat>
 
 
-            <com.github.clans.fab.FloatingActionButton
-                android:id="@+id/pv_ordine_export"
+            <androidx.recyclerview.widget.RecyclerView
+                android:id="@+id/articoli_ordine_list"
+                android:layout_width="match_parent"
+                android:layout_height="0dp"
+                android:layout_marginTop="16dp"
+                android:layout_marginBottom="92dp"
+                android:paddingStart="2dp"
+                android:paddingEnd="2dp"
+                android:clipToPadding="false"
+                android:paddingBottom="72dp"
+                android:scrollbars="vertical"
+                app:layout_constraintTop_toBottomOf="@id/header_content"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent" />
+
+            <androidx.appcompat.widget.LinearLayoutCompat
+                android:id="@+id/scan_art_spinner"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:src="@drawable/ic_black_upload"
-                android:visibility="gone"
-                app:fab_colorNormal="@color/white"
-                app:fab_colorPressed="@color/white_pressed"
-                app:fab_colorRipple="#66FFFFFF"
-                app:onClick="@{() -> viewModel.exportOrdine()}"
-                fab:fab_label="@string/close_and_export" />
-
-            <com.github.clans.fab.FloatingActionButton
-                android:id="@+id/pv_ordine_close"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:src="@drawable/ic_check_black_24dp"
+                android:layout_gravity="center_horizontal"
+                android:layout_marginTop="24dp"
+                android:orientation="horizontal"
                 android:visibility="visible"
-                app:fab_colorNormal="@color/white"
-                app:fab_colorPressed="@color/white_pressed"
-                app:fab_colorRipple="#66FFFFFF"
-                app:onClick="@{() -> viewModel.closeEdit()}"
-                fab:fab_label="@string/close_and_exit" />
+                app:layout_constraintTop_toBottomOf="@id/header_content"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintEnd_toEndOf="parent">
+
+
+                <ProgressBar
+                    android:id="@+id/progressBar"
+                    style="?android:attr/progressBarStyle"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content" />
+
+                <androidx.appcompat.widget.AppCompatTextView
+                    style="@style/AppTheme.NewMaterial.Text"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center_vertical"
+                    android:layout_marginStart="8dp"
+                    android:layout_marginEnd="12dp"
+                    android:gravity="center_horizontal"
+                    android:text="@string/scan_item"
+                    android:textSize="16sp" />
+            </androidx.appcompat.widget.LinearLayoutCompat>
+
+            <com.github.clans.fab.FloatingActionMenu
+                android:id="@+id/close_activity_fab"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignParentBottom="true"
+                app:layout_anchorGravity="center"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:menu_icon="@drawable/ic_check_white_24dp"
+                fab:menu_animationDelayPerItem="50"
+                fab:menu_backgroundColor="@color/white_bg_alpha"
+                fab:menu_buttonSpacing="0dp"
+                fab:menu_colorNormal="@color/success_color"
+                fab:menu_colorPressed="@color/green_400"
+                fab:menu_labels_colorNormal="@color/white"
+                fab:menu_labels_colorPressed="@color/white_pressed"
+                fab:menu_labels_colorRipple="#66FFFFFF"
+                fab:menu_labels_cornerRadius="3dp"
+                fab:menu_labels_hideAnimation="@anim/fab_slide_out_to_right"
+                fab:menu_labels_margin="0dp"
+                fab:menu_labels_padding="8dp"
+                fab:menu_labels_paddingBottom="4dp"
+                fab:menu_labels_paddingLeft="8dp"
+                fab:menu_labels_paddingRight="8dp"
+                fab:menu_labels_paddingTop="4dp"
+                fab:menu_labels_position="left"
+                fab:menu_labels_showAnimation="@anim/fab_slide_in_from_right"
+                fab:menu_labels_showShadow="true"
+                fab:menu_labels_textColor="@color/black_semi_transparent"
+                fab:menu_labels_textSize="18sp"
+                fab:menu_openDirection="up"
+                fab:menu_shadowColor="#66000000"
+                fab:menu_shadowRadius="4dp"
+                fab:menu_shadowXOffset="1dp"
+                fab:menu_shadowYOffset="3dp"
+                fab:menu_showShadow="true">
+
+
+                <com.github.clans.fab.FloatingActionButton
+                    android:id="@+id/pv_ordine_export"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:src="@drawable/ic_black_upload"
+                    android:visibility="gone"
+                    app:fab_colorNormal="@color/white"
+                    app:fab_colorPressed="@color/white_pressed"
+                    app:fab_colorRipple="#66FFFFFF"
+                    app:onClick="@{() -> viewModel.exportOrdine()}"
+                    fab:fab_label="@string/close_and_export" />
+
+                <com.github.clans.fab.FloatingActionButton
+                    android:id="@+id/pv_ordine_close"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:src="@drawable/ic_check_black_24dp"
+                    android:visibility="visible"
+                    app:fab_colorNormal="@color/white"
+                    app:fab_colorPressed="@color/white_pressed"
+                    app:fab_colorRipple="#66FFFFFF"
+                    app:onClick="@{() -> viewModel.closeEdit()}"
+                    fab:fab_label="@string/close_and_exit" />
+
+
+            </com.github.clans.fab.FloatingActionMenu>
+
+        </androidx.constraintlayout.widget.ConstraintLayout>
+
 
 
-        </com.github.clans.fab.FloatingActionMenu>
     </androidx.coordinatorlayout.widget.CoordinatorLayout>
+
+
 </layout>
\ No newline at end of file
diff --git a/build.gradle b/build.gradle
index 95264602..dfb93232 100644
--- a/build.gradle
+++ b/build.gradle
@@ -10,7 +10,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.1.1'
+        classpath 'com.android.tools.build:gradle:7.1.2'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         classpath 'com.google.gms:google-services:4.3.10'