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 new file mode 100644 index 00000000..9a7ba14a --- /dev/null +++ b/app/src/main/java/it/integry/integrywmsnative/core/class_router/configs/BaseMenuConfiguration.java @@ -0,0 +1,86 @@ +package it.integry.integrywmsnative.core.class_router.configs; + +import androidx.annotation.DrawableRes; +import androidx.annotation.IdRes; +import androidx.annotation.StringRes; + +import java.util.ArrayList; +import java.util.List; + +public class BaseMenuConfiguration { + + + protected List groups = new ArrayList<>(); + + public BaseMenuConfiguration addGroup(MenuGroup menuGroup) { + this.groups.add(menuGroup); + return this; + } + + public List getGroups() { + return groups; + } + + + public static class MenuGroup { + @StringRes + private int mGroupText; + + private List mItems = new ArrayList<>(); + + public int getGroupText() { + return mGroupText; + } + + public MenuGroup setGroupText(@StringRes int groupText) { + mGroupText = groupText; + return this; + } + + public List getItems() { + return mItems; + } + + public MenuGroup addItem(MenuItem item) { + this.mItems.add(item); + return this; + } + } + + public static class MenuItem { + @IdRes + private int mID; + @StringRes private int mTitleText; + @DrawableRes + private int mTitleIcon; + + public int getID() { + return mID; + } + + public MenuItem setID(@IdRes int ID) { + this.mID = ID; + return this; + } + + public int getTitleText() { + return mTitleText; + } + + public MenuItem setTitleText(@StringRes int titleText) { + mTitleText = titleText; + return this; + } + + public int getTitleIcon() { + return mTitleIcon; + } + + public MenuItem setTitleIcon(@DrawableRes int titleIcon) { + mTitleIcon = titleIcon; + 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 06b6b965..3b1ae680 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,40 +1,10 @@ package it.integry.integrywmsnative.core.class_router.configs; -import androidx.annotation.DrawableRes; -import androidx.annotation.IdRes; -import androidx.annotation.StringRes; - -import java.util.ArrayList; -import java.util.List; - import it.integry.integrywmsnative.R; -public class MenuConfiguration { +public class MenuConfiguration extends BaseMenuConfiguration { -// public static class IDS { -// -// public static class General { -// -// public static int Accettazione = 1001; -// public static int Spedizione = 1002; -// public static int RettificaGiacenze = 1003; -// public static int Versamento = 1004; -// public static int PickingLibero = 1005; -// public static int UltimeConsegne = 1006; -// } -// -// public static class Production { -// public static int Lavorazione = 2001; -// public static int Produzione = 2002; -// public static int VersamentoMateriale = 2003; -// public static int RecuperoMateriale = 2004; -// } -// -// } - - - private List groups = new ArrayList<>(); public MenuConfiguration() { @@ -93,72 +63,6 @@ public class MenuConfiguration { - public MenuConfiguration addGroup(MenuGroup menuGroup) { - this.groups.add(menuGroup); - return this; - } - - public List getGroups() { - return groups; - } - - - public static class MenuGroup { - @StringRes private int mGroupText; - - private List mItems = new ArrayList<>(); - - public int getGroupText() { - return mGroupText; - } - - public MenuGroup setGroupText(@StringRes int groupText) { - mGroupText = groupText; - return this; - } - - public List getItems() { - return mItems; - } - - public MenuGroup addItem(MenuItem item) { - this.mItems.add(item); - return this; - } - } - - public static class MenuItem { - @IdRes private int mID; - @StringRes private int mTitleText; - @DrawableRes private int mTitleIcon; - - public int getID() { - return mID; - } - - public MenuItem setID(@IdRes int ID) { - this.mID = ID; - return this; - } - - public int getTitleText() { - return mTitleText; - } - - public MenuItem setTitleText(@StringRes int titleText) { - mTitleText = titleText; - return this; - } - - public int getTitleIcon() { - return mTitleIcon; - } - - public MenuItem setTitleIcon(@DrawableRes int titleIcon) { - mTitleIcon = titleIcon; - return this; - } - } } 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 66fe23b0..eee1f7ee 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 @@ -32,6 +32,7 @@ import it.integry.integrywmsnative.core.REST.model.DistribuzioneColloDTO; import it.integry.integrywmsnative.core.REST.watcher.ServerStatusChecker; 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.data_recover.ColliDataRecover; @@ -224,7 +225,7 @@ public class MainFragment extends Fragment implements ITitledFragment, IScrollab private void initGestMenu() { ICustomConfiguration customConfiguration = ClassRouter.getIstance(ClassRouter.PATH.CUSTOM_CONFIGURATION); - MenuConfiguration menuConfiguration = customConfiguration.getConfig(BaseCustomConfiguration.Keys.MENU_CONFIGURATION); + BaseMenuConfiguration menuConfiguration = customConfiguration.getConfig(BaseCustomConfiguration.Keys.MENU_CONFIGURATION); List menuGroups = menuConfiguration.getGroups(); diff --git a/dynamic_ime/src/main/java/it/integry/wms/dynamic_customization/extensions/CustomConfiguration.java b/dynamic_ime/src/main/java/it/integry/wms/dynamic_customization/extensions/CustomConfiguration.java index 8d2add83..8f1687ab 100644 --- a/dynamic_ime/src/main/java/it/integry/wms/dynamic_customization/extensions/CustomConfiguration.java +++ b/dynamic_ime/src/main/java/it/integry/wms/dynamic_customization/extensions/CustomConfiguration.java @@ -6,7 +6,7 @@ import it.integry.integrywmsnative.core.class_router.interfaces.ICustomConfigura public class CustomConfiguration extends BaseCustomConfiguration implements ICustomConfiguration { public CustomConfiguration() { - + configurations.put(Keys.MENU_CONFIGURATION, new MenuConfigurationIME()); } } 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 new file mode 100644 index 00000000..29d4173c --- /dev/null +++ b/dynamic_ime/src/main/java/it/integry/wms/dynamic_customization/extensions/MenuConfigurationIME.java @@ -0,0 +1,47 @@ +package it.integry.wms.dynamic_customization.extensions; + +import it.integry.integrywmsnative.core.class_router.configs.BaseMenuConfiguration; + +public class MenuConfigurationIME extends BaseMenuConfiguration { + + public MenuConfigurationIME() { + + this + .addGroup( + new MenuGroup() + .setGroupText(it.integry.integrywmsnative.R.string.general) + + .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)) + + .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)) + + .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)) + +// .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)) + ); + + } + +} diff --git a/dynamic_vgalimenti/src/main/java/it/integry/wms/dynamic_customization/extensions/CustomConfiguration.java b/dynamic_vgalimenti/src/main/java/it/integry/wms/dynamic_customization/extensions/CustomConfiguration.java index 6983cd84..14f39cdf 100644 --- a/dynamic_vgalimenti/src/main/java/it/integry/wms/dynamic_customization/extensions/CustomConfiguration.java +++ b/dynamic_vgalimenti/src/main/java/it/integry/wms/dynamic_customization/extensions/CustomConfiguration.java @@ -7,6 +7,7 @@ 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()); } } \ No newline at end of file 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 new file mode 100644 index 00000000..5b2d5213 --- /dev/null +++ b/dynamic_vgalimenti/src/main/java/it/integry/wms/dynamic_customization/extensions/MenuConfigurationVG.java @@ -0,0 +1,42 @@ +package it.integry.wms.dynamic_customization.extensions; + +import it.integry.integrywmsnative.core.class_router.configs.BaseMenuConfiguration; + +public class MenuConfigurationVG extends BaseMenuConfiguration { + + public MenuConfigurationVG() { + + this + .addGroup( + new MenuGroup() + .setGroupText(it.integry.integrywmsnative.R.string.general) + + .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)) + + .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)) + + .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)) + ); + + } + +} \ No newline at end of file