Modificata icona ordinamento articoli in accetazione (colore nero).

Aggiunto onDestroy in ElevatedToolbar

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()) {

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);
+
 }

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;
+    }
 }

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;
+    }
 }

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();

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");
         }
     }
 

app/src/main/res/drawable/ic_filter_list_24dp_black.xml

@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24.0"
+    android:viewportHeight="24.0">
+    <path
+        android:fillColor="#000000"
+        android:pathData="M10,18h4v-2h-4v2zM3,6v2h18L21,6L3,6zM6,13h12v-2L6,11v2z"/>
+</vector>

app/src/main/res/layout/activity_accettazione_ordine_inevaso.xml

@@ -39,8 +39,9 @@
                     <androidx.appcompat.widget.Toolbar
                         android:id="@+id/toolbar"
                         android:layout_height="?attr/actionBarSize"
-                        app:layout_collapseMode="pin"
+                        android:layout_width="match_parent"
-                        android:layout_width="match_parent">
+                        app:popupTheme="@style/ThemeOverlay.AppCompat.Light"
+                        app:layout_collapseMode="pin">
                     </androidx.appcompat.widget.Toolbar>
 
                 </com.google.android.material.appbar.AppBarLayout>

app/src/main/res/menu/activity_accettazione_ordine_inevaso.xml

@@ -4,7 +4,7 @@
 
     <item
         android:id="@+id/action_filter"
-        android:icon="@drawable/ic_filter_list_24dp"
+        android:icon="@drawable/ic_filter_list_24dp_black"
         android:title="@string/action_orderBy"
         app:showAsAction="ifRoom"/>
 </menu>