Integry/WMS_Native
19
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Prima implementazione DialogInputQuantityV2

Browse Source
This commit is contained in:
Giuseppe Scorrano 2020-02-28 18:54:24 +01:00
parent 4ac27c5b95
commit ce62c57d5d
13 changed files with 277 additions and 92 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
app/src/main/java/it/integry/integrywmsnative/gest/spedizione_new/SpedizioneActivity.java
View File

@ -31,6 +31,7 @@ import it.integry.integrywmsnative.core.data_recover.ColliDataRecover;
import it.integry.integrywmsnative.core.data_recover.ColliDataRecoverService;
import it.integry.integrywmsnative.core.di.BindableBoolean;
import it.integry.integrywmsnative.core.expansion.RunnableArgs;
import it.integry.integrywmsnative.core.model.MtbAart;
import it.integry.integrywmsnative.core.model.MtbColt;
import it.integry.integrywmsnative.core.settings.SettingsManager;
import it.integry.integrywmsnative.core.utility.UtilityExceptions;
@ -42,6 +43,8 @@ import it.integry.integrywmsnative.gest.spedizione_new.core.SpedizioneListModel;
import it.integry.integrywmsnative.gest.vendita.dto.OrdineVenditaInevasoDTO;
import it.integry.integrywmsnative.gest.vendita.dto.PickingObjectDTO;
import it.integry.integrywmsnative.view.dialogs.base.DialogSimpleInputHelper;
import it.integry.integrywmsnative.view.dialogs.input_quantity_v2.DialogInputQuantityV2;
import it.integry.integrywmsnative.view.dialogs.input_quantity_v2.DialogInputQuantityV2DTO;
public class SpedizioneActivity extends AppCompatActivity implements SpedizioneViewModel.Listeners {
@ -77,7 +80,6 @@ public class SpedizioneActivity extends AppCompatActivity implements SpedizioneV
mBindings = DataBindingUtil.setContentView(this, R.layout.activity_spedizione);
// ((MainApplication) getApplicationContext()).appComponent.inject(this);
SpedizioneComponent spedizioneComponent = DaggerSpedizioneComponent.builder()
.mainApplicationModule(MainApplication.appModule)
.mainApplicationComponent(MainApplication.appComponent)
@ -94,7 +96,6 @@ public class SpedizioneActivity extends AppCompatActivity implements SpedizioneV
mFlashShowCodForn = customConfiguration.getConfig(BaseCustomConfiguration.Keys.FLAG_SHOW_COD_FORN_IN_SPEDIZIONE);
mBindings.setLifecycleOwner(this);
mBindings.setSpedizioneViewModel(mViewmodel);
mBindings.setSpedizioneView(this);
this.initBarcodeReader();
@ -105,6 +106,12 @@ public class SpedizioneActivity extends AppCompatActivity implements SpedizioneV
mViewmodel.setDataset(codMdep, mPickingList, mTestateOrdini);
}
@Override
public boolean onSupportNavigateUp() {
onBackPressed();
return true;
}
private void initBarcodeReader() {
barcodeScannerIstanceID = BarcodeManager.addCallback(new BarcodeCallbackDTO()
.setOnScanSuccessfull(onScanSuccessful)
@ -121,6 +128,12 @@ public class SpedizioneActivity extends AppCompatActivity implements SpedizioneV
SpedizioneListAdapter spedizioneListAdapter = new SpedizioneListAdapter(this, mSpedizioneMutableData);
this.mBindings.spedizionePickingList.setAdapter(spedizioneListAdapter);
this.mBindings.spedizionePickingList.setLayoutManager(new LinearLayoutManager(this));
spedizioneListAdapter.setOnItemClicked(clickedItem -> {
if(!noLUPresent.get() && SettingsManager.iDB().isFlagSpedizioneEnableManualPick()) {
this.mViewmodel.dispatchOrdineRow(clickedItem);
}
});
}
@ -197,13 +210,15 @@ public class SpedizioneActivity extends AppCompatActivity implements SpedizioneV
spedizioneListModel.setUntMis(x.getMtbAart().getUntMis());
}
spedizioneListModel.setOriginalModel(x);
return spedizioneListModel;
}).toList();
}
private boolean isThereAnyItemToPick(List<PickingObjectDTO> dataList) {
return Stream.of(dataList)
.anyMatch(x -> !x.isDeactivated() && !x.isHidden() && !x.isTempHidden());
.anyMatch(x -> !x.isHidden() && !x.isTempHidden());
}
private RunnableArgs<BarcodeScanDTO> onScanSuccessful = data -> {
@ -270,4 +285,12 @@ public class SpedizioneActivity extends AppCompatActivity implements SpedizioneV
UtilityExceptions.defaultException(this, ex, mCurrentProgress);
BarcodeManager.enable();
}
@Override
public void onItemDispatched(MtbAart mtbAart) {
DialogInputQuantityV2DTO dialogInputQuantityV2DTO = new DialogInputQuantityV2DTO();
dialogInputQuantityV2DTO.setMtbAart(mtbAart);
DialogInputQuantityV2.make(this, dialogInputQuantityV2DTO).show();
}
}

