Implementato completamente lo scan del barcode tramite fotocamera.

2020-03-25 19:02:14 +01:00
parent e5a4113968
commit cbce52fd83
35 changed files with 1184 additions and 74 deletions
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -99,9 +99,9 @@ dependencies {
    implementation 'androidx.cardview:cardview:1.0.0'
    implementation 'androidx.recyclerview:recyclerview:1.1.0'
    implementation 'androidx.preference:preference:1.1.0'
-    implementation 'com.squareup.okhttp3:okhttp:4.4.0'
-    implementation 'com.squareup.retrofit2:retrofit:2.7.2'
-    implementation 'com.squareup.retrofit2:converter-gson:2.7.2'
+    implementation 'com.squareup.okhttp3:okhttp:4.4.1'
+    implementation 'com.squareup.retrofit2:retrofit:2.8.0'
+    implementation 'com.squareup.retrofit2:converter-gson:2.8.0'
    implementation 'com.annimon:stream:1.2.1'
    implementation 'androidx.lifecycle:lifecycle-runtime:2.2.0'
    implementation 'androidx.lifecycle:lifecycle-extensions:2.2.0'
@@ -109,7 +109,7 @@ dependencies {
    implementation 'org.apache.commons:commons-text:1.8'

    //MVVM
-    def dagger2_version = "2.26"
+    def dagger2_version = '2.27'
    implementation 'androidx.lifecycle:lifecycle-extensions:2.2.0'
    implementation "androidx.lifecycle:lifecycle-common-java8:2.2.0"
    api "com.google.dagger:dagger:$dagger2_version"
@@ -145,8 +145,8 @@ dependencies {
    implementation project(':barcode_base_android_library')
    implementation project(':honeywellscannerlibrary')
    implementation project(':keyobardemulatorscannerlibrary')
-    implementation 'com.kroegerama:barcode-kaiteki:1.1.1'
-    androidTestImplementation 'org.junit.jupiter:junit-jupiter-api:5.6.0'
+    implementation project(':barcode_kaiteki')
+    androidTestImplementation 'org.junit.jupiter:junit-jupiter-api:5.6.1'
    androidTestImplementation 'org.testng:testng:7.1.0'
 }
 repositories {
--- a/app/src/main/java/it/integry/integrywmsnative/core/utility/UtilityDialog.java
+++ b/app/src/main/java/it/integry/integrywmsnative/core/utility/UtilityDialog.java
@@ -4,13 +4,26 @@ import android.app.Dialog;
 import android.content.Context;
 import android.widget.LinearLayout;

+import androidx.fragment.app.DialogFragment;
+
 public class UtilityDialog {

-    public static void setTo90PercentSize(Context context, Dialog dialog) {
+    public static void setTo90PercentWidth(Context context, Dialog dialog) {
        int width = (int)(context.getResources().getDisplayMetrics().widthPixels*0.90);
-        //int height = (int)(context.getResources().getDisplayMetrics().heightPixels*0.90);

        dialog.getWindow().setLayout(width, LinearLayout.LayoutParams.WRAP_CONTENT);
    }

+    public static void setTo90PercentWidth(Context context, DialogFragment dialog) {
+        int width = (int)(context.getResources().getDisplayMetrics().widthPixels*0.90);
+
+        dialog.getDialog().getWindow().setLayout(width, LinearLayout.LayoutParams.WRAP_CONTENT);
+    }
+
+//    public static void setTo90PercentHeight(Context context, Dialog dialog) {
+//        int height = (int)(context.getResources().getDisplayMetrics().heightPixels*0.90);
+//
+//        dialog.getWindow().setLayout(width, LinearLayout.LayoutParams.WRAP_CONTENT);
+//    }
+
 }
--- a/app/src/main/java/it/integry/integrywmsnative/gest/pv_ordine_acquisto_edit/dialog/EditArticoloDialog.java
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/pv_ordine_acquisto_edit/dialog/EditArticoloDialog.java
@@ -6,8 +6,6 @@ import android.content.Context;
 import android.graphics.Color;
 import android.graphics.drawable.ColorDrawable;
 import android.text.Editable;
-import android.text.Html;
-import android.text.SpannableString;
 import android.text.TextWatcher;
 import android.view.LayoutInflater;

@@ -23,7 +21,6 @@ import it.integry.integrywmsnative.core.utility.UtilityFocus;
 import it.integry.integrywmsnative.core.utility.UtilityProgress;
 import it.integry.integrywmsnative.databinding.DialogPvEditArticoloBinding;
 import it.integry.integrywmsnative.gest.pv_ordine_acquisto_edit.helper.PVEditOrderHelper;
-import it.integry.integrywmsnative.view.dialogs.base.DialogSimpleMessageHelper;

 public class EditArticoloDialog {

@@ -52,7 +49,7 @@ public class EditArticoloDialog {

        mDialog = new BaseDialog(context);
        mDialog.setContentView(mBinding.getRoot());
-        UtilityDialog.setTo90PercentSize(mContext, mDialog);
+        UtilityDialog.setTo90PercentWidth(mContext, mDialog);
        mDialog.getWindow().setBackgroundDrawable(new ColorDrawable(Color.TRANSPARENT));

        int qtaCnf = (int)Math.ceil(mArticolo.getQtaOrd() / mArticolo.getQtaCnf());
--- a/app/src/main/java/it/integry/integrywmsnative/gest/spedizione_new/SpedizioneActivity.java
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/spedizione_new/SpedizioneActivity.java
@@ -50,6 +50,7 @@ import it.integry.integrywmsnative.gest.spedizione_new.core.SpedizioneListModel;
 import it.integry.integrywmsnative.gest.spedizione_new.model.PickingObjectDTO;
 import it.integry.integrywmsnative.gest.vendita.dto.OrdineVenditaInevasoDTO;
 import it.integry.integrywmsnative.view.dialogs.base.DialogSimpleInputHelper;
+import it.integry.integrywmsnative.view.dialogs.camera_barcode_reader.DialogCameraBarcodeReader;
 import it.integry.integrywmsnative.view.dialogs.input_quantity_v2.DialogInputQuantityV2;
 import it.integry.integrywmsnative.view.dialogs.input_quantity_v2.DialogInputQuantityV2DTO;

@@ -281,24 +282,10 @@ public class SpedizioneActivity extends AppCompatActivity implements SpedizioneV
    }

    public void startCameraBarcode() {
-        List<BarcodeFormat> availableBarcodeFormats = new ArrayList<>();
-        availableBarcodeFormats.add(BarcodeFormat.QR_CODE);
-        availableBarcodeFormats.add(BarcodeFormat.CODE_128);
-        availableBarcodeFormats.add(BarcodeFormat.UPC_E);
-        availableBarcodeFormats.add(BarcodeFormat.CODABAR);
-        availableBarcodeFormats.add(BarcodeFormat.EAN_8);
-        availableBarcodeFormats.add(BarcodeFormat.EAN_13);
-        availableBarcodeFormats.add(BarcodeFormat.ITF);
-        availableBarcodeFormats.add(BarcodeFormat.UPC_A);
-
-        BarcodeBottomSheet bbs = BarcodeBottomSheet.Companion.show(
-                getSupportFragmentManager(),
-                availableBarcodeFormats,
-                false,
-                "tag"
-        );
-
-
+        DialogCameraBarcodeReader.newInstance(this, data -> {
+            this.onScanSuccessful.run(data);
+        })
+        .show(getSupportFragmentManager(), "camera_barcode");
    }

    public void removeListFilter() {
--- a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/DialogAskAction.java
+++ b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/DialogAskAction.java
@@ -31,7 +31,7 @@ public class DialogAskAction {

        mDialog = new BaseDialog(context);
        mDialog.setContentView(mBinding.getRoot());
-        UtilityDialog.setTo90PercentSize(mContext, mDialog);
+        UtilityDialog.setTo90PercentWidth(mContext, mDialog);
        mDialog.getWindow().setBackgroundDrawable(new ColorDrawable(Color.TRANSPARENT));

        mBinding.bottomSheetActionsTitle.setText(title);
--- a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/ask_cliente/DialogAskCliente.java
+++ b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/ask_cliente/DialogAskCliente.java
@@ -2,28 +2,20 @@ package it.integry.integrywmsnative.view.dialogs.ask_cliente;

 import android.app.Dialog;
 import android.content.Context;
-import android.content.DialogInterface;
 import android.graphics.Color;
 import android.graphics.drawable.ColorDrawable;
 import android.view.LayoutInflater;
 import android.view.WindowManager;
-import android.widget.ArrayAdapter;
-import android.widget.AutoCompleteTextView;
-import android.widget.LinearLayout;

 import androidx.databinding.DataBindingUtil;

 import java.util.AbstractMap;
 import java.util.ArrayList;
-import java.util.HashMap;
 import java.util.List;
 import java.util.Map;

 import it.integry.integrywmsnative.R;
-import it.integry.integrywmsnative.core.expansion.RunnableArgs;
 import it.integry.integrywmsnative.core.expansion.RunnableArgss;
-import it.integry.integrywmsnative.core.model.MtbColt;
-import it.integry.integrywmsnative.core.model.MtbDepoPosizione;
 import it.integry.integrywmsnative.core.model.VtbDest;
 import it.integry.integrywmsnative.core.utility.UtilityDialog;
 import it.integry.integrywmsnative.databinding.DialogAskClienteBinding;
@@ -68,7 +60,7 @@ public class DialogAskCliente {
        mDialog.setContentView(mBinding.getRoot());
        mDialog.setCanceledOnTouchOutside(false);
 //        mDialog.setCancelable(false);
-        UtilityDialog.setTo90PercentSize(mContext, mDialog);
+        UtilityDialog.setTo90PercentWidth(mContext, mDialog);
        mDialog.getWindow().setBackgroundDrawable(new ColorDrawable(Color.TRANSPARENT));
        mDialog.getWindow().setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_ADJUST_RESIZE);

--- a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/ask_position_of_lu/DialogAskPositionOfLU.java
+++ b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/ask_position_of_lu/DialogAskPositionOfLU.java
@@ -1,7 +1,6 @@
 package it.integry.integrywmsnative.view.dialogs.ask_position_of_lu;

 import android.app.Dialog;
-import android.app.ProgressDialog;
 import android.content.Context;

 import androidx.appcompat.widget.AppCompatTextView;
@@ -85,7 +84,7 @@ public class DialogAskPositionOfLU {
 //        mDialog.setCancelable(false);
        mDialog.getWindow().setBackgroundDrawable(new ColorDrawable(Color.TRANSPARENT));

-        UtilityDialog.setTo90PercentSize(mContext, mDialog);
+        UtilityDialog.setTo90PercentWidth(mContext, mDialog);

        mDialog.setOnShowListener(dialog -> {
            ((AppCompatTextView) adapter.getPage(0).findViewById(R.id.description_text)).setText(mCheckForLineaProd ? R.string.ask_production_line_of_lu_message : R.string.ask_position_of_lu_message);
--- a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/base/DialogSimpleInputHelper.java
+++ b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/base/DialogSimpleInputHelper.java
@@ -1,31 +1,17 @@
 package it.integry.integrywmsnative.view.dialogs.base;

-import android.app.Activity;
 import android.app.Dialog;
 import android.content.Context;
 import android.content.res.ColorStateList;
 import android.graphics.Color;
-import android.graphics.Rect;
 import android.graphics.drawable.ColorDrawable;
-import android.graphics.drawable.Drawable;
-import android.text.SpannableString;
-import android.text.Spanned;
 import android.view.LayoutInflater;
-import android.view.Window;
-import android.widget.LinearLayout;
-import android.widget.RelativeLayout;
-import android.widget.TextView;

-import androidx.annotation.StringRes;
-import androidx.core.content.ContextCompat;
 import androidx.databinding.DataBindingUtil;

-import java.util.HashMap;
-
 import it.integry.integrywmsnative.R;
 import it.integry.integrywmsnative.core.expansion.RunnableArgs;
 import it.integry.integrywmsnative.core.utility.UtilityDialog;
-import it.integry.integrywmsnative.databinding.DialogBaseBinding;
 import it.integry.integrywmsnative.databinding.DialogInputGeneralBinding;

 /**
@@ -60,7 +46,7 @@ public class DialogSimpleInputHelper {
        dialog.setCanceledOnTouchOutside(false);
        dialog.setContentView(mBinding.getRoot());
        dialog.getWindow().setBackgroundDrawable(new ColorDrawable(Color.TRANSPARENT));
-        UtilityDialog.setTo90PercentSize(mContext,dialog);
+        UtilityDialog.setTo90PercentWidth(mContext,dialog);

        return dialog;
    }
--- a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/basket_lu/DialogBasketLU.java
+++ b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/basket_lu/DialogBasketLU.java
@@ -2,16 +2,11 @@ package it.integry.integrywmsnative.view.dialogs.basket_lu;

 import android.app.Dialog;
 import android.content.Context;
-import android.content.DialogInterface;
 import android.graphics.Color;
 import android.graphics.drawable.ColorDrawable;
 import android.view.LayoutInflater;
-import android.view.View;

-import androidx.core.content.ContextCompat;
 import androidx.databinding.DataBindingUtil;
-import androidx.recyclerview.widget.DividerItemDecoration;
-import androidx.recyclerview.widget.LinearLayoutManager;

 import java.util.AbstractMap;
 import java.util.ArrayList;
@@ -21,12 +16,8 @@ import java.util.Map;
 import it.integry.integrywmsnative.R;
 import it.integry.integrywmsnative.core.expansion.RunnableArgs;
 import it.integry.integrywmsnative.core.model.MtbColt;
-import it.integry.integrywmsnative.core.rest.consumers.ColliMagazzinoRESTConsumer;
 import it.integry.integrywmsnative.core.utility.UtilityDialog;
 import it.integry.integrywmsnative.databinding.DialogBasketLuBinding;
-import it.integry.integrywmsnative.view.dialogs.ask_cliente.viewmodel.DialogAskCliente_Page1ViewModel;
-import it.integry.integrywmsnative.view.dialogs.ask_cliente.viewmodel.DialogAskCliente_Page2ViewModel;
-import it.integry.integrywmsnative.view.dialogs.basket_lu.pages.page1.DialogBasketLU_Page1_ListAdapter;
 import it.integry.integrywmsnative.view.dialogs.basket_lu.pages.page1.DialogBasketLU_Page1_ViewModel;
 import it.integry.integrywmsnative.view.dialogs.basket_lu.pages.page2.DialogBasketLU_Page2_ViewModel;

@@ -57,7 +48,7 @@ public class DialogBasketLU {
        mDialog.setCanceledOnTouchOutside(false);
        mDialog.getWindow().setBackgroundDrawable(new ColorDrawable(Color.TRANSPARENT));

-        UtilityDialog.setTo90PercentSize(context, mDialog);
+        UtilityDialog.setTo90PercentWidth(context, mDialog);

        this.initViewPager();
    }
--- a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/camera_barcode_reader/DialogCameraBarcodeReader.java
+++ b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/camera_barcode_reader/DialogCameraBarcodeReader.java
@@ -0,0 +1,129 @@
+package it.integry.integrywmsnative.view.dialogs.camera_barcode_reader;
+
+import android.app.Dialog;
+import android.content.Context;
+import android.graphics.Color;
+import android.graphics.drawable.ColorDrawable;
+import android.os.Bundle;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.databinding.DataBindingUtil;
+import androidx.fragment.app.DialogFragment;
+
+import com.google.zxing.BarcodeFormat;
+import com.google.zxing.Result;
+import com.kroegerama.kaiteki.bcode.BarcodeResultListener;
+import com.orhanobut.logger.Logger;
+
+import org.jetbrains.annotations.NotNull;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import it.integry.barcode_base_android_library.model.BarcodeScanDTO;
+import it.integry.barcode_base_android_library.model.BarcodeType;
+import it.integry.integrywmsnative.R;
+import it.integry.integrywmsnative.core.expansion.RunnableArgs;
+import it.integry.integrywmsnative.core.utility.UtilityDialog;
+import it.integry.integrywmsnative.databinding.DialogCameraBarcodeReaderBinding;
+
+public class DialogCameraBarcodeReader extends DialogFragment implements BarcodeResultListener {
+
+    private Context mContext;
+
+    private DialogCameraBarcodeReaderBinding mBindings;
+    private final RunnableArgs<BarcodeScanDTO> onComplete;
+
+    public static DialogCameraBarcodeReader newInstance(@NonNull Context context, @NonNull final RunnableArgs<BarcodeScanDTO> onComplete) {
+        return new DialogCameraBarcodeReader(context, onComplete);
+    }
+
+    private DialogCameraBarcodeReader(@NonNull Context context, @NonNull final RunnableArgs<BarcodeScanDTO> onComplete){
+        this.mContext = context;
+        this.onComplete = onComplete;
+    }
+
+
+    @Nullable
+    @Override
+    public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
+        mBindings = DataBindingUtil.inflate(inflater, R.layout.dialog_camera_barcode_reader, container, false);
+
+        UtilityDialog.setTo90PercentWidth(mContext, this);
+
+        getDialog().setCanceledOnTouchOutside(false);
+        getDialog().setCancelable(false);
+        getDialog().getWindow().setBackgroundDrawable(new ColorDrawable(Color.TRANSPARENT));
+
+        this.initBarcodeView();
+
+        mBindings.buttonConfirm.setOnClickListener(v -> {
+            dismiss();
+        });
+
+        return mBindings.getRoot();
+    }
+
+
+    private void initBarcodeView() {
+        List<BarcodeFormat> availableBarcodeFormats = new ArrayList<>();
+        availableBarcodeFormats.add(BarcodeFormat.QR_CODE);
+        availableBarcodeFormats.add(BarcodeFormat.CODE_128);
+        availableBarcodeFormats.add(BarcodeFormat.UPC_E);
+        availableBarcodeFormats.add(BarcodeFormat.CODABAR);
+        availableBarcodeFormats.add(BarcodeFormat.EAN_8);
+        availableBarcodeFormats.add(BarcodeFormat.EAN_13);
+        availableBarcodeFormats.add(BarcodeFormat.ITF);
+        availableBarcodeFormats.add(BarcodeFormat.UPC_A);
+
+        mBindings.bcode.setFormats(availableBarcodeFormats);
+        mBindings.bcode.setBarcodeInverted(false);
+        mBindings.bcode.setBarcodeResultListener(this);
+        mBindings.bcode.bindToLifecycle(this);
+    }
+
+    @Override
+    public boolean onBarcodeResult(@NotNull Result result) {
+
+        BarcodeScanDTO barcodeScanDTO = new BarcodeScanDTO()
+                .setByteValue(result.getRawBytes())
+                .setStringValue(result.getText());
+
+        BarcodeType type = null;
+
+        switch (result.getBarcodeFormat()) {
+            case CODE_128:
+                type = BarcodeType.CODE128;
+            case CODE_39:
+                type = BarcodeType.CODE39;
+
+            case EAN_13:
+                type = BarcodeType.EAN13;
+            case EAN_8:
+                type = BarcodeType.EAN8;
+
+            case UPC_A:
+                type = BarcodeType.UPCA;
+            case UPC_E:
+                type = BarcodeType.UPCE;
+            default:
+                Logger.e("Barcode not recognized", "Barcode type " + result.getBarcodeFormat().toString() + " was not mapped in DialogCameraBarcodeReader.java");
+                type = null;
+        }
+
+        barcodeScanDTO.setType(type);
+
+        this.dismiss();
+        this.onComplete.run(barcodeScanDTO);
+        return true;
+    }
+
+    @Override
+    public void onBarcodeScanCancelled() {
+
+    }
+}
--- a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/choose_art_from_lista_arts/DialogChooseArtFromListaArts.java
+++ b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/choose_art_from_lista_arts/DialogChooseArtFromListaArts.java
@@ -4,7 +4,6 @@ import android.app.Dialog;
 import android.content.Context;
 import androidx.databinding.DataBindingUtil;
 import androidx.core.content.ContextCompat;
-import androidx.appcompat.app.AlertDialog;
 import androidx.recyclerview.widget.DividerItemDecoration;
 import androidx.recyclerview.widget.LinearLayoutManager;

@@ -50,7 +49,7 @@ public class DialogChooseArtFromListaArts {
        mDialog.setCanceledOnTouchOutside(false);
        mDialog.getWindow().setBackgroundDrawable(new ColorDrawable(Color.TRANSPARENT));

-        UtilityDialog.setTo90PercentSize(context, mDialog);
+        UtilityDialog.setTo90PercentWidth(context, mDialog);

        initRecyclerView(bindings, listaArts);
    }
--- 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
@@ -1,11 +1,9 @@
 package it.integry.integrywmsnative.view.dialogs.choose_arts_from_lista_arts;

 import android.app.Dialog;
-import android.app.ProgressDialog;
 import android.content.Context;

 import androidx.databinding.DataBindingUtil;
-import androidx.appcompat.app.AlertDialog;
 import androidx.recyclerview.widget.LinearLayoutManager;

 import android.graphics.Color;
@@ -102,7 +100,7 @@ public class DialogChooseArtsFromListaArts {
            if(this.mOnAbort != null) this.mOnAbort.run();
        });

-        UtilityDialog.setTo90PercentSize(context, mDialog);
+        UtilityDialog.setTo90PercentWidth(context, mDialog);


        initRecyclerView(binding);
--- a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/input_quantity_v2/DialogInputQuantityV2ViewModel.java
+++ b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/input_quantity_v2/DialogInputQuantityV2ViewModel.java
@@ -32,6 +32,8 @@ public class DialogInputQuantityV2ViewModel {


    public void init() {
+        //Quando ho un barcode peso devo calcolare numCnf dal peso medio
+
        this.currentNumCnf.set(totalNumCnfToBeTaken != null ? totalNumCnfToBeTaken : BigDecimal.ONE);
        UtilityObservable.addPropertyChanged(this.currentNumCnf, this::onCurrentNumCnfChanged);

--- a/app/src/main/res/layout/dialog_camera_barcode_reader.xml
+++ b/app/src/main/res/layout/dialog_camera_barcode_reader.xml
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<layout>
+
+    <androidx.cardview.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
+        xmlns:app="http://schemas.android.com/apk/res-auto"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        app:cardCornerRadius="12dp"
+        app:cardElevation="0dp">
+
+        <androidx.constraintlayout.widget.ConstraintLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent">
+
+            <com.kroegerama.kaiteki.bcode.views.BarcodeView
+                android:id="@+id/bcode"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toTopOf="parent"
+                app:resultPointColor="#09E85E"
+                app:resultPointSize="8dp"
+                app:showResultPoints="true" />
+
+
+            <RelativeLayout
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:gravity="center|bottom"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toTopOf="parent"
+                android:paddingBottom="8dp">
+
+                <com.google.android.material.button.MaterialButton
+                    android:id="@+id/button_confirm"
+                    style="@style/Button.PrimaryFull"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="@string/action_close"
+                    android:layout_alignParentBottom="true"/>
+
+            </RelativeLayout>
+
+        </androidx.constraintlayout.widget.ConstraintLayout>
+    </androidx.cardview.widget.CardView>
+</layout>
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -296,6 +296,7 @@
    <string name="cod_alis_name">Griglia: </string>
    <string name="seleziona_crea_ordine_a_pv">Seleziona / Crea ordine</string>
    <string name="add">Aggiungi</string>
+    <string name="action_close">Chiudi</string>
    <string name="close_and_export">Chiudi ed esporta ordine</string>
    <string name="close_and_exit">Chiudi ordine</string>
    <string name="scan_art_barcode_to_add">Scansiona il codice di un articolo per aggiungerlo all\' ordine</string>
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -302,6 +302,7 @@
    <string name="cod_alis_name">Grid: </string>
    <string name="seleziona_crea_ordine_a_pv">Select/Create order</string>
    <string name="add">Add</string>
+    <string name="action_close">Close</string>
    <string name="close_and_export">Close and export</string>
    <string name="close_and_exit">Close order</string>
    <string name="scan_art_barcode_to_add">Scan an item barcode to add it to the order</string>