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 88ac8beb..bd64ba2b 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 @@ -1,9 +1,13 @@ package it.integry.integrywmsnative.view.dialogs.scan_or_create_lu; +import android.app.Dialog; import android.app.ProgressDialog; import android.content.Context; import androidx.databinding.DataBindingUtil; import androidx.appcompat.app.AlertDialog; + +import android.graphics.Color; +import android.graphics.drawable.ColorDrawable; import android.text.SpannableString; import android.view.LayoutInflater; import android.view.View; @@ -33,7 +37,7 @@ public class DialogScanOrCreateLU { private Context currentContext; - private AlertDialog currentAlert; + private Dialog mDialog; private DialogScanOrCreateLuBinding mBinding; @@ -42,12 +46,12 @@ public class DialogScanOrCreateLU { private MtbColt currentMtbColt; - public static AlertDialog make(final Context context, RunnableArgs onDialogDismiss) { - return new DialogScanOrCreateLU(context, false, onDialogDismiss).currentAlert; + public static Dialog make(final Context context, RunnableArgs onDialogDismiss) { + return new DialogScanOrCreateLU(context, false, onDialogDismiss).mDialog; } - public static AlertDialog make(final Context context, boolean disableCreation, RunnableArgs onDialogDismiss) { - return new DialogScanOrCreateLU(context, disableCreation, onDialogDismiss).currentAlert; + public static Dialog make(final Context context, boolean disableCreation, RunnableArgs onDialogDismiss) { + return new DialogScanOrCreateLU(context, disableCreation, onDialogDismiss).mDialog; } private DialogScanOrCreateLU(Context context, boolean disableCreation, RunnableArgs onDialogDismiss) { @@ -62,11 +66,11 @@ public class DialogScanOrCreateLU { if(disableCreation) mBinding.dialogScanOrCreateLuCreationLayout.setVisibility(View.GONE); - final AlertDialog.Builder alertDialog = new AlertDialog.Builder(context) - .setView(mBinding.getRoot()); - - currentAlert = alertDialog.create(); - currentAlert.setCanceledOnTouchOutside(false); + mDialog = new Dialog(context); + mDialog.setContentView(mBinding.getRoot()); + mDialog.setCanceledOnTouchOutside(false); +// mDialog.setCancelable(false); + mDialog.getWindow().setBackgroundDrawable(new ColorDrawable(Color.TRANSPARENT)); init(onDialogDismiss); initBarcode(context); @@ -93,7 +97,7 @@ public class DialogScanOrCreateLU { .setOnScanSuccessfull(onScanSuccessfull) .setOnScanFailed(ex -> UtilityExceptions.defaultException(context, ex, false))); - currentAlert.setOnDismissListener(dialog -> { + mDialog.setOnDismissListener(dialog -> { BarcodeManager.removeCallback(barcodeIstanceID); BarcodeManager.enable(); if(currentMtbColt == null) { @@ -244,7 +248,7 @@ public class DialogScanOrCreateLU { private void sendMtbColt(MtbColt mtbColtToSend, ProgressDialog progressDialog) { currentMtbColt = mtbColtToSend; progressDialog.dismiss(); - currentAlert.dismiss(); + mDialog.dismiss(); mOnDialogDismiss.run(mtbColtToSend); } diff --git a/app/src/main/res/layout/dialog_scan_or_create_lu.xml b/app/src/main/res/layout/dialog_scan_or_create_lu.xml index a0049a81..4b2f8fce 100644 --- a/app/src/main/res/layout/dialog_scan_or_create_lu.xml +++ b/app/src/main/res/layout/dialog_scan_or_create_lu.xml @@ -1,68 +1,138 @@ - - + + + android:layout_gravity="center_horizontal" + app:cardCornerRadius="12dp" + app:cardElevation="0dp"> + + + + + + + + + + + android:padding="24dp"> - + style="@style/TextViewMaterial.DialogTitle" + android:text="@string/title_open_lu" + android:gravity="center_horizontal"/> - - - - - - - - - + android:orientation="vertical" + android:layout_marginTop="16dp"> + + - + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index aa6e72e9..54444e20 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -193,4 +193,6 @@ Posizionamento VerrĂ  stampata una %s + Crea nuova UL + Apri UL \ No newline at end of file diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 8e6ff18f..9d344e1e 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -197,5 +197,7 @@ Placement A %s will be printed + Create new LU + Open LU