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 40678e0e..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(); + } @@ -340,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/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/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