Aggiornate icone della dashboard.

Piccoli fix su Versamento Materiale Produzione.

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

@@ -35,6 +35,7 @@ import it.integry.integrywmsnative.core.interfaces.ITitledFragment;
 import it.integry.integrywmsnative.gest.login.LoginActivity;
 import it.integry.integrywmsnative.gest.main.MainFragment;
 import it.integry.integrywmsnative.gest.picking_libero.PickingLiberoFragment;
+import it.integry.integrywmsnative.gest.prod_recupero_materiale.ProdRecuperoMaterialeFragment;
 import it.integry.integrywmsnative.gest.prod_versamento_materiale.ProdVersamentoMaterialeFragment;
 import it.integry.integrywmsnative.gest.rettifica_giacenze.RettificaGiacenzeFragment;
 import it.integry.integrywmsnative.gest.settings.MainSettingsFragment;
@@ -74,7 +75,7 @@ public class MainActivity extends AppCompatActivity
         mBinding.navView.setNavigationItemSelectedListener(this);
         mBinding.appBarMain.mainSearch.setVisibility(View.GONE);
 
-        pop();
+        openMain();
 
         init();
     }
@@ -99,8 +100,8 @@ public class MainActivity extends AppCompatActivity
             if (count == 0) {
                 super.onBackPressed();
             } else {
-                //pop();
-                getSupportFragmentManager().popBackStack();
+                pop();
+                // getSupportFragmentManager().popBackStack();
 
             }
         }
@@ -156,6 +157,9 @@ public class MainActivity extends AppCompatActivity
         else if (id == R.id.nav_prod_versamento_materiale) {
             fragment = ProdVersamentoMaterialeFragment.newInstance();
             this.adaptViewToFragment(fragment);
+        } else if (id == R.id.nav_prod_recupero_materiale) {
+            fragment = ProdRecuperoMaterialeFragment.newInstance();
+            this.adaptViewToFragment(fragment);
         }
 
         else if(id == R.id.nav_settings){
@@ -177,8 +181,8 @@ public class MainActivity extends AppCompatActivity
         return true;
     }
 
