From a0f2dfc4a6a56b377eb8dc81df0db5cc7837248f Mon Sep 17 00:00:00 2001
From: GiuseppeS <g.scorrano@integry.it>
Date: Tue, 22 Oct 2019 19:22:25 +0200
Subject: [PATCH] Creato menu drawer dinamico

---
 .idea/assetWizardSettings.xml                 |   4 +-
 .idea/caches/build_file_checksums.ser         | Bin 1020 -> 1020 bytes
 .idea/runConfigurations/app.xml               |   2 +-
 .../integrywmsnative/MainActivity.java        | 165 +++++++++---------
 .../configs/BaseMenuConfiguration.java        |  41 ++++-
 .../configs/MenuConfiguration.java            |  59 +++++--
 .../gest/main/MainFragment.java               |   8 +-
 .../drawable/ic_latest_delivery_customer.xml  |  45 +++++
 app/src/main/res/layout/activity_main.xml     |   3 +-
 .../main/res/menu/activity_main_drawer.xml    | 132 +++++++-------
 app/src/main/res/values-it/strings.xml        |   3 +
 app/src/main/res/values/config.xml            |  22 +++
 app/src/main/res/values/strings.xml           |   3 +
 dynamic_frudis/build.gradle                   |   2 +
 .../extensions/MenuConfigurationFRUDIS.java   |  63 ++++---
 dynamic_ime/build.gradle                      |   2 +
 .../extensions/MenuConfigurationIME.java      |  49 +++++-
 dynamic_vgalimenti/build.gradle               |   2 +
 .../extensions/MenuConfigurationVG.java       |  56 ++++--
 .../ICONS/icons8-deliver-food-reverse.svg     |  35 ++++
 20 files changed, 477 insertions(+), 219 deletions(-)
 create mode 100644 app/src/main/res/drawable/ic_latest_delivery_customer.xml
 create mode 100644 ext_sources/ICONS/icons8-deliver-food-reverse.svg

diff --git a/.idea/assetWizardSettings.xml b/.idea/assetWizardSettings.xml
index d168708f..96beb22f 100644
--- a/.idea/assetWizardSettings.xml
+++ b/.idea/assetWizardSettings.xml
@@ -147,8 +147,8 @@
                         <option name="values">
                           <map>
                             <entry key="assetSourceType" value="FILE" />
-                            <entry key="outputName" value="ic_black_latest_delivery" />
-                            <entry key="sourceFile" value="C:\Users\GiuseppeS\Desktop\icons8-deliver-food (1).svg" />
+                            <entry key="outputName" value="ic_icons8_deliver_food_reverse" />
+                            <entry key="sourceFile" value="C:\Work\Prod_Android\WMS_Native\ext_sources\ICONS\icons8-deliver-food-reverse.svg" />
                           </map>
                         </option>
                       </PersistentState>
diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser
index 5977300c102e549ec542eac34e668c4b43412ca1..be64c81a36738f38295ed2e67b071c7e7a3785f2 100644
GIT binary patch
delta 75
zcmV-R0JQ)72mA++m<04G4TZ6s-U1MybEFc;INPgK+WAJz5SZ4JiUTYVryS;`Yf7a`
h2Z_QQpM`=$lg0xj5g&BSk$0uk4!zh}J#SD`ka#;sB98z7