18
app/src/main/java/it/integry/integrywmsnative/gest/spedizione_new/SpedizioneViewModel.java
View File

@ -35,6 +35,7 @@ import it.integry.integrywmsnative.core.rest.consumers.PosizioniRESTConsumer;
import it.integry.integrywmsnative.core.rest.model.Ean13PesoModel;
import it.integry.integrywmsnative.core.settings.SettingsManager;
import it.integry.integrywmsnative.core.utility.UtilityBarcode;
import it.integry.integrywmsnative.core.utility.UtilityBigDecimal;
import it.integry.integrywmsnative.core.utility.UtilityPosizione;
import it.integry.integrywmsnative.core.utility.UtilityString;
import it.integry.integrywmsnative.gest.spedizione_new.exceptions.CurrentMonoLUPositionIsNotCorrectException;
@ -204,6 +205,10 @@ public class SpedizioneViewModel {
for (Listeners listener : mListeners) listener.onFilterChanged(newValue);
}
private void sendOnItemDispatched(MtbAart mtbAart) {
for (Listeners listener : mListeners) listener.onItemDispatched(mtbAart);
}
public void processBarcodeDTO(BarcodeScanDTO barcodeScanDTO, Runnable onComplete) {
//Se non c'è una UL aperta
@ -566,7 +571,7 @@ public class SpedizioneViewModel {
}
private void dispatchOrdineRow(final PickingObjectDTO pickingObjectDTO) {
public void dispatchOrdineRow(final PickingObjectDTO pickingObjectDTO) {
AtomicBigDecimal numCnfWithdrawRows = new AtomicBigDecimal();
AtomicBigDecimal qtaColWithdrawRows = new AtomicBigDecimal();
@ -577,6 +582,15 @@ public class SpedizioneViewModel {
qtaColWithdrawRows.addAndGet(row.getQtaCol());
});
BigDecimal numCnfDaEvadere = pickingObjectDTO.getNumCnfCollo().subtract(numCnfWithdrawRows.getBigDecimalValue());
BigDecimal qtaColDaEvadere = pickingObjectDTO.getQtaCollo().subtract(qtaColWithdrawRows.getBigDecimalValue());
if(UtilityBigDecimal.lowerThan(numCnfDaEvadere, BigDecimal.ZERO)) numCnfDaEvadere = BigDecimal.ZERO;
if(UtilityBigDecimal.lowerThan(qtaColDaEvadere, BigDecimal.ZERO)) qtaColDaEvadere = BigDecimal.ZERO;
this.sendOnItemDispatched(pickingObjectDTO.getMtbAart());
}
@ -637,6 +651,8 @@ public class SpedizioneViewModel {
void onFilterChanged(String newValue);
void onError(Exception ex);
void onItemDispatched(MtbAart mtbAart);
}
}

