From da499c2aa9205a34c172f42fea7ac36dd9be5bfd Mon Sep 17 00:00:00 2001 From: GiuseppeS Date: Thu, 21 Mar 2019 09:55:09 +0100 Subject: [PATCH] Implementata nuova UI nei DialogSimpleBase --- .../integrywmsnative/SplashActivity.java | 4 +- .../core/barcode_reader/BarcodeManager.java | 2 - .../core/context/MainContext.java | 2 +- .../core/utility/UtilityExceptions.java | 3 +- .../MainAccettazioneFragment.java | 5 +- ...eOnOrdineAccettazioneInevasoViewModel.java | 4 +- .../viewmodel/ContenutoBancaleViewModel.java | 2 +- .../gest/login/viewmodel/LoginViewModel.java | 2 +- .../viewmodel/PickingLiberoViewModel.java | 5 +- .../viewmodel/RettificaGiacenzeViewModel.java | 2 +- .../gest/vendita/MainVenditaFragment.java | 2 +- .../vendita/viewmodel/VenditaViewModel.java | 8 +- .../VenditaOrdineInevasoViewModel.java | 2 +- .../viewmodel/VersamentoMerceViewModel.java | 3 +- .../ArticoliInColloBottomSheetViewModel.java | 5 +- .../{ => base}/DialogSimpleMessageHelper.java | 103 +++++--- .../base/DialogSimpleMessageViewModel.java | 61 +++++ .../input_quantity/DialogInputQuantity.java | 7 +- .../DialogScanOrCreateLU.java | 3 +- app/src/main/res/layout/dialog_base.xml | 235 ++++++++++++++++++ app/src/main/res/values/buttons_style.xml | 25 ++ 21 files changed, 400 insertions(+), 85 deletions(-) rename app/src/main/java/it/integry/integrywmsnative/view/dialogs/{ => base}/DialogSimpleMessageHelper.java (55%) create mode 100644 app/src/main/java/it/integry/integrywmsnative/view/dialogs/base/DialogSimpleMessageViewModel.java create mode 100644 app/src/main/res/layout/dialog_base.xml diff --git a/app/src/main/java/it/integry/integrywmsnative/SplashActivity.java b/app/src/main/java/it/integry/integrywmsnative/SplashActivity.java index 9321c9db..f7147bcb 100644 --- a/app/src/main/java/it/integry/integrywmsnative/SplashActivity.java +++ b/app/src/main/java/it/integry/integrywmsnative/SplashActivity.java @@ -13,14 +13,12 @@ import java.util.List; import androidx.appcompat.app.AppCompatActivity; import butterknife.BindView; import butterknife.ButterKnife; -import it.integry.integrywmsnative.core.REST.watcher.ServerStatusChecker; import it.integry.integrywmsnative.core.context.MainContext; -import it.integry.integrywmsnative.core.expansion.RunnableArgss; import it.integry.integrywmsnative.core.expansion.RunnableArgsss; import it.integry.integrywmsnative.core.settings.SettingsManager; import it.integry.integrywmsnative.core.utility.PermissionsHelper; import it.integry.integrywmsnative.gest.login.LoginActivity; -import it.integry.integrywmsnative.view.dialogs.DialogSimpleMessageHelper; +import it.integry.integrywmsnative.view.dialogs.base.DialogSimpleMessageHelper; public class SplashActivity extends AppCompatActivity { diff --git a/app/src/main/java/it/integry/integrywmsnative/core/barcode_reader/BarcodeManager.java b/app/src/main/java/it/integry/integrywmsnative/core/barcode_reader/BarcodeManager.java index f9160f86..1787944c 100644 --- a/app/src/main/java/it/integry/integrywmsnative/core/barcode_reader/BarcodeManager.java +++ b/app/src/main/java/it/integry/integrywmsnative/core/barcode_reader/BarcodeManager.java @@ -1,7 +1,6 @@ package it.integry.integrywmsnative.core.barcode_reader; import android.content.Context; -import android.text.SpannableString; import java.lang.reflect.Constructor; import java.util.ArrayList; @@ -9,7 +8,6 @@ import java.util.List; import it.integry.integrywmsnative.core.utility.UtilityExceptions; import it.integry.integrywmsnative.core.utility.UtilityLogger; -import it.integry.integrywmsnative.view.dialogs.DialogSimpleMessageHelper; import it.integry.plugins.barcode_base_library.exception.BarcodeAdapterNotFoundException; import it.integry.plugins.barcode_base_library.interfaces.BarcodeReaderInterface; import it.integry.pointmobilescannerlibrary.PointMobileBarcodeReader; diff --git a/app/src/main/java/it/integry/integrywmsnative/core/context/MainContext.java b/app/src/main/java/it/integry/integrywmsnative/core/context/MainContext.java index 7aa4148c..eed2350a 100644 --- a/app/src/main/java/it/integry/integrywmsnative/core/context/MainContext.java +++ b/app/src/main/java/it/integry/integrywmsnative/core/context/MainContext.java @@ -10,7 +10,7 @@ import it.integry.integrywmsnative.core.REST.watcher.ServerStatusChecker; import it.integry.integrywmsnative.core.class_router.ClassRouter; import it.integry.integrywmsnative.core.settings.SettingsManager; import it.integry.integrywmsnative.core.utility.UtilityExceptions; -import it.integry.integrywmsnative.view.dialogs.DialogSimpleMessageHelper; +import it.integry.integrywmsnative.view.dialogs.base.DialogSimpleMessageHelper; public class MainContext { diff --git a/app/src/main/java/it/integry/integrywmsnative/core/utility/UtilityExceptions.java b/app/src/main/java/it/integry/integrywmsnative/core/utility/UtilityExceptions.java index 20f1f45a..ec1cf692 100644 --- a/app/src/main/java/it/integry/integrywmsnative/core/utility/UtilityExceptions.java +++ b/app/src/main/java/it/integry/integrywmsnative/core/utility/UtilityExceptions.java @@ -3,14 +3,13 @@ package it.integry.integrywmsnative.core.utility; import android.app.ProgressDialog; import android.content.Context; import android.text.SpannableString; -import android.util.Log; import com.crashlytics.android.Crashlytics; import com.orhanobut.logger.Logger; import it.integry.integrywmsnative.BuildConfig; import it.integry.integrywmsnative.core.REST.CommonRESTException; -import it.integry.integrywmsnative.view.dialogs.DialogSimpleMessageHelper; +import it.integry.integrywmsnative.view.dialogs.base.DialogSimpleMessageHelper; public class UtilityExceptions { 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 94a3c763..77a0cdb0 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 @@ -6,7 +6,6 @@ import android.content.Context; import android.content.Intent; import androidx.appcompat.widget.AppCompatTextView; -import androidx.appcompat.widget.Toolbar; import androidx.databinding.DataBindingUtil; import android.os.Bundle; import androidx.fragment.app.Fragment; @@ -22,7 +21,6 @@ import android.widget.Toast; import com.annimon.stream.Stream; import java.util.ArrayList; -import java.util.HashMap; import java.util.List; import java.util.concurrent.atomic.AtomicInteger; @@ -31,7 +29,6 @@ import butterknife.OnClick; import it.integry.integrywmsnative.R; import it.integry.integrywmsnative.core.CommonConst; import it.integry.integrywmsnative.core.REST.CommonRESTException; -import it.integry.integrywmsnative.core.coollection.Coollection; import it.integry.integrywmsnative.core.data_cache.DataCache; import it.integry.integrywmsnative.core.expansion.RunnableArgs; import it.integry.integrywmsnative.core.interfaces.ISearcableFragment; @@ -48,7 +45,7 @@ import it.integry.integrywmsnative.gest.accettazione.dto.OrdineAccettazioneGroup import it.integry.integrywmsnative.gest.accettazione.dto.OrdineAccettazioneInevasoDTO; import it.integry.integrywmsnative.gest.accettazione_ordine_inevaso.AccettazioneOrdineInevasoActivity; import it.integry.integrywmsnative.ui.ElevatedToolbar; -import it.integry.integrywmsnative.view.dialogs.DialogSimpleMessageHelper; +import it.integry.integrywmsnative.view.dialogs.base.DialogSimpleMessageHelper; public class MainAccettazioneFragment extends Fragment implements ISearcableFragment, ITitledFragment, IScrollableFragment { 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 9bc7c55c..d7c97e89 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 @@ -49,11 +49,9 @@ import it.integry.integrywmsnative.gest.accettazione_ordine_inevaso.core.MainLis import it.integry.integrywmsnative.gest.accettazione_ordine_inevaso.dto.AccettazioneOrdineInevasoOrderBy; import it.integry.integrywmsnative.gest.accettazione_ordine_inevaso.rest.OrdineAccettazioneInevasoRESTConsumerService; import it.integry.integrywmsnative.gest.accettazione_ordine_inevaso.views.NoteAggiuntiveNuovaULDialog; -import it.integry.integrywmsnative.gest.vendita.dto.OrdineVenditaGroupedInevasoDTO; -import it.integry.integrywmsnative.ui.StatusBarAlert; import it.integry.integrywmsnative.view.bottomsheet.interfaces.IOnColloClosedCallback; import it.integry.integrywmsnative.view.bottomsheet.viewmodel.ArticoliInColloBottomSheetViewModel; -import it.integry.integrywmsnative.view.dialogs.DialogSimpleMessageHelper; +import it.integry.integrywmsnative.view.dialogs.base.DialogSimpleMessageHelper; import it.integry.integrywmsnative.view.dialogs.input_quantity.DialogInputQuantity; import it.integry.integrywmsnative.view.dialogs.input_quantity.QuantityDTO; import it.integry.plugins.barcode_base_library.model.BarcodeScanDTO; diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/contenuto_bancale/viewmodel/ContenutoBancaleViewModel.java b/app/src/main/java/it/integry/integrywmsnative/gest/contenuto_bancale/viewmodel/ContenutoBancaleViewModel.java index 1043b7b0..807ffbac 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/contenuto_bancale/viewmodel/ContenutoBancaleViewModel.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/contenuto_bancale/viewmodel/ContenutoBancaleViewModel.java @@ -24,7 +24,7 @@ import it.integry.integrywmsnative.core.settings.SettingsManager; import it.integry.integrywmsnative.core.utility.UtilityExceptions; import it.integry.integrywmsnative.gest.contenuto_bancale.ContenutoBancaleActivity; import it.integry.integrywmsnative.gest.contenuto_bancale.core.ContenutoBancaleListAdapter; -import it.integry.integrywmsnative.view.dialogs.DialogSimpleMessageHelper; +import it.integry.integrywmsnative.view.dialogs.base.DialogSimpleMessageHelper; import static android.app.Activity.RESULT_OK; diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/login/viewmodel/LoginViewModel.java b/app/src/main/java/it/integry/integrywmsnative/gest/login/viewmodel/LoginViewModel.java index 027e28d4..f72dc910 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/login/viewmodel/LoginViewModel.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/login/viewmodel/LoginViewModel.java @@ -27,7 +27,7 @@ import it.integry.integrywmsnative.gest.login.LoginActivity; import it.integry.integrywmsnative.gest.login.core.LoginHelper; import it.integry.integrywmsnative.gest.login.dto.LoginAziendaDTO; import it.integry.integrywmsnative.gest.login.dto.LoginDTO; -import it.integry.integrywmsnative.view.dialogs.DialogSimpleMessageHelper; +import it.integry.integrywmsnative.view.dialogs.base.DialogSimpleMessageHelper; public class LoginViewModel { 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 b14243ed..8b993da3 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 @@ -2,7 +2,6 @@ package it.integry.integrywmsnative.gest.picking_libero.viewmodel; import android.app.Activity; import android.app.ProgressDialog; -import android.content.Context; import android.text.SpannableString; import android.view.View; @@ -17,7 +16,6 @@ import java.util.Iterator; import java.util.List; import androidx.annotation.NonNull; -import androidx.appcompat.app.ActionBar; import androidx.appcompat.widget.AppCompatTextView; import androidx.core.content.ContextCompat; import androidx.databinding.Observable; @@ -46,8 +44,7 @@ import it.integry.integrywmsnative.core.utility.UtilityString; import it.integry.integrywmsnative.databinding.FragmentPickingLiberoBinding; import it.integry.integrywmsnative.gest.picking_libero.core.PickingLiberoHelper; import it.integry.integrywmsnative.gest.picking_libero.core.PickingLiberoListAdapter; -import it.integry.integrywmsnative.ui.StatusBarAlert; -import it.integry.integrywmsnative.view.dialogs.DialogSimpleMessageHelper; +import it.integry.integrywmsnative.view.dialogs.base.DialogSimpleMessageHelper; import it.integry.integrywmsnative.view.dialogs.choose_arts_from_lista_arts.DialogChooseArtsFromListaArts; import it.integry.integrywmsnative.view.dialogs.input_quantity.DialogInputQuantity; import it.integry.plugins.barcode_base_library.model.BarcodeScanDTO; 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 dba3a1bd..42da807a 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 @@ -56,7 +56,7 @@ import it.integry.integrywmsnative.gest.rettifica_giacenze.core.RettificaGiacenz import it.integry.integrywmsnative.gest.rettifica_giacenze.core.adapter.AutoCompleteFornitoreAdapter; import it.integry.integrywmsnative.gest.rettifica_giacenze.core.adapter.RettificaGiacenzeMainListAdapter; import it.integry.integrywmsnative.gest.rettifica_giacenze.dto.FornitoreDTO; -import it.integry.integrywmsnative.view.dialogs.DialogSimpleMessageHelper; +import it.integry.integrywmsnative.view.dialogs.base.DialogSimpleMessageHelper; import it.integry.integrywmsnative.view.dialogs.ask_position_of_lu.DialogAskPositionOfLU; import it.integry.integrywmsnative.view.dialogs.choose_art_from_lista_arts.DialogChooseArtFromListaArts; import it.integry.integrywmsnative.view.dialogs.input_quantity.DialogInputQuantity; 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 c271c3bf..07c2e2da 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 @@ -51,7 +51,7 @@ import it.integry.integrywmsnative.gest.vendita.dto.PickingObjectDTO; import it.integry.integrywmsnative.gest.vendita.viewmodel.VenditaViewModel; import it.integry.integrywmsnative.gest.vendita_ordine_inevaso.VenditaOrdineInevasoActivity; import it.integry.integrywmsnative.ui.ElevatedToolbar; -import it.integry.integrywmsnative.view.dialogs.DialogSimpleMessageHelper; +import it.integry.integrywmsnative.view.dialogs.base.DialogSimpleMessageHelper; public class MainVenditaFragment extends Fragment implements ITitledFragment, IScrollableFragment, ISelectAllFragment, IFilterableFragment { diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/vendita/viewmodel/VenditaViewModel.java b/app/src/main/java/it/integry/integrywmsnative/gest/vendita/viewmodel/VenditaViewModel.java index a7af3d5c..ad4d53df 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/vendita/viewmodel/VenditaViewModel.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/vendita/viewmodel/VenditaViewModel.java @@ -5,14 +5,12 @@ import android.app.ProgressDialog; import android.text.Html; import android.text.SpannableString; -import com.annimon.stream.Collectors; import com.annimon.stream.Stream; import java.util.ArrayList; import java.util.List; import it.integry.integrywmsnative.R; -import it.integry.integrywmsnative.core.CommonConst; import it.integry.integrywmsnative.core.REST.consumers.BarcodeRESTConsumer; import it.integry.integrywmsnative.core.REST.consumers.ColliMagazzinoRESTConsumer; import it.integry.integrywmsnative.core.barcode_reader.BarcodeManager; @@ -21,18 +19,14 @@ import it.integry.integrywmsnative.core.model.DtbOrdt; import it.integry.integrywmsnative.core.model.secondary.GestioneEnum; import it.integry.integrywmsnative.core.utility.UtilityBarcode; import it.integry.integrywmsnative.core.utility.UtilityExceptions; -import it.integry.integrywmsnative.core.utility.UtilityLogger; -import it.integry.integrywmsnative.core.utility.UtilityPosizione; import it.integry.integrywmsnative.core.utility.UtilityProgress; import it.integry.integrywmsnative.core.utility.UtilityString; import it.integry.integrywmsnative.core.utility.UtilityToast; import it.integry.integrywmsnative.databinding.FragmentMainVenditaBinding; import it.integry.integrywmsnative.gest.vendita.MainVenditaFragment; import it.integry.integrywmsnative.gest.vendita.core.VenditaHelper; -import it.integry.integrywmsnative.gest.vendita.dialogs.DialogVenditaFiltroAvanzatoViewModel; import it.integry.integrywmsnative.gest.vendita.dto.OrdineVenditaInevasoDTO; -import it.integry.integrywmsnative.gest.vendita.dto.PickingObjectDTO; -import it.integry.integrywmsnative.view.dialogs.DialogSimpleMessageHelper; +import it.integry.integrywmsnative.view.dialogs.base.DialogSimpleMessageHelper; import it.integry.plugins.barcode_base_library.model.BarcodeScanDTO; public class VenditaViewModel { 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 44588839..3156d977 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 @@ -54,7 +54,7 @@ import it.integry.integrywmsnative.gest.vendita_ordine_inevaso.core.interfaces.I import it.integry.integrywmsnative.view.bottomsheet.interfaces.IOnColloClosedCallback; import it.integry.integrywmsnative.view.bottomsheet.viewmodel.ArticoliInColloBottomSheetViewModel; -import it.integry.integrywmsnative.view.dialogs.DialogSimpleMessageHelper; +import it.integry.integrywmsnative.view.dialogs.base.DialogSimpleMessageHelper; import it.integry.integrywmsnative.view.dialogs.ask_should_print.DialogAskShouldPrint; import it.integry.integrywmsnative.view.dialogs.input_quantity.DialogInputQuantity; import it.integry.integrywmsnative.view.dialogs.input_quantity.QuantityDTO; diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/versamento_merce/viewmodel/VersamentoMerceViewModel.java b/app/src/main/java/it/integry/integrywmsnative/gest/versamento_merce/viewmodel/VersamentoMerceViewModel.java index 6a5aa776..3f02c82a 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/versamento_merce/viewmodel/VersamentoMerceViewModel.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/versamento_merce/viewmodel/VersamentoMerceViewModel.java @@ -16,7 +16,6 @@ import java.util.Date; import java.util.Iterator; import java.util.List; -import it.integry.integrywmsnative.MainActivity; import it.integry.integrywmsnative.R; import it.integry.integrywmsnative.core.REST.consumers.BarcodeRESTConsumer; import it.integry.integrywmsnative.core.REST.consumers.ColliMagazzinoRESTConsumer; @@ -38,7 +37,7 @@ import it.integry.integrywmsnative.core.utility.UtilityString; import it.integry.integrywmsnative.databinding.FragmentMainVersamentoMerceBinding; import it.integry.integrywmsnative.gest.versamento_merce.core.VersamentoMerceHelper; import it.integry.integrywmsnative.view.dialogs.DialogAskLivelloPosizione; -import it.integry.integrywmsnative.view.dialogs.DialogSimpleMessageHelper; +import it.integry.integrywmsnative.view.dialogs.base.DialogSimpleMessageHelper; import it.integry.integrywmsnative.view.dialogs.choose_arts_from_lista_arts.DialogChooseArtsFromListaArts; import it.integry.integrywmsnative.view.dialogs.input_quantity.DialogInputQuantity; import it.integry.integrywmsnative.view.dialogs.scan_or_create_lu.DialogScanOrCreateLU; 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 c7f3e85e..5968ec0c 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 @@ -4,10 +4,8 @@ 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.databinding.ViewDataBinding; import androidx.annotation.NonNull; import com.google.android.material.bottomsheet.BottomSheetBehavior; import androidx.appcompat.app.AppCompatActivity; @@ -18,7 +16,6 @@ import android.view.ViewGroup; import android.widget.BaseAdapter; import java.lang.ref.WeakReference; -import java.math.BigDecimal; import it.integry.integrywmsnative.R; import it.integry.integrywmsnative.core.REST.consumers.ColliMagazzinoRESTConsumer; @@ -32,7 +29,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.dialogs.DialogSimpleMessageHelper; +import it.integry.integrywmsnative.view.dialogs.base.DialogSimpleMessageHelper; import it.integry.integrywmsnative.view.dialogs.input_quantity.DialogInputQuantity; public class ArticoliInColloBottomSheetViewModel { diff --git a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/DialogSimpleMessageHelper.java b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/base/DialogSimpleMessageHelper.java similarity index 55% rename from app/src/main/java/it/integry/integrywmsnative/view/dialogs/DialogSimpleMessageHelper.java rename to app/src/main/java/it/integry/integrywmsnative/view/dialogs/base/DialogSimpleMessageHelper.java index 0c9a48e3..a6f24019 100644 --- a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/DialogSimpleMessageHelper.java +++ b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/base/DialogSimpleMessageHelper.java @@ -1,8 +1,11 @@ -package it.integry.integrywmsnative.view.dialogs; +package it.integry.integrywmsnative.view.dialogs.base; import android.app.AlertDialog; +import android.app.Dialog; import android.content.Context; import android.content.res.ColorStateList; +import android.graphics.Color; +import android.graphics.drawable.ColorDrawable; import android.graphics.drawable.Drawable; import androidx.annotation.StringRes; import androidx.core.content.ContextCompat; @@ -16,7 +19,9 @@ import android.widget.TextView; import java.util.HashMap; +import androidx.databinding.DataBindingUtil; import it.integry.integrywmsnative.R; +import it.integry.integrywmsnative.databinding.DialogBaseBinding; /** * Created by GiuseppeS on 22/03/2018. @@ -46,20 +51,22 @@ public class DialogSimpleMessageHelper { } } - private static AlertDialog makeBase(TYPE type, Context mContext, String titleText, Spanned messageText, HashMap hashmapContent, Runnable onPositiveClick, Runnable onNegativeClick, @StringRes int rNeutralButtonString, Runnable onNeutralClick){ + private static Dialog makeBase(TYPE type, Context mContext, String titleText, Spanned messageText, HashMap hashmapContent, Runnable onPositiveClick, Runnable onNegativeClick, @StringRes int rNeutralButtonString, Runnable onNeutralClick){ LayoutInflater inflater = (LayoutInflater) mContext.getSystemService( Context.LAYOUT_INFLATER_SERVICE ); int colorBackgroundTitle = -1; Drawable titleIconRes = null; + Dialog dialog = new Dialog(mContext); + switch (type){ case INFO: - colorBackgroundTitle = ContextCompat.getColor(mContext, R.color.colorPrimary); + colorBackgroundTitle = ContextCompat.getColor(mContext, R.color.light_blue_300); titleIconRes = mContext.getResources().getDrawable(R.drawable.ic_info_78dp); break; case SUCCESS: - colorBackgroundTitle = ContextCompat.getColor(mContext, R.color.green_500); + colorBackgroundTitle = ContextCompat.getColor(mContext, R.color.green_300); titleIconRes = mContext.getResources().getDrawable(R.drawable.ic_done_white_24dp); break; @@ -69,27 +76,37 @@ public class DialogSimpleMessageHelper { break; case ERROR: - colorBackgroundTitle = ContextCompat.getColor(mContext, R.color.red_600); + colorBackgroundTitle = ContextCompat.getColor(mContext, R.color.red_300); titleIconRes = mContext.getResources().getDrawable(R.drawable.ic_mood_bad_24dp); break; } - //Title VIEW - View titleView = inflater.inflate(R.layout.dialog_custom_header, null); - TextView title = titleView.findViewById(R.id.title_text); - title.setText(titleText); + DialogSimpleMessageViewModel viewModel = new DialogSimpleMessageViewModel(dialog); - AppCompatImageView civ = titleView.findViewById(R.id.title_icon); - ColorStateList colorStateList = ColorStateList.valueOf(colorBackgroundTitle); - civ.setImageTintList(colorStateList); - civ.setImageDrawable(titleIconRes); + viewModel + .setOnPositive(onPositiveClick) + .setOnNeutral(onNeutralClick) + .setOnNegative(onNegativeClick); + + + DialogBaseBinding mBinding = DataBindingUtil.inflate(LayoutInflater.from(mContext), R.layout.dialog_base, null, false); + + + mBinding.setViewmodel(viewModel); + + + //Title VIEW + mBinding.titleText.setText(titleText); + ColorStateList colorStateList = ColorStateList.valueOf(Color.WHITE); + mBinding.titleIcon.setImageTintList(colorStateList); + mBinding.titleIcon.setImageDrawable(titleIconRes); + + mBinding.titleContainer.setBackgroundColor(colorBackgroundTitle); //Content View - View contentView = inflater.inflate(R.layout.dialog_custom_content, null); - TextView contentMessage = contentView.findViewById(R.id.dialog_content_main_message); - contentMessage.setText(messageText); + mBinding.descriptionText.setText(messageText); - LinearLayout hashMapContainer = contentView.findViewById(R.id.dialog_content_hashmap); + LinearLayout hashMapContainer = mBinding.dialogContentHashmap; if(hashmapContent != null) { for (int i = 0; i < hashmapContent.keySet().size(); i++) { @@ -104,31 +121,35 @@ public class DialogSimpleMessageHelper { } } + dialog.setCancelable(false); + dialog.setCanceledOnTouchOutside(false); + dialog.setContentView(mBinding.getRoot()); + dialog.getWindow().setBackgroundDrawable(new ColorDrawable(Color.TRANSPARENT)); - AlertDialog.Builder alertDialog = new AlertDialog.Builder(mContext) - .setCustomTitle(titleView) - .setView(contentView) -// .setMessage(messageText) - .setCancelable(false) - .setPositiveButton(mContext.getText(R.string.ok), (dialog, which) -> { - if(onPositiveClick != null) onPositiveClick.run(); - }); +// AlertDialog.Builder alertDialog = new AlertDialog.Builder(mContext) +// .setCustomTitle(titleView) +// .setView(contentView) +//// .setMessage(messageText) +// .setCancelable(false) +// .setPositiveButton(mContext.getText(R.string.ok), (dialog, which) -> { +// if(onPositiveClick != null) onPositiveClick.run(); +// }); - if(onNeutralClick != null){ - alertDialog.setNeutralButton(rNeutralButtonString, (dialog, which) -> onNeutralClick.run()); - } - if(onNegativeClick != null){ - alertDialog.setNegativeButton(mContext.getText(R.string.abort), (dialog, which) -> onNegativeClick.run()); - } +// if(onNeutralClick != null){ +// alertDialog.setNeutralButton(rNeutralButtonString, (dialog, which) -> onNeutralClick.run()); +// } +// if(onNegativeClick != null){ +// alertDialog.setNegativeButton(mContext.getText(R.string.abort), (dialog, which) -> onNegativeClick.run()); +// } - AlertDialog alert = alertDialog.create(); - alert.setCanceledOnTouchOutside(false); +// AlertDialog alert = alertDialog.create(); +// alert.setCanceledOnTouchOutside(false); - return alert; + return dialog; } - public static AlertDialog makeInfoDialog(Context mContext, String titleText, Spanned messageText, HashMap hashmapContent, Runnable onPositiveClick){ + public static Dialog makeInfoDialog(Context mContext, String titleText, Spanned messageText, HashMap hashmapContent, Runnable onPositiveClick){ return makeBase(TYPE.INFO, mContext, titleText, @@ -139,7 +160,7 @@ public class DialogSimpleMessageHelper { } - public static AlertDialog makeInfoDialog(Context mContext, String titleText, Spanned messageText, HashMap hashmapContent, Runnable onPositiveClick, Runnable onNegativeClick){ + public static Dialog makeInfoDialog(Context mContext, String titleText, Spanned messageText, HashMap hashmapContent, Runnable onPositiveClick, Runnable onNegativeClick){ return makeBase(TYPE.INFO, mContext, titleText, @@ -150,7 +171,7 @@ public class DialogSimpleMessageHelper { } - public static AlertDialog makeSuccessDialog(Context mContext, String titleText, Spanned messageText, HashMap hashmapContent, Runnable onPositiveClick){ + public static Dialog makeSuccessDialog(Context mContext, String titleText, Spanned messageText, HashMap hashmapContent, Runnable onPositiveClick){ return makeBase(TYPE.SUCCESS, mContext, titleText, @@ -161,7 +182,7 @@ public class DialogSimpleMessageHelper { } - public static AlertDialog makeWarningDialog(Context mContext, Spanned messageText, HashMap hashmapContent, Runnable onPositiveClick, Runnable onNegativeClick){ + public static Dialog makeWarningDialog(Context mContext, Spanned messageText, HashMap hashmapContent, Runnable onPositiveClick, Runnable onNegativeClick){ return makeBase(TYPE.WARNING, mContext, mContext.getText(R.string.warning).toString(), @@ -172,7 +193,7 @@ public class DialogSimpleMessageHelper { } - public static AlertDialog makeWarningDialog(Context mContext, Spanned messageText, HashMap hashmapContent, Runnable onPositiveClick){ + public static Dialog makeWarningDialog(Context mContext, Spanned messageText, HashMap hashmapContent, Runnable onPositiveClick){ return makeBase(TYPE.WARNING, mContext, mContext.getText(R.string.warning).toString(), @@ -182,7 +203,7 @@ public class DialogSimpleMessageHelper { null, -1, null); } - public static AlertDialog makeErrorDialog(Context mContext, Spanned messageText, HashMap hashmapContent, Runnable onPositiveClick){ + public static Dialog makeErrorDialog(Context mContext, Spanned messageText, HashMap hashmapContent, Runnable onPositiveClick){ return makeBase(TYPE.ERROR, mContext, @@ -193,7 +214,7 @@ public class DialogSimpleMessageHelper { null, -1, null); } - public static AlertDialog makeErrorDialog(Context mContext, Spanned messageText, HashMap hashmapContent, Runnable onPositiveClick, @StringRes int rNeutralButtonString, Runnable onNeutralClick){ + public static Dialog makeErrorDialog(Context mContext, Spanned messageText, HashMap hashmapContent, Runnable onPositiveClick, @StringRes int rNeutralButtonString, Runnable onNeutralClick){ return makeBase(TYPE.ERROR, mContext, diff --git a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/base/DialogSimpleMessageViewModel.java b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/base/DialogSimpleMessageViewModel.java new file mode 100644 index 00000000..2d3ed9e4 --- /dev/null +++ b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/base/DialogSimpleMessageViewModel.java @@ -0,0 +1,61 @@ +package it.integry.integrywmsnative.view.dialogs.base; + +import android.app.Dialog; + +public class DialogSimpleMessageViewModel { + + + private Dialog mDialog; + + private Runnable onPositive; + private Runnable onNeutral; + private Runnable onNegative; + + + public DialogSimpleMessageViewModel(Dialog dialog) { + mDialog = dialog; + } + + public DialogSimpleMessageViewModel setOnPositive(Runnable onPositive) { + this.onPositive = onPositive; + return this; + } + + public DialogSimpleMessageViewModel setOnNeutral(Runnable onNeutral) { + this.onNeutral = onNeutral; + return this; + } + + public DialogSimpleMessageViewModel setOnNegative(Runnable onNegative) { + this.onNegative = onNegative; + return this; + } + + + + public boolean isPositiveVisible() { + return onPositive != null; + } + + public boolean isNeutralVisible() { + return onNeutral != null; + } + + public boolean isNegativeVisible() { + return onNegative != null; + } + + + public void onPositiveClick() { + mDialog.dismiss(); + if(onPositive != null) onPositive.run(); + } + public void onNeutralClick() { + mDialog.dismiss(); + if(onNeutral != null) onNeutral.run(); + } + public void onNegativeClick() { + mDialog.dismiss(); + if(onNegative != null) onNegative.run(); + } +} diff --git a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/input_quantity/DialogInputQuantity.java b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/input_quantity/DialogInputQuantity.java index 7de9ea3f..218f7dc4 100644 --- a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/input_quantity/DialogInputQuantity.java +++ b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/input_quantity/DialogInputQuantity.java @@ -4,11 +4,10 @@ import android.app.AlertDialog; import android.app.DatePickerDialog; import android.app.ProgressDialog; import android.content.Context; -import android.content.DialogInterface; import android.content.res.ColorStateList; import androidx.databinding.DataBindingUtil; import androidx.databinding.Observable; -import androidx.databinding.ViewDataBinding; + import android.os.Handler; import com.google.android.material.textfield.TextInputLayout; import androidx.core.content.ContextCompat; @@ -25,12 +24,10 @@ import android.widget.EditText; import org.jetbrains.annotations.NotNull; import java.math.BigDecimal; -import java.math.RoundingMode; import java.util.Calendar; import java.util.Date; import java.util.GregorianCalendar; -import it.integry.integrywmsnative.MainApplication; import it.integry.integrywmsnative.R; import it.integry.integrywmsnative.core.REST.consumers.BarcodeRESTConsumer; import it.integry.integrywmsnative.core.REST.consumers.ISingleValueOperationCallback; @@ -46,7 +43,7 @@ import it.integry.integrywmsnative.core.utility.UtilityLogger; import it.integry.integrywmsnative.core.utility.UtilityProgress; import it.integry.integrywmsnative.core.utility.UtilityString; import it.integry.integrywmsnative.databinding.DialogInputQuantityArticoloBinding; -import it.integry.integrywmsnative.view.dialogs.DialogSimpleMessageHelper; +import it.integry.integrywmsnative.view.dialogs.base.DialogSimpleMessageHelper; import it.integry.plugins.barcode_base_library.model.BarcodeScanDTO; public class DialogInputQuantity { diff --git a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/scan_or_create_lu/DialogScanOrCreateLU.java b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/scan_or_create_lu/DialogScanOrCreateLU.java index d3034bb1..88ac8beb 100644 --- a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/scan_or_create_lu/DialogScanOrCreateLU.java +++ b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/scan_or_create_lu/DialogScanOrCreateLU.java @@ -3,7 +3,6 @@ package it.integry.integrywmsnative.view.dialogs.scan_or_create_lu; import android.app.ProgressDialog; import android.content.Context; import androidx.databinding.DataBindingUtil; -import androidx.databinding.ViewDataBinding; import androidx.appcompat.app.AlertDialog; import android.text.SpannableString; import android.view.LayoutInflater; @@ -27,7 +26,7 @@ import it.integry.integrywmsnative.core.utility.UtilityExceptions; import it.integry.integrywmsnative.core.utility.UtilityProgress; import it.integry.integrywmsnative.core.utility.UtilityString; import it.integry.integrywmsnative.databinding.DialogScanOrCreateLuBinding; -import it.integry.integrywmsnative.view.dialogs.DialogSimpleMessageHelper; +import it.integry.integrywmsnative.view.dialogs.base.DialogSimpleMessageHelper; import it.integry.plugins.barcode_base_library.model.BarcodeScanDTO; public class DialogScanOrCreateLU { diff --git a/app/src/main/res/layout/dialog_base.xml b/app/src/main/res/layout/dialog_base.xml new file mode 100644 index 00000000..162713df --- /dev/null +++ b/app/src/main/res/layout/dialog_base.xml @@ -0,0 +1,235 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/values/buttons_style.xml b/app/src/main/res/values/buttons_style.xml index 3a524e4c..332ccf13 100644 --- a/app/src/main/res/values/buttons_style.xml +++ b/app/src/main/res/values/buttons_style.xml @@ -21,4 +21,29 @@ @color/colorPrimary @android:color/white + + + + + + + + \ No newline at end of file