From 7814dff1eb87d7481309497a52914839ee04095e Mon Sep 17 00:00:00 2001 From: GiuseppeS Date: Tue, 15 Jan 2019 17:47:26 +0100 Subject: [PATCH] Implementato picking e home nel menu laterale. Modificate le stampanti delle gestioni. Creato layout con shortcut in HomePage. --- .../integrywmsnative/MainActivity.java | 35 +- .../di/binders/ExpandableLayoutBinders.java | 9 +- .../core/interfaces/ITitledFragment.java | 4 +- .../MainAccettazioneFragment.java | 9 +- ...eOnOrdineAccettazioneInevasoViewModel.java | 2 +- .../gest/main/MainFragment.java | 22 +- .../picking_libero/PickingLiberoActivity.java | 11 +- .../picking_libero/PickingLiberoFragment.java | 83 +++++ .../viewmodel/PickingLiberoViewModel.java | 16 +- .../RettificaGiacenzeFragment.java | 8 +- .../gest/settings/MainSettingsFragment.java | 6 +- .../settings/SettingsPreferenceFragment.java | 7 +- .../gest/vendita/MainVenditaFragment.java | 14 +- .../VenditaOrdineInevasoViewModel.java | 2 +- .../VersamentoMerceFragment.java | 6 +- app/src/main/res/drawable/ic_barcode_96.png | Bin 0 -> 1328 bytes app/src/main/res/drawable/ic_empty_box_96.png | Bin 0 -> 1051 bytes .../main/res/drawable/ic_load_shelf_96.png | Bin 0 -> 992 bytes .../res/layout/activity_picking_libero.xml | 278 +--------------- app/src/main/res/layout/fragment_main.xml | 116 ++++++- .../res/layout/fragment_picking_libero.xml | 301 ++++++++++++++++++ .../main/res/menu/activity_main_drawer.xml | 14 +- app/src/main/res/menu/fragment_vendita.xml | 10 +- app/src/main/res/values-it/strings.xml | 1 + app/src/main/res/values/colors.xml | 3 + app/src/main/res/values/strings.xml | 4 + 26 files changed, 610 insertions(+), 351 deletions(-) create mode 100644 app/src/main/java/it/integry/integrywmsnative/gest/picking_libero/PickingLiberoFragment.java create mode 100644 app/src/main/res/drawable/ic_barcode_96.png create mode 100644 app/src/main/res/drawable/ic_empty_box_96.png create mode 100644 app/src/main/res/drawable/ic_load_shelf_96.png create mode 100644 app/src/main/res/layout/fragment_picking_libero.xml diff --git a/app/src/main/java/it/integry/integrywmsnative/MainActivity.java b/app/src/main/java/it/integry/integrywmsnative/MainActivity.java index 9d51cbaf..1ff3cada 100644 --- a/app/src/main/java/it/integry/integrywmsnative/MainActivity.java +++ b/app/src/main/java/it/integry/integrywmsnative/MainActivity.java @@ -23,6 +23,7 @@ import android.widget.ImageView; import android.widget.LinearLayout; import android.widget.TextView; +import androidx.fragment.app.FragmentTransaction; import it.integry.integrywmsnative.core.REST.watcher.ServerStatusChecker; import it.integry.integrywmsnative.core.interfaces.IFilterableFragment; import it.integry.integrywmsnative.core.interfaces.IRecyclerFragment; @@ -35,6 +36,7 @@ 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.picking_libero.PickingLiberoFragment; import it.integry.integrywmsnative.gest.rettifica_giacenze.RettificaGiacenzeFragment; import it.integry.integrywmsnative.gest.settings.MainSettingsFragment; import it.integry.integrywmsnative.gest.vendita.MainVenditaFragment; @@ -72,7 +74,7 @@ public class MainActivity extends AppCompatActivity mBinding.navView.setNavigationItemSelectedListener(this); mBinding.appBarMain.mainSearch.setVisibility(View.GONE); - changeContentFragment(MainFragment.newInstance()); + popToMain(); init(); } @@ -92,10 +94,17 @@ public class MainActivity extends AppCompatActivity if (drawer.isDrawerOpen(GravityCompat.START)) { drawer.closeDrawer(GravityCompat.START); } else { - super.onBackPressed(); + int count = getSupportFragmentManager().getBackStackEntryCount(); + + if (count == 0) { + super.onBackPressed(); + } else { + getSupportFragmentManager().popBackStack(); + } } } + @Override public boolean onCreateOptionsMenu(Menu menu) { // Inflate the menu; this adds items to the action bar if it is present. @@ -132,9 +141,12 @@ public class MainActivity extends AppCompatActivity } else if (id == R.id.nav_rettifica_giacenze) { fragment = RettificaGiacenzeFragment.newInstance(); this.adaptViewToFragment(fragment); - } else if (id == R.id.nav_manage) { + } else if (id == R.id.nav_versamento_merce) { fragment = VersamentoMerceFragment.newInstance(); this.adaptViewToFragment(fragment); + } else if (id == R.id.nav_free_picking) { + fragment = PickingLiberoFragment.newInstance(); + this.adaptViewToFragment(fragment); } else if(id == R.id.nav_settings){ @@ -147,7 +159,7 @@ public class MainActivity extends AppCompatActivity startLoginActivity(); } - changeContentFragment(fragment); + changeContentFragment(fragment, true); DrawerLayout drawer = findViewById(R.id.drawer_layout); drawer.closeDrawer(GravityCompat.START); @@ -159,7 +171,7 @@ public class MainActivity extends AppCompatActivity adaptViewToFragment(mainFragment); - changeContentFragment(mainFragment); + changeContentFragment(mainFragment, false); } private void adaptViewToFragment(Fragment fragment){ @@ -173,7 +185,7 @@ public class MainActivity extends AppCompatActivity if(fragment instanceof ITitledFragment) { - getSupportActionBar().setTitle(((ITitledFragment) fragment).getTitle(this)); + ((ITitledFragment) fragment).onCreateActionBar(getSupportActionBar(), this); } else { getSupportActionBar().setTitle(R.string.app_name); } @@ -199,11 +211,16 @@ public class MainActivity extends AppCompatActivity } } - private void changeContentFragment(Fragment fragment){ + private void changeContentFragment(Fragment fragment, boolean addToBackStack){ if (fragment != null) { FragmentManager fragmentManager = getSupportFragmentManager(); - fragmentManager.beginTransaction() - .replace(R.id.frame_container, fragment).commit(); + FragmentTransaction ft = fragmentManager + .beginTransaction() + .replace(R.id.frame_container, fragment); + + if(addToBackStack) ft.addToBackStack(fragment.getTag()); + + ft.commit(); } } diff --git a/app/src/main/java/it/integry/integrywmsnative/core/di/binders/ExpandableLayoutBinders.java b/app/src/main/java/it/integry/integrywmsnative/core/di/binders/ExpandableLayoutBinders.java index 6bf97479..be166fae 100644 --- a/app/src/main/java/it/integry/integrywmsnative/core/di/binders/ExpandableLayoutBinders.java +++ b/app/src/main/java/it/integry/integrywmsnative/core/di/binders/ExpandableLayoutBinders.java @@ -19,12 +19,9 @@ public class ExpandableLayoutBinders { view.setOnExpansionUpdateListener(null); } - ExpandableLayout.OnExpansionUpdateListener watcher = new ExpandableLayout.OnExpansionUpdateListener() { - @Override - public void onExpansionUpdate(float expansionFraction, int state) { - if(view.isExpanded() == bindableBoolean.get()) return; - bindableBoolean.set(state == 1); - } + ExpandableLayout.OnExpansionUpdateListener watcher = (expansionFraction, state) -> { + if(view.isExpanded() == bindableBoolean.get()) return; + bindableBoolean.set(state == 1); }; view.setTag(R.id.bound_observable, new Pair<>(bindableBoolean, watcher)); diff --git a/app/src/main/java/it/integry/integrywmsnative/core/interfaces/ITitledFragment.java b/app/src/main/java/it/integry/integrywmsnative/core/interfaces/ITitledFragment.java index 4acc415b..716c682f 100644 --- a/app/src/main/java/it/integry/integrywmsnative/core/interfaces/ITitledFragment.java +++ b/app/src/main/java/it/integry/integrywmsnative/core/interfaces/ITitledFragment.java @@ -2,12 +2,14 @@ package it.integry.integrywmsnative.core.interfaces; import android.content.Context; +import androidx.appcompat.app.ActionBar; + /** * Created by GiuseppeS on 07/03/2018. */ public interface ITitledFragment { - String getTitle(Context context); + void onCreateActionBar(ActionBar actionBar, Context context); } diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/accettazione/MainAccettazioneFragment.java b/app/src/main/java/it/integry/integrywmsnative/gest/accettazione/MainAccettazioneFragment.java index 994a339c..e6483cb3 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/accettazione/MainAccettazioneFragment.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/accettazione/MainAccettazioneFragment.java @@ -4,6 +4,8 @@ package it.integry.integrywmsnative.gest.accettazione; import android.app.ProgressDialog; import android.content.Context; import android.content.Intent; + +import androidx.appcompat.app.ActionBar; import androidx.databinding.DataBindingUtil; import android.os.Bundle; import androidx.fragment.app.Fragment; @@ -69,9 +71,12 @@ public class MainAccettazioneFragment extends Fragment implements SearchView.OnQ return fragment; } + + + @Override - public String getTitle(Context context){ - return context.getText(R.string.accettazione_title_fragment).toString(); + public void onCreateActionBar(ActionBar actionBar, Context context) { + actionBar.setTitle(context.getText(R.string.accettazione_title_fragment).toString()); } @Override diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_ordine_inevaso/viewmodel/AccettazioneOnOrdineAccettazioneInevasoViewModel.java b/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_ordine_inevaso/viewmodel/AccettazioneOnOrdineAccettazioneInevasoViewModel.java index 6f76eb38..805b6e0d 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_ordine_inevaso/viewmodel/AccettazioneOnOrdineAccettazioneInevasoViewModel.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_ordine_inevaso/viewmodel/AccettazioneOnOrdineAccettazioneInevasoViewModel.java @@ -571,7 +571,7 @@ public class AccettazioneOnOrdineAccettazioneInevasoViewModel implements IOnColl return; } - PrinterRESTConsumer.getAvailablePrinters(SettingsManager.i().userSession.depo.getCodMdep(), new ISimpleOperationCallback>() { + PrinterRESTConsumer.getAvailablePrinters(SettingsManager.i().userSession.depo.getCodMdep(), PrinterRESTConsumer.Type.SECONDARIA, new ISimpleOperationCallback>() { @Override public void onSuccess(List value) { 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 d2c108b3..c95419d8 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 @@ -3,6 +3,8 @@ package it.integry.integrywmsnative.gest.main; import android.content.Context; import android.os.Bundle; + +import androidx.appcompat.app.ActionBar; import androidx.fragment.app.Fragment; import android.view.LayoutInflater; import android.view.View; @@ -95,9 +97,10 @@ public class MainFragment extends Fragment implements ITitledFragment { } + @Override - public String getTitle(Context context) { - return context.getString(R.string.app_name); + public void onCreateActionBar(ActionBar actionBar, Context context) { + actionBar.setTitle(context.getText(R.string.app_name).toString()); } @OnClick(R.id.fast_button_accettazione) @@ -110,4 +113,19 @@ public class MainFragment extends Fragment implements ITitledFragment { ((MainActivity) getActivity()).setItem(R.id.nav_spedizione); } + @OnClick(R.id.fast_button_rettifica_giacenze) + public void onClickRettificaGiacenze(View view) { + ((MainActivity) getActivity()).setItem(R.id.nav_rettifica_giacenze); + } + + @OnClick(R.id.fast_button_versamento) + public void onClickVersamento(View view) { + ((MainActivity) getActivity()).setItem(R.id.nav_versamento_merce); + } + + @OnClick(R.id.fast_button_picking_libero) + public void onClickPickingLibero(View view) { + ((MainActivity) getActivity()).setItem(R.id.nav_free_picking); + } + } diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/picking_libero/PickingLiberoActivity.java b/app/src/main/java/it/integry/integrywmsnative/gest/picking_libero/PickingLiberoActivity.java index 7dc16672..03e9e151 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/picking_libero/PickingLiberoActivity.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/picking_libero/PickingLiberoActivity.java @@ -27,13 +27,13 @@ public class PickingLiberoActivity extends AppCompatActivity { mBindings = DataBindingUtil.setContentView(this, R.layout.activity_picking_libero); mHelper = new PickingLiberoHelper(this); - +/* mViewModel = new PickingLiberoViewModel(); - mViewModel.init(this, mBindings, mHelper); + mViewModel.init(this, mBindings, mHelper, getSupportActionBar()); mBindings.setViewmodel(mViewModel); - setSupportActionBar(this.mBindings.toolbar); + setSupportActionBar(this.mBindings.layout.toolbar); getSupportActionBar().setDisplayHomeAsUpEnabled(true); getSupportActionBar().setDisplayShowTitleEnabled(false); @@ -42,11 +42,12 @@ public class PickingLiberoActivity extends AppCompatActivity { .setOnScanFailed(ex -> UtilityExceptions.defaultException(this, ex, false))); - mBindings.waterfallToolbar.setNestedScrollView(mBindings.scrollView); + mBindings.layout.waterfallToolbar.setNestedScrollView(mBindings.layout.scrollView); + */ } public void setTitle(String title) { - mBindings.toolbarTitle.setText(title); + mBindings.layout.toolbarTitle.setText(title); } @Override diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/picking_libero/PickingLiberoFragment.java b/app/src/main/java/it/integry/integrywmsnative/gest/picking_libero/PickingLiberoFragment.java new file mode 100644 index 00000000..c0b3916a --- /dev/null +++ b/app/src/main/java/it/integry/integrywmsnative/gest/picking_libero/PickingLiberoFragment.java @@ -0,0 +1,83 @@ +package it.integry.integrywmsnative.gest.picking_libero; + + +import android.content.Context; +import android.os.Bundle; +import androidx.fragment.app.Fragment; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; + +import androidx.appcompat.app.ActionBar; +import androidx.databinding.DataBindingUtil; +import it.integry.integrywmsnative.R; +import it.integry.integrywmsnative.core.barcode_reader.BarcodeCallbackDTO; +import it.integry.integrywmsnative.core.barcode_reader.BarcodeManager; +import it.integry.integrywmsnative.core.interfaces.ITitledFragment; +import it.integry.integrywmsnative.core.utility.UtilityExceptions; +import it.integry.integrywmsnative.databinding.FragmentPickingLiberoBinding; +import it.integry.integrywmsnative.gest.picking_libero.core.PickingLiberoHelper; +import it.integry.integrywmsnative.gest.picking_libero.viewmodel.PickingLiberoViewModel; + +/** + * A simple {@link Fragment} subclass. + */ +public class PickingLiberoFragment extends Fragment implements ITitledFragment { + + private FragmentPickingLiberoBinding mBindings; + + private PickingLiberoHelper mHelper; + private PickingLiberoViewModel mViewModel; + + private ActionBar mAppCompatActionBar; + + private int barcodeScannerIstanceID = -1; + + public PickingLiberoFragment() { + // Required empty public constructor + } + + public static PickingLiberoFragment newInstance() { + PickingLiberoFragment fragment = new PickingLiberoFragment(); + Bundle args = new Bundle(); + fragment.setArguments(args); + return fragment; + } + + @Override + public void onCreateActionBar(ActionBar actionBar, Context context) { + mAppCompatActionBar = actionBar; + mAppCompatActionBar.setTitle(context.getText(R.string.free_picking_title_fragment).toString()); + } + + @Override + public void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + } + + + + @Override + public View onCreateView(LayoutInflater inflater, ViewGroup container, + Bundle savedInstanceState) { + // Inflate the layout for this fragment + mBindings = DataBindingUtil.inflate(inflater, R.layout.fragment_picking_libero, container, false); + + mHelper = new PickingLiberoHelper(getActivity()); + + mViewModel = new PickingLiberoViewModel(); + mViewModel.init(getActivity(), mBindings, mHelper, mAppCompatActionBar); + + mBindings.setViewmodel(mViewModel); + + barcodeScannerIstanceID = BarcodeManager.addCallback(new BarcodeCallbackDTO() + .setOnScanSuccessfull(mViewModel.onScanSuccessfull) + .setOnScanFailed(ex -> UtilityExceptions.defaultException(getActivity(), ex, false))); + + + mBindings.waterfallToolbar.setNestedScrollView(mBindings.scrollView); + + return mBindings.getRoot(); + } + +} diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/picking_libero/viewmodel/PickingLiberoViewModel.java b/app/src/main/java/it/integry/integrywmsnative/gest/picking_libero/viewmodel/PickingLiberoViewModel.java index 6768e4bf..87aba666 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/picking_libero/viewmodel/PickingLiberoViewModel.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/picking_libero/viewmodel/PickingLiberoViewModel.java @@ -2,6 +2,7 @@ package it.integry.integrywmsnative.gest.picking_libero.viewmodel; import android.app.Activity; import android.app.ProgressDialog; +import android.content.Context; import android.text.SpannableString; import android.view.View; @@ -15,6 +16,7 @@ import java.util.Iterator; import java.util.List; import androidx.annotation.NonNull; +import androidx.appcompat.app.ActionBar; import androidx.core.content.ContextCompat; import androidx.databinding.Observable; import androidx.databinding.ObservableArrayList; @@ -45,6 +47,7 @@ import it.integry.integrywmsnative.core.utility.UtilityNumber; import it.integry.integrywmsnative.core.utility.UtilityProgress; import it.integry.integrywmsnative.core.utility.UtilityString; import it.integry.integrywmsnative.databinding.ActivityPickingLiberoBinding; +import it.integry.integrywmsnative.databinding.FragmentPickingLiberoBinding; import it.integry.integrywmsnative.gest.picking_libero.PickingLiberoActivity; import it.integry.integrywmsnative.gest.picking_libero.core.PickingLiberoHelper; import it.integry.integrywmsnative.gest.picking_libero.core.PickingLiberoListAdapter; @@ -67,16 +70,19 @@ public class PickingLiberoViewModel implements IRecyclerItemClicked { private BottomSheetBehavior mBottomSheetBehavior; - private PickingLiberoActivity mContext; - private ActivityPickingLiberoBinding mBinding; + private Activity mContext; + private FragmentPickingLiberoBinding mBinding; private PickingLiberoHelper mHelper; + private ActionBar mAppCompatActionBar; + private PickingLiberoListAdapter mAdapter; - public void init(PickingLiberoActivity context, ActivityPickingLiberoBinding binding, PickingLiberoHelper helper) { + public void init(Activity context, FragmentPickingLiberoBinding binding, PickingLiberoHelper helper, ActionBar appCompatActionBar) { mContext = context; mBinding = binding; mHelper = helper; + mAppCompatActionBar = appCompatActionBar; initObservable(); @@ -101,14 +107,14 @@ public class PickingLiberoViewModel implements IRecyclerItemClicked { if(mtbColt.get() != null) { initAdapter(); - mContext.setTitle(String.format(mContext.getText(R.string.lu_number_text).toString(), mtbColt.get().getNumCollo())); + mAppCompatActionBar.setTitle(String.format(mContext.getText(R.string.lu_number_text).toString(), mtbColt.get().getNumCollo())); initObservableMtbColr(); } else { destroyAdapter(); - mContext.setTitle(mContext.getText(R.string.free_picking).toString()); + mAppCompatActionBar.setTitle(mContext.getText(R.string.free_picking).toString()); } thereIsAnOpenedUL.set(mtbColt.get() != null); diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/rettifica_giacenze/RettificaGiacenzeFragment.java b/app/src/main/java/it/integry/integrywmsnative/gest/rettifica_giacenze/RettificaGiacenzeFragment.java index 23b0e531..0df6c53b 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/rettifica_giacenze/RettificaGiacenzeFragment.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/rettifica_giacenze/RettificaGiacenzeFragment.java @@ -2,6 +2,8 @@ package it.integry.integrywmsnative.gest.rettifica_giacenze; import android.content.Context; import android.content.res.ColorStateList; + +import androidx.appcompat.app.ActionBar; import androidx.databinding.DataBindingUtil; import android.os.Bundle; import androidx.fragment.app.Fragment; @@ -99,15 +101,13 @@ public class RettificaGiacenzeFragment extends Fragment implements ITitledFragme super.onDetach(); } - @Override - public String getTitle(Context context) { - return context.getResources().getString(R.string.rettifica_giacenze_fragment_title); + public void onCreateActionBar(ActionBar actionBar, Context context) { + actionBar.setTitle(context.getText(R.string.rettifica_giacenze_fragment_title).toString()); } - public void setUIToForn() { mBinding.rettificaGiacenzeFornCheckBox.setChecked(true); mBinding.rettificaGiacenzeFornLayout.setBackground(getActivity().getResources().getDrawable(R.drawable.circular_background_left)); diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/settings/MainSettingsFragment.java b/app/src/main/java/it/integry/integrywmsnative/gest/settings/MainSettingsFragment.java index 6c100d67..05198329 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/settings/MainSettingsFragment.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/settings/MainSettingsFragment.java @@ -1,6 +1,8 @@ package it.integry.integrywmsnative.gest.settings; import android.content.Context; + +import androidx.appcompat.app.ActionBar; import androidx.databinding.DataBindingUtil; import android.os.Bundle; import androidx.fragment.app.Fragment; @@ -29,8 +31,8 @@ public class MainSettingsFragment extends Fragment implements ITitledFragment { } @Override - public String getTitle(Context context){ - return context.getText(R.string.settings_category).toString(); + public void onCreateActionBar(ActionBar actionBar, Context context) { + actionBar.setTitle(context.getText(R.string.settings_category).toString()); } @Override diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/settings/SettingsPreferenceFragment.java b/app/src/main/java/it/integry/integrywmsnative/gest/settings/SettingsPreferenceFragment.java index 6b52e234..5b209fba 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/settings/SettingsPreferenceFragment.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/settings/SettingsPreferenceFragment.java @@ -2,6 +2,8 @@ package it.integry.integrywmsnative.gest.settings; import android.content.Context; import android.os.Bundle; + +import androidx.appcompat.app.ActionBar; import androidx.preference.CheckBoxPreference; import androidx.preference.EditTextPreference; import androidx.preference.ListPreference; @@ -43,10 +45,9 @@ public class SettingsPreferenceFragment extends PreferenceFragmentCompat impleme } - @Override - public String getTitle(Context context) { - return context.getText(R.string.settings_category).toString(); + public void onCreateActionBar(ActionBar actionBar, Context context) { + actionBar.setTitle(context.getText(R.string.settings_category).toString()); } diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/vendita/MainVenditaFragment.java b/app/src/main/java/it/integry/integrywmsnative/gest/vendita/MainVenditaFragment.java index 1fd2f6a1..c103f461 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/vendita/MainVenditaFragment.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/vendita/MainVenditaFragment.java @@ -3,6 +3,8 @@ package it.integry.integrywmsnative.gest.vendita; import android.app.ProgressDialog; import android.content.Context; import android.content.Intent; + +import androidx.appcompat.app.ActionBar; import androidx.databinding.DataBindingUtil; import android.os.Bundle; import androidx.fragment.app.Fragment; @@ -81,8 +83,8 @@ public class MainVenditaFragment extends Fragment implements ITitledFragment, IR } @Override - public String getTitle(Context context){ - return context.getText(R.string.vendita_title_fragment).toString(); + public void onCreateActionBar(ActionBar actionBar, Context context) { + actionBar.setTitle(context.getText(R.string.vendita_title_fragment).toString()); } @Override @@ -129,10 +131,10 @@ public class MainVenditaFragment extends Fragment implements ITitledFragment, IR @Override public boolean onOptionsItemSelected(MenuItem item) { - if(item.getItemId() == R.id.action_free_picking) { - Intent myIntent = new Intent(getActivity(), PickingLiberoActivity.class); - startActivity(myIntent); - } +// if(item.getItemId() == R.id.action_free_picking) { +// Intent myIntent = new Intent(getActivity(), PickingLiberoActivity.class); +// startActivity(myIntent); +// } return true; diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/vendita_ordine_inevaso/viewmodel/VenditaOrdineInevasoViewModel.java b/app/src/main/java/it/integry/integrywmsnative/gest/vendita_ordine_inevaso/viewmodel/VenditaOrdineInevasoViewModel.java index 59b25dc1..00ab4d09 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/vendita_ordine_inevaso/viewmodel/VenditaOrdineInevasoViewModel.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/vendita_ordine_inevaso/viewmodel/VenditaOrdineInevasoViewModel.java @@ -745,7 +745,7 @@ public class VenditaOrdineInevasoViewModel implements IOnColloClosedCallback, IO DialogAskShouldPrint.make(mActivity, "Packing List", shouldPrint -> { if(shouldPrint) { - PrinterRESTConsumer.getAvailablePrinters(SettingsManager.i().userSession.depo.getCodMdep(), PrinterRESTConsumer.Type.SECONDARIA, new ISimpleOperationCallback>() { + PrinterRESTConsumer.getAvailablePrinters(SettingsManager.i().userSession.depo.getCodMdep(), PrinterRESTConsumer.Type.PRIMARIA, new ISimpleOperationCallback>() { @Override public void onSuccess(List value) { diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/versamento_merce/VersamentoMerceFragment.java b/app/src/main/java/it/integry/integrywmsnative/gest/versamento_merce/VersamentoMerceFragment.java index 8a354e1c..f7ec7157 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/versamento_merce/VersamentoMerceFragment.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/versamento_merce/VersamentoMerceFragment.java @@ -1,6 +1,8 @@ package it.integry.integrywmsnative.gest.versamento_merce; import android.content.Context; + +import androidx.appcompat.app.ActionBar; import androidx.databinding.DataBindingUtil; import android.os.Bundle; import androidx.fragment.app.Fragment; @@ -83,7 +85,7 @@ public class VersamentoMerceFragment extends Fragment implements ITitledFragment } @Override - public String getTitle(Context context) { - return context.getResources().getString(R.string.versamento_merce_fragment_title); + public void onCreateActionBar(ActionBar actionBar, Context context) { + actionBar.setTitle(context.getText(R.string.versamento_merce_fragment_title).toString()); } } diff --git a/app/src/main/res/drawable/ic_barcode_96.png b/app/src/main/res/drawable/ic_barcode_96.png new file mode 100644 index 0000000000000000000000000000000000000000..05971ffb49d01ae97b4c984d051dd6c51624bc16 GIT binary patch literal 1328 zcmeAS@N?(olHy`uVBq!ia0vp^2_VeD1|%QND7OGojKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBugD~Uq{1qucHAg*N978JN-rn)ffhJW3Qv3_;d$;%ffA>AhKCFG_)wD@h+ah!QB6DY4ZCiUaFm3D1l&y(j zvxCE=)3zpNmrjYyRRhUAn*vgHBT6E3|NH03iSVYaI&ub^gbv ar~b))bK<2v4~hayIR;NxKbLh*2~7a&la!$V literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable/ic_empty_box_96.png b/app/src/main/res/drawable/ic_empty_box_96.png new file mode 100644 index 0000000000000000000000000000000000000000..bf75102dd98d905ba5fa6d2cce2f5f12b95270a6 GIT binary patch literal 1051 zcmeAS@N?(olHy`uVBq!ia0vp^2_VeD1|%QND7OGojKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBugD~Uq{1qt-49pumT^vIy;@-|V-N%zC(H5QbwC2Wb1rL_; z2PN!$+>Z(v*EN|6iRn3c+=x_+*dSsSVR=MR(8-B~^S!mP>Hqsz-=DeSb3HsX_^;i` z$v(TXU;W*mzw7tvRm<3pNhJ3eLWrJ&Wfj78jsL5ZvUf5@MlZj~w%;k#MLs1rIx&4G z`_)6gRkGix9A6k!AfLK+ZjxvX@71K=8ri95=RRZ#;eNY$%}(K*M*D?PDf3g$uGw3< z&Uxzr&k0+%pK@FwHtn}$UfXHjbu+WWO`mRJU%Nrbt~o1k=ko_etq_qnu8&Kq3QaHG z6pwswtqpfRZ^+-E7MlGoR^pWAil$=g@>y}hq59kBG$^iVmS4cN^<;U0?wYyU0j#$I z^$$heWd83Un&$qOxBPI_3ag5@8~!|M+bccWIDqv=t1aj8B-<|!Vt2h)m82QZNF<+L(}Gly%emrWnq7> zzQXLBt*%`6gy|)g2FIWxu^z;I|a^9F~7euPUkCbc_4Tx@YNo z*%e|&otwma?=PC!IQ@Z2z0Ah4Zws#ePA*pa@bsv}gQu&X%Q~loCIDVy;9&p& literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable/ic_load_shelf_96.png b/app/src/main/res/drawable/ic_load_shelf_96.png new file mode 100644 index 0000000000000000000000000000000000000000..7586f3a93ead690b38703c55cecd3ea18e18f44c GIT binary patch literal 992 zcmeAS@N?(olHy`uVBq!ia0vp^2_VeD1|%QND7OGojKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBugD~Uq{1qt-49umTE{-7;ac}3IUM1`(;`-hrkj2%Jwe(r^ zdv=aKmj90R2l)%0h+7D-in6jdF&|~`Fm_b;`@`_ns`Q!1$5y2ux1=uxoG_caBzRtM z?YSn_=}*GGt_$|`(0aLUs*2|%2vXg^rGF^=1NWc1J7f-fpD>hd&5Pt;e_(z9ZwgOQ z&h&>?FSyvMxI$kT{$klRt0g;tRd#dDw%rZuyOZl~{+w?AKrrK+>Ix>e4@@TQ?*&43 zaO`V%R@0;v!(v%h9J0Y<)?z2uOERKblb)>zm}uhO+O@<|D@5gN;6kO$J}yzuVx@Y4 z-yCNv8A5k(+-raKrv3dwE{inFXL~QO?tTz^V)+s-Yc+cZyH9sT>|ySm@uu-lfly*> zNAi5EzsNLGcc!0MVSGyZVp z9}fP&aEB#!p;Q0C_z!F)8}AwOita1@xx$`zwgc~i)ScT(Wz3qTTvnTf*DPYYw8&R% z{)&TJ(l#Ge&vMYcS@O~I^nK>@QGawNh^tgufBf~tOnggK-GMbn?{mf<-hcbE*}ZhX z?&s`0x^>HEduF`+(@@#9pDk2==^uIV$p&g^x^?M(hlFl2KG&>Mzr7*XsKK@S{>;e+ z4GWLHKjRs}Al7r;GL$ve<=fQB2Fj=PK#F;C+D*IepWIj3mp$s}o*(T>Suaf}ut4^MI|Z9~wvSu7A!xr{S^%f9P(hPZ3ui-0HGgu{HgH ziP@p(4bN1+-Tdx*B01Dq_C|C01EYZ2>A-laoN)fk*#eDK?}Lg%H1y{+I|u%q1`?iV zzu}R%n{xn!_lZ~L(`Tov=_@U@rkGcD{%tN045?oVjBUBUZ08U07RZIfgLw0vn%>{R zb8u-_9G1M2o3~B}f>c}cIlnVF?t3n(qWcz5)2t9T(Y+=s zd$g)DgCs-0Tv}qZ>cvve)EyPex%?~B0)l3`2Z+wMYw=9|u`TLvNo)Ks`KFWg38Hpw j_tih;-!q#qb*g>O8s8S)U3UtAxst)t)z4*}Q$iB}lwZBs literal 0 HcmV?d00001 diff --git a/app/src/main/res/layout/activity_picking_libero.xml b/app/src/main/res/layout/activity_picking_libero.xml index 8aad8891..48476662 100644 --- a/app/src/main/res/layout/activity_picking_libero.xml +++ b/app/src/main/res/layout/activity_picking_libero.xml @@ -19,281 +19,9 @@ android:layout_height="match_parent"> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + diff --git a/app/src/main/res/layout/fragment_main.xml b/app/src/main/res/layout/fragment_main.xml index 34228f99..187dc478 100644 --- a/app/src/main/res/layout/fragment_main.xml +++ b/app/src/main/res/layout/fragment_main.xml @@ -168,7 +168,7 @@ android:textStyle="bold"/> @@ -180,52 +180,134 @@ android:weightSum="1"> - + android:text="Accettazione" + android:gravity="center_horizontal"/> - + android:text="Spedizione" + android:gravity="center_horizontal"/> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/res/layout/fragment_picking_libero.xml b/app/src/main/res/layout/fragment_picking_libero.xml new file mode 100644 index 00000000..761633d3 --- /dev/null +++ b/app/src/main/res/layout/fragment_picking_libero.xml @@ -0,0 +1,301 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/menu/activity_main_drawer.xml b/app/src/main/res/menu/activity_main_drawer.xml index 338be150..7f15be9d 100644 --- a/app/src/main/res/menu/activity_main_drawer.xml +++ b/app/src/main/res/menu/activity_main_drawer.xml @@ -8,20 +8,24 @@ android:title="Home" /> + + + + + diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index 71a968a0..e86eca4f 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -176,5 +176,6 @@ Picking libero Per iniziare clicca sul + in basso a destra Scansiona un articolo per iniziare + Picking libero \ No newline at end of file diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index 9b2037d0..25c8acae 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -29,6 +29,7 @@ #1976D2 + #795548 #884CAF50 #4CAF50 @@ -57,6 +58,8 @@ #D32F2F + #009688 + #FDD835 diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 43023096..c115924b 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -25,6 +25,7 @@ Check out Inventory Items placement + Free picking Error Ops Warning @@ -178,4 +179,7 @@ Please press + button to start with picking Scan an item to start + + Hello blank fragment +