delta 75
zcmV-R0JQ)72mA++m;~+mCy23}-U1M+qFoaRxo?l1(op3u7f(c!iUTYVcqr2hFIUPk
h%UasNMOU-Slg0xj5%9H0XQt|5?XJ@d65Vz(Ie02nBFz8*

diff --git a/.idea/runConfigurations/app.xml b/.idea/runConfigurations/app.xml
index bf2ef1a7..fc9d4646 100644
--- a/.idea/runConfigurations/app.xml
+++ b/.idea/runConfigurations/app.xml
@@ -6,7 +6,7 @@
     <option name="DEPLOY_AS_INSTANT" value="false" />
     <option name="ARTIFACT_NAME" value="" />
     <option name="PM_INSTALL_OPTIONS" value="" />
-    <option name="DYNAMIC_FEATURES_DISABLED_LIST" value="dynamic_frudis,dynamic_ime,dynamic_vgalimenti" />
+    <option name="DYNAMIC_FEATURES_DISABLED_LIST" value="dynamic__base,dynamic_ime,dynamic_vgalimenti" />
     <option name="ACTIVITY_EXTRA_FLAGS" value="" />
     <option name="MODE" value="default_activity" />
     <option name="CLEAR_LOGCAT" value="true" />
diff --git a/app/src/main/java/it/integry/integrywmsnative/MainActivity.java b/app/src/main/java/it/integry/integrywmsnative/MainActivity.java
index d964b525..3240bfd2 100644
--- a/app/src/main/java/it/integry/integrywmsnative/MainActivity.java
+++ b/app/src/main/java/it/integry/integrywmsnative/MainActivity.java
@@ -18,10 +18,19 @@ import androidx.appcompat.widget.SearchView;
 import android.view.LayoutInflater;
 import android.view.Menu;
 import android.view.MenuItem;
+import android.view.SubMenu;
 import android.view.View;
 
 import androidx.fragment.app.FragmentTransaction;
+import androidx.recyclerview.widget.GridLayoutManager;
 
+import java.util.List;
+
+import it.integry.integrywmsnative.core.class_router.BaseCustomConfiguration;
+import it.integry.integrywmsnative.core.class_router.ClassRouter;
+import it.integry.integrywmsnative.core.class_router.configs.BaseMenuConfiguration;
+import it.integry.integrywmsnative.core.class_router.configs.MenuConfiguration;
+import it.integry.integrywmsnative.core.class_router.interfaces.ICustomConfiguration;
 import it.integry.integrywmsnative.core.rest.watcher.ServerStatusChecker;
 import it.integry.integrywmsnative.core.interfaces.IFilterableFragment;
 import it.integry.integrywmsnative.core.interfaces.IPoppableActivity;
@@ -32,10 +41,12 @@ import it.integry.integrywmsnative.core.settings.SettingsManager;
 import it.integry.integrywmsnative.core.update.UpdatesManager;
 import it.integry.integrywmsnative.core.utility.UtilitySettings;
 import it.integry.integrywmsnative.databinding.ActivityMainBinding;
+import it.integry.integrywmsnative.databinding.FragmentMainMenuGroupLayoutBinding;
 import it.integry.integrywmsnative.gest.accettazione.MainAccettazioneFragment;
 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.main.MenuListAdapter;
 import it.integry.integrywmsnative.gest.picking_libero.PickingLiberoFragment;
 import it.integry.integrywmsnative.gest.prod_pick_ord_lavorazione.ProdOrdineLavorazioneElencoFragment;
 import it.integry.integrywmsnative.gest.prod_accettazione_ord_produzione.ProdOrdineProduzioneElencoFragment;
@@ -80,6 +91,7 @@ public class MainActivity extends AppCompatActivity
         mBinding.navView.setNavigationItemSelectedListener(this);
         mBinding.appBarMain.mainSearch.setVisibility(View.GONE);
 
+        initGestMenu();
         openMain();
 
         init();
@@ -115,12 +127,10 @@ public class MainActivity extends AppCompatActivity
 
     @Override
     public boolean onCreateOptionsMenu(Menu menu) {
-        // Inflate the menu; this adds items to the action bar if it is present.
-        getMenuInflater().inflate(R.menu.main, menu);
         return true;
     }
 
-    public void setItem(@IdRes int menuId) {
+    public void setMenuItem(@IdRes int menuId) {
         mBinding.navView.setCheckedItem(menuId);
         onNavigationItemSelected(mBinding.navView.getMenu().findItem(menuId));
     }
@@ -134,91 +144,31 @@ public class MainActivity extends AppCompatActivity
         Fragment fragment = null;
         int id = item.getItemId();
 
+        BaseMenuConfiguration.MenuItem menuItem = getMenuItem(id);
 
-        switch(id) {
-            case R.id.nav_home:
-                this.pop();
-                break;
+        if(menuItem != null) {
+            fragment = menuItem.getFragmentClass();
+            this.adaptViewToFragment(fragment);
+        } else {
+            switch (id) {
+                case R.id.nav_home:
+                    this.pop();
+                    break;
 
-            case R.id.nav_accettazione:
-                fragment = MainAccettazioneFragment.newInstance();
-                this.adaptViewToFragment(fragment);
-                break;
-
-            case R.id.nav_rettifica_giacenze:
-                fragment = RettificaGiacenzeFragment.newInstance();
-                this.adaptViewToFragment(fragment);
-                break;
-
-            case R.id.nav_spedizione:
-                fragment = MainVenditaFragment.newInstance();
-                this.adaptViewToFragment(fragment);
-                break;
-
-            case R.id.nav_versamento_merce:
-                fragment = VersamentoMerceFragment.newInstance();
-                this.adaptViewToFragment(fragment);
-                break;
-
-            case R.id.nav_free_picking:
-                fragment = PickingLiberoFragment.newInstance();
-                this.adaptViewToFragment(fragment);
-                break;
-
-            case R.id.nav_resi_fornitore:
-                fragment = UltimiArriviFornitoreFragment.newInstance();
-                this.adaptViewToFragment(fragment);
-                break;
-
-            case R.id.nav_resi_cliente:
-                fragment = UltimeConsegneClienteFragment.newInstance();
-                this.adaptViewToFragment(fragment);
-                break;
-
-
-
-            case R.id.nav_prod_ordine_produzione:
-                fragment = ProdOrdineProduzioneElencoFragment.newInstance();
-                this.adaptViewToFragment(fragment);
-                break;
-
-            case R.id.nav_prod_ordine_lavorazione:
-                fragment = ProdOrdineLavorazioneElencoFragment.newInstance();
-                this.adaptViewToFragment(fragment);
-                break;
-
-            case R.id.nav_prod_versamento_materiale:
-                fragment = ProdVersamentoMaterialeFragment.newInstance();
-                this.adaptViewToFragment(fragment);
-                break;
-
-            case R.id.nav_prod_recupero_materiale:
-                fragment = ProdRecuperoMaterialeFragment.newInstance();
-                this.adaptViewToFragment(fragment);
-                break;
-
-
-
-
-            case R.id.nav_settings:
-                fragment = new MainSettingsFragment();
-                this.adaptViewToFragment(fragment);
-                break;
-
-
-
-
-            case R.id.nav_logout:
-                UtilitySettings.logout();
-                ServerStatusChecker.dispose();
-
-                startLoginActivity();
-                break;
+                case R.id.nav_settings:
+                    fragment = new MainSettingsFragment();
+                    this.adaptViewToFragment(fragment);
+                    break;
 
+                case R.id.nav_logout:
+                    UtilitySettings.logout();
+                    ServerStatusChecker.dispose();
 
+                    startLoginActivity();
+                    break;
+            }
         }
 
-
         changeContentFragment(fragment, true);
 
         DrawerLayout drawer = findViewById(R.id.drawer_layout);
@@ -227,6 +177,57 @@ public class MainActivity extends AppCompatActivity
     }
 
 
+    private void initGestMenu() {
+        Menu menu = mBinding.navView.getMenu();
+
+        ICustomConfiguration customConfiguration = ClassRouter.getIstance(ClassRouter.PATH.CUSTOM_CONFIGURATION);
+        BaseMenuConfiguration menuConfiguration = customConfiguration.getConfig(BaseCustomConfiguration.Keys.MENU_CONFIGURATION);
+        List<MenuConfiguration.MenuGroup> menuGroups = menuConfiguration.getGroups();
+
+        menu.add(R.id.nav_home, R.id.nav_home, 0, R.string.home)
+                .setIcon(R.drawable.ic_black_home);
+
+        for(MenuConfiguration.MenuGroup menuGroup : menuGroups) {
+
+            SubMenu subMenu = menu.addSubMenu(menuGroup.getGroupText());
+
+            for(MenuConfiguration.MenuItem menuItem : menuGroup.getItems()) {
+                subMenu
+                        .add(menuGroup.getGroupId(), menuItem.getID(), 0, menuItem.getTitleText())
+                        .setIcon(menuItem.getDrawerIcon());
+            }
+        }
+
+
+        SubMenu subMenu = menu.addSubMenu(R.string.other);
+        subMenu.add(R.id.nav_home, R.id.nav_settings, 0, R.string.general_settings)
+                .setIcon(R.drawable.ic_settings_24dp);
+        subMenu.add(R.id.nav_logout, R.id.nav_logout, 0, R.string.logout)
+                .setIcon(R.drawable.ic_logout_24dp);
+    }
+
+    private MenuConfiguration.MenuItem getMenuItem(@IdRes int menuId) {
+        ICustomConfiguration customConfiguration = ClassRouter.getIstance(ClassRouter.PATH.CUSTOM_CONFIGURATION);
+        BaseMenuConfiguration menuConfiguration = customConfiguration.getConfig(BaseCustomConfiguration.Keys.MENU_CONFIGURATION);
+        List<MenuConfiguration.MenuGroup> menuGroups = menuConfiguration.getGroups();
+
+        BaseMenuConfiguration.MenuItem menuItemToReturn = null;
+
+        for(MenuConfiguration.MenuGroup menuGroup : menuGroups) {
+            for(MenuConfiguration.MenuItem menuItem : menuGroup.getItems()) {
+                if(menuId == menuItem.getID()) {
+                    menuItemToReturn = menuItem;
+                    break;
+                }
+            }
+
+            if(menuItemToReturn != null) break;
+        }
+
+
+        return menuItemToReturn;
+    }
+
     private void openMain() {
         MainFragment mainFragment = MainFragment.newInstance();
 
diff --git a/app/src/main/java/it/integry/integrywmsnative/core/class_router/configs/BaseMenuConfiguration.java b/app/src/main/java/it/integry/integrywmsnative/core/class_router/configs/BaseMenuConfiguration.java
index 9a7ba14a..b10666ef 100644
--- a/app/src/main/java/it/integry/integrywmsnative/core/class_router/configs/BaseMenuConfiguration.java
+++ b/app/src/main/java/it/integry/integrywmsnative/core/class_router/configs/BaseMenuConfiguration.java
@@ -3,6 +3,7 @@ package it.integry.integrywmsnative.core.class_router.configs;
 import androidx.annotation.DrawableRes;
 import androidx.annotation.IdRes;
 import androidx.annotation.StringRes;
+import androidx.fragment.app.Fragment;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -26,9 +27,21 @@ public class BaseMenuConfiguration {
         @StringRes
         private int mGroupText;
 
+        @IdRes
+        private int mGroupId;
+
         private List<MenuItem> mItems = new ArrayList<>();
 
-        public int getGroupText() {
+        public @IdRes int getGroupId() {
+            return mGroupId;
+        }
+
+        public MenuGroup setGroupId(@IdRes int mGroupId) {
+            this.mGroupId = mGroupId;
+            return this;
+        }
+
+        public @StringRes int getGroupText() {
             return mGroupText;
         }
 
@@ -48,11 +61,11 @@ public class BaseMenuConfiguration {
     }
 
     public static class MenuItem {
-        @IdRes
-        private int mID;
+        @IdRes private int mID;
         @StringRes private int mTitleText;
-        @DrawableRes
-        private int mTitleIcon;
+        @DrawableRes private int mTitleIcon;
+        @DrawableRes private int mDrawerIcon;
+        private Fragment fragmentClass;
 
         public int getID() {
             return mID;
@@ -80,6 +93,24 @@ public class BaseMenuConfiguration {
             mTitleIcon = titleIcon;
             return this;
         }
+
+        public int getDrawerIcon() {
+            return mDrawerIcon;
+        }
+
+        public MenuItem setDrawerIcon(@DrawableRes int drawerIcon) {
+            mDrawerIcon = drawerIcon;
+            return this;
+        }
+
+        public Fragment getFragmentClass() {
+            return fragmentClass;
+        }
+
+        public MenuItem setFragmentClass(Fragment fragmentClass) {
+            this.fragmentClass = fragmentClass;
+            return this;
+        }
     }
 
 
diff --git a/app/src/main/java/it/integry/integrywmsnative/core/class_router/configs/MenuConfiguration.java b/app/src/main/java/it/integry/integrywmsnative/core/class_router/configs/MenuConfiguration.java
index 313cb476..81277197 100644
--- a/app/src/main/java/it/integry/integrywmsnative/core/class_router/configs/MenuConfiguration.java
+++ b/app/src/main/java/it/integry/integrywmsnative/core/class_router/configs/MenuConfiguration.java
@@ -1,6 +1,17 @@
 package it.integry.integrywmsnative.core.class_router.configs;
 
 import it.integry.integrywmsnative.R;
+import it.integry.integrywmsnative.gest.accettazione.MainAccettazioneFragment;
+import it.integry.integrywmsnative.gest.picking_libero.PickingLiberoFragment;
+import it.integry.integrywmsnative.gest.prod_accettazione_ord_produzione.ProdOrdineProduzioneElencoFragment;
+import it.integry.integrywmsnative.gest.prod_pick_ord_lavorazione.ProdOrdineLavorazioneElencoFragment;
+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.ultime_arrivi_fornitore.UltimiArriviFornitoreFragment;
+import it.integry.integrywmsnative.gest.ultime_consegne_cliente.UltimeConsegneClienteFragment;
+import it.integry.integrywmsnative.gest.vendita.MainVenditaFragment;
+import it.integry.integrywmsnative.gest.versamento_merce.VersamentoMerceFragment;
 
 public class MenuConfiguration extends BaseMenuConfiguration {
 
@@ -12,70 +23,96 @@ public class MenuConfiguration extends BaseMenuConfiguration {
             .addGroup(
                     new MenuGroup()
                             .setGroupText(R.string.purchase)
+                            .setGroupId(R.id.nav_group_acquisto)
 
                             .addItem(new MenuItem()
                                     .setID(R.id.nav_accettazione)
                                     .setTitleText(R.string.accettazione_title_fragment)
-                                    .setTitleIcon(R.drawable.ic_dashboard_accettazione))
+                                    .setTitleIcon(R.drawable.ic_dashboard_accettazione)
+                                    .setDrawerIcon(R.drawable.ic_black_download)
+                                    .setFragmentClass(MainAccettazioneFragment.newInstance()))
 
                             .addItem(new MenuItem()
                                     .setID(R.id.nav_resi_fornitore)
                                     .setTitleText(R.string.fragment_ultime_arrivi_fornitore_title)
-                                    .setTitleIcon(R.drawable.ic_latest_delivery))
+                                    .setTitleIcon(R.drawable.ic_latest_delivery)
+                                    .setDrawerIcon(R.drawable.ic_black_latest_delivery)
+                                    .setFragmentClass(UltimiArriviFornitoreFragment.newInstance()))
             ).addGroup(
                     new MenuGroup()
                             .setGroupText(R.string.checkout)
+                            .setGroupId(R.id.nav_group_spedizione)
 
                             .addItem(new MenuItem()
                                     .setID(R.id.nav_spedizione)
                                     .setTitleText(R.string.vendita_title_fragment)
-                                    .setTitleIcon(R.drawable.ic_dashboard_spedizione))
+                                    .setTitleIcon(R.drawable.ic_dashboard_spedizione)
+                                    .setDrawerIcon(R.drawable.ic_black_upload)
+                                    .setFragmentClass(MainVenditaFragment.newInstance()))
 
                             .addItem(new MenuItem()
                                     .setID(R.id.nav_free_picking)
                                     .setTitleText(R.string.free_picking)
-                                    .setTitleIcon(R.drawable.ic_dashboard_picking_libero))
+                                    .setTitleIcon(R.drawable.ic_dashboard_picking_libero)
+                                    .setDrawerIcon(R.drawable.ic_black_barcode_scanner)
+                                    .setFragmentClass(PickingLiberoFragment.newInstance()))
 
                             .addItem(new MenuItem()
                                     .setID(R.id.nav_resi_cliente)
                                     .setTitleText(R.string.fragment_ultime_consegne_cliente_title)
-                                    .setTitleIcon(R.drawable.ic_latest_delivery))
+                                    .setTitleIcon(R.drawable.ic_latest_delivery_customer)
+                                    .setDrawerIcon(R.drawable.ic_black_latest_delivery)
+                                    .setFragmentClass(UltimeConsegneClienteFragment.newInstance()))
             ).addGroup(new MenuGroup()
                             .setGroupText(R.string.manufacture)
+                            .setGroupId(R.id.nav_group_produzione)
 
                             .addItem(new MenuItem()
                                     .setID(R.id.nav_prod_ordine_produzione)
                                     .setTitleText(R.string.prod_ordine_produzione_title_fragment)
-                                    .setTitleIcon(R.drawable.ic_dashboard_accettazione))
+                                    .setTitleIcon(R.drawable.ic_dashboard_accettazione)
+                                    .setDrawerIcon(R.drawable.ic_black_external)
+                                    .setFragmentClass(ProdOrdineProduzioneElencoFragment.newInstance()))
 
                             .addItem(new MenuItem()
                                     .setID(R.id.nav_prod_ordine_lavorazione)
                                     .setTitleText(R.string.prod_ordine_lavorazione_title_fragment)
-                                    .setTitleIcon(R.drawable.ic_dashboard_spedizione))
+                                    .setTitleIcon(R.drawable.ic_dashboard_spedizione)
+                                    .setDrawerIcon(R.drawable.ic_black_external)
+                                    .setFragmentClass(ProdOrdineLavorazioneElencoFragment.newInstance()))
 
                             .addItem(new MenuItem()
                                     .setID(R.id.nav_prod_versamento_materiale)
                                     .setTitleText(R.string.prod_versamento_materiale_title_fragment)
-                                    .setTitleIcon(R.drawable.ic_dashboard_prod_versamento_materiale))
+                                    .setTitleIcon(R.drawable.ic_dashboard_prod_versamento_materiale)
+                                    .setDrawerIcon(R.drawable.ic_black_external)
+                                    .setFragmentClass(ProdVersamentoMaterialeFragment.newInstance()))
 
                             .addItem(new MenuItem()
                                     .setID(R.id.nav_prod_recupero_materiale)
                                     .setTitleText(R.string.prod_recupero_materiale_title_fragment)
-                                    .setTitleIcon(R.drawable.ic_dashboard_prod_recupero_materiale))
+                                    .setTitleIcon(R.drawable.ic_dashboard_prod_recupero_materiale)
+                                    .setDrawerIcon(R.drawable.ic_black_external)
+                                    .setFragmentClass(ProdRecuperoMaterialeFragment.newInstance()))
             )
             .addGroup(
                     new MenuGroup()
                             .setGroupText(R.string.internal_handling)
+                            .setGroupId(R.id.nav_group_movimentazione_interna)
 
                             .addItem(new MenuItem()
                                     .setID(R.id.nav_versamento_merce)
                                     .setTitleText(R.string.versamento_merce_fragment_title)
-                                    .setTitleIcon(R.drawable.ic_dashboard_versamento_merce))
+                                    .setTitleIcon(R.drawable.ic_dashboard_versamento_merce)
+                                    .setDrawerIcon(R.drawable.ic_black_load_shelf)
+                                    .setFragmentClass(VersamentoMerceFragment.newInstance()))
 
                             .addItem(new MenuItem()
                                     .setID(R.id.nav_rettifica_giacenze)
                                     .setTitleText(R.string.rettifica_giacenze_fragment_title)
-                                    .setTitleIcon(R.drawable.ic_dashboard_rettifica_giacenze))
+                                    .setTitleIcon(R.drawable.ic_dashboard_rettifica_giacenze)
+                                    .setDrawerIcon(R.drawable.ic_black_empty_box)
+                                    .setFragmentClass(RettificaGiacenzeFragment.newInstance()))
 
 
             );
diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/main/MainFragment.java b/app/src/main/java/it/integry/integrywmsnative/gest/main/MainFragment.java
index b9439001..5f346755 100644
--- a/app/src/main/java/it/integry/integrywmsnative/gest/main/MainFragment.java
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/main/MainFragment.java
@@ -214,13 +214,9 @@ public class MainFragment extends Fragment implements ITitledFragment, IScrollab
 
     private void initGestMenu() {
         ICustomConfiguration customConfiguration = ClassRouter.getIstance(ClassRouter.PATH.CUSTOM_CONFIGURATION);
-
         BaseMenuConfiguration menuConfiguration = customConfiguration.getConfig(BaseCustomConfiguration.Keys.MENU_CONFIGURATION);
-
         List<MenuConfiguration.MenuGroup> menuGroups = menuConfiguration.getGroups();
 
-
-
         for(MenuConfiguration.MenuGroup menuGroup : menuGroups) {
 
             FragmentMainMenuGroupLayoutBinding groupBinding = DataBindingUtil.inflate(mLayoutInflater, R.layout.fragment_main_menu_group_layout, null, false);
@@ -240,11 +236,9 @@ public class MainFragment extends Fragment implements ITitledFragment, IScrollab
 
             mBindings.menuContainer.addView(groupBinding.getRoot());
         }
-
-
     }
 
     private void onMenuClick(MenuConfiguration.MenuItem menuItem) {
-        ((MainActivity) getActivity()).setItem(menuItem.getID());
+        ((MainActivity) getActivity()).setMenuItem(menuItem.getID());
     }
 }
