diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/contenuto_bancale/core/ContenutoBancaleListAdapter.java b/app/src/main/java/it/integry/integrywmsnative/gest/contenuto_bancale/core/ContenutoBancaleListAdapter.java index 2444c4d6..47a44604 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/contenuto_bancale/core/ContenutoBancaleListAdapter.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/contenuto_bancale/core/ContenutoBancaleListAdapter.java @@ -11,12 +11,14 @@ import android.view.ViewGroup; import it.integry.integrywmsnative.R; import it.integry.integrywmsnative.core.interfaces.IRecyclerItemClicked; import it.integry.integrywmsnative.core.model.MtbColr; +import it.integry.integrywmsnative.core.utility.UtilityNumber; +import it.integry.integrywmsnative.core.utility.UtilityString; import it.integry.integrywmsnative.databinding.ListaContenutoBancaleListModelBinding; public class ContenutoBancaleListAdapter extends RecyclerView.Adapter { - protected Context mContext; + protected static Context mContext; protected ObservableArrayList mDataset; private IRecyclerItemClicked mOnItemClickListener; @@ -32,6 +34,18 @@ public class ContenutoBancaleListAdapter extends RecyclerView.Adapter colliToSave = new ArrayList<>(); boolean shouldPrint = false; @@ -271,11 +267,9 @@ public class ProdRecuperoMaterialeViewModel { UtilityExceptions.defaultException(mContext, ex, finalProgress); }); - } else { finalProgress.dismiss(); } - }; if(sourceMtbColt != null) saveRunnable.run(sourceMtbColt); diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/vendita/dto/PickingObjectDTO.java b/app/src/main/java/it/integry/integrywmsnative/gest/vendita/dto/PickingObjectDTO.java index ea315961..bdc38730 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/vendita/dto/PickingObjectDTO.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/vendita/dto/PickingObjectDTO.java @@ -1,8 +1,5 @@ package it.integry.integrywmsnative.gest.vendita.dto; -import android.os.Parcel; -import android.os.Parcelable; - import java.math.BigDecimal; import java.util.ArrayList; import java.util.Date; @@ -16,7 +13,7 @@ import it.integry.integrywmsnative.core.utility.UtilityDate; import it.integry.integrywmsnative.core.utility.UtilityLogger; import it.integry.integrywmsnative.core.utility.UtilityString; -public class PickingObjectDTO implements Parcelable { +public class PickingObjectDTO { private Integer numCollo; private String gestione; @@ -35,7 +32,7 @@ public class PickingObjectDTO implements Parcelable { private String partitaMag; private BigDecimal qtaOrd; private BigDecimal numCnfCollo; - private BigDecimal numCnf; + private BigDecimal numCnfOrd; private String codAlis; private BigDecimal colliPedana; private BigDecimal qtaDisponibileCollo; @@ -51,165 +48,6 @@ public class PickingObjectDTO implements Parcelable { private ArrayList withdrawRows = new ArrayList<>(); - protected PickingObjectDTO(Parcel in) { - if (in.readByte() == 0) { - numCollo = null; - } else { - numCollo = in.readInt(); - } - gestione = in.readString(); - serCollo = in.readString(); - descrizioneEstesa = in.readString(); - codJcom = in.readString(); - codMart = in.readString(); - posizione = in.readString(); - dataCollo = in.readString(); - if (in.readByte() == 0) { - idViaggio = null; - } else { - idViaggio = in.readInt(); - } - codTagl = in.readString(); - codCol = in.readString(); - dataScad = in.readString(); - codArtFor = in.readString(); - partitaMag = in.readString(); - codAlis = in.readString(); - hidden = in.readByte() == 0x00 ? null : in.readByte() != 0x00; - deactivated = in.readByte() == 0x00 ? null : in.readByte() != 0x00; - - if (in.readByte() == 0) { - qtaCollo = null; - } else { - qtaCollo = new BigDecimal(in.readFloat()); - } - if (in.readByte() == 0) { - qtaOrd = null; - } else { - qtaOrd = new BigDecimal(in.readFloat()); - } - if (in.readByte() == 0) { - numCnf = null; - } else { - numCnf = new BigDecimal(in.readFloat()); - } - if (in.readByte() == 0) { - numCnfCollo = null; - } else { - numCnfCollo = new BigDecimal(in.readFloat()); - } - if (in.readByte() == 0) { - qtaDisponibileCollo = null; - } else { - qtaDisponibileCollo = new BigDecimal(in.readFloat()); - } - if (in.readByte() == 0) { - numCnfDisponibileCollo = null; - } else { - numCnfDisponibileCollo = new BigDecimal(in.readFloat()); - } - - - mtbAart = (MtbAart) in.readValue(MtbAart.class.getClassLoader()); - } - - @Override - public void writeToParcel(Parcel dest, int flags) { - if (numCollo == null) { - dest.writeByte((byte) 0); - } else { - dest.writeByte((byte) 1); - dest.writeInt(numCollo); - } - dest.writeString(gestione); - dest.writeString(serCollo); - dest.writeString(descrizioneEstesa); - dest.writeString(codJcom); - dest.writeString(codMart); - dest.writeString(posizione); - dest.writeString(dataCollo); - if (idViaggio == null) { - dest.writeByte((byte) 0); - } else { - dest.writeByte((byte) 1); - dest.writeInt(idViaggio); - } - dest.writeString(codTagl); - dest.writeString(codCol); - dest.writeString(dataScad); - dest.writeString(codArtFor); - dest.writeString(partitaMag); - dest.writeString(codAlis); - if (hidden == null) { - dest.writeByte((byte) (0x00)); - } else { - dest.writeByte((byte) (0x01)); - dest.writeByte((byte) (hidden ? 0x01 : 0x00)); - } - if (deactivated == null) { - dest.writeByte((byte) (0x00)); - } else { - dest.writeByte((byte) (0x01)); - dest.writeByte((byte) (deactivated ? 0x01 : 0x00)); - } - - if (qtaCollo == null) { - dest.writeByte((byte) (0x00)); - } else { - dest.writeByte((byte) (0x01)); - dest.writeFloat(qtaCollo.floatValue()); - } - if (qtaOrd == null) { - dest.writeByte((byte) (0x00)); - } else { - dest.writeByte((byte) (0x01)); - dest.writeFloat(qtaOrd.floatValue()); - } - if (numCnf == null) { - dest.writeByte((byte) (0x00)); - } else { - dest.writeByte((byte) (0x01)); - dest.writeFloat(numCnf.floatValue()); - } - if (numCnfCollo == null) { - dest.writeByte((byte) (0x00)); - } else { - dest.writeByte((byte) (0x01)); - dest.writeFloat(numCnfCollo.floatValue()); - } - if (qtaDisponibileCollo == null) { - dest.writeByte((byte) (0x00)); - } else { - dest.writeByte((byte) (0x01)); - dest.writeFloat(qtaDisponibileCollo.floatValue()); - } - if (numCnfDisponibileCollo == null) { - dest.writeByte((byte) (0x00)); - } else { - dest.writeByte((byte) (0x01)); - dest.writeFloat(numCnfDisponibileCollo.floatValue()); - } - - dest.writeValue(mtbAart); - } - - @Override - public int describeContents() { - return 0; - } - - public static final Creator CREATOR = new Creator() { - @Override - public PickingObjectDTO createFromParcel(Parcel in) { - return new PickingObjectDTO(in); - } - - @Override - public PickingObjectDTO[] newArray(int size) { - return new PickingObjectDTO[size]; - } - }; - public Integer getNumCollo() { return numCollo; } @@ -384,12 +222,12 @@ public class PickingObjectDTO implements Parcelable { return this; } - public BigDecimal getNumCnf() { - return numCnf; + public BigDecimal getNumCnfOrd() { + return numCnfOrd; } - public PickingObjectDTO setNumCnf(BigDecimal numCnf) { - this.numCnf = numCnf; + public PickingObjectDTO setNumCnfOrd(BigDecimal numCnfOrd) { + this.numCnfOrd = numCnfOrd; return this; } diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/vendita_ordine_inevaso/core/MainListOrdineVenditaInevasoAdapter.java b/app/src/main/java/it/integry/integrywmsnative/gest/vendita_ordine_inevaso/core/MainListOrdineVenditaInevasoAdapter.java index 3d15303c..63e35072 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/vendita_ordine_inevaso/core/MainListOrdineVenditaInevasoAdapter.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/vendita_ordine_inevaso/core/MainListOrdineVenditaInevasoAdapter.java @@ -200,7 +200,8 @@ public class MainListOrdineVenditaInevasoAdapter extends RecyclerView.Adapter filteredMtbColrs = Stream.of(mtbColrs).filter( -// x -> x.getCodMart().equalsIgnoreCase(item.getCodMart()) && -// ((x.getCodJcom() == null && item.getCodJcom() == null) || (x.getCodJcom() != null && x.getCodJcom().equalsIgnoreCase(item.getCodJcom()))) && -// (!SettingsManager.iDB().isEnableCheckPartitaMagCheckPickingV() || (SettingsManager.iDB().isEnableCheckPartitaMagCheckPickingV() && ((x.getPartitaMag() == null && item.getPartitaMag() == null) || (x.getPartitaMag() != null && x.getPartitaMag().equalsIgnoreCase(item.getPartitaMag()))))) && -// ((x.getNumColloRif() == null && item.getNumCollo() == null) || (x.getNumColloRif() != null && x.getNumColloRif().equals(item.getNumCollo())))).toList(); - for (MtbColr mtbColr : item.getWithdrawRows()) { - currentQtaEvasa = currentQtaEvasa.add(mtbColr.getQtaCol()); + currentQtaEvasa = currentQtaEvasa.add(item.getMtbAart().isFlagQtaCnfFissa() ? mtbColr.getQtaCol() : mtbColr.getNumCnf()); } } diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/vendita_ordine_inevaso/dto/VenditaOrdineInevasoListViewModel.java b/app/src/main/java/it/integry/integrywmsnative/gest/vendita_ordine_inevaso/dto/VenditaOrdineInevasoListViewModel.java index 2121b5dd..1099956a 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/vendita_ordine_inevaso/dto/VenditaOrdineInevasoListViewModel.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/vendita_ordine_inevaso/dto/VenditaOrdineInevasoListViewModel.java @@ -27,6 +27,7 @@ public class VenditaOrdineInevasoListViewModel { private String subDescrizione2; private BigDecimal qtaRiservata; private BigDecimal qtaOrdinata; + private String untMis; private PickingObjectDTO originalModel; @@ -101,6 +102,15 @@ public class VenditaOrdineInevasoListViewModel { this.originalModel = originalModel; return this; } + + public String getUntMis() { + return untMis; + } + + public SubItem setUntMis(String untMis) { + this.untMis = untMis; + return this; + } } } diff --git a/app/src/main/java/it/integry/integrywmsnative/view/bottomsheet/ArticoliInColloBottomSheetHelper.java b/app/src/main/java/it/integry/integrywmsnative/view/bottomsheet/ArticoliInColloBottomSheetHelper.java index e3af5a78..76ccd233 100644 --- a/app/src/main/java/it/integry/integrywmsnative/view/bottomsheet/ArticoliInColloBottomSheetHelper.java +++ b/app/src/main/java/it/integry/integrywmsnative/view/bottomsheet/ArticoliInColloBottomSheetHelper.java @@ -66,8 +66,6 @@ public class ArticoliInColloBottomSheetHelper extends BottomSheetBehavior.Bottom mBinding.articoliInColloDetailsPosizione.setText(mtbColt.getPosizione() != null ? mtbColt.getPosizione() : "N/A"); -// mBindings.articoliInColloDetailsPreparatoDa.setText(mtbColt.getPreparatoDa() != null ? mtbColt.getPreparatoDa() : "N/A"); - } public void updateRigheNumber(int newRigheNumber){ diff --git a/app/src/main/java/it/integry/integrywmsnative/view/bottomsheet/view/ArticoliInColloBottomSheetMtbColrAdapter.java b/app/src/main/java/it/integry/integrywmsnative/view/bottomsheet/view/ArticoliInColloBottomSheetMtbColrAdapter.java new file mode 100644 index 00000000..a46969c1 --- /dev/null +++ b/app/src/main/java/it/integry/integrywmsnative/view/bottomsheet/view/ArticoliInColloBottomSheetMtbColrAdapter.java @@ -0,0 +1,135 @@ +package it.integry.integrywmsnative.view.bottomsheet.view; + +import android.content.Context; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; +import android.widget.BaseAdapter; + +import androidx.databinding.DataBindingUtil; +import androidx.databinding.ObservableField; +import androidx.databinding.ObservableList; + +import java.lang.ref.WeakReference; + +import it.integry.integrywmsnative.R; +import it.integry.integrywmsnative.core.model.MtbColr; +import it.integry.integrywmsnative.core.model.MtbColt; +import it.integry.integrywmsnative.core.utility.UtilityNumber; +import it.integry.integrywmsnative.core.utility.UtilityString; +import it.integry.integrywmsnative.databinding.FragmentArticoliInColloBottomSheetMtbcolrItemBinding; + +public class ArticoliInColloBottomSheetMtbColrAdapter extends BaseAdapter { + + + private final WeakReferenceOnListChangedCallback onListChangedCallback; + private Context mContext; + private ObservableField mtbColt; + + + public ArticoliInColloBottomSheetMtbColrAdapter(Context context, ObservableField mtbColt) { + super(); + this.mContext = context; + this.mtbColt = mtbColt; + this.onListChangedCallback = new WeakReferenceOnListChangedCallback(this); + + this.mtbColt.get().getMtbColr().addOnListChangedCallback(onListChangedCallback); + } + + @Override + public View getView(int position, View convertView, ViewGroup parent) { + + LayoutInflater inflater = LayoutInflater.from(parent.getContext()); + + FragmentArticoliInColloBottomSheetMtbcolrItemBinding binding = DataBindingUtil.inflate(inflater, R.layout.fragment_articoli_in_collo_bottom_sheet__mtbcolr_item, parent, false); + + final MtbColr mtbColr = mtbColt.get().getMtbColr().get(position); + binding.setMtbColr(mtbColr); + + //Setting qty with unt_mis + if(mtbColr.getMtbAart() != null) { + if (mtbColr.getMtbAart().isFlagQtaCnfFissa()) { + binding.qtaTextview.setText(UtilityNumber.decimalToString(mtbColr.getQtaCol()) + (!UtilityString.isNullOrEmpty(mtbColr.getMtbAart().getUntMis()) ? "\n" + mtbColr.getMtbAart().getUntMis() : "")); + } else { + binding.qtaTextview.setText(UtilityNumber.decimalToString(mtbColr.getNumCnf()) + "\n" + mContext.getString(R.string.unt_mis_col)); + } + } else { + binding.qtaTextview.setText(UtilityNumber.decimalToString(mtbColr.getQtaCol())); + } + + + binding.executePendingBindings(); + + if(position % 2 == 1) binding.getRoot().setBackgroundColor(mContext.getResources().getColor(R.color.letturaFacilitataBG)); + + return binding.getRoot(); + } + + @Override + public long getItemId(int position) { + return position; + } + + @Override + public Object getItem(int position) { + return position; + } + + @Override + public int getCount() { + if(mtbColt.get() != null && mtbColt.get().getMtbColr() != null) { + + return mtbColt.get().getMtbColr().size(); + } else return 0; + } + + + public class WeakReferenceOnListChangedCallback extends ObservableList.OnListChangedCallback { + + private final WeakReference adapterReference; + + public WeakReferenceOnListChangedCallback(BaseAdapter baseAdapter) { + this.adapterReference = new WeakReference<>(baseAdapter); + } + + @Override + public void onChanged(ObservableList sender) { + BaseAdapter adapter = adapterReference.get(); + if (adapter != null) { + adapter.notifyDataSetChanged(); + } + } + + @Override + public void onItemRangeChanged(ObservableList sender, int positionStart, int itemCount) { + BaseAdapter adapter = adapterReference.get(); + if (adapter != null) { + adapter.notifyDataSetChanged(); + } + } + + @Override + public void onItemRangeInserted(ObservableList sender, int positionStart, int itemCount) { + BaseAdapter adapter = adapterReference.get(); + if (adapter != null) { + adapter.notifyDataSetChanged(); + } + } + + @Override + public void onItemRangeMoved(ObservableList sender, int fromPosition, int toPosition, int itemCount) { + BaseAdapter adapter = adapterReference.get(); + if (adapter != null) { + adapter.notifyDataSetChanged(); + } + } + + @Override + public void onItemRangeRemoved(ObservableList sender, int positionStart, int itemCount) { + BaseAdapter adapter = adapterReference.get(); + if (adapter != null) { + adapter.notifyDataSetChanged(); + } + } + } +} diff --git a/app/src/main/java/it/integry/integrywmsnative/view/bottomsheet/viewmodel/ArticoliInColloBottomSheetViewModel.java b/app/src/main/java/it/integry/integrywmsnative/view/bottomsheet/viewmodel/ArticoliInColloBottomSheetViewModel.java index 3ba14ce7..67b5fe02 100644 --- a/app/src/main/java/it/integry/integrywmsnative/view/bottomsheet/viewmodel/ArticoliInColloBottomSheetViewModel.java +++ b/app/src/main/java/it/integry/integrywmsnative/view/bottomsheet/viewmodel/ArticoliInColloBottomSheetViewModel.java @@ -36,6 +36,7 @@ import it.integry.integrywmsnative.databinding.FragmentArticoliInColloBottomShee import it.integry.integrywmsnative.databinding.FragmentArticoliInColloBottomSheetMtbcolrItemBinding; import it.integry.integrywmsnative.view.bottomsheet.ArticoliInColloBottomSheetHelper; import it.integry.integrywmsnative.view.bottomsheet.interfaces.IOnColloClosedCallback; +import it.integry.integrywmsnative.view.bottomsheet.view.ArticoliInColloBottomSheetMtbColrAdapter; import it.integry.integrywmsnative.view.dialogs.base.DialogSimpleMessageHelper; import it.integry.integrywmsnative.view.dialogs.input_quantity.DialogInputQuantity; @@ -64,21 +65,13 @@ public class ArticoliInColloBottomSheetViewModel { mBindings.setViewModel(this); -// ShapeAppearanceModel shapeAppearanceModel = new ShapeAppearanceModel(); -// -// shapeAppearanceModel.setTopLeftCorner(CornerFamily.ROUNDED, 6); -// shapeAppearanceModel.setTopRightCorner(CornerFamily.ROUNDED, 6); -// -// MaterialShapeDrawable materialShapeDrawable = new MaterialShapeDrawable(shapeAppearanceModel); -// mBindings.getRoot().setBackground(materialShapeDrawable); - mtbColt.addOnPropertyChangedCallback(new Observable.OnPropertyChangedCallback() { @Override public void onPropertyChanged(Observable sender, int propertyId) { if(mtbColt.get() != null) { - mBindings.linearListview.setAdapter(new ArticoliInColloBottomSheetMtbColrAdapter()); + mBindings.linearListview.setAdapter(new ArticoliInColloBottomSheetMtbColrAdapter(mContext, mtbColt)); mBindings.linearListview.setOnItemClickListener((parent, view, position, id) -> { mBottomSheetBehavior.setState(BottomSheetBehavior.STATE_EXPANDED); @@ -192,6 +185,7 @@ public class ArticoliInColloBottomSheetViewModel { final Dialog progress = UtilityProgress.createDefaultProgressDialog(mContext); itemToEdit.setQtaCol(quantityDTO.qtaTot.getBigDecimal()); + itemToEdit.setNumCnf(quantityDTO.numCnf.getBigDecimal()); ColliMagazzinoRESTConsumer.updateRiga(itemToEdit, () ->{ mBottomSheetBehavior.setState(BottomSheetBehavior.STATE_COLLAPSED); @@ -232,101 +226,6 @@ public class ArticoliInColloBottomSheetViewModel { } - public class ArticoliInColloBottomSheetMtbColrAdapter extends BaseAdapter { - private final WeakReferenceOnListChangedCallback onListChangedCallback; - - public ArticoliInColloBottomSheetMtbColrAdapter() { - super(); - this.onListChangedCallback = new WeakReferenceOnListChangedCallback(this); - - mtbColt.get().getMtbColr().addOnListChangedCallback(onListChangedCallback); - } - - @Override - public View getView(int position, View convertView, ViewGroup parent) { - - LayoutInflater inflater = LayoutInflater.from(parent.getContext()); - - FragmentArticoliInColloBottomSheetMtbcolrItemBinding binding = DataBindingUtil.inflate(inflater, R.layout.fragment_articoli_in_collo_bottom_sheet__mtbcolr_item, parent, false); - - final MtbColr item = mtbColt.get().getMtbColr().get(position); - binding.setMtbColr(item); - binding.executePendingBindings(); - - if(position % 2 == 1) binding.getRoot().setBackgroundColor(mContext.getResources().getColor(R.color.letturaFacilitataBG)); - - return binding.getRoot(); - } - - @Override - public long getItemId(int position) { - return position; - } - - @Override - public Object getItem(int position) { - return position; - } - - @Override - public int getCount() { - if(mtbColt.get() != null && mtbColt.get().getMtbColr() != null) { - - return mtbColt.get().getMtbColr().size(); - } else return 0; - } - - - public class WeakReferenceOnListChangedCallback extends ObservableList.OnListChangedCallback { - - private final WeakReference adapterReference; - - public WeakReferenceOnListChangedCallback(BaseAdapter baseAdapter) { - this.adapterReference = new WeakReference<>(baseAdapter); - } - - @Override - public void onChanged(ObservableList sender) { - BaseAdapter adapter = adapterReference.get(); - if (adapter != null) { - adapter.notifyDataSetChanged(); - } - } - - @Override - public void onItemRangeChanged(ObservableList sender, int positionStart, int itemCount) { - BaseAdapter adapter = adapterReference.get(); - if (adapter != null) { - adapter.notifyDataSetChanged(); - } - } - - @Override - public void onItemRangeInserted(ObservableList sender, int positionStart, int itemCount) { - BaseAdapter adapter = adapterReference.get(); - if (adapter != null) { - adapter.notifyDataSetChanged(); - } - } - - @Override - public void onItemRangeMoved(ObservableList sender, int fromPosition, int toPosition, int itemCount) { - BaseAdapter adapter = adapterReference.get(); - if (adapter != null) { - adapter.notifyDataSetChanged(); - } - } - - @Override - public void onItemRangeRemoved(ObservableList sender, int positionStart, int itemCount) { - BaseAdapter adapter = adapterReference.get(); - if (adapter != null) { - adapter.notifyDataSetChanged(); - } - } - } - } - } diff --git a/app/src/main/res/layout/activity_vendita_ordine_inevaso.xml b/app/src/main/res/layout/activity_vendita_ordine_inevaso.xml index da1bbb17..0ca95f9c 100644 --- a/app/src/main/res/layout/activity_vendita_ordine_inevaso.xml +++ b/app/src/main/res/layout/activity_vendita_ordine_inevaso.xml @@ -63,7 +63,7 @@ android:layout_gravity="end" android:background="@drawable/ripple_effect" android:adjustViewBounds="true" - android:src="@drawable/ic_search_black_24dp" + android:src="@drawable/ic_black_barcode" android:visibility="@{BuildConfig.DEBUG ? View.VISIBLE : View.GONE}" android:onClick="@{() -> viewmodel.manualSearch()}" android:tint="@color/colorPrimaryGray"/> diff --git a/app/src/main/res/layout/fragment_articoli_in_collo_bottom_sheet.xml b/app/src/main/res/layout/fragment_articoli_in_collo_bottom_sheet.xml index e8fdc40b..f9797ecd 100644 --- a/app/src/main/res/layout/fragment_articoli_in_collo_bottom_sheet.xml +++ b/app/src/main/res/layout/fragment_articoli_in_collo_bottom_sheet.xml @@ -48,7 +48,7 @@ android:textStyle="bold" android:drawablePadding="12dp" android:textColor="@color/colorPrimary" - android:paddingTop="8dp" + android:paddingTop="12dp" android:paddingBottom="8dp" android:paddingLeft="16dp" android:paddingRight="16dp" @@ -57,19 +57,6 @@ android:textSize="16sp" style="@style/AppTheme.NewMaterial.Text"/> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -314,6 +284,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/already_read_articles" + style="@style/AppTheme.NewMaterial.Text" android:textAllCaps="true" android:textStyle="bold"/> @@ -356,6 +327,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:clickable="true" + android:focusable="true" android:orientation="vertical" app:dividerThickness="0.5dp" /> @@ -409,9 +381,11 @@ android:layout_height="match_parent" android:layout_marginEnd="8dp" android:gravity="center" - android:text="Cioccolato" android:textAppearance="@android:style/TextAppearance.Material.Title" - app:layout_constraintTop_toTopOf="parent"/> + app:layout_constraintTop_toTopOf="parent" + app:layout_constraintStart_toStartOf="parent" + style="@style/AppTheme.NewMaterial.Text.ToolbarTitle.DarkActionBar" + tools:text="Num UL"/> @@ -451,6 +425,7 @@ android:layout_height="wrap_content" android:orientation="vertical" android:layout_marginBottom="8dp" + app:layout_constraintTop_toTopOf="parent" app:layout_constraintEnd_toStartOf="@id/bottom_sheet_actions_quantity" app:layout_constraintStart_toStartOf="parent"> @@ -460,30 +435,31 @@ android:layout_height="wrap_content" tools:text="Descrizione articolo" android:textColor="#444" - android:textSize="18dp" - android:maxLines="1" + android:maxLines="2" android:ellipsize="end" - android:paddingRight="8dp" - android:textStyle="bold" /> + android:paddingStart="0dp" + android:paddingEnd="8dp" + android:textStyle="bold" + style="@style/AppTheme.NewMaterial.Text.Medium"/> + style="@style/AppTheme.NewMaterial.Text.Small" /> @@ -504,6 +480,7 @@ android:layout_width="0dp" android:layout_height="wrap_content" android:orientation="vertical" + app:layout_constraintTop_toTopOf="parent" app:layout_constraintEnd_toStartOf="@id/guideline_action" app:layout_constraintStart_toStartOf="parent" android:gravity="center"> @@ -530,6 +507,7 @@ android:layout_width="0dp" android:layout_height="wrap_content" android:orientation="vertical" + app:layout_constraintTop_toTopOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="@id/guideline_action" android:gravity="center"> diff --git a/app/src/main/res/layout/fragment_articoli_in_collo_bottom_sheet__mtbcolr_item.xml b/app/src/main/res/layout/fragment_articoli_in_collo_bottom_sheet__mtbcolr_item.xml index 8c7f6423..2c500812 100644 --- a/app/src/main/res/layout/fragment_articoli_in_collo_bottom_sheet__mtbcolr_item.xml +++ b/app/src/main/res/layout/fragment_articoli_in_collo_bottom_sheet__mtbcolr_item.xml @@ -34,19 +34,19 @@ android:textColor="@color/colorPrimary" android:textSize="14sp" android:textStyle="bold" + style="@style/AppTheme.NewMaterial.Text.Small" tools:text="COD MART" /> @@ -56,6 +56,7 @@ android:text="@{`Lotto: ` + mtbColr.getPartitaMag()}" android:textSize="14sp" android:visibility="@{UtilityString.isNullOrEmpty(mtbColr.getPartitaMag()) ? View.INVISIBLE : View.VISIBLE}" + style="@style/AppTheme.NewMaterial.Text.Small" tools:text="Lotto: ABCDE" /> @@ -72,6 +73,7 @@ app:layout_constraintBottom_toBottomOf="parent"> diff --git a/app/src/main/res/layout/lista_contenuto_bancale_list_model.xml b/app/src/main/res/layout/lista_contenuto_bancale_list_model.xml index 6104a51e..2181a19c 100644 --- a/app/src/main/res/layout/lista_contenuto_bancale_list_model.xml +++ b/app/src/main/res/layout/lista_contenuto_bancale_list_model.xml @@ -84,6 +84,7 @@ app:layout_constraintBottom_toBottomOf="parent"> diff --git a/app/src/main/res/layout/vendita_ordine_inevaso_main_list_child_group_model.xml b/app/src/main/res/layout/vendita_ordine_inevaso_main_list_child_group_model.xml index 8c75cc17..d1341fd0 100644 --- a/app/src/main/res/layout/vendita_ordine_inevaso_main_list_child_group_model.xml +++ b/app/src/main/res/layout/vendita_ordine_inevaso_main_list_child_group_model.xml @@ -50,7 +50,7 @@ android:id="@+id/vendita_ordine_inevaso_main_list_group_item_qta_evasa" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginLeft="4dp" + android:layout_marginStart="4dp" android:textStyle="bold" android:textColor="@color/green_700" style="@style/AppTheme.NewMaterial.Text.Medium" @@ -73,6 +73,17 @@ style="@style/AppTheme.NewMaterial.Text.Medium" tools:text="QTA"/> + + diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index 03c0767c..393004ce 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -85,9 +85,10 @@ pezzi - confezione - confezioni + collo + colli + col Chiudi UL Articoli presenti Ordini diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index f8fc5b9f..32ec6adb 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -31,6 +31,7 @@ package packages + pkg Integry WMS Integry Open navigation drawer diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index 1092d0ff..da1bec89 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -52,6 +52,12 @@ @android:color/black + +