Finish v1.19.2(243)

app/build.gradle

@@ -6,8 +6,8 @@ apply plugin: 'com.google.gms.google-services'
 
 android {
 
-    def appVersionCode = 242
+    def appVersionCode = 243
-    def appVersionName = '1.19.1'
+    def appVersionName = '1.19.2'
 
     signingConfigs {
         release {

app/src/main/java/it/integry/integrywmsnative/core/class_router/BaseCustomConfiguration.java

@@ -2,7 +2,6 @@ package it.integry.integrywmsnative.core.class_router;
 
 import java.util.HashMap;
 
-import it.integry.integrywmsnative.core.class_router.configs.MenuConfiguration;
 import it.integry.integrywmsnative.core.class_router.interfaces.ICustomConfiguration;
 import it.integry.integrywmsnative.core.utility.UtilityHashMap;
 
@@ -10,14 +9,12 @@ public class BaseCustomConfiguration implements ICustomConfiguration {
 
 
     public static class Keys {
-        public static int MENU_CONFIGURATION = 0;
         public static int FLAG_SHOW_COD_FORN_IN_SPEDIZIONE = 1;
         public static int CUSTOM_DYNAMIC_VERSION_PATH = 2;
         public static int FLAG_SPEDIZIONE_GROUP_BY_GRP_MERC = 3;
     }
 
-    protected HashMap<Integer, Object> configurations = new HashMap<Integer, Object>() {{
+    protected HashMap<Integer, Object> configurations = new HashMap<>() {{
-        put(Keys.MENU_CONFIGURATION, new MenuConfiguration());
         put(Keys.FLAG_SHOW_COD_FORN_IN_SPEDIZIONE, true);
         put(Keys.FLAG_SPEDIZIONE_GROUP_BY_GRP_MERC, false);
     }};

app/src/main/java/it/integry/integrywmsnative/gest/accettazione/MainAccettazioneFragment.java

@@ -65,10 +65,7 @@ public class MainAccettazioneFragment extends BaseFragment implements ISearcable
     }
 
     public static MainAccettazioneFragment newInstance() {
-        MainAccettazioneFragment fragment = new MainAccettazioneFragment();
+        return new MainAccettazioneFragment();
-        Bundle args = new Bundle();
-        fragment.setArguments(args);
-        return fragment;
     }
 
 

app/src/main/java/it/integry/integrywmsnative/gest/accettazione_picking/AccettazionePickingViewModel.java

@@ -786,9 +786,12 @@ public class AccettazionePickingViewModel {
     }
 
     private void printCollo(Runnable onComplete) {
+        MtbColt cloneMtbColt = (MtbColt) mCurrentMtbColt.clone();
+        cloneMtbColt.setGestione(cloneMtbColt.getGestioneEnum() == GestioneEnum.LAVORAZIONE ? GestioneEnum.PRODUZIONE : cloneMtbColt.getGestioneEnum());
+
         this.mPrinterRESTConsumer.printCollo(
                 PrinterRESTConsumer.Type.SECONDARIA,
-                mCurrentMtbColt,
+                cloneMtbColt,
                 () -> {
                     this.sendLUSuccessfullyPrinted();
                     onComplete.run();

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

@@ -27,7 +27,6 @@ import javax.inject.Inject;
 
 import it.integry.integrywmsnative.MainApplication;
 import it.integry.integrywmsnative.R;
-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;
@@ -242,7 +241,7 @@ public class MainActivity extends BaseActivity
 
     private MenuConfiguration.MenuItem getMenuItem(@IdRes int menuId) {
         ICustomConfiguration customConfiguration = ClassRouter.getInstance(ClassRouter.PATH.CUSTOM_CONFIGURATION);
-        BaseMenuConfiguration menuConfiguration = customConfiguration.getConfig(BaseCustomConfiguration.Keys.MENU_CONFIGURATION);
+        BaseMenuConfiguration menuConfiguration = new MenuConfiguration();
         List<MenuConfiguration.MenuGroup> menuGroups = menuConfiguration.getGroups();
 
         BaseMenuConfiguration.MenuItem menuItemToReturn = null;

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

@@ -276,9 +276,7 @@ public class MainFragment extends Fragment implements ITitledFragment, IScrollab
                     groupBinding.mainList.setAdapter(menuListAdapter);
                     groupBinding.mainList.setNestedScrollingEnabled(false);
 
-                    menuListAdapter.setClickListener((view, position) -> {
+                    menuListAdapter.setClickListener(this::onMenuClick);
-                        onMenuClick(menuGroup.getItems().get(position));
-                    });
 
                     mBindings.menuContainer.addView(groupBinding.getRoot());
 

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

@@ -14,14 +14,15 @@ import androidx.recyclerview.widget.RecyclerView;
 import java.util.List;
 
 import it.integry.integrywmsnative.R;
+import it.integry.integrywmsnative.core.class_router.configs.BaseMenuConfiguration;
 import it.integry.integrywmsnative.core.class_router.configs.MenuConfiguration;
 
 public class MenuListAdapter extends RecyclerView.Adapter<MenuListAdapter.ViewHolder> {
 
-    private Context mContext;
+    private final Context mContext;
 
-    private List<MenuConfiguration.MenuItem> mDataset;
+    private final List<MenuConfiguration.MenuItem> mDataset;
-    private LayoutInflater mInflater;
+    private final LayoutInflater mInflater;
     private ItemClickListener mClickListener;
 
     // data is passed into the constructor
@@ -44,6 +45,10 @@ public class MenuListAdapter extends RecyclerView.Adapter<MenuListAdapter.ViewHo
     public void onBindViewHolder(@NonNull ViewHolder holder, int position) {
         holder.mIcon.setImageDrawable(ResourcesCompat.getDrawable(mContext.getResources(), mDataset.get(position).getTitleIcon(), null));
         holder.mTitle.setText(mContext.getResources().getString(mDataset.get(position).getTitleText()));
+
+        holder.itemView.setOnClickListener(v -> {
+            if (mClickListener != null) mClickListener.onItemClick(mDataset.get(position));
+        });
     }
 
     // total number of cells
@@ -54,20 +59,14 @@ public class MenuListAdapter extends RecyclerView.Adapter<MenuListAdapter.ViewHo
 
 
     // stores and recycles views as they are scrolled off screen
-    public class ViewHolder extends RecyclerView.ViewHolder implements View.OnClickListener {
+    public static class ViewHolder extends RecyclerView.ViewHolder {
-        private TextView mTitle;
+        private final TextView mTitle;
-        private ImageView mIcon;
+        private final ImageView mIcon;
 
         ViewHolder(View itemView) {
             super(itemView);
             mTitle = itemView.findViewById(R.id.menu_title);
             mIcon = itemView.findViewById(R.id.menu_icon);
-            itemView.setOnClickListener(this);
-        }
-
-        @Override
-        public void onClick(View view) {
-            if (mClickListener != null) mClickListener.onItemClick(view, getAdapterPosition());
         }
     }
 
@@ -79,6 +78,6 @@ public class MenuListAdapter extends RecyclerView.Adapter<MenuListAdapter.ViewHo
 
     // parent activity will implement this method to respond to click events
     public interface ItemClickListener {
-        void onItemClick(View view, int position);
+        void onItemClick(BaseMenuConfiguration.MenuItem menuItem);
     }
 }

dynamic_vgalimenti/src/main/java/it/integry/wms/dynamic_customization/extensions/CustomConfiguration.java

@@ -7,7 +7,6 @@ public class CustomConfiguration extends BaseCustomConfiguration implements ICus
 
     public CustomConfiguration() {
         configurations.put(Keys.FLAG_SHOW_COD_FORN_IN_SPEDIZIONE, false);
-        configurations.put(Keys.MENU_CONFIGURATION, new MenuConfigurationVG());
         configurations.put(Keys.FLAG_SPEDIZIONE_GROUP_BY_GRP_MERC, true);
     }
 

dynamic_vgalimenti/src/main/java/it/integry/wms/dynamic_customization/extensions/MenuConfigurationVG.java

@@ -1,70 +0,0 @@
-package it.integry.wms.dynamic_customization.extensions;
-
-import it.integry.integrywmsnative.core.class_router.configs.BaseMenuConfiguration;
-import it.integry.integrywmsnative.core.model.secondary.GestioneEnum;
-import it.integry.integrywmsnative.gest.accettazione.MainAccettazioneFragment;
-import it.integry.integrywmsnative.gest.ordini_uscita_elenco.OrdiniUscitaElencoFragment;
-import it.integry.integrywmsnative.gest.picking_libero.PickingLiberoFragment;
-import it.integry.integrywmsnative.gest.rettifica_giacenze.RettificaGiacenzeFragment;
-import it.integry.integrywmsnative.gest.versamento_merce.VersamentoMerceFragment;
-
-public class MenuConfigurationVG extends BaseMenuConfiguration {
-
-    public MenuConfigurationVG() {
-
-        this
-                .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)
-                                        .setDrawerIcon(it.integry.integrywmsnative.R.drawable.ic_black_download)
-                                        .setFragmentFactory(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)
-                                        .setDrawerIcon(it.integry.integrywmsnative.R.drawable.ic_black_upload)
-                                        .setFragmentFactory(() -> OrdiniUscitaElencoFragment.newInstance(GestioneEnum.VENDITA, null, -1, null)))
-
-                                .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)
-                                        .setDrawerIcon(it.integry.integrywmsnative.R.drawable.ic_black_barcode_scanner)
-                                        .setFragmentFactory(() -> PickingLiberoFragment.newInstance(GestioneEnum.VENDITA)))
-                )
-                .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)
-                                        .setFragmentFactory(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)
-                                        .setFragmentFactory(RettificaGiacenzeFragment::newInstance))
-
-
-                );
-
-    }
-
-}