diff --git a/app/src/main/res/drawable/ic_latest_delivery_customer.xml b/app/src/main/res/drawable/ic_latest_delivery_customer.xml
new file mode 100644
index 00000000..cc293c1a
--- /dev/null
+++ b/app/src/main/res/drawable/ic_latest_delivery_customer.xml
@@ -0,0 +1,45 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="512dp"
+    android:height="512dp"
+    android:viewportWidth="512"
+    android:viewportHeight="512">
+  <path
+      android:pathData="M202.7,160c0,-11.8 9.5,-21.3 21.3,-21.3h213.3c11.8,0 21.3,9.5 21.3,21.3v224c0,11.8 -9.5,21.3 -21.3,21.3H202.7V160z"
+      android:fillColor="#AA8B07"/>
+  <path
+      android:pathData="M53.3,405.3c-11.8,0 -21.3,-9.5 -21.3,-21.3v-64l37.8,-113.4C72.7,197.9 80.9,192 90,192h112.6v213.3H53.3"
+      android:fillColor="#D6B31D"/>
+  <path
+      android:pathData="M74.7,400c0,-26.5 21.5,-48 48,-48s48,21.5 48,48s-21.5,48 -48,48S74.7,426.5 74.7,400"
+      android:fillColor="#37474F"/>
+  <path
+      android:pathData="M309.3,400c0,-26.5 21.5,-48 48,-48s48,21.5 48,48s-21.5,48 -48,48S309.3,426.5 309.3,400"
+      android:fillColor="#37474F"/>
+  <path
+      android:pathData="M106.7,400c0,-8.8 7.2,-16 16,-16s16,7.2 16,16c0,8.8 -7.2,16 -16,16S106.7,408.8 106.7,400"
+      android:fillColor="#78909C"/>
+  <path
+      android:pathData="M341.3,400c0,-8.8 7.2,-16 16,-16s16,7.2 16,16c0,8.8 -7.2,16 -16,16S341.3,408.8 341.3,400"
+      android:fillColor="#78909C"/>
+  <path
+      android:pathData="M85.3,298.7c-5.9,0 -10.7,-4.8 -10.7,-10.7v-9c0,-1.1 0.2,-2.3 0.5,-3.3l18.4,-55.1c1.4,-4.4 5.5,-7.3 10.1,-7.3H160c5.9,0 10.7,4.8 10.7,10.7v64c0,5.9 -4.8,10.7 -10.7,10.7H85.3"
+      android:fillColor="#37474F"/>
+  <path
+      android:pathData="M458.7,258.2V160c0,-11.8 -9.5,-21.3 -21.3,-21.3H259c-1.9,8.6 -3,17.5 -3,26.7c0,67.8 54.9,122.7 122.7,122.7C409.3,288 437.2,276.7 458.7,258.2z"
+      android:fillColor="#7F690A"/>
+  <path
+      android:pathData="M277.3,165.3c0,-56 45.4,-101.3 101.3,-101.3S480,109.4 480,165.3s-45.4,101.3 -101.3,101.3S277.3,221.3 277.3,165.3"
+      android:fillColor="#00ACC1"/>
+  <path
+      android:pathData="M304,165.3c0,41.3 33.4,74.7 74.7,74.7s74.7,-33.4 74.7,-74.7s-33.4,-74.7 -74.7,-74.7S304,124.1 304,165.3zM373.3,165.3c0,-3 2.4,-5.3 5.3,-5.3c2.9,0 5.3,2.4 5.3,5.3c0,3 -2.4,5.3 -5.3,5.3C375.8,170.7 373.3,168.3 373.3,165.3z"
+      android:fillColor="#EEEEEE"/>
+  <path
+      android:fillColor="#FF000000"
+      android:pathData="M384,155.3h-10.7v-48.7H384V155.3z"/>
+  <path
+      android:fillColor="#FF000000"
+      android:pathData="M367.3,164.3l12.5,12.5l-29.5,29.6l-12.5,-12.5L367.3,164.3z"/>
+  <path
+      android:fillColor="#FF000000"
+      android:pathData="M362.7,165.3c0,8.8 7.2,16 16,16c8.8,0 16,-7.2 16,-16c0,-8.8 -7.2,-16 -16,-16C369.8,149.3 362.7,156.5 362.7,165.3zM373.3,165.3c0,-3 2.4,-5.3 5.3,-5.3c2.9,0 5.3,2.4 5.3,5.3c0,3 -2.4,5.3 -5.3,5.3C375.8,170.7 373.3,168.3 373.3,165.3z"/>
+</vector>
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index b23977c8..9b2b5087 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -23,8 +23,7 @@
             android:layout_gravity="start"
             android:fitsSystemWindows="true"
             android:background="@android:color/white"
-            app:headerLayout="@layout/nav_header_main"
-            app:menu="@menu/activity_main_drawer" />
+            app:headerLayout="@layout/nav_header_main" />
 
     </androidx.drawerlayout.widget.DrawerLayout>
 
diff --git a/app/src/main/res/menu/activity_main_drawer.xml b/app/src/main/res/menu/activity_main_drawer.xml
index 6073c0c1..b3a72221 100644
--- a/app/src/main/res/menu/activity_main_drawer.xml
+++ b/app/src/main/res/menu/activity_main_drawer.xml
@@ -2,63 +2,63 @@
 <menu xmlns:android="http://schemas.android.com/apk/res/android">
 
     <group android:checkableBehavior="single">
-        <item
-            android:id="@+id/nav_home"
-            android:icon="@drawable/ic_black_home"
-            android:title="Home" />
-        <item
-            android:id="@+id/nav_accettazione"
-            android:icon="@drawable/ic_black_download"
-            android:title="@string/accettazione_title_fragment" />
-        <item
-            android:id="@+id/nav_spedizione"
-            android:icon="@drawable/ic_black_upload"
-            android:title="@string/vendita_title_fragment" />
-        <item
-            android:id="@+id/nav_rettifica_giacenze"
-            android:icon="@drawable/ic_black_empty_box"
-            android:title="@string/rettifica_giacenze_fragment_title" />
-        <item
-            android:id="@+id/nav_versamento_merce"
-            android:icon="@drawable/ic_black_load_shelf"
-            android:title="@string/versamento_merce_fragment_title" />
-        <item
-            android:id="@+id/nav_free_picking"
-            android:icon="@drawable/ic_black_barcode_scanner"
-            android:title="@string/free_picking" />
-        <item
-            android:id="@+id/nav_resi_fornitore"
-            android:icon="@drawable/ic_black_latest_delivery"
-            android:title="@string/fragment_ultime_arrivi_fornitore_title" />
-        <item
-            android:id="@+id/nav_resi_cliente"
-            android:icon="@drawable/ic_black_latest_delivery"
-            android:title="@string/fragment_ultime_consegne_cliente_title" />
+<!--        <item-->
+<!--            android:id="@+id/nav_home"-->
+<!--            android:icon="@drawable/ic_black_home"-->
+<!--            android:title="Home" />-->
+<!--        <item-->
+<!--            android:id="@+id/nav_accettazione"-->
+<!--            android:icon="@drawable/ic_black_download"-->
+<!--            android:title="@string/accettazione_title_fragment" />-->
+<!--        <item-->
+<!--            android:id="@+id/nav_spedizione"-->
+<!--            android:icon="@drawable/ic_black_upload"-->
+<!--            android:title="@string/vendita_title_fragment" />-->
+<!--        <item-->
+<!--            android:id="@+id/nav_rettifica_giacenze"-->
+<!--            android:icon="@drawable/ic_black_empty_box"-->
+<!--            android:title="@string/rettifica_giacenze_fragment_title" />-->
+<!--        <item-->
+<!--            android:id="@+id/nav_versamento_merce"-->
+<!--            android:icon="@drawable/ic_black_load_shelf"-->
+<!--            android:title="@string/versamento_merce_fragment_title" />-->
+<!--        <item-->
+<!--            android:id="@+id/nav_free_picking"-->
+<!--            android:icon="@drawable/ic_black_barcode_scanner"-->
+<!--            android:title="@string/free_picking" />-->
+<!--        <item-->
+<!--            android:id="@+id/nav_resi_fornitore"-->
+<!--            android:icon="@drawable/ic_black_latest_delivery"-->
+<!--            android:title="@string/fragment_ultime_arrivi_fornitore_title" />-->
+<!--        <item-->
+<!--            android:id="@+id/nav_resi_cliente"-->
+<!--            android:icon="@drawable/ic_black_latest_delivery"-->
+<!--            android:title="@string/fragment_ultime_consegne_cliente_title" />-->
     </group>
 
 
