From bf1fc455e1a8e0ae742f9489e22c976f3c944fde Mon Sep 17 00:00:00 2001 From: GiuseppeS Date: Wed, 5 Oct 2022 15:58:09 +0200 Subject: [PATCH 1/2] fix su dialog vari --- .../RettificaGiacenzeFragment.java | 11 +- .../gest/spedizione/SpedizioneActivity.java | 5 +- .../dialogs/base/DialogSimpleMessageView.java | 4 +- .../DialogChooseArtFromListaArts.java | 80 -------------- .../DialogChooseArtFromListaArtsView.java | 73 +++++++++++++ .../DialogInputQuantityV2View.java | 10 ++ .../DialogScanOrCreateLUView.java | 2 +- .../main/res/drawable/badge_round_corner.xml | 2 +- .../dialog_input_quantity_v2.xml | 2 + .../layout/bottom_sheet__mtb_colr_edit.xml | 2 +- .../dialog_choose_art_from_lista_art.xml | 61 ++++------- ..._choose_art_from_lista_art__item_model.xml | 100 +++++++++--------- .../res/layout/dialog_input_quantity_v2.xml | 2 + .../fragment_main_rettifica_giacenze.xml | 81 ++++++-------- app/src/main/res/values/styles.xml | 3 + 15 files changed, 209 insertions(+), 229 deletions(-) delete mode 100644 app/src/main/java/it/integry/integrywmsnative/view/dialogs/choose_art_from_lista_arts/DialogChooseArtFromListaArts.java create mode 100644 app/src/main/java/it/integry/integrywmsnative/view/dialogs/choose_art_from_lista_arts/DialogChooseArtFromListaArtsView.java 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 60cb2914..3f19c8aa 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 @@ -59,7 +59,7 @@ import it.integry.integrywmsnative.view.dialogs.DialogConsts; import it.integry.integrywmsnative.view.dialogs.DialogProgressView; import it.integry.integrywmsnative.view.dialogs.ask_position_of_lu.DialogAskPositionOfLU; 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.choose_art_from_lista_arts.DialogChooseArtFromListaArtsView; 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.DialogScanOrCreateLUView; @@ -157,8 +157,8 @@ public class RettificaGiacenzeFragment extends BaseFragment implements ITitledFr mBinding.rettificaGiacenzeMainList.setHasFixedSize(true); mBinding.rettificaGiacenzeMainList.setLayoutManager(new LinearLayoutManager(getActivity())); - SimpleDividerItemDecoration itemDecorator = new SimpleDividerItemDecoration(getActivity(), SimpleDividerItemDecoration.VERTICAL); - itemDecorator.setDrawable(ContextCompat.getDrawable(getActivity(), R.drawable.divider)); + SimpleDividerItemDecoration itemDecorator = new SimpleDividerItemDecoration(requireActivity(), SimpleDividerItemDecoration.VERTICAL); + itemDecorator.setDrawable(ContextCompat.getDrawable(requireActivity(), R.drawable.divider)); mBinding.rettificaGiacenzeMainList.addItemDecoration(itemDecorator); } @@ -289,7 +289,8 @@ public class RettificaGiacenzeFragment extends BaseFragment implements ITitledFr @Override public void onArtListLoaded(ArrayList artList, RunnableArgs onArtChoosed) { - DialogChooseArtFromListaArts.make(getActivity(), artList, onArtChoosed).show(); + new DialogChooseArtFromListaArtsView(artList, onArtChoosed) + .show(requireActivity().getSupportFragmentManager(), "tag"); } @Override @@ -300,7 +301,7 @@ public class RettificaGiacenzeFragment extends BaseFragment implements ITitledFr } else { onComplete.run(mtbColt, created); } - }).show(getActivity().getSupportFragmentManager(), "tag"); + }).show(requireActivity().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 ff9d9ca6..9c8c42e0 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 @@ -72,7 +72,7 @@ import it.integry.integrywmsnative.view.dialogs.ask_position_of_lu.DialogAskPosi 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.DialogSimpleMessageView; -import it.integry.integrywmsnative.view.dialogs.choose_art_from_lista_arts.DialogChooseArtFromListaArts; +import it.integry.integrywmsnative.view.dialogs.choose_art_from_lista_arts.DialogChooseArtFromListaArtsView; import it.integry.integrywmsnative.view.dialogs.choose_batch_lot.DialogChooseBatchLotView; import it.integry.integrywmsnative.view.dialogs.info_aggiuntive_lu.InfoAggiuntiveLUDialog; import it.integry.integrywmsnative.view.dialogs.input_peso_lu.DialogInputPesoLuView; @@ -936,7 +936,8 @@ public class SpedizioneActivity extends BaseActivity implements SpedizioneViewMo @Override public void onChooseArtRequest(List artsList, RunnableArgs onComplete) { - DialogChooseArtFromListaArts.make(this, artsList, onComplete).show(); + new DialogChooseArtFromListaArtsView(artsList, onComplete) + .show(getSupportFragmentManager(), "tag"); } @Override 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 index e33913e2..6189f6b9 100644 --- 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 @@ -116,7 +116,7 @@ public class DialogSimpleMessageView extends BaseDialogFragment { if (isPositiveVisible()) alertDialogBuilder.setPositiveButton(getPositiveButtonText(), (dialog, which) -> { - this.mOnPositiveClick.run(); + if(this.mOnPositiveClick != null) this.mOnPositiveClick.run(); }); if (isNeutralVisible()) @@ -194,7 +194,7 @@ public class DialogSimpleMessageView extends BaseDialogFragment { public boolean isPositiveVisible() { - return mOnPositiveClick != null; + return mOnPositiveClick != null || (!isNeutralVisible() && !isNegativeVisible()); } public boolean isNeutralVisible() { diff --git a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/choose_art_from_lista_arts/DialogChooseArtFromListaArts.java b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/choose_art_from_lista_arts/DialogChooseArtFromListaArts.java deleted file mode 100644 index 493b36a3..00000000 --- a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/choose_art_from_lista_arts/DialogChooseArtFromListaArts.java +++ /dev/null @@ -1,80 +0,0 @@ -package it.integry.integrywmsnative.view.dialogs.choose_art_from_lista_arts; - -import android.app.Dialog; -import android.content.Context; -import android.graphics.Color; -import android.graphics.drawable.ColorDrawable; -import android.view.LayoutInflater; - -import androidx.core.content.ContextCompat; -import androidx.databinding.DataBindingUtil; -import androidx.recyclerview.widget.LinearLayoutManager; - -import java.util.List; - -import it.integry.integrywmsnative.R; -import it.integry.integrywmsnative.core.expansion.RunnableArgs; -import it.integry.integrywmsnative.core.interfaces.IRecyclerItemClicked; -import it.integry.integrywmsnative.core.model.MtbAart; -import it.integry.integrywmsnative.core.utility.UtilityDialog; -import it.integry.integrywmsnative.databinding.DialogChooseArtFromListaArtBinding; -import it.integry.integrywmsnative.ui.SimpleDividerItemDecoration; - -public class DialogChooseArtFromListaArts { - - - private Context currentContext; - private Dialog mDialog; - - private DialogChooseArtFromListaArtsAdapter currentAdapter; - - private RunnableArgs mOnItemChoosed; - - public static Dialog make(final Context context, List listaArts, RunnableArgs onItemChoosed) { - return new DialogChooseArtFromListaArts(context, listaArts, onItemChoosed).mDialog; - } - - - private DialogChooseArtFromListaArts(Context context, List listaArts, RunnableArgs onItemChoosed) { - currentContext = context; - mOnItemChoosed = onItemChoosed; - - LayoutInflater inflater = (LayoutInflater) context.getSystemService( Context.LAYOUT_INFLATER_SERVICE ); - DialogChooseArtFromListaArtBinding bindings = DataBindingUtil.inflate(inflater, R.layout.dialog_choose_art_from_lista_art, null, false); - - mDialog = new Dialog(context); - - mDialog.setContentView(bindings.getRoot()); - - mDialog.setCanceledOnTouchOutside(false); - mDialog.getWindow().setBackgroundDrawable(new ColorDrawable(Color.TRANSPARENT)); - - UtilityDialog.setTo90PercentWidth(context, mDialog); - - initRecyclerView(bindings, listaArts); - } - - private void initRecyclerView(DialogChooseArtFromListaArtBinding binding, List dataset) { - binding.dialogChooseArtFromListaArtMainList.setNestedScrollingEnabled(false); - - binding.dialogChooseArtFromListaArtMainList.setHasFixedSize(true); - - binding.dialogChooseArtFromListaArtMainList.setLayoutManager(new LinearLayoutManager(currentContext)); - - SimpleDividerItemDecoration itemDecorator = new SimpleDividerItemDecoration(currentContext, SimpleDividerItemDecoration.VERTICAL); - itemDecorator.setDrawable(ContextCompat.getDrawable(currentContext, R.drawable.divider)); - binding.dialogChooseArtFromListaArtMainList.addItemDecoration(itemDecorator); - - currentAdapter = new DialogChooseArtFromListaArtsAdapter(currentContext, dataset, onItemClicked); - binding.dialogChooseArtFromListaArtMainList.setAdapter(currentAdapter); - } - - private IRecyclerItemClicked onItemClicked = (item, position) -> { - if(mOnItemChoosed != null) { - mOnItemChoosed.run(item); - } - - mDialog.dismiss(); - }; - -} diff --git a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/choose_art_from_lista_arts/DialogChooseArtFromListaArtsView.java b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/choose_art_from_lista_arts/DialogChooseArtFromListaArtsView.java new file mode 100644 index 00000000..89f4908e --- /dev/null +++ b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/choose_art_from_lista_arts/DialogChooseArtFromListaArtsView.java @@ -0,0 +1,73 @@ +package it.integry.integrywmsnative.view.dialogs.choose_art_from_lista_arts; + +import android.app.Dialog; +import android.os.Bundle; +import android.view.LayoutInflater; + +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.core.content.ContextCompat; +import androidx.fragment.app.DialogFragment; +import androidx.recyclerview.widget.LinearLayoutManager; + +import com.google.android.material.dialog.MaterialAlertDialogBuilder; + +import java.util.List; + +import it.integry.integrywmsnative.R; +import it.integry.integrywmsnative.core.expansion.RunnableArgs; +import it.integry.integrywmsnative.core.model.MtbAart; +import it.integry.integrywmsnative.databinding.DialogChooseArtFromListaArtBinding; +import it.integry.integrywmsnative.ui.SimpleDividerItemDecoration; + +public class DialogChooseArtFromListaArtsView extends DialogFragment { + + + private final List mListaArts; + private final RunnableArgs mOnItemChoosed; + + + public DialogChooseArtFromListaArtsView(List listaArts, RunnableArgs onItemChoosed) { + super(); + this.mListaArts = listaArts; + this.mOnItemChoosed = onItemChoosed; + } + + + @NonNull + @Override + public Dialog onCreateDialog(@Nullable Bundle savedInstanceState) { + var binding = DialogChooseArtFromListaArtBinding.inflate(LayoutInflater.from(requireContext())); + + initRecyclerView(binding, mListaArts); + + var alertDialog = new MaterialAlertDialogBuilder(requireContext()) + .setView(binding.getRoot()) + .setCancelable(false) + .create(); + + alertDialog.setCanceledOnTouchOutside(false); + return alertDialog; + } + + private void initRecyclerView(DialogChooseArtFromListaArtBinding binding, List dataset) { + binding.dialogChooseArtFromListaArtMainList.setNestedScrollingEnabled(false); + binding.dialogChooseArtFromListaArtMainList.setHasFixedSize(true); + binding.dialogChooseArtFromListaArtMainList.setLayoutManager(new LinearLayoutManager(requireContext())); + + SimpleDividerItemDecoration itemDecorator = new SimpleDividerItemDecoration(requireContext(), SimpleDividerItemDecoration.VERTICAL); + itemDecorator.setDrawable(ContextCompat.getDrawable(requireContext(), R.drawable.divider)); + binding.dialogChooseArtFromListaArtMainList.addItemDecoration(itemDecorator); + + DialogChooseArtFromListaArtsAdapter mCurrentAdapter = new DialogChooseArtFromListaArtsAdapter(requireContext(), dataset, + ((item, position) -> { + if (mOnItemChoosed != null) { + mOnItemChoosed.run(item); + } + + dismiss(); + })); + binding.dialogChooseArtFromListaArtMainList.setAdapter(mCurrentAdapter); + } + +} 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 b15686ed..3b396079 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 @@ -1,5 +1,6 @@ package it.integry.integrywmsnative.view.dialogs.input_quantity_v2; +import android.app.Dialog; import android.content.Context; import android.content.res.ColorStateList; import android.os.Bundle; @@ -10,6 +11,7 @@ import android.text.SpannableString; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; +import android.view.WindowManager; import android.view.inputmethod.EditorInfo; import androidx.annotation.NonNull; @@ -123,6 +125,14 @@ public class DialogInputQuantityV2View extends BaseDialogFragment implements Dia this.initBarcode(); } + @NonNull + @Override + public Dialog onCreateDialog(@Nullable Bundle savedInstanceState) { + var dialog = super.onCreateDialog(savedInstanceState); + dialog.getWindow().setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_ADJUST_RESIZE); + return dialog; + } + @Nullable @Override public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) { diff --git a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/scan_or_create_lu/DialogScanOrCreateLUView.java b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/scan_or_create_lu/DialogScanOrCreateLUView.java index a55dce7d..1716cef5 100644 --- a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/scan_or_create_lu/DialogScanOrCreateLUView.java +++ b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/scan_or_create_lu/DialogScanOrCreateLUView.java @@ -93,8 +93,8 @@ public class DialogScanOrCreateLUView extends BaseDialogFragment implements Dial this.mViewModel.init(mShouldCheckResiduo, mShouldCheckIfExistDoc, mEnableCreation); mBindings.createNewLuButton.setOnClickListener(v -> { - dismiss(); this.mViewModel.createNewLU(); +// dismiss(); }); mBindings.viewBasket.setOnClickListener(v -> { diff --git a/app/src/main/res/drawable/badge_round_corner.xml b/app/src/main/res/drawable/badge_round_corner.xml index cd319ab1..0e8c0074 100644 --- a/app/src/main/res/drawable/badge_round_corner.xml +++ b/app/src/main/res/drawable/badge_round_corner.xml @@ -8,5 +8,5 @@ android:right="6dp" android:top="1dp" /> - + \ No newline at end of file diff --git a/app/src/main/res/layout-land-hdpi/dialog_input_quantity_v2.xml b/app/src/main/res/layout-land-hdpi/dialog_input_quantity_v2.xml index c61d28fc..5452db46 100644 --- a/app/src/main/res/layout-land-hdpi/dialog_input_quantity_v2.xml +++ b/app/src/main/res/layout-land-hdpi/dialog_input_quantity_v2.xml @@ -295,6 +295,7 @@ android:backgroundTint="@color/light_blue_100" android:orientation="vertical" android:paddingHorizontal="8dp" + android:paddingVertical="4dp" android:visibility="@{viewmodel.totalNumCnfInWarehouse != null || viewmodel.totalQtaInWarehouse != null ? View.VISIBLE : View.GONE}"> @@ -394,6 +395,7 @@ android:backgroundTint="@color/light_blue_100" android:orientation="vertical" android:paddingHorizontal="8dp" + android:paddingVertical="4dp" android:visibility="@{viewmodel.totalNumCnfCommitted != null || viewmodel.totalQtaCommitted != null ? View.VISIBLE : View.GONE}"> diff --git a/app/src/main/res/layout/bottom_sheet__mtb_colr_edit.xml b/app/src/main/res/layout/bottom_sheet__mtb_colr_edit.xml index 4b28e597..af488e79 100644 --- a/app/src/main/res/layout/bottom_sheet__mtb_colr_edit.xml +++ b/app/src/main/res/layout/bottom_sheet__mtb_colr_edit.xml @@ -26,7 +26,7 @@ - + + android:orientation="vertical" + android:padding="16dp"> - + + - - - - + android:layout_marginBottom="16dp" + android:text="@string/dialog_choose_art_from_lista_art" /> - - - - - - - - - - + android:layout_height="match_parent" + tools:listitem="@layout/dialog_choose_art_from_lista_art__item_model" + tools:itemCount="5"/> diff --git a/app/src/main/res/layout/dialog_choose_art_from_lista_art__item_model.xml b/app/src/main/res/layout/dialog_choose_art_from_lista_art__item_model.xml index 811e9ff8..159d8ebf 100644 --- a/app/src/main/res/layout/dialog_choose_art_from_lista_art__item_model.xml +++ b/app/src/main/res/layout/dialog_choose_art_from_lista_art__item_model.xml @@ -1,74 +1,72 @@ - + + + + + + type="it.integry.integrywmsnative.core.model.MtbAart" /> + + android:paddingBottom="8dp" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" + android:background="?android:attr/selectableItemBackground"> - + + + + + + + + + - - - - - - - - - - - - - - - - + android:ellipsize="end" + android:text="@{mtbAart.descrizioneEstesa}" + android:textColor="@android:color/black" + android:textSize="16sp" + tools:text="Descrizione lunga articolo" /> + + \ No newline at end of file diff --git a/app/src/main/res/layout/dialog_input_quantity_v2.xml b/app/src/main/res/layout/dialog_input_quantity_v2.xml index c2c324c4..eec7a5c1 100644 --- a/app/src/main/res/layout/dialog_input_quantity_v2.xml +++ b/app/src/main/res/layout/dialog_input_quantity_v2.xml @@ -306,6 +306,7 @@ android:backgroundTint="@color/light_blue_100" android:orientation="vertical" android:paddingHorizontal="8dp" + android:paddingVertical="4dp" android:visibility="@{viewmodel.totalNumCnfInWarehouse != null || viewmodel.totalQtaInWarehouse != null ? View.VISIBLE : View.GONE}"> @@ -405,6 +406,7 @@ android:backgroundTint="@color/light_blue_100" android:orientation="vertical" android:paddingHorizontal="8dp" + android:paddingVertical="4dp" android:visibility="@{viewmodel.totalNumCnfCommitted != null || viewmodel.totalQtaCommitted != null ? View.VISIBLE : View.GONE}"> diff --git a/app/src/main/res/layout/fragment_main_rettifica_giacenze.xml b/app/src/main/res/layout/fragment_main_rettifica_giacenze.xml index 005bb94e..9e048f23 100644 --- a/app/src/main/res/layout/fragment_main_rettifica_giacenze.xml +++ b/app/src/main/res/layout/fragment_main_rettifica_giacenze.xml @@ -31,12 +31,12 @@ android:layout_width="match_parent" android:layout_height="match_parent"> - - - + android:backgroundTint="@color/colorPrimary" + android:orientation="horizontal"> + android:text="num:" + android:textColor="@android:color/white" /> - + - + android:padding="8dp"> - - - - + android:layout_height="wrap_content" + android:orientation="horizontal" + android:weightSum="10"> + android:layout_width="wrap_content" + android:layout_height="match_parent" + android:layout_weight="3" + app:hintTextAppearance="@style/hint_text"> + android:layout_weight="7" + app:hintTextAppearance="@style/hint_text"> - - - + + - + + android:scrollbarStyle="outsideOverlay" + tools:listitem="@layout/lista_rettifica_giacenze_model" /> + app:srcCompat="@drawable/ic_check_black_24dp" + app:visibility="@{view.thereIsAnOpenedUL}" /> - + + android:focusable="true" + android:visibility="gone" /> @android:color/white true @style/Animation.AppCompat.Dialog + false + @android:color/transparent + false From fb23009fcc1e54731f22154df3b8e7c3e80d38a8 Mon Sep 17 00:00:00 2001 From: ValerioC Date: Wed, 5 Oct 2022 16:20:03 +0200 Subject: [PATCH 2/2] -> v1.29.7 (311) --- app/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 246014bf..bccc041d 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -10,8 +10,8 @@ apply plugin: 'com.google.gms.google-services' android { - def appVersionCode = 310 - def appVersionName = '1.29.6' + def appVersionCode = 311 + def appVersionName = '1.29.7' signingConfigs { release {