89
app/src/main/java/it/integry/integrywmsnative/gest/spedizione_new/core/SpedizioneListAdapter.java
View File

@ -28,6 +28,7 @@ import it.integry.integrywmsnative.core.class_router.BaseCustomConfiguration;
import it.integry.integrywmsnative.core.class_router.ClassRouter;
import it.integry.integrywmsnative.core.class_router.interfaces.ICustomConfiguration;
import it.integry.integrywmsnative.core.expansion.OnListGeneralChangedCallback;
import it.integry.integrywmsnative.core.expansion.RunnableArgs;
import it.integry.integrywmsnative.core.model.MtbColr;
import it.integry.integrywmsnative.core.model.MtbColt;
import it.integry.integrywmsnative.core.settings.SettingsManager;
@ -44,6 +45,8 @@ public class SpedizioneListAdapter extends SectionedRecyclerViewAdapter<Spedizio
private Context mContext;
private List<SpedizioneListModel> mDataset = new ArrayList<>();
private RunnableArgs<PickingObjectDTO> mOnItemClicked;
static class SubheaderHolder extends RecyclerView.ViewHolder {
SpedizioneMainListGroupHeaderBinding mBinding;
@ -80,6 +83,10 @@ public class SpedizioneListAdapter extends SectionedRecyclerViewAdapter<Spedizio
});
}
public void setOnItemClicked(RunnableArgs<PickingObjectDTO> onItemClicked) {
this.mOnItemClicked = onItemClicked;
}
@Override
public SubheaderHolder onCreateSubheaderViewHolder(ViewGroup parent, int viewType) {
@ -99,12 +106,6 @@ public class SpedizioneListAdapter extends SectionedRecyclerViewAdapter<Spedizio
SpedizioneListModel pickingObjectDTO = this.mDataset.get(nextItemPosition);
subheaderHolder.mBinding.spedizioneGroupTitle.setText(pickingObjectDTO.getGroupTitle());
// if (pickingObjectDTO.isDeactivated()) {
// subheaderHolder.mBinding.spedizioneGroupTitle.setText(mContext.getText(R.string.picking_not_available));
// } else {
// subheaderHolder.mBinding.spedizioneGroupTitle.setText(String.format("%s: %s", mContext.getText(R.string.position_text), UtilityString.isNullOrEmpty(pickingObjectDTO.getPosizione()) ? "N.A." : pickingObjectDTO.getPosizione()));
// }
}
@Override
@ -116,56 +117,11 @@ public class SpedizioneListAdapter extends SectionedRecyclerViewAdapter<Spedizio
holder.mBinding.badge1.setBackground(mContext.getResources().getDrawable(!pickingObjectDTO.isActive() ? R.drawable.badge_gray_round_corner : R.drawable.badge1_round_corner));
holder.mBinding.qtaEvasa.setTextColor(mContext.getResources().getColor(!pickingObjectDTO.isActive() ? R.color.gray_600 : R.color.green_700));
// BigDecimal qtaEvasa = BigDecimal.ZERO;
//
// if (SettingsManager.iDB().isFlagForceAllToColli()) {
// for (MtbColr withdrawRow : pickingObjectDTO.getWithdrawRows()) {
// qtaEvasa = qtaEvasa.add(withdrawRow.getNumCnf());
// }
// } else {
// for (MtbColr withdrawRow : pickingObjectDTO.getWithdrawRows()) {
// qtaEvasa = qtaEvasa.add(withdrawRow.getQtaCol());
// }
// }
holder.mBinding.descrizione.setText(pickingObjectDTO.getDescrizione());
holder.mBinding.descrizione.setTextColor(pickingObjectDTO.isDescrizionePresente() ? Color.BLACK : Color.GRAY);
// String descrizioneString = pickingObjectDTO.getDescrizione();
// int descrizioneColor = Color.BLACK;
//
//
// if (UtilityString.isNullOrEmpty(descrizioneString)) {
// holder.mBinding.descrizione.setText(mContext.getString(R.string.no_description));
// holder.mBinding.descrizione.setTextColor(Color.BLACK);
// } else {
// holder.mBinding.descrizione.setText(descrizioneString);
// holder.mBinding.descrizione.setTextColor(Color.GRAY);
// }
//
//
// if (UtilityString.isNullOrEmpty(descrizioneString)) {
// descrizioneString = mContext.getString(R.string.no_description);
// descrizioneColor = Color.GRAY;
// } else if (descrizioneString.equalsIgnoreCase(CommonConst.Config.COMMESSA_MAG)) {
// descrizioneString = mContext.getString(R.string.stock);
// }
//
// holder.mBinding.descrizione.setText(descrizioneString);
// holder.mBinding.descrizione.setTextColor(descrizioneColor);
// String badge1 = "";
//
// if (mFlashShowCodForn) {
// badge1 += !UtilityString.isNullOrEmpty(pickingObjectDTO.getCodAlis()) ? (pickingObjectDTO.getCodAlis() + " - ") : "";
// badge1 += (!UtilityString.isNullOrEmpty(pickingObjectDTO.getCodArtFor()) ? pickingObjectDTO.getCodArtFor() : pickingObjectDTO.getCodMart());
// } else {
// badge1 += pickingObjectDTO.getCodMart();
// }
holder.mBinding.badge1.setText(pickingObjectDTO.getBadge1());
// holder.mBinding.badge2.setText(UtilityString.isNullOrEmpty(pickingObjectDTO.getCodJcom()) ? null : pickingObjectDTO.getCodJcom());
holder.mBinding.badge2.setText(pickingObjectDTO.getBadge2());
holder.mBinding.badge2.setVisibility(UtilityString.isNullOrEmpty(pickingObjectDTO.getBadge2()) ? View.GONE : View.VISIBLE);
@ -176,40 +132,15 @@ public class SpedizioneListAdapter extends SectionedRecyclerViewAdapter<Spedizio
holder.mBinding.subdescrizione2.setText(UtilityString.isNullOrEmpty(pickingObjectDTO.getSubDescrizione2()) ? null : Html.fromHtml(pickingObjectDTO.getSubDescrizione2()));
holder.mBinding.subdescrizione2.setVisibility(UtilityString.isNullOrEmpty(pickingObjectDTO.getSubDescrizione2()) ? View.GONE : View.VISIBLE);
// if (!UtilityString.isNullOrEmpty(pickingObjectDTO.getPartitaMag())) {
// holder.mBinding.subdescrizione1.setText(pickingObjectDTO.getPartitaMag());
// holder.mBinding.subdescrizione1.setVisibility(View.VISIBLE);
// } else {
// holder.mBinding.subdescrizione1.setText(null);
// holder.mBinding.subdescrizione1.setVisibility(View.GONE);
// }
//
// if (pickingObjectDTO.getNumCollo() != null) {
// String description2 = String.format(mContext.getResources().getText(R.string.lu_number_data_text).toString(), pickingObjectDTO.getNumCollo(), pickingObjectDTO.getDataColloHuman());
// holder.mBinding.subdescrizione2.setText(Html.fromHtml(description2));
// holder.mBinding.subdescrizione2.setVisibility(View.VISIBLE);
// } else {
// holder.mBinding.subdescrizione2.setText(null);
// holder.mBinding.subdescrizione2.setVisibility(View.GONE);
// }
// if (SettingsManager.iDB().isFlagForceAllToColli() || (pickingObjectDTO.getMtbAart() == null || !pickingObjectDTO.getMtbAart().isFlagQtaCnfFissa())) {
// holder.mBinding.untMis.setText("col");
// holder.mBinding.qtaTot.setText(UtilityNumber.decimalToString(pickingObjectDTO.getNumCollo() != null ? pickingObjectDTO.getNumCnfCollo() : pickingObjectDTO.getNumCnfOrd()));
// } else {
// holder.mBinding.qtaTot.setText(UtilityNumber.decimalToString(pickingObjectDTO.getNumCollo() != null ? pickingObjectDTO.getQtaCollo() : pickingObjectDTO.getQtaOrd()));
// if (pickingObjectDTO.getMtbAart() != null)
// holder.mBinding.untMis.setText(pickingObjectDTO.getMtbAart().getUntMis());
// }
holder.mBinding.qtaEvasa.setText(UtilityNumber.decimalToString(pickingObjectDTO.getQtaEvasa()));
holder.mBinding.qtaTot.setText(UtilityNumber.decimalToString(pickingObjectDTO.getQtaTot()));
holder.mBinding.untMis.setText(pickingObjectDTO.getUntMis());
holder.mBinding.untMis.setVisibility(UtilityString.isNullOrEmpty(pickingObjectDTO.getUntMis()) ? View.GONE : View.VISIBLE);
holder.mBinding.getRoot().setOnClickListener(v -> {
if(this.mOnItemClicked != null) this.mOnItemClicked.run(pickingObjectDTO.getOriginalModel());
});
}