-    <group android:checkableBehavior="single" >
-        <item android:title="@string/production">
-            <menu>
-                <item
-                    android:id="@+id/nav_prod_ordine_produzione"
-                    android:icon="@drawable/ic_black_external"
-                    android:title="@string/prod_ordine_produzione_title_fragment" />
-                <item
-                    android:id="@+id/nav_prod_ordine_lavorazione"
-                    android:icon="@drawable/ic_black_external"
-                    android:title="@string/prod_ordine_lavorazione_title_fragment" />
-                <item
-                    android:id="@+id/nav_prod_versamento_materiale"
-                    android:icon="@drawable/ic_black_external"
-                    android:title="@string/prod_versamento_materiale_title_fragment" />
-                <item
-                    android:id="@+id/nav_prod_recupero_materiale"
-                    android:icon="@drawable/ic_black_internal"
-                    android:title="@string/prod_recupero_materiale_title_fragment" />
-            </menu>
-        </item>
-    </group>
+<!--    <group android:checkableBehavior="single" >-->
+<!--        <item android:title="@string/production">-->
+<!--            <menu>-->
+<!--                <item-->
+<!--                    android:id="@+id/nav_prod_ordine_produzione"-->
+<!--                    android:icon="@drawable/ic_black_external"-->
+<!--                    android:title="@string/prod_ordine_produzione_title_fragment" />-->
+<!--                <item-->
+<!--                    android:id="@+id/nav_prod_ordine_lavorazione"-->
+<!--                    android:icon="@drawable/ic_black_external"-->
+<!--                    android:title="@string/prod_ordine_lavorazione_title_fragment" />-->
+<!--                <item-->
+<!--                    android:id="@+id/nav_prod_versamento_materiale"-->
+<!--                    android:icon="@drawable/ic_black_external"-->
+<!--                    android:title="@string/prod_versamento_materiale_title_fragment" />-->
+<!--                <item-->
+<!--                    android:id="@+id/nav_prod_recupero_materiale"-->
+<!--                    android:icon="@drawable/ic_black_internal"-->
+<!--                    android:title="@string/prod_recupero_materiale_title_fragment" />-->
+<!--            </menu>-->
+<!--        </item>-->
+<!--    </group>-->
 <!--
     <item android:title="Communicate">
         <menu>
@@ -73,17 +73,17 @@
         </menu>
     </item>
 -->
-    <item android:title="Altro">
-        <menu>
-            <item
-                android:id="@+id/nav_settings"
-                android:icon="@drawable/ic_settings_24dp"
-                android:title="@string/general_settings" />
-            <item
-                android:id="@+id/nav_logout"
-                android:icon="@drawable/ic_logout_24dp"
-                android:title="Logout" />
-        </menu>
-    </item>
+<!--    <item android:title="Altro">-->
+<!--        <menu>-->
+<!--            <item-->
+<!--                android:id="@+id/nav_settings"-->
+<!--                android:icon="@drawable/ic_settings_24dp"-->
+<!--                android:title="@string/general_settings" />-->
+<!--            <item-->
+<!--                android:id="@+id/nav_logout"-->
+<!--                android:icon="@drawable/ic_logout_24dp"-->
+<!--                android:title="Logout" />-->
+<!--        </menu>-->
+<!--    </item>-->
 
 </menu>
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index d7bee95a..7cd6a3a7 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -254,4 +254,7 @@
     <string name="delivered_on">Consegnato il %s</string>
 
     <string name="batch_lot_not_enabled">Il lotto <b>%s</b> non è attivo. Continuare?</string>
+    <string name="other">Altro</string>
+    <string name="home">Home</string>
+    <string name="logout">Logout</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/config.xml b/app/src/main/res/values/config.xml
index 0f805cfd..34f79424 100644
--- a/app/src/main/res/values/config.xml
+++ b/app/src/main/res/values/config.xml
@@ -3,4 +3,26 @@
 
     <item name="bound_observable" type="id" />
 
+
+    <item name="nav_group_acquisto" type="id" />
+    <item name="nav_group_spedizione" type="id" />
+    <item name="nav_group_produzione" type="id" />
+    <item name="nav_group_movimentazione_interna" type="id" />
+    <item name="nav_group_altro" type="id" />
+
+    <item name="nav_home" type="id" />
+    <item name="nav_accettazione" type="id" />
+    <item name="nav_spedizione" type="id" />
+    <item name="nav_rettifica_giacenze" type="id" />
+    <item name="nav_versamento_merce" type="id" />
+    <item name="nav_free_picking" type="id" />
+    <item name="nav_resi_fornitore" type="id" />
+    <item name="nav_resi_cliente" type="id" />
+    <item name="nav_prod_ordine_produzione" type="id" />
+    <item name="nav_prod_versamento_materiale" type="id" />
+    <item name="nav_prod_ordine_lavorazione" type="id" />
+    <item name="nav_prod_recupero_materiale" type="id" />
+    <item name="nav_settings" type="id" />
+    <item name="nav_logout" type="id" />
+
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 0b880457..1faca8c2 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -260,5 +260,8 @@
     <string name="title_dynamic_frudis">Frudis customizations</string>
 
     <string name="batch_lot_not_enabled">Batch lot <b>%s</b> is inactive. Continue?</string>
+    <string name="other">Other</string>
+    <string name="home">Home</string>
+    <string name="logout">Logout</string>
 
 </resources>
diff --git a/dynamic_frudis/build.gradle b/dynamic_frudis/build.gradle
index 8d14a8b1..06cb2f7c 100644
--- a/dynamic_frudis/build.gradle
+++ b/dynamic_frudis/build.gradle
@@ -23,4 +23,6 @@ android {
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
     implementation project(':app')
+
+    implementation 'androidx.appcompat:appcompat:1.1.0'
 }
diff --git a/dynamic_frudis/src/main/java/it/integry/wms/dynamic_customization/extensions/MenuConfigurationFRUDIS.java b/dynamic_frudis/src/main/java/it/integry/wms/dynamic_customization/extensions/MenuConfigurationFRUDIS.java
index ec3ec92a..318aa237 100644
--- a/dynamic_frudis/src/main/java/it/integry/wms/dynamic_customization/extensions/MenuConfigurationFRUDIS.java
+++ b/dynamic_frudis/src/main/java/it/integry/wms/dynamic_customization/extensions/MenuConfigurationFRUDIS.java
@@ -1,6 +1,13 @@
 package it.integry.wms.dynamic_customization.extensions;
 
 import it.integry.integrywmsnative.core.class_router.configs.BaseMenuConfiguration;
