From 0acf02355689b7a5993eb62e54406c314df7abc5 Mon Sep 17 00:00:00 2001 From: GiuseppeS Date: Thu, 7 Jul 2022 17:51:46 +0200 Subject: [PATCH] Creata UI per smartphone del rientro merce --- .idea/deploymentTargetDropDown.xml | 23 +- .../core/expansion/BaseFragment.java | 5 +- .../IOrdersLoadingListener.java | 9 + .../core/rest/consumers/MesRESTConsumer.java | 2 +- .../ProdRientroMerceFragment.java | 92 ++- .../ProdRientroMerceViewModel.java | 17 +- .../ProdRientroMerceOrderDetailFragment.java | 15 +- .../ProdRientroMerceOrderListFragment.java | 25 +- app/src/main/res/drawable/ripple_effect.xml | 13 - ...agment_prod_rientro_merce_order_detail.xml | 712 ++++++++++++++++++ .../activity_contab_doc_interni_edit.xml | 2 +- .../layout/activity_prod_dettaglio_linea.xml | 2 +- .../activity_pv_ordine_acquisto_edit.xml | 2 +- .../main/res/layout/activity_spedizione.xml | 4 +- .../dialog_basket_lu__mtb_colt_model.xml | 2 +- .../layout/fragment_prod_rientro_merce.xml | 16 +- ...agment_prod_rientro_merce_order_detail.xml | 17 +- ...erce_order_detail__mtb_colt_item_model.xml | 2 +- ...fragment_prod_rientro_merce_order_list.xml | 122 +-- ...tro_merce_order_list__list_group_model.xml | 166 ++-- .../res/layout/lista_bancali_list_model.xml | 2 +- .../layout/picking_resi_main_list__item.xml | 2 +- app/src/main/res/values-large/values.xml | 6 + app/src/main/res/values/values.xml | 6 + 24 files changed, 1054 insertions(+), 210 deletions(-) create mode 100644 app/src/main/java/it/integry/integrywmsnative/core/interfaces/viewmodel_listeners/IOrdersLoadingListener.java delete mode 100644 app/src/main/res/drawable/ripple_effect.xml create mode 100644 app/src/main/res/layout-large/fragment_prod_rientro_merce_order_detail.xml create mode 100644 app/src/main/res/values-large/values.xml create mode 100644 app/src/main/res/values/values.xml diff --git a/.idea/deploymentTargetDropDown.xml b/.idea/deploymentTargetDropDown.xml index 2850b67a..6d7535b1 100644 --- a/.idea/deploymentTargetDropDown.xml +++ b/.idea/deploymentTargetDropDown.xml @@ -1,13 +1,34 @@ + + + + + + + + + + + + - + + + + + + + + + + diff --git a/app/src/main/java/it/integry/integrywmsnative/core/expansion/BaseFragment.java b/app/src/main/java/it/integry/integrywmsnative/core/expansion/BaseFragment.java index dfcb3aea..a6f5dd6a 100644 --- a/app/src/main/java/it/integry/integrywmsnative/core/expansion/BaseFragment.java +++ b/app/src/main/java/it/integry/integrywmsnative/core/expansion/BaseFragment.java @@ -99,6 +99,10 @@ public abstract class BaseFragment extends Fragment { } } + public boolean onBackPressed() { + return false; + } + protected void popMe() { if (requireActivity() instanceof IPoppableActivity) { requireActivity().runOnUiThread(() -> { @@ -107,6 +111,5 @@ public abstract class BaseFragment extends Fragment { } else { requireActivity().getSupportFragmentManager().popBackStack(); } - } } diff --git a/app/src/main/java/it/integry/integrywmsnative/core/interfaces/viewmodel_listeners/IOrdersLoadingListener.java b/app/src/main/java/it/integry/integrywmsnative/core/interfaces/viewmodel_listeners/IOrdersLoadingListener.java new file mode 100644 index 00000000..ae6e0e50 --- /dev/null +++ b/app/src/main/java/it/integry/integrywmsnative/core/interfaces/viewmodel_listeners/IOrdersLoadingListener.java @@ -0,0 +1,9 @@ +package it.integry.integrywmsnative.core.interfaces.viewmodel_listeners; + +public interface IOrdersLoadingListener { + + void onOrderLoadingStarted(); + + void onOrderLoadingEnded(); + +} diff --git a/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/MesRESTConsumer.java b/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/MesRESTConsumer.java index 85d91398..c48bbd10 100644 --- a/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/MesRESTConsumer.java +++ b/app/src/main/java/it/integry/integrywmsnative/core/rest/consumers/MesRESTConsumer.java @@ -50,7 +50,7 @@ public class MesRESTConsumer extends _BaseRESTConsumer { MesRESTConsumerService mesRESTConsumerService = RESTBuilder.getService(MesRESTConsumerService.class); mesRESTConsumerService.getOrdiniLavorazione(flagEvaso, codJfas) - .enqueue(new Callback>>() { + .enqueue(new Callback<>() { @Override public void onResponse(Call>> call, Response>> response) { analyzeAnswer(response, "getOrdiniLavorazione", (m) -> onComplete.run(response.body().getDto()), onFailed); diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/prod_rientro_merce/ProdRientroMerceFragment.java b/app/src/main/java/it/integry/integrywmsnative/gest/prod_rientro_merce/ProdRientroMerceFragment.java index 735dd909..2914278a 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/prod_rientro_merce/ProdRientroMerceFragment.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/prod_rientro_merce/ProdRientroMerceFragment.java @@ -11,6 +11,7 @@ import androidx.annotation.NonNull; import androidx.annotation.Nullable; import androidx.appcompat.widget.AppCompatTextView; import androidx.databinding.DataBindingUtil; +import androidx.databinding.ObservableField; import java.util.ArrayList; import java.util.List; @@ -19,7 +20,9 @@ import javax.inject.Inject; import it.integry.integrywmsnative.MainApplication; import it.integry.integrywmsnative.R; +import it.integry.integrywmsnative.core.barcode_reader.BarcodeManager; import it.integry.integrywmsnative.core.expansion.BaseFragment; +import it.integry.integrywmsnative.core.interfaces.ILifecycleFragment; import it.integry.integrywmsnative.core.interfaces.IScrollableFragment; import it.integry.integrywmsnative.core.interfaces.ITitledFragment; import it.integry.integrywmsnative.core.model.MtbColr; @@ -32,9 +35,18 @@ import it.integry.integrywmsnative.view.bottom_sheet__lu_content.BottomSheetFrag import it.integry.integrywmsnative.view.bottom_sheet__mtb_colr_edit.BottomSheetMtbColrEditView; import it.integry.integrywmsnative.view.dialogs.base.DialogSimpleMessageView; -public class ProdRientroMerceFragment extends BaseFragment implements ITitledFragment, IScrollableFragment, ProdRientroMerceViewModel.Listener, BottomSheetFragmentLUContentView.Listener, BottomSheetMtbColrEditView.Listener { +public class ProdRientroMerceFragment extends BaseFragment implements + ITitledFragment, + IScrollableFragment, + ILifecycleFragment, + ProdRientroMerceViewModel.Listener, + BottomSheetFragmentLUContentView.Listener, + BottomSheetMtbColrEditView.Listener, + ProdRientroMerceOrderListFragment.OnRefreshListener { + public final ObservableField isLargeLayout = new ObservableField<>(false); + @Inject ProdRientroMerceViewModel mViewModel; @@ -56,20 +68,47 @@ public class ProdRientroMerceFragment extends BaseFragment implements ITitledFra super.onCreate(savedInstanceState); setRetainInstance(true); + boolean isLargeLayout = getResources().getBoolean(R.bool.large_layout); + this.isLargeLayout.set(isLargeLayout); + mProdRientroMerceOrderListFragment = ProdRientroMerceOrderListFragment.newInstance(mToolbar); mProdRientroMerceOrderDetailFragment = ProdRientroMerceOrderDetailFragment.newInstance(); - mProdRientroMerceOrderListFragment.setOnItemSelectedRunnable(mProdRientroMerceOrderDetailFragment::setOrder); + + + mProdRientroMerceOrderListFragment + .setOnItemSelectedRunnable(order -> { + if (!isLargeLayout) { + getChildFragmentManager() + .beginTransaction() + .show(mProdRientroMerceOrderDetailFragment) + .addToBackStack(ProdRientroMerceOrderDetailFragment.class.getName()) + .commit(); + } + + mProdRientroMerceOrderDetailFragment.setOrder(order); + }) + .setOnRefreshListener(this); mProdRientroMerceOrderDetailFragment.setOnMtbColtClicked(item -> { mBindings.bottomSheetMtbColrEdit.setMtbColr(item.getMtbColr().get(0)); mBindings.bottomSheetMtbColrEdit.expand(); }); - getChildFragmentManager() - .beginTransaction() - .replace(R.id.order_list_fragment, mProdRientroMerceOrderListFragment) - .replace(R.id.order_detail_fragment, mProdRientroMerceOrderDetailFragment) - .commit(); + if (isLargeLayout) { + getChildFragmentManager() + .beginTransaction() + .replace(R.id.left_side_fragment_container, mProdRientroMerceOrderListFragment) + .replace(R.id.right_side_fragment_container, mProdRientroMerceOrderDetailFragment) + .commit(); + } else { + getChildFragmentManager() + .beginTransaction() + .add(R.id.full_width_container, mProdRientroMerceOrderListFragment) + .add(R.id.full_width_container, mProdRientroMerceOrderDetailFragment) + .hide(mProdRientroMerceOrderDetailFragment) + .commit(); + } + MainApplication.appComponent .prodRientroMerceComponent() @@ -82,6 +121,8 @@ public class ProdRientroMerceFragment extends BaseFragment implements ITitledFra @Nullable Bundle savedInstanceState) { mBindings = DataBindingUtil.inflate(LayoutInflater.from(getActivity()), R.layout.fragment_prod_rientro_merce, container, false); mBindings.setLifecycleOwner(this); + mBindings.setView(this); + mBindings.setViewmodel(mViewModel); mViewModel.setListener(this); @@ -94,13 +135,13 @@ public class ProdRientroMerceFragment extends BaseFragment implements ITitledFra public void onActivityCreated(@Nullable Bundle savedInstanceState) { super.onActivityCreated(savedInstanceState); - if(savedInstanceState == null) { + if (savedInstanceState == null) { this.mViewModel.getOrdiniLavorazioneAperti().observe(this.getViewLifecycleOwner(), this::ordersUpdated); - - mViewModel.init(); + mViewModel.refreshOrderList(); } } + @Override public void onCreateActionBar(AppCompatTextView titleText, Context context) { mAppBarTitle = titleText; @@ -139,7 +180,6 @@ public class ProdRientroMerceFragment extends BaseFragment implements ITitledFra } - private void initBottomSheet() { mBindings.bottomSheetMtbColrEdit.setListener(this); mBindings.bottomSheetMtbColrEdit.disableEditButton(); @@ -157,7 +197,33 @@ public class ProdRientroMerceFragment extends BaseFragment implements ITitledFra DialogSimpleMessageView.makeWarningDialog(new SpannableString(text), null, () -> mProdRientroMerceOrderDetailFragment.deleteMtbColr(mtbColr), - () -> {} - ).show(getActivity().getSupportFragmentManager(), "tag"); + () -> { + } + ).show(requireActivity().getSupportFragmentManager(), "tag"); + } + + @Override + public void onOrderLoadingStarted() { + BarcodeManager.disable(); + this.mProdRientroMerceOrderListFragment.onOrderLoadingStarted(); + } + + @Override + public void onOrderLoadingEnded() { + BarcodeManager.enable(); + this.mProdRientroMerceOrderListFragment.onOrderLoadingEnded(); + } + + @Override + public void onRefresh() { + this.mViewModel.refreshOrderList(); + } + + @Override + public void onPreDestroy(Runnable onComplete) { + if(getChildFragmentManager().getBackStackEntryCount() > 0) + getChildFragmentManager().popBackStack(); + + else onComplete.run(); } } \ No newline at end of file diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/prod_rientro_merce/ProdRientroMerceViewModel.java b/app/src/main/java/it/integry/integrywmsnative/gest/prod_rientro_merce/ProdRientroMerceViewModel.java index 8d8a13a5..4e3160bc 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/prod_rientro_merce/ProdRientroMerceViewModel.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/prod_rientro_merce/ProdRientroMerceViewModel.java @@ -7,6 +7,7 @@ import java.util.List; import javax.inject.Inject; import it.integry.integrywmsnative.core.interfaces.viewmodel_listeners.ILoadingListener; +import it.integry.integrywmsnative.core.interfaces.viewmodel_listeners.IOrdersLoadingListener; import it.integry.integrywmsnative.core.rest.consumers.MesRESTConsumer; import it.integry.integrywmsnative.gest.prod_versamento_materiale.dto.OrdineLavorazioneDTO; import it.integry.integrywmsnative.gest.spedizione.exceptions.OrdersLoadException; @@ -25,12 +26,12 @@ public class ProdRientroMerceViewModel { this.mMesRESTConsumer = mesRESTConsumer; } - public void init() { - new Thread(this::sendOnLoadingStarted).start(); + public void refreshOrderList() { + new Thread(this::sendOnOrdersLoadingStarted).start(); this.mMesRESTConsumer.getOrdiniLavorazione("I", null, ordiniLavorazioneList -> { this.mOrdiniLavorazioneAperti.postValue(ordiniLavorazioneList); - this.sendOnLoadingEnded(); + this.sendOnOrdersLoadingEnded(); }, ex -> this.sendError(new OrdersLoadException(ex))); } @@ -51,12 +52,20 @@ public class ProdRientroMerceViewModel { if (this.mListener != null) mListener.onLoadingEnded(); } + private void sendOnOrdersLoadingStarted() { + if (this.mListener != null) mListener.onOrderLoadingStarted(); + } + + private void sendOnOrdersLoadingEnded() { + if (this.mListener != null) mListener.onOrderLoadingEnded(); + } + private void sendError(Exception ex) { if (this.mListener != null) mListener.onError(ex); } - public interface Listener extends ILoadingListener { + public interface Listener extends ILoadingListener, IOrdersLoadingListener { void onDataSaved(); diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/prod_rientro_merce/order_detail/ProdRientroMerceOrderDetailFragment.java b/app/src/main/java/it/integry/integrywmsnative/gest/prod_rientro_merce/order_detail/ProdRientroMerceOrderDetailFragment.java index 59c2bef7..0330c007 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/prod_rientro_merce/order_detail/ProdRientroMerceOrderDetailFragment.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/prod_rientro_merce/order_detail/ProdRientroMerceOrderDetailFragment.java @@ -113,11 +113,14 @@ public class ProdRientroMerceOrderDetailFragment extends BaseFragment implements mViewModel.setListener(this); + if(currentOrder.getValue() != null) + refreshOrder(); this.mViewModel.mtbColtsOfOrder.observe(getViewLifecycleOwner(), this::refreshList); this.initRecyclerView(); this.initULScaleBluetoothConnection(); + mBindings.executePendingBindings(); return mBindings.getRoot(); } @@ -182,11 +185,15 @@ public class ProdRientroMerceOrderDetailFragment extends BaseFragment implements } public void setOrder(OrdineLavorazioneDTO order) { - currentOrder.postValue(order); - mBindings.invalidateAll(); - mAdapter.clearDataset(); + currentOrder.setValue(order); - mViewModel.setOrder(order); + refreshOrder(); + } + + private void refreshOrder() { + if(mBindings != null) mBindings.invalidateAll(); + if(mAdapter != null) mAdapter.clearDataset(); + if(mViewModel != null) mViewModel.setOrder(currentOrder.getValue()); } private void refreshList(List mtbColts) { diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/prod_rientro_merce/order_list/ProdRientroMerceOrderListFragment.java b/app/src/main/java/it/integry/integrywmsnative/gest/prod_rientro_merce/order_list/ProdRientroMerceOrderListFragment.java index 1c81cd5b..7592d2d1 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/prod_rientro_merce/order_list/ProdRientroMerceOrderListFragment.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/prod_rientro_merce/order_list/ProdRientroMerceOrderListFragment.java @@ -36,12 +36,10 @@ import it.integry.integrywmsnative.ui.SimpleDividerItemDecoration; public class ProdRientroMerceOrderListFragment extends Fragment { private final ObservableArrayList mOrdiniApertiMutableData = new ObservableArrayList<>(); - private FragmentProdRientroMerceOrderListBinding mBindings = null; - private RunnableArgs mOnItemSelectedRunnable; - private ElevatedToolbar mToolbar; + private OnRefreshListener onRefreshListener; public ProdRientroMerceOrderListFragment() { // Required empty public constructor @@ -93,6 +91,10 @@ public class ProdRientroMerceOrderListFragment extends Fragment { this.mBindings.mainList.setLayoutManager(new LinearLayoutManager(getActivity())); this.mToolbar.setRecyclerView(mBindings.mainList); + + this.mBindings.swiperefresh.setOnRefreshListener(() -> { + if(onRefreshListener != null) onRefreshListener.onRefresh(); + }); } public void pushOrderList(List orderList) { @@ -101,6 +103,14 @@ public class ProdRientroMerceOrderListFragment extends Fragment { } + public void onOrderLoadingStarted() { + this.mBindings.swiperefresh.setRefreshing(true); + } + + public void onOrderLoadingEnded() { + this.mBindings.swiperefresh.setRefreshing(false); + } + private List convertDataModelToListModel(List dataList) { @@ -164,4 +174,13 @@ public class ProdRientroMerceOrderListFragment extends Fragment { public RecyclerView getList() { return mBindings.mainList; } + + public ProdRientroMerceOrderListFragment setOnRefreshListener(OnRefreshListener onRefreshListener) { + this.onRefreshListener = onRefreshListener; + return this; + } + + public interface OnRefreshListener { + void onRefresh(); + } } \ No newline at end of file diff --git a/app/src/main/res/drawable/ripple_effect.xml b/app/src/main/res/drawable/ripple_effect.xml deleted file mode 100644 index de3ca6a0..00000000 --- a/app/src/main/res/drawable/ripple_effect.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout-large/fragment_prod_rientro_merce_order_detail.xml b/app/src/main/res/layout-large/fragment_prod_rientro_merce_order_detail.xml new file mode 100644 index 00000000..a1a00a53 --- /dev/null +++ b/app/src/main/res/layout-large/fragment_prod_rientro_merce_order_detail.xml @@ -0,0 +1,712 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_contab_doc_interni_edit.xml b/app/src/main/res/layout/activity_contab_doc_interni_edit.xml index 8fec2e0d..de1e7a22 100644 --- a/app/src/main/res/layout/activity_contab_doc_interni_edit.xml +++ b/app/src/main/res/layout/activity_contab_doc_interni_edit.xml @@ -60,7 +60,7 @@ android:layout_width="wrap_content" android:layout_height="50dp" android:layout_gravity="end" - android:background="@drawable/ripple_effect" + android:background="?attr/selectableItemBackground" android:adjustViewBounds="true" android:src="@drawable/ic_search_black_24dp" android:onClick="@{()->view.manualSearch()}" diff --git a/app/src/main/res/layout/activity_prod_dettaglio_linea.xml b/app/src/main/res/layout/activity_prod_dettaglio_linea.xml index ecfd6b83..c60edf24 100644 --- a/app/src/main/res/layout/activity_prod_dettaglio_linea.xml +++ b/app/src/main/res/layout/activity_prod_dettaglio_linea.xml @@ -85,7 +85,7 @@ android:layout_alignParentEnd="true" android:layout_centerVertical="true" android:adjustViewBounds="true" - android:background="@drawable/ripple_effect" + android:background="?attr/selectableItemBackground" android:onClick="@{()->viewModel.settings()}" android:src="@drawable/ic_settings_24dp" android:tint="@color/colorPrimaryGray" /> diff --git a/app/src/main/res/layout/activity_pv_ordine_acquisto_edit.xml b/app/src/main/res/layout/activity_pv_ordine_acquisto_edit.xml index 0eafc37c..26a62561 100644 --- a/app/src/main/res/layout/activity_pv_ordine_acquisto_edit.xml +++ b/app/src/main/res/layout/activity_pv_ordine_acquisto_edit.xml @@ -53,7 +53,7 @@ android:layout_height="50dp" android:layout_gravity="end" android:adjustViewBounds="true" - android:background="@drawable/ripple_effect" + android:background="?attr/selectableItemBackground" android:onClick="@{()->viewModel.manualSearch()}" android:src="@drawable/ic_search_black_24dp" android:tint="@color/colorPrimaryGray" /> diff --git a/app/src/main/res/layout/activity_spedizione.xml b/app/src/main/res/layout/activity_spedizione.xml index ada4900c..bfd765b7 100644 --- a/app/src/main/res/layout/activity_spedizione.xml +++ b/app/src/main/res/layout/activity_spedizione.xml @@ -61,7 +61,7 @@ android:layout_height="50dp" android:layout_gravity="end" android:adjustViewBounds="true" - android:background="@drawable/ripple_effect" + android:background="?attr/selectableItemBackground" android:src="@drawable/ic_add_24dp" android:tint="@color/colorPrimaryGray" app:visibility="@{spedizioneView.addExtraItemsEnabled}" @@ -73,7 +73,7 @@ android:layout_height="50dp" android:layout_gravity="end" android:adjustViewBounds="true" - android:background="@drawable/ripple_effect" + android:background="?attr/selectableItemBackground" app:singleClick="@{() -> spedizioneView.startManualSearch()}" android:src="@drawable/ic_black_barcode" android:tint="@color/colorPrimaryGray" diff --git a/app/src/main/res/layout/dialog_basket_lu__mtb_colt_model.xml b/app/src/main/res/layout/dialog_basket_lu__mtb_colt_model.xml index 34f42761..76990136 100644 --- a/app/src/main/res/layout/dialog_basket_lu__mtb_colt_model.xml +++ b/app/src/main/res/layout/dialog_basket_lu__mtb_colt_model.xml @@ -21,7 +21,7 @@ android:paddingEnd="12dp" android:paddingBottom="12dp" android:clickable="true" - android:background="@drawable/ripple_effect"> + android:background="?attr/selectableItemBackground"> + android:orientation="horizontal" + app:visibility="@{view.isLargeLayout}"> + + + + diff --git a/app/src/main/res/layout/fragment_prod_rientro_merce_order_detail.xml b/app/src/main/res/layout/fragment_prod_rientro_merce_order_detail.xml index 1eb6787a..e70038f2 100644 --- a/app/src/main/res/layout/fragment_prod_rientro_merce_order_detail.xml +++ b/app/src/main/res/layout/fragment_prod_rientro_merce_order_detail.xml @@ -23,8 +23,7 @@ @@ -93,22 +92,12 @@ - + android:padding="16dp"> @@ -701,7 +691,6 @@ - diff --git a/app/src/main/res/layout/fragment_prod_rientro_merce_order_detail__mtb_colt_item_model.xml b/app/src/main/res/layout/fragment_prod_rientro_merce_order_detail__mtb_colt_item_model.xml index ff182c70..2281031e 100644 --- a/app/src/main/res/layout/fragment_prod_rientro_merce_order_detail__mtb_colt_item_model.xml +++ b/app/src/main/res/layout/fragment_prod_rientro_merce_order_detail__mtb_colt_item_model.xml @@ -23,7 +23,7 @@ xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="wrap_content" - android:background="@drawable/ripple_effect" + android:background="?attr/selectableItemBackground" android:clickable="true" android:paddingTop="12dp" android:paddingEnd="12dp" diff --git a/app/src/main/res/layout/fragment_prod_rientro_merce_order_list.xml b/app/src/main/res/layout/fragment_prod_rientro_merce_order_list.xml index e738d5b7..743ee057 100644 --- a/app/src/main/res/layout/fragment_prod_rientro_merce_order_list.xml +++ b/app/src/main/res/layout/fragment_prod_rientro_merce_order_list.xml @@ -1,74 +1,84 @@ - - - - - - - + tools:context=".gest.prod_rientro_merce.order_list.ProdRientroMerceOrderListFragment"> - + - + - + - + - - - + + + + + + - + android:orientation="vertical" + app:layout_constraintEnd_toStartOf="@id/guideline_empty_right" + app:layout_constraintStart_toEndOf="@id/guideline_empty_left" + app:layout_constraintTop_toTopOf="@id/guideline_empty_top"> - + - + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_prod_rientro_merce_order_list__list_group_model.xml b/app/src/main/res/layout/fragment_prod_rientro_merce_order_list__list_group_model.xml index 061f4ca0..0e5ce981 100644 --- a/app/src/main/res/layout/fragment_prod_rientro_merce_order_list__list_group_model.xml +++ b/app/src/main/res/layout/fragment_prod_rientro_merce_order_list__list_group_model.xml @@ -16,110 +16,100 @@ xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="wrap_content" - android:background="@drawable/ripple_effect" + android:background="?attr/selectableItemBackground" + android:clickable="true" + android:focusable="true" android:orientation="horizontal" - android:paddingStart="2dp" - android:paddingEnd="4dp"> + android:paddingVertical="8dp" + android:paddingStart="4dp" + android:paddingEnd="12dp"> - + + + + android:layout_toEndOf="@id/ordine_state_icon" + android:orientation="vertical"> - - - - - + android:layout_height="wrap_content"> - - - - - - - + android:layout_alignParentEnd="true" + tools:text="Cons 07 nov 2018" /> - + - - + + + + + + - + + + + + android:layout_height="wrap_content" + android:layout_toStartOf="@id/right_sub_descrizione" + android:paddingEnd="6dp" + tools:text="TextView" /> + - + - - - - - - diff --git a/app/src/main/res/layout/lista_bancali_list_model.xml b/app/src/main/res/layout/lista_bancali_list_model.xml index d3382ba4..33f36c99 100644 --- a/app/src/main/res/layout/lista_bancali_list_model.xml +++ b/app/src/main/res/layout/lista_bancali_list_model.xml @@ -26,7 +26,7 @@ android:paddingEnd="12dp" android:paddingBottom="12dp" android:clickable="true" - android:background="@drawable/ripple_effect"> + android:background="?attr/selectableItemBackground"> diff --git a/app/src/main/res/values-large/values.xml b/app/src/main/res/values-large/values.xml new file mode 100644 index 00000000..66a72ee4 --- /dev/null +++ b/app/src/main/res/values-large/values.xml @@ -0,0 +1,6 @@ + + + + true + + \ No newline at end of file diff --git a/app/src/main/res/values/values.xml b/app/src/main/res/values/values.xml new file mode 100644 index 00000000..f2329703 --- /dev/null +++ b/app/src/main/res/values/values.xml @@ -0,0 +1,6 @@ + + + + false + + \ No newline at end of file