From 7d771bf39bbba0c34fcd052b58cbd982cdef8437 Mon Sep 17 00:00:00 2001
From: GiuseppeS <g.scorrano@integry.it>
Date: Fri, 7 Jan 2022 18:09:37 +0100
Subject: [PATCH] Implementato suggerimento della posizione (da mtb_aart)

---
 .../AccettazionePickingActivity.java          |  3 ++
 .../ui/AccettazioneListAdapter.java           |  5 +-
 .../ui/AccettazioneListModel.java             | 11 +++++
 .../ui/PickingResiListAdapter.java            |  2 +-
 .../spedizione/ui/SpedizioneListAdapter.java  |  2 +-
 .../main/res/drawable/badge2_round_corner.xml | 12 -----
 ...ound_corner.xml => badge_round_corner.xml} |  2 +-
 app/src/main/res/drawable/ic_location_24.xml  |  5 ++
 .../dialog_input_quantity_v2.xml              |  4 +-
 ...e_ordine_inevaso_main_list__group_item.xml | 47 ++++++++++++++++---
 ...ntab_doc_interno_row__list_single_item.xml |  3 +-
 .../bottom_sheet_fragment__lu_content.xml     |  2 +-
 ..._sheet_fragment__lu_content__list_item.xml | 10 ++--
 .../dialog_basket_lu__mtb_colr_model.xml      |  6 ++-
 .../dialog_basket_lu__mtb_colt_model.xml      |  3 +-
 ...hoose_arts_from_lista_arts__item_model.xml |  6 ++-
 .../res/layout/dialog_input_quantity_v2.xml   |  4 +-
 .../res/layout/dialog_pv_edit_articolo.xml    |  4 +-
 ..._choose_ords_lav_from_list__item_model.xml |  4 +-
 .../fragment_main_rettifica_giacenze.xml      |  3 +-
 ...ime_consegne_cliente__list_single_item.xml |  3 +-
 ...fragment_ordini_a_pv__list_single_item.xml |  3 +-
 ...erce_order_detail__mtb_colt_item_model.xml |  5 +-
 ...coli_ordine_acquisto__list_single_item.xml |  3 +-
 ...imi_arrivi_fornitore__list_single_item.xml |  3 +-
 .../res/layout/lista_bancali_list_model.xml   |  3 +-
 .../lista_contenuto_bancale_list_model.xml    | 10 ++--
 .../lista_picking_libero_list_model.xml       |  6 ++-
 .../layout/lista_rettifica_giacenze_model.xml |  6 ++-
 .../layout/picking_resi_main_list__item.xml   |  2 +-
 .../spedizione_main_list__group_item.xml      |  5 +-
 ...ne_inevaso_main_list_child_group_model.xml |  5 +-
 app/src/main/res/values/colors.xml            |  7 +++
 33 files changed, 136 insertions(+), 63 deletions(-)
 delete mode 100644 app/src/main/res/drawable/badge2_round_corner.xml
 rename app/src/main/res/drawable/{badge_gray_round_corner.xml => badge_round_corner.xml} (81%)
 create mode 100644 app/src/main/res/drawable/ic_location_24.xml

diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_picking/AccettazionePickingActivity.java b/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_picking/AccettazionePickingActivity.java
index 9d32ba24..2538fa60 100644
--- a/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_picking/AccettazionePickingActivity.java
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_picking/AccettazionePickingActivity.java
@@ -388,6 +388,7 @@ public class AccettazionePickingActivity extends BaseActivity implements Accetta
                     accettazioneListModel.setBadge2(String.valueOf(x.getSitArtOrdDTO().getNumOrd()));
 
                     accettazioneListModel.setDescrizione(x.getSitArtOrdDTO().getDescrizioneCommessa());
+                    if(x.getMtbAart() != null) accettazioneListModel.setPosizione(x.getMtbAart().getPosizione());
 
                     //Calc Num CNF
                     BigDecimal numCnfEvasa = BigDecimal.ZERO;
@@ -451,6 +452,7 @@ public class AccettazionePickingActivity extends BaseActivity implements Accetta
                     accettazioneListModel.setBadge2(String.valueOf(x.getSitArtOrdDTO().getNumOrd()));
 
                     accettazioneListModel.setDescrizione(x.getSitArtOrdDTO().getDescrizioneCommessa());
+                    if(x.getMtbAart() != null) accettazioneListModel.setPosizione(x.getMtbAart().getPosizione());
 
                     //Calc Num CNF
                     BigDecimal numCnfEvasa = BigDecimal.ZERO;
@@ -555,6 +557,7 @@ public class AccettazionePickingActivity extends BaseActivity implements Accetta
 
                     if (x.getMtbAart() != null) {
                         accettazioneListModel.setDescrizione(x.getMtbAart().getDescrizioneEstesa());
+                        accettazioneListModel.setPosizione(x.getMtbAart().getPosizione());
                     }
 
                     accettazioneListModel.setOriginalModel(x);
diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_picking/ui/AccettazioneListAdapter.java b/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_picking/ui/AccettazioneListAdapter.java
index 6236a6bf..d5278bca 100644
--- a/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_picking/ui/AccettazioneListAdapter.java
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_picking/ui/AccettazioneListAdapter.java
@@ -114,7 +114,7 @@ public class AccettazioneListAdapter extends SectionedRecyclerViewAdapter<Accett
 
         holder.mBinding.deactivatedOverBg.setVisibility(!pickingObjectDTO.isActive() ? View.VISIBLE : View.GONE);
         holder.mBinding.getRoot().setAlpha(!pickingObjectDTO.isActive() ? 0.8f : 1);
-        holder.mBinding.badge1.setBackground(ResourcesCompat.getDrawable(mContext.getResources(), !pickingObjectDTO.isActive() ? R.drawable.badge_gray_round_corner : R.drawable.badge1_round_corner, null));
+        holder.mBinding.badge1.setBackground(ResourcesCompat.getDrawable(mContext.getResources(), !pickingObjectDTO.isActive() ? R.drawable.badge_round_corner : R.drawable.badge1_round_corner, null));
         holder.mBinding.qtaEvasa.setTextColor(ResourcesCompat.getColor(mContext.getResources(), !pickingObjectDTO.isActive() ? R.color.gray_600 : R.color.green_700, null));
 
         holder.mBinding.descrizione.setText(pickingObjectDTO.getDescrizione());
@@ -125,6 +125,9 @@ public class AccettazioneListAdapter extends SectionedRecyclerViewAdapter<Accett
         holder.mBinding.badge2.setText(pickingObjectDTO.getBadge2());
         holder.mBinding.badge2.setVisibility(UtilityString.isNullOrEmpty(pickingObjectDTO.getBadge2()) ? View.GONE : View.VISIBLE);
 
+        holder.mBinding.badge3.setText(pickingObjectDTO.getPosizione());
+        holder.mBinding.badge3Layout.setVisibility(UtilityString.isNullOrEmpty(pickingObjectDTO.getPosizione()) ? View.GONE : View.VISIBLE);
+
 
         holder.mBinding.qtaEvasa.setText(UtilityNumber.decimalToString(pickingObjectDTO.getQtaEvasa()));
         holder.mBinding.qtaTot.setText(UtilityNumber.decimalToString(pickingObjectDTO.getQtaTot()));
diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_picking/ui/AccettazioneListModel.java b/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_picking/ui/AccettazioneListModel.java
index b42e5e44..014a1c84 100644
--- a/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_picking/ui/AccettazioneListModel.java
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_picking/ui/AccettazioneListModel.java
@@ -23,6 +23,8 @@ public class AccettazioneListModel implements Cloneable {
     private BigDecimal secQtaTot;
     private String secUntMis;
 
+    private String posizione;
+
     private boolean active;
 
     private PickingObjectDTO mOriginalModel;
@@ -154,6 +156,15 @@ public class AccettazioneListModel implements Cloneable {
         return this;
     }
 
+    public String getPosizione() {
+        return posizione;
+    }
+
+    public AccettazioneListModel setPosizione(String posizione) {
+        this.posizione = posizione;
+        return this;
+    }
+
     public boolean isActive() {
         return active;
     }
diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/picking_resi/ui/PickingResiListAdapter.java b/app/src/main/java/it/integry/integrywmsnative/gest/picking_resi/ui/PickingResiListAdapter.java
index 4d8b3c29..b7af8dfe 100644
--- a/app/src/main/java/it/integry/integrywmsnative/gest/picking_resi/ui/PickingResiListAdapter.java
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/picking_resi/ui/PickingResiListAdapter.java
@@ -107,7 +107,7 @@ public class PickingResiListAdapter extends SectionedRecyclerViewAdapter<Picking
 
         holder.mBinding.deactivatedOverBg.setVisibility(!pickingResiListModel.isActive() ? View.VISIBLE : View.GONE);
         holder.mBinding.getRoot().setAlpha(!pickingResiListModel.isActive() ? 0.8f : 1);
-        holder.mBinding.badge1.setBackground(ResourcesCompat.getDrawable(mContext.getResources(), !pickingResiListModel.isActive() ? R.drawable.badge_gray_round_corner : R.drawable.badge1_round_corner, null));
+        holder.mBinding.badge1.setBackground(ResourcesCompat.getDrawable(mContext.getResources(), !pickingResiListModel.isActive() ? R.drawable.badge_round_corner : R.drawable.badge1_round_corner, null));
         holder.mBinding.qtaEvasa.setTextColor(ResourcesCompat.getColor(mContext.getResources(), !pickingResiListModel.isActive() ? R.color.gray_600 : R.color.green_700, null));
 
         holder.mBinding.descrizione.setText(pickingResiListModel.getDescrizione());
diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/spedizione/ui/SpedizioneListAdapter.java b/app/src/main/java/it/integry/integrywmsnative/gest/spedizione/ui/SpedizioneListAdapter.java
index 68fa2471..2fc84245 100644
--- a/app/src/main/java/it/integry/integrywmsnative/gest/spedizione/ui/SpedizioneListAdapter.java
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/spedizione/ui/SpedizioneListAdapter.java
@@ -124,7 +124,7 @@ public class SpedizioneListAdapter extends SectionedRecyclerViewAdapter<Spedizio
 
         holder.mBinding.deactivatedOverBg.setVisibility(!pickingObjectDTO.isActive() ? View.VISIBLE : View.GONE);
         holder.mBinding.getRoot().setAlpha(!pickingObjectDTO.isActive() ? 0.8f : 1);
-        holder.mBinding.badge1.setBackground(ResourcesCompat.getDrawable(mContext.getResources(), !pickingObjectDTO.isActive() ? R.drawable.badge_gray_round_corner : R.drawable.badge1_round_corner, null));
+        holder.mBinding.badge1.setBackground(ResourcesCompat.getDrawable(mContext.getResources(), !pickingObjectDTO.isActive() ? R.drawable.badge_round_corner : R.drawable.badge1_round_corner, null));
         holder.mBinding.qtaEvasa.setTextColor(ResourcesCompat.getColor(mContext.getResources(), !pickingObjectDTO.isActive() ? R.color.gray_600 : R.color.green_700, null));
 
         holder.mBinding.descrizione.setText(pickingObjectDTO.getDescrizione());
diff --git a/app/src/main/res/drawable/badge2_round_corner.xml b/app/src/main/res/drawable/badge2_round_corner.xml
deleted file mode 100644
index 9ecc4c83..00000000
--- a/app/src/main/res/drawable/badge2_round_corner.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android" >
-
-    <solid android:color="@color/orange_600" />
-
-    <padding
-        android:left="1dp"
-        android:right="1dp"
-        android:top="1dp" />
-
-    <corners android:radius="5dp" />
-</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/badge_gray_round_corner.xml b/app/src/main/res/drawable/badge_round_corner.xml
similarity index 81%
rename from app/src/main/res/drawable/badge_gray_round_corner.xml
rename to app/src/main/res/drawable/badge_round_corner.xml
index 18455ca2..cd319ab1 100644
--- a/app/src/main/res/drawable/badge_gray_round_corner.xml
+++ b/app/src/main/res/drawable/badge_round_corner.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android" >
 
-    <solid android:color="@color/gray_600" />
+    <solid android:color="@color/white" />
 
     <padding
         android:left="6dp"
diff --git a/app/src/main/res/drawable/ic_location_24.xml b/app/src/main/res/drawable/ic_location_24.xml
new file mode 100644
index 00000000..e5383d72
--- /dev/null
+++ b/app/src/main/res/drawable/ic_location_24.xml
@@ -0,0 +1,5 @@
+<vector android:height="24dp" android:tint="#FFFFFF"
+    android:viewportHeight="24" android:viewportWidth="24"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="@android:color/white" android:pathData="M12,2C8.13,2 5,5.13 5,9c0,5.25 7,13 7,13s7,-7.75 7,-13c0,-3.87 -3.13,-7 -7,-7zM12,11.5c-1.38,0 -2.5,-1.12 -2.5,-2.5s1.12,-2.5 2.5,-2.5 2.5,1.12 2.5,2.5 -1.12,2.5 -2.5,2.5z"/>
+</vector>
diff --git a/app/src/main/res/layout-land-hdpi/dialog_input_quantity_v2.xml b/app/src/main/res/layout-land-hdpi/dialog_input_quantity_v2.xml
index 9cdf90ca..a5bfb9f0 100644
--- a/app/src/main/res/layout-land-hdpi/dialog_input_quantity_v2.xml
+++ b/app/src/main/res/layout-land-hdpi/dialog_input_quantity_v2.xml
@@ -194,7 +194,7 @@
                         android:layout_gravity="center"
                         android:layout_marginEnd="2dp"
                         android:layout_weight="0.5"
-                        android:background="@drawable/badge_gray_round_corner"
+                        android:background="@drawable/badge_round_corner"
                         android:backgroundTint="@color/green_600"
                         android:orientation="vertical"
                         android:padding="8dp"
@@ -293,7 +293,7 @@
                         android:layout_gravity="center"
                         android:layout_marginStart="2dp"
                         android:layout_weight="0.5"
-                        android:background="@drawable/badge_gray_round_corner"
+                        android:background="@drawable/badge_round_corner"
                         android:backgroundTint="@color/colorPrimary"
                         android:orientation="vertical"
                         android:padding="8dp"
diff --git a/app/src/main/res/layout/accettazione_ordine_inevaso_main_list__group_item.xml b/app/src/main/res/layout/accettazione_ordine_inevaso_main_list__group_item.xml
index 2d6ff5f1..8da22590 100644
--- a/app/src/main/res/layout/accettazione_ordine_inevaso_main_list__group_item.xml
+++ b/app/src/main/res/layout/accettazione_ordine_inevaso_main_list__group_item.xml
@@ -24,7 +24,8 @@
                     style="@style/AppTheme.NewMaterial.Text.Small"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:background="@drawable/badge1_round_corner"
+                    android:background="@drawable/badge_round_corner"
+                    android:backgroundTint="@color/colorPrimary"
                     android:paddingLeft="6dp"
                     android:paddingTop="2dp"
                     android:paddingRight="6dp"
@@ -39,7 +40,8 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_marginStart="8dp"
-                    android:background="@drawable/badge2_round_corner"
+                    android:background="@drawable/badge_round_corner"
+                    android:backgroundTint="@color/orange_600"
                     android:paddingLeft="6dp"
                     android:paddingTop="2dp"
                     android:paddingRight="6dp"
@@ -48,6 +50,37 @@
                     android:textStyle="bold"
                     tools:text="BADGE 2" />
 
+                <androidx.appcompat.widget.LinearLayoutCompat
+                    android:id="@+id/badge3_layout"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:orientation="horizontal"
+                    android:layout_marginStart="8dp"
+                    android:paddingLeft="6dp"
+                    android:paddingTop="2dp"
+                    android:paddingRight="6dp"
+                    android:paddingBottom="2dp"
+                    android:background="@drawable/badge_round_corner"
+                    android:backgroundTint="@color/light_blue_500"
+                    android:gravity="center_vertical">
+
+                    <androidx.appcompat.widget.AppCompatImageView
+                        android:layout_width="12dp"
+                        android:layout_height="12dp"
+                        android:src="@drawable/ic_location_24"
+                        android:tint="@color/white"/>
+
+                    <androidx.appcompat.widget.AppCompatTextView
+                        android:id="@+id/badge3"
+                        style="@style/AppTheme.NewMaterial.Text.Small"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginStart="4dp"
+                        android:textColor="@android:color/white"
+                        android:textStyle="bold"
+                        tools:text="POSIZIONE" />
+
+                </androidx.appcompat.widget.LinearLayoutCompat>
 
                 <androidx.appcompat.widget.LinearLayoutCompat
                     android:id="@+id/primary_unt_mis"
@@ -104,12 +137,12 @@
 
                 <androidx.appcompat.widget.AppCompatTextView
                     android:id="@+id/descrizione"
-                    android:layout_alignParentStart="true"
-                    android:layout_toStartOf="@id/secondary_unt_mis"
                     style="@style/AppTheme.NewMaterial.Text.Medium"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
+                    android:layout_alignParentStart="true"
                     android:layout_marginTop="4dp"
+                    android:layout_toStartOf="@id/secondary_unt_mis"
                     android:textColor="@android:color/black"
                     android:textSize="16sp"
                     tools:text="DESCRIZIONE" />
@@ -117,12 +150,12 @@
 
                 <androidx.appcompat.widget.LinearLayoutCompat
                     android:id="@+id/secondary_unt_mis"
-                    android:layout_alignParentEnd="true"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
+                    android:layout_alignParentEnd="true"
+                    android:alpha="0.8"
                     android:gravity="end"
-                    android:orientation="horizontal"
-                    android:alpha="0.8">
+                    android:orientation="horizontal">
 
                     <androidx.appcompat.widget.AppCompatTextView
                         android:id="@+id/sec_qta_evasa"
diff --git a/app/src/main/res/layout/activity_contab_doc_interno_row__list_single_item.xml b/app/src/main/res/layout/activity_contab_doc_interno_row__list_single_item.xml
index 8e99b660..8cadf3fc 100644
--- a/app/src/main/res/layout/activity_contab_doc_interno_row__list_single_item.xml
+++ b/app/src/main/res/layout/activity_contab_doc_interno_row__list_single_item.xml
@@ -75,7 +75,8 @@
             <androidx.appcompat.widget.AppCompatTextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:background="@drawable/badge1_round_corner"
+                android:background="@drawable/badge_round_corner"
+                android:backgroundTint="@color/colorPrimary"
                 android:gravity="center"
                 android:paddingLeft="6dp"
                 android:paddingTop="2dp"
diff --git a/app/src/main/res/layout/bottom_sheet_fragment__lu_content.xml b/app/src/main/res/layout/bottom_sheet_fragment__lu_content.xml
index 4569f54f..468fbf1a 100644
--- a/app/src/main/res/layout/bottom_sheet_fragment__lu_content.xml
+++ b/app/src/main/res/layout/bottom_sheet_fragment__lu_content.xml
@@ -63,7 +63,7 @@
                             android:layout_width="24dp"
                             android:layout_height="4dp"
                             android:alpha="0.5"
-                            android:background="@drawable/badge_gray_round_corner"
+                            android:background="@drawable/badge_round_corner"
                             android:backgroundTint="@android:color/white"
                             app:layout_constraintEnd_toEndOf="parent"
                             app:layout_constraintStart_toStartOf="parent"
diff --git a/app/src/main/res/layout/bottom_sheet_fragment__lu_content__list_item.xml b/app/src/main/res/layout/bottom_sheet_fragment__lu_content__list_item.xml
index c2d2c4c6..4570db80 100644
--- a/app/src/main/res/layout/bottom_sheet_fragment__lu_content__list_item.xml
+++ b/app/src/main/res/layout/bottom_sheet_fragment__lu_content__list_item.xml
@@ -65,7 +65,8 @@
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_alignParentEnd="true"
-                        android:background="@drawable/badge2_round_corner"
+                        android:background="@drawable/badge_round_corner"
+                        android:backgroundTint="@color/orange_600"
                         android:paddingStart="6dp"
                         android:paddingEnd="6dp"
                         android:text="@{UtilityNumber.decimalToString(mtbColr.qtaCol) + mtbColr.mtbAart.untMis}"
@@ -117,7 +118,8 @@
                     style="@style/AppTheme.NewMaterial.Text.Small"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:background="@drawable/badge1_round_corner"
+                    android:background="@drawable/badge_round_corner"
+                    android:backgroundTint="@color/colorPrimary"
                     android:gravity="center"
                     android:paddingLeft="6dp"
                     android:paddingTop="2dp"
@@ -146,7 +148,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="8dp"
-                android:background="@drawable/badge1_round_corner"
+                android:background="@drawable/badge_round_corner"
                 android:backgroundTint="@color/green_600"
                 android:orientation="horizontal"
                 android:padding="2dp">
@@ -154,7 +156,7 @@
                 <androidx.appcompat.widget.LinearLayoutCompat
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:background="@drawable/badge1_round_corner"
+                    android:background="@drawable/badge_round_corner"
                     android:backgroundTint="@android:color/white"
                     android:orientation="horizontal"
                     android:padding="0dp">
diff --git a/app/src/main/res/layout/dialog_basket_lu__mtb_colr_model.xml b/app/src/main/res/layout/dialog_basket_lu__mtb_colr_model.xml
index 00ed2e55..5e0d56e5 100644
--- a/app/src/main/res/layout/dialog_basket_lu__mtb_colr_model.xml
+++ b/app/src/main/res/layout/dialog_basket_lu__mtb_colr_model.xml
@@ -73,7 +73,8 @@
                     android:layout_alignParentEnd="true"
                     android:paddingStart="6dp"
                     android:paddingEnd="6dp"
-                    android:background="@drawable/badge2_round_corner"
+                    android:background="@drawable/badge_round_corner"
+                    android:backgroundTint="@color/orange_600"
                     android:textColor="@android:color/white"
                     style="@style/AppTheme.NewMaterial.Text.Small"
                     tools:text="PESO KG" />
@@ -119,7 +120,8 @@
                 android:id="@+id/qta_textview"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:background="@drawable/badge1_round_corner"
+                android:background="@drawable/badge_round_corner"
+                android:backgroundTint="@color/colorPrimary"
                 android:gravity="center"
                 android:paddingLeft="6dp"
                 android:paddingTop="2dp"
diff --git a/app/src/main/res/layout/dialog_basket_lu__mtb_colt_model.xml b/app/src/main/res/layout/dialog_basket_lu__mtb_colt_model.xml
index 0b28f0d2..34f42761 100644
--- a/app/src/main/res/layout/dialog_basket_lu__mtb_colt_model.xml
+++ b/app/src/main/res/layout/dialog_basket_lu__mtb_colt_model.xml
@@ -42,7 +42,8 @@
                     android:gravity="center"
                     android:text="@{mtbColt.numCollo.toString()}"
                     tools:text="22222"
-                    android:background="@drawable/badge1_round_corner"
+                    android:background="@drawable/badge_round_corner"
+                    android:backgroundTint="@color/colorPrimary"
                     android:textColor="@android:color/white"
                     android:paddingTop="2dp"
                     android:paddingBottom="2dp"
diff --git a/app/src/main/res/layout/dialog_choose_arts_from_lista_arts__item_model.xml b/app/src/main/res/layout/dialog_choose_arts_from_lista_arts__item_model.xml
index 15abcf53..7fba3597 100644
--- a/app/src/main/res/layout/dialog_choose_arts_from_lista_arts__item_model.xml
+++ b/app/src/main/res/layout/dialog_choose_arts_from_lista_arts__item_model.xml
@@ -73,7 +73,8 @@
                         android:textStyle="bold"
                         android:paddingStart="6dp"
                         android:paddingEnd="6dp"
-                        android:background="@drawable/badge2_round_corner"
+                        android:background="@drawable/badge_round_corner"
+                        android:backgroundTint="@color/orange_600"
                         android:textColor="@android:color/white"
                         android:layout_alignParentEnd="true"
                         style="@style/AppTheme.NewMaterial.Text.Small"
@@ -120,7 +121,8 @@
                     android:id="@+id/qta_textview"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:background="@drawable/badge1_round_corner"
+                    android:background="@drawable/badge_round_corner"
+                    android:backgroundTint="@color/colorPrimary"
                     android:gravity="center"
                     android:paddingLeft="6dp"
                     android:paddingTop="2dp"
diff --git a/app/src/main/res/layout/dialog_input_quantity_v2.xml b/app/src/main/res/layout/dialog_input_quantity_v2.xml
index cc51b506..39a84a9c 100644
--- a/app/src/main/res/layout/dialog_input_quantity_v2.xml
+++ b/app/src/main/res/layout/dialog_input_quantity_v2.xml
@@ -205,7 +205,7 @@
                     android:layout_gravity="center"
                     android:layout_marginEnd="2dp"
                     android:layout_weight="0.5"
-                    android:background="@drawable/badge_gray_round_corner"
+                    android:background="@drawable/badge_round_corner"
                     android:backgroundTint="@color/green_600"
                     android:orientation="vertical"
                     android:padding="8dp"
@@ -304,7 +304,7 @@
                     android:layout_gravity="center"
                     android:layout_marginStart="2dp"
                     android:layout_weight="0.5"
-                    android:background="@drawable/badge_gray_round_corner"
+                    android:background="@drawable/badge_round_corner"
                     android:backgroundTint="@color/colorPrimary"
                     android:orientation="vertical"
                     android:padding="8dp"
diff --git a/app/src/main/res/layout/dialog_pv_edit_articolo.xml b/app/src/main/res/layout/dialog_pv_edit_articolo.xml
index 77f66825..7ae43a88 100644
--- a/app/src/main/res/layout/dialog_pv_edit_articolo.xml
+++ b/app/src/main/res/layout/dialog_pv_edit_articolo.xml
@@ -208,7 +208,7 @@
                     android:layout_gravity="center"
                     android:layout_marginEnd="2dp"
                     android:layout_weight="0.5"
-                    android:background="@drawable/badge_gray_round_corner"
+                    android:background="@drawable/badge_round_corner"
                     android:backgroundTint="@color/green_600"
                     android:orientation="vertical"
                     android:padding="8dp">
@@ -307,7 +307,7 @@
                     android:layout_gravity="center"
                     android:layout_marginStart="2dp"
                     android:layout_weight="0.5"
-                    android:background="@drawable/badge_gray_round_corner"
+                    android:background="@drawable/badge_round_corner"
                     android:backgroundTint="@color/colorPrimary"
                     android:orientation="vertical"
                     android:padding="8dp"
diff --git a/app/src/main/res/layout/fragment_choose_ords_lav_from_list__item_model.xml b/app/src/main/res/layout/fragment_choose_ords_lav_from_list__item_model.xml
index 2b2ccbcd..6f1115b2 100644
--- a/app/src/main/res/layout/fragment_choose_ords_lav_from_list__item_model.xml
+++ b/app/src/main/res/layout/fragment_choose_ords_lav_from_list__item_model.xml
@@ -78,7 +78,7 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_alignParentEnd="true"
-                    android:background="@drawable/badge2_round_corner"
+                    android:background="@drawable/badge_round_corner"
                     android:backgroundTint="@{context.getColor(listModel.selected.get() ? R.color.orange_600 : R.color.gray_500)}"
                     android:paddingStart="6dp"
                     android:paddingEnd="6dp"
@@ -137,7 +137,7 @@
                 style="@style/AppTheme.NewMaterial.Text.Small"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:background="@drawable/badge1_round_corner"
+                android:background="@drawable/badge_round_corner"
                 android:backgroundTint="@{context.getColor(listModel.selected.get() ? R.color.colorPrimary : R.color.gray_500)}"
                 android:gravity="center"
                 android:paddingLeft="6dp"
diff --git a/app/src/main/res/layout/fragment_main_rettifica_giacenze.xml b/app/src/main/res/layout/fragment_main_rettifica_giacenze.xml
index 99bf8da1..005bb94e 100644
--- a/app/src/main/res/layout/fragment_main_rettifica_giacenze.xml
+++ b/app/src/main/res/layout/fragment_main_rettifica_giacenze.xml
@@ -52,7 +52,8 @@
                             android:layout_width="match_parent"
                             android:layout_height="wrap_content"
                             android:orientation="horizontal"
-                            android:background="@drawable/badge1_round_corner">
+                            android:background="@drawable/badge_round_corner"
+                            android:backgroundTint="@color/colorPrimary">
 
                             <androidx.appcompat.widget.AppCompatTextView
                                 style="@style/AppTheme.NewMaterial.Text.Medium"
diff --git a/app/src/main/res/layout/fragment_main_ultime_consegne_cliente__list_single_item.xml b/app/src/main/res/layout/fragment_main_ultime_consegne_cliente__list_single_item.xml
index 4e6b7b12..a72ed5ef 100644
--- a/app/src/main/res/layout/fragment_main_ultime_consegne_cliente__list_single_item.xml
+++ b/app/src/main/res/layout/fragment_main_ultime_consegne_cliente__list_single_item.xml
@@ -31,7 +31,8 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 tools:text="BADGE 1"
-                android:background="@drawable/badge1_round_corner"
+                android:background="@drawable/badge_round_corner"
+                android:backgroundTint="@color/colorPrimary"
                 android:textColor="@android:color/white"
                 android:paddingTop="2dp"
                 android:paddingBottom="2dp"
diff --git a/app/src/main/res/layout/fragment_ordini_a_pv__list_single_item.xml b/app/src/main/res/layout/fragment_ordini_a_pv__list_single_item.xml
index 99dc168f..9fd36130 100644
--- a/app/src/main/res/layout/fragment_ordini_a_pv__list_single_item.xml
+++ b/app/src/main/res/layout/fragment_ordini_a_pv__list_single_item.xml
@@ -33,7 +33,8 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 tools:text="BADGE 1"
-                android:background="@drawable/badge1_round_corner"
+                android:background="@drawable/badge_round_corner"
+                android:backgroundTint="@color/colorPrimary"
                 android:textColor="@android:color/white"
                 android:paddingTop="2dp"
                 android:paddingBottom="2dp"
diff --git a/app/src/main/res/layout/fragment_prod_rientro_merce_order_detail__mtb_colt_item_model.xml b/app/src/main/res/layout/fragment_prod_rientro_merce_order_detail__mtb_colt_item_model.xml
index e4989418..ff182c70 100644
--- a/app/src/main/res/layout/fragment_prod_rientro_merce_order_detail__mtb_colt_item_model.xml
+++ b/app/src/main/res/layout/fragment_prod_rientro_merce_order_detail__mtb_colt_item_model.xml
@@ -47,7 +47,8 @@
                     style="@style/AppTheme.NewMaterial.Text.Small"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:background="@drawable/badge1_round_corner"
+                    android:background="@drawable/badge_round_corner"
+                    android:backgroundTint="@color/colorPrimary"
                     android:gravity="center"
                     android:paddingLeft="6dp"
                     android:paddingTop="2dp"
@@ -118,7 +119,7 @@
                         android:layout_height="wrap_content"
                         android:layout_alignParentEnd="true"
                         android:layout_centerVertical="true"
-                        android:background="@drawable/badge1_round_corner"
+                        android:background="@drawable/badge_round_corner"
                         android:backgroundTint="@color/green_400"
                         android:paddingStart="6dp"
                         android:paddingEnd="6dp"
diff --git a/app/src/main/res/layout/fragment_pv_articoli_ordine_acquisto__list_single_item.xml b/app/src/main/res/layout/fragment_pv_articoli_ordine_acquisto__list_single_item.xml
index f221198b..47c0bf98 100644
--- a/app/src/main/res/layout/fragment_pv_articoli_ordine_acquisto__list_single_item.xml
+++ b/app/src/main/res/layout/fragment_pv_articoli_ordine_acquisto__list_single_item.xml
@@ -75,7 +75,8 @@
             <androidx.appcompat.widget.AppCompatTextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:background="@drawable/badge1_round_corner"
+                android:background="@drawable/badge_round_corner"
+                android:backgroundTint="@color/colorPrimary"
                 android:gravity="center"
                 android:paddingLeft="6dp"
                 android:paddingTop="2dp"
diff --git a/app/src/main/res/layout/fragment_ultimi_arrivi_fornitore__list_single_item.xml b/app/src/main/res/layout/fragment_ultimi_arrivi_fornitore__list_single_item.xml
index 462bbc24..da4cc753 100644
--- a/app/src/main/res/layout/fragment_ultimi_arrivi_fornitore__list_single_item.xml
+++ b/app/src/main/res/layout/fragment_ultimi_arrivi_fornitore__list_single_item.xml
@@ -30,7 +30,8 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 tools:text="BADGE 1"
-                android:background="@drawable/badge1_round_corner"
+                android:background="@drawable/badge_round_corner"
+                android:backgroundTint="@color/colorPrimary"
                 android:textColor="@android:color/white"
                 android:paddingTop="2dp"
                 android:paddingBottom="2dp"
diff --git a/app/src/main/res/layout/lista_bancali_list_model.xml b/app/src/main/res/layout/lista_bancali_list_model.xml
index 61be3a47..d3382ba4 100644
--- a/app/src/main/res/layout/lista_bancali_list_model.xml
+++ b/app/src/main/res/layout/lista_bancali_list_model.xml
@@ -47,7 +47,8 @@
                 android:gravity="center"
                 android:text="@{mtbColt.numCollo.toString()}"
                 tools:text="22222"
-                android:background="@drawable/badge1_round_corner"
+                android:background="@drawable/badge_round_corner"
+                android:backgroundTint="@color/colorPrimary"
                 android:textColor="@android:color/white"
                 android:paddingTop="2dp"
                 android:paddingBottom="2dp"
diff --git a/app/src/main/res/layout/lista_contenuto_bancale_list_model.xml b/app/src/main/res/layout/lista_contenuto_bancale_list_model.xml
index 89751e87..6525d4f4 100644
--- a/app/src/main/res/layout/lista_contenuto_bancale_list_model.xml
+++ b/app/src/main/res/layout/lista_contenuto_bancale_list_model.xml
@@ -79,7 +79,8 @@
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_alignParentEnd="true"
-                        android:background="@drawable/badge2_round_corner"
+                        android:background="@drawable/badge_round_corner"
+                        android:backgroundTint="@color/orange_600"
                         android:paddingStart="6dp"
                         android:paddingEnd="6dp"
                         android:text="@{UtilityNumber.decimalToString(mtbColr.qtaCol) + mtbColr.mtbAart.untMis}"
@@ -130,7 +131,8 @@
                     style="@style/AppTheme.NewMaterial.Text"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:background="@drawable/badge1_round_corner"
+                    android:background="@drawable/badge_round_corner"
+                    android:backgroundTint="@color/colorPrimary"
                     android:gravity="center"
                     android:paddingLeft="6dp"
                     android:paddingTop="2dp"
@@ -159,7 +161,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="8dp"
-                android:background="@drawable/badge1_round_corner"
+                android:background="@drawable/badge_round_corner"
                 android:backgroundTint="@color/green_600"
                 android:orientation="horizontal"
                 android:padding="2dp">
@@ -167,7 +169,7 @@
                 <androidx.appcompat.widget.LinearLayoutCompat
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:background="@drawable/badge1_round_corner"
+                    android:background="@drawable/badge_round_corner"
                     android:backgroundTint="@android:color/white"
                     android:orientation="horizontal"
                     android:padding="0dp">
diff --git a/app/src/main/res/layout/lista_picking_libero_list_model.xml b/app/src/main/res/layout/lista_picking_libero_list_model.xml
index c17fbc09..b9a30bcb 100644
--- a/app/src/main/res/layout/lista_picking_libero_list_model.xml
+++ b/app/src/main/res/layout/lista_picking_libero_list_model.xml
@@ -52,7 +52,8 @@
                     android:layout_alignParentEnd="true"
                     android:paddingStart="6dp"
                     android:paddingEnd="6dp"
-                    android:background="@drawable/badge2_round_corner"
+                    android:background="@drawable/badge_round_corner"
+                    android:backgroundTint="@color/orange_600"
                     android:textColor="@android:color/white"
                     style="@style/AppTheme.NewMaterial.Text.Small"
                     tools:text="PESO KG" />
@@ -99,7 +100,8 @@
                 android:id="@+id/qta_textview"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:background="@drawable/badge1_round_corner"
+                android:background="@drawable/badge_round_corner"
+                android:backgroundTint="@color/colorPrimary"
                 android:gravity="center"
                 android:paddingLeft="6dp"
                 android:paddingTop="2dp"
diff --git a/app/src/main/res/layout/lista_rettifica_giacenze_model.xml b/app/src/main/res/layout/lista_rettifica_giacenze_model.xml
index 69e7354a..50883ad9 100644
--- a/app/src/main/res/layout/lista_rettifica_giacenze_model.xml
+++ b/app/src/main/res/layout/lista_rettifica_giacenze_model.xml
@@ -71,7 +71,8 @@
                     android:layout_alignParentEnd="true"
                     android:paddingStart="6dp"
                     android:paddingEnd="6dp"
-                    android:background="@drawable/badge2_round_corner"
+                    android:background="@drawable/badge_round_corner"
+                    android:backgroundTint="@color/orange_600"
                     android:textColor="@android:color/white"
                     style="@style/AppTheme.NewMaterial.Text.Small"
                     tools:text="PESO KG" />
@@ -117,7 +118,8 @@
                 android:id="@+id/qta_textview"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:background="@drawable/badge1_round_corner"
+                android:background="@drawable/badge_round_corner"
+                android:backgroundTint="@color/colorPrimary"
                 android:gravity="center"
                 android:paddingLeft="6dp"
                 android:paddingTop="2dp"
diff --git a/app/src/main/res/layout/picking_resi_main_list__item.xml b/app/src/main/res/layout/picking_resi_main_list__item.xml
index b6166418..381974ab 100644
--- a/app/src/main/res/layout/picking_resi_main_list__item.xml
+++ b/app/src/main/res/layout/picking_resi_main_list__item.xml
@@ -24,7 +24,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 tools:text="BADGE 1"
-                android:background="@drawable/badge1_round_corner"
+                android:background="@drawable/badge_round_corner"
                 android:textColor="@android:color/white"
                 android:paddingTop="2dp"
                 android:paddingBottom="2dp"
diff --git a/app/src/main/res/layout/spedizione_main_list__group_item.xml b/app/src/main/res/layout/spedizione_main_list__group_item.xml
index 038eb6dd..7970497f 100644
--- a/app/src/main/res/layout/spedizione_main_list__group_item.xml
+++ b/app/src/main/res/layout/spedizione_main_list__group_item.xml
@@ -25,7 +25,7 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     tools:text="BADGE 1"
-                    android:background="@drawable/badge1_round_corner"
+                    android:background="@drawable/badge_round_corner"
                     android:textColor="@android:color/white"
                     android:paddingTop="2dp"
                     android:paddingBottom="2dp"
@@ -150,7 +150,8 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     tools:text="BADGE 2"
-                    android:background="@drawable/badge2_round_corner"
+                    android:background="@drawable/badge_round_corner"
+                    android:backgroundTint="@color/orange_600"
                     android:textColor="@android:color/white"
                     android:paddingTop="2dp"
                     android:paddingBottom="2dp"
diff --git a/app/src/main/res/layout/vendita_ordine_inevaso_main_list_child_group_model.xml b/app/src/main/res/layout/vendita_ordine_inevaso_main_list_child_group_model.xml
index 772d9417..f15ad122 100644
--- a/app/src/main/res/layout/vendita_ordine_inevaso_main_list_child_group_model.xml
+++ b/app/src/main/res/layout/vendita_ordine_inevaso_main_list_child_group_model.xml
@@ -22,7 +22,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 tools:text="BADGE 1"
-                android:background="@drawable/badge1_round_corner"
+                android:background="@drawable/badge_round_corner"
                 android:textColor="@android:color/white"
                 android:paddingTop="2dp"
                 android:paddingBottom="2dp"
@@ -135,7 +135,8 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 tools:text="BADGE 2"
-                android:background="@drawable/badge2_round_corner"
+                android:background="@drawable/badge_round_corner"
+                android:backgroundTint="@color/orange_600"
                 android:textColor="@android:color/white"
                 android:paddingTop="2dp"
                 android:paddingBottom="2dp"
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index a0ae114a..4959bd0d 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -82,7 +82,14 @@
 
 
 
+    <color name="light_blue_100">#B3E5FC</color>
+    <color name="light_blue_200">#81D4FA</color>
     <color name="light_blue_300">#4fc3f7</color>
+    <color name="light_blue_400">#29B6F6</color>
+    <color name="light_blue_500">#03A9F4</color>
+    <color name="light_blue_600">#039BE5</color>
+    <color name="light_blue_700">#0288D1</color>
+    <color name="light_blue_800">#0277BD</color>
 
 
     <color name="orange_600_with_alpha">#88FB8C00</color>