+import it.integry.integrywmsnative.gest.picking_libero.PickingLiberoFragment;
+import it.integry.integrywmsnative.gest.prod_accettazione_ord_produzione.ProdOrdineProduzioneElencoFragment;
+import it.integry.integrywmsnative.gest.prod_pick_ord_lavorazione.ProdOrdineLavorazioneElencoFragment;
+import it.integry.integrywmsnative.gest.prod_recupero_materiale.ProdRecuperoMaterialeFragment;
+import it.integry.integrywmsnative.gest.prod_versamento_materiale.ProdVersamentoMaterialeFragment;
+import it.integry.integrywmsnative.gest.ultime_consegne_cliente.UltimeConsegneClienteFragment;
+import it.integry.integrywmsnative.gest.vendita.MainVenditaFragment;
 
 public class MenuConfigurationFRUDIS extends BaseMenuConfiguration {
 
@@ -11,46 +18,62 @@ public class MenuConfigurationFRUDIS extends BaseMenuConfiguration {
                 .addGroup(
                 new MenuGroup()
                         .setGroupText(it.integry.integrywmsnative.R.string.checkout)
+                        .setGroupId(it.integry.integrywmsnative.R.id.nav_group_spedizione)
 
                         .addItem(new MenuItem()
                                 .setID(it.integry.integrywmsnative.R.id.nav_spedizione)
                                 .setTitleText(it.integry.integrywmsnative.R.string.vendita_title_fragment)
-                                .setTitleIcon(it.integry.integrywmsnative.R.drawable.ic_dashboard_spedizione))
+                                .setTitleIcon(it.integry.integrywmsnative.R.drawable.ic_dashboard_spedizione)
+                                .setDrawerIcon(it.integry.integrywmsnative.R.drawable.ic_black_upload)
+                                .setFragmentClass(MainVenditaFragment.newInstance()))
 
                         .addItem(new MenuItem()
                                 .setID(it.integry.integrywmsnative.R.id.nav_free_picking)
                                 .setTitleText(it.integry.integrywmsnative.R.string.free_picking)
-                                .setTitleIcon(it.integry.integrywmsnative.R.drawable.ic_dashboard_picking_libero))
+                                .setTitleIcon(it.integry.integrywmsnative.R.drawable.ic_dashboard_picking_libero)
+                                .setDrawerIcon(it.integry.integrywmsnative.R.drawable.ic_black_barcode_scanner)
+                                .setFragmentClass(PickingLiberoFragment.newInstance()))
 
                         .addItem(new MenuItem()
                                 .setID(it.integry.integrywmsnative.R.id.nav_resi_cliente)
                                 .setTitleText(it.integry.integrywmsnative.R.string.fragment_ultime_consegne_cliente_title)
-                                .setTitleIcon(it.integry.integrywmsnative.R.drawable.ic_latest_delivery))
+                                .setTitleIcon(it.integry.integrywmsnative.R.drawable.ic_latest_delivery_customer)
+                                .setDrawerIcon(it.integry.integrywmsnative.R.drawable.ic_black_latest_delivery)
+                                .setFragmentClass(UltimeConsegneClienteFragment.newInstance()))
 
         )
                 .addGroup(new MenuGroup()
 
-                    .setGroupText(it.integry.integrywmsnative.R.string.manufacture)
+                        .setGroupText(it.integry.integrywmsnative.R.string.manufacture)
+                        .setGroupId(it.integry.integrywmsnative.R.id.nav_group_produzione)
 
-                    .addItem(new MenuItem()
-                            .setID(it.integry.integrywmsnative.R.id.nav_prod_ordine_produzione)
-                            .setTitleText(it.integry.integrywmsnative.R.string.prod_ordine_produzione_title_fragment)
-                            .setTitleIcon(it.integry.integrywmsnative.R.drawable.ic_dashboard_accettazione))
+                        .addItem(new MenuItem()
+                                .setID(it.integry.integrywmsnative.R.id.nav_prod_ordine_produzione)
+                                .setTitleText(it.integry.integrywmsnative.R.string.prod_ordine_produzione_title_fragment)
+                                .setTitleIcon(it.integry.integrywmsnative.R.drawable.ic_dashboard_accettazione)
+                                .setDrawerIcon(it.integry.integrywmsnative.R.drawable.ic_black_external)
+                                .setFragmentClass(ProdOrdineProduzioneElencoFragment.newInstance()))
 
-                    .addItem(new MenuItem()
-                            .setID(it.integry.integrywmsnative.R.id.nav_prod_ordine_lavorazione)
-                            .setTitleText(it.integry.integrywmsnative.R.string.prod_ordine_lavorazione_title_fragment)
-                            .setTitleIcon(it.integry.integrywmsnative.R.drawable.ic_dashboard_spedizione))
+                        .addItem(new MenuItem()
+                                .setID(it.integry.integrywmsnative.R.id.nav_prod_ordine_lavorazione)
+                                .setTitleText(it.integry.integrywmsnative.R.string.prod_ordine_lavorazione_title_fragment)
+                                .setTitleIcon(it.integry.integrywmsnative.R.drawable.ic_dashboard_spedizione)
+                                .setDrawerIcon(it.integry.integrywmsnative.R.drawable.ic_black_external)
+                                .setFragmentClass(ProdOrdineLavorazioneElencoFragment.newInstance()))
 
-                    .addItem(new MenuItem()
-                            .setID(it.integry.integrywmsnative.R.id.nav_prod_versamento_materiale)
-                            .setTitleText(it.integry.integrywmsnative.R.string.prod_versamento_materiale_title_fragment)
-                            .setTitleIcon(it.integry.integrywmsnative.R.drawable.ic_dashboard_prod_versamento_materiale))
+                        .addItem(new MenuItem()
+                                .setID(it.integry.integrywmsnative.R.id.nav_prod_versamento_materiale)
+                                .setTitleText(it.integry.integrywmsnative.R.string.prod_versamento_materiale_title_fragment)
+                                .setTitleIcon(it.integry.integrywmsnative.R.drawable.ic_dashboard_prod_versamento_materiale)
+                                .setDrawerIcon(it.integry.integrywmsnative.R.drawable.ic_black_external)
+                                .setFragmentClass(ProdVersamentoMaterialeFragment.newInstance()))
 
-                    .addItem(new MenuItem()
-                            .setID(it.integry.integrywmsnative.R.id.nav_prod_recupero_materiale)
-                            .setTitleText(it.integry.integrywmsnative.R.string.prod_recupero_materiale_title_fragment)
-                            .setTitleIcon(it.integry.integrywmsnative.R.drawable.ic_dashboard_prod_recupero_materiale))
+                        .addItem(new MenuItem()
+                                .setID(it.integry.integrywmsnative.R.id.nav_prod_recupero_materiale)
+                                .setTitleText(it.integry.integrywmsnative.R.string.prod_recupero_materiale_title_fragment)
+                                .setTitleIcon(it.integry.integrywmsnative.R.drawable.ic_dashboard_prod_recupero_materiale)
+                                .setDrawerIcon(it.integry.integrywmsnative.R.drawable.ic_black_external)
+                                .setFragmentClass(ProdRecuperoMaterialeFragment.newInstance()))
         );
 
 
diff --git a/dynamic_ime/build.gradle b/dynamic_ime/build.gradle
index 403ded64..3567aca1 100644
--- a/dynamic_ime/build.gradle
+++ b/dynamic_ime/build.gradle
@@ -22,4 +22,6 @@ android {
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
     implementation project(':app')
+
+    implementation 'androidx.appcompat:appcompat:1.1.0'
 }
diff --git a/dynamic_ime/src/main/java/it/integry/wms/dynamic_customization/extensions/MenuConfigurationIME.java b/dynamic_ime/src/main/java/it/integry/wms/dynamic_customization/extensions/MenuConfigurationIME.java
index 08eb2e70..9410777b 100644
--- a/dynamic_ime/src/main/java/it/integry/wms/dynamic_customization/extensions/MenuConfigurationIME.java
+++ b/dynamic_ime/src/main/java/it/integry/wms/dynamic_customization/extensions/MenuConfigurationIME.java
@@ -1,6 +1,15 @@
 package it.integry.wms.dynamic_customization.extensions;
 
 import it.integry.integrywmsnative.core.class_router.configs.BaseMenuConfiguration;
