Merge branch 'feature/RefactoringGestioneColli' into master-beta

.idea/codeStyles/Project.xml

@@ -1,5 +1,40 @@
 <component name="ProjectCodeStyleConfiguration">
   <code_scheme name="Project" version="173">
+    <JavaCodeStyleSettings>
+      <option name="IMPORT_LAYOUT_TABLE">
+        <value>
+          <package name="" withSubpackages="true" static="false" module="true" />
+          <package name="android" withSubpackages="true" static="true" />
+          <package name="androidx" withSubpackages="true" static="true" />
+          <package name="com" withSubpackages="true" static="true" />
+          <package name="junit" withSubpackages="true" static="true" />
+          <package name="net" withSubpackages="true" static="true" />
+          <package name="org" withSubpackages="true" static="true" />
+          <package name="java" withSubpackages="true" static="true" />
+          <package name="javax" withSubpackages="true" static="true" />
+          <package name="" withSubpackages="true" static="true" />
+          <emptyLine />
+          <package name="android" withSubpackages="true" static="false" />
+          <emptyLine />
+          <package name="androidx" withSubpackages="true" static="false" />
+          <emptyLine />
+          <package name="com" withSubpackages="true" static="false" />
+          <emptyLine />
+          <package name="junit" withSubpackages="true" static="false" />
+          <emptyLine />
+          <package name="net" withSubpackages="true" static="false" />
+          <emptyLine />
+          <package name="org" withSubpackages="true" static="false" />
+          <emptyLine />
+          <package name="java" withSubpackages="true" static="false" />
+          <emptyLine />
+          <package name="javax" withSubpackages="true" static="false" />
+          <emptyLine />
+          <package name="" withSubpackages="true" static="false" />
+          <emptyLine />
+        </value>
+      </option>
+    </JavaCodeStyleSettings>
     <JetCodeStyleSettings>
       <option name="CODE_STYLE_DEFAULTS" value="KOTLIN_OFFICIAL" />
     </JetCodeStyleSettings>

app/build.gradle