13
app/src/main/java/it/integry/integrywmsnative/gest/spedizione_new/core/SpedizioneListModel.java
View File

@ -2,6 +2,8 @@ package it.integry.integrywmsnative.gest.spedizione_new.core;
import java.math.BigDecimal;
import it.integry.integrywmsnative.gest.vendita.dto.PickingObjectDTO;
public class SpedizioneListModel {
private String groupTitle;
@ -19,6 +21,8 @@ public class SpedizioneListModel {
private boolean active;
private PickingObjectDTO mOriginalModel;
public String getGroupTitle() {
return groupTitle;
}
@ -117,4 +121,13 @@ public class SpedizioneListModel {
this.active = active;
return this;
}
public PickingObjectDTO getOriginalModel() {
return mOriginalModel;
}
public SpedizioneListModel setOriginalModel(PickingObjectDTO originalModel) {
this.mOriginalModel = originalModel;
return this;
}
}

50
app/src/main/java/it/integry/integrywmsnative/view/dialogs/input_quantity_v2/DialogInputQuantityV2.java Normal file
View File

@ -0,0 +1,50 @@
package it.integry.integrywmsnative.view.dialogs.input_quantity_v2;
import android.app.Dialog;
import android.content.Context;
import android.graphics.Color;
import android.graphics.drawable.ColorDrawable;
import android.view.LayoutInflater;
import androidx.databinding.DataBindingUtil;
import org.jetbrains.annotations.NotNull;
import it.integry.integrywmsnative.R;
import it.integry.integrywmsnative.databinding.DialogInputQuantityV2Binding;
public class DialogInputQuantityV2 {
private Dialog mDialog;
private Context mContext;
private DialogInputQuantityV2ViewModel mViewModel;
private DialogInputQuantityV2DTO mDialogInputQuantityV2DTO;
public static Dialog make(@NotNull Context context, @NotNull DialogInputQuantityV2DTO dialogInputQuantityV2DTO) {
return new DialogInputQuantityV2(context, dialogInputQuantityV2DTO)
.mDialog;
}
private DialogInputQuantityV2(@NotNull Context context, @NotNull DialogInputQuantityV2DTO dialogInputQuantityV2DTO) {
this.mContext = context;
this.mDialogInputQuantityV2DTO = dialogInputQuantityV2DTO;
LayoutInflater inflater = (LayoutInflater) context.getSystemService( Context.LAYOUT_INFLATER_SERVICE );
DialogInputQuantityV2Binding bindings = DataBindingUtil.inflate(inflater, R.layout.dialog_input_quantity_v2, null, false);
this.mViewModel = new DialogInputQuantityV2ViewModel();
this.mViewModel.setMtbAart(dialogInputQuantityV2DTO.getMtbAart());
bindings.setViewmodel(this.mViewModel);
mDialog = new Dialog(context);
mDialog.setContentView(bindings.getRoot());
mDialog.setCanceledOnTouchOutside(false);
mDialog.setCancelable(false);
mDialog.getWindow().setBackgroundDrawable(new ColorDrawable(Color.TRANSPARENT));
}
}

17
app/src/main/java/it/integry/integrywmsnative/view/dialogs/input_quantity_v2/DialogInputQuantityV2DTO.java Normal file
View File

@ -0,0 +1,17 @@
package it.integry.integrywmsnative.view.dialogs.input_quantity_v2;
import it.integry.integrywmsnative.core.model.MtbAart;
public class DialogInputQuantityV2DTO {
private MtbAart mtbAart;
public MtbAart getMtbAart() {
return mtbAart;
}
public DialogInputQuantityV2DTO setMtbAart(MtbAart mtbAart) {
this.mtbAart = mtbAart;
return this;
}
}

20
app/src/main/java/it/integry/integrywmsnative/view/dialogs/input_quantity_v2/DialogInputQuantityV2ViewModel.java Normal file
View File

@ -0,0 +1,20 @@
package it.integry.integrywmsnative.view.dialogs.input_quantity_v2;
import androidx.databinding.ObservableField;
import it.integry.integrywmsnative.core.model.MtbAart;
public class DialogInputQuantityV2ViewModel {
public ObservableField<MtbAart> mtbAart = new ObservableField<>();
public DialogInputQuantityV2ViewModel() {
}
public void setMtbAart(MtbAart mtbAart) {
this.mtbAart.set(mtbAart);
}
}

9
app/src/main/res/drawable/bg_bordered.xml Normal file
View File

@ -0,0 +1,9 @@
<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle" >
<solid android:color="@android:color/white" />
<stroke android:width="1dip" android:color="#969696"/>
<!-- The radius makes the corners rounded -->
<corners
android:radius="8dp" >
</corners>
</shape>

4
app/src/main/res/layout/activity_spedizione.xml
View File

@ -8,10 +8,6 @@
<import type="android.view.View" />
<import type="it.integry.integrywmsnative.BuildConfig" />
<variable
name="spedizioneViewModel"
type="it.integry.integrywmsnative.gest.spedizione_new.SpedizioneViewModel" />
<variable
name="spedizioneView"
type="it.integry.integrywmsnative.gest.spedizione_new.SpedizioneActivity" />

101
app/src/main/res/layout/dialog_input_quantity_v2.xml Normal file
View File

@ -0,0 +1,101 @@
<?xml version="1.0" encoding="utf-8"?>
<layout xmlns:app="http://schemas.android.com/apk/res-auto">
<data>
<import type="it.integry.integrywmsnative.core.utility.UtilityString" />
<import type="android.view.View" />
<variable
name="viewmodel"
type="it.integry.integrywmsnative.view.dialogs.input_quantity_v2.DialogInputQuantityV2ViewModel" />
</data>
<androidx.cardview.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
app:cardCornerRadius="12dp"
app:cardElevation="0dp">
<androidx.appcompat.widget.LinearLayoutCompat
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_margin="16dp"
android:orientation="vertical">
<RelativeLayout
android:id="@+id/dialog_title_panel"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal">
<androidx.appcompat.widget.LinearLayoutCompat
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentStart="true"
android:layout_toStartOf="@id/title_unt_mis"
android:orientation="vertical">
<androidx.appcompat.widget.AppCompatTextView
style="@style/AppTheme.NewMaterial.Dialog.DialogTitleText"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:ellipsize="end"
android:textColor="@color/colorPrimary"
android:text="@{viewmodel.mtbAart.codMart}"
tools:text="COD MART (Partita mag)" />
<androidx.appcompat.widget.AppCompatTextView
style="@style/AppTheme.NewMaterial.Dialog.DialogSubTitleText"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:ellipsize="end"
android:textColor="@color/red_600"
android:visibility="@{UtilityString.isNullOrEmpty(viewmodel.mtbAart.diacod) ? View.GONE : View.VISIBLE}"
tools:text="DIACOD" />
</androidx.appcompat.widget.LinearLayoutCompat>
<RelativeLayout
android:id="@+id/title_unt_mis"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentEnd="true"
android:visibility="@{UtilityString.isNullOrEmpty(viewmodel.mtbAart.untMis) ? View.GONE : View.VISIBLE}" >
<androidx.appcompat.widget.LinearLayoutCompat
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="@drawable/bg_bordered"
android:gravity="center_horizontal"
android:orientation="vertical"
android:padding="4dp">
<androidx.appcompat.widget.AppCompatTextView
style="@style/AppTheme.NewMaterial.Text.Small"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textAllCaps="true"
android:textColor="@android:color/black"
android:text="@string/unt_mis" />
<androidx.appcompat.widget.AppCompatTextView
style="@style/AppTheme.NewMaterial.Text.Large"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="@android:color/black"
android:text="@{viewmodel.mtbAart.untMis}"
tools:text="(PZ)" />
</androidx.appcompat.widget.LinearLayoutCompat>
</RelativeLayout>
</RelativeLayout>
</androidx.appcompat.widget.LinearLayoutCompat>
</androidx.cardview.widget.CardView>
</layout>

1
app/src/main/res/values-it/strings.xml
View File

@ -92,6 +92,7 @@
<item quantity="one">collo</item>
<item quantity="other">colli</item>
</plurals>
<string name="unt_mis">Unt mis</string>
<string name="unt_mis_col">col</string>
<string name="action_close_ul">Chiudi UL</string>
<string name="already_read_articles">Articoli presenti</string>

3
app/src/main/res/values/strings.xml
View File

@ -31,6 +31,7 @@
<item quantity="one">package</item>
<item quantity="other">packages</item>
</plurals>
<string name="unt_mis">UM</string>
<string name="unt_mis_col">pkg</string>
<string name="app_name" translatable="false">Integry WMS</string>
<string name="integry" translatable="false">Integry</string>
@ -44,7 +45,7 @@
<string name="waiting">Waiting</string>
<string name="loading">Loading</string>
<string name="completed">Completed</string>
<string name="search">Search...</string>
<string name="search">Search&#8230;</string>
<string name="login">Login</string>
<string name="permission_request_message">Permissions are required for app to work properly</string>
<string name="ord_acq_testata"><![CDATA[#<b>%s</b> of <b>%s</b>]]></string>

15
app/src/main/res/values/styles.xml
View File

@ -84,12 +84,19 @@
</style>
<style name="AppTheme.NewMaterial.Dialog" parent="android:Theme.Holo.Dialog">
<item name="android:windowMinWidthMajor">90%</item>
<item name="android:windowMinWidthMinor">80%</item>
<style name="AppTheme.NewMaterial.Dialog.DialogTitleText" parent="AppTheme.NewMaterial.Text">
<item name="android:textColor">@android:color/black</item>
<item name="android:textSize">21sp</item>
<item name="android:textStyle">bold</item>
</style>
<style name="AppTheme.NewMaterial.Dialog.DialogSubTitleText" parent="AppTheme.NewMaterial.Text">
<item name="android:textColor">@android:color/black</item>
<item name="android:textSize">18sp</item>
</style>
<style name="SplashTheme" parent="AppTheme.NoActionBar">
<item name="android:windowBackground">@drawable/splash_background</item>
</style>