diff --git a/app/src/main/java/it/integry/integrywmsnative/MainActivity.java b/app/src/main/java/it/integry/integrywmsnative/MainActivity.java index 5570812b..01231fa9 100644 --- a/app/src/main/java/it/integry/integrywmsnative/MainActivity.java +++ b/app/src/main/java/it/integry/integrywmsnative/MainActivity.java @@ -30,6 +30,7 @@ import it.integry.integrywmsnative.core.class_router.ClassRouter; import it.integry.integrywmsnative.core.class_router.configs.BaseMenuConfiguration; import it.integry.integrywmsnative.core.class_router.configs.MenuConfiguration; import it.integry.integrywmsnative.core.class_router.interfaces.ICustomConfiguration; +import it.integry.integrywmsnative.core.data_recover.ColliDataRecoverService; import it.integry.integrywmsnative.core.data_store.db.AppDatabase; import it.integry.integrywmsnative.core.expansion.BaseActivity; import it.integry.integrywmsnative.core.expansion.OnSingleClickListener; @@ -42,6 +43,7 @@ import it.integry.integrywmsnative.core.interfaces.ISelectAllFragment; import it.integry.integrywmsnative.core.interfaces.ITitledFragment; import it.integry.integrywmsnative.core.rest.watcher.ServerStatusChecker; import it.integry.integrywmsnative.core.update.UpdatesManager; +import it.integry.integrywmsnative.core.utility.UtilityContext; import it.integry.integrywmsnative.core.utility.UtilitySettings; import it.integry.integrywmsnative.databinding.ActivityMainBinding; import it.integry.integrywmsnative.gest.login.LoginActivity; @@ -59,6 +61,9 @@ public class MainActivity extends BaseActivity @Inject AppDatabase mAppDatabase; + @Inject + ColliDataRecoverService mColliDataRecoverService; + @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); @@ -68,10 +73,13 @@ public class MainActivity extends BaseActivity .create() .inject(this); + mColliDataRecoverService.init(this); + mBinding = DataBindingUtil.inflate(LayoutInflater.from(this), R.layout.activity_main, null, false); setContentView(mBinding.getRoot()); UpdatesManager.init(this); + UtilityContext.initMainActivity(this); setSupportActionBar(mBinding.appBarMain.toolbar); getSupportActionBar().setDisplayShowTitleEnabled(false); diff --git a/app/src/main/java/it/integry/integrywmsnative/MainApplicationModule.java b/app/src/main/java/it/integry/integrywmsnative/MainApplicationModule.java index e57d8cf2..e15b89e4 100644 --- a/app/src/main/java/it/integry/integrywmsnative/MainApplicationModule.java +++ b/app/src/main/java/it/integry/integrywmsnative/MainApplicationModule.java @@ -38,7 +38,7 @@ public class MainApplicationModule { @Provides @Singleton ColliDataRecoverService provideColliDataRecoverService() { - return new ColliDataRecoverService(mContext); + return new ColliDataRecoverService(); } @Provides diff --git a/app/src/main/java/it/integry/integrywmsnative/SplashActivity.java b/app/src/main/java/it/integry/integrywmsnative/SplashActivity.java index da5608bf..d25bb38d 100644 --- a/app/src/main/java/it/integry/integrywmsnative/SplashActivity.java +++ b/app/src/main/java/it/integry/integrywmsnative/SplashActivity.java @@ -6,22 +6,21 @@ import android.content.pm.PackageManager; import android.os.Bundle; import android.text.SpannableString; import android.view.LayoutInflater; -import android.widget.TextView; + +import androidx.databinding.DataBindingUtil; import java.util.ArrayList; import java.util.List; -import androidx.appcompat.app.AppCompatActivity; -import androidx.databinding.DataBindingUtil; - import it.integry.integrywmsnative.core.context.MainContext; import it.integry.integrywmsnative.core.expansion.BaseActivity; 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.core.utility.UtilityContext; import it.integry.integrywmsnative.databinding.ActivitySplashBinding; import it.integry.integrywmsnative.gest.login.LoginActivity; -import it.integry.integrywmsnative.view.dialogs.base.DialogSimpleMessageHelper; +import it.integry.integrywmsnative.view.dialogs.base.DialogSimpleMessageView; public class SplashActivity extends BaseActivity { @@ -39,6 +38,8 @@ public class SplashActivity extends BaseActivity { mBinding = DataBindingUtil.inflate(LayoutInflater.from(this), R.layout.activity_splash, null, false); setContentView(mBinding.getRoot()); + UtilityContext.initMainActivity(this); + initAppVersion(); initPermissions(this::init); @@ -49,10 +50,10 @@ public class SplashActivity extends BaseActivity { onComplete.run(); }, permanentlyDenied -> { if(permanentlyDenied) { - DialogSimpleMessageHelper.makeErrorDialog(this, - new SpannableString(getText(R.string.permissions_permanently_denied)), null, () -> { + DialogSimpleMessageView.makeErrorDialog(new SpannableString(getText(R.string.permissions_permanently_denied)), null, () -> { this.finish(); - }).show(); + }) + .show(getSupportFragmentManager(), "tag"); } else { initPermissions(onComplete); } diff --git a/app/src/main/java/it/integry/integrywmsnative/core/context/AppContext.java b/app/src/main/java/it/integry/integrywmsnative/core/context/AppContext.java index 8f752c4d..3498373e 100644 --- a/app/src/main/java/it/integry/integrywmsnative/core/context/AppContext.java +++ b/app/src/main/java/it/integry/integrywmsnative/core/context/AppContext.java @@ -9,7 +9,6 @@ import com.orhanobut.logger.Logger; import javax.inject.Inject; import it.integry.integrywmsnative.BuildConfig; -import it.integry.integrywmsnative.core.data_recover.ColliDataRecover; import it.integry.integrywmsnative.core.data_store.db.AppDatabase; import it.integry.integrywmsnative.core.settings.SettingsManager; import it.integry.integrywmsnative.core.settings.Stash; @@ -41,8 +40,6 @@ public class AppContext { this.initCrashlytics(); this.initLogger(); - - this.initRecoverColli(); } @@ -77,9 +74,5 @@ public class AppContext { Logger.addLogAdapter(new AndroidLogAdapter()); } - private void initRecoverColli() { - ColliDataRecover.init(mContext); - } - } 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 8d425f15..63b81354 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 @@ -1,21 +1,25 @@ package it.integry.integrywmsnative.core.context; import android.content.Context; +import android.text.Html; import android.text.SpannableString; +import android.text.Spanned; import androidx.appcompat.app.AppCompatActivity; import java.lang.reflect.Method; +import java.net.ConnectException; import it.integry.integrywmsnative.MainApplication; import it.integry.integrywmsnative.R; import it.integry.integrywmsnative.core.barcode_reader.BarcodeManager; import it.integry.integrywmsnative.core.class_router.ClassRouter; +import it.integry.integrywmsnative.core.data_recover.ColliDataRecover; import it.integry.integrywmsnative.core.rest.watcher.ServerStatusChecker; import it.integry.integrywmsnative.core.settings.SettingsManager; import it.integry.integrywmsnative.core.utility.UtilityExceptions; import it.integry.integrywmsnative.core.utility.UtilitySettings; -import it.integry.integrywmsnative.view.dialogs.base.DialogSimpleMessageHelper; +import it.integry.integrywmsnative.view.dialogs.base.DialogSimpleMessageView; public class MainContext { @@ -37,6 +41,8 @@ public class MainContext { this.initReflections(); this.initServerStatusChecker(); + + ColliDataRecover.init(mContext); } @@ -46,11 +52,23 @@ public class MainContext { private void initDBData(Runnable onComplete) { SettingsManager.loadDBVariables(onComplete, ex -> { - DialogSimpleMessageHelper.makeErrorDialog(mContext, - new SpannableString(ex.getMessage()), null, mContext::finish, R.string.logout, () -> { + + Spanned message = null; + + if (ex.getCause() != null && ex.getCause() instanceof ConnectException) { + message = Html.fromHtml("Impossibile collegarsi all'host " + SettingsManager.i().getServer().getHost() + ":" + SettingsManager.i().getServer().getPort() + ". Riprovare più tardi."); + } else if (ex.getMessage().startsWith("Status 404:")) { + message = Html.fromHtml("Errore 404. Non è stato possibile soddisfare la richiesta sull'host " + SettingsManager.i().getServer().getHost() + ":" + SettingsManager.i().getServer().getPort() + ". Riprovare più tardi."); + } else { + message = new SpannableString(ex.getMessage()); + } + + DialogSimpleMessageView.makeErrorDialog( + message, null, mContext::finish, R.string.logout, () -> { UtilitySettings.logout(); MainApplication.exit(); - }).show(); + }) + .show(mContext.getSupportFragmentManager(), "tag"); } ); } diff --git a/app/src/main/java/it/integry/integrywmsnative/core/data_recover/ColliDataRecover.java b/app/src/main/java/it/integry/integrywmsnative/core/data_recover/ColliDataRecover.java index ea14d912..fadeef43 100644 --- a/app/src/main/java/it/integry/integrywmsnative/core/data_recover/ColliDataRecover.java +++ b/app/src/main/java/it/integry/integrywmsnative/core/data_recover/ColliDataRecover.java @@ -2,6 +2,8 @@ package it.integry.integrywmsnative.core.data_recover; import android.content.Context; +import androidx.appcompat.app.AppCompatActivity; + import com.annimon.stream.Optional; import com.annimon.stream.Stream; import com.google.android.gms.common.util.IOUtils; @@ -107,11 +109,11 @@ public class ColliDataRecover { } } - private static Context mContext; + private static AppCompatActivity mContext; private static List mtbColtsSessions = new ArrayList<>(); - public static void init(Context context) { + public static void init(AppCompatActivity context) { mContext = context; if(isFilePresent(CommonConst.Files.RECOVER_COLLO_FILE)) { diff --git a/app/src/main/java/it/integry/integrywmsnative/core/data_recover/ColliDataRecoverService.java b/app/src/main/java/it/integry/integrywmsnative/core/data_recover/ColliDataRecoverService.java index 6d14cd1c..ca313714 100644 --- a/app/src/main/java/it/integry/integrywmsnative/core/data_recover/ColliDataRecoverService.java +++ b/app/src/main/java/it/integry/integrywmsnative/core/data_recover/ColliDataRecoverService.java @@ -2,6 +2,8 @@ package it.integry.integrywmsnative.core.data_recover; import android.content.Context; +import androidx.appcompat.app.AppCompatActivity; + import com.annimon.stream.Optional; import com.annimon.stream.Stream; import com.google.android.gms.common.util.IOUtils; @@ -28,20 +30,21 @@ import it.integry.integrywmsnative.core.utility.UtilityExceptions; public class ColliDataRecoverService { - private final Context mContext; + private AppCompatActivity mContext; private List mtbColtsSessions = new ArrayList<>(); @Inject - public ColliDataRecoverService(Context context) { - this.mContext = context; + public ColliDataRecoverService() { + } + + public void init(AppCompatActivity appCompatActivity) { + this.mContext = appCompatActivity; if(isFilePresent(CommonConst.Files.RECOVER_COLLO_FILE)) { loadLocalFile(); } } - - public boolean thereIsAnExistantSession() { return mtbColtsSessions.size() > 0; } diff --git a/app/src/main/java/it/integry/integrywmsnative/core/utility/UtilityContext.java b/app/src/main/java/it/integry/integrywmsnative/core/utility/UtilityContext.java index f1e73285..a7cc3a5c 100644 --- a/app/src/main/java/it/integry/integrywmsnative/core/utility/UtilityContext.java +++ b/app/src/main/java/it/integry/integrywmsnative/core/utility/UtilityContext.java @@ -2,17 +2,28 @@ package it.integry.integrywmsnative.core.utility; import android.content.Context; +import androidx.appcompat.app.AppCompatActivity; + public class UtilityContext { private static Context mApplicationContext; + private static AppCompatActivity mMainActivity; public static void initApplicationContext(Context context) { mApplicationContext = context; } + public static void initMainActivity(AppCompatActivity mainActivity) { + mMainActivity = mainActivity; + } + public static Context getApplicationContext() { return mApplicationContext; } + public static AppCompatActivity getMainActivity() { + return mMainActivity; + } + } 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 97b0d387..d529e95f 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 @@ -9,7 +9,7 @@ import com.orhanobut.logger.Logger; import it.integry.integrywmsnative.BuildConfig; import it.integry.integrywmsnative.core.rest.CommonRESTException; -import it.integry.integrywmsnative.view.dialogs.base.DialogSimpleMessageHelper; +import it.integry.integrywmsnative.view.dialogs.base.DialogSimpleMessageView; public class UtilityExceptions { @@ -43,8 +43,9 @@ public class UtilityExceptions { if(ex.getCause() != null) errorMessage += "
" + ex.getCause().getMessage(); } - if(context != null) { - DialogSimpleMessageHelper.makeErrorDialog(context, new SpannableString(errorMessage), null, null).show(); + if(UtilityContext.getMainActivity() != null) { + DialogSimpleMessageView.makeErrorDialog(new SpannableString(errorMessage), null, null) + .show(UtilityContext.getMainActivity().getSupportFragmentManager(), "tag"); } if(!BuildConfig.DEBUG) { 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 49744814..24c56ab8 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 @@ -41,7 +41,7 @@ import it.integry.integrywmsnative.gest.accettazione.dto.SitArtOrdDTO; import it.integry.integrywmsnative.gest.accettazione.rest.OrdiniAccettazioneRESTConsumer; import it.integry.integrywmsnative.gest.accettazione_picking.AccettazionePickingActivity; import it.integry.integrywmsnative.ui.ElevatedToolbar; -import it.integry.integrywmsnative.view.dialogs.base.DialogSimpleMessageHelper; +import it.integry.integrywmsnative.view.dialogs.base.DialogSimpleMessageView; public class MainAccettazioneFragment extends Fragment implements ISearcableFragment, ITitledFragment, IScrollableFragment { @@ -187,8 +187,7 @@ public class MainAccettazioneFragment extends Fragment implements ISearcableFrag .count(); - DialogSimpleMessageHelper.makeInfoDialog(getActivity(), - getText(R.string.orders).toString(), + DialogSimpleMessageView.makeInfoDialog(getText(R.string.orders).toString(), Html.fromHtml(String.format(getActivity().getResources().getQuantityString(R.plurals.loaded_orders_message, (int) ordsCounter), ordsCounter) + "

" + "" + artsCounter + " " + getActivity().getResources().getQuantityString(R.plurals.available_articles, (int) artsCounter)), @@ -203,14 +202,17 @@ public class MainAccettazioneFragment extends Fragment implements ISearcableFrag myIntent.putExtra("keySitArts", cacheSitArtItemID); getActivity().startActivity(myIntent); - }).show(); + }).show(getActivity().getSupportFragmentManager(), "tag"); }, ex -> { progress.dismiss(); String errorMessage = CommonRESTException.tryRecognizeThenGetMessage(ex); if(errorMessage == null) errorMessage = ex.getMessage() + "\n" + ex.getCause().getCause().getMessage(); - DialogSimpleMessageHelper.makeErrorDialog(getActivity(), new SpannableString(errorMessage), null, null).show(); + + DialogSimpleMessageView + .makeErrorDialog(new SpannableString(errorMessage), null, null) + .show(getActivity().getSupportFragmentManager(), "tag"); }); diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_picking/AccettazionePickingActivity.java b/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_picking/AccettazionePickingActivity.java index 77621f8e..cb91bac0 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_picking/AccettazionePickingActivity.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_picking/AccettazionePickingActivity.java @@ -60,7 +60,7 @@ import it.integry.integrywmsnative.gest.spedizione.exceptions.InvalidPesoKGExcep import it.integry.integrywmsnative.gest.spedizione.model.PickedQuantityDTO; import it.integry.integrywmsnative.view.bottom_sheet__lu_content.BottomSheetFragmentLUContentView; import it.integry.integrywmsnative.view.bottom_sheet__lu_content.BottomSheetFragmentLUContentViewModel; -import it.integry.integrywmsnative.view.dialogs.base.DialogSimpleMessageHelper; +import it.integry.integrywmsnative.view.dialogs.base.DialogSimpleMessageView; import it.integry.integrywmsnative.view.dialogs.input_quantity_v2.DialogInputQuantityV2View; import it.integry.integrywmsnative.view.dialogs.input_quantity_v2.DialogInputQuantityV2DTO; import it.integry.integrywmsnative.view.dialogs.note_aggiuntive_lu.NoteAggiuntiveLUDialog; @@ -245,7 +245,7 @@ public class AccettazionePickingActivity extends BaseActivity implements Accetta //Calc Num CNF BigDecimal numCnfEvasa = BigDecimal.ZERO; - if(x.getWithdrawMtbColrs().size() > 0) { + if (x.getWithdrawMtbColrs().size() > 0) { numCnfEvasa = Stream.of(x.getWithdrawMtbColrs()) .map(MtbColr::getNumCnf) .reduce(BigDecimal.ZERO, BigDecimal::add); @@ -254,14 +254,13 @@ public class AccettazionePickingActivity extends BaseActivity implements Accetta //Calc qta col BigDecimal qtaEvasa = BigDecimal.ZERO; - if(x.getWithdrawMtbColrs().size() > 0) { + if (x.getWithdrawMtbColrs().size() > 0) { qtaEvasa = Stream.of(x.getWithdrawMtbColrs()) .map(MtbColr::getQtaCol) .reduce(BigDecimal.ZERO, BigDecimal::add); } - if (SettingsManager.iDB().isFlagForceAllToColli() || (x.getMtbAart() == null || !x.getMtbAart().isFlagQtaCnfFissaBoolean())) { accettazioneListModel.setQtaEvasa(numCnfEvasa); accettazioneListModel.setQtaTot(x.getSitArtOrdDTO().getNumCnfDaEvadere()); @@ -308,7 +307,7 @@ public class AccettazionePickingActivity extends BaseActivity implements Accetta //Calc Num CNF BigDecimal numCnfEvasa = BigDecimal.ZERO; - if(x.getWithdrawMtbColrs().size() > 0) { + if (x.getWithdrawMtbColrs().size() > 0) { numCnfEvasa = Stream.of(x.getWithdrawMtbColrs()) .map(MtbColr::getNumCnf) .reduce(BigDecimal.ZERO, BigDecimal::add); @@ -317,14 +316,13 @@ public class AccettazionePickingActivity extends BaseActivity implements Accetta //Calc qta col BigDecimal qtaEvasa = BigDecimal.ZERO; - if(x.getWithdrawMtbColrs().size() > 0) { + if (x.getWithdrawMtbColrs().size() > 0) { qtaEvasa = Stream.of(x.getWithdrawMtbColrs()) .map(MtbColr::getQtaCol) .reduce(BigDecimal.ZERO, BigDecimal::add); } - if (SettingsManager.iDB().isFlagForceAllToColli() || (x.getMtbAart() == null || !x.getMtbAart().isFlagQtaCnfFissaBoolean())) { accettazioneListModel.setQtaEvasa(numCnfEvasa); accettazioneListModel.setQtaTot(x.getSitArtOrdDTO().getNumCnfDaEvadere()); @@ -371,7 +369,7 @@ public class AccettazionePickingActivity extends BaseActivity implements Accetta //Calc Num CNF BigDecimal numCnfEvasa = BigDecimal.ZERO; - if(x.getWithdrawMtbColrs().size() > 0) { + if (x.getWithdrawMtbColrs().size() > 0) { numCnfEvasa = Stream.of(x.getWithdrawMtbColrs()) .map(MtbColr::getNumCnf) .reduce(BigDecimal.ZERO, BigDecimal::add); @@ -380,7 +378,7 @@ public class AccettazionePickingActivity extends BaseActivity implements Accetta //Calc qta col BigDecimal qtaEvasa = BigDecimal.ZERO; - if(x.getWithdrawMtbColrs().size() > 0) { + if (x.getWithdrawMtbColrs().size() > 0) { qtaEvasa = Stream.of(x.getWithdrawMtbColrs()) .map(MtbColr::getQtaCol) .reduce(BigDecimal.ZERO, BigDecimal::add); @@ -431,7 +429,7 @@ public class AccettazionePickingActivity extends BaseActivity implements Accetta //Calc Num CNF BigDecimal numCnfEvasa = BigDecimal.ZERO; - if(x.getWithdrawMtbColrs().size() > 0) { + if (x.getWithdrawMtbColrs().size() > 0) { numCnfEvasa = Stream.of(x.getWithdrawMtbColrs()) .map(MtbColr::getNumCnf) .reduce(BigDecimal.ZERO, BigDecimal::add); @@ -440,7 +438,7 @@ public class AccettazionePickingActivity extends BaseActivity implements Accetta //Calc qta col BigDecimal qtaEvasa = BigDecimal.ZERO; - if(x.getWithdrawMtbColrs().size() > 0) { + if (x.getWithdrawMtbColrs().size() > 0) { qtaEvasa = Stream.of(x.getWithdrawMtbColrs()) .map(MtbColr::getQtaCol) .reduce(BigDecimal.ZERO, BigDecimal::add); @@ -535,7 +533,7 @@ public class AccettazionePickingActivity extends BaseActivity implements Accetta public void startListaBancaliRegistratiActivity(ArrayList mtbColts) { Intent myIntent = ListaBancaliActivity.createIntent(this, - Stream.of(mtbColts).map(x -> (MtbColt)x).toList(), + Stream.of(mtbColts).map(x -> (MtbColt) x).toList(), input -> ((RecoverMtbColt) input).isFlagCanBeRecovered(), PrinterRESTConsumer.Type.SECONDARIA, ReportManager.getReportNameLUFromGestione(GestioneEnum.ACQUISTO)); @@ -546,7 +544,9 @@ public class AccettazionePickingActivity extends BaseActivity implements Accetta public void onLUSuccessullyPrinted() { Resources res = getResources(); String errorMessage = res.getText(R.string.alert_print_completed_message).toString(); - DialogSimpleMessageHelper.makeSuccessDialog(this, res.getText(R.string.completed).toString(), new SpannableString(errorMessage), null, null).show(); + DialogSimpleMessageView + .makeSuccessDialog(res.getText(R.string.completed).toString(), new SpannableString(errorMessage), null, null) + .show(getSupportFragmentManager(), "tag"); } @Override @@ -556,13 +556,13 @@ public class AccettazionePickingActivity extends BaseActivity implements Accetta @Override public void onLUPrintError(Exception ex, Runnable onComplete) { this.closeProgress(); - DialogSimpleMessageHelper.makeErrorDialog( - this, + DialogSimpleMessageView.makeErrorDialog( new SpannableString(ex.getMessage()), null, null, R.string.button_ignore_print, - onComplete).show(); + onComplete) + .show(getSupportFragmentManager(), "tag"); } @Override @@ -599,7 +599,7 @@ public class AccettazionePickingActivity extends BaseActivity implements Accetta public void onError(Exception ex) { this.closeProgress(); - if(ex instanceof InvalidPesoKGException) { + if (ex instanceof InvalidPesoKGException) { UtilityToast.showToast(ex.getMessage()); } else { UtilityExceptions.defaultException(this, ex, mCurrentProgress); @@ -664,12 +664,11 @@ public class AccettazionePickingActivity extends BaseActivity implements Accetta @Override public void onMtbColrDeleteRequest(RunnableArgs onComplete) { String text = getResources().getString(R.string.alert_delete_mtb_colr); - DialogSimpleMessageHelper.makeWarningDialog(this, - new SpannableString(text), + DialogSimpleMessageView.makeWarningDialog(new SpannableString(text), null, () -> onComplete.run(true), () -> onComplete.run(false) - ).show(); + ).show(getSupportFragmentManager(), "tag"); } @Override 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 4cf28074..f4a5ab67 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.utility.UtilityExceptions; import it.integry.integrywmsnative.core.utility.UtilityProgress; import it.integry.integrywmsnative.gest.contenuto_bancale.ContenutoBancaleActivity; import it.integry.integrywmsnative.gest.contenuto_bancale.core.ContenutoBancaleListAdapter; -import it.integry.integrywmsnative.view.dialogs.base.DialogSimpleMessageHelper; +import it.integry.integrywmsnative.view.dialogs.base.DialogSimpleMessageView; import static android.app.Activity.RESULT_OK; @@ -118,7 +118,9 @@ public class ContenutoBancaleViewModel implements IRecyclerItemClicked Resources res = mContext.getResources(); String errorMessage = res.getText(R.string.alert_print_completed_message).toString(); - DialogSimpleMessageHelper.makeSuccessDialog(mContext, res.getText(R.string.completed).toString(), new SpannableString(errorMessage), null, null).show(); + DialogSimpleMessageView + .makeSuccessDialog(res.getText(R.string.completed).toString(), new SpannableString(errorMessage), null, null) + .show(mContext.getSupportFragmentManager(), "tag"); }, ex -> UtilityExceptions.defaultException(mContext, ex, progress)); } catch (Exception ex) { @@ -128,7 +130,9 @@ public class ContenutoBancaleViewModel implements IRecyclerItemClicked } else { progress.dismiss(); String errorMessage = "Nessuna stampante configurata"; - DialogSimpleMessageHelper.makeWarningDialog(mContext, new SpannableString(errorMessage), null, null).show(); + DialogSimpleMessageView + .makeWarningDialog(new SpannableString(errorMessage), null, null) + .show(mContext.getSupportFragmentManager(), "tag");; } }, ex -> { UtilityExceptions.defaultException(mContext, ex, progress); 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 91b797c0..ff43799c 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 @@ -28,7 +28,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.base.DialogSimpleMessageHelper; +import it.integry.integrywmsnative.view.dialogs.base.DialogSimpleMessageView; public class LoginViewModel { @@ -192,22 +192,22 @@ public class LoginViewModel { private void onLoginFailed(final Spanned message){ mProgress.dismiss(); loginButtonEnabled.set(true); - mActivity.runOnUiThread(() -> DialogSimpleMessageHelper.makeErrorDialog( - mActivity, + mActivity.runOnUiThread(() -> DialogSimpleMessageView.makeErrorDialog( message, null, - null).show()); + null) + .show(mActivity.getSupportFragmentManager(), "tag")); } private void onLoginSuccess(final String title, final Spanned message, final String host, final int port, final List availableProfiles){ mProgress.dismiss(); - mActivity.runOnUiThread(() -> DialogSimpleMessageHelper.makeSuccessDialog( - mActivity, + mActivity.runOnUiThread(() -> DialogSimpleMessageView.makeSuccessDialog( title, message, null, - () -> showProfileDBSelectionDialog(host, port, availableProfiles)).show()); + () -> showProfileDBSelectionDialog(host, port, availableProfiles)) + .show(mActivity.getSupportFragmentManager(), "tag")); } private void showProfileDBSelectionDialog(final String host, final int port, final List availableProfiles){ diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/ordini_uscita_elenco/OrdiniUscitaElencoFragment.java b/app/src/main/java/it/integry/integrywmsnative/gest/ordini_uscita_elenco/OrdiniUscitaElencoFragment.java index 72acdc52..7dd3b647 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/ordini_uscita_elenco/OrdiniUscitaElencoFragment.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/ordini_uscita_elenco/OrdiniUscitaElencoFragment.java @@ -53,7 +53,7 @@ import it.integry.integrywmsnative.gest.ordini_uscita_elenco.list.OrdiniUscitaEl import it.integry.integrywmsnative.gest.spedizione.SpedizioneActivity; import it.integry.integrywmsnative.gest.spedizione.dialogs.row_info.BaseDialogRowInfoView; import it.integry.integrywmsnative.ui.ElevatedToolbar; -import it.integry.integrywmsnative.view.dialogs.base.DialogSimpleMessageHelper; +import it.integry.integrywmsnative.view.dialogs.base.DialogSimpleMessageView; public class OrdiniUscitaElencoFragment extends BaseFragment implements ITitledFragment, ILifecycleFragment, IScrollableFragment, ISelectAllFragment, IFilterableFragment, OrdiniUscitaElencoViewModel.Listener { @@ -315,8 +315,7 @@ public class OrdiniUscitaElencoFragment extends BaseFragment implements ITitledF int alreadyRegisteredUL = alreadyRegisteredMtbColts.size(); - DialogSimpleMessageHelper.makeInfoDialog(getActivity(), - getText(R.string.orders).toString(), + DialogSimpleMessageView.makeInfoDialog(getText(R.string.orders).toString(), Html.fromHtml(String.format(getActivity().getResources().getQuantityString(R.plurals.loaded_orders_message, orders.size()), orders.size()) + "
" + "" + codMarts.size() + " " + getActivity().getResources().getQuantityString(R.plurals.available_articles, codMarts.size()) @@ -324,7 +323,7 @@ public class OrdiniUscitaElencoFragment extends BaseFragment implements ITitledF "" + alreadyRegisteredUL + " " + getActivity().getResources().getQuantityString(R.plurals.already_registered_lu, alreadyRegisteredUL)), null, () -> SpedizioneActivity.startActivity(getActivity(), sitArts, orders, alreadyRegisteredMtbColts, mCurrentGestioneCol, mCurrentSegnoCol, MtbColr.Causale.DEFAULT, mDialogRowInfo) - ).show(); + ).show(getActivity().getSupportFragmentManager(), "tag"); } @Override diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/picking_libero/PickingLiberoFragment.java b/app/src/main/java/it/integry/integrywmsnative/gest/picking_libero/PickingLiberoFragment.java index bf6c709b..bad33b1e 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/picking_libero/PickingLiberoFragment.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/picking_libero/PickingLiberoFragment.java @@ -55,7 +55,7 @@ import it.integry.integrywmsnative.ui.ElevatedToolbar; import it.integry.integrywmsnative.view.bottom_sheet__mtb_colr_edit.BottomSheetMtbColrEditView; import it.integry.integrywmsnative.view.dialogs.DialogConsts; import it.integry.integrywmsnative.view.dialogs.ask_cliente.DialogAskCliente; -import it.integry.integrywmsnative.view.dialogs.base.DialogSimpleMessageHelper; +import it.integry.integrywmsnative.view.dialogs.base.DialogSimpleMessageView; import it.integry.integrywmsnative.view.dialogs.choose_arts_from_lista_arts.DialogChooseArtsFromListaArts; import it.integry.integrywmsnative.view.dialogs.input_quantity_v2.DialogInputQuantityV2DTO; import it.integry.integrywmsnative.view.dialogs.input_quantity_v2.DialogInputQuantityV2View; @@ -268,12 +268,11 @@ public class PickingLiberoFragment extends BaseFragment implements ITitledFragme @Override public void onMtbColrDeleteRequest(RunnableArgs onComplete) { String text = getResources().getString(R.string.alert_delete_mtb_colr); - DialogSimpleMessageHelper.makeWarningDialog(getActivity(), - new SpannableString(text), + DialogSimpleMessageView.makeWarningDialog(new SpannableString(text), null, () -> onComplete.run(true), () -> onComplete.run(false) - ).show(); + ).show(getActivity().getSupportFragmentManager(), "tag"); } @Override diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/picking_resi/PickingResiActivity.java b/app/src/main/java/it/integry/integrywmsnative/gest/picking_resi/PickingResiActivity.java index 782fb055..8e9444a4 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/picking_resi/PickingResiActivity.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/picking_resi/PickingResiActivity.java @@ -49,7 +49,7 @@ import it.integry.integrywmsnative.gest.spedizione.model.PickedQuantityDTO; import it.integry.integrywmsnative.view.bottom_sheet__lu_content.BottomSheetFragmentLUContentView; import it.integry.integrywmsnative.view.bottom_sheet__lu_content.BottomSheetFragmentLUContentViewModel; import it.integry.integrywmsnative.view.dialogs.ask_should_print.DialogAskShouldPrint; -import it.integry.integrywmsnative.view.dialogs.base.DialogSimpleMessageHelper; +import it.integry.integrywmsnative.view.dialogs.base.DialogSimpleMessageView; import it.integry.integrywmsnative.view.dialogs.input_quantity_v2.DialogInputQuantityV2View; import it.integry.integrywmsnative.view.dialogs.input_quantity_v2.DialogInputQuantityV2DTO; import it.integry.integrywmsnative.view.dialogs.note_aggiuntive_lu.NoteAggiuntiveLUDialog; @@ -334,12 +334,11 @@ public class PickingResiActivity extends BaseActivity implements BottomSheetFrag @Override public void onMtbColrDeleteRequest(RunnableArgs onComplete) { String text = getResources().getString(R.string.alert_delete_mtb_colr); - DialogSimpleMessageHelper.makeWarningDialog(this, - new SpannableString(text), + DialogSimpleMessageView.makeWarningDialog(new SpannableString(text), null, () -> onComplete.run(true), () -> onComplete.run(false) - ).show(); + ).show(getSupportFragmentManager(), "tag"); } @Override @@ -362,7 +361,9 @@ public class PickingResiActivity extends BaseActivity implements BottomSheetFrag public void onLUSuccessullyPrinted() { Resources res = getResources(); String errorMessage = res.getText(R.string.alert_print_completed_message).toString(); - DialogSimpleMessageHelper.makeSuccessDialog(this, res.getText(R.string.completed).toString(), new SpannableString(errorMessage), null, null).show(); + DialogSimpleMessageView + .makeSuccessDialog(res.getText(R.string.completed).toString(), new SpannableString(errorMessage), null, null) + .show(getSupportFragmentManager(), "tag"); } @Override @@ -373,13 +374,13 @@ public class PickingResiActivity extends BaseActivity implements BottomSheetFrag @Override public void onLUPrintError(Exception ex, Runnable onComplete) { this.closeProgress(); - DialogSimpleMessageHelper.makeErrorDialog( - this, + DialogSimpleMessageView.makeErrorDialog( new SpannableString(ex.getMessage()), null, null, R.string.button_ignore_print, - onComplete).show(); + onComplete) + .show(getSupportFragmentManager(), "tag"); } @Override diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/prod_accettazione_ord_produzione/ProdOrdineProduzioneElencoFragment.java b/app/src/main/java/it/integry/integrywmsnative/gest/prod_accettazione_ord_produzione/ProdOrdineProduzioneElencoFragment.java index 1cdc39ef..df721f6b 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/prod_accettazione_ord_produzione/ProdOrdineProduzioneElencoFragment.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/prod_accettazione_ord_produzione/ProdOrdineProduzioneElencoFragment.java @@ -41,7 +41,7 @@ import it.integry.integrywmsnative.gest.prod_accettazione_ord_produzione.core.Or import it.integry.integrywmsnative.gest.prod_accettazione_ord_produzione.core.OrdineProduzioneListAdapter; import it.integry.integrywmsnative.gest.prod_accettazione_ord_produzione.dialog.DialogOrdineProduzioneFiltroAvanzato; import it.integry.integrywmsnative.ui.ElevatedToolbar; -import it.integry.integrywmsnative.view.dialogs.base.DialogSimpleMessageHelper; +import it.integry.integrywmsnative.view.dialogs.base.DialogSimpleMessageView; /** * A simple {@link Fragment} subclass. @@ -137,7 +137,9 @@ public class ProdOrdineProduzioneElencoFragment extends Fragment implements ITit String errorMessage = CommonRESTException.tryRecognizeThenGetMessage(ex); if (errorMessage == null) errorMessage = ex.getMessage(); - DialogSimpleMessageHelper.makeErrorDialog(getActivity(), new SpannableString(errorMessage), null, null).show(); + DialogSimpleMessageView + .makeErrorDialog(new SpannableString(errorMessage), null, null) + .show(getActivity().getSupportFragmentManager(), "tag"); } ); } @@ -197,8 +199,7 @@ public class ProdOrdineProduzioneElencoFragment extends Fragment implements ITit .distinctBy(x -> x.getDataOrd() + " " + x.getNumOrd() + " " + x.getGestione()) .count(); - DialogSimpleMessageHelper.makeInfoDialog(getActivity(), - getText(R.string.orders).toString(), + DialogSimpleMessageView.makeInfoDialog(getText(R.string.orders).toString(), Html.fromHtml(String.format(getActivity().getResources().getQuantityString(R.plurals.loaded_orders_message, (int) ordsCounter), ordsCounter) + "

" + "" + artsCounter + " " + getActivity().getResources().getQuantityString(R.plurals.available_articles, (int) artsCounter)), @@ -213,7 +214,7 @@ public class ProdOrdineProduzioneElencoFragment extends Fragment implements ITit myIntent.putExtra("keySitArts", cacheSitArtItemID); getActivity().startActivity(myIntent); - }).show(); + }).show(getActivity().getSupportFragmentManager(), "tag"); }, @@ -224,7 +225,9 @@ public class ProdOrdineProduzioneElencoFragment extends Fragment implements ITit String errorMessage = CommonRESTException.tryRecognizeThenGetMessage(ex); if (errorMessage == null) errorMessage = ex.getMessage() + "\n" + ex.getCause().getCause().getMessage(); - DialogSimpleMessageHelper.makeErrorDialog(getActivity(), new SpannableString(errorMessage), null, null).show(); + DialogSimpleMessageView + .makeErrorDialog(new SpannableString(errorMessage), null, null) + .show(getActivity().getSupportFragmentManager(), "tag"); }); diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/prod_recupero_materiale/viewmodel/ProdRecuperoMaterialeViewModel.java b/app/src/main/java/it/integry/integrywmsnative/gest/prod_recupero_materiale/viewmodel/ProdRecuperoMaterialeViewModel.java index 1f53fb66..917fadf0 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/prod_recupero_materiale/viewmodel/ProdRecuperoMaterialeViewModel.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/prod_recupero_materiale/viewmodel/ProdRecuperoMaterialeViewModel.java @@ -42,7 +42,7 @@ import it.integry.integrywmsnative.gest.prod_recupero_materiale.core.ProdRecuper import it.integry.integrywmsnative.gest.prod_recupero_materiale.dto.HistoryVersamentoProdULDTO; import it.integry.integrywmsnative.gest.spedizione.model.PickedQuantityDTO; import it.integry.integrywmsnative.view.dialogs.DialogCommon; -import it.integry.integrywmsnative.view.dialogs.base.DialogSimpleMessageHelper; +import it.integry.integrywmsnative.view.dialogs.base.DialogSimpleMessageView; import it.integry.integrywmsnative.view.dialogs.input_quantity_v2.DialogInputQuantityV2DTO; import it.integry.integrywmsnative.view.dialogs.input_quantity_v2.DialogInputQuantityV2View; import it.integry.integrywmsnative.view.dialogs.scan_or_create_lu.DialogScanOrCreateLU; @@ -386,13 +386,13 @@ public class ProdRecuperoMaterialeViewModel { }, ex -> { progress.dismiss(); String errorMessage = ex.getMessage(); - DialogSimpleMessageHelper.makeErrorDialog( - mContext, + DialogSimpleMessageView.makeErrorDialog( new SpannableString(errorMessage), null, null, R.string.button_ignore_print, - onComplete).show(); + onComplete) + .show(mContext.getSupportFragmentManager(), "tag"); }); } catch (Exception ex) { @@ -402,7 +402,9 @@ public class ProdRecuperoMaterialeViewModel { } else { progress.dismiss(); String errorMessage = "Nessuna stampante configurata"; - DialogSimpleMessageHelper.makeWarningDialog(mContext, new SpannableString(errorMessage), null, onComplete).show(); + DialogSimpleMessageView + .makeWarningDialog(new SpannableString(errorMessage), null, onComplete) + .show(mContext.getSupportFragmentManager(), "tag"); } }, ex -> { UtilityExceptions.defaultException(mContext, ex, progress); diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/prod_versamento_materiale/core/ChooseOrdsLavFromListAdapter.java b/app/src/main/java/it/integry/integrywmsnative/gest/prod_versamento_materiale/core/ChooseOrdsLavFromListAdapter.java index 21bfaabd..9e729256 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/prod_versamento_materiale/core/ChooseOrdsLavFromListAdapter.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/prod_versamento_materiale/core/ChooseOrdsLavFromListAdapter.java @@ -6,6 +6,7 @@ import android.text.SpannableString; import android.view.LayoutInflater; import android.view.ViewGroup; +import androidx.appcompat.app.AppCompatActivity; import androidx.databinding.DataBindingUtil; import androidx.databinding.Observable; import androidx.recyclerview.widget.RecyclerView; @@ -32,7 +33,7 @@ import it.integry.integrywmsnative.core.utility.UtilityResources; import it.integry.integrywmsnative.core.utility.UtilityString; import it.integry.integrywmsnative.databinding.FragmentChooseOrdsLavFromListItemModelBinding; import it.integry.integrywmsnative.gest.prod_versamento_materiale.dto.OrdineLavorazioneDTO; -import it.integry.integrywmsnative.view.dialogs.base.DialogSimpleMessageHelper; +import it.integry.integrywmsnative.view.dialogs.base.DialogSimpleMessageView; public class ChooseOrdsLavFromListAdapter extends RecyclerView.Adapter { @@ -57,11 +58,12 @@ public class ChooseOrdsLavFromListAdapter extends RecyclerView.Adapter Per una corretta suddivisione delle quantità registra le risorse.")), null, () -> { itemModel.getChecked().set(false); - }).show(); + }) + .show(((AppCompatActivity) mContext).getSupportFragmentManager(), "tag"); return; } if (!itemModel.isChecked()) { diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/prod_versamento_materiale/viewmodel/ProdVersamentoMaterialViewModel.java b/app/src/main/java/it/integry/integrywmsnative/gest/prod_versamento_materiale/viewmodel/ProdVersamentoMaterialViewModel.java index 1a8a927c..ce53400b 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/prod_versamento_materiale/viewmodel/ProdVersamentoMaterialViewModel.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/prod_versamento_materiale/viewmodel/ProdVersamentoMaterialViewModel.java @@ -8,6 +8,7 @@ import android.text.SpannableString; import android.view.View; import android.widget.Toast; +import androidx.appcompat.app.AppCompatActivity; import androidx.databinding.ObservableField; import androidx.recyclerview.widget.LinearLayoutManager; @@ -44,7 +45,7 @@ import it.integry.integrywmsnative.gest.prod_versamento_materiale.dto.OrdineLavo import it.integry.integrywmsnative.view.dialogs.DialogCommon; import it.integry.integrywmsnative.view.dialogs.DialogConsts; import it.integry.integrywmsnative.view.dialogs.ask_position_of_lu.DialogAskPositionOfLU; -import it.integry.integrywmsnative.view.dialogs.base.DialogSimpleMessageHelper; +import it.integry.integrywmsnative.view.dialogs.base.DialogSimpleMessageView; import it.integry.integrywmsnative.view.dialogs.scan_or_create_lu.DialogScanOrCreateLU; @@ -75,7 +76,7 @@ public class ProdVersamentoMaterialViewModel { mMtbColr = mtbColr; mBinding.descrArt.setText(mtbColr.getDescrizione()); mBinding.codArt.setText(mtbColr.getCodMart()); - mBinding.batch.setText(mtbColr.getPartitaMag() + ((mtbColr.getMtbPartitaMag() != null) ? " - "+ mtbColr.getMtbPartitaMag().getDescrizione() : "")); + mBinding.batch.setText(mtbColr.getPartitaMag() + ((mtbColr.getMtbPartitaMag() != null) ? " - " + mtbColr.getMtbPartitaMag().getDescrizione() : "")); if (!SettingsManager.iDB().isFlagForceAllToColli() && (mtbColr.getMtbAart() == null || mtbColr.getMtbAart().isFlagQtaCnfFissaBoolean())) { String text = UtilityNumber.decimalToString(mtbColr.getQtaCol()); @@ -96,18 +97,20 @@ public class ProdVersamentoMaterialViewModel { } else if ((mtbColt.getGestioneEnum() == GestioneEnum.ACQUISTO || mtbColt.getGestioneEnum() == GestioneEnum.LAVORAZIONE || mtbColt.getGestioneEnum() == GestioneEnum.VENDITA) && mtbColt.getSegno().equals(+1)) { if (mtbColt.getMtbColr() == null || mtbColt.getMtbColr().size() == 0) { - DialogSimpleMessageHelper.makeWarningDialog(mContext, + DialogSimpleMessageView.makeWarningDialog( new SpannableString(Html.fromHtml("E' stata scansionata una UL già vuota")), - null, this::openLU).show(); + null, this::openLU) + .show(((AppCompatActivity) mContext).getSupportFragmentManager(), "tag"); } else { setMtbColt(mtbColt); choosePosition(); } } else { - DialogSimpleMessageHelper.makeWarningDialog(mContext, - new SpannableString(Html.fromHtml("Sono accettate solamente UL di Acquisto o Lavorazione di CARICO")), - null, this::openLU).show(); + DialogSimpleMessageView + .makeWarningDialog(new SpannableString(Html.fromHtml("Sono accettate solamente UL di Acquisto o Lavorazione di CARICO")), + null, this::openLU) + .show(((AppCompatActivity) mContext).getSupportFragmentManager(), "tag"); } }).show(); } @@ -123,28 +126,36 @@ public class ProdVersamentoMaterialViewModel { createColloScarico(mtbDepoPosizione); } else { if (mtbColt == null || mtbColt.get() == null || mtbColt.get().getMtbColr() == null || mtbColt.get().getMtbColr().size() <= 0) { - DialogSimpleMessageHelper.makeWarningDialog(mContext, - new SpannableString(Html.fromHtml("Il collo selezionato non presenta articoli versabili sulla linea.")), - null, this::openLU).show(); + DialogSimpleMessageView + .makeWarningDialog(new SpannableString(Html.fromHtml("Il collo selezionato non presenta articoli versabili sulla linea.")), + null, this::openLU) + .show(((AppCompatActivity) mContext).getSupportFragmentManager(), "tag"); return; } else if (mtbColt.get().getMtbColr().size() > 1) { - DialogSimpleMessageHelper.makeWarningDialog(mContext, - new SpannableString(Html.fromHtml("Il collo selezionato contiene più articoli, solo il primo verrà versato in questa sessione.
Per versare i colli restanti ripetere l'operazione di versamento.")), - null, () -> { - cyclicGetOrdiniLavByCollo(mtbColt.get().getMtbColr().iterator(), mtbDepoPosizione); - }).show(); + DialogSimpleMessageView + .makeWarningDialog(new SpannableString(Html.fromHtml("Il collo selezionato contiene più articoli, solo il primo verrà versato in questa sessione.
Per versare i colli restanti ripetere l'operazione di versamento.")), + null, () -> { + cyclicGetOrdiniLavByCollo(mtbColt.get().getMtbColr().iterator(), mtbDepoPosizione); + }) + .show(((AppCompatActivity) mContext).getSupportFragmentManager(), "tag"); return; } - MesRESTConsumer.getOrdiniLavorazioneMateriale(mtbDepoPosizione.getPosizione(), getIdMaterialeFromCollo(mtbColt.get()), ordini -> richiediOrdiniPerVersamento(ordini, mtbDepoPosizione), e -> DialogSimpleMessageHelper.makeWarningDialog(mContext, - new SpannableString(Html.fromHtml(e.getMessage())), - null, this::openLU).show()); + MesRESTConsumer.getOrdiniLavorazioneMateriale( + mtbDepoPosizione.getPosizione(), + getIdMaterialeFromCollo(mtbColt.get()), + ordini -> richiediOrdiniPerVersamento(ordini, mtbDepoPosizione), + e -> DialogSimpleMessageView.makeWarningDialog(new SpannableString(Html.fromHtml(e.getMessage())), + null, + this::openLU) + .show(((AppCompatActivity) mContext).getSupportFragmentManager(), "tag")); } } else { - DialogSimpleMessageHelper.makeWarningDialog(mContext, - new SpannableString(Html.fromHtml("Si è verificato un errore. Riprovare")), - null, this::openLU).show(); + DialogSimpleMessageView + .makeWarningDialog(new SpannableString(Html.fromHtml("Si è verificato un errore. Riprovare")), + null, this::openLU) + .show(((AppCompatActivity) mContext).getSupportFragmentManager(), "tag"); } } @@ -243,8 +254,8 @@ public class ProdVersamentoMaterialViewModel { richiediOrdiniPerVersamento(ordini, mtbDepoPosizione); } } - , e -> DialogSimpleMessageHelper.makeWarningDialog(mContext, - new SpannableString(Html.fromHtml(e.getMessage())), - null, this::openLU).show()); + , e -> DialogSimpleMessageView.makeWarningDialog(new SpannableString(Html.fromHtml(e.getMessage())), + null, this::openLU) + .show(((AppCompatActivity) mContext).getSupportFragmentManager(), "tag")); } } diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/pv_ordine_acquisto_edit/PVOrdineAcquistoEditActivity.java b/app/src/main/java/it/integry/integrywmsnative/gest/pv_ordine_acquisto_edit/PVOrdineAcquistoEditActivity.java index 913f46dc..4da7c280 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/pv_ordine_acquisto_edit/PVOrdineAcquistoEditActivity.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/pv_ordine_acquisto_edit/PVOrdineAcquistoEditActivity.java @@ -42,7 +42,7 @@ import it.integry.integrywmsnative.gest.pv_ordine_acquisto_edit.helper.PVEditOrd import it.integry.integrywmsnative.ui.FabMenuCustomAnimations; import it.integry.integrywmsnative.view.dialogs.DialogAskAction; import it.integry.integrywmsnative.view.dialogs.base.DialogSimpleInputHelper; -import it.integry.integrywmsnative.view.dialogs.base.DialogSimpleMessageHelper; +import it.integry.integrywmsnative.view.dialogs.base.DialogSimpleMessageView; public class PVOrdineAcquistoEditActivity extends BaseActivity { @@ -135,7 +135,7 @@ public class PVOrdineAcquistoEditActivity extends BaseActivity { private void deleteArticolo(ArticoloOrdine articoloOrdine) { String text = "Stai per eliminare l'articolo " + articoloOrdine.getDescrizione() + " dall'ordine,
sei sicuro?"; - DialogSimpleMessageHelper.makeWarningDialog(this, new SpannableString(Html.fromHtml(text)), null, () -> this.runOnUiThread(() -> { + DialogSimpleMessageView.makeWarningDialog(new SpannableString(Html.fromHtml(text)), null, () -> this.runOnUiThread(() -> { final Dialog progress = UtilityProgress.createDefaultProgressDialog(this); mhelper.removeArticoloFromOrdine(articoloOrdine, () -> { progress.dismiss(); @@ -146,7 +146,7 @@ public class PVOrdineAcquistoEditActivity extends BaseActivity { runOnUiThread(() -> UtilityExceptions.defaultException(this, e)); }); }), () -> { - }).show(); + }).show(getSupportFragmentManager(), "tag"); } private void handleException(Exception ex) { diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/pv_ordini_acquisto/PVOrdiniAcquistoGrigliaFragment.java b/app/src/main/java/it/integry/integrywmsnative/gest/pv_ordini_acquisto/PVOrdiniAcquistoGrigliaFragment.java index 1b9f3b68..065c665c 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/pv_ordini_acquisto/PVOrdiniAcquistoGrigliaFragment.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/pv_ordini_acquisto/PVOrdiniAcquistoGrigliaFragment.java @@ -47,7 +47,7 @@ import it.integry.integrywmsnative.gest.pv_ordini_acquisto.dialogs.DialogScanLis import it.integry.integrywmsnative.gest.pv_ordini_acquisto.helper.OrdineAcquistoPvHelper; import it.integry.integrywmsnative.ui.ElevatedToolbar; import it.integry.integrywmsnative.view.dialogs.DialogAskAction; -import it.integry.integrywmsnative.view.dialogs.base.DialogSimpleMessageHelper; +import it.integry.integrywmsnative.view.dialogs.base.DialogSimpleMessageView; public class PVOrdiniAcquistoGrigliaFragment extends Fragment implements ITitledFragment, IScrollableFragment { @@ -142,7 +142,9 @@ public class PVOrdiniAcquistoGrigliaFragment extends Fragment implements ITitled }), (e) -> { progress.dismiss(); String errorMessage = e.getMessage(); - getActivity().runOnUiThread(() -> DialogSimpleMessageHelper.makeErrorDialog(getActivity(), new SpannableString(errorMessage), null, null).show()); + getActivity().runOnUiThread(() -> DialogSimpleMessageView + .makeErrorDialog(new SpannableString(errorMessage), null, null) + .show(getActivity().getSupportFragmentManager(), "tag")); }); } @@ -198,7 +200,7 @@ public class PVOrdiniAcquistoGrigliaFragment extends Fragment implements ITitled private void deleteOrdine(Ordine ordine) { String text = "Stai per eliminare un ordine sei sicuro?"; - DialogSimpleMessageHelper.makeWarningDialog(getActivity(), new SpannableString(Html.fromHtml(text)), null, () -> getActivity().runOnUiThread(() -> { + DialogSimpleMessageView.makeWarningDialog(new SpannableString(Html.fromHtml(text)), null, () -> getActivity().runOnUiThread(() -> { final Dialog progress = UtilityProgress.createDefaultProgressDialog(getActivity()); mHelper.deleteOrder(ordine, () -> { getActivity().runOnUiThread(() -> { @@ -211,7 +213,7 @@ public class PVOrdiniAcquistoGrigliaFragment extends Fragment implements ITitled getActivity().runOnUiThread(() -> UtilityExceptions.defaultException(getActivity(), e)); }); }), () -> { - }).show(); + }).show(getActivity().getSupportFragmentManager(), "tag"); } private void refreshRenderedOrdini(List ordini) { diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/rettifica_giacenze/RettificaGiacenzeFragment.java b/app/src/main/java/it/integry/integrywmsnative/gest/rettifica_giacenze/RettificaGiacenzeFragment.java index 610376c9..1366e3e7 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/rettifica_giacenze/RettificaGiacenzeFragment.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/rettifica_giacenze/RettificaGiacenzeFragment.java @@ -60,7 +60,7 @@ import it.integry.integrywmsnative.gest.spedizione.model.PickingObjectDTO; import it.integry.integrywmsnative.view.bottom_sheet__mtb_colr_edit.BottomSheetMtbColrEditView; import it.integry.integrywmsnative.view.dialogs.DialogConsts; import it.integry.integrywmsnative.view.dialogs.ask_position_of_lu.DialogAskPositionOfLU; -import it.integry.integrywmsnative.view.dialogs.base.DialogSimpleMessageHelper; +import it.integry.integrywmsnative.view.dialogs.base.DialogSimpleMessageView; import it.integry.integrywmsnative.view.dialogs.choose_art_from_lista_arts.DialogChooseArtFromListaArts; import it.integry.integrywmsnative.view.dialogs.input_quantity_v2.DialogInputQuantityV2View; import it.integry.integrywmsnative.view.dialogs.input_quantity_v2.DialogInputQuantityV2DTO; @@ -360,12 +360,12 @@ public class RettificaGiacenzeFragment extends Fragment implements ITitledFragme @Override public void onMtbColrDeleteRequest(RunnableArgs onComplete) { String text = getResources().getString(R.string.alert_delete_mtb_colr); - DialogSimpleMessageHelper.makeWarningDialog(getActivity(), - new SpannableString(text), + DialogSimpleMessageView.makeWarningDialog(new SpannableString(text), null, () -> onComplete.run(true), () -> onComplete.run(false) - ).show(); + ) + .show(getActivity().getSupportFragmentManager(), "tag"); } @Override @@ -471,29 +471,31 @@ public class RettificaGiacenzeFragment extends Fragment implements ITitledFragme public void onLUSuccessullyPrinted() { Resources res = getResources(); String errorMessage = res.getText(R.string.alert_print_completed_message).toString(); - DialogSimpleMessageHelper.makeSuccessDialog(getActivity(), res.getText(R.string.completed).toString(), new SpannableString(errorMessage), null, null).show(); + DialogSimpleMessageView + .makeSuccessDialog(res.getText(R.string.completed).toString(), new SpannableString(errorMessage), null, null) + .show(getActivity().getSupportFragmentManager(), "tag"); } @Override public void onLUPrintRequest(RunnableArgs onComplete) { - DialogSimpleMessageHelper.makeInfoDialog( - getActivity(), + DialogSimpleMessageView.makeInfoDialog( getActivity().getResources().getString(R.string.action_print_ul), new SpannableString(getActivity().getResources().getString(R.string.ask_print_message)), null, () -> onComplete.run(true), - () -> onComplete.run(false)).show(); + () -> onComplete.run(false)) + .show(getActivity().getSupportFragmentManager(), "tag");; } @Override public void onLUPrintError(Exception ex, Runnable onComplete) { - DialogSimpleMessageHelper.makeErrorDialog( - getActivity(), + DialogSimpleMessageView.makeErrorDialog( new SpannableString(ex.getMessage()), null, null, R.string.button_ignore_print, - onComplete).show(); + onComplete) + .show(getActivity().getSupportFragmentManager(), "tag"); } @Override diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/spedizione/SpedizioneActivity.java b/app/src/main/java/it/integry/integrywmsnative/gest/spedizione/SpedizioneActivity.java index 2aa9f89b..0af39985 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/spedizione/SpedizioneActivity.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/spedizione/SpedizioneActivity.java @@ -67,7 +67,7 @@ import it.integry.integrywmsnative.view.dialogs.DialogConsts; import it.integry.integrywmsnative.view.dialogs.ask_position_of_lu.DialogAskPositionOfLU; import it.integry.integrywmsnative.view.dialogs.ask_should_print.DialogAskShouldPrint; import it.integry.integrywmsnative.view.dialogs.base.DialogSimpleInputHelper; -import it.integry.integrywmsnative.view.dialogs.base.DialogSimpleMessageHelper; +import it.integry.integrywmsnative.view.dialogs.base.DialogSimpleMessageView; import it.integry.integrywmsnative.view.dialogs.camera_barcode_reader.DialogCameraBarcodeReader; import it.integry.integrywmsnative.view.dialogs.input_peso_lu.DialogInputPeso; import it.integry.integrywmsnative.view.dialogs.input_quantity_v2.DialogInputQuantityV2DTO; @@ -719,7 +719,9 @@ public class SpedizioneActivity extends BaseActivity implements SpedizioneViewMo public void onLUSuccessullyPrinted() { Resources res = getResources(); String errorMessage = res.getText(R.string.alert_print_completed_message).toString(); - DialogSimpleMessageHelper.makeSuccessDialog(this, res.getText(R.string.completed).toString(), new SpannableString(errorMessage), null, null).show(); + DialogSimpleMessageView + .makeSuccessDialog(res.getText(R.string.completed).toString(), new SpannableString(errorMessage), null, null) + .show(getSupportFragmentManager(), "tag");; } @Override @@ -730,13 +732,14 @@ public class SpedizioneActivity extends BaseActivity implements SpedizioneViewMo @Override public void onLUPrintError(Exception ex, Runnable onComplete) { this.closeProgress(); - DialogSimpleMessageHelper.makeErrorDialog( - this, + DialogSimpleMessageView.makeErrorDialog( new SpannableString(ex.getMessage()), null, null, R.string.button_ignore_print, - onComplete).show(); + onComplete) + .show(getSupportFragmentManager(), "tag"); + ; } @Override @@ -754,12 +757,12 @@ public class SpedizioneActivity extends BaseActivity implements SpedizioneViewMo @Override public void onMtbColrDeleteRequest(RunnableArgs onComplete) { String text = getResources().getString(R.string.alert_delete_mtb_colr); - DialogSimpleMessageHelper.makeWarningDialog(this, - new SpannableString(text), + DialogSimpleMessageView.makeWarningDialog(new SpannableString(text), null, () -> onComplete.run(true), () -> onComplete.run(false) - ).show(); + ) + .show(getSupportFragmentManager(), "tag"); } @Override 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 b2a835fa..8c1ab989 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 @@ -40,7 +40,7 @@ import it.integry.integrywmsnative.databinding.FragmentMainVersamentoMerceBindin import it.integry.integrywmsnative.gest.versamento_merce.core.VersamentoMerceHelper; import it.integry.integrywmsnative.view.dialogs.DialogAskLivelloPosizione; import it.integry.integrywmsnative.view.dialogs.DialogCommon; -import it.integry.integrywmsnative.view.dialogs.base.DialogSimpleMessageHelper; +import it.integry.integrywmsnative.view.dialogs.base.DialogSimpleMessageView; import it.integry.integrywmsnative.view.dialogs.choose_arts_from_lista_arts.DialogChooseArtsFromListaArts; import it.integry.integrywmsnative.view.dialogs.input_quantity_v2.DialogInputQuantityV2View; import it.integry.integrywmsnative.view.dialogs.input_quantity_v2.DialogInputQuantityV2DTO; @@ -76,9 +76,10 @@ public class VersamentoMerceViewModel { } else if (mtbColt.getGestioneEnum() == GestioneEnum.VENDITA) { setMtbColt(mtbColt); } else { - DialogSimpleMessageHelper.makeWarningDialog(mContext, - new SpannableString(Html.fromHtml("Sono accettate solamente UL di Acquisto o Lavorazione di CARICO")), - null, this::openLU).show(); + DialogSimpleMessageView + .makeWarningDialog(new SpannableString(Html.fromHtml("Sono accettate solamente UL di Acquisto o Lavorazione di CARICO")), + null, this::openLU) + .show(mContext.getSupportFragmentManager(), "tag");; } }).show(); } @@ -151,9 +152,10 @@ public class VersamentoMerceViewModel { } private void showTooMuchULFound() { - DialogSimpleMessageHelper.makeWarningDialog(mContext, + DialogSimpleMessageView.makeWarningDialog( new SpannableString(mContext.getResources().getText(R.string.too_much_lu_found_message_in_mono_lu)), - null, null).show(); + null, null) + .show(mContext.getSupportFragmentManager(), "tag"); } private void executeEtichettaEan128(BarcodeScanDTO barcodeScanDTO, Dialog progressDialog) { @@ -429,18 +431,19 @@ public class VersamentoMerceViewModel { private void askULVenditaConfirm(RunnableArgs callback) { - DialogSimpleMessageHelper.makeWarningDialog( - mContext, + DialogSimpleMessageView.makeWarningDialog( new SpannableString(mContext.getResources().getString(R.string.lu_gest_v_loading_alert)), null, () -> callback.run(true), - () -> callback.run(false)).show(); + () -> callback.run(false)) + .show(mContext.getSupportFragmentManager(), "tag"); } private void showWrongGestioneUL() { - DialogSimpleMessageHelper.makeWarningDialog(mContext, + DialogSimpleMessageView.makeWarningDialog( new SpannableString(Html.fromHtml(mContext.getResources().getText(R.string.gestione_V_not_accepted_message).toString())), - null, null).show(); + null, null) + .show(mContext.getSupportFragmentManager(), "tag"); } diff --git a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/DialogCommon.java b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/DialogCommon.java index f2ed317e..e35f0e4b 100644 --- a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/DialogCommon.java +++ b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/DialogCommon.java @@ -3,48 +3,52 @@ package it.integry.integrywmsnative.view.dialogs; import android.content.Context; import android.text.SpannableString; +import androidx.appcompat.app.AppCompatActivity; + import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import it.integry.integrywmsnative.R; -import it.integry.integrywmsnative.view.dialogs.base.DialogSimpleMessageHelper; +import it.integry.integrywmsnative.view.dialogs.base.DialogSimpleMessageView; public class DialogCommon { public static void showNoArtFoundDialog(@NotNull Context context, @Nullable Runnable onPositiveClick) { - DialogSimpleMessageHelper.makeWarningDialog(context, - new SpannableString(context.getResources().getText(R.string.no_result_from_barcode)), - null, onPositiveClick).show(); + DialogSimpleMessageView + .makeWarningDialog(new SpannableString(context.getResources().getText(R.string.no_result_from_barcode)), + null, onPositiveClick) + .show(((AppCompatActivity) context).getSupportFragmentManager(), "tag"); } public static void showNoULFound(@NotNull Context context, @Nullable Runnable onPositiveClick) { - DialogSimpleMessageHelper.makeWarningDialog(context, - new SpannableString(context.getResources().getText(R.string.no_lu_found_message)), - null, onPositiveClick).show(); + DialogSimpleMessageView.makeWarningDialog(new SpannableString(context.getResources().getText(R.string.no_lu_found_message)), + null, onPositiveClick) + .show(((AppCompatActivity) context).getSupportFragmentManager(), "tag"); } public static void showNoOrderFound(@NotNull Context context, @Nullable Runnable onPositiveClick) { - DialogSimpleMessageHelper.makeWarningDialog(context, - new SpannableString(context.getResources().getText(R.string.no_orders_found_message)), - null, onPositiveClick).show(); + DialogSimpleMessageView.makeWarningDialog(new SpannableString(context.getResources().getText(R.string.no_orders_found_message)), + null, onPositiveClick) + .show(((AppCompatActivity) context).getSupportFragmentManager(), "tag");; } public static void showDataSaved(@NotNull Context context, @Nullable Runnable onPositiveClick) { - DialogSimpleMessageHelper.makeSuccessDialog( - context, + DialogSimpleMessageView.makeSuccessDialog( context.getResources().getString(R.string.completed), new SpannableString(context.getResources().getString(R.string.data_saved)), - null, onPositiveClick).show(); + null, onPositiveClick) + .show(((AppCompatActivity) context).getSupportFragmentManager(), "tag"); } public static void showRestError(@NotNull Context context, Exception ex, @Nullable Runnable onPositiveClick) { - DialogSimpleMessageHelper.makeErrorDialog(context, - new SpannableString(ex.getMessage()), null, onPositiveClick).show(); + DialogSimpleMessageView + .makeErrorDialog(new SpannableString(ex.getMessage()), null, onPositiveClick) + .show(((AppCompatActivity) context).getSupportFragmentManager(), "tag"); } } diff --git a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/base/DialogSimpleMessageHelper.java b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/base/DialogSimpleMessageHelper.java deleted file mode 100644 index cae2d7b4..00000000 --- a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/base/DialogSimpleMessageHelper.java +++ /dev/null @@ -1,243 +0,0 @@ -package it.integry.integrywmsnative.view.dialogs.base; - -import android.app.Activity; -import android.app.Dialog; -import android.content.Context; -import android.content.res.ColorStateList; -import android.graphics.Color; -import android.graphics.Rect; -import android.graphics.drawable.ColorDrawable; -import android.graphics.drawable.Drawable; -import android.text.SpannableString; -import android.text.Spanned; -import android.view.LayoutInflater; -import android.view.Window; -import android.widget.LinearLayout; -import android.widget.RelativeLayout; -import android.widget.TextView; - -import androidx.annotation.StringRes; -import androidx.core.content.ContextCompat; -import androidx.core.content.res.ResourcesCompat; -import androidx.databinding.DataBindingUtil; - -import java.util.HashMap; - -import it.integry.integrywmsnative.R; -import it.integry.integrywmsnative.databinding.DialogBaseBinding; - -/** - * Created by GiuseppeS on 22/03/2018. - */ - -public class DialogSimpleMessageHelper { - - public enum TYPE { - INFO(1), - SUCCESS(2), - WARNING(3), - ERROR(4); - - private int value; - - TYPE(int value) { - this.value = value; - } - - public int getValue() { - return this.value; - } - - public static TYPE fromInt(int value) { - for (TYPE b : TYPE.values()) { - if (b.value == value) return b; - } - return null; - } - } - - private static Dialog makeBase(TYPE type, Context mContext, String titleText, Spanned messageText, HashMap hashmapContent, Runnable onPositiveClick, Runnable onNegativeClick, @StringRes Integer 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.light_blue_300); - titleIconRes = ResourcesCompat.getDrawable(mContext.getResources(), R.drawable.ic_info_78dp, null); - break; - - case SUCCESS: - colorBackgroundTitle = ContextCompat.getColor(mContext, R.color.green_300); - titleIconRes = ResourcesCompat.getDrawable(mContext.getResources(), R.drawable.ic_done_white_24dp, null); - break; - - case WARNING: - colorBackgroundTitle = ContextCompat.getColor(mContext, R.color.yellow_600); - titleIconRes = ResourcesCompat.getDrawable(mContext.getResources(), R.drawable.ic_warning_white_24dp, null); - break; - - case ERROR: - colorBackgroundTitle = ContextCompat.getColor(mContext, R.color.red_300); - titleIconRes = ResourcesCompat.getDrawable(mContext.getResources(), R.drawable.ic_mood_bad_24dp, null); - break; - } - - DialogSimpleMessageViewModel viewModel = new DialogSimpleMessageViewModel(dialog); - - viewModel - .setOnPositive(onPositiveClick) - .setOnNeutral(onNeutralClick) - .setOnNegative(onNegativeClick) - - .setPositiveButtonText(mContext.getText(R.string.ok).toString()) - .setNeutralButtonText(rNeutralButtonString != null && rNeutralButtonString != -1 ? mContext.getText(rNeutralButtonString).toString() : null) - .setNegativeButtonText(mContext.getText(R.string.no).toString()); - - - DialogBaseBinding mBinding = DataBindingUtil.inflate(LayoutInflater.from(mContext), R.layout.dialog_base, null, false); - - mBinding.setViewmodel(viewModel); - - - Rect displayRectangle = new Rect(); - Window window = ((Activity) mContext).getWindow(); - window.getDecorView().getWindowVisibleDisplayFrame(displayRectangle); - mBinding.titleContainer.setMinimumWidth((int) (displayRectangle.width() * 0.8f)); - - - //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 - mBinding.descriptionText.setText(messageText); - - LinearLayout hashMapContainer = mBinding.dialogContentHashmap; - - if (hashmapContent != null) { - for (int i = 0; i < hashmapContent.keySet().size(); i++) { - String currentKey = hashmapContent.keySet().toArray()[i].toString(); - String currentValue = hashmapContent.get(currentKey); - - RelativeLayout singleMapContent = (RelativeLayout) inflater.inflate(R.layout.dialog_custom_content_hashmap_viewmodel, null); - ((TextView) singleMapContent.findViewById(R.id.dialog_content_hashmap_key)).setText(currentKey); - ((TextView) singleMapContent.findViewById(R.id.dialog_content_hashmap_value)).setText(currentValue); - - hashMapContainer.addView(singleMapContent); - } - } - - dialog.setCancelable(false); - dialog.setCanceledOnTouchOutside(false); - dialog.setContentView(mBinding.getRoot()); - dialog.getWindow().setBackgroundDrawable(new ColorDrawable(Color.TRANSPARENT)); - - return dialog; - } - - - public static Dialog makeInfoDialog(Context mContext, String titleText, Spanned messageText, HashMap hashmapContent, Runnable onPositiveClick) { - return makeBase(TYPE.INFO, - mContext, - titleText, - messageText, - hashmapContent, - onPositiveClick, - null, -1, null); - } - - - public static Dialog makeInfoDialog(Context mContext, String titleText, Spanned messageText, HashMap hashmapContent, Runnable onPositiveClick, Runnable onNegativeClick) { - return makeBase(TYPE.INFO, - mContext, - titleText, - messageText, - hashmapContent, - onPositiveClick, - onNegativeClick, -1, null); - } - - - public static Dialog makeSuccessDialog(Context mContext, String titleText, Spanned messageText, HashMap hashmapContent, Runnable onPositiveClick) { - return makeBase(TYPE.SUCCESS, - mContext, - titleText, - messageText, - hashmapContent, - onPositiveClick, - null, -1, null); - } - - - 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(), - messageText, - hashmapContent, - onPositiveClick, - () -> { - if (onNegativeClick != null) onNegativeClick.run(); - }, -1, null); - } - - - public static Dialog makeWarningDialog(Context mContext, Spanned messageText, HashMap hashmapContent, Runnable onPositiveClick) { - return makeBase(TYPE.WARNING, - mContext, - mContext.getText(R.string.warning).toString(), - messageText, - hashmapContent, - onPositiveClick, - null, -1, null); - } - - public static void showSimpleWarningDialog(Context context, String message) { - makeErrorDialog( - context, - new SpannableString(message), - null, - null).show(); - } - - public static Dialog makeErrorDialog(Context mContext, Spanned messageText, HashMap hashmapContent, Runnable onPositiveClick) { - - return makeBase(TYPE.ERROR, - mContext, - mContext.getText(R.string.ops).toString(), - messageText, - hashmapContent, - onPositiveClick, - null, -1, null); - } - - public static void showSimpleErrorDialog(Context context, String message) { - makeErrorDialog( - context, - new SpannableString(message), - null, - null).show(); - } - - public static Dialog makeErrorDialog(Context mContext, Spanned messageText, HashMap hashmapContent, Runnable onPositiveClick, @StringRes int rNeutralButtonString, Runnable onNeutralClick) { - - return makeBase(TYPE.ERROR, - mContext, - mContext.getText(R.string.ops).toString(), - messageText, - hashmapContent, - onPositiveClick, - null, rNeutralButtonString, onNeutralClick); - - } - - -} diff --git a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/base/DialogSimpleMessageView.java b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/base/DialogSimpleMessageView.java new file mode 100644 index 00000000..50edd5e8 --- /dev/null +++ b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/base/DialogSimpleMessageView.java @@ -0,0 +1,286 @@ +package it.integry.integrywmsnative.view.dialogs.base; + +import android.content.Context; +import android.content.res.ColorStateList; +import android.graphics.Color; +import android.graphics.drawable.ColorDrawable; +import android.graphics.drawable.Drawable; +import android.os.Bundle; +import android.text.Spanned; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; +import android.widget.RelativeLayout; +import android.widget.TextView; + +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.annotation.StringRes; +import androidx.appcompat.widget.LinearLayoutCompat; +import androidx.core.content.ContextCompat; +import androidx.core.content.res.ResourcesCompat; +import androidx.databinding.DataBindingUtil; + +import java.util.HashMap; + +import it.integry.integrywmsnative.R; +import it.integry.integrywmsnative.core.expansion.BaseDialogFragment; +import it.integry.integrywmsnative.core.utility.UtilityDialog; +import it.integry.integrywmsnative.core.utility.UtilityResources; +import it.integry.integrywmsnative.databinding.DialogBaseBinding; + +/** + * Created by GiuseppeS on 22/03/2018. + */ + +public class DialogSimpleMessageView extends BaseDialogFragment { + + public enum TYPE { + INFO(1), + SUCCESS(2), + WARNING(3), + ERROR(4); + + private int value; + + TYPE(int value) { + this.value = value; + } + + public int getValue() { + return this.value; + } + + public static TYPE fromInt(int value) { + for (TYPE b : TYPE.values()) { + if (b.value == value) return b; + } + return null; + } + } + + + private final TYPE mType; + private final String mTitleText; + private final Spanned mMessageText; + private final HashMap mHashmapContent; + private final Runnable mOnPositiveClick; + private final Runnable mOnNegativeClick; + private final @StringRes Integer mRNeutralButtonString; + private final Runnable mOnNeutralClick; + + + private String positiveButtonText; + private String neutralButtonText; + private String negativeButtonText; + + + private DialogBaseBinding mBindings; + private Context mContext; + + public static DialogSimpleMessageView newInstance(@NonNull TYPE type, @NonNull String titleText, @NonNull Spanned messageText, HashMap hashmapContent , Runnable onPositiveClick, Runnable onNegativeClick, @StringRes Integer rNeutralButtonString, Runnable onNeutralClick) { + return new DialogSimpleMessageView(type, titleText, messageText, hashmapContent, onPositiveClick, onNegativeClick, rNeutralButtonString, onNeutralClick); + } + + private DialogSimpleMessageView(@NonNull TYPE type, @NonNull String titleText, @NonNull Spanned messageText, HashMap hashmapContent , Runnable onPositiveClick, Runnable onNegativeClick, @StringRes Integer rNeutralButtonString, Runnable onNeutralClick) { + super(); + + this.mType = type; + this.mTitleText = titleText; + this.mMessageText = messageText; + this.mHashmapContent = hashmapContent; + this.mOnPositiveClick = onPositiveClick; + this.mOnNegativeClick = onNegativeClick; + this.mRNeutralButtonString = rNeutralButtonString; + this.mOnNeutralClick = onNeutralClick; + } + + @Override + public void onStart() { + super.onStart(); + + UtilityDialog.setTo90PercentWidth(this.mContext, this); + } + + @Nullable + @Override + public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) { + this.mContext = getActivity(); + + mBindings = DataBindingUtil.inflate(inflater, R.layout.dialog_base, container, false); + + mBindings.setView(this); + mBindings.setLifecycleOwner(this); + + getDialog().setCanceledOnTouchOutside(false); + getDialog().getWindow().setBackgroundDrawable(new ColorDrawable(Color.TRANSPARENT)); + + int colorBackgroundTitle = -1; + Drawable titleIconRes = null; + + switch (mType) { + case INFO: + colorBackgroundTitle = ContextCompat.getColor(mContext, R.color.light_blue_300); + titleIconRes = ResourcesCompat.getDrawable(mContext.getResources(), R.drawable.ic_info_78dp, null); + break; + + case SUCCESS: + colorBackgroundTitle = ContextCompat.getColor(mContext, R.color.green_300); + titleIconRes = ResourcesCompat.getDrawable(mContext.getResources(), R.drawable.ic_done_white_24dp, null); + break; + + case WARNING: + colorBackgroundTitle = ContextCompat.getColor(mContext, R.color.yellow_600); + titleIconRes = ResourcesCompat.getDrawable(mContext.getResources(), R.drawable.ic_warning_white_24dp, null); + break; + + case ERROR: + colorBackgroundTitle = ContextCompat.getColor(mContext, R.color.red_300); + titleIconRes = ResourcesCompat.getDrawable(mContext.getResources(), R.drawable.ic_mood_bad_24dp, null); + break; + } + + this.positiveButtonText = mContext.getText(R.string.ok).toString(); + this.negativeButtonText = mContext.getText(R.string.no).toString(); + + //Title VIEW + mBindings.titleText.setText(mTitleText); + ColorStateList colorStateList = ColorStateList.valueOf(Color.WHITE); + mBindings.titleIcon.setImageTintList(colorStateList); + mBindings.titleIcon.setImageDrawable(titleIconRes); + + mBindings.titleContainer.setBackgroundColor(colorBackgroundTitle); + + //Content View + mBindings.descriptionText.setText(mMessageText); + + LinearLayoutCompat hashMapContainer = mBindings.dialogContentHashmap; + + if (mHashmapContent != null) { + for (int i = 0; i < mHashmapContent.keySet().size(); i++) { + String currentKey = mHashmapContent.keySet().toArray()[i].toString(); + String currentValue = mHashmapContent.get(currentKey); + + RelativeLayout singleMapContent = (RelativeLayout) inflater.inflate(R.layout.dialog_custom_content_hashmap_viewmodel, null); + ((TextView) singleMapContent.findViewById(R.id.dialog_content_hashmap_key)).setText(currentKey); + ((TextView) singleMapContent.findViewById(R.id.dialog_content_hashmap_value)).setText(currentValue); + + hashMapContainer.addView(singleMapContent); + } + } + + return mBindings.getRoot(); + } + + + public boolean isPositiveVisible() { + return mOnPositiveClick != null; + } + + public boolean isNeutralVisible() { + return mOnNeutralClick != null; + } + + public boolean isNegativeVisible() { + return mOnNegativeClick != null; + } + + + public String getPositiveButtonText() { + return positiveButtonText; + } + + public String getNeutralButtonText() { + return mRNeutralButtonString != null && mRNeutralButtonString != -1 ? mContext.getText(mRNeutralButtonString).toString() : null; + } + + public String getNegativeButtonText() { + return negativeButtonText; + } + + public void onPositiveClick() { + if(mOnPositiveClick != null) mOnPositiveClick.run(); + } + + public void onNeutralClick() { + if(mOnNeutralClick != null) mOnNeutralClick.run(); + } + + public void onNegativeClick() { + if(mOnNegativeClick != null) mOnNegativeClick.run(); + } + + public static DialogSimpleMessageView makeInfoDialog(String titleText, Spanned messageText, HashMap hashmapContent, Runnable onPositiveClick) { + return newInstance(TYPE.INFO, + titleText, + messageText, + hashmapContent, + onPositiveClick, + null, -1, null); + } + + + public static DialogSimpleMessageView makeInfoDialog(String titleText, Spanned messageText, HashMap hashmapContent, Runnable onPositiveClick, Runnable onNegativeClick) { + return newInstance(TYPE.INFO, + titleText, + messageText, + hashmapContent, + onPositiveClick, + onNegativeClick, -1, null); + } + + + public static DialogSimpleMessageView makeSuccessDialog(String titleText, Spanned messageText, HashMap hashmapContent, Runnable onPositiveClick) { + return newInstance(TYPE.SUCCESS, + titleText, + messageText, + hashmapContent, + onPositiveClick, + null, -1, null); + } + + + public static DialogSimpleMessageView makeWarningDialog(Spanned messageText, HashMap hashmapContent, Runnable onPositiveClick, Runnable onNegativeClick) { + return newInstance(TYPE.WARNING, + UtilityResources.getString(R.string.warning), + messageText, + hashmapContent, + onPositiveClick, + () -> { + if (onNegativeClick != null) onNegativeClick.run(); + }, -1, null); + } + + + public static DialogSimpleMessageView makeWarningDialog(Spanned messageText, HashMap hashmapContent, Runnable onPositiveClick) { + return newInstance(TYPE.WARNING, + UtilityResources.getString(R.string.warning), + messageText, + hashmapContent, + onPositiveClick, + null, -1, null); + } + + public static DialogSimpleMessageView makeErrorDialog(Spanned messageText, HashMap hashmapContent, Runnable onPositiveClick) { + + return newInstance(TYPE.ERROR, + UtilityResources.getString(R.string.ops), + messageText, + hashmapContent, + onPositiveClick, + null, -1, null); + } + + public static DialogSimpleMessageView makeErrorDialog(Spanned messageText, HashMap hashmapContent, Runnable onPositiveClick, @StringRes int rNeutralButtonString, Runnable onNeutralClick) { + + return newInstance(TYPE.ERROR, + UtilityResources.getString(R.string.ops), + messageText, + hashmapContent, + onPositiveClick, + null, rNeutralButtonString, onNeutralClick); + + } + + +} 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 deleted file mode 100644 index 3a217b53..00000000 --- a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/base/DialogSimpleMessageViewModel.java +++ /dev/null @@ -1,91 +0,0 @@ -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; - - private String positiveButtonText; - private String neutralButtonText; - private String negativeButtonText; - - 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 String getPositiveButtonText() { - return positiveButtonText; - } - - public DialogSimpleMessageViewModel setPositiveButtonText(String positiveButtonText) { - this.positiveButtonText = positiveButtonText; - return this; - } - - public String getNeutralButtonText() { - return neutralButtonText; - } - - public DialogSimpleMessageViewModel setNeutralButtonText(String neutralButtonText) { - this.neutralButtonText = neutralButtonText; - return this; - } - - public String getNegativeButtonText() { - return negativeButtonText; - } - - public DialogSimpleMessageViewModel setNegativeButtonText(String negativeButtonText) { - this.negativeButtonText = negativeButtonText; - return this; - } - - 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/camera_barcode_reader/DialogCameraBarcodeReader.java b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/camera_barcode_reader/DialogCameraBarcodeReader.java index 09ffdd5a..785fe3e2 100644 --- a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/camera_barcode_reader/DialogCameraBarcodeReader.java +++ b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/camera_barcode_reader/DialogCameraBarcodeReader.java @@ -1,6 +1,5 @@ package it.integry.integrywmsnative.view.dialogs.camera_barcode_reader; -import android.app.Dialog; import android.content.Context; import android.graphics.Color; import android.graphics.drawable.ColorDrawable; @@ -53,7 +52,6 @@ public class DialogCameraBarcodeReader extends DialogFragment implements Barcode public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) { mBindings = DataBindingUtil.inflate(inflater, R.layout.dialog_camera_barcode_reader, container, false); - UtilityDialog.setTo95PercentWidth(mContext, this); getDialog().setCanceledOnTouchOutside(false); getDialog().setCancelable(false); @@ -68,6 +66,13 @@ public class DialogCameraBarcodeReader extends DialogFragment implements Barcode return mBindings.getRoot(); } + @Override + public void onStart() { + super.onStart(); + + UtilityDialog.setTo95PercentWidth(mContext, this); + } + @Override public void onStop() { super.onStop(); diff --git a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/input_quantity_v2/DialogInputQuantityV2View.java b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/input_quantity_v2/DialogInputQuantityV2View.java index fc527cb5..d115eb93 100644 --- a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/input_quantity_v2/DialogInputQuantityV2View.java +++ b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/input_quantity_v2/DialogInputQuantityV2View.java @@ -41,7 +41,7 @@ import it.integry.integrywmsnative.core.model.MtbUntMis; import it.integry.integrywmsnative.core.utility.UtilityExceptions; import it.integry.integrywmsnative.core.utility.UtilityObservable; import it.integry.integrywmsnative.databinding.DialogInputQuantityV2Binding; -import it.integry.integrywmsnative.view.dialogs.base.DialogSimpleMessageHelper; +import it.integry.integrywmsnative.view.dialogs.base.DialogSimpleMessageView; public class DialogInputQuantityV2View extends BaseDialogFragment implements DialogInputQuantityV2ViewModel.Listener { @@ -66,7 +66,7 @@ public class DialogInputQuantityV2View extends BaseDialogFragment implements Dia public ObservableField enabledChangePartitaMag = new ObservableField<>(true); public ObservableField enabledLUCloseButton = new ObservableField<>(true); - public Context context; + private Context context; private DialogInputQuantityV2Binding mBindings; private boolean mEnableDataCallback = true; @@ -99,6 +99,7 @@ public class DialogInputQuantityV2View extends BaseDialogFragment implements Dia this.context = getActivity(); mBindings = DataBindingUtil.inflate(inflater, R.layout.dialog_input_quantity_v2, container, false); + mBindings.setLifecycleOwner(this); mBindings.toolbar.setTitle("Inserimento articolo"); @@ -356,6 +357,8 @@ public class DialogInputQuantityV2View extends BaseDialogFragment implements Dia @Override public void onError(Exception ex) { - DialogSimpleMessageHelper.makeErrorDialog(this.context, new SpannableString(Html.fromHtml(ex.getMessage())), null, null).show(); + DialogSimpleMessageView + .makeErrorDialog(new SpannableString(Html.fromHtml(ex.getMessage())), null, null) + .show(getActivity().getSupportFragmentManager(), "tag");; } } 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 38bb45b4..fcb64c3b 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 @@ -8,6 +8,7 @@ import android.text.SpannableString; import android.view.LayoutInflater; import android.view.View; +import androidx.appcompat.app.AppCompatActivity; import androidx.databinding.DataBindingUtil; import com.annimon.stream.Stream; @@ -31,7 +32,7 @@ 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.DialogCommon; -import it.integry.integrywmsnative.view.dialogs.base.DialogSimpleMessageHelper; +import it.integry.integrywmsnative.view.dialogs.base.DialogSimpleMessageView; import it.integry.integrywmsnative.view.dialogs.basket_lu.DialogBasketLU; public class DialogScanOrCreateLU { @@ -198,13 +199,13 @@ public class DialogScanOrCreateLU { } else { if(mtbColt.getCodDtip() != null && mShouldCheckIfExistDoc) { - DialogSimpleMessageHelper.makeWarningDialog(mContext, + DialogSimpleMessageView.makeWarningDialog( new SpannableString(mContext.getResources().getText(R.string.lu_already_attache_to_doc)), null, () -> { BarcodeManager.enable(); progressDialog.dismiss(); }) - .show(); + .show(((AppCompatActivity) mContext).getSupportFragmentManager(), "tag"); } else { BarcodeManager.enable(); @@ -231,17 +232,15 @@ public class DialogScanOrCreateLU { if(mtbColt != null) { if(mtbColt.getCodDtip() != null && mShouldCheckIfExistDoc) { - DialogSimpleMessageHelper.makeWarningDialog(mContext, - new SpannableString(mContext.getResources().getText(R.string.lu_already_attache_to_doc)), + DialogSimpleMessageView.makeWarningDialog(new SpannableString(mContext.getResources().getText(R.string.lu_already_attache_to_doc)), null, () -> { BarcodeManager.enable(); progressDialog.dismiss(); }) - .show(); + .show(((AppCompatActivity) mContext).getSupportFragmentManager(), "tag"); } else { if(mtbColt.getGestioneEnum() == GestioneEnum.VENDITA && mtbColt.getSegno() == -1) { - DialogSimpleMessageHelper.makeWarningDialog(mContext, - new SpannableString(mContext.getResources().getText(R.string.lu_gest_v_loading_alert)), + DialogSimpleMessageView.makeWarningDialog(new SpannableString(mContext.getResources().getText(R.string.lu_gest_v_loading_alert)), null, () -> { BarcodeManager.enable(); sendMtbColt(mtbColt, progressDialog, false); @@ -249,7 +248,7 @@ public class DialogScanOrCreateLU { BarcodeManager.enable(); progressDialog.dismiss(); }) - .show(); + .show(((AppCompatActivity) mContext).getSupportFragmentManager(), "tag"); } else { BarcodeManager.enable(); @@ -287,9 +286,10 @@ public class DialogScanOrCreateLU { private void showTooMuchULFound() { - DialogSimpleMessageHelper.makeWarningDialog(mContext, + DialogSimpleMessageView.makeWarningDialog( new SpannableString(mContext.getResources().getText(R.string.too_much_lu_found_message_in_mono_lu)), - null, null).show(); + null, null) + .show(((AppCompatActivity) mContext).getSupportFragmentManager(), "tag"); } private void sendMtbColt(MtbColt mtbColtToSend, Dialog progressDialog, boolean created) { diff --git a/app/src/main/res/layout/dialog_base.xml b/app/src/main/res/layout/dialog_base.xml index 6b7ddd31..d9d9947b 100644 --- a/app/src/main/res/layout/dialog_base.xml +++ b/app/src/main/res/layout/dialog_base.xml @@ -7,22 +7,21 @@ + name="view" + type="it.integry.integrywmsnative.view.dialogs.base.DialogSimpleMessageView" /> - - @@ -38,207 +37,193 @@ android:id="@+id/title_icon" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:src="@drawable/ic_error_white_24dp" - android:layout_margin="24dp"/> + android:layout_margin="24dp" + android:src="@drawable/ic_error_white_24dp" /> - + android:paddingEnd="16dp" + android:paddingBottom="16dp"> - - - + + + + + - - - - + android:paddingLeft="12dp" + android:paddingRight="12dp"> - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + android:visibility="@{view.negativeVisible && !view.neutralVisible ? View.VISIBLE : View.GONE}"> + + + + + + + + + + + + + + + + + + + + + + + + + + app:layout_constraintGuide_percent="0.33" /> + app:layout_constraintGuide_percent="0.66" /> + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toTopOf="parent" /> + app:layout_constraintStart_toStartOf="@id/left_buttons_guideline" + app:layout_constraintTop_toTopOf="parent" + app:strokeColor="@color/colorPrimary" /> + app:layout_constraintStart_toStartOf="@id/right_buttons_guideline" + app:layout_constraintTop_toTopOf="parent" /> @@ -247,50 +232,49 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="8dp" - android:visibility="@{!viewmodel.negativeVisible && viewmodel.neutralVisible ? View.VISIBLE : View.GONE}"> + android:visibility="@{!view.negativeVisible && view.neutralVisible ? View.VISIBLE : View.GONE}"> + app:layout_constraintGuide_percent="0.5" /> + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toTopOf="parent" + app:strokeColor="@color/colorPrimary" /> + app:layout_constraintStart_toStartOf="@id/center_guideline2" + app:layout_constraintTop_toTopOf="parent" /> - - + - +