diff --git a/app/src/main/java/it/integry/integrywmsnative/MainActivity.java b/app/src/main/java/it/integry/integrywmsnative/MainActivity.java index da6f1864..018ab5a8 100644 --- a/app/src/main/java/it/integry/integrywmsnative/MainActivity.java +++ b/app/src/main/java/it/integry/integrywmsnative/MainActivity.java @@ -147,10 +147,11 @@ public class MainActivity extends AppCompatActivity } else if (id == R.id.nav_free_picking) { fragment = PickingLiberoFragment.newInstance(); this.adaptViewToFragment(fragment); - } else if (id == R.id.nav_resi_cliente) { - fragment = UltimeConsegneClienteFragment.newInstance(); - this.adaptViewToFragment(fragment); } +// else if (id == R.id.nav_resi_cliente) { +// fragment = UltimeConsegneClienteFragment.newInstance(); +// this.adaptViewToFragment(fragment); +// } else if(id == R.id.nav_settings){ fragment = new MainSettingsFragment(); 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 247cc912..7c69e828 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 @@ -217,10 +217,10 @@ public class MainFragment extends Fragment implements ITitledFragment, IScrollab ((MainActivity) getActivity()).setItem(R.id.nav_free_picking); } - @OnClick(R.id.fast_button_resi_clienti) - public void onClickResiClientio(View view) { - ((MainActivity) getActivity()).setItem(R.id.nav_resi_cliente); - } +// @OnClick(R.id.fast_button_resi_clienti) +// public void onClickResiClientio(View view) { +// ((MainActivity) getActivity()).setItem(R.id.nav_resi_cliente); +// } @Override public void setScrollToolbar(ElevatedToolbar toolbar) { diff --git a/app/src/main/res/layout/fragment_main.xml b/app/src/main/res/layout/fragment_main.xml index 4764d766..37c326af 100644 --- a/app/src/main/res/layout/fragment_main.xml +++ b/app/src/main/res/layout/fragment_main.xml @@ -391,42 +391,42 @@ - + + + + + + + + - + + + + + + - + + + + + - + + + + + + + + + - - + + diff --git a/app/src/main/res/menu/activity_main_drawer.xml b/app/src/main/res/menu/activity_main_drawer.xml index 92ea3218..eac2cdab 100644 --- a/app/src/main/res/menu/activity_main_drawer.xml +++ b/app/src/main/res/menu/activity_main_drawer.xml @@ -26,10 +26,10 @@ android:id="@+id/nav_free_picking" android:icon="@drawable/ic_barcode_96" android:title="@string/free_picking" /> - + + + +