diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 9d4a8adb..faf9884e 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -18,7 +18,11 @@
android:supportsRtl="true"
android:theme="@style/AppTheme"
android:usesCleartextTraffic="true">
-
+
observableBigDecimal) {
+ Pair, TextWatcherAdapter> pair = (Pair) view.getTag(R.id.bound_observable);
+ if (pair == null || pair.first != observableBigDecimal) {
+ if (pair != null) {
+ view.removeTextChangedListener(pair.second);
+ }
+ TextWatcherAdapter watcher = new TextWatcherAdapter() {
+ @Override
+ public void onTextChanged(CharSequence s, int start, int before, int count) {
+ observableBigDecimal.set(new BigDecimal(s.toString()));
+ }
+ };
+ view.setTag(R.id.bound_observable, new Pair<>(observableBigDecimal, watcher));
+ view.addTextChangedListener(watcher);
+ }
+ BigDecimal newValue = observableBigDecimal.get();
+ if(view.getText().toString().trim().length() > 0 && !UtilityBigDecimal.equalsTo(new BigDecimal(view.getText().toString()), newValue)) {
+ view.setText(UtilityNumber.decimalToString(newValue));
+ }
+ }
+
@BindingAdapter("binding")
public static void bindAutoCompleteTextView(AutoCompleteTextView view, final BindableString bindableString) {
Pair pair = (Pair) view.getTag(R.id.bound_observable);
@@ -94,7 +125,8 @@ public class Converters {
view.removeTextChangedListener(pair.second);
}
TextWatcherAdapter watcher = new TextWatcherAdapter() {
- @Override public void onTextChanged(CharSequence s, int start, int before, int count) {
+ @Override
+ public void onTextChanged(CharSequence s, int start, int before, int count) {
bindableString.set(s.toString());
}
};
@@ -115,7 +147,8 @@ public class Converters {
view.removeTextChangedListener(pair.second);
}
TextWatcherAdapter watcher = new TextWatcherAdapter() {
- @Override public void onTextChanged(CharSequence s, int start, int before, int count) {
+ @Override
+ public void onTextChanged(CharSequence s, int start, int before, int count) {
bindableString.set(s.toString());
}
};
@@ -136,7 +169,8 @@ public class Converters {
view.removeTextChangedListener(pair.second);
}
TextWatcherAdapter watcher = new TextWatcherAdapter() {
- @Override public void onTextChanged(CharSequence s, int start, int before, int count) {
+ @Override
+ public void onTextChanged(CharSequence s, int start, int before, int count) {
bindableString.set(s.toString());
}
};
@@ -166,12 +200,13 @@ public class Converters {
view.removeTextChangedListener(pair.second);
}
TextWatcherAdapter watcher = new TextWatcherAdapter() {
- @Override public void onTextChanged(CharSequence s, int start, int before, int count) {
+ @Override
+ public void onTextChanged(CharSequence s, int start, int before, int count) {
try {
- if(s.toString().trim().isEmpty()){
+ if (s.toString().trim().isEmpty()) {
bindableFloat.set(null);
} else bindableFloat.set(decimalFormat.parse(s.toString()).floatValue());
- } catch (Exception ex){
+ } catch (Exception ex) {
Log.e("FloatFormat", ex.getMessage());
}
}
@@ -227,7 +262,7 @@ public class Converters {
@BindingAdapter({"layout_constraintGuide_percent"})
public static void bindFloatPercetageOnGuideline(View view, final float percentage) {
- ((Guideline)view).setGuidelinePercent(percentage);
+ ((Guideline) view).setGuidelinePercent(percentage);
}
@BindingAdapter({"backgroundTintResID"})
@@ -251,4 +286,13 @@ public class Converters {
view.setVisibility(bindableBoolean.get() ? View.VISIBLE : View.GONE);
}
+
+ @BindingAdapter("android:layout_weight")
+ public static void setLayoutWeight(View view, final Float weight) {
+
+ LinearLayoutCompat.LayoutParams layoutParams = (LinearLayoutCompat.LayoutParams) view.getLayoutParams();
+ layoutParams.weight = weight;
+ view.setLayoutParams(layoutParams);
+ }
+
}
\ No newline at end of file
diff --git a/app/src/main/java/it/integry/integrywmsnative/core/model/MtbAart.java b/app/src/main/java/it/integry/integrywmsnative/core/model/MtbAart.java
index cbd3646e..d50e24da 100644
--- a/app/src/main/java/it/integry/integrywmsnative/core/model/MtbAart.java
+++ b/app/src/main/java/it/integry/integrywmsnative/core/model/MtbAart.java
@@ -6,6 +6,8 @@ import android.os.Parcelable;
import java.math.BigDecimal;
import java.util.Date;
+import it.integry.integrywmsnative.core.utility.UtilityString;
+
/**
* Created by GiuseppeS on 06/03/2018.
*/
@@ -658,6 +660,10 @@ public class MtbAart implements Parcelable{
return flagRapConvVariabile;
}
+ public boolean getFlagRapConvVariabileBoolean() {
+ return !UtilityString.isNullOrEmpty(flagRapConvVariabile) && flagRapConvVariabile.equalsIgnoreCase("S");
+ }
+
public MtbAart setFlagRapConvVariabile(String flagRapConvVariabile) {
this.flagRapConvVariabile = flagRapConvVariabile;
return this;
@@ -703,7 +709,7 @@ public class MtbAart implements Parcelable{
return flagQtaCnfFissa;
}
- public boolean isFlagQtaCnfFissa() {
+ public boolean getFlagQtaCnfFissaBoolean() {
return "S".equalsIgnoreCase(flagQtaCnfFissa);
}
diff --git a/app/src/main/java/it/integry/integrywmsnative/core/utility/UtilityObservable.java b/app/src/main/java/it/integry/integrywmsnative/core/utility/UtilityObservable.java
new file mode 100644
index 00000000..6861738f
--- /dev/null
+++ b/app/src/main/java/it/integry/integrywmsnative/core/utility/UtilityObservable.java
@@ -0,0 +1,19 @@
+package it.integry.integrywmsnative.core.utility;
+
+import androidx.databinding.Observable;
+import androidx.databinding.ObservableField;
+
+import it.integry.integrywmsnative.core.expansion.RunnableArgs;
+
+public class UtilityObservable {
+
+ public static void addPropertyChanged(ObservableField observableField, RunnableArgs onValueChanged) {
+ observableField.addOnPropertyChangedCallback(new Observable.OnPropertyChangedCallback() {
+ @Override
+ public void onPropertyChanged(Observable sender, int propertyId) {
+ onValueChanged.run(observableField.get());
+ }
+ });
+ }
+
+}
diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_ordine_inevaso/viewmodel/AccettazioneOrdineAccettazioneInevasoViewModel.java b/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_ordine_inevaso/viewmodel/AccettazioneOrdineAccettazioneInevasoViewModel.java
index 5c1699b1..91cd1c50 100644
--- a/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_ordine_inevaso/viewmodel/AccettazioneOrdineAccettazioneInevasoViewModel.java
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_ordine_inevaso/viewmodel/AccettazioneOrdineAccettazioneInevasoViewModel.java
@@ -784,7 +784,7 @@ public class AccettazioneOrdineAccettazioneInevasoViewModel implements IOnColloC
//if(!UtilityString.isNullOrEmpty(ean128Model.Sscc)) {
dto.setQtaTot(new BigDecimal(ean128Model.Count));
- if (!item.getMtbAart().isFlagQtaCnfFissa()) {
+ if (!item.getMtbAart().getFlagQtaCnfFissaBoolean()) {
dto.setQtaCnf(new BigDecimal(ean128Model.Count));
}
//} else {
@@ -827,7 +827,7 @@ public class AccettazioneOrdineAccettazioneInevasoViewModel implements IOnColloC
.setCodJcom(item.getCodJcom())
.setRigaOrd(item.getRigaOrd());
- if (!item.getMtbAart().isFlagQtaCnfFissa()) {
+ if (!item.getMtbAart().getFlagQtaCnfFissaBoolean()) {
mtbColr.setQtaCnf(quantityDTO.qtaCnf.getBigDecimal());
}
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 571f2c1f..d07564d5 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
@@ -39,7 +39,7 @@ public class ContenutoBancaleListAdapter extends RecyclerView.Adapter {
- if(value && mBindings.noConnectionTopLayout.isExpanded()){
+ if (value && mBindings.noConnectionTopLayout.isExpanded()) {
collapseNoConnectionLayout();
- } else if(!value && !mBindings.noConnectionTopLayout.isExpanded()){
+ } else if (!value && !mBindings.noConnectionTopLayout.isExpanded()) {
expandNoConnectionLayout();
}
});
@@ -118,13 +119,13 @@ public class MainFragment extends Fragment implements ITitledFragment, IScrollab
mBindings.currentUserName.setText(SettingsManager.i().user.fullname);
mBindings.currentDeposito.setText(String.format("Deposito: %s • %s", SettingsManager.i().userSession.depo.getCodMdep(), SettingsManager.i().userSession.depo.getDescrizione()));
- if(SettingsManager.iDB().getDatiAzienda() != null && SettingsManager.iDB().getDatiAzienda().isLogoAvailable()) {
+ if (SettingsManager.iDB().getDatiAzienda() != null && SettingsManager.iDB().getDatiAzienda().isLogoAvailable()) {
// currentLogoAzienda.setImageBitmap(SettingsManager.iDB().getDatiAzienda().getLogo());
}
}
private void initRecuperoCollo() {
- if(ColliDataRecover.thereIsAnExistantSession()){
+ if (ColliDataRecover.thereIsAnExistantSession()) {
startRecoverMode();
List generatedErrors = new ArrayList<>();
@@ -144,33 +145,39 @@ public class MainFragment extends Fragment implements ITitledFragment, IScrollab
}
private void cyclicRecover(Iterator sessionsIterator, Runnable onComplete, RunnableArgs onFailed) {
- if(sessionsIterator.hasNext()) {
+
+ RunnableArgss tmpOnFailed = (ex, recoveredMtbColtID) -> {
+ if (ex.getMessage().contains("Dati entity mtb_colt non trovati") || ex.getMessage().contains("Dati collo non corretti") || (ex.getMessage().contains("Il collo numero") && ex.getMessage().contains("non esiste"))) {
+ ColliDataRecover.closeSession(recoveredMtbColtID);
+ onFailed.run(ex);
+ } else {
+ onFailed.run(ex);
+ }
+
+ cyclicRecover(sessionsIterator, onComplete, onFailed);
+ };
+
+ if (sessionsIterator.hasNext()) {
Integer recoveredMtbColtID = sessionsIterator.next();
ColliDataRecover.RecoverDTO recoveredMtbColtDto = ColliDataRecover.getSession(recoveredMtbColtID);
MtbColt recoveredMtbColt = recoveredMtbColtDto.getMtbColt();
- if(recoveredMtbColt != null && (recoveredMtbColt.getGestioneEnum() == GestioneEnum.VENDITA || recoveredMtbColt.getGestioneEnum() == GestioneEnum.LAVORAZIONE) && !UtilityString.isNullOrEmpty(recoveredMtbColt.getFiltroOrdini())) {
+ if (recoveredMtbColt != null && (recoveredMtbColt.getGestioneEnum() == GestioneEnum.VENDITA || recoveredMtbColt.getGestioneEnum() == GestioneEnum.LAVORAZIONE) && !UtilityString.isNullOrEmpty(recoveredMtbColt.getFiltroOrdini())) {
IOrdiniVendita ordiniVendita = ClassRouter.getInstance(ClassRouter.PATH.ORDINI_VENDITA);
ColliMagazzinoRESTConsumer.updateDataFine(getActivity(), null, recoveredMtbColt, () -> {
- ordiniVendita.distribuisciCollo(null, recoveredMtbColt, recoveredMtbColtDto.getTestateOrdini(),
- mtbColts -> {
- ColliDataRecover.closeSession(recoveredMtbColtID);
-
- cyclicRecover(sessionsIterator, onComplete, onFailed);
- }, ex -> {
-
- if(ex.getMessage().contains("Dati collo non corretti") || (ex.getMessage().contains("Il collo numero") && ex.getMessage().contains("non esiste"))) {
+ ordiniVendita.distribuisciCollo(null, recoveredMtbColt, recoveredMtbColtDto.getTestateOrdini(),
+ mtbColts -> {
ColliDataRecover.closeSession(recoveredMtbColtID);
- onFailed.run(ex);
- } else {
- onFailed.run(ex);
- }
- cyclicRecover(sessionsIterator, onComplete, onFailed);
- });
- }, onFailed);
+ cyclicRecover(sessionsIterator, onComplete, onFailed);
+ }, ex -> {
+ tmpOnFailed.run(ex, recoveredMtbColtID);
+ });
+ }, ex -> {
+ tmpOnFailed.run(ex, recoveredMtbColtID);
+ });
} else {
ColliDataRecover.closeSession(recoveredMtbColtID);
cyclicRecover(sessionsIterator, onComplete, onFailed);
@@ -181,12 +188,14 @@ public class MainFragment extends Fragment implements ITitledFragment, IScrollab
}
}
- private void collapseNoConnectionLayout(){
- if(getActivity() != null) getActivity().runOnUiThread(() -> mBindings.noConnectionTopLayout.collapse(true));
+ private void collapseNoConnectionLayout() {
+ if (getActivity() != null)
+ getActivity().runOnUiThread(() -> mBindings.noConnectionTopLayout.collapse(true));
}
- private void expandNoConnectionLayout(){
- if(getActivity() != null) getActivity().runOnUiThread(() -> mBindings.noConnectionTopLayout.expand(true));
+ private void expandNoConnectionLayout() {
+ if (getActivity() != null)
+ getActivity().runOnUiThread(() -> mBindings.noConnectionTopLayout.expand(true));
}
private void startRecoverMode() {
@@ -213,21 +222,12 @@ public class MainFragment extends Fragment implements ITitledFragment, IScrollab
}
-
-
-
-
-
-
-
-
-
private void initGestMenu() {
ICustomConfiguration customConfiguration = ClassRouter.getInstance(ClassRouter.PATH.CUSTOM_CONFIGURATION);
BaseMenuConfiguration menuConfiguration = customConfiguration.getConfig(BaseCustomConfiguration.Keys.MENU_CONFIGURATION);
List menuGroups = menuConfiguration.getGroups();
- for(MenuConfiguration.MenuGroup menuGroup : menuGroups) {
+ for (MenuConfiguration.MenuGroup menuGroup : menuGroups) {
FragmentMainMenuGroupLayoutBinding groupBinding = DataBindingUtil.inflate(mLayoutInflater, R.layout.fragment_main_menu_group_layout, null, false);
diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/picking_libero/core/PickingLiberoListAdapter.java b/app/src/main/java/it/integry/integrywmsnative/gest/picking_libero/core/PickingLiberoListAdapter.java
index 7bf62675..af3a18cc 100644
--- a/app/src/main/java/it/integry/integrywmsnative/gest/picking_libero/core/PickingLiberoListAdapter.java
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/picking_libero/core/PickingLiberoListAdapter.java
@@ -36,7 +36,7 @@ public class PickingLiberoListAdapter extends RecyclerView.Adapter 0){
usedCnf = BigDecimal.ONE;
@@ -128,7 +127,7 @@ public class ChooseOrdsLavFromListAdapter extends RecyclerView.Adapter 0 && !mtbAart.isFlagQtaCnfFissa()) {
+ if (ean128Model.NetWeightKg != null && ean128Model.NetWeightKg > 0 && !mtbAart.getFlagQtaCnfFissaBoolean()) {
qtaDto.setQtaTot(new BigDecimal(ean128Model.NetWeightKg));
} else {
qtaDto.setQtaTot(qtaDto.getQtaCnf().multiply(new BigDecimal(qtaDto.getNumCnf())));
diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/spedizione_new/SpedizioneActivity.java b/app/src/main/java/it/integry/integrywmsnative/gest/spedizione_new/SpedizioneActivity.java
index c9843b9f..fdd46442 100644
--- a/app/src/main/java/it/integry/integrywmsnative/gest/spedizione_new/SpedizioneActivity.java
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/spedizione_new/SpedizioneActivity.java
@@ -3,7 +3,6 @@ package it.integry.integrywmsnative.gest.spedizione_new;
import androidx.appcompat.app.AppCompatActivity;
import androidx.databinding.DataBindingUtil;
import androidx.databinding.ObservableArrayList;
-import androidx.lifecycle.ViewModelProvider;
import androidx.recyclerview.widget.LinearLayoutManager;
import android.app.Dialog;
@@ -28,8 +27,6 @@ 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.data_cache.DataCache;
-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;
@@ -202,7 +199,7 @@ public class SpedizioneActivity extends AppCompatActivity implements SpedizioneV
spedizioneListModel.setSubDescrizione2(String.format(getString(R.string.lu_number_data_text), x.getNumCollo(), x.getDataColloHuman()));
}
- if (SettingsManager.iDB().isFlagForceAllToColli() || (x.getMtbAart() == null || !x.getMtbAart().isFlagQtaCnfFissa())) {
+ if (SettingsManager.iDB().isFlagForceAllToColli() || (x.getMtbAart() == null || !x.getMtbAart().getFlagQtaCnfFissaBoolean())) {
spedizioneListModel.setUntMis("col");
spedizioneListModel.setQtaTot(x.getNumCollo() != null ? x.getNumCnfCollo() : x.getNumCnfOrd());
} else {
@@ -288,11 +285,16 @@ public class SpedizioneActivity extends AppCompatActivity implements SpedizioneV
}
@Override
- public void onItemDispatched(MtbAart mtbAart, BigDecimal totalQtaOrd, BigDecimal totalNumCnfOrd) {
+ public void onItemDispatched(MtbAart mtbAart, BigDecimal totalQtaOrd, BigDecimal totalNumCnfOrd, BigDecimal totalQtaToBeTaken, BigDecimal totalNumCnfToBeTaken, BigDecimal qtaCnfToBeTaken, BigDecimal totalQtaAvailable, BigDecimal totalNumCnfAvailable) {
DialogInputQuantityV2DTO dialogInputQuantityV2DTO = new DialogInputQuantityV2DTO()
.setMtbAart(mtbAart)
.setTotalQtaOrd(totalQtaOrd)
- .setTotalNumCnfOrd(totalNumCnfOrd);
+ .setTotalNumCnfOrd(totalNumCnfOrd)
+ .setTotalQtaToBeTaken(totalQtaToBeTaken)
+ .setTotalNumCnfToBeTaken(totalNumCnfToBeTaken)
+ .setQtaCnfToBeTaken(qtaCnfToBeTaken)
+ .setTotalQtaAvailable(totalQtaAvailable)
+ .setTotalNumCnfAvailable(totalNumCnfAvailable);
DialogInputQuantityV2
.newInstance(dialogInputQuantityV2DTO)
diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/spedizione_new/SpedizioneViewModel.java b/app/src/main/java/it/integry/integrywmsnative/gest/spedizione_new/SpedizioneViewModel.java
index 1722c573..ed120130 100644
--- a/app/src/main/java/it/integry/integrywmsnative/gest/spedizione_new/SpedizioneViewModel.java
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/spedizione_new/SpedizioneViewModel.java
@@ -76,7 +76,6 @@ public class SpedizioneViewModel {
}
-
public void setDataset(String codMdep, List pickingList, List testateOrdini) {
this.mDefaultCodMdep = codMdep;
this.mPickingList.postValue(pickingList);
@@ -205,8 +204,9 @@ public class SpedizioneViewModel {
for (Listeners listener : mListeners) listener.onFilterChanged(newValue);
}
- private void sendOnItemDispatched(MtbAart mtbAart, BigDecimal totalQtaOrd, BigDecimal totalNumCnfOrd) {
- for (Listeners listener : mListeners) listener.onItemDispatched(mtbAart, totalQtaOrd, totalNumCnfOrd);
+ private void sendOnItemDispatched(MtbAart mtbAart, BigDecimal totalQtaOrd, BigDecimal totalNumCnfOrd, BigDecimal totalQtaToBeTaken, BigDecimal totalNumCnfToBeTaken, BigDecimal qtaCnfToBeTaken, BigDecimal totalQtaAvailable, BigDecimal totalNumCnfAvailable) {
+ for (Listeners listener : mListeners)
+ listener.onItemDispatched(mtbAart, totalQtaOrd, totalNumCnfOrd, totalQtaToBeTaken, totalNumCnfToBeTaken, qtaCnfToBeTaken, totalQtaAvailable, totalNumCnfAvailable);
}
public void processBarcodeDTO(BarcodeScanDTO barcodeScanDTO, Runnable onComplete) {
@@ -418,31 +418,29 @@ public class SpedizioneViewModel {
.toList();
-
List matchPickingObjectByArt = Stream.of(pickingList)
.filter(x -> //x.getNumCollo() == null &&
(listOfCodMartsInRowCollo.contains(x.getCodMart()) && !alreadyMatchedArts.contains(x.getCodMart())))
.toList();
- if(SettingsManager.iDB().isEnableCheckPartitaMagCheckPickingV()) {
+ if (SettingsManager.iDB().isEnableCheckPartitaMagCheckPickingV()) {
for (int i = 0; i < matchPickingObjectByArt.size(); i++) {
PickingObjectDTO tmpPickObj = matchPickingObjectByArt.get(i);
-
List matchWithPartitaMag = Stream.of(scannedUL.getMtbColr())
.filter(x -> x.getCodMart().equalsIgnoreCase(tmpPickObj.getCodMart()) &&
Objects.equals(x.getPartitaMag(), tmpPickObj.getPartitaMag())).toList();
boolean anyMatch = matchWithPartitaMag.size() > 0;
- if(!anyMatch) {
+ if (!anyMatch) {
matchPickingObjectByArt.remove(i);
i--;
} else {
- for(int k = 0; k < matchWithPartitaMag.size(); k++) {
+ for (int k = 0; k < matchWithPartitaMag.size(); k++) {
MtbColr matchRow = matchWithPartitaMag.get(k);
@@ -466,7 +464,7 @@ public class SpedizioneViewModel {
List matchWithColloRow = Stream.of(scannedUL.getMtbColr())
.filter(x -> x.getCodMart().equalsIgnoreCase(tmpPickObj.getCodMart())).toList();
- for(int k = 0; k < matchWithColloRow.size(); k++) {
+ for (int k = 0; k < matchWithColloRow.size(); k++) {
MtbColr matchRow = matchWithColloRow.get(k);
@@ -484,8 +482,6 @@ public class SpedizioneViewModel {
}
-
-
//}
matchPickingObject.addAll(matchPickingObjectByArt);
@@ -524,21 +520,21 @@ public class SpedizioneViewModel {
private void loadMatchedRows(List matchedRows) {
- if(matchedRows == null || matchedRows.size() == 0) {
+ if (matchedRows == null || matchedRows.size() == 0) {
this.sendError(new NoArtsFoundException());
} else {
List pickingList = mPickingList.getValue();
- for(int i = 0; i < pickingList.size(); i++) {
- if(!matchedRows.contains(pickingList.get(i))) {
+ for (int i = 0; i < pickingList.size(); i++) {
+ if (!matchedRows.contains(pickingList.get(i))) {
pickingList.get(i).setTempHidden(true);
}
}
- if(matchedRows.size() == 1 ) {
+ if (matchedRows.size() == 1) {
if (matchedRows.get(0).getTempPickData() != null &&
- matchedRows.get(0).getTempPickData().getSourceMtbColt() != null ) {
+ matchedRows.get(0).getTempPickData().getSourceMtbColt() != null) {
// MtbColt tempSourceMtbColt = matchedRows.get(0).getTempPickData().getSourceMtbColt();
@@ -555,7 +551,7 @@ public class SpedizioneViewModel {
// refreshOrderBy(false);
// }
- } else if(matchedRows.get(0).isDeactivated()) {
+ } else if (matchedRows.get(0).isDeactivated()) {
this.sendFilterChanged("");
// applyFilter("");
// refreshOrderBy(false);
@@ -586,14 +582,32 @@ public class SpedizioneViewModel {
});
- BigDecimal numCnfDaPrelevare = pickingObjectDTO.getNumCnfCollo().subtract(numCnfWithdrawRows.getBigDecimalValue());
- BigDecimal qtaColDaPrelevare = pickingObjectDTO.getQtaCollo().subtract(qtaColWithdrawRows.getBigDecimalValue());
-
- if(UtilityBigDecimal.lowerThan(numCnfDaPrelevare, BigDecimal.ZERO)) numCnfDaPrelevare = BigDecimal.ZERO;
- if(UtilityBigDecimal.lowerThan(qtaColDaPrelevare, BigDecimal.ZERO)) qtaColDaPrelevare = BigDecimal.ZERO;
+ BigDecimal numCnfDaPrelevare = null;
+ BigDecimal qtaColDaPrelevare = null;
+ BigDecimal qtaCnfDaPrelevare = null;
- this.sendOnItemDispatched(pickingObjectDTO.getMtbAart(), totalQtaOrd, totalNumCnfOrd);
+ BigDecimal totalQtaAvailable = null;
+ BigDecimal totalNumCnfAvailable = null;
+
+ if(pickingObjectDTO.getNumCollo() != null) {
+ numCnfDaPrelevare = pickingObjectDTO.getNumCnfCollo().subtract(numCnfWithdrawRows.getBigDecimalValue());
+ qtaColDaPrelevare = pickingObjectDTO.getQtaCollo().subtract(qtaColWithdrawRows.getBigDecimalValue());
+ qtaCnfDaPrelevare = pickingObjectDTO.getQtaCnfCollo();
+
+ totalQtaAvailable = pickingObjectDTO.getQtaDisponibileCollo();
+ totalNumCnfAvailable = pickingObjectDTO.getNumCnfDisponibileCollo();
+
+
+ if (UtilityBigDecimal.lowerThan(numCnfDaPrelevare, BigDecimal.ZERO))
+ numCnfDaPrelevare = BigDecimal.ZERO;
+
+ if (UtilityBigDecimal.lowerThan(qtaColDaPrelevare, BigDecimal.ZERO))
+ qtaColDaPrelevare = BigDecimal.ZERO;
+
+ }
+
+ this.sendOnItemDispatched(pickingObjectDTO.getMtbAart(), totalQtaOrd, totalNumCnfOrd, qtaColDaPrelevare, numCnfDaPrelevare, qtaCnfDaPrelevare, totalQtaAvailable, totalNumCnfAvailable);
}
@@ -628,7 +642,6 @@ public class SpedizioneViewModel {
this.mCurrentMtbColt = mtbColt;
-
mMtbColtSessionID = this.mColliDataRecoverService.startNewSession(mtbColt, mTestateOrdini);
if (onComplete != null) onComplete.run();
@@ -655,7 +668,7 @@ public class SpedizioneViewModel {
void onError(Exception ex);
- void onItemDispatched(MtbAart mtbAart, BigDecimal totalQtaOrd, BigDecimal totalNumCnfOrd);
+ void onItemDispatched(MtbAart mtbAart, BigDecimal totalQtaOrd, BigDecimal totalNumCnfOrd, BigDecimal totalQtaToBeTaken, BigDecimal totalNumCnfToBeTaken, BigDecimal qtaCnfToBeTaken, BigDecimal totalQtaAvailable, BigDecimal totalNumCnfAvailable);
}
}
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
index 8fe6d0d7..bc9df9cf 100644
--- 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
@@ -49,7 +49,7 @@ public class ArticoliInColloBottomSheetMtbColrAdapter extends BaseAdapter {
binding.setMtbColr(mtbColr);
//Setting qty with unt_mis
- if(!SettingsManager.iDB().isFlagForceAllToColli() && (mtbColr.getMtbAart() == null || mtbColr.getMtbAart().isFlagQtaCnfFissa())){
+ if(!SettingsManager.iDB().isFlagForceAllToColli() && (mtbColr.getMtbAart() == null || mtbColr.getMtbAart().getFlagQtaCnfFissaBoolean())){
String text = UtilityNumber.decimalToString(mtbColr.getQtaCol());
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 1061de90..0dcd2d11 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
@@ -1,30 +1,19 @@
package it.integry.integrywmsnative.view.bottomsheet.viewmodel;
import android.app.Dialog;
-import android.app.ProgressDialog;
import android.content.Context;
-import androidx.databinding.DataBindingUtil;
+
import androidx.databinding.Observable;
import androidx.databinding.ObservableArrayList;
import androidx.databinding.ObservableField;
-import androidx.databinding.ObservableList;
import androidx.annotation.NonNull;
import com.google.android.material.bottomsheet.BottomSheetBehavior;
-import com.google.android.material.shape.CornerFamily;
-import com.google.android.material.shape.CornerTreatment;
-import com.google.android.material.shape.MaterialShapeDrawable;
-import com.google.android.material.shape.ShapeAppearanceModel;
import androidx.appcompat.app.AppCompatActivity;
import android.text.SpannableString;
-import android.view.LayoutInflater;
import android.view.View;
-import android.view.ViewGroup;
-import android.widget.BaseAdapter;
-import java.lang.ref.WeakReference;
import java.math.BigDecimal;
-import java.util.ArrayList;
import it.integry.integrywmsnative.R;
import it.integry.integrywmsnative.core.model.CommonModelConsts;
@@ -38,7 +27,6 @@ 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.FragmentArticoliInColloBottomSheetBinding;
-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;
@@ -161,7 +149,7 @@ public class ArticoliInColloBottomSheetViewModel {
//Setting qty with unt_mis
if(clickedItem.getMtbAart() != null) {
- if (clickedItem.getMtbAart().isFlagQtaCnfFissa()) {
+ if (clickedItem.getMtbAart().getFlagQtaCnfFissaBoolean()) {
mBindings.bottomSheetActionsQuantity.setText(UtilityNumber.decimalToString(clickedItem.getQtaCol()) + (!UtilityString.isNullOrEmpty(clickedItem.getMtbAart().getUntMis()) ? ("" + clickedItem.getMtbAart().getUntMis()) : ""));
} else {
mBindings.bottomSheetActionsQuantity.setText(UtilityNumber.decimalToString(clickedItem.getNumCnf()) + " " + mContext.getString(R.string.unt_mis_col));
diff --git a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/basket_lu/pages/page2/DialogBasketLU_Page2_ListAdapter.java b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/basket_lu/pages/page2/DialogBasketLU_Page2_ListAdapter.java
index 131eb1e4..8a5e8474 100644
--- a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/basket_lu/pages/page2/DialogBasketLU_Page2_ListAdapter.java
+++ b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/basket_lu/pages/page2/DialogBasketLU_Page2_ListAdapter.java
@@ -57,7 +57,7 @@ public class DialogBasketLU_Page2_ListAdapter extends RecyclerView.Adapter currentNumCnf = new ObservableField<>();
+ public ObservableField currentQtaCnf = new ObservableField<>();
+ public ObservableField currentQtaTot = new ObservableField<>();
+
+
+
+ public void init() {
+ this.currentNumCnf.set(totalNumCnfToBeTaken != null ? totalNumCnfToBeTaken : BigDecimal.ONE);
+ UtilityObservable.addPropertyChanged(this.currentNumCnf, this::onCurrentNumCnfChanged);
+
+
+ this.currentQtaCnf.set(qtaCnfToBeTaken != null ? qtaCnfToBeTaken : this.mtbAart.get().getQtaCnf());
+ UtilityObservable.addPropertyChanged(this.currentQtaCnf, this::onCurrentQtaCnfChanged);
+
+
+ this.currentQtaTot.set(totalQtaToBeTaken != null ? totalQtaToBeTaken : this.mtbAart.get().getQtaCnf());
+ UtilityObservable.addPropertyChanged(this.currentQtaTot, this::onCurrentQtaTotChanged);
}
+
+
+
public void setMtbAart(MtbAart mtbAart) {
this.mtbAart.set(mtbAart);
}
@@ -31,4 +57,44 @@ public class DialogInputQuantityV2ViewModel {
this.totalNumCnfOrd = totalNumCnfOrd;
return this;
}
+
+ public DialogInputQuantityV2ViewModel setTotalQtaToBeTaken(BigDecimal totalQtaToBeTaken) {
+ this.totalQtaToBeTaken = totalQtaToBeTaken;
+ return this;
+ }
+
+ public DialogInputQuantityV2ViewModel setTotalNumCnfToBeTaken(BigDecimal totalNumCnfToBeTaken) {
+ this.totalNumCnfToBeTaken = totalNumCnfToBeTaken;
+ return this;
+ }
+
+ public DialogInputQuantityV2ViewModel setQtaCnfToBeTaken(BigDecimal qtaCnfToBeTaken) {
+ this.qtaCnfToBeTaken = qtaCnfToBeTaken;
+ return this;
+ }
+
+ public DialogInputQuantityV2ViewModel setTotalQtaAvailable(BigDecimal totalQtaAvailable) {
+ this.totalQtaAvailable = totalQtaAvailable;
+ return this;
+ }
+
+ public DialogInputQuantityV2ViewModel setTotalNumCnfAvailable(BigDecimal totalNumCnfAvailable) {
+ this.totalNumCnfAvailable = totalNumCnfAvailable;
+ return this;
+ }
+
+
+
+
+ private void onCurrentNumCnfChanged(BigDecimal newValue) {
+ String a = "";
+ }
+
+ private void onCurrentQtaCnfChanged(BigDecimal newValue) {
+ String a = "";
+ }
+
+ private void onCurrentQtaTotChanged(BigDecimal newValue) {
+ String a = "";
+ }
}
diff --git a/app/src/main/res/layout/dialog_basket_lu__mtb_colr_model.xml b/app/src/main/res/layout/dialog_basket_lu__mtb_colr_model.xml
index 68efafe6..00ed2e55 100644
--- a/app/src/main/res/layout/dialog_basket_lu__mtb_colr_model.xml
+++ b/app/src/main/res/layout/dialog_basket_lu__mtb_colr_model.xml
@@ -67,7 +67,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@{UtilityNumber.decimalToString(mtbColr.qtaCol) + mtbColr.mtbAart.untMis}"
- android:visibility="@{SettingsManager.iDB().isFlagForceAllToColli() || (mtbColr.mtbAart != null && !mtbColr.mtbAart.isFlagQtaCnfFissa()) ? View.VISIBLE : View.GONE}"
+ android:visibility="@{SettingsManager.iDB().isFlagForceAllToColli() || (mtbColr.mtbAart != null && !mtbColr.mtbAart.flagQtaCnfFissaBoolean) ? View.VISIBLE : View.GONE}"
android:textSize="14sp"
android:textStyle="bold"
android:layout_alignParentEnd="true"
diff --git a/app/src/main/res/layout/dialog_choose_arts_from_lista_arts__item_model.xml b/app/src/main/res/layout/dialog_choose_arts_from_lista_arts__item_model.xml
index e4a40b0e..15abcf53 100644
--- a/app/src/main/res/layout/dialog_choose_arts_from_lista_arts__item_model.xml
+++ b/app/src/main/res/layout/dialog_choose_arts_from_lista_arts__item_model.xml
@@ -68,7 +68,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@{UtilityNumber.decimalToString(checkableMtbColr.item.mtbColr.qtaCol) + checkableMtbColr.item.mtbColr.mtbAart.untMis}"
- android:visibility="@{checkableMtbColr.item.mtbColr.mtbAart != null && !checkableMtbColr.item.mtbColr.mtbAart.isFlagQtaCnfFissa() ? View.VISIBLE : View.GONE}"
+ android:visibility="@{checkableMtbColr.item.mtbColr.mtbAart != null && !checkableMtbColr.item.mtbColr.mtbAart.flagQtaCnfFissaBoolean ? View.VISIBLE : View.GONE}"
android:textSize="14sp"
android:textStyle="bold"
android:paddingStart="6dp"
diff --git a/app/src/main/res/layout/dialog_input_quantity_v2.xml b/app/src/main/res/layout/dialog_input_quantity_v2.xml
index 411a3589..d65de49b 100644
--- a/app/src/main/res/layout/dialog_input_quantity_v2.xml
+++ b/app/src/main/res/layout/dialog_input_quantity_v2.xml
@@ -1,10 +1,16 @@
-
+
+
+
+
+
-
@@ -22,13 +27,12 @@
android:id="@+id/toolbar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:minHeight="?attr/actionBarSize"
android:background="?attr/colorPrimary"
- app:layout_constraintTop_toTopOf="parent"
+ android:minHeight="?attr/actionBarSize"
+ app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintEnd_toEndOf="parent">
-
-
+ app:layout_constraintTop_toTopOf="parent"
+ app:titleTextColor="@android:color/white">
@@ -37,11 +41,11 @@
+ app:layout_constraintStart_toStartOf="parent"
+ app:layout_constraintTop_toBottomOf="@+id/toolbar">
@@ -82,119 +86,110 @@
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}" >
+ android:visibility="@{UtilityString.isNullOrEmpty(viewmodel.mtbAart.untMis) ? View.GONE : View.VISIBLE}">
-
-
-
-
-
-
+ android:text="@string/total_ordered"
+ android:textColor="@android:color/black" />
+ android:layout_alignParentEnd="true"
+ android:orientation="horizontal">
+ android:text="@{UtilityNumber.decimalToString(viewmodel.totalNumCnfOrd)}"
+ android:textStyle="bold"
+ android:textColor="@android:color/black" />
-
+ android:text="@string/unt_mis_col"
+ android:textStyle="bold"
+ android:textColor="@android:color/black" />
+ android:text="("
+ android:textStyle="bold"
+ android:textColor="@android:color/black" />
+ android:layout_marginStart="0dp"
+ android:text="@{UtilityNumber.decimalToString(viewmodel.totalQtaOrd)}"
+ android:textStyle="bold"
+ android:textColor="@android:color/black" />
+ android:text="@{viewmodel.mtbAart.untMis}"
+ android:textStyle="bold"
+ android:textColor="@android:color/black" />
+ android:layout_marginStart="0dp"
+ android:text=")"
+ android:textStyle="bold"
+ android:textColor="@android:color/black" />
@@ -203,100 +198,297 @@
+
+
+ android:layout_height="wrap_content"
+ android:visibility="@{viewmodel.totalNumCnfToBeTaken != null || viewmodel.totalQtaToBeTaken != null ? View.VISIBLE : View.GONE}">
+ android:layout_toStartOf="@id/qta_da_prelevare_panel"
+ android:text="@string/to_be_taken"
+ android:textColor="@android:color/black" />
-
+ android:orientation="horizontal">
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ android:layout_height="wrap_content"
+ android:visibility="@{viewmodel.totalNumCnfAvailable != null || viewmodel.totalQtaAvailable != null ? View.VISIBLE : View.GONE}">
+ android:layout_toStartOf="@id/qta_disponibile_panel"
+ android:text="@string/total_available"
+ android:textColor="@android:color/black" />
-
+ android:orientation="horizontal">
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ app:layout_constraintTop_toTopOf="parent"
+ app:strokeColor="@color/colorPrimary" />
+ app:iconGravity="textStart"
+ app:layout_constraintTop_toTopOf="parent" />
+ app:iconGravity="textStart"
+ app:layout_constraintTop_toTopOf="parent" />
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 3d13125d..5db8f34f 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
@@ -48,7 +48,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@{UtilityNumber.decimalToString(mtbColr.qtaCol) + mtbColr.mtbAart.untMis}"
- android:visibility="@{SettingsManager.iDB().isFlagForceAllToColli() || (mtbColr.mtbAart != null && !mtbColr.mtbAart.isFlagQtaCnfFissa()) ? View.VISIBLE : View.GONE}"
+ android:visibility="@{SettingsManager.iDB().isFlagForceAllToColli() || (mtbColr.mtbAart != null && !mtbColr.mtbAart.flagQtaCnfFissaBoolean) ? View.VISIBLE : View.GONE}"
android:textSize="14sp"
android:textStyle="bold"
android:layout_alignParentEnd="true"
diff --git a/app/src/main/res/layout/fragment_choose_ords_lav_from_list__item_model.xml b/app/src/main/res/layout/fragment_choose_ords_lav_from_list__item_model.xml
index 555215de..d06ab91c 100644
--- a/app/src/main/res/layout/fragment_choose_ords_lav_from_list__item_model.xml
+++ b/app/src/main/res/layout/fragment_choose_ords_lav_from_list__item_model.xml
@@ -71,7 +71,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@{UtilityNumber.decimalToString(checkableOrdineLav.qtaCol.get()) +' '+ mtbColr.mtbAart.untMis}"
- android:visibility="@{SettingsManager.iDB().isFlagForceAllToColli() || (mtbColr.mtbAart != null && !mtbColr.mtbAart.isFlagQtaCnfFissa()) ? View.VISIBLE : View.GONE}"
+ android:visibility="@{SettingsManager.iDB().isFlagForceAllToColli() || (mtbColr.mtbAart != null && !mtbColr.mtbAart.flagQtaCnfFissaBoolean) ? View.VISIBLE : View.GONE}"
android:textSize="14sp"
android:textStyle="bold"
android:layout_alignParentEnd="true"
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 1fe4a04e..d8fb6884 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
@@ -63,7 +63,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@{UtilityNumber.decimalToString(mtbColr.qtaCol) + mtbColr.mtbAart.untMis}"
- android:visibility="@{SettingsManager.iDB().isFlagForceAllToColli() || (mtbColr.mtbAart != null && !mtbColr.mtbAart.isFlagQtaCnfFissa()) ? View.VISIBLE : View.GONE}"
+ android:visibility="@{SettingsManager.iDB().isFlagForceAllToColli() || (mtbColr.mtbAart != null && !mtbColr.mtbAart.flagQtaCnfFissaBoolean) ? View.VISIBLE : View.GONE}"
android:textSize="14sp"
android:textStyle="bold"
android:layout_alignParentEnd="true"
diff --git a/app/src/main/res/layout/lista_picking_libero_list_model.xml b/app/src/main/res/layout/lista_picking_libero_list_model.xml
index d20d2c96..c17fbc09 100644
--- a/app/src/main/res/layout/lista_picking_libero_list_model.xml
+++ b/app/src/main/res/layout/lista_picking_libero_list_model.xml
@@ -46,7 +46,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@{UtilityNumber.decimalToString(mtbColr.qtaCol) + mtbColr.mtbAart.untMis}"
- android:visibility="@{SettingsManager.iDB().isFlagForceAllToColli() || (mtbColr.mtbAart != null && !mtbColr.mtbAart.isFlagQtaCnfFissa()) ? View.VISIBLE : View.GONE}"
+ android:visibility="@{SettingsManager.iDB().isFlagForceAllToColli() || (mtbColr.mtbAart != null && !mtbColr.mtbAart.flagQtaCnfFissaBoolean) ? View.VISIBLE : View.GONE}"
android:textSize="14sp"
android:textStyle="bold"
android:layout_alignParentEnd="true"
diff --git a/app/src/main/res/layout/lista_rettifica_giacenze_model.xml b/app/src/main/res/layout/lista_rettifica_giacenze_model.xml
index 523f10de..69e7354a 100644
--- a/app/src/main/res/layout/lista_rettifica_giacenze_model.xml
+++ b/app/src/main/res/layout/lista_rettifica_giacenze_model.xml
@@ -65,7 +65,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@{UtilityNumber.decimalToString(mtbColr.qtaCol) + mtbColr.mtbAart.untMis}"
- android:visibility="@{SettingsManager.iDB().isFlagForceAllToColli() || (mtbColr.mtbAart != null && !mtbColr.mtbAart.isFlagQtaCnfFissa()) ? View.VISIBLE : View.GONE}"
+ android:visibility="@{SettingsManager.iDB().isFlagForceAllToColli() || (mtbColr.mtbAart != null && !mtbColr.mtbAart.flagQtaCnfFissaBoolean) ? View.VISIBLE : View.GONE}"
android:textSize="14sp"
android:textStyle="bold"
android:layout_alignParentEnd="true"
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index ba8d42f1..d4878b2c 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -84,7 +84,13 @@
@@ -113,6 +119,8 @@
- @color/colorAccent
- true
- @android:color/white
+
+ - @font/google_sans_regular
diff --git a/build.gradle b/build.gradle
index 0b94cd6b..25adc767 100644
--- a/build.gradle
+++ b/build.gradle
@@ -14,7 +14,7 @@ buildscript {
}
}
dependencies {
- classpath 'com.android.tools.build:gradle:3.6.0'
+ classpath 'com.android.tools.build:gradle:3.6.1'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
classpath 'com.google.gms:google-services:4.3.3'
classpath 'com.google.firebase:perf-plugin:1.3.1'