+import it.integry.integrywmsnative.gest.accettazione.MainAccettazioneFragment;
+import it.integry.integrywmsnative.gest.picking_libero.PickingLiberoFragment;
+import it.integry.integrywmsnative.gest.prod_accettazione_ord_produzione.ProdOrdineProduzioneElencoFragment;
+import it.integry.integrywmsnative.gest.prod_pick_ord_lavorazione.ProdOrdineLavorazioneElencoFragment;
+import it.integry.integrywmsnative.gest.rettifica_giacenze.RettificaGiacenzeFragment;
+import it.integry.integrywmsnative.gest.ultime_arrivi_fornitore.UltimiArriviFornitoreFragment;
+import it.integry.integrywmsnative.gest.ultime_consegne_cliente.UltimeConsegneClienteFragment;
+import it.integry.integrywmsnative.gest.vendita.MainVenditaFragment;
+import it.integry.integrywmsnative.gest.versamento_merce.VersamentoMerceFragment;
 
 public class MenuConfigurationIME extends BaseMenuConfiguration {
 
@@ -12,61 +21,83 @@ public class MenuConfigurationIME extends BaseMenuConfiguration {
                 .addGroup(
                         new MenuGroup()
                                 .setGroupText(it.integry.integrywmsnative.R.string.purchase)
+                                .setGroupId(it.integry.integrywmsnative.R.id.nav_group_acquisto)
 
                                 .addItem(new MenuItem()
                                         .setID(it.integry.integrywmsnative.R.id.nav_accettazione)
                                         .setTitleText(it.integry.integrywmsnative.R.string.accettazione_title_fragment)
-                                        .setTitleIcon(it.integry.integrywmsnative.R.drawable.ic_dashboard_accettazione))
+                                        .setTitleIcon(it.integry.integrywmsnative.R.drawable.ic_dashboard_accettazione)
+                                        .setDrawerIcon(it.integry.integrywmsnative.R.drawable.ic_black_download)
+                                        .setFragmentClass(MainAccettazioneFragment.newInstance()))
 
                                 .addItem(new MenuItem()
                                         .setID(it.integry.integrywmsnative.R.id.nav_resi_fornitore)
                                         .setTitleText(it.integry.integrywmsnative.R.string.fragment_ultime_arrivi_fornitore_title)
-                                        .setTitleIcon(it.integry.integrywmsnative.R.drawable.ic_latest_delivery))
+                                        .setTitleIcon(it.integry.integrywmsnative.R.drawable.ic_latest_delivery)
+                                        .setDrawerIcon(it.integry.integrywmsnative.R.drawable.ic_black_latest_delivery)
+                                        .setFragmentClass(UltimiArriviFornitoreFragment.newInstance()))
                 ).addGroup(
                         new MenuGroup()
                                 .setGroupText(it.integry.integrywmsnative.R.string.checkout)
+                                .setGroupId(it.integry.integrywmsnative.R.id.nav_group_spedizione)
 
                                 .addItem(new MenuItem()
                                         .setID(it.integry.integrywmsnative.R.id.nav_spedizione)
                                         .setTitleText(it.integry.integrywmsnative.R.string.vendita_title_fragment)
-                                        .setTitleIcon(it.integry.integrywmsnative.R.drawable.ic_dashboard_spedizione))
+                                        .setTitleIcon(it.integry.integrywmsnative.R.drawable.ic_dashboard_spedizione)
+                                        .setDrawerIcon(it.integry.integrywmsnative.R.drawable.ic_black_upload)
+                                        .setFragmentClass(MainVenditaFragment.newInstance()))
 
                                 .addItem(new MenuItem()
                                         .setID(it.integry.integrywmsnative.R.id.nav_free_picking)
                                         .setTitleText(it.integry.integrywmsnative.R.string.free_picking)
-                                        .setTitleIcon(it.integry.integrywmsnative.R.drawable.ic_dashboard_picking_libero))
+                                        .setTitleIcon(it.integry.integrywmsnative.R.drawable.ic_dashboard_picking_libero)
+                                        .setDrawerIcon(it.integry.integrywmsnative.R.drawable.ic_black_barcode_scanner)
+                                        .setFragmentClass(PickingLiberoFragment.newInstance()))
 
                                 .addItem(new MenuItem()
                                         .setID(it.integry.integrywmsnative.R.id.nav_resi_cliente)
                                         .setTitleText(it.integry.integrywmsnative.R.string.fragment_ultime_consegne_cliente_title)
-                                        .setTitleIcon(it.integry.integrywmsnative.R.drawable.ic_latest_delivery))
+                                        .setTitleIcon(it.integry.integrywmsnative.R.drawable.ic_latest_delivery_customer)
+                                        .setDrawerIcon(it.integry.integrywmsnative.R.drawable.ic_black_latest_delivery)
+                                        .setFragmentClass(UltimeConsegneClienteFragment.newInstance()))
 
                 ).addGroup(
                         new MenuGroup()
                                 .setGroupText(it.integry.integrywmsnative.R.string.manufacture)
+                                .setGroupId(it.integry.integrywmsnative.R.id.nav_group_produzione)
 
                                 .addItem(new MenuItem()
                                         .setID(it.integry.integrywmsnative.R.id.nav_prod_ordine_produzione)
                                         .setTitleText(it.integry.integrywmsnative.R.string.prod_ordine_produzione_title_fragment)
-                                        .setTitleIcon(it.integry.integrywmsnative.R.drawable.ic_dashboard_accettazione))
+                                        .setTitleIcon(it.integry.integrywmsnative.R.drawable.ic_dashboard_accettazione)
+                                        .setDrawerIcon(it.integry.integrywmsnative.R.drawable.ic_black_external)
+                                        .setFragmentClass(ProdOrdineProduzioneElencoFragment.newInstance()))
 
                                 .addItem(new MenuItem()
                                         .setID(it.integry.integrywmsnative.R.id.nav_prod_ordine_lavorazione)
                                         .setTitleText(it.integry.integrywmsnative.R.string.prod_ordine_lavorazione_title_fragment)
-                                        .setTitleIcon(it.integry.integrywmsnative.R.drawable.ic_dashboard_spedizione))
+                                        .setTitleIcon(it.integry.integrywmsnative.R.drawable.ic_dashboard_spedizione)
+                                        .setDrawerIcon(it.integry.integrywmsnative.R.drawable.ic_black_external)
+                                        .setFragmentClass(ProdOrdineLavorazioneElencoFragment.newInstance()))
                 ).addGroup(
                         new MenuGroup()
                                 .setGroupText(it.integry.integrywmsnative.R.string.internal_handling)
+                                .setGroupId(it.integry.integrywmsnative.R.id.nav_group_movimentazione_interna)
 
                                 .addItem(new MenuItem()
                                         .setID(it.integry.integrywmsnative.R.id.nav_versamento_merce)
                                         .setTitleText(it.integry.integrywmsnative.R.string.versamento_merce_fragment_title)
-                                        .setTitleIcon(it.integry.integrywmsnative.R.drawable.ic_dashboard_versamento_merce))
+                                        .setTitleIcon(it.integry.integrywmsnative.R.drawable.ic_dashboard_versamento_merce)
+                                        .setDrawerIcon(it.integry.integrywmsnative.R.drawable.ic_black_load_shelf)
+                                        .setFragmentClass(VersamentoMerceFragment.newInstance()))
 
                                 .addItem(new MenuItem()
                                         .setID(it.integry.integrywmsnative.R.id.nav_rettifica_giacenze)
                                         .setTitleText(it.integry.integrywmsnative.R.string.rettifica_giacenze_fragment_title)
-                                        .setTitleIcon(it.integry.integrywmsnative.R.drawable.ic_dashboard_rettifica_giacenze))
+                                        .setTitleIcon(it.integry.integrywmsnative.R.drawable.ic_dashboard_rettifica_giacenze)
+                                        .setDrawerIcon(it.integry.integrywmsnative.R.drawable.ic_black_empty_box)
+                                        .setFragmentClass(RettificaGiacenzeFragment.newInstance()))
 
 
                 );