@@ -10,8 +10,8 @@ apply plugin: 'com.google.gms.google-services'
 
 android {
 
-    def appVersionCode = 500
+    def appVersionCode = 501
-    def appVersionName = '1.46.12'
+    def appVersionName = '1.46.13'
 
     signingConfigs {
         release {

app/src/main/java/it/integry/integrywmsnative/core/model/MtbAart.java

@@ -97,6 +97,8 @@ public class MtbAart extends EntityBase {
 
     private List<MtbUntMis> mtbUntMis;
 
+    private List<MtbAartBarCode> mtbAartBarCode;
+
 
     public enum UntMisRifPesoEnum {
         C,
@@ -965,6 +967,13 @@ public class MtbAart extends EntityBase {
         return getMtbUntMis() != null && !getMtbUntMis().isEmpty() ? getMtbUntMis().get(0) : null;
     }
 
+    public List<MtbAartBarCode> getMtbAartBarCode() {
+        return mtbAartBarCode;
+    }
+
+    public void setMtbAartBarCode(List<MtbAartBarCode> mtbAartBarCode) {
+        this.mtbAartBarCode = mtbAartBarCode;
+    }
 
     @Override
     public boolean equals(Object o) {

app/src/main/java/it/integry/integrywmsnative/core/model/MtbAartBarCode.java

@@ -0,0 +1,55 @@
+package it.integry.integrywmsnative.core.model;
+
+import java.math.BigDecimal;
+
+public class MtbAartBarCode extends EntityBase {
+    private String codBarre;
+    private String codMart;
+    private BigDecimal qtaCnf;
+    private String flagPrimario;
+    private String tipoCodBarre;
+
+    public MtbAartBarCode() {
+        this.type = "mtb_aart_bar_code";
+    }
+
+    public String getCodBarre() {
+        return codBarre;
+    }
+
+    public void setCodBarre(String codBarre) {
+        this.codBarre = codBarre;
+    }
+
+    public String getCodMart() {
+        return codMart;
+    }
+
+    public void setCodMart(String codMart) {
+        this.codMart = codMart;
+    }
+
+    public BigDecimal getQtaCnf() {
+        return qtaCnf;
+    }
+
+    public void setQtaCnf(BigDecimal qtaCnf) {
+        this.qtaCnf = qtaCnf;
+    }
+
+    public String getFlagPrimario() {
+        return flagPrimario;
+    }
+
+    public void setFlagPrimario(String flagPrimario) {
+        this.flagPrimario = flagPrimario;
+    }
+
+    public String getTipoCodBarre() {
+        return tipoCodBarre;
+    }
+
+    public void setTipoCodBarre(String tipoCodBarre) {
+        this.tipoCodBarre = tipoCodBarre;
+    }
+}

app/src/main/java/it/integry/integrywmsnative/gest/accettazione_ordini_picking/AccettazioneOrdiniPickingActivity.java

@@ -370,7 +370,7 @@ public class AccettazioneOrdiniPickingActivity extends BaseActivity implements A
 
     private void refreshList() {
 
-        runOnUiThread(() -> {
+        handler.post(() -> {
             List<PickingObjectDTO> tmpList;
 
             if (mAppliedFilterViewModel != null) {
@@ -702,6 +702,7 @@ public class AccettazioneOrdiniPickingActivity extends BaseActivity implements A
                         .findFirst().get()
                         .isCanBeRecovered(),
 
+                false,
                 ReportManager.getReportNameLUFromGestione(GestioneEnum.ACQUISTO));
 
         this.startActivityForResult(myIntent, PICK_UL_REQUEST);
@@ -776,7 +777,7 @@ public class AccettazioneOrdiniPickingActivity extends BaseActivity implements A
 
     @Override
     public void onWarning(String warningText, Runnable action) {
-        this.runOnUiThread(() -> {
+        this.handler.post(() -> {
             this.onLoadingEnded();
             DialogSimpleMessageView
                     .makeWarningDialog(new SpannableString(Html.fromHtml(warningText)), null, action)
@@ -791,7 +792,7 @@ public class AccettazioneOrdiniPickingActivity extends BaseActivity implements A
         if (!mDialogInputQuantityV2View.isVisible())
             mDialogInputQuantityV2View
                     .setDialogInputQuantityV2DTO(dialogInputQuantityV2DTO).setOnComplete(resultDTO -> {
-                        if (resultDTO == null) {
+                        if (resultDTO == null || resultDTO.isAborted()) {
                             this.mViewModel.resetMatchedRows();
                             return;
                         }
@@ -804,7 +805,7 @@ public class AccettazioneOrdiniPickingActivity extends BaseActivity implements A
 
     @Override
     public void onRowSaved() {
-        runOnUiThread(() -> {
+        handler.post(() -> {
             Snackbar.make(mBindings.getRoot(), R.string.data_saved, Snackbar.LENGTH_SHORT)
                     .setBackgroundTint(getResources().getColor(R.color.green_500))
                     .show();
@@ -813,7 +814,7 @@ public class AccettazioneOrdiniPickingActivity extends BaseActivity implements A
 
     @Override
     public void onFilterCodMartApplied(String codMartToFilter) {
-        runOnUiThread(() -> {
+        handler.post(() -> {
             var codMarts = new ArrayList<String>();
             codMarts.add(codMartToFilter);
 
@@ -823,7 +824,7 @@ public class AccettazioneOrdiniPickingActivity extends BaseActivity implements A
 
     @Override
     public void onFilterPosizioneApplied(String posizioneToFilter) {
-        runOnUiThread(() -> {
+        handler.post(() -> {
             var posizioni = new ArrayList<String>();
             posizioni.add(posizioneToFilter);
 
@@ -834,7 +835,7 @@ public class AccettazioneOrdiniPickingActivity extends BaseActivity implements A
     @Override
     public void onULVersata(VersamentoAutomaticoULResponseDTO versamentoAutomaticoULResponseDTO, Runnable onComplete) {
 
-        runOnUiThread(() -> {
+        handler.post(() -> {
             DialogVersamentoAutomaticoULDoneView.newInstance(versamentoAutomaticoULResponseDTO, onComplete).show(getSupportFragmentManager(), "tag");
         });
 
@@ -842,7 +843,7 @@ public class AccettazioneOrdiniPickingActivity extends BaseActivity implements A
 
     @Override
     public void onMtbColrDeleteRequest(RunnableArgs<Boolean> onComplete) {
-        runOnUiThread(() -> {
+        handler.post(() -> {
             String text = getResources().getString(R.string.alert_delete_mtb_colr);
             DialogSimpleMessageView.makeWarningDialog(new SpannableString(text), null, () -> onComplete.run(true), () -> onComplete.run(false)).show(getSupportFragmentManager(), "tag");
         });
@@ -850,7 +851,7 @@ public class AccettazioneOrdiniPickingActivity extends BaseActivity implements A
 
     @Override
     public void onLUOpened(MtbColt mtbColt) {
-        runOnUiThread(() -> {
+        handler.post(() -> {
             noLUPresent.set(false);
             Snackbar.make(mBindings.getRoot(), R.string.data_saved, Snackbar.LENGTH_SHORT)
                     .setBackgroundTint(getResources().getColor(R.color.green_500))
@@ -862,11 +863,13 @@ public class AccettazioneOrdiniPickingActivity extends BaseActivity implements A
 
     @Override
     public void onLUClosed() {
+        handler.post(() -> {
             noLUPresent.set(true);
             this.mBottomSheetFragmentLUContentViewModel.setMtbColt(null);
             this.refreshList();
 
             if (this.mShouldCloseActivity) super.onBackPressed();
+        });
     }
 
     @Override

app/src/main/java/it/integry/integrywmsnative/gest/pv_verifica_giacenze/VerificaGiacenzeFragment.java

@@ -282,6 +282,7 @@ public class VerificaGiacenzeFragment extends BaseFragment implements ITitledFra
                 .setPartitaMag(partitaMag)
                 .setDataScad(dataScad)
                 .setCanInputZeroQuantity(true)
+                .setCanOverflowOrderQuantity(true)
                 .setCanLUBeClosed(false);
 
         if (!dialogInputQuantityV2View.isVisible())

app/src/main/java/it/integry/integrywmsnative/gest/pv_verifica_giacenze/VerificaGiacenzeViewModel.java

@@ -11,6 +11,7 @@ import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
+import java.util.Optional;
 import java.util.concurrent.ExecutorService;
 import java.util.stream.Collectors;
 
@@ -24,6 +25,7 @@ import it.integry.integrywmsnative.core.data_store.db.respository_new.VerificaGi
 import it.integry.integrywmsnative.core.exception.NoArtsFoundException;
 import it.integry.integrywmsnative.core.mapper.VerificaGiacenzeMapper;
 import it.integry.integrywmsnative.core.model.MtbAart;
+import it.integry.integrywmsnative.core.model.MtbAartBarCode;
 import it.integry.integrywmsnative.core.rest.consumers.ArticoloRESTConsumer;
 import it.integry.integrywmsnative.core.rest.consumers.GiacenzaPvRESTConsumer;
 import it.integry.integrywmsnative.core.rest.model.Ean13PesoModel;
@@ -280,10 +282,21 @@ public class VerificaGiacenzeViewModel {
     }
 
     public MtbAart searchAnagraficaByBarcode(String barcode) {
-        return currentLoadedAnagrafiche.parallelStream()
+        MtbAart mtbAart = currentLoadedAnagrafiche.parallelStream()
-                .filter(mtbAart -> barcode.equals(mtbAart.getBarCode()))
+                .filter(x -> barcode.equals(x.getBarCode()))
                 .findFirst()
                 .orElse(null);
+
+        if (mtbAart == null) {
+            mtbAart = currentLoadedAnagrafiche.parallelStream()
+                    .filter(x -> x.getMtbAartBarCode() != null &&
+                            x.getMtbAartBarCode().stream()
+                                    .anyMatch(y -> barcode.equals(y.getCodBarre())))
+                    .findFirst()
+                    .orElse(null);
+        }
+
+        return mtbAart;
     }
 
     public void insertRow(VerificaGiacenzeRowEntity rowEntity) {

app/src/main/res/layout/bottom_sheet_fragment__lu_content__list_item.xml

@@ -27,10 +27,10 @@
     <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:padding="8dp"
+        android:background="?attr/selectableItemBackground"
         android:clickable="true"
         android:focusable="true"
-        android:background="?attr/selectableItemBackground">
+        android:padding="8dp">
 
         <androidx.constraintlayout.widget.ConstraintLayout
             android:id="@+id/art_detail"
@@ -40,52 +40,25 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent">
 
-            <LinearLayout
+            <TextView
-                android:id="@+id/linearLayout"
+                android:id="@+id/articolo_textview"
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:orientation="vertical"
-                app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintEnd_toStartOf="@+id/qta_box"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toTopOf="parent">
-
-
-                <RelativeLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content">
-
-                    <androidx.appcompat.widget.AppCompatTextView
                 style="@style/AppTheme.NewMaterial.Text.Small"
-                        android:layout_width="wrap_content"
+                android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:text="@{mtbColr.codMart}"
                 android:textColor="?colorPrimary"
                 android:textSize="14sp"
                 android:textStyle="bold"
+                app:layout_constraintEnd_toStartOf="@+id/qta_layout"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toTopOf="parent"
                 tools:text="COD MART" />
 
-                    <androidx.appcompat.widget.AppCompatTextView
-                        style="@style/AppTheme.NewMaterial.Text.Small"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_alignParentEnd="true"
-                        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}"
-                        android:textColor="@android:color/white"
-                        android:textSize="14sp"
-                        android:textStyle="bold"
-                        android:visibility="@{SettingsManager.iDB().isFlagForceAllToColli() || (mtbColr.mtbAart != null &amp;&amp; !mtbColr.mtbAart.flagQtaCnfFissaBoolean) ? View.VISIBLE : View.GONE}"
-                        tools:text="PESO KG" />
-
-                </RelativeLayout>
 
             <TextView
+                android:id="@+id/articolo_descrizione_textview"
                 style="@style/AppTheme.NewMaterial.Text.Small"
-                    android:layout_width="match_parent"
+                android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:ellipsize="end"
                 android:maxLines="2"
@@ -94,62 +67,87 @@
                 android:text="@{mtbColr.getDescrizione()}"
                 android:textColor="@android:color/black"
                 android:textSize="16sp"
+                app:layout_constraintEnd_toStartOf="@+id/qta_layout"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@id/articolo_textview"
                 tools:text="Descrizione lunga articolo" />
 
 
             <TextView
                 style="@style/AppTheme.NewMaterial.Text.Small"
-                    android:layout_width="wrap_content"
+                android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:text="@{`Lotto: ` + mtbColr.getPartitaMag()}"
                 android:textSize="14sp"
-                    android:visibility="@{UtilityString.isNullOrEmpty(mtbColr.getPartitaMag()) ? View.INVISIBLE : View.VISIBLE}"
+                app:layout_constraintEnd_toStartOf="@+id/qta_layout"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@id/articolo_descrizione_textview"
+                app:visibilityWhenNotNull="@{mtbColr.getPartitaMag()}"
                 tools:text="Lotto: ABCDE" />
 
-            </LinearLayout>
 
-            <RelativeLayout
+            <LinearLayout
-                android:id="@+id/qta_box"
+                android:id="@+id/qta_layout"
-                android:layout_width="wrap_content"
+                android:layout_width="0dp"
                 android:layout_height="wrap_content"
-                android:paddingStart="12dp"
+                android:gravity="center_vertical"
-                android:paddingEnd="12dp"
+                android:orientation="vertical"
                 app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintTop_toTopOf="parent">
 
+
+                <androidx.appcompat.widget.AppCompatTextView
+                    android:id="@+id/num_cnf_text"
+                    style="@style/AppTheme.NewMaterial.Text.Small"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginBottom="-16dp"
+                    android:background="@drawable/badge_round_corner_top"
+                    android:backgroundTint="?colorSecondaryContainer"
+                    android:gravity="center_horizontal"
+                    android:paddingStart="6dp"
+                    android:paddingEnd="6dp"
+                    android:paddingBottom="16dp"
+                    android:text="@{UtilityNumber.decimalToString(mtbColr.numCnf) + ` CNF`}"
+                    android:textColor="?colorOnSecondaryContainer"
+                    android:textSize="14sp"
+                    android:textStyle="bold"
+                    app:visibility="@{SettingsManager.iDB().isFlagForceAllToColli() || (mtbColr.mtbAart != null &amp;&amp; !mtbColr.mtbAart.flagQtaCnfFissaBoolean)}"
+                    tools:text="NUM CNF" />
+
                 <androidx.appcompat.widget.AppCompatTextView
                     android:id="@+id/qta_textview"
                     style="@style/AppTheme.NewMaterial.Text.Small"
-                    android:layout_width="wrap_content"
+                    android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:background="@drawable/badge_round_corner"
-                    android:backgroundTint="?colorPrimary"
+                    android:backgroundTint="?colorPrimaryContainer"
                     android:gravity="center"
                     android:paddingLeft="6dp"
                     android:paddingTop="2dp"
                     android:paddingRight="6dp"
                     android:paddingBottom="2dp"
                     android:textAllCaps="true"
-                    android:textColor="@android:color/white"
+                    android:textColor="?colorOnPrimaryContainer"
                     android:textSize="16sp"
                     android:textStyle="bold"
                     tools:text="280.45\nCONF" />
 
-            </RelativeLayout>
+            </LinearLayout>
         </androidx.constraintlayout.widget.ConstraintLayout>
 
         <com.google.android.material.card.MaterialCardView
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_marginTop="8dp"
-            android:visibility="@{mtbColr.numColloRif != null ? View.VISIBLE : View.GONE}"
-            android:focusable="false"
             android:clickable="false"
+            android:focusable="false"
+            android:visibility="@{mtbColr.numColloRif != null ? View.VISIBLE : View.GONE}"
+            app:cardElevation="0dp"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/art_detail"
-            app:cardElevation="0dp"
             app:strokeWidth="0dp">
 
             <androidx.appcompat.widget.LinearLayoutCompat
@@ -177,10 +175,10 @@
                     <androidx.appcompat.widget.AppCompatTextView
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
+                        android:ellipsize="end"
+                        android:singleLine="true"
                         android:text="@{&quot;#&quot; + mtbColr.numColloRif + &quot; (&quot; + mtbColr.serColloRif + &quot;)&quot;}"
                         android:textAppearance="@style/TextAppearance.Material3.TitleMedium"
-                        android:singleLine="true"
-                        android:ellipsize="end"
                         tools:text="#5230 (/)" />
 
                     <androidx.appcompat.widget.AppCompatTextView
@@ -196,10 +194,10 @@
                 <androidx.appcompat.widget.AppCompatTextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
+                    android:ellipsize="end"
+                    android:singleLine="true"
                     android:text="@{UtilityDate.formatDate(mtbColr.dataColloRifD, UtilityDate.COMMONS_DATE_FORMATS.DMY_HUMAN)}"
                     android:textAppearance="@style/TextAppearance.Material3.TitleMedium"
-                    android:singleLine="true"
-                    android:ellipsize="end"
                     tools:text="20 gennaio 2025" />
             </androidx.appcompat.widget.LinearLayoutCompat>
 

app/src/main/res/layout/lista_contenuto_bancale_list_model.xml

@@ -27,10 +27,10 @@
     <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:padding="8dp"
+        android:background="?attr/selectableItemBackground"
         android:clickable="true"
         android:focusable="true"
-        android:background="?attr/selectableItemBackground">
+        android:padding="8dp">
 
         <androidx.constraintlayout.widget.ConstraintLayout
             android:id="@+id/art_detail"
@@ -40,89 +40,88 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent">
 
-            <LinearLayout
-                android:id="@+id/linearLayout"
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:orientation="vertical"
-                app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintEnd_toStartOf="@+id/num_cnf_text"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toTopOf="parent">
 
-
+            <TextView
-                <RelativeLayout
+                android:id="@+id/articolo_textview"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content">
-
-                    <androidx.appcompat.widget.AppCompatTextView
                 style="@style/AppTheme.NewMaterial.Text.Small"
-                        android:layout_width="wrap_content"
+                android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:text="@{mtbColr.codMart}"
                 android:textColor="?colorPrimary"
                 android:textSize="14sp"
                 android:textStyle="bold"
+                app:layout_constraintEnd_toStartOf="@+id/qta_layout"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toTopOf="parent"
                 tools:text="COD MART" />
 
-                </RelativeLayout>
 
             <TextView
+                android:id="@+id/articolo_descrizione_textview"
                 style="@style/AppTheme.NewMaterial.Text.Small"
-                    android:layout_width="match_parent"
+                android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:ellipsize="end"
+                android:gravity="start"
                 android:maxLines="2"
                 android:paddingStart="0dp"
                 android:paddingEnd="8dp"
                 android:text="@{mtbColr.getDescrizione()}"
                 android:textColor="@android:color/black"
                 android:textSize="16sp"
+                app:layout_constraintEnd_toStartOf="@+id/qta_layout"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@id/articolo_textview"
                 tools:text="Descrizione lunga articolo" />
 
 
             <TextView
                 style="@style/AppTheme.NewMaterial.Text.Small"
-                    android:layout_width="wrap_content"
+                android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:text="@{`Lotto: ` + mtbColr.getPartitaMag()}"
                 android:textSize="14sp"
                 android:visibility="@{UtilityString.isNullOrEmpty(mtbColr.getPartitaMag()) ? View.INVISIBLE : View.VISIBLE}"
+                app:layout_constraintEnd_toStartOf="@+id/qta_layout"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@id/articolo_descrizione_textview"
                 tools:text="Lotto: ABCDE" />
 
-            </LinearLayout>
 
+            <LinearLayout
+                android:id="@+id/qta_layout"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:orientation="vertical"
+                android:gravity="center_vertical"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintTop_toTopOf="parent"
+                app:layout_constraintBottom_toBottomOf="parent">
 
                 <androidx.appcompat.widget.AppCompatTextView
                     android:id="@+id/num_cnf_text"
                     style="@style/AppTheme.NewMaterial.Text.Small"
-                android:layout_width="0dp"
+                    android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                android:layout_alignParentEnd="true"
-                android:gravity="center_horizontal"
                     android:background="@drawable/badge_round_corner_top"
                     android:backgroundTint="?colorSecondaryContainer"
+                    android:gravity="center_horizontal"
                     android:paddingStart="6dp"
                     android:paddingEnd="6dp"
                     android:paddingBottom="16dp"
+                    android:layout_marginBottom="-16dp"
                     android:text="@{UtilityNumber.decimalToString(mtbColr.numCnf) + ` CNF`}"
                     android:textColor="?colorOnSecondaryContainer"
                     android:textSize="14sp"
                     android:textStyle="bold"
-                android:visibility="@{SettingsManager.iDB().isFlagForceAllToColli() || (mtbColr.mtbAart != null &amp;&amp; !mtbColr.mtbAart.flagQtaCnfFissaBoolean) ? View.VISIBLE : View.GONE}"
+                    app:visibility="@{SettingsManager.iDB().isFlagForceAllToColli() || (mtbColr.mtbAart != null &amp;&amp; !mtbColr.mtbAart.flagQtaCnfFissaBoolean)}"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintTop_toTopOf="parent"
                     tools:text="NUM CNF" />
 
                 <androidx.appcompat.widget.AppCompatTextView
                     android:id="@+id/qta_textview"
                     style="@style/AppTheme.NewMaterial.Text.Small"
-                app:layout_constraintEnd_toEndOf="parent"
+                    android:layout_width="match_parent"
-                app:layout_constraintTop_toBottomOf="@id/num_cnf_text"
-                app:layout_constraintStart_toStartOf="@id/num_cnf_text"
-                android:layout_width="0dp"
                     android:layout_height="wrap_content"
-                android:layout_marginTop="-16dp"
                     android:background="@drawable/badge_round_corner"
                     android:backgroundTint="?colorPrimaryContainer"
                     android:gravity="center"
@@ -135,20 +134,21 @@
                     android:textSize="16sp"
                     android:textStyle="bold"
                     tools:text="280.45\nCONF" />
+            </LinearLayout>
         </androidx.constraintlayout.widget.ConstraintLayout>
 
         <com.google.android.material.card.MaterialCardView
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_marginTop="8dp"
-            android:visibility="@{mtbColr.numColloRif != null ? View.VISIBLE : View.GONE}"
-            android:focusable="false"
             android:clickable="false"
+            android:focusable="false"
+            app:cardElevation="0dp"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/art_detail"
-            app:cardElevation="0dp"
+            app:strokeWidth="0dp"
-            app:strokeWidth="0dp">
+            app:visibilityWhenNotNull="@{mtbColr.numColloRif}">
 
             <androidx.appcompat.widget.LinearLayoutCompat
                 android:layout_width="match_parent"
@@ -175,10 +175,10 @@
                     <androidx.appcompat.widget.AppCompatTextView
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
+                        android:ellipsize="end"
+                        android:singleLine="true"
                         android:text="@{&quot;#&quot; + mtbColr.numColloRif + &quot; (&quot; + mtbColr.serColloRif + &quot;)&quot;}"
                         android:textAppearance="@style/TextAppearance.Material3.TitleMedium"
-                        android:singleLine="true"
-                        android:ellipsize="end"
                         tools:text="#5230 (/)" />
 
                     <androidx.appcompat.widget.AppCompatTextView
@@ -194,10 +194,10 @@
                 <androidx.appcompat.widget.AppCompatTextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
+                    android:ellipsize="end"
+                    android:singleLine="true"
                     android:text="@{UtilityDate.formatDate(mtbColr.dataColloRifD, UtilityDate.COMMONS_DATE_FORMATS.DMY_HUMAN)}"
                     android:textAppearance="@style/TextAppearance.Material3.TitleMedium"
-                    android:singleLine="true"
-                    android:ellipsize="end"
                     tools:text="20 gennaio 2025" />
             </androidx.appcompat.widget.LinearLayoutCompat>