-    @Override
-    public void pop() {
+
+    private void openMain() {
         MainFragment mainFragment = MainFragment.newInstance();
 
         adaptViewToFragment(mainFragment);
@@ -187,6 +191,18 @@ public class MainActivity extends AppCompatActivity
         mBinding.navView.setCheckedItem(R.id.nav_home);
     }
 
+    @Override
+    public void pop() {
+
+        int count = getSupportFragmentManager().getBackStackEntryCount();
+        for(int i = 0; i < count; i++) {
+            getSupportFragmentManager().popBackStack();
+        }
+
+        openMain();
+
+    }
+
     private void adaptViewToFragment(Fragment fragment){
         if(fragment instanceof ISearcableFragment) {
             mBinding.appBarMain.mainSearch.setOnQueryTextListener((SearchView.OnQueryTextListener) fragment);

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

@@ -140,6 +140,7 @@ public class ColliMagazzinoRESTConsumer extends _BaseRESTConsumer{
                 .setDataCollo((String) null)
                 .setSegno(-1)
                 .setGestione(GestioneEnum.LAVORAZIONE)
+                .setDataVers(null)
                 .setOperation(CommonModelConsts.OPERATION.INSERT);
 
         if(posizione != null) {

app/src/main/java/it/integry/integrywmsnative/gest/main/MainFragment.java

@@ -229,6 +229,11 @@ public class MainFragment extends Fragment implements ITitledFragment, IScrollab
         ((MainActivity) getActivity()).setItem(R.id.nav_prod_versamento_materiale);
     }
 
+//    @OnClick(R.id.fast_button_prod_recupero_materiale)
+//    public void onClickProdRecuperoMateriale(View view) {
+//        ((MainActivity) getActivity()).setItem(R.id.nav_prod_recupero_materiale);
+//    }
+
     @Override
     public void setScrollToolbar(ElevatedToolbar toolbar) {
         mToolbar = toolbar;

app/src/main/java/it/integry/integrywmsnative/gest/prod_recupero_materiale/ProdRecuperoMaterialeFragment.java

@@ -0,0 +1,91 @@
+package it.integry.integrywmsnative.gest.prod_recupero_materiale;
+
+
+import android.content.Context;
+import android.os.Bundle;
+
+import androidx.appcompat.widget.AppCompatTextView;
+import androidx.databinding.DataBindingUtil;
+import androidx.fragment.app.Fragment;
+
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+
+import it.integry.integrywmsnative.R;
+import it.integry.integrywmsnative.core.interfaces.IPoppableActivity;
+import it.integry.integrywmsnative.core.interfaces.ITitledFragment;
+import it.integry.integrywmsnative.databinding.FragmentProdRecuperoMaterialeBinding;
+import it.integry.integrywmsnative.gest.prod_recupero_materiale.core.ProdRecuperoMaterialeHelper;
+import it.integry.integrywmsnative.gest.prod_recupero_materiale.viewmodel.ProdRecuperoMaterialeViewModel;
+import it.integry.integrywmsnative.gest.prod_versamento_materiale.ProdVersamentoMaterialeFragment;
+import it.integry.integrywmsnative.gest.prod_versamento_materiale.core.ProdVersamentoMaterialHelper;
+import it.integry.integrywmsnative.gest.prod_versamento_materiale.viewmodel.ProdVersamentoMaterialViewModel;
+
+/**
+ * A simple {@link Fragment} subclass.
+ */
+public class ProdRecuperoMaterialeFragment extends Fragment implements ITitledFragment {
+    private FragmentProdRecuperoMaterialeBinding mBinding;
+    private ProdRecuperoMaterialeViewModel mViewmodel;
+    private ProdRecuperoMaterialeHelper mHelper;
+
+
+    public ProdRecuperoMaterialeFragment() {
+        // Required empty public constructor
+    }
+
+    public static ProdRecuperoMaterialeFragment newInstance() {
+        ProdRecuperoMaterialeFragment fragment = new ProdRecuperoMaterialeFragment();
+        Bundle args = new Bundle();
+        fragment.setArguments(args);
+        return fragment;
+    }
+
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+
+        mViewmodel = new ProdRecuperoMaterialeViewModel();
+    }
+
+
+    @Override
+    public View onCreateView(LayoutInflater inflater, ViewGroup container,
+                             Bundle savedInstanceState) {
+        mBinding = DataBindingUtil.inflate(inflater, R.layout.fragment_prod_recupero_materiale, container, false);
+
+
+        init();
+        return mBinding.getRoot();
+    }
+
+    @Override
+    public void onAttach(Context context) {
+        super.onAttach(context);
+
+    }
+
+    @Override
+    public void onDetach() {
+        super.onDetach();
+
+    }
+
+    private void init() {
+        mHelper = new ProdRecuperoMaterialeHelper(getActivity());
+        mViewmodel.init(getActivity(), mBinding, mHelper, () -> {
+            ((IPoppableActivity) getActivity()).pop();
+        });
+
+        mViewmodel.openLU();
+
+    }
+
+
+    @Override
+    public void onCreateActionBar(AppCompatTextView titleText, Context context) {
+        titleText.setText(context.getText(R.string.prod_recupero_materiale_title_fragment).toString());
+    }
+
+}

app/src/main/java/it/integry/integrywmsnative/gest/prod_recupero_materiale/core/ProdRecuperoMaterialeHelper.java

@@ -0,0 +1,13 @@
+package it.integry.integrywmsnative.gest.prod_recupero_materiale.core;
+
+import android.content.Context;
+
+public class ProdRecuperoMaterialeHelper {
+
+
+    private Context mContext;
+
+    public ProdRecuperoMaterialeHelper(Context context) {
+        this.mContext = context;
+    }
+}

app/src/main/java/it/integry/integrywmsnative/gest/prod_recupero_materiale/viewmodel/ProdRecuperoMaterialeViewModel.java

@@ -0,0 +1,86 @@
+package it.integry.integrywmsnative.gest.prod_recupero_materiale.viewmodel;
+
+import android.app.Activity;
+import android.content.Context;
+import android.text.Html;
+import android.text.SpannableString;
+
+import androidx.databinding.ObservableField;
+
+import it.integry.integrywmsnative.R;
+import it.integry.integrywmsnative.core.barcode_reader.BarcodeManager;
+import it.integry.integrywmsnative.core.interfaces.IPoppableActivity;
+import it.integry.integrywmsnative.core.model.MtbColt;
+import it.integry.integrywmsnative.core.model.secondary.GestioneEnum;
+import it.integry.integrywmsnative.databinding.FragmentProdRecuperoMaterialeBinding;
+import it.integry.integrywmsnative.gest.prod_recupero_materiale.core.ProdRecuperoMaterialeHelper;
+import it.integry.integrywmsnative.view.dialogs.base.DialogSimpleMessageHelper;
+import it.integry.integrywmsnative.view.dialogs.scan_or_create_lu.DialogScanOrCreateLU;
+
+public class ProdRecuperoMaterialeViewModel {
+
+    private Context mContext;
+
+    private FragmentProdRecuperoMaterialeBinding mBinding;
+    private ProdRecuperoMaterialeHelper mHelper;
+    private Runnable mOnRecuperoCompleted;
+
+    public ObservableField<MtbColt> mtbColt = new ObservableField<>();
+
+
+    public void init(Activity context, FragmentProdRecuperoMaterialeBinding binding, ProdRecuperoMaterialeHelper helper, Runnable onRecuperoCompleted) {
+        mContext = context;
+        mBinding = binding;
+        mHelper = helper;
+        mOnRecuperoCompleted = onRecuperoCompleted;
+
+        BarcodeManager.enable();
+    }
+
+    public void openLU() {
+        DialogScanOrCreateLU.make(mContext, true, mtbColt -> {
+            if(mtbColt == null) {
+                ((IPoppableActivity)mContext).pop();
+            } else if((mtbColt.getGestioneEnum() == GestioneEnum.LAVORAZIONE) && mtbColt.getSegno().equals(-1)){
+
+                if(mtbColt.getMtbColr() == null || mtbColt.getMtbColr().size() == 0) {
+                    DialogSimpleMessageHelper.makeWarningDialog(mContext,
+                            new SpannableString(Html.fromHtml("E' stata scansionata una UL già vuota")),
+                            null, this::openLU).show();
+
+                } else {
+                    setMtbColt(mtbColt);
+//                    choosePosition();
+                }
+            } else {
+                DialogSimpleMessageHelper.makeWarningDialog(mContext,
+                        new SpannableString(Html.fromHtml("Sono accettate solamente UL di <b>Lavorazione</b> di <b>SCARICO</b>")),
+                        null, this::openLU).show();
+            }
+        }).show();
+    }
+
+
+
+
+    public void setMtbColt(MtbColt mtbColt) {
+        this.mtbColt.set(mtbColt);
+    }
+
+    public void resetMtbColt() {
+        this.mtbColt.set(null);
+        openLU();
+    }
+
+
+    private void showDataSavedDialog(Runnable onPositiveClick) {
+
+        DialogSimpleMessageHelper.makeSuccessDialog(
+                mContext,
+                mContext.getResources().getString(R.string.completed),
+                new SpannableString(mContext.getResources().getString(R.string.data_saved)),
+                null, onPositiveClick).show();
+
+    }
+
+}

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

@@ -0,0 +1,6 @@
+<vector android:height="24dp" android:viewportHeight="48"
+    android:viewportWidth="48" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#4CAF50" android:pathData="M37,5L11,5L6,12L6,40C6,41.6563 7.3438,43 9,43L39,43C40.6563,43 42,41.6563 42,40L42,12Z"/>
+    <path android:fillColor="#2E7D32" android:pathData="M12.0273,7L8.457,12L18,12C18,15.3125 20.6875,18 24,18C27.3125,18 30,15.3125 30,12L39.543,12L35.9727,7Z"/>
+    <path android:fillColor="#CCFF90" android:pathData="M30.8242,21.7539L22.9336,29.6563L19.1719,25.8984L17,28.0742L22.9375,34L33,23.9258Z"/>
+</vector>

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

@@ -0,0 +1,13 @@
+<vector android:height="24dp" android:viewportHeight="48"
+    android:viewportWidth="48" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#607D8B" android:pathData="M13.1016,33C12.3984,33 11.8984,32.5 11.8008,31.8008L9.1992,9.6992C9,8.1016 7.6992,7 6.1992,7L5,7L5,9L6.1992,9C6.6992,9 7.1016,9.3984 7.1992,9.8984L9.8008,32.1016C10,33.8008 11.3984,35 13.1016,35L24,35L24,33Z"/>
+    <path android:fillColor="#FFC107" android:pathData="M14,31L43,31L43,35L14,35Z"/>
+    <path android:fillColor="#37474F" android:pathData="M41,38C41,39.6563 39.6563,41 38,41C36.3438,41 35,39.6563 35,38C35,36.3438 36.3438,35 38,35C39.6563,35 41,36.3438 41,38Z"/>
+    <path android:fillColor="#37474F" android:pathData="M22,38C22,39.6563 20.6563,41 19,41C17.3438,41 16,39.6563 16,38C16,36.3438 17.3438,35 19,35C20.6563,35 22,36.3438 22,38Z"/>
+    <path android:fillColor="#607D8B" android:pathData="M39,38C39,38.5508 38.5508,39 38,39C37.4492,39 37,38.5508 37,38C37,37.4492 37.4492,37 38,37C38.5508,37 39,37.4492 39,38Z"/>
+    <path android:fillColor="#607D8B" android:pathData="M20,38C20,38.5508 19.5508,39 19,39C18.4492,39 18,38.5508 18,38C18,37.4492 18.4492,37 19,37C19.5508,37 20,37.4492 20,38Z"/>
+    <path android:fillColor="#FF9800" android:pathData="M38,31L18,31C16.8984,31 16,30.1016 16,29L16,9C16,7.8984 16.8984,7 18,7L38,7C39.1016,7 40,7.8984 40,9L40,29C40,30.1016 39.1016,31 38,31Z"/>
+    <path android:fillColor="#8A5100" android:pathData="M30,11L26,11C25.3984,11 25,10.6016 25,10C25,9.3984 25.3984,9 26,9L30,9C30.6016,9 31,9.3984 31,10C31,10.6016 30.6016,11 30,11Z"/>
+    <path android:fillColor="#8A5100" android:pathData="M30,24L26,24C25.3984,24 25,23.6016 25,23C25,22.3984 25.3984,22 26,22L30,22C30.6016,22 31,22.3984 31,23C31,23.6016 30.6016,24 30,24Z"/>
+    <path android:fillColor="#C77600" android:pathData="M16,18L40,18L40,20L16,20Z"/>
+</vector>

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

@@ -0,0 +1,16 @@
+<vector android:height="24dp" android:viewportHeight="512"
+    android:viewportWidth="512" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#BF360C" android:pathData="M439.5,53.3h-77.9l-20.3,405.3h117.3L439.5,53.3z"/>
+    <path android:fillColor="#E64A19" android:pathData="M352,245.3h-42.7v-64l-128,64v-64l-128,64v213.3H352V245.3z"/>
+    <path android:fillColor="#FFC107" android:pathData="M96,288h42.7v42.7H96V288z"/>
+    <path android:fillColor="#FFC107" android:pathData="M181.3,288H224v42.7h-42.7V288z"/>
+    <path android:fillColor="#FFC107" android:pathData="M266.7,288h42.7v42.7h-42.7V288z"/>
+    <path android:fillColor="#FFC107" android:pathData="M96,373.3h42.7V416H96V373.3z"/>
+    <path android:fillColor="#FFC107" android:pathData="M181.3,373.3H224V416h-42.7V373.3z"/>
+    <path android:fillColor="#FFC107" android:pathData="M266.7,373.3h42.7V416h-42.7V373.3z"/>
+    <path android:fillColor="#00BCD4" android:pathData="M379.4,204.3v-57.6"/>
+    <path android:fillColor="#00BCD4" android:pathData="M379.4,146.7"/>
+    <path android:fillColor="#00BCD4"
+        android:pathData="M379.4,204.3c-64.9,0 -117.8,54.9 -117.8,122.5h-55.4c0,-99.3 77.7,-180.1 173.2,-180.1c0,0 0,-50.4 0,-50.4l97,79.3l-97,79.3V204.3L379.4,204.3"
+        android:strokeColor="#FFFFFF" android:strokeWidth="10"/>
+</vector>

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

@@ -0,0 +1,16 @@
+<vector android:height="24dp" android:viewportHeight="512"
+    android:viewportWidth="512" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#BF360C" android:pathData="M439.5,53.3h-77.9l-20.3,405.3h117.3L439.5,53.3z"/>
+    <path android:fillColor="#E64A19" android:pathData="M352,245.3h-42.7v-64l-128,64v-64l-128,64v213.3H352V245.3z"/>
+    <path android:fillColor="#FFC107" android:pathData="M96,288h42.7v42.7H96V288z"/>
+    <path android:fillColor="#FFC107" android:pathData="M181.3,288H224v42.7h-42.7V288z"/>
+    <path android:fillColor="#FFC107" android:pathData="M266.7,288h42.7v42.7h-42.7V288z"/>
+    <path android:fillColor="#FFC107" android:pathData="M96,373.3h42.7V416H96V373.3z"/>
+    <path android:fillColor="#FFC107" android:pathData="M181.3,373.3H224V416h-42.7V373.3z"/>
+    <path android:fillColor="#FFC107" android:pathData="M266.7,373.3h42.7V416h-42.7V373.3z"/>
+    <path android:fillColor="#00BCD4" android:pathData="M224.5,254.6h57.6"/>
+    <path android:fillColor="#00BCD4" android:pathData="M282.2,254.6"/>
+    <path android:fillColor="#6DBE45"
+        android:pathData="M224.5,254.6c0,-64.9 -54.9,-117.8 -122.5,-117.8V81.4c99.3,0 180.1,77.7 180.1,173.2c0,0 50.4,0 50.4,0l-79.3,97l-79.3,-97H224.5L224.5,254.6"
+        android:strokeColor="#FFFFFF" android:strokeWidth="10"/>
+</vector>

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

@@ -0,0 +1,11 @@
+<vector android:height="24dp" android:viewportHeight="48"
+    android:viewportWidth="48" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#FF9800" android:pathData="M6,43L42,43L42,16L24,9L6,16Z"/>
+    <path android:fillColor="#D47E00" android:pathData="M23,9L25,9L25,43L23,43Z"/>
+    <path android:fillColor="#D47E00" android:pathData="M6,26L42,26L42,28L6,28Z"/>
+    <path android:fillColor="#8A5100" android:pathData="M17,32L13,32C12.3984,32 12,31.6016 12,31C12,30.3984 12.3984,30 13,30L17,30C17.6016,30 18,30.3984 18,31C18,31.6016 17.6016,32 17,32Z"/>
+    <path android:fillColor="#8A5100" android:pathData="M35,32L31,32C30.3984,32 30,31.6016 30,31C30,30.3984 30.3984,30 31,30L35,30C35.6016,30 36,30.3984 36,31C36,31.6016 35.6016,32 35,32Z"/>
+    <path android:fillColor="#8A5100" android:pathData="M17,16L13,16C12.3984,16 12,15.6016 12,15C12,14.3984 12.3984,14 13,14L17,14C17.6016,14 18,14.3984 18,15C18,15.6016 17.6016,16 17,16Z"/>
+    <path android:fillColor="#8A5100" android:pathData="M35,16L31,16C30.3984,16 30,15.6016 30,15C30,14.3984 30.3984,14 31,14L35,14C35.6016,14 36,14.3984 36,15C36,15.6016 35.6016,16 35,16Z"/>
+    <path android:fillColor="#F44336" android:pathData="M24,7L6,14L6,18L24,11L42,18L42,14Z"/>
+</vector>

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

@@ -0,0 +1,8 @@
+<vector android:height="24dp" android:viewportHeight="48"
+    android:viewportWidth="48" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#455A64" android:pathData="M36,4L26,4C26,5.1016 25.1016,6 24,6C22.8984,6 22,5.1016 22,4L12,4C9.8008,4 8,5.8008 8,8L8,40C8,42.1992 9.8008,44 12,44L36,44C38.1992,44 40,42.1992 40,40L40,8C40,5.8008 38.1992,4 36,4Z"/>
+    <path android:fillColor="#FFFFFF" android:pathData="M36,41L12,41C11.3984,41 11,40.6016 11,40L11,8C11,7.3984 11.3984,7 12,7L36,7C36.6016,7 37,7.3984 37,8L37,40C37,40.6016 36.6016,41 36,41Z"/>
+    <path android:fillColor="#90A4AE" android:pathData="M26,4C26,5.1016 25.1016,6 24,6C22.8984,6 22,5.1016 22,4L15,4L15,8C15,9.1016 15.8984,10 17,10L31,10C32.1016,10 33,9.1016 33,8L33,4Z"/>
+    <path android:fillColor="#90A4AE" android:pathData="M24,0C21.8008,0 20,1.8008 20,4C20,6.1992 21.8008,8 24,8C26.1992,8 28,6.1992 28,4C28,1.8008 26.1992,0 24,0ZM24,6C22.8984,6 22,5.1016 22,4C22,2.8984 22.8984,2 24,2C25.1016,2 26,2.8984 26,4C26,5.1016 25.1016,6 24,6Z"/>
+    <path android:fillColor="#4CAF50" android:pathData="M30.6016,18.6016L21.6016,27.6016L17.3984,23.3008L14.8984,25.8008L21.6992,32.5L33.1016,21.1016Z"/>
+</vector>

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

@@ -0,0 +1,8 @@
+<vector android:height="24dp" android:viewportHeight="48"
+    android:viewportWidth="48" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#D1C4E9" android:pathData="M38,7L10,7C8.8984,7 8,7.8984 8,9L8,15C8,16.1016 8.8984,17 10,17L38,17C39.1016,17 40,16.1016 40,15L40,9C40,7.8984 39.1016,7 38,7Z"/>
+    <path android:fillColor="#D1C4E9" android:pathData="M38,19L10,19C8.8984,19 8,19.8984 8,21L8,27C8,28.1016 8.8984,29 10,29L38,29C39.1016,29 40,28.1016 40,27L40,21C40,19.8984 39.1016,19 38,19Z"/>
+    <path android:fillColor="#D1C4E9" android:pathData="M38,31L10,31C8.8984,31 8,31.8984 8,33L8,39C8,40.1016 8.8984,41 10,41L38,41C39.1016,41 40,40.1016 40,39L40,33C40,31.8984 39.1016,31 38,31Z"/>
+    <path android:fillColor="#43A047" android:pathData="M48,38C48,43.5234 43.5234,48 38,48C32.4766,48 28,43.5234 28,38C28,32.4766 32.4766,28 38,28C43.5234,28 48,32.4766 48,38Z"/>
+    <path android:fillColor="#DCEDC8" android:pathData="M42.5,33.3008L36.8008,39L34.1016,36.3008L32,38.5L36.8008,43.3008L44.6016,35.5Z"/>
+</vector>

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

@@ -207,206 +207,227 @@
                             app:layout_constraintTop_toTopOf="parent"
                             android:text="@string/general" />
 
-                        <com.google.android.material.card.MaterialCardView
+                        <RelativeLayout
                             android:id="@+id/fast_button_accettazione"
-                            style="@style/Widget.MaterialComponents.CardView"
                             android:layout_width="0dp"
                             android:layout_height="wrap_content"
-                            android:layout_margin="8dp"
                             app:layout_constraintTop_toBottomOf="@id/general_dashboard_group_title"
                             app:layout_constraintStart_toStartOf="parent"
-                            app:layout_constraintEnd_toStartOf="@id/guide_1"
-                            app:cardBackgroundColor="@android:color/white"
-                            app:cardCornerRadius="4dp">
+                            app:layout_constraintEnd_toStartOf="@id/guide_1">
 
-
-                            <LinearLayout
+                            <com.google.android.material.card.MaterialCardView
+                                style="@style/Widget.MaterialComponents.CardView"
                                 android:layout_width="match_parent"
                                 android:layout_height="wrap_content"
-                                android:gravity="center_horizontal"
-                                android:orientation="vertical"
-                                android:padding="8dp">
+                                android:layout_margin="8dp"
+                                app:cardBackgroundColor="@android:color/white"
+                                app:cardCornerRadius="4dp">
 
-                                <ImageView
-                                    android:layout_width="64sp"
+
+                                <LinearLayout
+                                    android:layout_width="match_parent"
                                     android:layout_height="wrap_content"
-                                    android:adjustViewBounds="true"
-                                    android:src="@drawable/ic_accettazione_96" />
+                                    android:gravity="center_horizontal"
+                                    android:orientation="vertical"
+                                    android:padding="8dp">
 
-                                <androidx.appcompat.widget.AppCompatTextView
-                                    android:layout_width="wrap_content"
-                                    android:layout_height="wrap_content"
-                                    android:layout_marginTop="16dp"
-                                    android:text="@string/accettazione_title_fragment"
-                                    android:textAllCaps="true"
-                                    android:textColor="@color/grey_700"
-                                    android:textStyle="bold" />
+                                    <ImageView
+                                        android:layout_width="64sp"
+                                        android:layout_height="wrap_content"
+                                        android:adjustViewBounds="true"
+                                        android:src="@drawable/ic_dashboard_accettazione" />
 
-                            </LinearLayout>
-                        </com.google.android.material.card.MaterialCardView>
+                                    <androidx.appcompat.widget.AppCompatTextView
+                                        android:layout_width="wrap_content"
+                                        android:layout_height="wrap_content"
+                                        android:layout_marginTop="16dp"
+                                        android:text="@string/accettazione_title_fragment"
+                                        android:textAllCaps="true"
+                                        android:textColor="@color/grey_700"
+                                        android:textStyle="bold" />
 
+                                </LinearLayout>
+                            </com.google.android.material.card.MaterialCardView>
+                        </RelativeLayout>
 
-                        <com.google.android.material.card.MaterialCardView
+                        <RelativeLayout
                             android:id="@+id/fast_button_spedizione"
-                            style="@style/Widget.MaterialComponents.CardView"
                             android:layout_width="0dp"
                             android:layout_height="wrap_content"
-                            android:layout_margin="8dp"
                             app:layout_constraintTop_toBottomOf="@id/general_dashboard_group_title"
                             app:layout_constraintStart_toEndOf="@id/guide_1"
-                            app:layout_constraintEnd_toEndOf="parent"
-                            app:cardBackgroundColor="@android:color/white"
-                            app:cardCornerRadius="4dp">
+                            app:layout_constraintEnd_toEndOf="parent">
 
-
-                            <LinearLayout
+                            <com.google.android.material.card.MaterialCardView
+                                style="@style/Widget.MaterialComponents.CardView"
                                 android:layout_width="match_parent"
                                 android:layout_height="wrap_content"
-                                android:gravity="center_horizontal"
-                                android:orientation="vertical"
-                                android:padding="8dp">
+                                android:layout_margin="8dp"
+                                app:cardBackgroundColor="@android:color/white"
+                                app:cardCornerRadius="4dp">
 
-                                <ImageView
-                                    android:layout_width="64sp"
+
+                                <LinearLayout
+                                    android:layout_width="match_parent"
                                     android:layout_height="wrap_content"
-                                    android:adjustViewBounds="true"
-                                    android:src="@drawable/ic_spedizione_96" />
+                                    android:gravity="center_horizontal"
+                                    android:orientation="vertical"
+                                    android:padding="8dp">
 
-                                <androidx.appcompat.widget.AppCompatTextView
-                                    android:layout_width="wrap_content"
-                                    android:layout_height="wrap_content"
-                                    android:layout_marginTop="16dp"
-                                    android:text="@string/vendita_title_fragment"
-                                    android:textAllCaps="true"
-                                    android:textColor="@color/grey_700"
-                                    android:textStyle="bold" />
+                                    <ImageView
+                                        android:layout_width="64sp"
+                                        android:layout_height="wrap_content"
+                                        android:adjustViewBounds="true"
+                                        android:src="@drawable/ic_dashboard_spedizione" />
 
-                            </LinearLayout>
-                        </com.google.android.material.card.MaterialCardView>
+                                    <androidx.appcompat.widget.AppCompatTextView
+                                        android:layout_width="wrap_content"
+                                        android:layout_height="wrap_content"
+                                        android:layout_marginTop="16dp"
+                                        android:text="@string/vendita_title_fragment"
+                                        android:textAllCaps="true"
+                                        android:textColor="@color/grey_700"
+                                        android:textStyle="bold" />
 
+                                </LinearLayout>
+                            </com.google.android.material.card.MaterialCardView>
+                        </RelativeLayout>
 
-                        <com.google.android.material.card.MaterialCardView
+                        <RelativeLayout
                             android:id="@+id/fast_button_rettifica_giacenze"
-                            style="@style/Widget.MaterialComponents.CardView"
                             android:layout_width="0dp"
                             android:layout_height="wrap_content"
-                            android:layout_margin="8dp"
                             app:layout_constraintTop_toBottomOf="@id/fast_button_accettazione"
                             app:layout_constraintStart_toStartOf="parent"
-                            app:layout_constraintEnd_toStartOf="@id/guide_1"
-                            app:cardBackgroundColor="@android:color/white"
-                            app:cardCornerRadius="4dp">
+                            app:layout_constraintEnd_toStartOf="@id/guide_1">
 
-
-                            <LinearLayout
+                            <com.google.android.material.card.MaterialCardView
+                                style="@style/Widget.MaterialComponents.CardView"
                                 android:layout_width="match_parent"
                                 android:layout_height="wrap_content"
-                                android:gravity="center_horizontal"
-                                android:orientation="vertical"
-                                android:padding="8dp">
+                                android:layout_margin="8dp"
+                                app:cardBackgroundColor="@android:color/white"
+                                app:cardCornerRadius="4dp">
 
-                                <ImageView
-                                    android:layout_width="64sp"
-                                    android:layout_height="wrap_content"
-                                    android:adjustViewBounds="true"
-                                    android:src="@drawable/ic_rettifica_giacenze_96" />
 
-                                <androidx.appcompat.widget.AppCompatTextView
-                                    android:layout_width="wrap_content"
+                                <LinearLayout
+                                    android:layout_width="match_parent"
                                     android:layout_height="wrap_content"
-                                    android:layout_marginTop="16dp"
                                     android:gravity="center_horizontal"
-                                    android:text="@string/rettifica_giacenze_fragment_title"
-                                    android:textAllCaps="true"
-                                    android:textColor="@color/grey_700"
-                                    android:textStyle="bold" />
+                                    android:orientation="vertical"
+                                    android:padding="8dp">
 
-                            </LinearLayout>
-                        </com.google.android.material.card.MaterialCardView>
+                                    <ImageView
+                                        android:layout_width="64sp"
+                                        android:layout_height="wrap_content"
+                                        android:adjustViewBounds="true"
+                                        android:src="@drawable/ic_dashboard_rettifica_giacenze" />
 
+                                    <androidx.appcompat.widget.AppCompatTextView
+                                        android:layout_width="wrap_content"
+                                        android:layout_height="wrap_content"
+                                        android:layout_marginTop="16dp"
+                                        android:gravity="center_horizontal"
+                                        android:text="@string/rettifica_giacenze_fragment_title"
+                                        android:textAllCaps="true"
+                                        android:textColor="@color/grey_700"
+                                        android:textStyle="bold" />
 
-                        <com.google.android.material.card.MaterialCardView
+                                </LinearLayout>
+                            </com.google.android.material.card.MaterialCardView>
+                        </RelativeLayout>
+
+                        <RelativeLayout
                             android:id="@+id/fast_button_versamento"
-                            style="@style/Widget.MaterialComponents.CardView"
                             android:layout_width="0dp"
                             android:layout_height="wrap_content"
-                            android:layout_margin="8dp"
                             app:layout_constraintTop_toBottomOf="@id/fast_button_spedizione"
                             app:layout_constraintStart_toEndOf="@id/guide_1"
-                            app:layout_constraintEnd_toEndOf="parent"
-                            app:cardBackgroundColor="@android:color/white"
-                            app:cardCornerRadius="4dp">
+                            app:layout_constraintEnd_toEndOf="parent">
 
-
-                            <LinearLayout
+                            <com.google.android.material.card.MaterialCardView
+                                style="@style/Widget.MaterialComponents.CardView"
                                 android:layout_width="match_parent"
                                 android:layout_height="wrap_content"
-                                android:gravity="center_horizontal"
-                                android:orientation="vertical"
-                                android:padding="8dp">
+                                android:layout_margin="8dp"
+                                app:cardBackgroundColor="@android:color/white"
+                                app:cardCornerRadius="4dp">
 
-                                <ImageView
-                                    android:layout_width="64sp"
+
+                                <LinearLayout
+                                    android:layout_width="match_parent"
                                     android:layout_height="wrap_content"
-                                    android:adjustViewBounds="true"
-                                    android:src="@drawable/ic_versamento_merce_96" />
-
-
-                                <androidx.appcompat.widget.AppCompatTextView
-                                    android:layout_width="wrap_content"
-                                    android:layout_height="wrap_content"
-                                    android:layout_marginTop="16dp"
                                     android:gravity="center_horizontal"
-                                    android:text="@string/versamento_merce_fragment_title"
-                                    android:textAllCaps="true"
-                                    android:textColor="@color/grey_700"
-                                    android:textStyle="bold" />
+                                    android:orientation="vertical"
+                                    android:padding="8dp">
 
-                            </LinearLayout>
-                        </com.google.android.material.card.MaterialCardView>
+                                    <ImageView
+                                        android:layout_width="64sp"
+                                        android:layout_height="wrap_content"
+                                        android:adjustViewBounds="true"
+                                        android:src="@drawable/ic_dashboard_versamento_merce" />
 
 
-                        <com.google.android.material.card.MaterialCardView
+                                    <androidx.appcompat.widget.AppCompatTextView
+                                        android:layout_width="wrap_content"
+                                        android:layout_height="wrap_content"
+                                        android:layout_marginTop="16dp"
+                                        android:gravity="center_horizontal"
+                                        android:text="@string/versamento_merce_fragment_title"
+                                        android:textAllCaps="true"
+                                        android:textColor="@color/grey_700"
+                                        android:textStyle="bold" />
+
+                                </LinearLayout>
+                            </com.google.android.material.card.MaterialCardView>
+
+                        </RelativeLayout>
+
+                        <RelativeLayout
                             android:id="@+id/fast_button_picking_libero"
-                            style="@style/Widget.MaterialComponents.CardView"
                             android:layout_width="0dp"
                             android:layout_height="wrap_content"
-                            android:layout_margin="8dp"
                             app:layout_constraintTop_toBottomOf="@id/fast_button_rettifica_giacenze"
                             app:layout_constraintStart_toStartOf="parent"
-                            app:layout_constraintEnd_toStartOf="@id/guide_1"
-                            app:cardBackgroundColor="@android:color/white"
-                            app:cardCornerRadius="4dp">
+                            app:layout_constraintEnd_toStartOf="@id/guide_1">
 
-
-                            <LinearLayout
+                            <com.google.android.material.card.MaterialCardView
+                                style="@style/Widget.MaterialComponents.CardView"
                                 android:layout_width="match_parent"
                                 android:layout_height="wrap_content"
-                                android:gravity="center_horizontal"
-                                android:orientation="vertical"
-                                android:padding="8dp">
+                                android:layout_margin="8dp"
+                                app:cardBackgroundColor="@android:color/white"
+                                app:cardCornerRadius="4dp">
 
-                                <ImageView
-                                    android:layout_width="64sp"
+
+                                <LinearLayout
+                                    android:layout_width="match_parent"
                                     android:layout_height="wrap_content"
-                                    android:adjustViewBounds="true"
-                                    android:src="@drawable/ic_picking_libero_96" />
-
-
-                                <androidx.appcompat.widget.AppCompatTextView
-                                    android:layout_width="wrap_content"
-                                    android:layout_height="wrap_content"
-                                    android:layout_marginTop="16dp"
                                     android:gravity="center_horizontal"
-                                    android:text="@string/free_picking"
-                                    android:textAllCaps="true"
-                                    android:textColor="@color/grey_700"
-                                    android:textStyle="bold" />
+                                    android:orientation="vertical"
+                                    android:padding="8dp">
 
-                            </LinearLayout>
-                        </com.google.android.material.card.MaterialCardView>
+                                    <ImageView
+                                        android:layout_width="64sp"
+                                        android:layout_height="wrap_content"
+                                        android:adjustViewBounds="true"
+                                        android:src="@drawable/ic_dashboard_picking_libero" />
 
 
+                                    <androidx.appcompat.widget.AppCompatTextView
+                                        android:layout_width="wrap_content"
+                                        android:layout_height="wrap_content"
+                                        android:layout_marginTop="16dp"
+                                        android:gravity="center_horizontal"
+                                        android:text="@string/free_picking"
+                                        android:textAllCaps="true"
+                                        android:textColor="@color/grey_700"
+                                        android:textStyle="bold" />
+
+                                </LinearLayout>
+                            </com.google.android.material.card.MaterialCardView>
+                        </RelativeLayout>
+
                         <!--<com.google.android.material.card.MaterialCardView-->
                             <!--android:id="@+id/fast_button_resi_clienti"-->
                             <!--style="@style/Widget.MaterialComponents.CardView"-->
@@ -449,7 +470,6 @@
 
 
 
-
                     </androidx.constraintlayout.widget.ConstraintLayout>
 
 
@@ -474,85 +494,96 @@
                             app:layout_constraintTop_toTopOf="parent"
                             android:text="@string/production" />
 
-                        <com.google.android.material.card.MaterialCardView
+
+                        <RelativeLayout
                             android:id="@+id/fast_button_prod_versamento_materiale"
-                            style="@style/Widget.MaterialComponents.CardView"
                             android:layout_width="0dp"
                             android:layout_height="wrap_content"
-                            android:layout_margin="8dp"
                             app:layout_constraintTop_toBottomOf="@id/prod_dashboard_group_title"
                             app:layout_constraintStart_toStartOf="parent"
-                            app:layout_constraintEnd_toStartOf="@id/guide_2"
-                            app:cardBackgroundColor="@android:color/white"
-                            app:cardCornerRadius="4dp">
+                            app:layout_constraintEnd_toStartOf="@id/guide_2">
 
-
-                            <LinearLayout
+                            <com.google.android.material.card.MaterialCardView
+                                style="@style/Widget.MaterialComponents.CardView"
                                 android:layout_width="match_parent"
                                 android:layout_height="wrap_content"
-                                android:gravity="center_horizontal"
-                                android:orientation="vertical"
-                                android:padding="8dp">
+                                android:layout_margin="8dp"
+                                app:cardBackgroundColor="@android:color/white"
+                                app:cardCornerRadius="4dp">
 
-                                <ImageView
-                                    android:layout_width="64sp"
-                                    android:layout_height="wrap_content"
-                                    android:adjustViewBounds="true"
-                                    android:src="@drawable/ic_prod_versamento_materiale" />
 
-                                <androidx.appcompat.widget.AppCompatTextView
-                                    android:layout_width="wrap_content"
+                                <LinearLayout
+                                    android:layout_width="match_parent"
                                     android:layout_height="wrap_content"
-                                    android:layout_marginTop="16dp"
                                     android:gravity="center_horizontal"
-                                    android:text="@string/prod_versamento_materiale_title_fragment"
-                                    android:textAllCaps="true"
-                                    android:textColor="@color/grey_700"
-                                    android:textStyle="bold" />
+                                    android:orientation="vertical"
+                                    android:padding="8dp">
 
-                            </LinearLayout>
-                        </com.google.android.material.card.MaterialCardView>
+                                    <ImageView
+                                        android:layout_width="64sp"
+                                        android:layout_height="wrap_content"
+                                        android:adjustViewBounds="true"
+                                        android:src="@drawable/ic_dashboard_prod_versamento_materiale" />
+
+                                    <androidx.appcompat.widget.AppCompatTextView
+                                        android:layout_width="wrap_content"
+                                        android:layout_height="wrap_content"
+                                        android:layout_marginTop="16dp"
+                                        android:gravity="center_horizontal"
+                                        android:text="@string/prod_versamento_materiale_title_fragment"
+                                        android:textAllCaps="true"
+                                        android:textColor="@color/grey_700"
+                                        android:textStyle="bold" />
+
+                                </LinearLayout>
+                            </com.google.android.material.card.MaterialCardView>
+                        </RelativeLayout>
 
 
-                        <!--<com.google.android.material.card.MaterialCardView-->
+                        <!--<RelativeLayout-->
                             <!--android:id="@+id/fast_button_prod_recupero_materiale"-->
-                            <!--style="@style/Widget.MaterialComponents.CardView"-->
                             <!--android:layout_width="0dp"-->
                             <!--android:layout_height="wrap_content"-->
-                            <!--android:layout_margin="8dp"-->
-                            <!--app:layout_constraintTop_toTopOf="parent"-->
+                            <!--app:layout_constraintTop_toBottomOf="@id/prod_dashboard_group_title"-->
                             <!--app:layout_constraintStart_toEndOf="@id/guide_2"-->
-                            <!--app:layout_constraintEnd_toEndOf="parent"-->
-                            <!--app:cardBackgroundColor="@android:color/white"-->
-                            <!--app:cardCornerRadius="4dp">-->
+                            <!--app:layout_constraintEnd_toEndOf="parent">-->
 
-
-                            <!--<LinearLayout-->
+                            <!--<com.google.android.material.card.MaterialCardView-->
+                                <!--style="@style/Widget.MaterialComponents.CardView"-->
                                 <!--android:layout_width="match_parent"-->
                                 <!--android:layout_height="wrap_content"-->
-                                <!--android:gravity="center_horizontal"-->
-                                <!--android:orientation="vertical"-->
-                                <!--android:padding="8dp">-->
+                                <!--android:layout_margin="8dp"-->
+                                <!--app:cardBackgroundColor="@android:color/white"-->
+                                <!--app:cardCornerRadius="4dp">-->
 
-                                <!--<ImageView-->
-                                    <!--android:layout_width="64sp"-->
+
+                                <!--<LinearLayout-->
+                                    <!--android:layout_width="match_parent"-->
                                     <!--android:layout_height="wrap_content"-->
-                                    <!--android:adjustViewBounds="true"-->
-                                    <!--android:src="@drawable/ic_spedizione_96" />-->
+                                    <!--android:gravity="center_horizontal"-->
+                                    <!--android:orientation="vertical"-->
+                                    <!--android:padding="8dp">-->
 
-                                <!--<androidx.appcompat.widget.AppCompatTextView-->
-                                    <!--android:layout_width="wrap_content"-->
-                                    <!--android:layout_height="wrap_content"-->
-                                    <!--android:layout_marginTop="16dp"-->
-                                    <!--android:text="@string/vendita_title_fragment"-->
-                                    <!--android:textAllCaps="true"-->
-                                    <!--android:textColor="@color/grey_700"-->
-                                    <!--android:textStyle="bold" />-->
+                                    <!--<ImageView-->
+                                        <!--android:layout_width="64sp"-->
+                                        <!--android:layout_height="wrap_content"-->
+                                        <!--android:adjustViewBounds="true"-->
+                                        <!--android:src="@drawable/ic_dashboard_prod_recupero_materiale" />-->
 
-                            <!--</LinearLayout>-->
-                        <!--</com.google.android.material.card.MaterialCardView>-->
+                                    <!--<androidx.appcompat.widget.AppCompatTextView-->
+                                        <!--android:layout_width="wrap_content"-->
+                                        <!--android:layout_height="wrap_content"-->
+                                        <!--android:layout_marginTop="16dp"-->
+                                        <!--android:gravity="center_horizontal"-->
+                                        <!--android:text="@string/prod_recupero_materiale_title_fragment"-->
+                                        <!--android:textAllCaps="true"-->
+                                        <!--android:textColor="@color/grey_700"-->
+                                        <!--android:textStyle="bold" />-->
 
+                                <!--</LinearLayout>-->
+                            <!--</com.google.android.material.card.MaterialCardView>-->
 
+                        <!--</RelativeLayout>-->
 
 
 

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

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:tools="http://schemas.android.com/tools"
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:fab="http://schemas.android.com/apk/res-auto">
+    <data>
+
+    </data>
+    <FrameLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        tools:context=".gest.prod_recupero_materiale.ProdRecuperoMaterialeFragment">
+
+
+    </FrameLayout>
+
+</layout>

app/src/main/res/menu/activity_main_drawer.xml

@@ -40,10 +40,10 @@
                     android:id="@+id/nav_prod_versamento_materiale"
                     android:icon="@drawable/ic_settings_24dp"
                     android:title="@string/prod_versamento_materiale_title_fragment" />
-                <!--<item-->
-                    <!--android:id="@+id/nav_prod_recupera_materiale"-->
-                    <!--android:icon="@drawable/ic_logout_24dp"-->
-                    <!--android:title="Logout" />-->
+                <item
+                    android:id="@+id/nav_prod_recupero_materiale"
+                    android:icon="@drawable/ic_settings_24dp"
+                    android:title="@string/prod_recupero_materiale_title_fragment" />
             </menu>
         </item>
     </group>

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

@@ -205,4 +205,5 @@
     <string name="general">Generale</string>
     <string name="production">Produzione</string>
     <string name="prod_versamento_materiale_title_fragment">Versamento materiale</string>
+    <string name="prod_recupero_materiale_title_fragment">Recupero materiale</string>
 </resources>

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

@@ -208,7 +208,8 @@
 
     <string name="general">General</string>
     <string name="production">Production</string>
-    <string name="prod_versamento_materiale_title_fragment">Deposit material</string>
+    <string name="prod_versamento_materiale_title_fragment">Deposit raw material</string>
+    <string name="prod_recupero_materiale_title_fragment">Recover raw material</string>
 
 
 </resources>