Finish v1_0_13(16)

.idea/assetWizardSettings.xml

@@ -3,6 +3,11 @@
   <component name="WizardSettings">
     <option name="children">
       <map>
+        <entry key="imageWizard">
+          <value>
+            <PersistentState />
+          </value>
+        </entry>
         <entry key="vectorWizard">
           <value>
             <PersistentState>

app/build.gradle

@@ -21,8 +21,8 @@ android {
         applicationId "it.integry.integrywmsnative"
         minSdkVersion 21
         targetSdkVersion 28
-        versionCode 15
+        versionCode 16
-        versionName "1.0.12"
+        versionName "1.0.13"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
 

app/src/main/AndroidManifest.xml

@@ -19,24 +19,20 @@
         <activity
             android:name=".MainActivity"
             android:label="@string/app_name"
+            android:screenOrientation="portrait"
             android:theme="@style/Light"
-            android:windowSoftInputMode="adjustPan"
+            android:windowSoftInputMode="adjustPan">
-            android:screenOrientation="portrait">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
 
-                <category android:name="android.intent.category.LAUNCHER" />
-            </intent-filter>
         </activity>
         <activity
             android:name=".gest.accettazione_ordine_inevaso.AccettazioneOrdineInevasoActivity"
-            android:theme="@style/Light"
             android:screenOrientation="portrait"
+            android:theme="@style/Light"
             android:windowSoftInputMode="adjustNothing" />
         <activity
             android:name=".gest.vendita_ordine_inevaso.VenditaOrdineInevasoActivity"
-            android:theme="@style/Light"
             android:screenOrientation="portrait"
+            android:theme="@style/Light"
             android:windowSoftInputMode="adjustNothing" />
         <activity
             android:name=".gest.login.LoginActivity"
@@ -52,12 +48,24 @@
             android:label="@string/activity_contenuto_bancale_title"
             android:screenOrientation="portrait"
             android:theme="@style/Light" />
+
         <meta-data
             android:name="io.fabric.ApiKey"
             android:value="26f0d16c00d20fe74582627c831f26e30646a187" />
         <meta-data
             android:name="firebase_crashlytics_collection_enabled"
             android:value="true" />
+
+        <activity
+            android:name=".SplashActivity"
+            android:label="@string/app_name"
+            android:theme="@style/SplashTheme">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+        </activity>
     </application>
 
 </manifest>

app/src/main/java/it/integry/integrywmsnative/MainActivity.java

@@ -55,11 +55,6 @@ public class MainActivity extends AppCompatActivity
 
         //ExceptionsHandler.init(this);
 
-        PermissionsHelper.askPermissions(this);
-
-        if(SettingsManager.i().user.username == null && SettingsManager.i().user.password == null){
-            startLoginActivity();
-        } else {
         mBinding = DataBindingUtil.inflate(LayoutInflater.from(this), R.layout.activity_main, null, false);
         setContentView(mBinding.getRoot());
 
@@ -82,7 +77,6 @@ public class MainActivity extends AppCompatActivity
 
         init();
     }
-    }
 
 
     private void startLoginActivity(){

app/src/main/java/it/integry/integrywmsnative/SplashActivity.java

@@ -0,0 +1,90 @@
+package it.integry.integrywmsnative;
+
+import android.content.Intent;
+import android.content.pm.PackageInfo;
+import android.content.pm.PackageManager;
+import android.os.Bundle;
+import android.app.Activity;
+import android.os.Handler;
+import android.text.SpannableString;
+import android.widget.TextView;
+
+import androidx.appcompat.app.AppCompatActivity;
+import butterknife.BindView;
+import butterknife.ButterKnife;
+import it.integry.integrywmsnative.core.settings.SettingsManager;
+import it.integry.integrywmsnative.core.utility.PermissionsHelper;
+import it.integry.integrywmsnative.gest.login.LoginActivity;
+import it.integry.integrywmsnative.view.dialogs.DialogSimpleMessageHelper;
+
+public class SplashActivity extends AppCompatActivity {
+
+    @BindView(R.id.app_version_textview)
+    TextView appVersionTextView;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_splash);
+
+        ButterKnife.bind(this);
+
+        initAppVersion();
+
+
+        PermissionsHelper.askPermissions(this, () -> {
+            init();
+        }, permanentlyDenied -> {
+            if(permanentlyDenied) {
+                DialogSimpleMessageHelper.makeErrorDialog(this,
+                        new SpannableString(getText(R.string.permissions_permanrntly_denied)), null, () -> {
+                            this.finish();
+                        }).show();
+            }
+        });
+
+
+    }
+
+
+    private void initAppVersion() {
+        try {
+            PackageInfo pInfo = getPackageManager().getPackageInfo(getPackageName(), 0);
+            String version = pInfo.versionName;
+            appVersionTextView.setText("v" + version);
+        } catch (PackageManager.NameNotFoundException e) {
+            e.printStackTrace();
+        }
+    }
+
+    private void init() {
+        if(SettingsManager.i().user.username == null && SettingsManager.i().user.password == null){
+            startLoginActivity();
+        } else {
+            startMainActivity();
+        }
+    }
+
+
+
+
+
+
+    private void startLoginActivity(){
+        Intent myIntent = new Intent(this, LoginActivity.class);
+        startActivity(myIntent);
+        this.finish();
+    }
+
+    private void startMainActivity(){
+        new Handler().postDelayed(() -> {
+            Intent myIntent = new Intent(this, MainActivity.class);
+            startActivity(myIntent);
+            this.finish();
+        }, 3000);
+
+
+    }
+
+
+}