diff --git a/dynamic_vgalimenti/build.gradle b/dynamic_vgalimenti/build.gradle
index 412793e8..123e2743 100644
--- a/dynamic_vgalimenti/build.gradle
+++ b/dynamic_vgalimenti/build.gradle
@@ -19,4 +19,6 @@ android {
 dependencies {
     implementation fileTree(include: ['*.jar'], dir: 'libs')
     implementation project(':app')
+
+    implementation 'androidx.appcompat:appcompat:1.1.0'
 }
diff --git a/dynamic_vgalimenti/src/main/java/it/integry/wms/dynamic_customization/extensions/MenuConfigurationVG.java b/dynamic_vgalimenti/src/main/java/it/integry/wms/dynamic_customization/extensions/MenuConfigurationVG.java
index 5b2d5213..954d69fb 100644
--- a/dynamic_vgalimenti/src/main/java/it/integry/wms/dynamic_customization/extensions/MenuConfigurationVG.java
+++ b/dynamic_vgalimenti/src/main/java/it/integry/wms/dynamic_customization/extensions/MenuConfigurationVG.java
@@ -1,6 +1,12 @@
 package it.integry.wms.dynamic_customization.extensions;
 
 import it.integry.integrywmsnative.core.class_router.configs.BaseMenuConfiguration;
+import it.integry.integrywmsnative.gest.accettazione.MainAccettazioneFragment;
+import it.integry.integrywmsnative.gest.picking_libero.PickingLiberoFragment;
+import it.integry.integrywmsnative.gest.rettifica_giacenze.RettificaGiacenzeFragment;
+import it.integry.integrywmsnative.gest.ultime_arrivi_fornitore.UltimiArriviFornitoreFragment;
+import it.integry.integrywmsnative.gest.vendita.MainVenditaFragment;
+import it.integry.integrywmsnative.gest.versamento_merce.VersamentoMerceFragment;
 
 public class MenuConfigurationVG extends BaseMenuConfiguration {
 
@@ -9,32 +15,54 @@ public class MenuConfigurationVG extends BaseMenuConfiguration {
         this
                 .addGroup(
                         new MenuGroup()
-                                .setGroupText(it.integry.integrywmsnative.R.string.general)
+                                .setGroupText(it.integry.integrywmsnative.R.string.purchase)
+                                .setGroupId(it.integry.integrywmsnative.R.id.nav_group_acquisto)
 
                                 .addItem(new MenuItem()
                                         .setID(it.integry.integrywmsnative.R.id.nav_accettazione)
                                         .setTitleText(it.integry.integrywmsnative.R.string.accettazione_title_fragment)
-                                        .setTitleIcon(it.integry.integrywmsnative.R.drawable.ic_dashboard_accettazione))
+                                        .setTitleIcon(it.integry.integrywmsnative.R.drawable.ic_dashboard_accettazione)
+                                        .setDrawerIcon(it.integry.integrywmsnative.R.drawable.ic_black_download)
+                                        .setFragmentClass(MainAccettazioneFragment.newInstance()))
+                ).addGroup(
+                        new MenuGroup()
+                                .setGroupText(it.integry.integrywmsnative.R.string.checkout)
+                                .setGroupId(it.integry.integrywmsnative.R.id.nav_group_spedizione)
 
                                 .addItem(new MenuItem()
                                         .setID(it.integry.integrywmsnative.R.id.nav_spedizione)
                                         .setTitleText(it.integry.integrywmsnative.R.string.vendita_title_fragment)
-                                        .setTitleIcon(it.integry.integrywmsnative.R.drawable.ic_dashboard_spedizione))
-
-                                .addItem(new MenuItem()
-                                        .setID(it.integry.integrywmsnative.R.id.nav_rettifica_giacenze)
-                                        .setTitleText(it.integry.integrywmsnative.R.string.rettifica_giacenze_fragment_title)
-                                        .setTitleIcon(it.integry.integrywmsnative.R.drawable.ic_dashboard_rettifica_giacenze))
-
-                                .addItem(new MenuItem()
-                                        .setID(it.integry.integrywmsnative.R.id.nav_versamento_merce)
-                                        .setTitleText(it.integry.integrywmsnative.R.string.versamento_merce_fragment_title)
-                                        .setTitleIcon(it.integry.integrywmsnative.R.drawable.ic_dashboard_versamento_merce))
+                                        .setTitleIcon(it.integry.integrywmsnative.R.drawable.ic_dashboard_spedizione)
+                                        .setDrawerIcon(it.integry.integrywmsnative.R.drawable.ic_black_upload)
+                                        .setFragmentClass(MainVenditaFragment.newInstance()))
 
                                 .addItem(new MenuItem()
                                         .setID(it.integry.integrywmsnative.R.id.nav_free_picking)
                                         .setTitleText(it.integry.integrywmsnative.R.string.free_picking)
-                                        .setTitleIcon(it.integry.integrywmsnative.R.drawable.ic_dashboard_picking_libero))
+                                        .setTitleIcon(it.integry.integrywmsnative.R.drawable.ic_dashboard_picking_libero)
+                                        .setDrawerIcon(it.integry.integrywmsnative.R.drawable.ic_black_barcode_scanner)
+                                        .setFragmentClass(PickingLiberoFragment.newInstance()))
+                )
+                .addGroup(
+                        new MenuGroup()
+                                .setGroupText(it.integry.integrywmsnative.R.string.internal_handling)
+                                .setGroupId(it.integry.integrywmsnative.R.id.nav_group_movimentazione_interna)
+
+                                .addItem(new MenuItem()
+                                        .setID(it.integry.integrywmsnative.R.id.nav_versamento_merce)
+                                        .setTitleText(it.integry.integrywmsnative.R.string.versamento_merce_fragment_title)
+                                        .setTitleIcon(it.integry.integrywmsnative.R.drawable.ic_dashboard_versamento_merce)
+                                        .setDrawerIcon(it.integry.integrywmsnative.R.drawable.ic_black_load_shelf)
+                                        .setFragmentClass(VersamentoMerceFragment.newInstance()))
+
+                                .addItem(new MenuItem()
+                                        .setID(it.integry.integrywmsnative.R.id.nav_rettifica_giacenze)
+                                        .setTitleText(it.integry.integrywmsnative.R.string.rettifica_giacenze_fragment_title)
+                                        .setTitleIcon(it.integry.integrywmsnative.R.drawable.ic_dashboard_rettifica_giacenze)
+                                        .setDrawerIcon(it.integry.integrywmsnative.R.drawable.ic_black_empty_box)
+                                        .setFragmentClass(RettificaGiacenzeFragment.newInstance()))
+
+
                 );
 
     }
diff --git a/ext_sources/ICONS/icons8-deliver-food-reverse.svg b/ext_sources/ICONS/icons8-deliver-food-reverse.svg
new file mode 100644
index 00000000..45a63889
--- /dev/null
+++ b/ext_sources/ICONS/icons8-deliver-food-reverse.svg
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 23.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Livello_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 512 512" style="enable-background:new 0 0 512 512;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#AA8B07;}
+	.st1{fill:#D6B31D;}
+	.st2{fill:#37474F;}
+	.st3{fill:#78909C;}
+	.st4{fill:#7F690A;}
+	.st5{fill:#00ACC1;}
+	.st6{fill:#EEEEEE;}
+</style>
+<g id="surface1">
+	<path class="st0" d="M202.7,160c0-11.8,9.5-21.3,21.3-21.3h213.3c11.8,0,21.3,9.5,21.3,21.3v224c0,11.8-9.5,21.3-21.3,21.3H202.7
+		V160z"/>
+	<path class="st1" d="M53.3,405.3c-11.8,0-21.3-9.5-21.3-21.3v-64l37.8-113.4C72.7,197.9,80.9,192,90,192h112.6v213.3H53.3"/>
+	<path class="st2" d="M74.7,400c0-26.5,21.5-48,48-48s48,21.5,48,48s-21.5,48-48,48S74.7,426.5,74.7,400"/>
+	<path class="st2" d="M309.3,400c0-26.5,21.5-48,48-48s48,21.5,48,48s-21.5,48-48,48S309.3,426.5,309.3,400"/>
+	<path class="st3" d="M106.7,400c0-8.8,7.2-16,16-16s16,7.2,16,16c0,8.8-7.2,16-16,16S106.7,408.8,106.7,400"/>
+	<path class="st3" d="M341.3,400c0-8.8,7.2-16,16-16s16,7.2,16,16c0,8.8-7.2,16-16,16S341.3,408.8,341.3,400"/>
+	<path class="st2" d="M85.3,298.7c-5.9,0-10.7-4.8-10.7-10.7v-9c0-1.1,0.2-2.3,0.5-3.3l18.4-55.1c1.4-4.4,5.5-7.3,10.1-7.3H160
+		c5.9,0,10.7,4.8,10.7,10.7v64c0,5.9-4.8,10.7-10.7,10.7H85.3"/>
+	<path class="st4" d="M458.7,258.2V160c0-11.8-9.5-21.3-21.3-21.3H259c-1.9,8.6-3,17.5-3,26.7c0,67.8,54.9,122.7,122.7,122.7
+		C409.3,288,437.2,276.7,458.7,258.2z"/>
+	<path class="st5" d="M277.3,165.3c0-56,45.4-101.3,101.3-101.3S480,109.4,480,165.3s-45.4,101.3-101.3,101.3
+		S277.3,221.3,277.3,165.3"/>
+	<path class="st6" d="M304,165.3c0,41.3,33.4,74.7,74.7,74.7s74.7-33.4,74.7-74.7s-33.4-74.7-74.7-74.7S304,124.1,304,165.3z
+		 M373.3,165.3c0-3,2.4-5.3,5.3-5.3c2.9,0,5.3,2.4,5.3,5.3c0,3-2.4,5.3-5.3,5.3C375.8,170.7,373.3,168.3,373.3,165.3z"/>
+	<path d="M384,155.3h-10.7v-48.7H384V155.3z"/>
+	<path d="M367.3,164.3l12.5,12.5l-29.5,29.6l-12.5-12.5L367.3,164.3z"/>
+	<path d="M362.7,165.3c0,8.8,7.2,16,16,16c8.8,0,16-7.2,16-16c0-8.8-7.2-16-16-16C369.8,149.3,362.7,156.5,362.7,165.3z
+		 M373.3,165.3c0-3,2.4-5.3,5.3-5.3c2.9,0,5.3,2.4,5.3,5.3c0,3-2.4,5.3-5.3,5.3C375.8,170.7,373.3,168.3,373.3,165.3z"/>
+</g>
+</svg>