diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser index ebe421f9..8df4dbec 100644 Binary files a/.idea/caches/build_file_checksums.ser and b/.idea/caches/build_file_checksums.ser differ diff --git a/app/build.gradle b/app/build.gradle index 0c245163..16d0264e 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -17,8 +17,8 @@ apply plugin: 'com.google.gms.google-services' android { - def appVersionCode = 42 - def appVersionName = '1.0.39' + def appVersionCode = 43 + def appVersionName = '1.0.40' signingConfigs { release { diff --git a/app/src/main/java/it/integry/integrywmsnative/MainActivity.java b/app/src/main/java/it/integry/integrywmsnative/MainActivity.java index 4c15198a..ffdb7e6e 100644 --- a/app/src/main/java/it/integry/integrywmsnative/MainActivity.java +++ b/app/src/main/java/it/integry/integrywmsnative/MainActivity.java @@ -208,6 +208,9 @@ public class MainActivity extends AppCompatActivity if(fragment instanceof IScrollableFragment) { ((IScrollableFragment) fragment).setScrollToolbar(mBinding.appBarMain.elevatedToolbar); + ((IScrollableFragment) fragment).setOnPreDestroy(() -> { + mBinding.appBarMain.elevatedToolbar.resetAll(); + }); } if(fragment instanceof ISelectAllFragment && ((ISelectAllFragment)fragment).isEnabled()) { diff --git a/app/src/main/java/it/integry/integrywmsnative/core/interfaces/IScrollableFragment.java b/app/src/main/java/it/integry/integrywmsnative/core/interfaces/IScrollableFragment.java index 7fde4694..1d295d8d 100644 --- a/app/src/main/java/it/integry/integrywmsnative/core/interfaces/IScrollableFragment.java +++ b/app/src/main/java/it/integry/integrywmsnative/core/interfaces/IScrollableFragment.java @@ -6,4 +6,6 @@ public interface IScrollableFragment { void setScrollToolbar(ElevatedToolbar toolbar); + void setOnPreDestroy(Runnable onPreDestroy); + } 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 77a0cdb0..8eca2b68 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 @@ -49,6 +49,7 @@ import it.integry.integrywmsnative.view.dialogs.base.DialogSimpleMessageHelper; public class MainAccettazioneFragment extends Fragment implements ISearcableFragment, ITitledFragment, IScrollableFragment { + private Runnable mOnPreDestroy; private ElevatedToolbar mToolbar; private FragmentMainAccettazioneBinding mBinding; @@ -112,6 +113,11 @@ public class MainAccettazioneFragment extends Fragment implements ISearcableFrag return mBinding.getRoot(); } + @Override + public void onDestroy() { + if(mOnPreDestroy != null) mOnPreDestroy.run(); + super.onDestroy(); + } @@ -166,6 +172,7 @@ public class MainAccettazioneFragment extends Fragment implements ISearcableFrag return groupedOrdine; }) .distinctBy(x -> x.codAnagForn + "_" + x.nomeFornitore) + .sortBy(x -> x.nomeFornitore) .toList(); @@ -339,4 +346,9 @@ public class MainAccettazioneFragment extends Fragment implements ISearcableFrag public void setScrollToolbar(ElevatedToolbar toolbar) { mToolbar = toolbar; } + + @Override + public void setOnPreDestroy(Runnable onPreDestroy) { + mOnPreDestroy = onPreDestroy; + } } diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_ordine_inevaso/viewmodel/AccettazioneOnOrdineAccettazioneInevasoViewModel.java b/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_ordine_inevaso/viewmodel/AccettazioneOnOrdineAccettazioneInevasoViewModel.java index d7c97e89..84400e7d 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_ordine_inevaso/viewmodel/AccettazioneOnOrdineAccettazioneInevasoViewModel.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_ordine_inevaso/viewmodel/AccettazioneOnOrdineAccettazioneInevasoViewModel.java @@ -396,7 +396,7 @@ public class AccettazioneOnOrdineAccettazioneInevasoViewModel implements IOnColl } ProgressDialog finalProgress = progress; - NoteAggiuntiveNuovaULDialog.show(mActivity, new NoteAggiuntiveNuovaULDialog.Callback() { + NoteAggiuntiveNuovaULDialog.make(mActivity, new NoteAggiuntiveNuovaULDialog.Callback() { @Override public void onSuccess(String noteString) { @@ -507,7 +507,7 @@ public class AccettazioneOnOrdineAccettazioneInevasoViewModel implements IOnColl public void onAbort() { finalProgress.dismiss(); } - }); + }).show(); } diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_ordine_inevaso/views/NoteAggiuntiveNuovaULDialog.java b/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_ordine_inevaso/views/NoteAggiuntiveNuovaULDialog.java index 79e5a62d..6133b8c2 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_ordine_inevaso/views/NoteAggiuntiveNuovaULDialog.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_ordine_inevaso/views/NoteAggiuntiveNuovaULDialog.java @@ -1,59 +1,57 @@ package it.integry.integrywmsnative.gest.accettazione_ordine_inevaso.views; +import android.app.Dialog; import android.content.Context; import com.google.android.material.textfield.TextInputEditText; import androidx.appcompat.app.AlertDialog; + +import android.graphics.Color; +import android.graphics.drawable.ColorDrawable; +import android.view.LayoutInflater; import android.view.ViewGroup; import android.widget.RelativeLayout; +import androidx.databinding.DataBindingUtil; import it.integry.integrywmsnative.R; import it.integry.integrywmsnative.core.utility.UtilityDimension; +import it.integry.integrywmsnative.databinding.DialogNoteAggiuntiveNuovaUlBinding; public class NoteAggiuntiveNuovaULDialog { + private Dialog currentDialog; + public interface Callback { void onSuccess(String noteString); void onAbort(); } + public static Dialog make(Context context, final Callback callback) { + return new NoteAggiuntiveNuovaULDialog(context, callback).currentDialog; + } - public static void show(Context mContext, final Callback callback){ + private NoteAggiuntiveNuovaULDialog(Context context, final Callback callback){ - RelativeLayout relativeLayout = new RelativeLayout(mContext); + LayoutInflater inflater = (LayoutInflater) context.getSystemService( Context.LAYOUT_INFLATER_SERVICE ); + DialogNoteAggiuntiveNuovaUlBinding bindings = DataBindingUtil.inflate(inflater, R.layout.dialog_note_aggiuntive_nuova_ul, null, false); - relativeLayout.setLayoutParams( - new RelativeLayout.LayoutParams( - RelativeLayout.LayoutParams.MATCH_PARENT, - RelativeLayout.LayoutParams.MATCH_PARENT)); + currentDialog = new Dialog(context); + currentDialog.setContentView(bindings.getRoot()); - relativeLayout.setPadding(UtilityDimension.convertSizeToDP(mContext, 22), - UtilityDimension.convertSizeToDP(mContext, 8), - UtilityDimension.convertSizeToDP(mContext, 24), - 0); + currentDialog.setCanceledOnTouchOutside(false); + currentDialog.setCancelable(false); + currentDialog.getWindow().setBackgroundDrawable(new ColorDrawable(Color.TRANSPARENT)); - final TextInputEditText mTextInputEditText = new TextInputEditText(mContext); - mTextInputEditText.setHint(R.string.hint_additional_notes); + bindings.buttonConfirm.setOnClickListener(v -> { + currentDialog.dismiss(); + callback.onSuccess(bindings.additionalNotesText.getText().toString()); + }); - ViewGroup.LayoutParams layoutParams = new ViewGroup.LayoutParams( - ViewGroup.LayoutParams.MATCH_PARENT, - ViewGroup.LayoutParams.WRAP_CONTENT); + bindings.buttonAbort.setOnClickListener(v -> { + currentDialog.dismiss(); + callback.onAbort(); + }); - mTextInputEditText.setLayoutParams(layoutParams); - relativeLayout.addView(mTextInputEditText); - - AlertDialog dialog = new AlertDialog.Builder(mContext) - .setTitle(mContext.getText(R.string.action_create_ul)) - .setMessage(R.string.dialog_message_additional_notes) - - .setCancelable(false) - - .setView(relativeLayout) - - .setPositiveButton(R.string.confirm, (dialog1, which) -> callback.onSuccess(mTextInputEditText.getText().toString())) - .setNegativeButton(R.string.abort, (dialogInterface, i) -> callback.onAbort()) - .create(); - dialog.show(); } } diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/main/MainFragment.java b/app/src/main/java/it/integry/integrywmsnative/gest/main/MainFragment.java index d433b2b8..78d39ee5 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/main/MainFragment.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/main/MainFragment.java @@ -51,6 +51,7 @@ public class MainFragment extends Fragment implements ITitledFragment, IScrollab private FragmentMainBinding mBindings; + private Runnable mOnPreDestroy; private ElevatedToolbar mToolbar; public MainFragment() { @@ -83,6 +84,12 @@ public class MainFragment extends Fragment implements ITitledFragment, IScrollab return mBindings.getRoot(); } + @Override + public void onDestroy() { + if(mOnPreDestroy != null) mOnPreDestroy.run(); + super.onDestroy(); + } + private void init(){ ServerStatusChecker.getIstance().addCallback(value -> { @@ -214,4 +221,9 @@ public class MainFragment extends Fragment implements ITitledFragment, IScrollab public void setScrollToolbar(ElevatedToolbar toolbar) { mToolbar = toolbar; } + + @Override + public void setOnPreDestroy(Runnable onPreDestroy) { + mOnPreDestroy = onPreDestroy; + } } diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/vendita/MainVenditaFragment.java b/app/src/main/java/it/integry/integrywmsnative/gest/vendita/MainVenditaFragment.java index 07c2e2da..67ce3198 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/vendita/MainVenditaFragment.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/vendita/MainVenditaFragment.java @@ -55,6 +55,7 @@ import it.integry.integrywmsnative.view.dialogs.base.DialogSimpleMessageHelper; public class MainVenditaFragment extends Fragment implements ITitledFragment, IScrollableFragment, ISelectAllFragment, IFilterableFragment { + private Runnable mOnPreDestroy; private ElevatedToolbar mToolbar; private VenditaHelper mHelper; @@ -102,6 +103,7 @@ public class MainVenditaFragment extends Fragment implements ITitledFragment, IS @Override public void onDestroy() { + if(mOnPreDestroy != null) mOnPreDestroy.run(); BarcodeManager.removeCallback(barcodeScannerIstanceID); super.onDestroy(); } @@ -385,6 +387,11 @@ public class MainVenditaFragment extends Fragment implements ITitledFragment, IS mToolbar = toolbar; } + @Override + public void setOnPreDestroy(Runnable onPreDestroy) { + mOnPreDestroy = onPreDestroy; + } + @Override public boolean isEnabled() { return SettingsManager.iDB().isFlagMultiClienteOrdV(); diff --git a/app/src/main/java/it/integry/integrywmsnative/ui/ElevatedToolbar.java b/app/src/main/java/it/integry/integrywmsnative/ui/ElevatedToolbar.java index f4a8b165..581c1f20 100644 --- a/app/src/main/java/it/integry/integrywmsnative/ui/ElevatedToolbar.java +++ b/app/src/main/java/it/integry/integrywmsnative/ui/ElevatedToolbar.java @@ -2,6 +2,7 @@ package it.integry.integrywmsnative.ui; import android.animation.ObjectAnimator; import android.animation.StateListAnimator; +import android.app.Activity; import android.content.Context; import android.util.AttributeSet; import android.util.Log; @@ -78,6 +79,7 @@ public class ElevatedToolbar extends CardView { if(mRecyclerView != null) { mRecyclerView.setOnScrollListener(recyclerViewScrollListener); + } else { Log.e("ElevatedToolbar", "RecyclerView is NULL"); } @@ -86,8 +88,6 @@ public class ElevatedToolbar extends CardView { public void removeRecyclerViewScrollListener(){ if(mRecyclerView != null) { mRecyclerView.setOnScrollListener(null); - } else { - Log.e("ElevatedToolbar", "REMOVE: RecyclerView is NULL"); } } @@ -118,8 +118,6 @@ public class ElevatedToolbar extends CardView { public void removeScrollViewScrollListener(){ if(mScrollView != null) { mScrollView.getViewTreeObserver().removeOnScrollChangedListener(scrollViewScrollListener); - } else { - Log.e("ElevatedToolbar", "REMOVE: ScrollView is NULL"); } } @@ -151,8 +149,6 @@ public class ElevatedToolbar extends CardView { public void removeNestedScrollViewListener() { if(mNestedScrollView != null) { mNestedScrollView.setOnScrollChangeListener((NestedScrollView.OnScrollChangeListener) null); - } else { - Log.e("ElevatedToolbar", "REMOVE: NestedScrollView is NULL"); } } diff --git a/app/src/main/res/drawable/ic_filter_list_24dp_black.xml b/app/src/main/res/drawable/ic_filter_list_24dp_black.xml new file mode 100644 index 00000000..2d5ef68e --- /dev/null +++ b/app/src/main/res/drawable/ic_filter_list_24dp_black.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/layout/activity_accettazione_ordine_inevaso.xml b/app/src/main/res/layout/activity_accettazione_ordine_inevaso.xml index 666f22e6..30d9ae3f 100644 --- a/app/src/main/res/layout/activity_accettazione_ordine_inevaso.xml +++ b/app/src/main/res/layout/activity_accettazione_ordine_inevaso.xml @@ -39,8 +39,9 @@ + android:layout_width="match_parent" + app:popupTheme="@style/ThemeOverlay.AppCompat.Light" + app:layout_collapseMode="pin"> diff --git a/app/src/main/res/layout/dialog_note_aggiuntive_nuova_ul.xml b/app/src/main/res/layout/dialog_note_aggiuntive_nuova_ul.xml new file mode 100644 index 00000000..8468bd05 --- /dev/null +++ b/app/src/main/res/layout/dialog_note_aggiuntive_nuova_ul.xml @@ -0,0 +1,131 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/menu/activity_accettazione_ordine_inevaso.xml b/app/src/main/res/menu/activity_accettazione_ordine_inevaso.xml index ab7682c2..6ab69ecc 100644 --- a/app/src/main/res/menu/activity_accettazione_ordine_inevaso.xml +++ b/app/src/main/res/menu/activity_accettazione_ordine_inevaso.xml @@ -4,7 +4,7 @@ \ No newline at end of file