app/src/main/java/it/integry/integrywmsnative/core/REST/consumers/ColliMagazzinoRESTConsumer.java

@@ -4,6 +4,7 @@ import com.annimon.stream.Stream;
 import com.google.gson.JsonObject;
 
 import java.text.SimpleDateFormat;
+import java.util.Calendar;
 import java.util.List;
 
 import it.integry.integrywmsnative.core.CommonConst;
@@ -131,6 +132,18 @@ public class ColliMagazzinoRESTConsumer extends _BaseRESTConsumer{
             mtbColtToCreate.setSerCollo(customSerCollo);
         }
 
+        Calendar calendar = Calendar.getInstance();
+        int currentYear = calendar.get(Calendar.YEAR);
+
+
+        String fullYear = "20" + UtilityBarcode.getAnnoColloFromULAnonima(barcode);
+
+
+
+        if(!fullYear.equalsIgnoreCase("" + currentYear)){
+            onFailed.run(new Exception("Per continuare scansiona un'etichetta dell'anno corrente"));
+        }
+
         mtbColtToCreate
                 .setOperation(CommonModelConsts.OPERATION.INSERT);
 

app/src/main/java/it/integry/integrywmsnative/core/di/Converters.java

@@ -103,7 +103,7 @@ public class Converters {
 
 
         final DecimalFormat decimalFormat = new DecimalFormat();
-        decimalFormat.setMaximumFractionDigits(2);
+        decimalFormat.setMaximumFractionDigits(3);
         decimalFormat.setDecimalFormatSymbols(otherSymbols);
 
         Pair<BindableFloat, TextWatcherAdapter> pair = (Pair) view.getTag(R.id.bound_observable);

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

@@ -123,7 +123,7 @@ public class MtbColr extends EntityBase implements Parcelable {
             numCnf = new BigDecimal(in.readFloat());
         }
 
-        in.readParcelable(MtbAart.class.getClassLoader());
+        mtbAart = in.readParcelable(MtbAart.class.getClassLoader());
     }
 
     @Override

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

@@ -139,7 +139,7 @@ public class MtbColt extends EntityBase implements Parcelable {
 
 
 
-        in.readTypedList(mtbColr, MtbColr.CREATOR);
+        in.readList(mtbColr, MtbColr.class.getClassLoader());
 
 
     }
