From 1a053d3dd6685194c305c97355af46f0f06eb65d Mon Sep 17 00:00:00 2001 From: GiuseppeS Date: Wed, 30 Jan 2019 16:50:26 +0100 Subject: [PATCH 1/2] =?UTF-8?q?Migliorata=20gestione=20colli=20recover.=20?= =?UTF-8?q?Incrementata=20velocit=C3=A0=20di=20caricamento=20del=20Filtro?= =?UTF-8?q?=20in=20avantielenco=20Spedizioni.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .idea/caches/build_file_checksums.ser | Bin 729 -> 729 bytes app/build.gradle | 1 + .../core/data_recover/ColliDataRecover.java | 14 ++++ .../MainAccettazioneFragment.java | 2 +- ...eOnOrdineAccettazioneInevasoViewModel.java | 34 +++++---- .../gest/main/MainFragment.java | 48 ++++++++++--- .../viewmodel/PickingLiberoViewModel.java | 18 +++-- .../viewmodel/RettificaGiacenzeViewModel.java | 17 +++-- .../gest/vendita/MainVenditaFragment.java | 2 +- .../gest/vendita/core/VenditaHelper.java | 16 +++-- .../dialogs/DialogVenditaFiltroAvanzato.java | 10 +-- .../dto/OrdineVenditaGroupedInevasoDTO.java | 12 ++++ .../vendita/dto/OrdineVenditaInevasoDTO.java | 12 ++++ .../VenditaOrdineInevasoViewModel.java | 40 +++++++---- .../DialogAskShouldPrint.java | 5 -- app/src/main/res/layout/activity_splash.xml | 2 +- .../layout/dialog_vendita_filtro_avanzato.xml | 65 +++++++++--------- 17 files changed, 193 insertions(+), 105 deletions(-) diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser index ddf3434277b10a17338207c84e9809911f45603a..8749c9fa060d26665951ce27f0634f0ae7487c2b 100644 GIT binary patch delta 36 ucmV+<0NelB1=$6Vm;|0a7oCxuwGecsk2X=$du@ad)JrAv{!X)D0eAr_>ks+> delta 36 ucmV+<0NelB1=$6Vm;``L`Vo getAllSessionIDs() { + if(thereIsAnExistantSession()) { + + List sessionIDs = new ArrayList<>(); + + for(int i = 0; i < mtbColtsSessions.size(); i++){ + sessionIDs.add(i); + } + + return sessionIDs; + + } else return null; + } + public static MtbColt getSession(Integer sessionID) { if(sessionID == null) return null; diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/accettazione/MainAccettazioneFragment.java b/app/src/main/java/it/integry/integrywmsnative/gest/accettazione/MainAccettazioneFragment.java index 35250094..b7b3814f 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/accettazione/MainAccettazioneFragment.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/accettazione/MainAccettazioneFragment.java @@ -308,7 +308,7 @@ public class MainAccettazioneFragment extends Fragment implements ISearcableFrag } - RunnableArgs onGroupSelectionChanged = dto -> { + private RunnableArgs onGroupSelectionChanged = dto -> { List selectedOrders = helper.getSelectedOrders(groupedOrdiniInevasi); if(selectedOrders != null && selectedOrders.size() > 1){ diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_ordine_inevaso/viewmodel/AccettazioneOnOrdineAccettazioneInevasoViewModel.java b/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_ordine_inevaso/viewmodel/AccettazioneOnOrdineAccettazioneInevasoViewModel.java index cf570082..374f5ba0 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_ordine_inevaso/viewmodel/AccettazioneOnOrdineAccettazioneInevasoViewModel.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_ordine_inevaso/viewmodel/AccettazioneOnOrdineAccettazioneInevasoViewModel.java @@ -8,6 +8,7 @@ import androidx.recyclerview.widget.LinearLayoutManager; import android.text.SpannableString; import com.annimon.stream.Stream; +import com.tfb.fbtoast.FBToast; import java.math.BigDecimal; import java.util.ArrayList; @@ -462,13 +463,16 @@ public class AccettazioneOnOrdineAccettazioneInevasoViewModel implements IOnColl finalProgress.dismiss(); - new StatusBarAlert.Builder(mActivity) - .autoHide(true) - .withDuration(2500) - .showProgress(false) - .withText(R.string.data_saved) - .withAlertColor(R.color.mainGreen) - .build(); + FBToast.successToast(mActivity,mActivity.getResources().getString(R.string.data_saved) ,FBToast.LENGTH_SHORT); + + +// new StatusBarAlert.Builder(mActivity) +// .autoHide(true) +// .withDuration(2500) +// .showProgress(false) +// .withText(R.string.data_saved) +// .withAlertColor(R.color.mainGreen) +// .build(); if(onComplete != null) onComplete.run(); @@ -794,13 +798,15 @@ public class AccettazioneOnOrdineAccettazioneInevasoViewModel implements IOnColl mArticoliInColloBottomSheetViewModel.mtbColt.get().getMtbColr().add(mtbColr); refreshOrderBy(false); - new StatusBarAlert.Builder(mActivity) - .autoHide(true) - .withDuration(2500) - .showProgress(false) - .withText(R.string.data_saved) - .withAlertColor(R.color.mainGreen) - .build(); + FBToast.successToast(mActivity,mActivity.getResources().getString(R.string.data_saved) ,FBToast.LENGTH_SHORT); + +// new StatusBarAlert.Builder(mActivity) +// .autoHide(true) +// .withDuration(2500) +// .showProgress(false) +// .withText(R.string.data_saved) +// .withAlertColor(R.color.mainGreen) +// .build(); progress.dismiss(); } diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/main/MainFragment.java b/app/src/main/java/it/integry/integrywmsnative/gest/main/MainFragment.java index a1c23d4a..9a918128 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/main/MainFragment.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/main/MainFragment.java @@ -17,6 +17,10 @@ import android.widget.TextView; import net.cachapa.expandablelayout.ExpandableLayout; +import java.util.ArrayList; +import java.util.Iterator; +import java.util.List; + import butterknife.BindView; import butterknife.ButterKnife; import butterknife.OnClick; @@ -27,6 +31,7 @@ import it.integry.integrywmsnative.core.REST.consumers.ColliMagazzinoRESTConsume import it.integry.integrywmsnative.core.REST.model.DistribuzioneColloDTO; import it.integry.integrywmsnative.core.REST.watcher.ServerStatusChecker; import it.integry.integrywmsnative.core.data_recover.ColliDataRecover; +import it.integry.integrywmsnative.core.expansion.RunnableArgs; import it.integry.integrywmsnative.core.interfaces.IScrollableFragment; import it.integry.integrywmsnative.core.interfaces.ITitledFragment; import it.integry.integrywmsnative.core.model.MtbColt; @@ -113,23 +118,44 @@ public class MainFragment extends Fragment implements ITitledFragment, IScrollab if(ColliDataRecover.thereIsAnExistantSession()){ startRecoverMode(); - Integer recoveredMtbColtID = ColliDataRecover.getFirstSessionID(); + List generatedErrors = new ArrayList<>(); + + Iterator sessionsIterator = ColliDataRecover.getAllSessionIDs().iterator(); + + cyclicRecover(sessionsIterator, () -> { + + for (Exception ex : generatedErrors) { + UtilityExceptions.defaultException(getActivity(), ex); + } + + endRecoverMode(); + }, generatedErrors::add); + + } + } + + private void cyclicRecover(Iterator sessionsIterator, Runnable onComplete, RunnableArgs onFailed) { + if(sessionsIterator.hasNext()) { + Integer recoveredMtbColtID = sessionsIterator.next(); MtbColt recoveredMtbColt = ColliDataRecover.getSession(recoveredMtbColtID); - if(recoveredMtbColt != null && recoveredMtbColt.getGestioneEnum() == GestioneEnum.VENDITA && !UtilityString.isNullOrEmpty(recoveredMtbColt.getFiltroOrdini())) { + if(recoveredMtbColt != null && (recoveredMtbColt.getGestioneEnum() == GestioneEnum.VENDITA || recoveredMtbColt.getGestioneEnum() == GestioneEnum.LAVORAZIONE) && !UtilityString.isNullOrEmpty(recoveredMtbColt.getFiltroOrdini())) { ColliMagazzinoRESTConsumer.distribuisciCollo(recoveredMtbColt, SettingsManager.iDB().getDefaultCriterioDistribuzione(), - mtbColts -> { - ColliDataRecover.closeSession(recoveredMtbColtID); - endRecoverMode(); - }, - ex -> { - UtilityExceptions.defaultException(getActivity(), ex); - endRecoverMode(); - }); + mtbColts -> { + ColliDataRecover.closeSession(recoveredMtbColtID); + + cyclicRecover(sessionsIterator, onComplete, onFailed); + }, ex -> { + onFailed.run(ex); + cyclicRecover(sessionsIterator, onComplete, onFailed); + }); } else { ColliDataRecover.closeSession(recoveredMtbColtID); - endRecoverMode(); + cyclicRecover(sessionsIterator, onComplete, onFailed); } + + } else { + onComplete.run(); } } diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/picking_libero/viewmodel/PickingLiberoViewModel.java b/app/src/main/java/it/integry/integrywmsnative/gest/picking_libero/viewmodel/PickingLiberoViewModel.java index 1a0943ff..fb49d93f 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/picking_libero/viewmodel/PickingLiberoViewModel.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/picking_libero/viewmodel/PickingLiberoViewModel.java @@ -8,6 +8,7 @@ import android.view.View; import com.annimon.stream.Stream; import com.google.android.material.bottomsheet.BottomSheetBehavior; +import com.tfb.fbtoast.FBToast; import java.math.BigDecimal; import java.util.ArrayList; @@ -480,13 +481,16 @@ public class PickingLiberoViewModel implements IRecyclerItemClicked { if(shouldCloseProgress) progressDialogFinal.dismiss(); - new StatusBarAlert.Builder(mContext) - .autoHide(true) - .withDuration(2500) - .showProgress(false) - .withText(R.string.data_saved) - .withAlertColor(R.color.mainGreen) - .build(); + FBToast.successToast(mContext, mContext.getResources().getString(R.string.data_saved) ,FBToast.LENGTH_SHORT); + + +// new StatusBarAlert.Builder(mContext) +// .autoHide(true) +// .withDuration(2500) +// .showProgress(false) +// .withText(R.string.data_saved) +// .withAlertColor(R.color.mainGreen) +// .build(); if(onComplete != null) onComplete.run(); diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/rettifica_giacenze/viewmodel/RettificaGiacenzeViewModel.java b/app/src/main/java/it/integry/integrywmsnative/gest/rettifica_giacenze/viewmodel/RettificaGiacenzeViewModel.java index efbebe94..16d26c0d 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/rettifica_giacenze/viewmodel/RettificaGiacenzeViewModel.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/rettifica_giacenze/viewmodel/RettificaGiacenzeViewModel.java @@ -16,6 +16,7 @@ import android.view.View; import android.view.inputmethod.EditorInfo; import com.annimon.stream.Stream; +import com.tfb.fbtoast.FBToast; import java.math.BigDecimal; import java.util.ArrayList; @@ -341,13 +342,15 @@ public class RettificaGiacenzeViewModel implements IRecyclerItemClicked mtbColt.get().getMtbColr().add(mtbColr); - new StatusBarAlert.Builder(mContext) - .autoHide(true) - .withDuration(2500) - .showProgress(false) - .withText(R.string.data_saved) - .withAlertColor(R.color.mainGreen) - .build(); + FBToast.successToast(mContext, mContext.getResources().getString(R.string.data_saved) ,FBToast.LENGTH_SHORT); + +// new StatusBarAlert.Builder(mContext) +// .autoHide(true) +// .withDuration(2500) +// .showProgress(false) +// .withText(R.string.data_saved) +// .withAlertColor(R.color.mainGreen) +// .build(); resetTexts(); progress.dismiss(); diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/vendita/MainVenditaFragment.java b/app/src/main/java/it/integry/integrywmsnative/gest/vendita/MainVenditaFragment.java index 46ba31ee..e73a4c84 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/vendita/MainVenditaFragment.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/vendita/MainVenditaFragment.java @@ -289,7 +289,7 @@ public class MainVenditaFragment extends Fragment implements ITitledFragment, IS } }; - RunnableArgs onGroupSelectionChanged = dto -> { + private RunnableArgs onGroupSelectionChanged = dto -> { List selectedOrders = mHelper.getSelectedOrders(groupedOrdiniInevasi); if(!SettingsManager.iDB().isFlagMultiClienteOrdV()){ diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/vendita/core/VenditaHelper.java b/app/src/main/java/it/integry/integrywmsnative/gest/vendita/core/VenditaHelper.java index 9a4c5c93..fb624437 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/vendita/core/VenditaHelper.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/vendita/core/VenditaHelper.java @@ -23,6 +23,7 @@ import it.integry.integrywmsnative.core.model.MtbColr; import it.integry.integrywmsnative.core.model.MtbColt; import it.integry.integrywmsnative.core.model.secondary.GestioneEnum; import it.integry.integrywmsnative.core.settings.SettingsManager; +import it.integry.integrywmsnative.core.utility.UtilityDB; import it.integry.integrywmsnative.core.utility.UtilityDate; import it.integry.integrywmsnative.core.utility.UtilityFirebase; import it.integry.integrywmsnative.core.utility.UtilityLogger; @@ -146,10 +147,10 @@ public class VenditaHelper { "mtb_colt.ser_collo = mtb_colr.ser_collo AND " + "mtb_colt.data_collo = mtb_colr.data_collo AND " + "mtb_colt.num_collo = mtb_colr.num_collo AND " + - "mtb_colt.gestione = 'V' AND " + + "mtb_colt.gestione IN ('V', 'L') AND " + "mtb_colt.data_doc is null AND "; - String whereCond = ""; + StringBuilder whereCond = new StringBuilder(); for(int i = 0; i < orders.size(); i++){ @@ -157,13 +158,16 @@ public class VenditaHelper { for(int j = 0; j < currentOrders.size(); j++){ - whereCond += "(mtb_colr.data_ord = '" + UtilityDate.formatDate(currentOrders.get(j).getData(), UtilityDate.COMMONS_DATE_FORMATS.YMD_SLASH) + "' " + - "AND mtb_colr.num_ord = " + currentOrders.get(j).getNumero() + ") "; + whereCond + .append("(mtb_colr.data_ord = '").append(UtilityDate.formatDate(currentOrders.get(j).getData(), UtilityDate.COMMONS_DATE_FORMATS.YMD_SLASH)).append("' ") + .append("AND mtb_colr.num_ord = ").append(currentOrders.get(j).getNumero()).append(" ") + .append("AND mtb_colr.gestione = ").append(UtilityDB.valueToString(currentOrders.get(j).getGestione())) + .append(") "); if(i != (orders.size() - 1)){ - whereCond += "OR "; + whereCond.append("OR "); } else if(j != (currentOrders.size() - 1)) { - whereCond += "OR "; + whereCond.append("OR "); } } } diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/vendita/dialogs/DialogVenditaFiltroAvanzato.java b/app/src/main/java/it/integry/integrywmsnative/gest/vendita/dialogs/DialogVenditaFiltroAvanzato.java index 8527e334..5a8e9ae9 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/vendita/dialogs/DialogVenditaFiltroAvanzato.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/vendita/dialogs/DialogVenditaFiltroAvanzato.java @@ -199,13 +199,13 @@ public class DialogVenditaFiltroAvanzato { currentNumOrdsPredicate = o -> numOrdsInteger.contains(o.getNumOrd()); - bindings.inputNumOrds.setErrorEnabled(false); - bindings.inputNumOrds.setError(""); +// bindings.inputNumOrds.setErrorEnabled(false); +// bindings.inputNumOrds.setError(""); } catch (NumberFormatException ex) { currentNumOrdsPredicate = null; - bindings.inputNumOrds.setErrorEnabled(true); - bindings.inputNumOrds.setError(currentContext.getResources().getString(R.string.error)); +// bindings.inputNumOrds.setErrorEnabled(true); +// bindings.inputNumOrds.setError(currentContext.getResources().getString(R.string.error)); } } @@ -320,7 +320,7 @@ public class DialogVenditaFiltroAvanzato { currentFilteredOrderList = tmpStream.toList(); } - return Stream.of(currentFilteredOrderList).map(x -> x.getCodVvet() + " - " + x.getDescrizioneVettore()).distinct().withoutNulls().toList(); + return Stream.of(currentFilteredOrderList).filter(x -> x.getCodVvet() != null).map(x -> x.getCodVvet() + " - " + x.getDescrizioneVettore()).distinct().withoutNulls().toList(); } private List getAvailableAutomezzi() { diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/vendita/dto/OrdineVenditaGroupedInevasoDTO.java b/app/src/main/java/it/integry/integrywmsnative/gest/vendita/dto/OrdineVenditaGroupedInevasoDTO.java index cbc87727..823279e8 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/vendita/dto/OrdineVenditaGroupedInevasoDTO.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/vendita/dto/OrdineVenditaGroupedInevasoDTO.java @@ -34,6 +34,7 @@ public class OrdineVenditaGroupedInevasoDTO implements Cloneable, Serializable, private String dataCons; private String rifOrd; private String gestione; + private int colliRiservati; private String codAnagClie; @@ -169,6 +170,15 @@ public class OrdineVenditaGroupedInevasoDTO implements Cloneable, Serializable, return this; } + public int getColliRiservati() { + return colliRiservati; + } + + public Ordine setColliRiservati(int colliRiservati) { + this.colliRiservati = colliRiservati; + return this; + } + public List getClienti() { return clienti; } @@ -206,6 +216,7 @@ public class OrdineVenditaGroupedInevasoDTO implements Cloneable, Serializable, clienti = null; } gestione = in.readString(); + colliRiservati = in.readInt(); } @Override @@ -236,6 +247,7 @@ public class OrdineVenditaGroupedInevasoDTO implements Cloneable, Serializable, dest.writeList(clienti); } dest.writeString(gestione); + dest.writeInt(colliRiservati); } @SuppressWarnings("unused") diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/vendita/dto/OrdineVenditaInevasoDTO.java b/app/src/main/java/it/integry/integrywmsnative/gest/vendita/dto/OrdineVenditaInevasoDTO.java index 72415d11..92ce9897 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/vendita/dto/OrdineVenditaInevasoDTO.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/vendita/dto/OrdineVenditaInevasoDTO.java @@ -43,6 +43,7 @@ public class OrdineVenditaInevasoDTO implements Parcelable { private BigDecimal saldoContabile; private String codVzon; private String ragSocOrdV; + private int colliRiservati; protected OrdineVenditaInevasoDTO(Parcel in) { @@ -85,6 +86,7 @@ public class OrdineVenditaInevasoDTO implements Parcelable { } codVzon = in.readString(); ragSocOrdV = in.readString(); + colliRiservati = in.readInt(); } @Override @@ -131,6 +133,7 @@ public class OrdineVenditaInevasoDTO implements Parcelable { } dest.writeString(codVzon); dest.writeString(ragSocOrdV); + dest.writeInt(colliRiservati); } @Override @@ -448,4 +451,13 @@ public class OrdineVenditaInevasoDTO implements Parcelable { this.ragSocOrdV = ragSocOrdV; return this; } + + public int getColliRiservati() { + return colliRiservati; + } + + public OrdineVenditaInevasoDTO setColliRiservati(int colliRiservati) { + this.colliRiservati = colliRiservati; + return this; + } } diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/vendita_ordine_inevaso/viewmodel/VenditaOrdineInevasoViewModel.java b/app/src/main/java/it/integry/integrywmsnative/gest/vendita_ordine_inevaso/viewmodel/VenditaOrdineInevasoViewModel.java index 022c8118..057d6b37 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/vendita_ordine_inevaso/viewmodel/VenditaOrdineInevasoViewModel.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/vendita_ordine_inevaso/viewmodel/VenditaOrdineInevasoViewModel.java @@ -7,6 +7,7 @@ import androidx.recyclerview.widget.LinearLayoutManager; import android.text.SpannableString; import com.annimon.stream.Stream; +import com.tfb.fbtoast.FBToast; import java.math.BigDecimal; import java.util.ArrayList; @@ -658,7 +659,10 @@ public class VenditaOrdineInevasoViewModel implements IOnColloClosedCallback, IO @Override public void onSuccess(MtbColt value) { - mtbColtSessionID = ColliDataRecover.startNewSession(value); + mtbColt + .setNumCollo(value.getNumCollo()) + .setDataCollo(value.getDataColloS()); + mtbColtSessionID = ColliDataRecover.startNewSession(mtbColt); value .setDisablePrint(disablePrint) @@ -668,13 +672,16 @@ public class VenditaOrdineInevasoViewModel implements IOnColloClosedCallback, IO if(closeProgress) finalProgress.dismiss(); - new StatusBarAlert.Builder(mActivity) - .autoHide(true) - .withDuration(2500) - .showProgress(false) - .withText(R.string.data_saved) - .withAlertColor(R.color.mainGreen) - .build(); + FBToast.successToast(mActivity,mActivity.getResources().getString(R.string.data_saved) ,FBToast.LENGTH_SHORT); + + +// new StatusBarAlert.Builder(mActivity) +// .autoHide(true) +// .withDuration(2500) +// .showProgress(false) +// .withText(R.string.data_saved) +// .withAlertColor(R.color.mainGreen) +// .build(); if(onComplete != null) onComplete.run(); @@ -1043,13 +1050,16 @@ public class VenditaOrdineInevasoViewModel implements IOnColloClosedCallback, IO //Chiamato removeListFilter perché cosi mi cancella tutti i dati di pick temporanei removeListFilter(); - new StatusBarAlert.Builder(mActivity) - .autoHide(true) - .withDuration(2500) - .showProgress(false) - .withText(R.string.data_saved) - .withAlertColor(R.color.mainGreen) - .build(); + + FBToast.successToast(mActivity,mActivity.getResources().getString(R.string.data_saved) ,FBToast.LENGTH_SHORT); + +// new StatusBarAlert.Builder(mActivity) +// .autoHide(true) +// .withDuration(2500) +// .showProgress(false) +// .withText(R.string.data_saved) +// .withAlertColor(R.color.mainGreen) +// .build(); progress.dismiss(); } diff --git a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/ask_should_print/DialogAskShouldPrint.java b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/ask_should_print/DialogAskShouldPrint.java index 3fd2eb45..39e3e521 100644 --- a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/ask_should_print/DialogAskShouldPrint.java +++ b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/ask_should_print/DialogAskShouldPrint.java @@ -12,9 +12,6 @@ import it.integry.integrywmsnative.databinding.DialogAskShouldPrintBinding; public class DialogAskShouldPrint { - - private Context currentContext; - private AlertDialog currentAlert; public static AlertDialog make(final Context context, final String nomeEtichetta, RunnableArgs onDialogDismiss) { @@ -22,8 +19,6 @@ public class DialogAskShouldPrint { } private DialogAskShouldPrint(Context context, String nomeEtichetta, RunnableArgs onDialogDismiss) { - currentContext = context; - LayoutInflater inflater = (LayoutInflater) context.getSystemService( Context.LAYOUT_INFLATER_SERVICE ); DialogAskShouldPrintBinding bindings = DataBindingUtil.inflate(inflater, R.layout.dialog_ask_should_print, null, false); diff --git a/app/src/main/res/layout/activity_splash.xml b/app/src/main/res/layout/activity_splash.xml index 238aed23..bc02239c 100644 --- a/app/src/main/res/layout/activity_splash.xml +++ b/app/src/main/res/layout/activity_splash.xml @@ -7,7 +7,7 @@ android:background="@color/colorPrimary" tools:context=".SplashActivity"> - - + + + + - + - + + + + + - + - + + + + - + - + + + + - + - + + + + - + - + + + + - + From c85065419a09f7e106a91379e3d19c38c685787f Mon Sep 17 00:00:00 2001 From: GiuseppeS Date: Wed, 30 Jan 2019 16:52:59 +0100 Subject: [PATCH 2/2] -> v1.0.28 (31) --- .idea/caches/build_file_checksums.ser | Bin 729 -> 729 bytes app/build.gradle | 4 ++-- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser index 8749c9fa060d26665951ce27f0634f0ae7487c2b..2085cbb232623de2477f10076daab99386e0f2a3 100644 GIT binary patch delta 36 ucmV+<0NelB1=$6Vm;|48Vsw$5wGhc2@pKa6w?ZMAfm@=dt824i0eAs9rx1Yv delta 36 ucmV+<0NelB1=$6Vm;|0a7oCxuwGecsk2X=$du@ad)JrAv{!X)D0eAr_>ks+> diff --git a/app/build.gradle b/app/build.gradle index 24170526..311bfbbb 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -17,8 +17,8 @@ apply plugin: 'com.google.gms.google-services' android { - def appVersionCode = 30 - def appVersionName = '1.0.27' + def appVersionCode = 31 + def appVersionName = '1.0.28' signingConfigs { release {