Finish v.1.23.9(264)

app/build.gradle

@@ -10,8 +10,8 @@ apply plugin: 'com.google.gms.google-services'
 
 android {
 
-    def appVersionCode = 262
+    def appVersionCode = 264
-    def appVersionName = '1.23.7'
+    def appVersionName = '1.23.9'
 
     signingConfigs {
         release {

app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/OrdiniRESTConsumer.java

@@ -125,7 +125,7 @@ public class OrdiniRESTConsumer extends _BaseRESTConsumer {
         OrdiniRESTConsumerService service = RESTBuilder.getService(OrdiniRESTConsumerService.class);
 
         service.getOrdiniInevasi(codMdep, gestione.getText())
-                .enqueue(new Callback<ServiceRESTResponse<List<OrdineUscitaInevasoDTO>>>() {
+                .enqueue(new Callback<>() {
                     @Override
                     public void onResponse(Call<ServiceRESTResponse<List<OrdineUscitaInevasoDTO>>> call, Response<ServiceRESTResponse<List<OrdineUscitaInevasoDTO>>> response) {
                         analyzeAnswer(response, "getOrdiniInevasi", responseDtoList -> {
@@ -145,7 +145,7 @@ public class OrdiniRESTConsumer extends _BaseRESTConsumer {
                 });
     }
 
-    public void retrieveListaArticoliFromOrdiniUscita(List<OrdineUscitaInevasoDTO> orders, RunnableArgs<List<SitArtOrdDTO>> onComplete, RunnableArgs<Exception> onFailed) {
+    public void retrieveListaArticoliFromOrdiniUscita(String codMdep, List<OrdineUscitaInevasoDTO> orders, RunnableArgs<List<SitArtOrdDTO>> onComplete, RunnableArgs<Exception> onFailed) {
         List<GetPickingListDTO> getPickingListDTOs = Stream.of(orders)
                 .map(x -> new GetPickingListDTO()
                         .setData(x.getDataOrdS())
@@ -157,7 +157,7 @@ public class OrdiniRESTConsumer extends _BaseRESTConsumer {
 
         OrdiniRESTConsumerService service = RESTBuilder.getService(OrdiniRESTConsumerService.class, 90);
 
-        service.getArticoliFromOrdini(getPickingListDTOs).enqueue(new Callback<ServiceRESTResponse<List<SitArtOrdDTO>>>() {
+        service.getArticoliFromOrdini(codMdep, getPickingListDTOs).enqueue(new Callback<>() {
             @Override
             public void onResponse(Call<ServiceRESTResponse<List<SitArtOrdDTO>>> call, Response<ServiceRESTResponse<List<SitArtOrdDTO>>> response) {
                 analyzeAnswer(response, "retrieveListaArticoliFromOrdiniUscita", onComplete, onFailed);

app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/OrdiniRESTConsumerService.java

@@ -16,7 +16,7 @@ import retrofit2.http.Query;
 public interface OrdiniRESTConsumerService {
 
     @POST("wms/getArticoliFromOrdini")
-    Call<ServiceRESTResponse<List<SitArtOrdDTO>>> getArticoliFromOrdini(@Body List<GetPickingListDTO> pickingListDTO);
+    Call<ServiceRESTResponse<List<SitArtOrdDTO>>> getArticoliFromOrdini(@Query("codMdep") String codMdep, @Body List<GetPickingListDTO> pickingListDTO);
 
     @POST("wms/getSuggestedPickingList")
     Call<ServiceRESTResponse<List<PickingObjectDTO>>> getSuggestedPickingList(@Query("codMdep") String codMdep, @Body List<SitArtOrdDTO> sitArtOrdDTOList);

app/src/main/java/it/integry/integrywmsnative/core/rest/model/SitArtOrdDTO.java

@@ -19,6 +19,7 @@ public class SitArtOrdDTO {
     private String idViaggio;
     private String codMdep;
     private boolean flagEnablePickManuale;
+    private boolean flagEnableScanArt;
     private String codMgrp;
     private String descrizioneMgrp;
     private String codMsgr;
@@ -145,6 +146,14 @@ public class SitArtOrdDTO {
         return this;
     }
 
+    public boolean isFlagEnableScanArt() {
+        return flagEnableScanArt;
+    }
+
+    public SitArtOrdDTO setFlagEnableScanArt(boolean flagEnableScanArt) {
+        this.flagEnableScanArt = flagEnableScanArt;
+        return this;
+    }
 
     public String getCodMgrp() {
         return codMgrp;

app/src/main/java/it/integry/integrywmsnative/gest/ordini_uscita_elenco/OrdiniUscitaElencoFragment.java

@@ -697,34 +697,34 @@ public class OrdiniUscitaElencoFragment extends BaseFragment implements ITitledF
     };
 
     private void refreshList(List<OrdiniUscitaElencoDTO> filteredList) {
-        this.onLoadingStarted();
 
-        //new Thread(() -> {
+//        new Thread(() -> {
 
-        requireActivity().runOnUiThread(() -> {
+//        requireActivity().runOnUiThread(() -> {
-            List<OrdiniUscitaElencoDTO> tmpList;
+//        this.onLoadingStarted();
+        List<OrdiniUscitaElencoDTO> tmpList;
 
-            if (filteredList != null) {
+        if (filteredList != null) {
-                tmpList = filteredList;
+            tmpList = filteredList;
-            } else if (mAppliedFilterViewModel != null) {
+        } else if (mAppliedFilterViewModel != null) {
-                mAppliedFilterViewModel.applyAllTests();
+            mAppliedFilterViewModel.applyAllTests();
-                tmpList = mAppliedFilterViewModel.getMutableFilteredOrderList().getValue();
+            tmpList = mAppliedFilterViewModel.getMutableFilteredOrderList().getValue();
-            } else {
+        } else {
-                tmpList = mViewModel.getOrderList().getValue();
+            tmpList = mViewModel.getOrderList().getValue();
-            }
+        }
 
-            var list = convertDataModelToListModel(tmpList);
+        var list = convertDataModelToListModel(tmpList);
 
-            this.mOrdiniInevasiMutableData.clear();
+        this.mOrdiniInevasiMutableData.clear();
-            this.mOrdiniInevasiMutableData.addAll(list);
+        this.mOrdiniInevasiMutableData.addAll(list);
 
-            fabVisible.set(Stream.of(mOrdiniInevasiMutableData)
+        fabVisible.set(Stream.of(mOrdiniInevasiMutableData)
-                    .anyMatch(y -> y.getSelectedObservable().get()));
+                .anyMatch(y -> y.getSelectedObservable().get()));
 
-            this.onLoadingEnded();
+//        this.onLoadingEnded();
-        });
+//        });
 
-        //}).start();
+//        }).start();
 
     }
 

app/src/main/java/it/integry/integrywmsnative/gest/ordini_uscita_elenco/OrdiniUscitaElencoViewModel.java

@@ -104,7 +104,7 @@ public class OrdiniUscitaElencoViewModel {
                 .distinct()
                 .toList();
 
-        if (foundGestioni != null && foundGestioni.size() > 1) {
+        if (foundGestioni.size() > 1) {
             this.sendError(new InvalidLUMultiGestioneException());
             return;
         }
@@ -116,7 +116,7 @@ public class OrdiniUscitaElencoViewModel {
                 .distinct()
                 .toList();
 
-        if (foundCodMdep != null && foundCodMdep.size() > 1) {
+        if (foundCodMdep.size() > 1) {
             this.sendError(new InvalidLUMultiCodMdepException());
             return;
         }
@@ -128,9 +128,9 @@ public class OrdiniUscitaElencoViewModel {
                 .map(x -> (OrdineUscitaInevasoDTO) x)
                 .toList();
 
-        this.mOrdiniRESTConsumer.retrieveListaArticoliFromOrdiniUscita(selectedOrdersBase, sitArts -> {
+        this.mOrdiniRESTConsumer.retrieveListaArticoliFromOrdiniUscita(mCurrentCodMdep, selectedOrdersBase, sitArts -> {
 
-            if(mtbGrupToFilter != null && !mtbGrupToFilter.isEmpty()) {
+            if (mtbGrupToFilter != null && !mtbGrupToFilter.isEmpty()) {
                 sitArts = Stream.of(sitArts)
                         .filter(x -> Stream.of(mtbGrupToFilter).map(MtbGrup::getCodMgrp).anyMatch(y -> y.equalsIgnoreCase(x.getCodMgrp())))
                         .toList();

app/src/main/java/it/integry/integrywmsnative/gest/spedizione/SpedizioneViewModel.java

@@ -708,6 +708,7 @@ public class SpedizioneViewModel {
 
         List<PickingObjectDTO> matchPickingObject = Stream.of(pickingList)
                 .filter(x -> UtilityString.equalsIgnoreCase(mtbAart.getCodMart(), x.getSitArtOrdDTO().getCodMart()))
+                .filter(x -> x.getSitArtOrdDTO().isFlagEnableScanArt())
                 .filter(x -> {
                     MtbPartitaMag mtbPartitaMag = pickData != null && pickData.getManualPickDTO() != null && pickData.getManualPickDTO().getMtbPartitaMag() != null ? pickData.getManualPickDTO().getMtbPartitaMag() : null;
                     return !mEnableCheckPartitaMag || (mtbPartitaMag != null && UtilityString.equalsIgnoreCase(x.getSitArtOrdDTO().getPartitaMag(), mtbPartitaMag.getPartitaMag()));
@@ -742,8 +743,8 @@ public class SpedizioneViewModel {
                 this.getPickingList().postValue(pickingList);
             } else {
                 MtbColt refMtbColt = matchedItem.getRefMtbColt();
-                MtbColr refMtbColr = refMtbColt != null ? matchedItem.getRefMtbColt().getMtbColr().get(0) : null;
+                MtbColr refMtbColr = refMtbColt != null ? refMtbColt.getMtbColr().get(0) : null;
-                this.dispatchOrdineRow(matchedItem, refMtbColt, refMtbColr, false);
+                this.dispatchOrdineRow(matchedItem, refMtbColt, refMtbColr, refMtbColr == null);
             }
 
         } else {

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();
 

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"
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
-    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
+        <androidx.constraintlayout.widget.ConstraintLayout
-            android:id="@+id/linearLayout2"
             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:layout_height="wrap_content"
-                android:background="@color/full_white"
+                app:layout_constraintTop_toTopOf="parent"
-                android:orientation="vertical"
+                app:layout_constraintStart_toStartOf="parent"
-                android:paddingTop="8dp"
+                app:layout_constraintEnd_toEndOf="parent">
-                tools:context=".gest.contenuto_bancale.ContenutoBancaleActivity">
 
-                <it.integry.integrywmsnative.ui.ElevatedToolbar
+                <androidx.appcompat.widget.Toolbar
-                    android:id="@+id/elevated_toolbar"
+                    android:id="@+id/toolbar"
                     android:layout_width="match_parent"
-                    android:layout_height="wrap_content">
+                    android:layout_height="?actionBarSize">
-
-                    <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"/>
 
                     <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:textStyle="bold"
-                        android:layout_marginEnd="12dp"
+                        tools:text="22 ottobre 2018" />
-                        android:layout_gravity="center_vertical"
+                </androidx.appcompat.widget.LinearLayoutCompat>
-                        android:gravity="center_horizontal"
-                        style="@style/AppTheme.NewMaterial.Text"
-                        android:text="@string/scan_item"/>
-                </LinearLayout>
 
-            </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
+            </androidx.appcompat.widget.LinearLayoutCompat>
-            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">
 
 
-            <com.github.clans.fab.FloatingActionButton
+            <androidx.recyclerview.widget.RecyclerView
-                android:id="@+id/pv_ordine_export"
+                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:layout_gravity="center_horizontal"
-                android:visibility="gone"
+                android:layout_marginTop="24dp"
-                app:fab_colorNormal="@color/white"
+                android:orientation="horizontal"
-                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:layout_constraintTop_toBottomOf="@id/header_content"
-                app:fab_colorPressed="@color/white_pressed"
+                app:layout_constraintStart_toStartOf="parent"
-                app:fab_colorRipple="#66FFFFFF"
+                app:layout_constraintEnd_toEndOf="parent">
-                app:onClick="@{() -> viewModel.closeEdit()}"
+
-                fab:fab_label="@string/close_and_exit" />
+
+                <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>

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'