@@ -228,7 +228,7 @@ public class MtbColt extends EntityBase implements Parcelable {
             dest.writeFloat(altezzaCm.floatValue());
         }
 
-        dest.writeTypedList(mtbColr);
+        dest.writeList(mtbColr);
     }
 
     @Override

app/src/main/java/it/integry/integrywmsnative/core/utility/PermissionsHelper.java

@@ -9,10 +9,11 @@ import com.emreeran.permissionlivedata.Status;
 import java.util.ArrayList;
 
 import androidx.appcompat.app.AppCompatActivity;
+import it.integry.integrywmsnative.core.expansion.RunnableArgs;
 
 public class PermissionsHelper {
 
-    public static void askPermissions(AppCompatActivity activity) {
+    public static void askPermissions(AppCompatActivity activity, Runnable onPermissionsConfirmed, RunnableArgs<Boolean> onPermissionsDenied) {
 
         PermissionLiveData permissionLiveData = PermissionLiveData.create(
                 activity,
@@ -23,14 +24,17 @@ public class PermissionsHelper {
         permissionLiveData.observe(activity, permission -> {
             if (permission.getStatus() == Status.RECEIVED) {
                 if (permission.getGranted()) {
+                    onPermissionsConfirmed.run();
                     //UtilityToast.showToast("Permission " + permission.getName() + " was granted.");
                 } else if (permission.getShouldShowRequestPermissionRationale()) {
-                    UtilityToast.showToast("Permission " + permission.getName() + " was denied without ask never again checked.");
+                    onPermissionsDenied.run(true);
+                    //UtilityToast.showToast("Permission " + permission.getName() + " was denied without ask never again checked.");
                 } else {
-                    UtilityToast.showToast("Permission " + permission.getName() + " was denied.");
+                    onPermissionsDenied.run(false);
+                    //UtilityToast.showToast("Permission " + permission.getName() + " was denied.");
                 }
             } else if (permission.getStatus() == Status.PENDING) {
-                UtilityToast.showToast(String.format("Pending request for %s", permission.getName()));
+                //UtilityToast.showToast(String.format("Pending request for %s", permission.getName()));
             }
         });
     }

app/src/main/java/it/integry/integrywmsnative/core/utility/UtilityBarcode.java

@@ -49,6 +49,15 @@ public class UtilityBarcode {
 
 
 
+    public static Integer getAnnoColloFromULAnonima(String barcode) {
+        if(barcode != null){
+            return Integer.parseInt(barcode.substring(1, 3));
+        } else
+            return null;
+    }
+
+
+
     public static String convertITF14toEAN13(String barcodeITF14) {
         String barcodeEAN13 = null;
 

app/src/main/java/it/integry/integrywmsnative/gest/accettazione_ordine_inevaso/core/AccettazioneOrdineInevasoHelper.java

@@ -298,7 +298,9 @@ public class AccettazioneOrdineInevasoHelper {
         if(mtbColrs != null) {
             SimpleDateFormat sdf = new SimpleDateFormat("dd/MM/yyyy HH:mm:ss");
 
-            List<MtbColr> filteredMtbColrs = Stream.of(mtbColrs).filter(
+            List<MtbColr> filteredMtbColrs = Stream.of(mtbColrs)
+                    .filter(x -> x.getNumOrd() != null)
+                    .filter(
                        x -> x.getCodMart().equalsIgnoreCase(item.mtbAart.getCodMart()) &&
                            (x.getCodJcom() != null && x.getCodJcom().equalsIgnoreCase(item.codJcom)) &&
                             x.getRigaOrd() == item.rigaOrd &&

app/src/main/java/it/integry/integrywmsnative/gest/accettazione_ordine_inevaso/core/MainListOrdineAccettazioneAdapter.java

@@ -165,9 +165,9 @@ public class MainListOrdineAccettazioneAdapter extends RecyclerView.Adapter<Main
                 } else if (rowItem.getQtaRiservata().floatValue() > 0) {
                     groupModelView.setBackgroundColor(mContext.getResources().getColor(R.color.orange_600_with_alpha));
                 } else if (visibleElementsCounter % 2 == 1) {
-                    groupModelView.setBackgroundColor(mContext.getResources().getColor(R.color.letturaFacilitataBG));
-                } else {
                     groupModelView.setBackgroundColor(Color.WHITE);
+                } else {
+                    groupModelView.setBackgroundColor(mContext.getResources().getColor(R.color.letturaFacilitataBG));
                 }
 
 

app/src/main/java/it/integry/integrywmsnative/gest/accettazione_ordine_inevaso/viewmodel/AccettazioneOnOrdineAccettazioneInevasoViewModel.java

@@ -13,6 +13,7 @@ import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
+import java.util.Objects;
 
 import it.integry.integrywmsnative.BR;
 import it.integry.integrywmsnative.R;
@@ -170,11 +171,20 @@ public class AccettazioneOnOrdineAccettazioneInevasoViewModel implements IOnColl
 
             MtbColr currentMtbColr = recoveredMtbColt.getMtbColr().get(i);
 
+            /*
             List<OrdineAccettazioneDTO.Riga> foundRows = Stream.of(groupedOrdini)
                     .filter(x -> x.getNumOrd() == currentMtbColr.getNumOrd() &&
                             x.getRigaOrd() == currentMtbColr.getRigaOrd()&&
                             x.getDataOrd().equals(currentMtbColr.getDataOrdD()))
                     .toList();
+            */
+
+            List<OrdineAccettazioneDTO.Riga> foundRows = Stream.of(groupedOrdini)
+                    .filter(x -> Objects.equals(x.mtbAart.getCodMart(), currentMtbColr.getCodMart()) &&
+                            Objects.equals(x.getPartitaMag(), currentMtbColr.getPartitaMag()) &&
+                            Objects.equals(x.getCodJcom(), currentMtbColr.getCodJcom()))
+                    .toList();
+
 
             if(foundRows != null && foundRows.size() > 0){
                 OrdineAccettazioneDTO.Riga currentRow = foundRows.get(0);

app/src/main/java/it/integry/integrywmsnative/gest/lista_bancali/ListaBancaliActivity.java

@@ -70,7 +70,7 @@ public class ListaBancaliActivity extends AppCompatActivity {
             // Make sure the request was successful
             if (resultCode == RESULT_OK) {
 
-//                MtbColt recoveredMtbColt = data.getParcelableExtra("key");
+                // MtbColt recoveredMtbColt = data.getParcelableExtra("key");
 
 
                 this.setResult(RESULT_OK, data);

app/src/main/java/it/integry/integrywmsnative/gest/rettifica_giacenze/viewmodel/RettificaGiacenzeViewModel.java

@@ -290,6 +290,7 @@ public class RettificaGiacenzeViewModel implements IRecyclerItemClicked<MtbColr>
         qtaDto.setQtaTot(mtbAart.getQtaCnf());
 
         qtaDto.setQtaDaEvadere(new BigDecimal(-1));
+        qtaDto.setQtaDisponibile(new BigDecimal(-1));
 
         qtaDto.setCanPartitaMagBeChanged(true);
         qtaDto.setCanDataScadBeChanged(true);

app/src/main/java/it/integry/integrywmsnative/gest/vendita_ordine_inevaso/core/MainListOrdineVenditaInevasoAdapter.java

@@ -157,9 +157,9 @@ public class MainListOrdineVenditaInevasoAdapter extends RecyclerView.Adapter<Ma
                 } else if (rowItem.getQtaRiservata().floatValue() > 0) {
                     groupModelView.setBackgroundColor(mContext.getResources().getColor(R.color.orange_600_with_alpha));
                 } else if (visibleElementsCounter % 2 == 1) {
-                    groupModelView.setBackgroundColor(mContext.getResources().getColor(R.color.letturaFacilitataBG));
-                } else {
                     groupModelView.setBackgroundColor(Color.WHITE);
+                } else {
+                    groupModelView.setBackgroundColor(mContext.getResources().getColor(R.color.letturaFacilitataBG));
                 }
 
                 final TextView badge1 = groupModelView.findViewById(R.id.vendita_ordine_inevaso_main_list_group_item_badge1);

app/src/main/java/it/integry/integrywmsnative/view/dialogs/input_quantity/DialogInputQuantity.java

@@ -459,7 +459,7 @@ public class DialogInputQuantity {
                     if (!quantityDTO.blockedQtaTot.get()) {
 
                         quantityDTO.qtaTotNotificationEnabled = false;
-                        quantityDTO.qtaTot.set((float) Math.round(quantityDTO.qtaCnf.get(true) * quantityDTO.numCnf.get(true) * 100) / 100);
+                        quantityDTO.qtaTot.set((float) Math.round(quantityDTO.qtaCnf.get(true) * quantityDTO.numCnf.get(true) * 1000) / 1000);
                         quantityDTO.qtaTotNotificationEnabled = true;
 
 
@@ -467,9 +467,9 @@ public class DialogInputQuantity {
 
                         quantityDTO.qtaCnfNotificationEnabled = false;
                         if(quantityDTO.numCnf.get(true) != 0) {
-                            quantityDTO.qtaCnf.set((float) Math.round(quantityDTO.qtaTot.get(true) / quantityDTO.numCnf.get(true) * 100) / 100);
+                            quantityDTO.qtaCnf.set((float) Math.round(quantityDTO.qtaTot.get(true) / quantityDTO.numCnf.get(true) * 1000) / 1000);
                         } else {
-                            quantityDTO.qtaCnf.set((float) Math.round(quantityDTO.qtaTot.get(true) / 1 * 100) / 100);
+                            quantityDTO.qtaCnf.set((float) Math.round(quantityDTO.qtaTot.get(true) / 1 * 1000) / 1000);
                         }
                         quantityDTO.qtaCnfNotificationEnabled = true;
 
@@ -494,7 +494,7 @@ public class DialogInputQuantity {
                     if (!quantityDTO.blockedQtaTot.get()) {
 
                         quantityDTO.qtaTotNotificationEnabled = false;
-                        quantityDTO.qtaTot.set((float) Math.round(quantityDTO.qtaCnf.get(true) * quantityDTO.numCnf.get(true) * 100) / 100);
+                        quantityDTO.qtaTot.set((float) Math.round(quantityDTO.qtaCnf.get(true) * quantityDTO.numCnf.get(true) * 1000) / 1000);
                         quantityDTO.qtaTotNotificationEnabled = true;
 
                     } else if (!quantityDTO.blockedNumDiCnf.get()) {
@@ -529,7 +529,7 @@ public class DialogInputQuantity {
                     if(!quantityDTO.blockedQtaPerCnf.get()){
 
                         quantityDTO.qtaCnfNotificationEnabled = false;
-                        quantityDTO.qtaCnf.set((float) Math.round(quantityDTO.qtaTot.get(true) / quantityDTO.numCnf.get(true) *100)/100);
+                        quantityDTO.qtaCnf.set((float) Math.round(quantityDTO.qtaTot.get(true) / quantityDTO.numCnf.get(true) *1000)/1000);
                         quantityDTO.qtaCnfNotificationEnabled = true;
 
                     } else if(!quantityDTO.blockedNumDiCnf.get()) {

app/src/main/res/drawable/splash_background.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item android:drawable="@color/colorPrimary"/>
+    
+
+</layer-list>

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

@@ -49,13 +49,13 @@
                 android:orientation="horizontal"
                 android:gravity="right">
 
-                <TextView
+                <!--<TextView-->
-                    android:layout_width="wrap_content"
+                    <!--android:layout_width="wrap_content"-->
-                    android:layout_height="wrap_content"
+                    <!--android:layout_height="wrap_content"-->
-                    android:textStyle="bold"
+                    <!--android:textStyle="bold"-->
-                    android:textColor="@color/green_700"
+                    <!--android:textColor="@color/green_700"-->
-                    style="@android:style/TextAppearance.Medium"
+                    <!--style="@android:style/TextAppearance.Medium"-->
-                    android:text="@string/dispatched"/>
+                    <!--android:text="@string/dispatched"/>-->
 
                 <TextView
                     android:id="@+id/accettazione_ordine_inevaso_main_list_group_item_qta_evasa"

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

@@ -14,6 +14,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:fitsSystemWindows="false"
+    android:background="@color/full_white"
     xmlns:fab="http://schemas.android.com/apk/res-auto"
     android:layout_gravity="top">
 

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

@@ -0,0 +1,73 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@color/colorPrimary"
+    tools:context=".SplashActivity">
+
+    <ImageView
+        android:id="@+id/imageView"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:src="@drawable/logo_integry_completo_1024w"
+        android:adjustViewBounds="true"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintLeft_toRightOf="@+id/guideline_left"
+        app:layout_constraintRight_toLeftOf="@+id/guideline_right" />
+
+
+    <androidx.constraintlayout.widget.Guideline
+        android:id="@+id/guideline_left"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:orientation="vertical"
+        app:layout_constraintGuide_percent="0.25" />
+
+    <androidx.constraintlayout.widget.Guideline
+        android:id="@+id/guideline_right"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:orientation="vertical"
+        app:layout_constraintGuide_percent="0.75" />
+
+
+    <androidx.constraintlayout.widget.Guideline
+        android:id="@+id/guideline_left_progress"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:orientation="vertical"
+        app:layout_constraintGuide_percent="0.3" />
+
+    <androidx.constraintlayout.widget.Guideline
+        android:id="@+id/guideline_right_progress"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:orientation="vertical"
+        app:layout_constraintGuide_percent="0.7" />
+
+    <ProgressBar
+        android:id="@+id/progressBar2"
+        style="?android:attr/progressBarStyleHorizontal"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="24dp"
+        android:indeterminate="true"
+        android:indeterminateTint="@android:color/white"
+        app:layout_constraintLeft_toRightOf="@+id/guideline_left_progress"
+        app:layout_constraintRight_toLeftOf="@+id/guideline_right_progress"
+        app:layout_constraintTop_toBottomOf="@id/imageView" />
+
+    <TextView
+        android:id="@+id/app_version_textview"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        tools:text="v 1.0.0"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        android:textColor="@android:color/white"
+        android:layout_marginBottom="24dp"/>
+</androidx.constraintlayout.widget.ConstraintLayout>

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

@@ -12,22 +12,28 @@
             type="it.integry.integrywmsnative.core.model.MtbAart"/>
     </data>
 
-    <androidx.constraintlayout.widget.ConstraintLayout
+    <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:orientation="vertical"
         android:paddingTop="8dp"
         android:paddingBottom="8dp">
 
 
         <LinearLayout
             android:id="@+id/linearLayout"
-            android:layout_width="0dp"
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:orientation="vertical"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent">
 
 
+            <RelativeLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content">
+
+
                 <androidx.appcompat.widget.AppCompatTextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
@@ -37,12 +43,24 @@
                     android:textStyle="bold"
                     tools:text="COD MART" />
 
+                <androidx.appcompat.widget.AppCompatTextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="@{mtbAart.diacod}"
+                    android:textColor="@color/red_600"
+                    android:textSize="14sp"
+                    android:textStyle="bold"
+                    android:visibility="@{UtilityString.isNullOrEmpty(mtbAart.diacod) ? View.INVISIBLE : View.VISIBLE}"
+                    android:layout_alignParentEnd="true"
+                    tools:text="DIACOD"/>
+            </RelativeLayout>
+
+
 
             <TextView
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:ellipsize="end"
-                android:maxLines="2"
                 android:text="@{mtbAart.descrizioneEstesa}"
                 android:textColor="@android:color/black"
                 android:textSize="16sp"
@@ -87,5 +105,5 @@
 
         </RelativeLayout>-->
 
-    </androidx.constraintlayout.widget.ConstraintLayout>
+    </LinearLayout>
 </layout>

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

@@ -96,7 +96,7 @@
                     android:paddingTop="2dp"
                     android:paddingRight="6dp"
                     android:paddingBottom="2dp"
-                    android:text="@{UtilityNumber.decimalToString(checkableMtbColr.mtbColr.getQtaCol()) + `\n` + checkableMtbColr.mtbColr.getUntMis()}"
+                    android:text="@{UtilityNumber.decimalToString(checkableMtbColr.mtbColr.getQtaCol()) + (checkableMtbColr.mtbColr.mtbAart != null && !UtilityString.isNullOrEmpty(checkableMtbColr.mtbColr.mtbAart.untMis) ? `\n` + checkableMtbColr.mtbColr.mtbAart.untMis : ``)}"
                     android:textSize="16sp"
                     android:textColor="@android:color/white"
                     android:textStyle="bold"

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

@@ -22,6 +22,8 @@
 
     <import type="android.graphics.Color" />
 
+    <import type="it.integry.integrywmsnative.core.utility.UtilityString" />
+
 </data>
 
 <androidx.cardview.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
@@ -39,15 +41,28 @@
             android:layout_height="wrap_content">
 
             <androidx.appcompat.widget.AppCompatTextView
+                android:id="@+id/dialog_title_text"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:ellipsize="end"
-                android:text='@{(viewmodel.codArtFor != null ? viewmodel.codArtFor : viewmodel.mtbAart.codMart) + (viewmodel.batchLot != null ? " (" + viewmodel.batchLot + ")" : "") }'
+                android:text='@{viewmodel.mtbAart.codMart + (!UtilityString.isNullOrEmpty(viewmodel.batchLot) ? " (" + viewmodel.batchLot + ")" : "") }'
-                android:textColor="#000"
+                android:textColor="@color/colorPrimary"
                 android:textSize="18sp"
                 android:textStyle="bold"
                 tools:text="AV25D200010B"/>
 
+            <androidx.appcompat.widget.AppCompatTextView
+                android:layout_below="@id/dialog_title_text"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:ellipsize="end"
+                android:text='@{!UtilityString.isNullOrEmpty(viewmodel.mtbAart.diacod) ? viewmodel.mtbAart.diacod : ""}'
+                android:textColor="@color/red_600"
+                android:textSize="16sp"
+                android:textStyle="bold"
+                android:visibility="@{UtilityString.isNullOrEmpty(viewmodel.mtbAart.diacod) ? View.GONE : View.VISIBLE}"
+                tools:text="DIACOD HERE"/>
+
             <androidx.appcompat.widget.AppCompatTextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
@@ -74,12 +89,12 @@
                 android:layout_height="wrap_content"
                 android:orientation="vertical">
 
-                <androidx.appcompat.widget.AppCompatTextView
+                <!--<androidx.appcompat.widget.AppCompatTextView-->
-                    android:layout_width="wrap_content"
+                    <!--android:layout_width="wrap_content"-->
-                    android:layout_height="wrap_content"
+                    <!--android:layout_height="wrap_content"-->
-                    android:text="@string/description"
+                    <!--android:text="@string/description"-->
-                    android:textSize="16sp"
+                    <!--android:textSize="16sp"-->
-                    tools:text="Descrizione" />
+                    <!--tools:text="Descrizione" />-->
 
                 <androidx.appcompat.widget.AppCompatTextView
                     android:layout_width="wrap_content"

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

@@ -80,7 +80,7 @@
                 android:paddingTop="2dp"
                 android:paddingRight="6dp"
                 android:paddingBottom="2dp"
-                android:text="@{UtilityNumber.decimalToString(mtbColr.getQtaCol()) + `\n` + mtbColr.getUntMis()}"
+                android:text="@{UtilityNumber.decimalToString(mtbColr.getQtaCol()) + (mtbColr.mtbAart != null && !UtilityString.isNullOrEmpty(mtbColr.mtbAart.untMis) ? `\n` + mtbColr.mtbAart.untMis : ``)}"
                 android:textSize="16sp"
                 android:textColor="@android:color/white"
                 android:textStyle="bold"

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

@@ -80,7 +80,7 @@
                 android:paddingTop="2dp"
                 android:paddingRight="6dp"
                 android:paddingBottom="2dp"
-                android:text="@{UtilityNumber.decimalToString(mtbColr.getQtaCol()) + `\n` + mtbColr.getUntMis()}"
+                android:text="@{UtilityNumber.decimalToString(mtbColr.getQtaCol()) + (mtbColr.mtbAart != null && !UtilityString.isNullOrEmpty(mtbColr.mtbAart.untMis) ? `\n` + mtbColr.mtbAart.untMis : ``)}"
                 android:textSize="16sp"
                 android:textColor="@android:color/white"
                 android:textStyle="bold"

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

@@ -49,13 +49,13 @@
                 android:orientation="horizontal"
                 android:gravity="right">
 
-                <TextView
+                <!--<TextView-->
-                    android:layout_width="wrap_content"
+                    <!--android:layout_width="wrap_content"-->
-                    android:layout_height="wrap_content"
+                    <!--android:layout_height="wrap_content"-->
-                    android:textStyle="bold"
+                    <!--android:textStyle="bold"-->
-                    android:textColor="@color/green_700"
+                    <!--android:textColor="@color/green_700"-->
-                    style="@android:style/TextAppearance.Medium"
+                    <!--style="@android:style/TextAppearance.Medium"-->
-                    android:text="@string/dispatched"/>
+                    <!--android:text="@string/dispatched"/>-->
 
                 <TextView
                     android:id="@+id/vendita_ordine_inevaso_main_list_group_item_qta_evasa"

app/src/main/res/values-it/strings.xml

@@ -163,5 +163,6 @@
 
     <string name="level">Livello</string>
     <string name="not_valid">Non valido</string>
+    <string name="permissions_permanrntly_denied"><![CDATA[Sono stati negati tutti i permessi necessari al funzionamento dell\'applicazione. L\'applicazione verrà adesso chiusa.]]></string>
 
 </resources>

app/src/main/res/values/strings.xml

@@ -171,5 +171,6 @@
     <string name="too_much_lu_found_message">Multiple LU found</string>
     <string name="ask_print_message">Do you want print the label?</string>
     <string name="ask_position_of_lu_message">Please scan a <b>Position</b> barcode</string>
+    <string name="permissions_permanrntly_denied">Please note that all permissions are required. Application will close now.</string>
 
 </resources>

app/src/main/res/values/styles.xml

@@ -17,6 +17,10 @@
         <item name="windowNoTitle">true</item>
     </style>
 
+    <style name="SplashTheme" parent="AppTheme.NoActionBar">
+        <item name="android:windowBackground">@drawable/splash_background</item>
+    </style>
+
     <style name="Light" parent="Theme.MaterialComponents.Light.NoActionBar.Bridge">
         <item name="colorPrimary">@color/colorPrimary</item>
         <item name="colorPrimaryDark">@color/colorPrimaryDark</item>

waterfall_toolbar/build.gradle

@@ -29,7 +29,7 @@ dependencies {
     implementation fileTree(include: ['*.jar'], dir: 'libs')
     // google
     implementation 'androidx.cardview:cardview:1.0.0'
-    implementation 'com.google.android.material:material:1.1.0-alpha01'
+    implementation 'com.google.android.material:material:1.1.0-alpha02'
     implementation 'androidx.appcompat:appcompat:1.1.0-alpha01'
     testImplementation 'junit:junit:4.12'
     androidTestImplementation 'androidx.test:runner:1.1.1'