From 01028f9888786ce21b25482939b84b120e121733 Mon Sep 17 00:00:00 2001
From: GiuseppeS <g.scorrano@integry.it>
Date: Thu, 2 Oct 2025 11:29:48 +0200
Subject: [PATCH 1/5] Rimossa tab bar dal main fragment

---
 .../gest/main/MainActivity.java               |  16 +-
 .../gest/main/MainFragment.java               |  94 +----
 .../res/drawable/easter_egg__horror_blood.xml |   9 -
 app/src/main/res/layout/fragment_main.xml     | 328 +++++++++---------
 4 files changed, 179 insertions(+), 268 deletions(-)
 delete mode 100644 app/src/main/res/drawable/easter_egg__horror_blood.xml

diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/main/MainActivity.java b/app/src/main/java/it/integry/integrywmsnative/gest/main/MainActivity.java
index 0d522fb4..ac8346cd 100644
--- a/app/src/main/java/it/integry/integrywmsnative/gest/main/MainActivity.java
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/main/MainActivity.java
@@ -102,7 +102,7 @@ public class MainActivity extends BaseActivity
 
         ActionBarDrawerToggle toggle = new ActionBarDrawerToggle(
                 this, mBinding.drawerLayout, mBinding.appBarMain.toolbar, R.string.navigation_drawer_open, R.string.navigation_drawer_close);
-        mBinding.drawerLayout.setDrawerListener(toggle);
+        mBinding.drawerLayout.addDrawerListener(toggle);
         toggle.syncState();
 
 
@@ -122,6 +122,16 @@ public class MainActivity extends BaseActivity
         startActivity(myIntent);
     }
 
+
+    public void toggleDrawer() {
+        if (mBinding.drawerLayout.isDrawerOpen(GravityCompat.START)) {
+            mBinding.drawerLayout.closeDrawer(GravityCompat.START);
+        } else {
+            mBinding.drawerLayout.openDrawer(GravityCompat.START);
+        }
+    }
+
+
     @Override
     public boolean onKeyDown(int keyCode, KeyEvent event) {
         if (keyCode == KeyEvent.KEYCODE_BACK) {
@@ -294,9 +304,13 @@ public class MainActivity extends BaseActivity
         for (int i = 0; i < count; i++) {
             getSupportFragmentManager().popBackStack();
         }
+
+        mBinding.appBarMain.elevatedToolbar.setVisibility(getSupportFragmentManager().getBackStackEntryCount() > 1 ? View.VISIBLE : View.GONE);
     }
 
     private void adaptViewToFragment(Fragment fragment) {
+        mBinding.appBarMain.elevatedToolbar.setVisibility(fragment instanceof MainFragment ? View.GONE : View.VISIBLE);
+
         if (fragment instanceof ISearchableFragment) {
             mBinding.appBarMain.mainSearch.setOnQueryTextListener((SearchView.OnQueryTextListener) fragment);
             mBinding.appBarMain.mainSearch.setVisibility(View.VISIBLE);
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 368311fa..8ffd9ca1 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
@@ -1,10 +1,7 @@
 package it.integry.integrywmsnative.gest.main;
 
 
-import android.animation.ArgbEvaluator;
-import android.animation.ObjectAnimator;
 import android.content.Context;
-import android.graphics.Color;
 import android.os.Bundle;
 import android.os.Handler;
 import android.view.LayoutInflater;
@@ -122,7 +119,6 @@ public class MainFragment extends Fragment implements ITitledFragment, IScrollab
         mBindings = DataBindingUtil.inflate(inflater, R.layout.fragment_main, container, false);
         mBindings.setView(this);
 
-        mBindings.easterEggHorrorBloodExpandableLayout.setExpanded(false, false);
         return mBindings.getRoot();
     }
 
@@ -246,6 +242,13 @@ public class MainFragment extends Fragment implements ITitledFragment, IScrollab
 
     }
 
+
+    public void toggleDrawer() {
+        if (getActivity() != null && getActivity() instanceof MainActivity) {
+            ((MainActivity) getActivity()).toggleDrawer();
+        }
+    }
+
     private void collapseNoConnectionLayout() {
         if (getActivity() != null)
             getActivity().runOnUiThread(() -> mBindings.noConnectionTopLayout.collapse(true));
@@ -335,89 +338,6 @@ public class MainFragment extends Fragment implements ITitledFragment, IScrollab
         this.mOnPreDestroyList.add(onPreDestroy);
     }
 
-
-    public void toggleEasterEggMode() {
-        easterEggToggle = !easterEggToggle;
-
-
-        int rootBgStart, rootBgEnd;
-        int profileBgStart, profileBgEnd;
-        float titleFlipStart, titleFlipEnd;
-        int animationTimeMillis = 0;
-
-        if (easterEggToggle) {
-            rootBgStart = Color.argb(255, 255, 255, 255);
-            rootBgEnd = Color.argb(255, 0, 0, 0);
-
-            profileBgStart = Color.argb(255, 26, 115, 232);
-            profileBgEnd = Color.argb(255, 211, 47, 47);
-            animationTimeMillis = 2500;
-            titleFlipStart = 1f;
-            titleFlipEnd = -1f;
-        } else {
-            rootBgStart = Color.argb(255, 0, 0, 0);
-            rootBgEnd = Color.argb(255, 255, 255, 255);
-
-            profileBgStart = Color.argb(255, 211, 47, 47);
-            profileBgEnd = Color.argb(255, 26, 115, 232);
-            animationTimeMillis = 750;
-            titleFlipStart = -1f;
-            titleFlipEnd = 1f;
-        }
-
-        mBindings.easterEggHorrorBloodExpandableLayout.setDuration(animationTimeMillis);
-        mBindings.easterEggHorrorBloodExpandableLayout.setExpanded(easterEggToggle, true);
-
-        View rootActivityView = requireActivity().findViewById(R.id.drawer_layout);
-        ObjectAnimator colorFadeRootBg = ObjectAnimator.ofObject(rootActivityView, "backgroundColor",
-                new ArgbEvaluator(),
-                rootBgStart,
-                rootBgEnd);
-
-        colorFadeRootBg.setDuration(animationTimeMillis);
-        colorFadeRootBg.start();
-
-        View toolbarActivityView = requireActivity().findViewById(R.id.toolbar);
-        ObjectAnimator colorFadeToolbarBg = ObjectAnimator.ofObject(toolbarActivityView, "backgroundColor",
-                new ArgbEvaluator(),
-                rootBgStart,
-                rootBgEnd);
-
-        colorFadeToolbarBg.setDuration(animationTimeMillis);
-        colorFadeToolbarBg.start();
-
-        ObjectAnimator colorFadeProfileBg = ObjectAnimator.ofObject(mBindings.profileRootContainer, "backgroundColor",
-                new ArgbEvaluator(),
-                profileBgStart,
-                profileBgEnd);
-
-        colorFadeProfileBg.setDuration(animationTimeMillis);
-        colorFadeProfileBg.start();
-
-        View toolbarTitleActivityView = requireActivity().findViewById(R.id.toolbar_title);
-        ObjectAnimator flipToolbarTitleX = ObjectAnimator.ofFloat(toolbarTitleActivityView, "scaleX",
-                titleFlipStart,
-                titleFlipEnd);
-
-        flipToolbarTitleX.setDuration(animationTimeMillis);
-        flipToolbarTitleX.start();
-
-        ObjectAnimator flipToolbarTitleY = ObjectAnimator.ofFloat(toolbarTitleActivityView, "scaleY",
-                titleFlipStart,
-                titleFlipEnd);
-
-        flipToolbarTitleY.setDuration(animationTimeMillis);
-        flipToolbarTitleY.start();
-
-        ObjectAnimator colorFadeTitleTextColor = ObjectAnimator.ofObject(toolbarTitleActivityView, "textColor",
-                new ArgbEvaluator(),
-                rootBgEnd,
-                rootBgStart);
-
-        colorFadeTitleTextColor.setDuration(animationTimeMillis);
-        colorFadeTitleTextColor.start();
-    }
-
     public void changeUserDepo() {
         DialogSwitchUserDepoView.newInstance(SettingsManager.iDB().getAvailableCodMdep(), this::onUserDepoChanged)
                 .show(getParentFragmentManager(), "switch-user-depo");
diff --git a/app/src/main/res/drawable/easter_egg__horror_blood.xml b/app/src/main/res/drawable/easter_egg__horror_blood.xml
deleted file mode 100644
index adc323f1..00000000
--- a/app/src/main/res/drawable/easter_egg__horror_blood.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="488.3dp"
-    android:height="168.7dp"
-    android:viewportWidth="488.3"
-    android:viewportHeight="168.7">
-  <path
-      android:pathData="M484.96,0c0.1,1.5 0.2,3.6 -0.3,6c-0.7,3.4 -2.1,5.8 -3.6,8.5c-0.9,1.7 -2,3.3 -3.5,5.2c-3.5,4.7 -7.2,17.7 -9.9,39.7s-1.3,59.4 1.5,72s-0.1,22.1 -4.6,26.3s0.9,2.1 -6.7,5.1c-7.6,3 -18.9,-5.4 -21.2,-17.7l0,0c-2.3,-12.3 -3.1,-9.1 -0.1,-21.5c3,-12.4 7.6,-24.9 7.7,-36.7c0.1,-11.8 -5.1,-34.2 -12.3,-38s-7,-2.7 -13.8,-3.1s-9.9,-0.1 -13.8,4.3c-3.9,4.4 -6.5,10.3 -7.9,19.7c-1.4,9.4 0,26.7 2.4,33.1c2.4,6.4 3.7,6.8 1,14.9c-2.7,8.1 -15.7,9.9 -20.5,2.9c-4.8,-7.1 -4.3,-17.9 -1.5,-34.7c2.8,-16.8 2.3,-14.6 2.2,-27.2c0,-12.6 1,-11.4 -1.3,-15.8c-2.3,-4.4 -9.7,-9.7 -16.9,-5.7c-7.2,4 -11.7,21.3 -12.6,28.1s-0.9,24.5 0.4,31c1.2,6.5 1.3,12.8 -0.6,17.5s-4,7.4 -7.2,8.6s-6.4,1.4 -10.1,-0.9c-3.7,-2.3 -8.2,-4.8 -8.7,-16.8c-0.5,-12 3.7,-39.8 2.1,-53.6c-1.2,-10.7 -3.7,-14.3 -9.2,-10.6c-3.9,2.6 -7.2,9.4 -4.9,16s2.8,8.4 2.7,13s-1.1,8 -4.4,11.6c-3.3,3.5 -8.3,5 -12.8,1.9c-4.5,-3.1 -6.7,-9.9 -4.3,-18.3c2.5,-8.4 10.1,-11.6 1.7,-19.2c-8.3,-7.6 -14.9,1.7 -15.1,15.6c-0.2,14 0.8,23 3.6,32.5c2.8,9.6 4.1,14.7 4.1,22.7s-5.1,16.1 -12.8,15.3s-12.7,-15.8 -14.7,-26.2c-2,-10.4 -1.8,-8.8 -2.5,-11.3s-1.3,-5 -1.6,-9.6c-1.8,-13 4.7,-26 4.8,-37.1c0,-6.6 0.8,-8.5 -2.8,-12.3s-19.3,6.1 -23.4,17.1s-3.9,10.9 -3.6,25.9s1.8,25.1 5.1,34.5c3.3,9.4 3.9,16.5 3.2,19.7c-0.6,3.3 -0.6,3.1 -1.3,8.3c-0.7,5.2 -3.9,10.8 -6.8,12.3c-3.9,2 -8.2,0.3 -10.5,-1.8c-2.4,-2.4 -5.4,-8.4 -6.7,-13.9s-1.3,-8.5 -1.3,-16s0.3,-14.8 0.7,-19.7c0.4,-4.9 0.8,-11.8 1.1,-25.1c0.3,-13.3 -0.4,-19.2 -3.6,-29.8s-3.5,-9.7 -7.1,-13.5s-5.6,-4.9 -8.6,-4.9c-2.9,0 -8.5,3 -11.3,5.9c-2.7,2.9 -5.6,8.2 -8,15.5s-2.7,9.4 0.3,22.8s3.5,16.2 1.4,27.5c-2,11.3 -7.2,16.8 -14.8,16.8s-12.2,-3.3 -14.5,-7.8s-3.7,-12.1 -3.4,-17.3s2,-15.6 2.8,-18.3c0.9,-2.6 2.8,-14.6 3.3,-20.7c0.5,-6.1 -0.4,-11 -3.4,-16.2s-4.6,-7.1 -6.5,-8.3c-4.8,-2.5 -9.5,2.4 -11.6,4.6c-3.8,3.9 -7.6,10.3 -9,14.7s-1,4.3 -0.3,12s0.8,8.5 -0.2,17s-1.6,11.8 -4.2,15.3s-4,4.7 -9.7,4.7s-12.5,-6.7 -13.7,-12.5s1.4,-15.6 3.1,-23.4s1,-20.1 -0.3,-24c-4,-13.1 -11.8,-9.2 -16.1,-1.2c-5.2,7.4 -5.5,31.2 -3.5,39.9s0.6,19.8 -0.4,24.8s-4.2,12.3 -7,15.4s-10.6,4.7 -14.7,2.4s-8.1,-6.9 -9.7,-11.6c-1.6,-4.7 -1.4,-13.4 0.3,-17.2c1.7,-3.8 7.6,-11.5 8.4,-23.2c0.9,-11.7 -4.8,-17 -5.4,-18.6c-0.6,-1.6 -2.5,-1.1 -4.5,1c-7.6,9.1 -5.7,19.2 -5.8,24.7c-0.4,14.7 3.9,39.6 4.1,49.4c0.2,9.8 -1.7,12.8 -3.5,17.6c-1.8,4.8 -3.4,7.4 -7.6,10s-10.2,5.3 -14.5,3.4c-4.3,-2 -5.1,0.1 -9.1,-11.3c-4,-11.4 1.5,-34 4.2,-42.1c2.7,-8.1 4.2,-11 5.3,-18.4s2.4,-20.6 2.4,-38c0,-17.3 0.6,-16.8 -1.5,-21.5c-3.1,-6.7 -5.1,-14.5 -1.9,-20.4c0.2,-0.4 0.6,-1.1 1.2,-1.8C171.66,0 328.26,0 484.96,0z"
-      android:fillColor="#D32F2F"/>
-</vector>
diff --git a/app/src/main/res/layout/fragment_main.xml b/app/src/main/res/layout/fragment_main.xml
index de9f1897..b86de747 100644
--- a/app/src/main/res/layout/fragment_main.xml
+++ b/app/src/main/res/layout/fragment_main.xml
@@ -8,6 +8,7 @@
             type="it.integry.integrywmsnative.gest.main.MainFragment" />
 
         <import type="android.view.View" />
+
         <import type="it.integry.integrywmsnative.core.settings.SettingsManager" />
     </data>
 
@@ -25,6 +26,162 @@
             android:layout_height="wrap_content"
             android:orientation="vertical">
 
+            <RelativeLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content">
+
+                <androidx.cardview.widget.CardView
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_margin="8dp"
+                    app:cardCornerRadius="16dp"
+                    app:cardElevation="4dp">
+
+
+                    <androidx.appcompat.widget.LinearLayoutCompat
+                        android:id="@+id/profile_root_container"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:background="?colorPrimary"
+                        android:orientation="vertical"
+                        android:paddingHorizontal="16dp"
+                        android:paddingVertical="8dp">
+
+
+                        <RelativeLayout
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:gravity="center_vertical"
+                            android:orientation="horizontal">
+
+
+                            <androidx.appcompat.widget.AppCompatImageView
+                                android:id="@+id/user_icon"
+                                android:layout_width="24dp"
+                                android:layout_height="wrap_content"
+                                android:layout_centerVertical="true"
+                                android:layout_marginEnd="16dp"
+                                android:adjustViewBounds="true"
+                                android:clickable="true"
+                                android:focusable="true"
+                                android:src="@drawable/ic_menu_24dp"
+                                android:tint="@android:color/white"
+                                android:background="?attr/selectableItemBackgroundBorderless"
+                                app:singleClick="@{() -> view.toggleDrawer() }"/>
+
+                            <androidx.appcompat.widget.LinearLayoutCompat
+                                android:id="@+id/user_detail_layout"
+                                android:layout_width="match_parent"
+                                android:layout_height="wrap_content"
+                                android:layout_marginEnd="16dp"
+                                android:layout_toStartOf="@id/switch_depo_button"
+                                android:layout_toEndOf="@id/user_icon"
+                                android:orientation="vertical">
+
+                                <androidx.appcompat.widget.AppCompatTextView
+                                    android:id="@+id/current_user_name"
+                                    style="@style/AppTheme.NewMaterial.Text.TextBoxDashboard"
+                                    android:layout_width="match_parent"
+                                    android:layout_height="wrap_content"
+                                    android:textColor="@android:color/white"
+                                    tools:text="MARIO ROSSI" />
+
+                                <androidx.appcompat.widget.AppCompatTextView
+                                    android:id="@+id/current_deposito"
+                                    style="@style/AppTheme.NewMaterial.Text.TextBoxLittleDashboard"
+                                    android:layout_width="wrap_content"
+                                    android:layout_height="wrap_content"
+                                    android:layout_marginTop="2dp"
+                                    tools:text="Deposito: 01 - Centrale" />
+
+                            </androidx.appcompat.widget.LinearLayoutCompat>
+
+
+                            <androidx.appcompat.widget.AppCompatImageView
+                                android:id="@+id/switch_depo_button"
+                                android:layout_width="30dp"
+                                android:layout_height="30dp"
+                                android:layout_alignParentEnd="true"
+                                android:layout_centerVertical="true"
+                                android:adjustViewBounds="true"
+                                android:clickable="true"
+                                android:focusable="true"
+                                android:onClick="@{() -> view.changeUserDepo()}"
+                                android:src="@drawable/ic_rounded_change_circle_24"
+                                android:tint="@android:color/white"
+                                android:visibility="@{SettingsManager.iDB().isFlagForceAllToColli() ? View.VISIBLE : View.GONE}" />
+
+                        </RelativeLayout>
+
+
+                        <net.cachapa.expandablelayout.ExpandableLayout
+                            android:id="@+id/recover_data_expandable_layout"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            app:el_duration="400"
+                            app:el_expanded="false">
+
+                            <androidx.appcompat.widget.LinearLayoutCompat
+                                android:layout_width="match_parent"
+                                android:layout_height="wrap_content"
+                                android:layout_marginTop="16dp"
+                                android:layout_marginBottom="8dp"
+                                android:gravity="center_vertical"
+                                android:orientation="horizontal">
+
+                                <androidx.appcompat.widget.AppCompatImageView
+                                    android:layout_width="30dp"
+                                    android:layout_height="30dp"
+                                    android:layout_marginEnd="16dp"
+                                    android:adjustViewBounds="true"
+                                    android:src="@drawable/ic_black_recover"
+                                    android:tint="@android:color/white" />
+
+                                <androidx.appcompat.widget.LinearLayoutCompat
+                                    android:layout_width="match_parent"
+                                    android:layout_height="wrap_content"
+                                    android:orientation="vertical">
+
+                                    <androidx.appcompat.widget.AppCompatTextView
+                                        style="@style/AppTheme.NewMaterial.Text.TextBoxDashboard"
+                                        android:layout_width="match_parent"
+                                        android:layout_height="wrap_content"
+                                        android:text="@string/recovering_data"
+                                        android:textColor="@android:color/white" />
+
+                                    <com.google.android.material.progressindicator.LinearProgressIndicator
+                                        android:id="@+id/progressBar"
+                                        style="?attr/linearProgressIndicatorStyle"
+                                        android:layout_width="match_parent"
+                                        android:layout_height="wrap_content"
+                                        android:layout_marginTop="4dp"
+                                        android:indeterminate="true"
+                                        app:indicatorColor="@android:color/white"
+                                        app:trackColor="@color/colorPrimaryDark"
+                                        app:trackCornerRadius="4dp"
+                                        app:trackThickness="8dp" />
+
+                                    <androidx.appcompat.widget.AppCompatTextView
+                                        style="@style/AppTheme.NewMaterial.Text.TextBoxLittleDashboard"
+                                        android:layout_width="wrap_content"
+                                        android:layout_height="wrap_content"
+                                        android:layout_marginTop="2dp"
+                                        android:text="@string/wait_a_moment" />
+
+                                </androidx.appcompat.widget.LinearLayoutCompat>
+
+
+                            </androidx.appcompat.widget.LinearLayoutCompat>
+
+                        </net.cachapa.expandablelayout.ExpandableLayout>
+
+                    </androidx.appcompat.widget.LinearLayoutCompat>
+
+
+                </androidx.cardview.widget.CardView>
+
+            </RelativeLayout>
+
             <net.cachapa.expandablelayout.ExpandableLayout
                 android:id="@+id/no_connection_top_layout"
                 android:layout_width="match_parent"
@@ -61,177 +218,6 @@
                     android:layout_height="wrap_content"
                     android:orientation="vertical">
 
-                    <RelativeLayout
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content">
-
-                        <androidx.cardview.widget.CardView
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            android:layout_margin="12dp"
-                            app:cardCornerRadius="16dp"
-                            app:cardElevation="4dp">
-
-
-                            <androidx.appcompat.widget.LinearLayoutCompat
-                                android:id="@+id/profile_root_container"
-                                android:layout_width="match_parent"
-                                android:layout_height="wrap_content"
-                                android:background="?colorPrimary"
-                                android:orientation="vertical"
-                                android:padding="16dp">
-
-
-                                <RelativeLayout
-                                    android:layout_width="match_parent"
-                                    android:layout_height="wrap_content"
-                                    android:gravity="center_vertical"
-                                    android:orientation="horizontal">
-
-
-                                    <androidx.appcompat.widget.AppCompatImageView
-                                        android:id="@+id/user_icon"
-                                        android:layout_width="30dp"
-                                        android:layout_height="30dp"
-                                        android:layout_marginEnd="16dp"
-                                        android:layout_centerVertical="true"
-                                        android:adjustViewBounds="true"
-                                        android:clickable="true"
-                                        android:focusable="true"
-                                        app:multipleClick="@{() -> view.toggleEasterEggMode()}"
-                                        android:src="@drawable/ic_outline_account_circle_48px"
-                                        android:tint="@android:color/white" />
-
-                                    <androidx.appcompat.widget.LinearLayoutCompat
-                                        android:id="@+id/user_detail_layout"
-                                        android:layout_width="match_parent"
-                                        android:layout_height="wrap_content"
-                                        android:orientation="vertical"
-                                        android:layout_marginEnd="16dp"
-                                        android:layout_toEndOf="@id/user_icon"
-                                        android:layout_toStartOf="@id/switch_depo_button">
-
-                                        <androidx.appcompat.widget.AppCompatTextView
-                                            android:id="@+id/current_user_name"
-                                            style="@style/AppTheme.NewMaterial.Text.TextBoxDashboard"
-                                            android:layout_width="match_parent"
-                                            android:layout_height="wrap_content"
-                                            android:textColor="@android:color/white"
-                                            tools:text="MARIO ROSSI" />
-
-                                        <androidx.appcompat.widget.AppCompatTextView
-                                            android:id="@+id/current_deposito"
-                                            style="@style/AppTheme.NewMaterial.Text.TextBoxLittleDashboard"
-                                            android:layout_width="wrap_content"
-                                            android:layout_height="wrap_content"
-                                            android:layout_marginTop="2dp"
-                                            tools:text="Deposito: 01 - Centrale" />
-
-                                    </androidx.appcompat.widget.LinearLayoutCompat>
-
-
-
-                                    <androidx.appcompat.widget.AppCompatImageView
-                                        android:id="@+id/switch_depo_button"
-                                        android:layout_width="30dp"
-                                        android:layout_height="30dp"
-                                        android:adjustViewBounds="true"
-                                        android:layout_centerVertical="true"
-                                        android:clickable="true"
-                                        android:focusable="true"
-                                        android:layout_alignParentEnd="true"
-                                        android:visibility="@{SettingsManager.iDB().isFlagForceAllToColli() ? View.VISIBLE : View.GONE}"
-                                        android:onClick="@{() -> view.changeUserDepo()}"
-                                        android:src="@drawable/ic_rounded_change_circle_24"
-                                        android:tint="@android:color/white" />
-
-                                </RelativeLayout>
-
-
-                                <net.cachapa.expandablelayout.ExpandableLayout
-                                    android:id="@+id/recover_data_expandable_layout"
-                                    android:layout_width="match_parent"
-                                    android:layout_height="wrap_content"
-                                    app:el_duration="400"
-                                    app:el_expanded="false">
-
-                                    <androidx.appcompat.widget.LinearLayoutCompat
-                                        android:layout_width="match_parent"
-                                        android:layout_height="wrap_content"
-                                        android:layout_marginTop="16dp"
-                                        android:layout_marginBottom="8dp"
-                                        android:gravity="center_vertical"
-                                        android:orientation="horizontal">
-
-                                        <androidx.appcompat.widget.AppCompatImageView
-                                            android:layout_width="30dp"
-                                            android:layout_height="30dp"
-                                            android:layout_marginEnd="16dp"
-                                            android:adjustViewBounds="true"
-                                            android:src="@drawable/ic_black_recover"
-                                            android:tint="@android:color/white" />
-
-                                        <androidx.appcompat.widget.LinearLayoutCompat
-                                            android:layout_width="match_parent"
-                                            android:layout_height="wrap_content"
-                                            android:orientation="vertical">
-
-                                            <androidx.appcompat.widget.AppCompatTextView
-                                                style="@style/AppTheme.NewMaterial.Text.TextBoxDashboard"
-                                                android:layout_width="match_parent"
-                                                android:layout_height="wrap_content"
-                                                android:text="@string/recovering_data"
-                                                android:textColor="@android:color/white" />
-
-                                            <com.google.android.material.progressindicator.LinearProgressIndicator
-                                                android:id="@+id/progressBar"
-                                                style="?attr/linearProgressIndicatorStyle"
-                                                android:layout_width="match_parent"
-                                                android:layout_height="wrap_content"
-                                                android:layout_marginTop="4dp"
-                                                android:indeterminate="true"
-                                                app:trackThickness="8dp"
-                                                app:trackCornerRadius="4dp"
-                                                app:indicatorColor="@android:color/white"
-                                                app:trackColor="@color/colorPrimaryDark"/>
-
-                                            <androidx.appcompat.widget.AppCompatTextView
-                                                style="@style/AppTheme.NewMaterial.Text.TextBoxLittleDashboard"
-                                                android:layout_width="wrap_content"
-                                                android:layout_height="wrap_content"
-                                                android:layout_marginTop="2dp"
-                                                android:text="@string/wait_a_moment" />
-
-                                        </androidx.appcompat.widget.LinearLayoutCompat>
-
-
-                                    </androidx.appcompat.widget.LinearLayoutCompat>
-
-                                </net.cachapa.expandablelayout.ExpandableLayout>
-
-                            </androidx.appcompat.widget.LinearLayoutCompat>
-
-
-                        </androidx.cardview.widget.CardView>
-
-
-                        <net.cachapa.expandablelayout.ExpandableLayout
-                            android:id="@+id/easter_egg__horror_blood_expandable_layout"
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            android:layout_marginHorizontal="16dp"
-                            android:layout_marginTop="50dp"
-                            app:el_expanded="false">
-
-                            <androidx.appcompat.widget.AppCompatImageView
-                                android:id="@+id/easter_egg__horror_blood"
-                                android:layout_width="match_parent"
-                                android:layout_height="wrap_content"
-                                android:adjustViewBounds="true"
-                                android:src="@drawable/easter_egg__horror_blood" />
-                        </net.cachapa.expandablelayout.ExpandableLayout>
-
-                    </RelativeLayout>
 
                     <androidx.appcompat.widget.LinearLayoutCompat
                         android:id="@+id/menu_container"

From b5d049aa1d3c8730443d995517dcebd73661b54b Mon Sep 17 00:00:00 2001
From: GiuseppeS <g.scorrano@integry.it>
Date: Thu, 2 Oct 2025 11:49:59 +0200
Subject: [PATCH 2/5] Rimosso style AppTheme.NewMaterial.Text.Medium e
 rimpiazzato con Material

---
 .../dialog_input_quantity_v2.xml              | 40 +++++++--------
 ...agment_prod_rientro_merce_order_detail.xml |  2 +-
 ..._bolla_picking_main_list__group_header.xml |  2 +-
 ...ne_bolla_picking_main_list__group_item.xml |  8 +--
 .../layout/accettazione_main_list_model.xml   |  2 +-
 ...ordine_inevaso_main_list__group_header.xml |  2 +-
 ...e_ordine_inevaso_main_list__group_item.xml | 10 ++--
 ...activity_picking_inventario__list_item.xml |  4 +-
 .../main/res/layout/activity_picking_resi.xml |  2 +-
 .../main/res/layout/activity_spedizione.xml   |  2 +-
 .../bottom_sheet__inventario_actions_view.xml |  4 +-
 ...tom_sheet__inventario_row_actions_view.xml |  2 +-
 .../layout/bottom_sheet__item_edit_view.xml   |  2 +-
 .../layout/bottom_sheet__mtb_colr_edit.xml    |  2 +-
 .../bottom_sheet_fragment__lu_content.xml     |  4 +-
 .../res/layout/bottom_sheet_line_actions.xml  |  2 +-
 .../res/layout/dialog_basket_lu__page1.xml    |  2 +-
 .../res/layout/dialog_basket_lu__page2.xml    |  2 +-
 .../dialog_choose_batch_lot_item_model.xml    |  2 +-
 .../layout/dialog_info_giacenza_list_item.xml |  2 +-
 ...alog_info_giacenza_situazione_articolo.xml |  8 +--
 ...ituazione_articolo_available_list_item.xml |  2 +-
 ...situazione_articolo_incoming_list_item.xml |  2 +-
 .../res/layout/dialog_input_quantity_v2.xml   | 26 +++++-----
 .../res/layout/dialog_pv_edit_articolo.xml    | 50 +++++++++----------
 ...og_row_info_prod_fabbisogno_linee_prod.xml |  2 +-
 .../layout/fragment_articoli_in_giacenza.xml  |  2 +-
 ..._choose_ords_lav_from_list__item_model.xml |  4 +-
 .../res/layout/fragment_elenco_inventario.xml |  2 +-
 .../layout/fragment_main_ordini_uscita.xml    |  3 +-
 ...t_main_ordini_uscita__list_group_model.xml |  5 +-
 .../fragment_main_rettifica_giacenze.xml      |  8 +--
 .../fragment_prod_fabbisogno_linee_prod.xml   |  2 +-
 ...agment_prod_rientro_merce_order_detail.xml |  2 +-
 ...erce_order_detail__mtb_colt_item_model.xml |  4 +-
 ...tro_merce_order_list__list_group_model.xml |  2 +-
 ...fragment_prod_riposizionamento_da_prod.xml |  2 +-
 ...agment_pv_ordini_acquisto__list_header.xml |  2 +-
 .../res/layout/fragment_verifica_giacenze.xml |  2 +-
 .../main/res/layout/layout_filter_agente.xml  |  9 ++--
 .../res/layout/layout_filter_automezzo.xml    |  8 ++-
 .../main/res/layout/layout_filter_cliente.xml |  9 ++--
 .../main/res/layout/layout_filter_cod_art.xml |  9 ++--
 .../res/layout/layout_filter_commessa.xml     |  9 ++--
 .../res/layout/layout_filter_deposito.xml     |  9 ++--
 .../main/res/layout/layout_filter_descr.xml   |  9 ++--
 .../res/layout/layout_filter_gruppo_merc.xml  |  9 ++--
 .../layout/layout_filter_numero_ordine.xml    |  9 ++--
 .../main/res/layout/layout_filter_paese.xml   |  9 ++--
 .../res/layout/layout_filter_posizione.xml    |  9 ++--
 .../res/layout/layout_filter_term_cons.xml    |  9 ++--
 .../main/res/layout/layout_filter_vettore.xml |  9 ++--
 .../main/res/layout/layout_filter_viaggio.xml |  9 ++--
 .../layout/picking_resi_main_list__item.xml   |  6 +--
 .../picking_resi_main_list__item_header.xml   |  2 +-
 ...od_riposizionamento_da_prod__list_item.xml |  8 +--
 .../spedizione_main_list__group_header.xml    |  2 +-
 .../spedizione_main_list__group_item.xml      |  4 +-
 app/src/main/res/values/styles.xml            |  4 --
 59 files changed, 176 insertions(+), 203 deletions(-)

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 e4742f39..958bdcfe 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
@@ -107,7 +107,7 @@
 
 
                         <androidx.appcompat.widget.AppCompatTextView
-                            style="@style/AppTheme.NewMaterial.Text.Medium"
+                            style="@style/TextAppearance.Material3.BodyLarge"
                             android:layout_width="match_parent"
                             android:layout_height="wrap_content"
                             android:layout_toStartOf="@id/qta_ord_panel"
@@ -121,14 +121,14 @@
                             android:orientation="horizontal">
 
                             <androidx.appcompat.widget.AppCompatTextView
-                                style="@style/AppTheme.NewMaterial.Text.Medium"
+                                style="@style/TextAppearance.Material3.BodyLarge"
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
                                 android:text="@{UtilityNumber.decimalToString(viewmodel.totalNumCnfOrd)}"
                                 android:textStyle="bold" />
 
                             <androidx.appcompat.widget.AppCompatTextView
-                                style="@style/AppTheme.NewMaterial.Text.Medium"
+                                style="@style/TextAppearance.Material3.BodyLarge"
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
                                 android:layout_alignParentEnd="true"
@@ -138,7 +138,7 @@
 
 
                             <androidx.appcompat.widget.AppCompatTextView
-                                style="@style/AppTheme.NewMaterial.Text.Medium"
+                                style="@style/TextAppearance.Material3.BodyLarge"
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
                                 android:layout_alignParentEnd="true"
@@ -147,7 +147,7 @@
                                 android:textStyle="bold" />
 
                             <androidx.appcompat.widget.AppCompatTextView
-                                style="@style/AppTheme.NewMaterial.Text.Medium"
+                                style="@style/TextAppearance.Material3.BodyLarge"
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
                                 android:layout_marginStart="0dp"
@@ -155,7 +155,7 @@
                                 android:textStyle="bold" />
 
                             <androidx.appcompat.widget.AppCompatTextView
-                                style="@style/AppTheme.NewMaterial.Text.Medium"
+                                style="@style/TextAppearance.Material3.BodyLarge"
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
                                 android:layout_alignParentEnd="true"
@@ -164,7 +164,7 @@
                                 android:textStyle="bold" />
 
                             <androidx.appcompat.widget.AppCompatTextView
-                                style="@style/AppTheme.NewMaterial.Text.Medium"
+                                style="@style/TextAppearance.Material3.BodyLarge"
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
                                 android:layout_alignParentEnd="true"
@@ -205,7 +205,7 @@
                                 android:tint="@color/gray_600" />
 
                             <androidx.appcompat.widget.AppCompatTextView
-                                style="@style/AppTheme.NewMaterial.Text.Medium"
+                                style="@style/TextAppearance.Material3.BodyLarge"
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
                                 android:layout_marginStart="4dp"
@@ -216,7 +216,7 @@
                                 tools:text="1" />
 
                             <androidx.appcompat.widget.AppCompatTextView
-                                style="@style/AppTheme.NewMaterial.Text.Medium"
+                                style="@style/TextAppearance.Material3.BodyLarge"
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
                                 android:layout_alignParentEnd="true"
@@ -229,7 +229,7 @@
 
 
                             <androidx.appcompat.widget.AppCompatTextView
-                                style="@style/AppTheme.NewMaterial.Text.Medium"
+                                style="@style/TextAppearance.Material3.BodyLarge"
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
                                 android:layout_alignParentEnd="true"
@@ -239,7 +239,7 @@
                                 android:visibility="@{view.currentTextNumPezziToTake > 0 &amp;&amp; view.currentTextNumCnfToTake > 0 ? View.VISIBLE : View.GONE}" />
 
                             <androidx.appcompat.widget.AppCompatTextView
-                                style="@style/AppTheme.NewMaterial.Text.Medium"
+                                style="@style/TextAppearance.Material3.BodyLarge"
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
                                 android:layout_marginStart="4dp"
@@ -250,7 +250,7 @@
                                 tools:text="4" />
 
                             <androidx.appcompat.widget.AppCompatTextView
-                                style="@style/AppTheme.NewMaterial.Text.Medium"
+                                style="@style/TextAppearance.Material3.BodyLarge"
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
                                 android:layout_alignParentEnd="true"
@@ -304,7 +304,7 @@
                                 android:orientation="horizontal">
 
                                 <androidx.appcompat.widget.AppCompatTextView
-                                    style="@style/AppTheme.NewMaterial.Text.Medium"
+                                    style="@style/TextAppearance.Material3.BodyLarge"
                                     android:layout_width="wrap_content"
                                     android:layout_height="wrap_content"
                                     android:text="@{UtilityNumber.decimalToString(viewmodel.totalNumCnfInWarehouse, 1)}"
@@ -312,7 +312,7 @@
                                     android:textStyle="bold" />
 
                                 <androidx.appcompat.widget.AppCompatTextView
-                                    style="@style/AppTheme.NewMaterial.Text.Medium"
+                                    style="@style/TextAppearance.Material3.BodyLarge"
                                     android:layout_width="wrap_content"
                                     android:layout_height="wrap_content"
                                     android:layout_alignParentEnd="true"
@@ -404,7 +404,7 @@
                                 android:orientation="horizontal">
 
                                 <androidx.appcompat.widget.AppCompatTextView
-                                    style="@style/AppTheme.NewMaterial.Text.Medium"
+                                    style="@style/TextAppearance.Material3.BodyLarge"
                                     android:layout_width="wrap_content"
                                     android:layout_height="wrap_content"
                                     android:text="@{UtilityNumber.decimalToString(viewmodel.totalNumCnfCommitted, 1)}"
@@ -412,7 +412,7 @@
                                     android:textStyle="bold" />
 
                                 <androidx.appcompat.widget.AppCompatTextView
-                                    style="@style/AppTheme.NewMaterial.Text.Medium"
+                                    style="@style/TextAppearance.Material3.BodyLarge"
                                     android:layout_width="wrap_content"
                                     android:layout_height="wrap_content"
                                     android:layout_alignParentEnd="true"
@@ -513,7 +513,7 @@
                                 android:orientation="horizontal">
 
                                 <androidx.appcompat.widget.AppCompatTextView
-                                    style="@style/AppTheme.NewMaterial.Text.Medium"
+                                    style="@style/TextAppearance.Material3.BodyLarge"
                                     android:layout_width="wrap_content"
                                     android:layout_height="wrap_content"
                                     android:text="@{UtilityNumber.decimalToString(viewmodel.totalNumCnfToBeTaken)}"
@@ -521,7 +521,7 @@
                                     android:textStyle="bold" />
 
                                 <androidx.appcompat.widget.AppCompatTextView
-                                    style="@style/AppTheme.NewMaterial.Text.Medium"
+                                    style="@style/TextAppearance.Material3.BodyLarge"
                                     android:layout_width="wrap_content"
                                     android:layout_height="wrap_content"
                                     android:layout_alignParentEnd="true"
@@ -612,7 +612,7 @@
                                 android:orientation="horizontal">
 
                                 <androidx.appcompat.widget.AppCompatTextView
-                                    style="@style/AppTheme.NewMaterial.Text.Medium"
+                                    style="@style/TextAppearance.Material3.BodyLarge"
                                     android:layout_width="wrap_content"
                                     android:layout_height="wrap_content"
                                     android:text="@{UtilityNumber.decimalToString(viewmodel.totalNumCnfAvailable)}"
@@ -620,7 +620,7 @@
                                     android:textStyle="bold" />
 
                                 <androidx.appcompat.widget.AppCompatTextView
-                                    style="@style/AppTheme.NewMaterial.Text.Medium"
+                                    style="@style/TextAppearance.Material3.BodyLarge"
                                     android:layout_width="wrap_content"
                                     android:layout_height="wrap_content"
                                     android:layout_alignParentEnd="true"
diff --git a/app/src/main/res/layout-large/fragment_prod_rientro_merce_order_detail.xml b/app/src/main/res/layout-large/fragment_prod_rientro_merce_order_detail.xml
index f064faae..3f8eb194 100644
--- a/app/src/main/res/layout-large/fragment_prod_rientro_merce_order_detail.xml
+++ b/app/src/main/res/layout-large/fragment_prod_rientro_merce_order_detail.xml
@@ -1231,7 +1231,7 @@
                                         android:src="@drawable/ic_playlist_add_check_24dp" />
 
                                     <androidx.appcompat.widget.AppCompatTextView
-                                        style="@style/AppTheme.NewMaterial.Text.Medium"
+                                        style="@style/TextAppearance.Material3.BodyLarge"
                                         android:layout_width="wrap_content"
                                         android:layout_height="wrap_content"
                                         android:gravity="center_horizontal"
diff --git a/app/src/main/res/layout/accettazione_bolla_picking_main_list__group_header.xml b/app/src/main/res/layout/accettazione_bolla_picking_main_list__group_header.xml
index 47146b87..408473da 100644
--- a/app/src/main/res/layout/accettazione_bolla_picking_main_list__group_header.xml
+++ b/app/src/main/res/layout/accettazione_bolla_picking_main_list__group_header.xml
@@ -10,7 +10,7 @@
 
         <androidx.appcompat.widget.AppCompatTextView
             android:id="@+id/group_title"
-            style="@style/AppTheme.NewMaterial.Text.Medium"
+            style="@style/TextAppearance.Material3.BodyLarge"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:ellipsize="end"
diff --git a/app/src/main/res/layout/accettazione_bolla_picking_main_list__group_item.xml b/app/src/main/res/layout/accettazione_bolla_picking_main_list__group_item.xml
index 68d0cba9..0d7d0170 100644
--- a/app/src/main/res/layout/accettazione_bolla_picking_main_list__group_item.xml
+++ b/app/src/main/res/layout/accettazione_bolla_picking_main_list__group_item.xml
@@ -106,7 +106,7 @@
 
                     <androidx.appcompat.widget.AppCompatTextView
                         android:id="@+id/qta_evasa"
-                        style="@style/AppTheme.NewMaterial.Text.Medium"
+                        style="@style/TextAppearance.Material3.BodyLarge"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_marginStart="4dp"
@@ -115,7 +115,7 @@
                         tools:text="QTA" />
 
                     <androidx.appcompat.widget.AppCompatTextView
-                        style="@style/AppTheme.NewMaterial.Text.Medium"
+                        style="@style/TextAppearance.Material3.BodyLarge"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:text=" / "
@@ -124,7 +124,7 @@
 
                     <androidx.appcompat.widget.AppCompatTextView
                         android:id="@+id/qta_tot"
-                        style="@style/AppTheme.NewMaterial.Text.Medium"
+                        style="@style/TextAppearance.Material3.BodyLarge"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:textColor="@android:color/black"
@@ -216,7 +216,7 @@
 
                 <androidx.appcompat.widget.AppCompatTextView
                     android:id="@+id/descrizione"
-                    style="@style/AppTheme.NewMaterial.Text.Medium"
+                    style="@style/TextAppearance.Material3.BodyLarge"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_alignParentStart="true"
diff --git a/app/src/main/res/layout/accettazione_main_list_model.xml b/app/src/main/res/layout/accettazione_main_list_model.xml
index 11ffd309..078c2513 100644
--- a/app/src/main/res/layout/accettazione_main_list_model.xml
+++ b/app/src/main/res/layout/accettazione_main_list_model.xml
@@ -15,7 +15,7 @@
 
         <TextView
             android:id="@+id/accettazione_main_list_group_header"
-            style="@style/AppTheme.NewMaterial.Text.Medium"
+            style="@style/TextAppearance.Material3.BodyLarge"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:textColor="@android:color/white"
diff --git a/app/src/main/res/layout/accettazione_ordine_inevaso_main_list__group_header.xml b/app/src/main/res/layout/accettazione_ordine_inevaso_main_list__group_header.xml
index e2934bb0..87538c82 100644
--- a/app/src/main/res/layout/accettazione_ordine_inevaso_main_list__group_header.xml
+++ b/app/src/main/res/layout/accettazione_ordine_inevaso_main_list__group_header.xml
@@ -10,7 +10,7 @@
 
         <androidx.appcompat.widget.AppCompatTextView
             android:id="@+id/group_title"
-            style="@style/AppTheme.NewMaterial.Text.Medium"
+            style="@style/TextAppearance.Material3.BodyLarge"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:ellipsize="end"
diff --git a/app/src/main/res/layout/accettazione_ordine_inevaso_main_list__group_item.xml b/app/src/main/res/layout/accettazione_ordine_inevaso_main_list__group_item.xml
index 214f9998..5f3fe27e 100644
--- a/app/src/main/res/layout/accettazione_ordine_inevaso_main_list__group_item.xml
+++ b/app/src/main/res/layout/accettazione_ordine_inevaso_main_list__group_item.xml
@@ -91,7 +91,7 @@
 
                     <androidx.appcompat.widget.AppCompatTextView
                         android:id="@+id/qta_evasa"
-                        style="@style/AppTheme.NewMaterial.Text.Medium"
+                        style="@style/TextAppearance.Material3.BodyLarge"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_marginStart="4dp"
@@ -100,7 +100,7 @@
                         tools:text="QTA" />
 
                     <androidx.appcompat.widget.AppCompatTextView
-                        style="@style/AppTheme.NewMaterial.Text.Medium"
+                        style="@style/TextAppearance.Material3.BodyLarge"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:text=" / "
@@ -109,7 +109,7 @@
 
                     <androidx.appcompat.widget.AppCompatTextView
                         android:id="@+id/qta_tot"
-                        style="@style/AppTheme.NewMaterial.Text.Medium"
+                        style="@style/TextAppearance.Material3.BodyLarge"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:textColor="@android:color/black"
@@ -137,7 +137,7 @@
 
                 <androidx.appcompat.widget.AppCompatTextView
                     android:id="@+id/descrizione"
-                    style="@style/AppTheme.NewMaterial.Text.Medium"
+                    style="@style/TextAppearance.Material3.BodyLarge"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_alignParentStart="true"
@@ -149,7 +149,7 @@
 
                 <androidx.appcompat.widget.AppCompatTextView
                     android:id="@+id/descrizione_sub_1"
-                    style="@style/AppTheme.NewMaterial.Text.Medium"
+                    style="@style/TextAppearance.Material3.BodyLarge"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_alignParentStart="true"
diff --git a/app/src/main/res/layout/activity_picking_inventario__list_item.xml b/app/src/main/res/layout/activity_picking_inventario__list_item.xml
index c4d889f6..c87a44d0 100644
--- a/app/src/main/res/layout/activity_picking_inventario__list_item.xml
+++ b/app/src/main/res/layout/activity_picking_inventario__list_item.xml
@@ -66,7 +66,7 @@
 
 
             <androidx.appcompat.widget.AppCompatTextView
-                style="@style/AppTheme.NewMaterial.Text.Medium"
+                style="@style/TextAppearance.Material3.BodyLarge"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:ellipsize="end"
@@ -77,7 +77,7 @@
 
 
             <androidx.appcompat.widget.AppCompatTextView
-                style="@style/AppTheme.NewMaterial.Text.Medium"
+                style="@style/TextAppearance.Material3.BodyLarge"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:ellipsize="end"
diff --git a/app/src/main/res/layout/activity_picking_resi.xml b/app/src/main/res/layout/activity_picking_resi.xml
index e767be21..51c7dd76 100644
--- a/app/src/main/res/layout/activity_picking_resi.xml
+++ b/app/src/main/res/layout/activity_picking_resi.xml
@@ -93,7 +93,7 @@
 
                                 <androidx.appcompat.widget.AppCompatTextView
                                     android:id="@+id/description_filter_text"
-                                    style="@style/AppTheme.NewMaterial.Text.Medium"
+                                    style="@style/TextAppearance.Material3.BodyLarge"
                                     android:layout_width="wrap_content"
                                     android:layout_height="wrap_content"
                                     android:ellipsize="end"
diff --git a/app/src/main/res/layout/activity_spedizione.xml b/app/src/main/res/layout/activity_spedizione.xml
index b5766d40..588cff86 100644
--- a/app/src/main/res/layout/activity_spedizione.xml
+++ b/app/src/main/res/layout/activity_spedizione.xml
@@ -119,7 +119,7 @@
 
                                     <androidx.appcompat.widget.AppCompatTextView
                                         android:id="@+id/description_filter_text"
-                                        style="@style/AppTheme.NewMaterial.Text.Medium"
+                                        style="@style/TextAppearance.Material3.BodyLarge"
                                         android:layout_width="wrap_content"
                                         android:layout_height="wrap_content"
                                         android:ellipsize="end"
diff --git a/app/src/main/res/layout/bottom_sheet__inventario_actions_view.xml b/app/src/main/res/layout/bottom_sheet__inventario_actions_view.xml
index 17c29d95..9a800f4e 100644
--- a/app/src/main/res/layout/bottom_sheet__inventario_actions_view.xml
+++ b/app/src/main/res/layout/bottom_sheet__inventario_actions_view.xml
@@ -52,7 +52,7 @@
                     android:orientation="horizontal">
 
                     <androidx.appcompat.widget.AppCompatTextView
-                        style="@style/AppTheme.NewMaterial.Text.Medium"
+                        style="@style/TextAppearance.Material3.BodyLarge"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:ellipsize="end"
@@ -64,7 +64,7 @@
                         android:textStyle="bold" />
 
                     <androidx.appcompat.widget.AppCompatTextView
-                        style="@style/AppTheme.NewMaterial.Text.Medium"
+                        style="@style/TextAppearance.Material3.BodyLarge"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:ellipsize="end"
diff --git a/app/src/main/res/layout/bottom_sheet__inventario_row_actions_view.xml b/app/src/main/res/layout/bottom_sheet__inventario_row_actions_view.xml
index a3c1ac8e..af28914f 100644
--- a/app/src/main/res/layout/bottom_sheet__inventario_row_actions_view.xml
+++ b/app/src/main/res/layout/bottom_sheet__inventario_row_actions_view.xml
@@ -57,7 +57,7 @@
 
 
                 <androidx.appcompat.widget.AppCompatTextView
-                    style="@style/AppTheme.NewMaterial.Text.Medium"
+                    style="@style/TextAppearance.Material3.BodyLarge"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:ellipsize="end"
diff --git a/app/src/main/res/layout/bottom_sheet__item_edit_view.xml b/app/src/main/res/layout/bottom_sheet__item_edit_view.xml
index d231d37f..e42d0a7e 100644
--- a/app/src/main/res/layout/bottom_sheet__item_edit_view.xml
+++ b/app/src/main/res/layout/bottom_sheet__item_edit_view.xml
@@ -44,7 +44,7 @@
 
                 <androidx.appcompat.widget.AppCompatTextView
                     android:id="@+id/bottom_sheet_actions_title"
-                    style="@style/AppTheme.NewMaterial.Text.Medium"
+                    style="@style/TextAppearance.Material3.BodyLarge"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:ellipsize="end"
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 b68e03ca..faa09460 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
@@ -41,7 +41,7 @@
 
                 <androidx.appcompat.widget.AppCompatTextView
                     android:id="@+id/bottom_sheet_actions_title"
-                    style="@style/AppTheme.NewMaterial.Text.Medium"
+                    style="@style/TextAppearance.Material3.BodyLarge"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:ellipsize="end"
diff --git a/app/src/main/res/layout/bottom_sheet_fragment__lu_content.xml b/app/src/main/res/layout/bottom_sheet_fragment__lu_content.xml
index 343bca25..5ba847bb 100644
--- a/app/src/main/res/layout/bottom_sheet_fragment__lu_content.xml
+++ b/app/src/main/res/layout/bottom_sheet_fragment__lu_content.xml
@@ -86,7 +86,7 @@
 
                         <androidx.appcompat.widget.AppCompatTextView
                             android:id="@+id/textview_art_counter"
-                            style="@style/AppTheme.NewMaterial.Text.Medium"
+                            style="@style/TextAppearance.Material3.BodyLarge"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:layout_marginStart="8dp"
@@ -97,7 +97,7 @@
 
                         <androidx.appcompat.widget.AppCompatTextView
                             android:id="@+id/textview_art_description"
-                            style="@style/AppTheme.NewMaterial.Text.Medium"
+                            style="@style/TextAppearance.Material3.BodyLarge"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:layout_marginStart="4dp"
diff --git a/app/src/main/res/layout/bottom_sheet_line_actions.xml b/app/src/main/res/layout/bottom_sheet_line_actions.xml
index eeb666b9..ce2efdec 100644
--- a/app/src/main/res/layout/bottom_sheet_line_actions.xml
+++ b/app/src/main/res/layout/bottom_sheet_line_actions.xml
@@ -95,7 +95,7 @@
                             android:layout_height="wrap_content"
                             style="@style/TextAppearance.Material3.LabelLarge"
                             android:text="@{listModel.isStarted() ? R.string.in_progress : listModel.isPaused() ? R.string.stand_by : R.string.stopped}"
-                            android:textAppearance="@style/AppTheme.NewMaterial.Text.Medium"
+                            android:textAppearance="@style/TextAppearance.Material3.BodyLarge"
                             android:textColor="@android:color/white"
                             android:textStyle="bold"
                             android:layout_marginStart="2dp"
diff --git a/app/src/main/res/layout/dialog_basket_lu__page1.xml b/app/src/main/res/layout/dialog_basket_lu__page1.xml
index 9bfb9f57..bb03cfdd 100644
--- a/app/src/main/res/layout/dialog_basket_lu__page1.xml
+++ b/app/src/main/res/layout/dialog_basket_lu__page1.xml
@@ -68,7 +68,7 @@
                     android:textColor="@android:color/black"
                     android:text="@string/no_lu_found_message"
                     android:layout_marginTop="16dp"
-                    style="@style/AppTheme.NewMaterial.Text.Medium"/>
+                    style="@style/TextAppearance.Material3.BodyLarge"/>
             </androidx.appcompat.widget.LinearLayoutCompat>
 
         </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/dialog_basket_lu__page2.xml b/app/src/main/res/layout/dialog_basket_lu__page2.xml
index 17a80322..e87885b6 100644
--- a/app/src/main/res/layout/dialog_basket_lu__page2.xml
+++ b/app/src/main/res/layout/dialog_basket_lu__page2.xml
@@ -78,7 +78,7 @@
                                 android:tint="@android:color/black" />
 
                             <androidx.appcompat.widget.AppCompatTextView
-                                style="@style/AppTheme.NewMaterial.Text.Medium"
+                                style="@style/TextAppearance.Material3.BodyLarge"
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
                                 android:layout_marginTop="16dp"
diff --git a/app/src/main/res/layout/dialog_choose_batch_lot_item_model.xml b/app/src/main/res/layout/dialog_choose_batch_lot_item_model.xml
index b2326321..b61c9965 100644
--- a/app/src/main/res/layout/dialog_choose_batch_lot_item_model.xml
+++ b/app/src/main/res/layout/dialog_choose_batch_lot_item_model.xml
@@ -42,7 +42,7 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:text="@{UtilityString.isNull(mtbPartitaMag.partitaMag, &quot;Nessun lotto&quot;)}"
-                    style="@style/AppTheme.NewMaterial.Text.Medium"
+                    style="@style/TextAppearance.Material3.BodyLarge"
                     android:textColor="?colorPrimary"
                     android:textStyle="bold"
                     tools:text="PARTITA MAG" />
diff --git a/app/src/main/res/layout/dialog_info_giacenza_list_item.xml b/app/src/main/res/layout/dialog_info_giacenza_list_item.xml
index 504435ba..92b858fd 100644
--- a/app/src/main/res/layout/dialog_info_giacenza_list_item.xml
+++ b/app/src/main/res/layout/dialog_info_giacenza_list_item.xml
@@ -37,7 +37,7 @@
 
 
             <androidx.appcompat.widget.AppCompatTextView
-                style="@style/AppTheme.NewMaterial.Text.Medium"
+                style="@style/TextAppearance.Material3.BodyLarge"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:text="@{&quot;UL &quot; + item.numCollo.toString() + &quot; del &quot; + UtilityDate.formatDate(item.dataCollo, UtilityDate.COMMONS_DATE_FORMATS.DMY_HUMAN)}"
diff --git a/app/src/main/res/layout/dialog_info_giacenza_situazione_articolo.xml b/app/src/main/res/layout/dialog_info_giacenza_situazione_articolo.xml
index 62cbb06d..3b73c536 100644
--- a/app/src/main/res/layout/dialog_info_giacenza_situazione_articolo.xml
+++ b/app/src/main/res/layout/dialog_info_giacenza_situazione_articolo.xml
@@ -67,7 +67,7 @@
                     android:orientation="horizontal">
 
                     <androidx.appcompat.widget.AppCompatTextView
-                        style="@style/AppTheme.NewMaterial.Text.Medium"
+                        style="@style/TextAppearance.Material3.BodyLarge"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:text="@{UtilityNumber.decimalToString(item.pedArrivo, 0)}"
@@ -75,7 +75,7 @@
                         android:textStyle="bold" />
 
                     <androidx.appcompat.widget.AppCompatTextView
-                        style="@style/AppTheme.NewMaterial.Text.Medium"
+                        style="@style/TextAppearance.Material3.BodyLarge"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_alignParentEnd="true"
@@ -169,7 +169,7 @@
                     android:orientation="horizontal">
 
                     <androidx.appcompat.widget.AppCompatTextView
-                        style="@style/AppTheme.NewMaterial.Text.Medium"
+                        style="@style/TextAppearance.Material3.BodyLarge"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:text="@{String.valueOf(item.pedMag)}"
@@ -177,7 +177,7 @@
                         android:textStyle="bold" />
 
                     <androidx.appcompat.widget.AppCompatTextView
-                        style="@style/AppTheme.NewMaterial.Text.Medium"
+                        style="@style/TextAppearance.Material3.BodyLarge"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_alignParentEnd="true"
diff --git a/app/src/main/res/layout/dialog_info_situazione_articolo_available_list_item.xml b/app/src/main/res/layout/dialog_info_situazione_articolo_available_list_item.xml
index 21a506c9..19c838fc 100644
--- a/app/src/main/res/layout/dialog_info_situazione_articolo_available_list_item.xml
+++ b/app/src/main/res/layout/dialog_info_situazione_articolo_available_list_item.xml
@@ -37,7 +37,7 @@
 
 
             <androidx.appcompat.widget.AppCompatTextView
-                style="@style/AppTheme.NewMaterial.Text.Medium"
+                style="@style/TextAppearance.Material3.BodyLarge"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:text="@{&quot;UL &quot; + item.numCollo.toString() + &quot; del &quot; + UtilityDate.formatDate(item.dataCollo, UtilityDate.COMMONS_DATE_FORMATS.DMY_HUMAN)}"
diff --git a/app/src/main/res/layout/dialog_info_situazione_articolo_incoming_list_item.xml b/app/src/main/res/layout/dialog_info_situazione_articolo_incoming_list_item.xml
index eca0c6ce..ed116c38 100644
--- a/app/src/main/res/layout/dialog_info_situazione_articolo_incoming_list_item.xml
+++ b/app/src/main/res/layout/dialog_info_situazione_articolo_incoming_list_item.xml
@@ -39,7 +39,7 @@
 
 
             <androidx.appcompat.widget.AppCompatTextView
-                style="@style/AppTheme.NewMaterial.Text.Medium"
+                style="@style/TextAppearance.Material3.BodyLarge"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:text="@{UtilityDate.formatDate(item.dataCons, UtilityDate.COMMONS_DATE_FORMATS.DMY_HUMAN)}"
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 38955285..845a6c88 100644
--- a/app/src/main/res/layout/dialog_input_quantity_v2.xml
+++ b/app/src/main/res/layout/dialog_input_quantity_v2.xml
@@ -217,7 +217,7 @@
                                 android:tint="@color/gray_600" />
 
                             <androidx.appcompat.widget.AppCompatTextView
-                                style="@style/AppTheme.NewMaterial.Text.Medium"
+                                style="@style/TextAppearance.Material3.BodyLarge"
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
                                 android:layout_marginStart="4dp"
@@ -228,7 +228,7 @@
                                 tools:text="1" />
 
                             <androidx.appcompat.widget.AppCompatTextView
-                                style="@style/AppTheme.NewMaterial.Text.Medium"
+                                style="@style/TextAppearance.Material3.BodyLarge"
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
                                 android:layout_alignParentEnd="true"
@@ -241,7 +241,7 @@
 
 
                             <androidx.appcompat.widget.AppCompatTextView
-                                style="@style/AppTheme.NewMaterial.Text.Medium"
+                                style="@style/TextAppearance.Material3.BodyLarge"
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
                                 android:layout_alignParentEnd="true"
@@ -251,7 +251,7 @@
                                 android:visibility="@{view.currentTextNumPezziToTake > 0 &amp;&amp; view.currentTextNumCnfToTake > 0 ? View.VISIBLE : View.GONE}" />
 
                             <androidx.appcompat.widget.AppCompatTextView
-                                style="@style/AppTheme.NewMaterial.Text.Medium"
+                                style="@style/TextAppearance.Material3.BodyLarge"
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
                                 android:layout_marginStart="4dp"
@@ -262,7 +262,7 @@
                                 tools:text="4" />
 
                             <androidx.appcompat.widget.AppCompatTextView
-                                style="@style/AppTheme.NewMaterial.Text.Medium"
+                                style="@style/TextAppearance.Material3.BodyLarge"
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
                                 android:layout_alignParentEnd="true"
@@ -316,7 +316,7 @@
                                 android:orientation="horizontal">
 
                                 <androidx.appcompat.widget.AppCompatTextView
-                                    style="@style/AppTheme.NewMaterial.Text.Medium"
+                                    style="@style/TextAppearance.Material3.BodyLarge"
                                     android:layout_width="wrap_content"
                                     android:layout_height="wrap_content"
                                     android:text="@{UtilityNumber.decimalToString(viewmodel.totalNumCnfInWarehouse, 1)}"
@@ -324,7 +324,7 @@
                                     android:textStyle="bold" />
 
                                 <androidx.appcompat.widget.AppCompatTextView
-                                    style="@style/AppTheme.NewMaterial.Text.Medium"
+                                    style="@style/TextAppearance.Material3.BodyLarge"
                                     android:layout_width="wrap_content"
                                     android:layout_height="wrap_content"
                                     android:layout_alignParentEnd="true"
@@ -416,7 +416,7 @@
                                 android:orientation="horizontal">
 
                                 <androidx.appcompat.widget.AppCompatTextView
-                                    style="@style/AppTheme.NewMaterial.Text.Medium"
+                                    style="@style/TextAppearance.Material3.BodyLarge"
                                     android:layout_width="wrap_content"
                                     android:layout_height="wrap_content"
                                     android:text="@{UtilityNumber.decimalToString(viewmodel.totalNumCnfCommitted, 1)}"
@@ -424,7 +424,7 @@
                                     android:textStyle="bold" />
 
                                 <androidx.appcompat.widget.AppCompatTextView
-                                    style="@style/AppTheme.NewMaterial.Text.Medium"
+                                    style="@style/TextAppearance.Material3.BodyLarge"
                                     android:layout_width="wrap_content"
                                     android:layout_height="wrap_content"
                                     android:layout_alignParentEnd="true"
@@ -525,7 +525,7 @@
                                 android:orientation="horizontal">
 
                                 <androidx.appcompat.widget.AppCompatTextView
-                                    style="@style/AppTheme.NewMaterial.Text.Medium"
+                                    style="@style/TextAppearance.Material3.BodyLarge"
                                     android:layout_width="wrap_content"
                                     android:layout_height="wrap_content"
                                     android:text="@{UtilityNumber.decimalToString(viewmodel.totalNumCnfToBeTaken)}"
@@ -533,7 +533,7 @@
                                     android:textStyle="bold" />
 
                                 <androidx.appcompat.widget.AppCompatTextView
-                                    style="@style/AppTheme.NewMaterial.Text.Medium"
+                                    style="@style/TextAppearance.Material3.BodyLarge"
                                     android:layout_width="wrap_content"
                                     android:layout_height="wrap_content"
                                     android:layout_alignParentEnd="true"
@@ -624,7 +624,7 @@
                                 android:orientation="horizontal">
 
                                 <androidx.appcompat.widget.AppCompatTextView
-                                    style="@style/AppTheme.NewMaterial.Text.Medium"
+                                    style="@style/TextAppearance.Material3.BodyLarge"
                                     android:layout_width="wrap_content"
                                     android:layout_height="wrap_content"
                                     android:text="@{UtilityNumber.decimalToString(viewmodel.totalNumCnfAvailable)}"
@@ -632,7 +632,7 @@
                                     android:textStyle="bold" />
 
                                 <androidx.appcompat.widget.AppCompatTextView
-                                    style="@style/AppTheme.NewMaterial.Text.Medium"
+                                    style="@style/TextAppearance.Material3.BodyLarge"
                                     android:layout_width="wrap_content"
                                     android:layout_height="wrap_content"
                                     android:layout_alignParentEnd="true"
diff --git a/app/src/main/res/layout/dialog_pv_edit_articolo.xml b/app/src/main/res/layout/dialog_pv_edit_articolo.xml
index 1728fecf..62bae6e3 100644
--- a/app/src/main/res/layout/dialog_pv_edit_articolo.xml
+++ b/app/src/main/res/layout/dialog_pv_edit_articolo.xml
@@ -151,7 +151,7 @@
                 android:layout_marginTop="8dp">
 
                 <androidx.appcompat.widget.AppCompatTextView
-                    style="@style/AppTheme.NewMaterial.Text.Medium"
+                    style="@style/TextAppearance.Material3.BodyLarge"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_toStartOf="@id/qta_ord_panel"
@@ -166,7 +166,7 @@
                     android:orientation="horizontal">
 
                     <androidx.appcompat.widget.AppCompatTextView
-                        style="@style/AppTheme.NewMaterial.Text.Medium"
+                        style="@style/TextAppearance.Material3.BodyLarge"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:text="@{UtilityNumber.decimalToString(view.articolo.qtaCnfGiacenza)}"
@@ -175,7 +175,7 @@
                         tools:text="1" />
 
                     <androidx.appcompat.widget.AppCompatTextView
-                        style="@style/AppTheme.NewMaterial.Text.Medium"
+                        style="@style/TextAppearance.Material3.BodyLarge"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_alignParentEnd="true"
@@ -186,7 +186,7 @@
 
 
                     <androidx.appcompat.widget.AppCompatTextView
-                        style="@style/AppTheme.NewMaterial.Text.Medium"
+                        style="@style/TextAppearance.Material3.BodyLarge"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_alignParentEnd="true"
@@ -196,7 +196,7 @@
                         android:textStyle="bold" />
 
                     <androidx.appcompat.widget.AppCompatTextView
-                        style="@style/AppTheme.NewMaterial.Text.Medium"
+                        style="@style/TextAppearance.Material3.BodyLarge"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_marginStart="0dp"
@@ -205,7 +205,7 @@
                         android:textStyle="bold" />
 
                     <androidx.appcompat.widget.AppCompatTextView
-                        style="@style/AppTheme.NewMaterial.Text.Medium"
+                        style="@style/TextAppearance.Material3.BodyLarge"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_alignParentEnd="true"
@@ -215,7 +215,7 @@
                         android:textStyle="bold" />
 
                     <androidx.appcompat.widget.AppCompatTextView
-                        style="@style/AppTheme.NewMaterial.Text.Medium"
+                        style="@style/TextAppearance.Material3.BodyLarge"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_alignParentEnd="true"
@@ -236,7 +236,7 @@
                 android:layout_marginTop="8dp">
 
                 <androidx.appcompat.widget.AppCompatTextView
-                    style="@style/AppTheme.NewMaterial.Text.Medium"
+                    style="@style/TextAppearance.Material3.BodyLarge"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_toStartOf="@id/incoming_cnf"
@@ -251,7 +251,7 @@
                     android:orientation="horizontal">
 
                     <androidx.appcompat.widget.AppCompatTextView
-                        style="@style/AppTheme.NewMaterial.Text.Medium"
+                        style="@style/TextAppearance.Material3.BodyLarge"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:text="@{UtilityNumber.decimalToString(view.articolo.getCnfDaRic())}"
@@ -260,7 +260,7 @@
                         tools:text="1" />
 
                     <androidx.appcompat.widget.AppCompatTextView
-                        style="@style/AppTheme.NewMaterial.Text.Medium"
+                        style="@style/TextAppearance.Material3.BodyLarge"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_alignParentEnd="true"
@@ -271,7 +271,7 @@
 
 
                     <androidx.appcompat.widget.AppCompatTextView
-                        style="@style/AppTheme.NewMaterial.Text.Medium"
+                        style="@style/TextAppearance.Material3.BodyLarge"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_alignParentEnd="true"
@@ -281,7 +281,7 @@
                         android:textStyle="bold" />
 
                     <androidx.appcompat.widget.AppCompatTextView
-                        style="@style/AppTheme.NewMaterial.Text.Medium"
+                        style="@style/TextAppearance.Material3.BodyLarge"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_marginStart="0dp"
@@ -290,7 +290,7 @@
                         android:textStyle="bold" />
 
                     <androidx.appcompat.widget.AppCompatTextView
-                        style="@style/AppTheme.NewMaterial.Text.Medium"
+                        style="@style/TextAppearance.Material3.BodyLarge"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_alignParentEnd="true"
@@ -300,7 +300,7 @@
                         android:textStyle="bold" />
 
                     <androidx.appcompat.widget.AppCompatTextView
-                        style="@style/AppTheme.NewMaterial.Text.Medium"
+                        style="@style/TextAppearance.Material3.BodyLarge"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_alignParentEnd="true"
@@ -322,7 +322,7 @@
                 android:layout_marginTop="8dp">
 
                 <androidx.appcompat.widget.AppCompatTextView
-                    style="@style/AppTheme.NewMaterial.Text.Medium"
+                    style="@style/TextAppearance.Material3.BodyLarge"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_toStartOf="@id/max_cnf"
@@ -337,7 +337,7 @@
                     android:orientation="horizontal">
 
                     <androidx.appcompat.widget.AppCompatTextView
-                        style="@style/AppTheme.NewMaterial.Text.Medium"
+                        style="@style/TextAppearance.Material3.BodyLarge"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:text="@{UtilityNumber.decimalToString(view.articolo.ctMaxOrd)}"
@@ -346,7 +346,7 @@
                         tools:text="1" />
 
                     <androidx.appcompat.widget.AppCompatTextView
-                        style="@style/AppTheme.NewMaterial.Text.Medium"
+                        style="@style/TextAppearance.Material3.BodyLarge"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_alignParentEnd="true"
@@ -357,7 +357,7 @@
 
 
                     <androidx.appcompat.widget.AppCompatTextView
-                        style="@style/AppTheme.NewMaterial.Text.Medium"
+                        style="@style/TextAppearance.Material3.BodyLarge"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_alignParentEnd="true"
@@ -367,7 +367,7 @@
                         android:textStyle="bold" />
 
                     <androidx.appcompat.widget.AppCompatTextView
-                        style="@style/AppTheme.NewMaterial.Text.Medium"
+                        style="@style/TextAppearance.Material3.BodyLarge"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_marginStart="0dp"
@@ -376,7 +376,7 @@
                         android:textStyle="bold" />
 
                     <androidx.appcompat.widget.AppCompatTextView
-                        style="@style/AppTheme.NewMaterial.Text.Medium"
+                        style="@style/TextAppearance.Material3.BodyLarge"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_alignParentEnd="true"
@@ -386,7 +386,7 @@
                         android:textStyle="bold" />
 
                     <androidx.appcompat.widget.AppCompatTextView
-                        style="@style/AppTheme.NewMaterial.Text.Medium"
+                        style="@style/TextAppearance.Material3.BodyLarge"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_alignParentEnd="true"
@@ -436,7 +436,7 @@
                         android:orientation="horizontal">
 
                         <androidx.appcompat.widget.AppCompatTextView
-                            style="@style/AppTheme.NewMaterial.Text.Medium"
+                            style="@style/TextAppearance.Material3.BodyLarge"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:text="@{UtilityNumber.decimalToString(view.articolo.qtaCnfPrevistaVendita)}"
@@ -445,7 +445,7 @@
                             android:textStyle="bold" />
 
                         <androidx.appcompat.widget.AppCompatTextView
-                            style="@style/AppTheme.NewMaterial.Text.Medium"
+                            style="@style/TextAppearance.Material3.BodyLarge"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:layout_alignParentEnd="true"
@@ -535,7 +535,7 @@
                         android:orientation="horizontal">
 
                         <androidx.appcompat.widget.AppCompatTextView
-                            style="@style/AppTheme.NewMaterial.Text.Medium"
+                            style="@style/TextAppearance.Material3.BodyLarge"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:text="@{UtilityNumber.decimalToString(view.articolo.qtaCnfProposta)}"
@@ -544,7 +544,7 @@
                             android:textStyle="bold" />
 
                         <androidx.appcompat.widget.AppCompatTextView
-                            style="@style/AppTheme.NewMaterial.Text.Medium"
+                            style="@style/TextAppearance.Material3.BodyLarge"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:layout_alignParentEnd="true"
diff --git a/app/src/main/res/layout/dialog_row_info_prod_fabbisogno_linee_prod.xml b/app/src/main/res/layout/dialog_row_info_prod_fabbisogno_linee_prod.xml
index 936337a8..e40fc974 100644
--- a/app/src/main/res/layout/dialog_row_info_prod_fabbisogno_linee_prod.xml
+++ b/app/src/main/res/layout/dialog_row_info_prod_fabbisogno_linee_prod.xml
@@ -57,7 +57,7 @@
                     <androidx.appcompat.widget.AppCompatTextView
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        style="@style/AppTheme.NewMaterial.Text.Medium"
+                        style="@style/TextAppearance.Material3.BodyLarge"
                         android:text="Linee di impegno"
                         android:layout_marginBottom="8dp"/>
 
diff --git a/app/src/main/res/layout/fragment_articoli_in_giacenza.xml b/app/src/main/res/layout/fragment_articoli_in_giacenza.xml
index 3ff6ecd3..285bfe54 100644
--- a/app/src/main/res/layout/fragment_articoli_in_giacenza.xml
+++ b/app/src/main/res/layout/fragment_articoli_in_giacenza.xml
@@ -67,7 +67,7 @@
                     android:src="@drawable/ic_playlist_add_check_24dp" />
 
                 <androidx.appcompat.widget.AppCompatTextView
-                    style="@style/AppTheme.NewMaterial.Text.Medium"
+                    style="@style/TextAppearance.Material3.BodyLarge"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:gravity="center_horizontal"
diff --git a/app/src/main/res/layout/fragment_choose_ords_lav_from_list__item_model.xml b/app/src/main/res/layout/fragment_choose_ords_lav_from_list__item_model.xml
index 9cd70448..cd885737 100644
--- a/app/src/main/res/layout/fragment_choose_ords_lav_from_list__item_model.xml
+++ b/app/src/main/res/layout/fragment_choose_ords_lav_from_list__item_model.xml
@@ -63,7 +63,7 @@
                 android:layout_height="wrap_content">
 
                 <androidx.appcompat.widget.AppCompatTextView
-                    style="@style/AppTheme.NewMaterial.Text.Medium"
+                    style="@style/TextAppearance.Material3.BodyLarge"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:text="@{Html.fromHtml(listModel.preDescriptionText)}"
@@ -92,7 +92,7 @@
 
 
             <androidx.appcompat.widget.AppCompatTextView
-                style="@style/AppTheme.NewMaterial.Text.Medium"
+                style="@style/TextAppearance.Material3.BodyLarge"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:ellipsize="end"
diff --git a/app/src/main/res/layout/fragment_elenco_inventario.xml b/app/src/main/res/layout/fragment_elenco_inventario.xml
index c820c97d..3f7cb91e 100644
--- a/app/src/main/res/layout/fragment_elenco_inventario.xml
+++ b/app/src/main/res/layout/fragment_elenco_inventario.xml
@@ -65,7 +65,7 @@
                     android:src="@drawable/ic_playlist_add_check_24dp" />
 
                 <androidx.appcompat.widget.AppCompatTextView
-                    style="@style/AppTheme.NewMaterial.Text.Medium"
+                    style="@style/TextAppearance.Material3.BodyLarge"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:gravity="center_horizontal"
diff --git a/app/src/main/res/layout/fragment_main_ordini_uscita.xml b/app/src/main/res/layout/fragment_main_ordini_uscita.xml
index 7c86adde..cdd15b7f 100644
--- a/app/src/main/res/layout/fragment_main_ordini_uscita.xml
+++ b/app/src/main/res/layout/fragment_main_ordini_uscita.xml
@@ -20,8 +20,7 @@
 
     <FrameLayout
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:background="@android:color/white">
+        android:layout_height="match_parent">
 
         <androidx.appcompat.widget.LinearLayoutCompat
             android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/fragment_main_ordini_uscita__list_group_model.xml b/app/src/main/res/layout/fragment_main_ordini_uscita__list_group_model.xml
index be1ddb89..9bf0e87e 100644
--- a/app/src/main/res/layout/fragment_main_ordini_uscita__list_group_model.xml
+++ b/app/src/main/res/layout/fragment_main_ordini_uscita__list_group_model.xml
@@ -15,8 +15,7 @@
         android:layout_height="wrap_content"
         android:paddingStart="4dp"
         android:paddingEnd="12dp"
-        android:paddingVertical="4dp"
-        android:background="@color/full_white">
+        android:paddingVertical="4dp">
 
         <!-- 2. Lo spazio di 8dp è ora gestito con constraint -->
         <View
@@ -46,7 +45,6 @@
             tools:text="Ord. Ven. 39 del 27 ott 2017"
             android:ellipsize="end"
             android:maxLines="1"
-            android:textColor="#000"
             style="@style/TextAppearance.Material3.BodyMedium"
             app:layout_constraintStart_toEndOf="@id/checkbox"
             app:layout_constraintEnd_toStartOf="@id/right_descrizione"
@@ -74,7 +72,6 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             tools:text="Cons 07 nov 2018"
-            android:textColor="#000"
             style="@style/TextAppearance.Material3.BodyMedium"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintTop_toTopOf="parent"
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 465a1fa7..d88fab43 100644
--- a/app/src/main/res/layout/fragment_main_rettifica_giacenze.xml
+++ b/app/src/main/res/layout/fragment_main_rettifica_giacenze.xml
@@ -61,7 +61,7 @@
                             android:paddingBottom="8dp">
 
                             <androidx.appcompat.widget.AppCompatTextView
-                                style="@style/AppTheme.NewMaterial.Text.Medium"
+                                style="@style/TextAppearance.Material3.BodyLarge"
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
                                 android:text="@{Html.fromHtml(String.format(context.getString(R.string.lu_number_data_text), view.currentMtbColtObs.numCollo, UtilityDate.formatDate(view.currentMtbColtObs.getDataColloD(), UtilityDate.COMMONS_DATE_FORMATS.DMY_HUMAN)))}"
@@ -76,14 +76,14 @@
                                 app:visibilityWhenNotNull="@{view.currentMtbColtObs.posizione}">
 
                                 <androidx.appcompat.widget.AppCompatTextView
-                                    style="@style/AppTheme.NewMaterial.Text.Medium"
+                                    style="@style/TextAppearance.Material3.BodyLarge"
                                     android:layout_width="wrap_content"
                                     android:layout_height="wrap_content"
                                     android:text="Posizione: "
                                     android:textColor="@android:color/white"                                      />
 
                                 <androidx.appcompat.widget.AppCompatTextView
-                                    style="@style/AppTheme.NewMaterial.Text.Medium"
+                                    style="@style/TextAppearance.Material3.BodyLarge"
                                     android:layout_width="wrap_content"
                                     android:layout_height="wrap_content"
                                     android:text="@{view.currentMtbColtObs.posizione}"
@@ -264,7 +264,7 @@
                                 android:src="@drawable/ic_playlist_add_check_24dp" />
 
                             <androidx.appcompat.widget.AppCompatTextView
-                                style="@style/AppTheme.NewMaterial.Text.Medium"
+                                style="@style/TextAppearance.Material3.BodyLarge"
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
                                 android:gravity="center_horizontal"
diff --git a/app/src/main/res/layout/fragment_prod_fabbisogno_linee_prod.xml b/app/src/main/res/layout/fragment_prod_fabbisogno_linee_prod.xml
index 8d68963d..66e8e0a1 100644
--- a/app/src/main/res/layout/fragment_prod_fabbisogno_linee_prod.xml
+++ b/app/src/main/res/layout/fragment_prod_fabbisogno_linee_prod.xml
@@ -66,7 +66,7 @@
                     android:src="@drawable/ic_playlist_add_check_24dp" />
 
                 <androidx.appcompat.widget.AppCompatTextView
-                    style="@style/AppTheme.NewMaterial.Text.Medium"
+                    style="@style/TextAppearance.Material3.BodyLarge"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:gravity="center_horizontal"
diff --git a/app/src/main/res/layout/fragment_prod_rientro_merce_order_detail.xml b/app/src/main/res/layout/fragment_prod_rientro_merce_order_detail.xml
index db756d16..35e6f088 100644
--- a/app/src/main/res/layout/fragment_prod_rientro_merce_order_detail.xml
+++ b/app/src/main/res/layout/fragment_prod_rientro_merce_order_detail.xml
@@ -812,7 +812,7 @@
                                     android:src="@drawable/ic_playlist_add_check_24dp" />
 
                                 <androidx.appcompat.widget.AppCompatTextView
-                                    style="@style/AppTheme.NewMaterial.Text.Medium"
+                                    style="@style/TextAppearance.Material3.BodyLarge"
                                     android:layout_width="wrap_content"
                                     android:layout_height="wrap_content"
                                     android:gravity="center_horizontal"
diff --git a/app/src/main/res/layout/fragment_prod_rientro_merce_order_detail__mtb_colt_item_model.xml b/app/src/main/res/layout/fragment_prod_rientro_merce_order_detail__mtb_colt_item_model.xml
index 867a2945..0fe1dd93 100644
--- a/app/src/main/res/layout/fragment_prod_rientro_merce_order_detail__mtb_colt_item_model.xml
+++ b/app/src/main/res/layout/fragment_prod_rientro_merce_order_detail__mtb_colt_item_model.xml
@@ -95,7 +95,7 @@
                             android:layout_alignParentStart="true"
                             android:layout_toStartOf="@id/peso_lordo_collo"
                             android:text="@{mtbColt.getDataColloHumanLong()}"
-                            android:textAppearance="@style/AppTheme.NewMaterial.Text.Medium"
+                            android:textAppearance="@style/TextAppearance.Material3.BodyLarge"
                             android:textColor="@android:color/black"
                             android:textSize="16sp"
                             tools:text="28 ottobre 2018" />
@@ -124,7 +124,7 @@
                         android:paddingStart="6dp"
                         android:paddingEnd="6dp"
                         android:text="@{UtilityNumber.decimalToString(mtbColt.pesoKg, 0) + ` KG`}"
-                        android:textAppearance="@style/AppTheme.NewMaterial.Text.Medium"
+                        android:textAppearance="@style/TextAppearance.Material3.BodyLarge"
                         android:textColor="@android:color/black"
                         android:textStyle="bold"
                         tools:text="658 KG" />
diff --git a/app/src/main/res/layout/fragment_prod_rientro_merce_order_list__list_group_model.xml b/app/src/main/res/layout/fragment_prod_rientro_merce_order_list__list_group_model.xml
index a67f3a23..6b56d54c 100644
--- a/app/src/main/res/layout/fragment_prod_rientro_merce_order_list__list_group_model.xml
+++ b/app/src/main/res/layout/fragment_prod_rientro_merce_order_list__list_group_model.xml
@@ -60,7 +60,7 @@
 
                 <androidx.appcompat.widget.AppCompatTextView
                     android:id="@+id/descrizione"
-                    style="@style/AppTheme.NewMaterial.Text.Medium"
+                    style="@style/TextAppearance.Material3.BodyLarge"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_alignParentStart="true"
diff --git a/app/src/main/res/layout/fragment_prod_riposizionamento_da_prod.xml b/app/src/main/res/layout/fragment_prod_riposizionamento_da_prod.xml
index aa105a21..67760100 100644
--- a/app/src/main/res/layout/fragment_prod_riposizionamento_da_prod.xml
+++ b/app/src/main/res/layout/fragment_prod_riposizionamento_da_prod.xml
@@ -67,7 +67,7 @@
                     android:src="@drawable/ic_playlist_add_check_24dp" />
 
                 <androidx.appcompat.widget.AppCompatTextView
-                    style="@style/AppTheme.NewMaterial.Text.Medium"
+                    style="@style/TextAppearance.Material3.BodyLarge"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:gravity="center_horizontal"
diff --git a/app/src/main/res/layout/fragment_pv_ordini_acquisto__list_header.xml b/app/src/main/res/layout/fragment_pv_ordini_acquisto__list_header.xml
index 726cef3e..5c79ca59 100644
--- a/app/src/main/res/layout/fragment_pv_ordini_acquisto__list_header.xml
+++ b/app/src/main/res/layout/fragment_pv_ordini_acquisto__list_header.xml
@@ -21,7 +21,7 @@
                 android:id="@+id/title"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                style="@style/AppTheme.NewMaterial.Text.Medium"
+                style="@style/TextAppearance.Material3.BodyLarge"
                 android:textAllCaps="true"
                 android:layout_centerVertical="true"
                 android:layout_alignParentStart="true"
diff --git a/app/src/main/res/layout/fragment_verifica_giacenze.xml b/app/src/main/res/layout/fragment_verifica_giacenze.xml
index 5024a6c3..c92c668a 100644
--- a/app/src/main/res/layout/fragment_verifica_giacenze.xml
+++ b/app/src/main/res/layout/fragment_verifica_giacenze.xml
@@ -63,7 +63,7 @@
                     android:src="@drawable/ic_black_barcode_scanner" />
 
                 <androidx.appcompat.widget.AppCompatTextView
-                    style="@style/AppTheme.NewMaterial.Text.Medium"
+                    style="@style/TextAppearance.Material3.BodyLarge"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:gravity="center_horizontal"
diff --git a/app/src/main/res/layout/layout_filter_agente.xml b/app/src/main/res/layout/layout_filter_agente.xml
index a497b705..47d5c9a8 100644
--- a/app/src/main/res/layout/layout_filter_agente.xml
+++ b/app/src/main/res/layout/layout_filter_agente.xml
@@ -39,7 +39,7 @@
 
                 <androidx.appcompat.widget.AppCompatTextView
                     android:id="@+id/bottom_sheet_actions_title"
-                    style="@style/AppTheme.NewMaterial.Text.Medium"
+                    style="@style/TextAppearance.Material3.BodyLarge"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:ellipsize="end"
@@ -47,7 +47,6 @@
                     android:paddingStart="0dp"
                     android:paddingEnd="8dp"
                     android:text="@{view.filterName}"
-                    android:textColor="#444"
                     android:textStyle="bold"
                     tools:text="Nome filtro" />
 
@@ -59,8 +58,7 @@
                     android:maxLines="2"
                     android:paddingStart="0dp"
                     android:paddingEnd="8dp"
-                    android:text="Seleziona l'agente che vuoi filtrare"
-                    android:textColor="#444" />
+                    android:text="Seleziona l'agente che vuoi filtrare" />
 
             </androidx.appcompat.widget.LinearLayoutCompat>
 
@@ -68,8 +66,7 @@
                 android:id="@+id/search_view"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_alignParentEnd="true"
-                android:backgroundTint="@android:color/white" />
+                android:layout_alignParentEnd="true" />
 
 
         </RelativeLayout>
diff --git a/app/src/main/res/layout/layout_filter_automezzo.xml b/app/src/main/res/layout/layout_filter_automezzo.xml
index 00d0197e..8aed8686 100644
--- a/app/src/main/res/layout/layout_filter_automezzo.xml
+++ b/app/src/main/res/layout/layout_filter_automezzo.xml
@@ -39,7 +39,7 @@
 
                 <androidx.appcompat.widget.AppCompatTextView
                     android:id="@+id/bottom_sheet_actions_title"
-                    style="@style/AppTheme.NewMaterial.Text.Medium"
+                    style="@style/TextAppearance.Material3.BodyLarge"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:ellipsize="end"
@@ -47,7 +47,6 @@
                     android:paddingStart="0dp"
                     android:paddingEnd="8dp"
                     android:text="@{view.filterName}"
-                    android:textColor="#444"
                     android:textStyle="bold"
                     tools:text="Nome filtro" />
 
@@ -60,7 +59,7 @@
                     android:paddingStart="0dp"
                     android:paddingEnd="8dp"
                     android:text="Seleziona l'automezzo che vuoi filtrare"
-                    android:textColor="#444" />
+                     />
 
             </androidx.appcompat.widget.LinearLayoutCompat>
 
@@ -68,8 +67,7 @@
                 android:id="@+id/search_view"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_alignParentEnd="true"
-                android:backgroundTint="@android:color/white"/>
+                android:layout_alignParentEnd="true"/>
 
 
         </RelativeLayout>
diff --git a/app/src/main/res/layout/layout_filter_cliente.xml b/app/src/main/res/layout/layout_filter_cliente.xml
index 821dc449..4354cdd3 100644
--- a/app/src/main/res/layout/layout_filter_cliente.xml
+++ b/app/src/main/res/layout/layout_filter_cliente.xml
@@ -39,7 +39,7 @@
 
                 <androidx.appcompat.widget.AppCompatTextView
                     android:id="@+id/bottom_sheet_actions_title"
-                    style="@style/AppTheme.NewMaterial.Text.Medium"
+                    style="@style/TextAppearance.Material3.BodyLarge"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:ellipsize="end"
@@ -47,7 +47,7 @@
                     android:paddingStart="0dp"
                     android:paddingEnd="8dp"
                     android:text="@{view.filterName}"
-                    android:textColor="#444"
+
                     android:textStyle="bold"
                     tools:text="Nome filtro" />
 
@@ -60,7 +60,7 @@
                     android:paddingStart="0dp"
                     android:paddingEnd="8dp"
                     android:text="Seleziona il cliente che vuoi filtrare"
-                    android:textColor="#444" />
+                     />
 
             </androidx.appcompat.widget.LinearLayoutCompat>
 
@@ -68,8 +68,7 @@
                 android:id="@+id/search_view"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_alignParentEnd="true"
-                android:backgroundTint="@android:color/white" />
+                android:layout_alignParentEnd="true" />
 
 
         </RelativeLayout>
diff --git a/app/src/main/res/layout/layout_filter_cod_art.xml b/app/src/main/res/layout/layout_filter_cod_art.xml
index 5511a58f..d73e4597 100644
--- a/app/src/main/res/layout/layout_filter_cod_art.xml
+++ b/app/src/main/res/layout/layout_filter_cod_art.xml
@@ -39,7 +39,7 @@
 
                 <androidx.appcompat.widget.AppCompatTextView
                     android:id="@+id/bottom_sheet_actions_title"
-                    style="@style/AppTheme.NewMaterial.Text.Medium"
+                    style="@style/TextAppearance.Material3.BodyLarge"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:ellipsize="end"
@@ -47,7 +47,7 @@
                     android:paddingStart="0dp"
                     android:paddingEnd="8dp"
                     android:text="@{view.filterName}"
-                    android:textColor="#444"
+
                     android:textStyle="bold"
                     tools:text="Nome filtro" />
 
@@ -60,7 +60,7 @@
                     android:paddingStart="0dp"
                     android:paddingEnd="8dp"
                     android:text="Seleziona il codice articolo che vuoi filtrare"
-                    android:textColor="#444" />
+                     />
 
             </androidx.appcompat.widget.LinearLayoutCompat>
 
@@ -68,8 +68,7 @@
                 android:id="@+id/search_view"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_alignParentEnd="true"
-                android:backgroundTint="@android:color/white" />
+                android:layout_alignParentEnd="true" />
 
 
         </RelativeLayout>
diff --git a/app/src/main/res/layout/layout_filter_commessa.xml b/app/src/main/res/layout/layout_filter_commessa.xml
index 0a4e3aa1..0dc05489 100644
--- a/app/src/main/res/layout/layout_filter_commessa.xml
+++ b/app/src/main/res/layout/layout_filter_commessa.xml
@@ -39,7 +39,7 @@
 
                 <androidx.appcompat.widget.AppCompatTextView
                     android:id="@+id/bottom_sheet_actions_title"
-                    style="@style/AppTheme.NewMaterial.Text.Medium"
+                    style="@style/TextAppearance.Material3.BodyLarge"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:ellipsize="end"
@@ -47,7 +47,7 @@
                     android:paddingStart="0dp"
                     android:paddingEnd="8dp"
                     android:text="@{view.filterName}"
-                    android:textColor="#444"
+
                     android:textStyle="bold"
                     tools:text="Nome filtro" />
 
@@ -60,7 +60,7 @@
                     android:paddingStart="0dp"
                     android:paddingEnd="8dp"
                     android:text="Seleziona la commessa che vuoi filtrare"
-                    android:textColor="#444" />
+                     />
 
             </androidx.appcompat.widget.LinearLayoutCompat>
 
@@ -68,8 +68,7 @@
                 android:id="@+id/search_view"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_alignParentEnd="true"
-                android:backgroundTint="@android:color/white" />
+                android:layout_alignParentEnd="true" />
 
 
         </RelativeLayout>
diff --git a/app/src/main/res/layout/layout_filter_deposito.xml b/app/src/main/res/layout/layout_filter_deposito.xml
index 0638b413..6edbc818 100644
--- a/app/src/main/res/layout/layout_filter_deposito.xml
+++ b/app/src/main/res/layout/layout_filter_deposito.xml
@@ -39,7 +39,7 @@
 
                 <androidx.appcompat.widget.AppCompatTextView
                     android:id="@+id/bottom_sheet_actions_title"
-                    style="@style/AppTheme.NewMaterial.Text.Medium"
+                    style="@style/TextAppearance.Material3.BodyLarge"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:ellipsize="end"
@@ -47,7 +47,7 @@
                     android:paddingStart="0dp"
                     android:paddingEnd="8dp"
                     android:text="@{view.filterName}"
-                    android:textColor="#444"
+
                     android:textStyle="bold"
                     tools:text="Nome filtro" />
 
@@ -60,7 +60,7 @@
                     android:paddingStart="0dp"
                     android:paddingEnd="8dp"
                     android:text="Seleziona il deposito che vuoi filtrare"
-                    android:textColor="#444" />
+                     />
 
             </androidx.appcompat.widget.LinearLayoutCompat>
 
@@ -68,8 +68,7 @@
                 android:id="@+id/search_view"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_alignParentEnd="true"
-                android:backgroundTint="@android:color/white" />
+                android:layout_alignParentEnd="true" />
 
 
         </RelativeLayout>
diff --git a/app/src/main/res/layout/layout_filter_descr.xml b/app/src/main/res/layout/layout_filter_descr.xml
index 86ded055..1e3a6391 100644
--- a/app/src/main/res/layout/layout_filter_descr.xml
+++ b/app/src/main/res/layout/layout_filter_descr.xml
@@ -39,7 +39,7 @@
 
                 <androidx.appcompat.widget.AppCompatTextView
                     android:id="@+id/bottom_sheet_actions_title"
-                    style="@style/AppTheme.NewMaterial.Text.Medium"
+                    style="@style/TextAppearance.Material3.BodyLarge"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:ellipsize="end"
@@ -47,7 +47,7 @@
                     android:paddingStart="0dp"
                     android:paddingEnd="8dp"
                     android:text="@{view.filterName}"
-                    android:textColor="#444"
+
                     android:textStyle="bold"
                     tools:text="Nome filtro" />
 
@@ -60,7 +60,7 @@
                     android:paddingStart="0dp"
                     android:paddingEnd="8dp"
                     android:text="Seleziona la descrizione articolo che vuoi filtrare"
-                    android:textColor="#444" />
+                     />
 
             </androidx.appcompat.widget.LinearLayoutCompat>
 
@@ -68,8 +68,7 @@
                 android:id="@+id/search_view"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_alignParentEnd="true"
-                android:backgroundTint="@android:color/white" />
+                android:layout_alignParentEnd="true" />
 
 
         </RelativeLayout>
diff --git a/app/src/main/res/layout/layout_filter_gruppo_merc.xml b/app/src/main/res/layout/layout_filter_gruppo_merc.xml
index 5a4c8bae..f4cd3c88 100644
--- a/app/src/main/res/layout/layout_filter_gruppo_merc.xml
+++ b/app/src/main/res/layout/layout_filter_gruppo_merc.xml
@@ -39,7 +39,7 @@
 
                 <androidx.appcompat.widget.AppCompatTextView
                     android:id="@+id/bottom_sheet_actions_title"
-                    style="@style/AppTheme.NewMaterial.Text.Medium"
+                    style="@style/TextAppearance.Material3.BodyLarge"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:ellipsize="end"
@@ -47,7 +47,7 @@
                     android:paddingStart="0dp"
                     android:paddingEnd="8dp"
                     android:text="@{view.filterName}"
-                    android:textColor="#444"
+
                     android:textStyle="bold"
                     tools:text="Nome filtro" />
 
@@ -60,7 +60,7 @@
                     android:paddingStart="0dp"
                     android:paddingEnd="8dp"
                     android:text="Seleziona il gruppo merceologico che vuoi filtrare"
-                    android:textColor="#444" />
+                     />
 
             </androidx.appcompat.widget.LinearLayoutCompat>
 
@@ -68,8 +68,7 @@
                 android:id="@+id/search_view"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_alignParentEnd="true"
-                android:backgroundTint="@android:color/white" />
+                android:layout_alignParentEnd="true" />
 
 
         </RelativeLayout>
diff --git a/app/src/main/res/layout/layout_filter_numero_ordine.xml b/app/src/main/res/layout/layout_filter_numero_ordine.xml
index 7cb87d9f..bd3f8e03 100644
--- a/app/src/main/res/layout/layout_filter_numero_ordine.xml
+++ b/app/src/main/res/layout/layout_filter_numero_ordine.xml
@@ -38,7 +38,7 @@
 
                 <androidx.appcompat.widget.AppCompatTextView
                     android:id="@+id/bottom_sheet_actions_title"
-                    style="@style/AppTheme.NewMaterial.Text.Medium"
+                    style="@style/TextAppearance.Material3.BodyLarge"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:ellipsize="end"
@@ -46,7 +46,6 @@
                     android:paddingStart="0dp"
                     android:paddingEnd="8dp"
                     android:text="@{view.filterName}"
-                    android:textColor="#444"
                     android:textStyle="bold"
                     tools:text="Nome filtro" />
 
@@ -58,8 +57,7 @@
                     android:maxLines="2"
                     android:paddingStart="0dp"
                     android:paddingEnd="8dp"
-                    android:text="Seleziona il numero d'ordine che vuoi filtrare"
-                    android:textColor="#444" />
+                    android:text="Seleziona il numero d'ordine che vuoi filtrare" />
 
             </androidx.appcompat.widget.LinearLayoutCompat>
 
@@ -67,8 +65,7 @@
                 android:id="@+id/search_view"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_alignParentEnd="true"
-                android:backgroundTint="@android:color/white" />
+                android:layout_alignParentEnd="true" />
 
 
         </RelativeLayout>
diff --git a/app/src/main/res/layout/layout_filter_paese.xml b/app/src/main/res/layout/layout_filter_paese.xml
index ecad9251..1068a7d9 100644
--- a/app/src/main/res/layout/layout_filter_paese.xml
+++ b/app/src/main/res/layout/layout_filter_paese.xml
@@ -39,7 +39,7 @@
 
                 <androidx.appcompat.widget.AppCompatTextView
                     android:id="@+id/bottom_sheet_actions_title"
-                    style="@style/AppTheme.NewMaterial.Text.Medium"
+                    style="@style/TextAppearance.Material3.BodyLarge"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:ellipsize="end"
@@ -47,7 +47,7 @@
                     android:paddingStart="0dp"
                     android:paddingEnd="8dp"
                     android:text="@{view.filterName}"
-                    android:textColor="#444"
+
                     android:textStyle="bold"
                     tools:text="Nome filtro" />
 
@@ -60,7 +60,7 @@
                     android:paddingStart="0dp"
                     android:paddingEnd="8dp"
                     android:text="Seleziona l'automezzo che vuoi filtrare"
-                    android:textColor="#444" />
+                     />
 
             </androidx.appcompat.widget.LinearLayoutCompat>
 
@@ -68,8 +68,7 @@
                 android:id="@+id/search_view"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_alignParentEnd="true"
-                android:backgroundTint="@android:color/white" />
+                android:layout_alignParentEnd="true" />
 
 
         </RelativeLayout>
diff --git a/app/src/main/res/layout/layout_filter_posizione.xml b/app/src/main/res/layout/layout_filter_posizione.xml
index 4d8d27ee..45ba9be6 100644
--- a/app/src/main/res/layout/layout_filter_posizione.xml
+++ b/app/src/main/res/layout/layout_filter_posizione.xml
@@ -39,7 +39,7 @@
 
                 <androidx.appcompat.widget.AppCompatTextView
                     android:id="@+id/bottom_sheet_actions_title"
-                    style="@style/AppTheme.NewMaterial.Text.Medium"
+                    style="@style/TextAppearance.Material3.BodyLarge"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:ellipsize="end"
@@ -47,7 +47,7 @@
                     android:paddingStart="0dp"
                     android:paddingEnd="8dp"
                     android:text="@{view.filterName}"
-                    android:textColor="#444"
+
                     android:textStyle="bold"
                     tools:text="Nome filtro" />
 
@@ -60,7 +60,7 @@
                     android:paddingStart="0dp"
                     android:paddingEnd="8dp"
                     android:text="Seleziona la posizione che vuoi filtrare"
-                    android:textColor="#444" />
+                     />
 
             </androidx.appcompat.widget.LinearLayoutCompat>
 
@@ -68,8 +68,7 @@
                 android:id="@+id/search_view"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_alignParentEnd="true"
-                android:backgroundTint="@android:color/white" />
+                android:layout_alignParentEnd="true" />
 
 
         </RelativeLayout>
diff --git a/app/src/main/res/layout/layout_filter_term_cons.xml b/app/src/main/res/layout/layout_filter_term_cons.xml
index b9a8c3c4..93204c96 100644
--- a/app/src/main/res/layout/layout_filter_term_cons.xml
+++ b/app/src/main/res/layout/layout_filter_term_cons.xml
@@ -39,7 +39,7 @@
 
                 <androidx.appcompat.widget.AppCompatTextView
                     android:id="@+id/bottom_sheet_actions_title"
-                    style="@style/AppTheme.NewMaterial.Text.Medium"
+                    style="@style/TextAppearance.Material3.BodyLarge"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:ellipsize="end"
@@ -47,7 +47,7 @@
                     android:paddingStart="0dp"
                     android:paddingEnd="8dp"
                     android:text="@{view.filterName}"
-                    android:textColor="#444"
+
                     android:textStyle="bold"
                     tools:text="Nome filtro" />
 
@@ -60,7 +60,7 @@
                     android:paddingStart="0dp"
                     android:paddingEnd="8dp"
                     android:text="Seleziona i termini di consegna che vuoi filtrare"
-                    android:textColor="#444" />
+                     />
 
             </androidx.appcompat.widget.LinearLayoutCompat>
 
@@ -68,8 +68,7 @@
                 android:id="@+id/search_view"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_alignParentEnd="true"
-                android:backgroundTint="@android:color/white" />
+                android:layout_alignParentEnd="true" />
 
 
         </RelativeLayout>
diff --git a/app/src/main/res/layout/layout_filter_vettore.xml b/app/src/main/res/layout/layout_filter_vettore.xml
index d1770693..3dfe3b54 100644
--- a/app/src/main/res/layout/layout_filter_vettore.xml
+++ b/app/src/main/res/layout/layout_filter_vettore.xml
@@ -39,7 +39,7 @@
 
                 <androidx.appcompat.widget.AppCompatTextView
                     android:id="@+id/bottom_sheet_actions_title"
-                    style="@style/AppTheme.NewMaterial.Text.Medium"
+                    style="@style/TextAppearance.Material3.BodyLarge"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:ellipsize="end"
@@ -47,7 +47,7 @@
                     android:paddingStart="0dp"
                     android:paddingEnd="8dp"
                     android:text="@{view.filterName}"
-                    android:textColor="#444"
+
                     android:textStyle="bold"
                     tools:text="Nome filtro" />
 
@@ -60,7 +60,7 @@
                     android:paddingStart="0dp"
                     android:paddingEnd="8dp"
                     android:text="Seleziona il vettore che vuoi filtrare"
-                    android:textColor="#444" />
+                     />
 
             </androidx.appcompat.widget.LinearLayoutCompat>
 
@@ -68,8 +68,7 @@
                 android:id="@+id/search_view"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_alignParentEnd="true"
-                android:backgroundTint="@android:color/white" />
+                android:layout_alignParentEnd="true" />
 
 
         </RelativeLayout>
diff --git a/app/src/main/res/layout/layout_filter_viaggio.xml b/app/src/main/res/layout/layout_filter_viaggio.xml
index 6b48b5c2..0e277fe7 100644
--- a/app/src/main/res/layout/layout_filter_viaggio.xml
+++ b/app/src/main/res/layout/layout_filter_viaggio.xml
@@ -39,7 +39,7 @@
 
                 <androidx.appcompat.widget.AppCompatTextView
                     android:id="@+id/bottom_sheet_actions_title"
-                    style="@style/AppTheme.NewMaterial.Text.Medium"
+                    style="@style/TextAppearance.Material3.BodyLarge"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:ellipsize="end"
@@ -47,7 +47,7 @@
                     android:paddingStart="0dp"
                     android:paddingEnd="8dp"
                     android:text="@{view.filterName}"
-                    android:textColor="#444"
+
                     android:textStyle="bold"
                     tools:text="Nome filtro" />
 
@@ -60,7 +60,7 @@
                     android:paddingStart="0dp"
                     android:paddingEnd="8dp"
                     android:text="Seleziona il viaggio che vuoi filtrare"
-                    android:textColor="#444" />
+                     />
 
             </androidx.appcompat.widget.LinearLayoutCompat>
 
@@ -68,8 +68,7 @@
                 android:id="@+id/search_view"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_alignParentEnd="true"
-                android:backgroundTint="@android:color/white" />
+                android:layout_alignParentEnd="true" />
 
 
         </RelativeLayout>
diff --git a/app/src/main/res/layout/picking_resi_main_list__item.xml b/app/src/main/res/layout/picking_resi_main_list__item.xml
index 3863b58e..2c92b0d3 100644
--- a/app/src/main/res/layout/picking_resi_main_list__item.xml
+++ b/app/src/main/res/layout/picking_resi_main_list__item.xml
@@ -47,7 +47,7 @@
                     android:layout_marginStart="4dp"
                     android:textStyle="bold"
                     android:textColor="@color/green_700"
-                    style="@style/AppTheme.NewMaterial.Text.Medium"
+                    style="@style/TextAppearance.Material3.BodyLarge"
                     tools:text="QTA"/>
 
                 <TextView
@@ -55,7 +55,7 @@
                     android:layout_height="wrap_content"
                     android:textStyle="bold"
                     android:textColor="@android:color/black"
-                    style="@style/AppTheme.NewMaterial.Text.Medium"
+                    style="@style/TextAppearance.Material3.BodyLarge"
                     android:text=" / "/>
 
                 <TextView
@@ -64,7 +64,7 @@
                     android:layout_height="wrap_content"
                     android:textStyle="bold"
                     android:textColor="@android:color/black"
-                    style="@style/AppTheme.NewMaterial.Text.Medium"
+                    style="@style/TextAppearance.Material3.BodyLarge"
                     tools:text="QTA"/>
 
                 <androidx.appcompat.widget.AppCompatTextView
diff --git a/app/src/main/res/layout/picking_resi_main_list__item_header.xml b/app/src/main/res/layout/picking_resi_main_list__item_header.xml
index 6eecd206..db970488 100644
--- a/app/src/main/res/layout/picking_resi_main_list__item_header.xml
+++ b/app/src/main/res/layout/picking_resi_main_list__item_header.xml
@@ -14,7 +14,7 @@
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     tools:text="DESCRIZIONE"
-                    style="@style/AppTheme.NewMaterial.Text.Medium"
+                    style="@style/TextAppearance.Material3.BodyLarge"
                     android:padding="8dp"
                     android:textColor="@android:color/white"
                     android:textStyle="bold"
diff --git a/app/src/main/res/layout/prod_riposizionamento_da_prod__list_item.xml b/app/src/main/res/layout/prod_riposizionamento_da_prod__list_item.xml
index 73865e24..4da3f6fd 100644
--- a/app/src/main/res/layout/prod_riposizionamento_da_prod__list_item.xml
+++ b/app/src/main/res/layout/prod_riposizionamento_da_prod__list_item.xml
@@ -107,7 +107,7 @@
 
             <androidx.appcompat.widget.AppCompatTextView
                 android:id="@+id/qta_tot"
-                style="@style/AppTheme.NewMaterial.Text.Medium"
+                style="@style/TextAppearance.Material3.BodyLarge"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:text="@{String.valueOf(item.getCount())}"
@@ -129,7 +129,7 @@
                 tools:text="ped" />
 
             <androidx.appcompat.widget.AppCompatTextView
-                style="@style/AppTheme.NewMaterial.Text.Medium"
+                style="@style/TextAppearance.Material3.BodyLarge"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginStart="4dp"
@@ -141,7 +141,7 @@
                 tools:text="(" />
 
             <androidx.appcompat.widget.AppCompatTextView
-                style="@style/AppTheme.NewMaterial.Text.Medium"
+                style="@style/TextAppearance.Material3.BodyLarge"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:text="@{UtilityNumber.decimalToString(item.getNumCnf(), 0)}"
@@ -166,7 +166,7 @@
                 tools:text="col" />
 
             <androidx.appcompat.widget.AppCompatTextView
-                style="@style/AppTheme.NewMaterial.Text.Medium"
+                style="@style/TextAppearance.Material3.BodyLarge"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:text=")"
diff --git a/app/src/main/res/layout/spedizione_main_list__group_header.xml b/app/src/main/res/layout/spedizione_main_list__group_header.xml
index edc45a6f..5e7d77ba 100644
--- a/app/src/main/res/layout/spedizione_main_list__group_header.xml
+++ b/app/src/main/res/layout/spedizione_main_list__group_header.xml
@@ -12,7 +12,7 @@
 
         <androidx.appcompat.widget.AppCompatTextView
             android:id="@+id/spedizione_group_title"
-            style="@style/AppTheme.NewMaterial.Text.Medium"
+            style="@style/TextAppearance.Material3.BodyLarge"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:ellipsize="end"
diff --git a/app/src/main/res/layout/spedizione_main_list__group_item.xml b/app/src/main/res/layout/spedizione_main_list__group_item.xml
index 1dbc4d20..9ea33c06 100644
--- a/app/src/main/res/layout/spedizione_main_list__group_item.xml
+++ b/app/src/main/res/layout/spedizione_main_list__group_item.xml
@@ -56,7 +56,7 @@
                         android:layout_marginStart="4dp"
                         android:textStyle="bold"
                         android:textColor="@color/green_700"
-                        style="@style/AppTheme.NewMaterial.Text.Medium"
+                        style="@style/TextAppearance.Material3.BodyLarge"
                         tools:text="QTA" />
 
                     <androidx.appcompat.widget.AppCompatTextView
@@ -73,7 +73,7 @@
                         android:layout_height="wrap_content"
                         android:textStyle="bold"
                         android:textColor="@android:color/black"
-                        style="@style/AppTheme.NewMaterial.Text.Medium"
+                        style="@style/TextAppearance.Material3.BodyLarge"
                         tools:text="QTA" />
 
                     <androidx.appcompat.widget.AppCompatTextView
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index f6b5e68c..2260fae6 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -18,10 +18,6 @@
         <item name="android:textColor">@drawable/material_text_color</item>
         <item name="android:textSize">12sp</item>
     </style>
-    <style name="AppTheme.NewMaterial.Text.Medium" parent = "AppTheme.NewMaterial.Text">
-        <item name="android:textColor">@drawable/material_text_color</item>
-        <item name="android:textSize">16sp</item>
-    </style>
     <style name="AppTheme.NewMaterial.Text.Large" parent = "AppTheme.NewMaterial.Text">
         <item name="android:textColor">@drawable/material_text_color</item>
         <item name="android:textSize">18sp</item>

From 24d90b58f9ac441bec9498aee9e7f86aa12fa258 Mon Sep 17 00:00:00 2001
From: GiuseppeS <g.scorrano@integry.it>
Date: Thu, 2 Oct 2025 18:02:13 +0200
Subject: [PATCH 3/5] Implementato popup di Device in end of life

---
 .idea/deploymentTargetSelector.xml            |  4 +-
 .../MainApplicationComponent.java             |  7 +-
 .../integrywmsnative/SplashActivity.java      | 38 ++++++++-
 .../dialogs/base/DialogSimpleMessageView.java |  2 +-
 .../DialogDeviceEndOfLifeComponent.java       | 14 ++++
 .../DialogDeviceEndOfLifeModule.java          | 14 ++++
 .../DialogDeviceEndOfLifeView.java            | 77 +++++++++++++++++++
 .../DialogDeviceEndOfLifeViewModel.java       |  5 ++
 .../res/drawable/ic_warning_white_24dp.xml    |  5 --
 .../res/layout/dialog_device_end_of_life.xml  | 56 ++++++++++++++
 app/src/main/res/values-it/strings.xml        |  5 ++
 app/src/main/res/values/strings.xml           |  3 +
 12 files changed, 219 insertions(+), 11 deletions(-)
 create mode 100644 app/src/main/java/it/integry/integrywmsnative/view/dialogs/device_end_of_life/DialogDeviceEndOfLifeComponent.java
 create mode 100644 app/src/main/java/it/integry/integrywmsnative/view/dialogs/device_end_of_life/DialogDeviceEndOfLifeModule.java
 create mode 100644 app/src/main/java/it/integry/integrywmsnative/view/dialogs/device_end_of_life/DialogDeviceEndOfLifeView.java
 create mode 100644 app/src/main/java/it/integry/integrywmsnative/view/dialogs/device_end_of_life/DialogDeviceEndOfLifeViewModel.java
 delete mode 100644 app/src/main/res/drawable/ic_warning_white_24dp.xml
 create mode 100644 app/src/main/res/layout/dialog_device_end_of_life.xml

diff --git a/.idea/deploymentTargetSelector.xml b/.idea/deploymentTargetSelector.xml
index 65815674..5ab70353 100644
--- a/.idea/deploymentTargetSelector.xml
+++ b/.idea/deploymentTargetSelector.xml
@@ -4,10 +4,10 @@
     <selectionStates>
       <SelectionState runConfigName="app">
         <option name="selectionMode" value="DROPDOWN" />
-        <DropdownSelection timestamp="2025-05-14T09:45:15.341614500Z">
+        <DropdownSelection timestamp="2025-10-02T11:26:10.944286600Z">
           <Target type="DEFAULT_BOOT">
             <handle>
-              <DeviceId pluginId="PhysicalDevice" identifier="serial=23324B682F" />
+              <DeviceId pluginId="PhysicalDevice" identifier="serial=7da0808" />
             </handle>
           </Target>
         </DropdownSelection>
diff --git a/app/src/main/java/it/integry/integrywmsnative/MainApplicationComponent.java b/app/src/main/java/it/integry/integrywmsnative/MainApplicationComponent.java
index c7116656..dce9fdbd 100644
--- a/app/src/main/java/it/integry/integrywmsnative/MainApplicationComponent.java
+++ b/app/src/main/java/it/integry/integrywmsnative/MainApplicationComponent.java
@@ -142,6 +142,8 @@ import it.integry.integrywmsnative.view.dialogs.choose_batch_lot.DialogChooseBat
 import it.integry.integrywmsnative.view.dialogs.choose_batch_lot.DialogChooseBatchLotModule;
 import it.integry.integrywmsnative.view.dialogs.create_new_art.DialogCreateNewArtComponent;
 import it.integry.integrywmsnative.view.dialogs.create_new_art.DialogCreateNewArtModule;
+import it.integry.integrywmsnative.view.dialogs.device_end_of_life.DialogDeviceEndOfLifeComponent;
+import it.integry.integrywmsnative.view.dialogs.device_end_of_life.DialogDeviceEndOfLifeModule;
 import it.integry.integrywmsnative.view.dialogs.extra_info.DialogExtraInfoComponent;
 import it.integry.integrywmsnative.view.dialogs.extra_info.DialogExtraInfoModule;
 import it.integry.integrywmsnative.view.dialogs.info_aggiuntive_lu.DialogInfoAggiuntiveLUComponent;
@@ -251,7 +253,8 @@ import it.integry.integrywmsnative.view.dialogs.update_available.DialogUpdateAva
         VerificaGiacenzeModule.class,
         DialogExtraInfoModule.class,
         DialogAskDepositoModule.class,
-        DialogChooseArtFromListaArtsModule.class
+        DialogChooseArtFromListaArtsModule.class,
+        DialogDeviceEndOfLifeModule.class
 })
 public interface MainApplicationComponent {
 
@@ -422,6 +425,8 @@ public interface MainApplicationComponent {
 
     DialogChooseArtFromListaArtsComponent.Factory dialogChooseArtFromListaArtsComponent();
 
+    DialogDeviceEndOfLifeComponent.Factory dialogDeviceEndOfLifeComponent();
+
     void inject(MainApplication mainApplication);
 
     void inject(AppContext mainApplication);
diff --git a/app/src/main/java/it/integry/integrywmsnative/SplashActivity.java b/app/src/main/java/it/integry/integrywmsnative/SplashActivity.java
index 8527b644..732a8f77 100644
--- a/app/src/main/java/it/integry/integrywmsnative/SplashActivity.java
+++ b/app/src/main/java/it/integry/integrywmsnative/SplashActivity.java
@@ -4,6 +4,7 @@ import android.content.Context;
 import android.content.Intent;
 import android.content.pm.PackageInfo;
 import android.content.pm.PackageManager;
+import android.os.Build;
 import android.os.Bundle;
 import android.os.Handler;
 import android.text.SpannableString;
@@ -12,8 +13,10 @@ import android.view.LayoutInflater;
 
 import androidx.databinding.DataBindingUtil;
 
+import java.time.LocalDate;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.concurrent.CountDownLatch;
 
 import javax.inject.Inject;
 
@@ -27,6 +30,7 @@ import it.integry.integrywmsnative.databinding.ActivitySplashBinding;
 import it.integry.integrywmsnative.gest.login.LoginActivity;
 import it.integry.integrywmsnative.gest.main.MainActivity;
 import it.integry.integrywmsnative.view.dialogs.base.DialogSimpleMessageView;
+import it.integry.integrywmsnative.view.dialogs.device_end_of_life.DialogDeviceEndOfLifeView;
 
 public class SplashActivity extends BaseActivity implements MainContext.Listener {
 
@@ -65,9 +69,24 @@ public class SplashActivity extends BaseActivity implements MainContext.Listener
 
         UtilityContext.initMainActivity(this);
 
+        LocalDate endSupportDate = LocalDate.of(2026, 1, 31);
 
-        initAppVersion();
-        initPermissions(this::init);
+        boolean isOldAndroid = Build.VERSION.SDK_INT < Build.VERSION_CODES.O;
+
+        executorService.execute(() -> {
+
+            if (isOldAndroid)
+                showDeviceEndOfLifeMessage();
+
+            handler.post(() -> {
+                if (LocalDate.now().isBefore(endSupportDate) || !isOldAndroid) {
+                    initAppVersion();
+                    initPermissions(this::init);
+                } else {
+                    this.finish();
+                }
+            });
+        });
     }
 
     private void initAppVersion() {
@@ -105,6 +124,21 @@ public class SplashActivity extends BaseActivity implements MainContext.Listener
         }
     }
 
+
+    private void showDeviceEndOfLifeMessage() {
+
+        CountDownLatch latch = new CountDownLatch(1);
+
+        DialogDeviceEndOfLifeView.newInstance(latch::countDown)
+                .show(this.getSupportFragmentManager(), "dialog_device_end_of_life");
+
+        try {
+            latch.await();
+        } catch (InterruptedException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
     @Override
     public void onDBDataLoading(String item) {
         handler.post(() -> mBinding.loadingInfoTextview.setText("Caricamento " + item));
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 c4ede104..41d4c9ed 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
@@ -148,7 +148,7 @@ public class DialogSimpleMessageView extends BaseDialogFragment {
             }
             case WARNING -> {
                 colorBackgroundTitle = ContextCompat.getColor(requireContext(), R.color.yellow_600);
-                yield ResourcesCompat.getDrawable(requireContext().getResources(), R.drawable.ic_warning_white_24dp, null);
+                yield ResourcesCompat.getDrawable(requireContext().getResources(), R.drawable.ic_baseline_warning_24, null);
             }
             case ERROR -> {
                 colorBackgroundTitle = ContextCompat.getColor(requireContext(), R.color.red_300);
diff --git a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/device_end_of_life/DialogDeviceEndOfLifeComponent.java b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/device_end_of_life/DialogDeviceEndOfLifeComponent.java
new file mode 100644
index 00000000..584da834
--- /dev/null
+++ b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/device_end_of_life/DialogDeviceEndOfLifeComponent.java
@@ -0,0 +1,14 @@
+package it.integry.integrywmsnative.view.dialogs.device_end_of_life;
+
+import dagger.Subcomponent;
+
+@Subcomponent
+public interface DialogDeviceEndOfLifeComponent {
+
+    @Subcomponent.Factory
+    interface Factory {
+        DialogDeviceEndOfLifeComponent create();
+    }
+
+    void inject(DialogDeviceEndOfLifeView dialogDeviceEndOfLifeView);
+}
\ No newline at end of file
diff --git a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/device_end_of_life/DialogDeviceEndOfLifeModule.java b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/device_end_of_life/DialogDeviceEndOfLifeModule.java
new file mode 100644
index 00000000..1b13bdec
--- /dev/null
+++ b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/device_end_of_life/DialogDeviceEndOfLifeModule.java
@@ -0,0 +1,14 @@
+package it.integry.integrywmsnative.view.dialogs.device_end_of_life;
+
+import dagger.Module;
+import dagger.Provides;
+
+@Module(subcomponents = DialogDeviceEndOfLifeComponent.class)
+public class DialogDeviceEndOfLifeModule {
+
+    @Provides
+    DialogDeviceEndOfLifeViewModel providesDialogDeviceEndOfLifeViewModel() {
+        return new DialogDeviceEndOfLifeViewModel();
+    }
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/device_end_of_life/DialogDeviceEndOfLifeView.java b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/device_end_of_life/DialogDeviceEndOfLifeView.java
new file mode 100644
index 00000000..58343ce9
--- /dev/null
+++ b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/device_end_of_life/DialogDeviceEndOfLifeView.java
@@ -0,0 +1,77 @@
+package it.integry.integrywmsnative.view.dialogs.device_end_of_life;
+
+import android.app.Dialog;
+import android.content.Context;
+import android.os.Bundle;
+import android.view.LayoutInflater;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
+import com.google.android.material.dialog.MaterialAlertDialogBuilder;
+
+import javax.inject.Inject;
+
+import it.integry.integrywmsnative.MainApplication;
+import it.integry.integrywmsnative.R;
+import it.integry.integrywmsnative.core.expansion.BaseDialogFragment;
+import it.integry.integrywmsnative.databinding.DialogDeviceEndOfLifeBinding;
+
+public class DialogDeviceEndOfLifeView extends BaseDialogFragment {
+
+    @Inject
+    DialogDeviceEndOfLifeViewModel mViewModel;
+
+    private DialogDeviceEndOfLifeBinding mBindings;
+    private Context mContext;
+
+    private final Runnable onComplete;
+
+    //Pass here all external parameters
+    public static DialogDeviceEndOfLifeView newInstance(Runnable onComplete) {
+        return new DialogDeviceEndOfLifeView(onComplete);
+    }
+
+    private DialogDeviceEndOfLifeView(Runnable onComplete) {
+        super();
+
+        this.onComplete = onComplete;
+
+        MainApplication.appComponent
+                .dialogDeviceEndOfLifeComponent()
+                .create()
+                .inject(this);
+    }
+
+
+    @NonNull
+    @Override
+    public Dialog onCreateDialog(@Nullable Bundle savedInstanceState) {
+        this.mContext = requireContext();
+
+        mBindings = DialogDeviceEndOfLifeBinding.inflate(LayoutInflater.from(this.mContext), null, false);
+        mBindings.setLifecycleOwner(this);
+
+
+        setCancelable(false);
+
+        var alertDialog = new MaterialAlertDialogBuilder(this.mContext)
+                .setView(mBindings.getRoot())
+                .setCancelable(isCancelable())
+                .setPositiveButton(R.string.i_understand_action, (dialog, which) -> {
+                    if (onComplete != null) onComplete.run();
+                    dismiss();
+                })
+                .create();
+
+        alertDialog.setCanceledOnTouchOutside(isCancelable());
+        alertDialog.setOnShowListener(this);
+        return alertDialog;
+    }
+
+    @Override
+    public void dismiss() {
+        if (getDialog() != null) getDialog().dismiss();
+    }
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/device_end_of_life/DialogDeviceEndOfLifeViewModel.java b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/device_end_of_life/DialogDeviceEndOfLifeViewModel.java
new file mode 100644
index 00000000..fce6b11b
--- /dev/null
+++ b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/device_end_of_life/DialogDeviceEndOfLifeViewModel.java
@@ -0,0 +1,5 @@
+package it.integry.integrywmsnative.view.dialogs.device_end_of_life;
+
+public class DialogDeviceEndOfLifeViewModel {
+
+}
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_warning_white_24dp.xml b/app/src/main/res/drawable/ic_warning_white_24dp.xml
deleted file mode 100644
index 3aea284b..00000000
--- a/app/src/main/res/drawable/ic_warning_white_24dp.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<vector android:height="76dp" android:tint="#FFFFFF"
-    android:viewportHeight="24.0" android:viewportWidth="24.0"
-    android:width="76dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#FF000000" android:pathData="M1,21h22L12,2 1,21zM13,18h-2v-2h2v2zM13,14h-2v-4h2v4z"/>
-</vector>
diff --git a/app/src/main/res/layout/dialog_device_end_of_life.xml b/app/src/main/res/layout/dialog_device_end_of_life.xml
new file mode 100644
index 00000000..1f33d9f0
--- /dev/null
+++ b/app/src/main/res/layout/dialog_device_end_of_life.xml
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools">
+
+    <data>
+        <import type="it.integry.integrywmsnative.R" />
+        <import type="androidx.core.content.ContextCompat" />
+        <import type="android.text.Html" />
+    </data>
+
+    <androidx.cardview.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
+        android:orientation="vertical" android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center_horizontal"
+        app:cardCornerRadius="16dp"
+        app:cardElevation="0dp">
+
+
+        <androidx.appcompat.widget.LinearLayoutCompat
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="vertical"
+            android:paddingHorizontal="16dp"
+            android:paddingVertical="16dp">
+
+            <androidx.appcompat.widget.AppCompatImageView
+                style="@style/MaterialAlertDialog.Material3.Title.Icon.CenterStacked"
+                android:layout_width="36dp"
+                android:layout_height="36dp"
+                android:src="@drawable/ic_baseline_warning_24"
+                app:tint="?attr/colorError" />
+
+
+            <androidx.appcompat.widget.AppCompatTextView
+                android:id="@+id/title_text"
+                style="@style/MaterialAlertDialog.Material3.Title.Text.CenterStacked"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:gravity="center_horizontal"
+                android:layout_marginBottom="16dp"
+                android:text="Fine supporto" />
+
+
+            <androidx.appcompat.widget.AppCompatTextView
+                android:id="@+id/description_text"
+                style="@style/TextAppearance.Material3.BodyLarge"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:gravity="center_horizontal"
+                android:text="@{Html.fromHtml(ContextCompat.getString(context, R.string.device_end_of_life_message))}"
+                tools:text="@string/device_end_of_life_message"/>
+
+
+        </androidx.appcompat.widget.LinearLayoutCompat>
+    </androidx.cardview.widget.CardView>
+</layout>
\ No newline at end of file
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index ffc77c6a..706cc86c 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -37,6 +37,7 @@
     <string name="ops">Ops</string>
     <string name="warning">Attenzione</string>
     <string name="ok">OK</string>
+    <string name="i_understand_action">Ho capito</string>
     <string name="abort">Annulla</string>
     <string name="reset">Resetta</string>
     <string name="dispatched_abbr">Evasi</string>
@@ -499,4 +500,8 @@
 
     <string name="switch_depo_title">Cambia deposito</string>
     <string name="switch_depo_description">Cambia il deposito principale su cui stai lavorando tra quelli a te disponibili</string>
+
+
+
+    <string name="device_end_of_life_message"><![CDATA[A partire dal <b>1 febbraio 2026</b>, i dispositivi con una versione di <b>Android inferiore alla 8.0 non saranno più supportati</b>. Per continuare a utilizzare l’app in modo sicuro e con tutte le funzionalità, ti consigliamo di aggiornare il tuo sistema operativo o utilizzare un dispositivo compatibile.]]></string>
 </resources>
\ 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 75144049..5218b93c 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -85,6 +85,7 @@
     <string name="ops">Ops</string>
     <string name="warning">Warning</string>
     <string name="ok">OK</string>
+    <string name="i_understand_action">Got it</string>
     <string name="abort">Abort</string>
     <string name="reset">Reset</string>
     <string name="dispatched_abbr">Dspch</string>
@@ -505,4 +506,6 @@
 
     <string name="switch_depo_title">Change deposit</string>
     <string name="switch_depo_description">Change the main deposit you are working on among those available to you</string>
+
+    <string name="device_end_of_life_message"><![CDATA[Starting from <b>February 1, 2026</b>, devices running <b>Android versions earlier than 8.0 will no longer be supported</b>.<br />To continue using the app securely and with full functionality, please update your operating system or switch to a compatible device.]]></string>
 </resources>

From cff52140bd09a5fe2a45691fea599f6f28bea685 Mon Sep 17 00:00:00 2001
From: GiuseppeS <g.scorrano@integry.it>
Date: Wed, 8 Oct 2025 19:28:34 +0200
Subject: [PATCH 4/5] Fix UI Dark. Fix separatore virgola nel dialog input
 quantity.

---
 .../integrywmsnative/core/di/Converters.java  | 66 ++++++++++++++++++-
 .../core/utility/DecimalInputFilter.java      |  1 +
 .../utility/LocaleDecimalKeyListener.java     | 29 ++++++++
 .../core/utility/UtilityResources.java        | 25 +++++++
 .../AccettazioneBollaPickingListAdapter.java  |  2 +-
 .../AccettazioneOrdiniPickingListAdapter.java |  2 +-
 .../OrdiniUscitaElencoFiltroViewModel.java    |  3 +
 .../ui/PickingResiListAdapter.java            |  2 +-
 .../spedizione/ui/SpedizioneListAdapter.java  | 11 ++--
 ...ttomSheetFragmentLUContentListAdapter.java |  2 +-
 .../DialogInputQuantityV2View.java            |  2 +
 .../layout-land-hdpi/dialog_input_lu_prod.xml |  3 +-
 .../dialog_input_quantity_v2.xml              | 15 +++--
 .../main/res/layout/activity_spedizione.xml   |  4 +-
 .../res/layout/dialog_choose_batch_lot.xml    |  1 +
 .../dialog_choose_batch_lot_item_model.xml    |  3 +-
 .../main/res/layout/dialog_create_new_art.xml |  3 +-
 .../main/res/layout/dialog_input_lu_prod.xml  |  3 +-
 .../res/layout/dialog_input_quantity_v2.xml   | 16 +++--
 .../res/layout/dialog_pv_edit_articolo.xml    |  4 +-
 .../layout/fragment_main_ordini_uscita.xml    |  8 ++-
 ...t_main_ordini_uscita__list_group_model.xml | 39 ++++++-----
 .../spedizione_main_list__group_item.xml      | 14 +---
 app/src/main/res/values-night/themes.xml      |  2 +
 app/src/main/res/values/attr.xml              | 14 ++++
 app/src/main/res/values/colors.xml            | 20 +++++-
 app/src/main/res/values/custom_colors.xml     |  3 +-
 app/src/main/res/values/themes.xml            |  2 +
 28 files changed, 237 insertions(+), 62 deletions(-)
 create mode 100644 app/src/main/java/it/integry/integrywmsnative/core/utility/DecimalInputFilter.java
 create mode 100644 app/src/main/java/it/integry/integrywmsnative/core/utility/LocaleDecimalKeyListener.java

diff --git a/app/src/main/java/it/integry/integrywmsnative/core/di/Converters.java b/app/src/main/java/it/integry/integrywmsnative/core/di/Converters.java
index 66990239..8ccd1b09 100644
--- a/app/src/main/java/it/integry/integrywmsnative/core/di/Converters.java
+++ b/app/src/main/java/it/integry/integrywmsnative/core/di/Converters.java
@@ -11,6 +11,7 @@ import android.widget.EditText;
 import android.widget.FrameLayout;
 import android.widget.RadioButton;
 import android.widget.RadioGroup;
+import android.widget.TextView;
 
 import androidx.annotation.ColorRes;
 import androidx.appcompat.widget.AppCompatCheckBox;
@@ -37,6 +38,8 @@ import java.math.BigDecimal;
 import java.text.DecimalFormat;
 import java.text.DecimalFormatSymbols;
 import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
 import java.util.Calendar;
 import java.util.Date;
 import java.util.Locale;
@@ -45,6 +48,7 @@ import it.integry.integrywmsnative.MainApplication;
 import it.integry.integrywmsnative.R;
 import it.integry.integrywmsnative.core.expansion.BaseDialogFragment;
 import it.integry.integrywmsnative.core.expansion.RunnableArgs;
+import it.integry.integrywmsnative.core.utility.LocaleDecimalKeyListener;
 import it.integry.integrywmsnative.core.utility.UtilityBigDecimal;
 import it.integry.integrywmsnative.core.utility.UtilityDate;
 import it.integry.integrywmsnative.core.utility.UtilityNumber;
@@ -975,4 +979,64 @@ public class Converters {
         view.setLayoutParams(layoutParams);
     }
 
-}
\ No newline at end of file
+    /**
+     * BindingAdapter per bindare una LocalDate diretta su una TextView con un formato specificato.
+     * Esempio di utilizzo in XML:
+     * app:localDateText="@{myLocalDate}" app:dateFormat="@{@string/my_date_format}"
+     */
+    @BindingAdapter(value = {"localDateText", "dateFormat"}, requireAll = false)
+    public static void bindLocalDateText(TextView view, LocalDate date, String dateFormat) {
+        if (date == null) {
+            view.setText("");
+            return;
+        }
+        String pattern = dateFormat != null ? dateFormat : "dd/MM/yyyy";
+        DateTimeFormatter formatter = DateTimeFormatter.ofPattern(pattern);
+        view.setText(date.format(formatter));
+    }
+
+    @BindingAdapter(value = {"localDateTimeText", "dateFormat"}, requireAll = false)
+    public static void bindLocalDateText(TextView view, LocalDateTime date, String dateFormat) {
+        if (date == null) {
+            view.setText("");
+            return;
+        }
+        String pattern = dateFormat != null ? dateFormat : "dd/MM/yyyy hh:mm";
+        DateTimeFormatter formatter = DateTimeFormatter.ofPattern(pattern);
+        view.setText(date.format(formatter));
+    }
+
+    /**
+     * BindingAdapter per bindare una ObservableField<LocalDate> su una TextView con un formato specificato.
+     * Esempio di utilizzo in XML:
+     * app:localDateObservableText="@{myObservableLocalDate}" app:dateFormat="@{@string/my_date_format}"
+     */
+    @BindingAdapter(value = {"localDateObservableText", "dateFormat"}, requireAll = false)
+    public static void bindObservableLocalDateText(TextView view, ObservableField<LocalDate> observableDate, String dateFormat) {
+        if (observableDate == null) {
+            view.setText("");
+            return;
+        }
+        LocalDate date = observableDate.get();
+        if (date == null) {
+            view.setText("");
+            return;
+        }
+        String pattern = dateFormat != null ? dateFormat : "dd/MM/yyyy";
+        DateTimeFormatter formatter = DateTimeFormatter.ofPattern(pattern);
+        view.setText(date.format(formatter));
+    }
+
+    /**
+     * BindingAdapter che applica automaticamente il KeyListener localizzato
+     * ai campi con inputType numberDecimal, permettendo l'uso della virgola
+     * come separatore decimale in base al locale del dispositivo.
+     */
+    @BindingAdapter("useLocaleDecimalInput")
+    public static void setLocaleDecimalInput(EditText view, boolean useLocaleInput) {
+        if (useLocaleInput) {
+            view.setKeyListener(LocaleDecimalKeyListener.getInstance());
+        }
+    }
+
+}
diff --git a/app/src/main/java/it/integry/integrywmsnative/core/utility/DecimalInputFilter.java b/app/src/main/java/it/integry/integrywmsnative/core/utility/DecimalInputFilter.java
new file mode 100644
index 00000000..8b137891
--- /dev/null
+++ b/app/src/main/java/it/integry/integrywmsnative/core/utility/DecimalInputFilter.java
@@ -0,0 +1 @@
+
diff --git a/app/src/main/java/it/integry/integrywmsnative/core/utility/LocaleDecimalKeyListener.java b/app/src/main/java/it/integry/integrywmsnative/core/utility/LocaleDecimalKeyListener.java
new file mode 100644
index 00000000..18db4ddd
--- /dev/null
+++ b/app/src/main/java/it/integry/integrywmsnative/core/utility/LocaleDecimalKeyListener.java
@@ -0,0 +1,29 @@
+package it.integry.integrywmsnative.core.utility;
+
+import android.text.method.DigitsKeyListener;
+
+import java.text.DecimalFormatSymbols;
+import java.util.Locale;
+
+/**
+ * KeyListener personalizzato che accetta numeri decimali
+ * usando il separatore decimale del locale corrente (virgola per italiano)
+ */
+public class LocaleDecimalKeyListener {
+
+    /**
+     * Ottiene un'istanza del KeyListener per il locale corrente
+     */
+    public static DigitsKeyListener getInstance() {
+        return getInstance(Locale.getDefault());
+    }
+
+    /**
+     * Ottiene un'istanza del KeyListener per un locale specifico
+     */
+    public static DigitsKeyListener getInstance(Locale locale) {
+        DecimalFormatSymbols symbols = new DecimalFormatSymbols(locale);
+        char decimalSeparator = symbols.getDecimalSeparator();
+        return DigitsKeyListener.getInstance("0123456789" + decimalSeparator);
+    }
+}
diff --git a/app/src/main/java/it/integry/integrywmsnative/core/utility/UtilityResources.java b/app/src/main/java/it/integry/integrywmsnative/core/utility/UtilityResources.java
index bf222acf..dabced17 100644
--- a/app/src/main/java/it/integry/integrywmsnative/core/utility/UtilityResources.java
+++ b/app/src/main/java/it/integry/integrywmsnative/core/utility/UtilityResources.java
@@ -3,9 +3,15 @@ package it.integry.integrywmsnative.core.utility;
 import android.content.Context;
 import android.content.pm.PackageInfo;
 import android.content.pm.PackageManager;
+import android.content.res.ColorStateList;
+import android.util.TypedValue;
 
+import androidx.annotation.AttrRes;
+import androidx.annotation.ColorInt;
+import androidx.annotation.ColorRes;
 import androidx.annotation.RawRes;
 import androidx.annotation.StringRes;
+import androidx.core.content.ContextCompat;
 
 import java.io.BufferedReader;
 import java.io.IOException;
@@ -69,4 +75,23 @@ public class UtilityResources {
         return 0;
     }
 
+
+
+
+
+    // Funzione di utilità per ottenere un colore da un attributo del tema
+    public static @ColorRes int getColorResourceFromAttr(Context context, @AttrRes int attrRes) {
+        TypedValue typedValue = new TypedValue();
+        context.getTheme().resolveAttribute(attrRes, typedValue, true);
+        return typedValue.data;
+    }
+
+    public static @ColorInt int getColorFromAttr(Context context, @AttrRes int attrRes) {
+        return ContextCompat.getColor(context, getColorResourceFromAttr(context, attrRes));
+    }
+
+    public static ColorStateList getColorStateListFromAttr(Context context, @AttrRes int attrRes) {
+        return ColorStateList.valueOf(getColorResourceFromAttr(context, attrRes));
+    }
+
 }
diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_bolla_picking/ui/AccettazioneBollaPickingListAdapter.java b/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_bolla_picking/ui/AccettazioneBollaPickingListAdapter.java
index bf8f8a83..6010f2e8 100644
--- a/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_bolla_picking/ui/AccettazioneBollaPickingListAdapter.java
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_bolla_picking/ui/AccettazioneBollaPickingListAdapter.java
@@ -114,7 +114,7 @@ public class AccettazioneBollaPickingListAdapter extends SectionedRecyclerViewAd
         } else if (position % 2 == 1) {
             holder.mBinding.getRoot().setBackgroundColor(Color.WHITE);
         } else {
-            holder.mBinding.getRoot().setBackgroundColor(mContext.getResources().getColor(R.color.letturaFacilitataBG));
+            holder.mBinding.getRoot().setBackgroundColor(mContext.getResources().getColor(R.color.letturaFacilitataBGLight));
         }
 
         holder.mBinding.deactivatedOverBg.setVisibility(!pickingObjectDTO.isActive() ? View.VISIBLE : View.GONE);
diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_ordini_picking/ui/AccettazioneOrdiniPickingListAdapter.java b/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_ordini_picking/ui/AccettazioneOrdiniPickingListAdapter.java
index eb21ba04..4ec1481a 100644
--- a/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_ordini_picking/ui/AccettazioneOrdiniPickingListAdapter.java
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_ordini_picking/ui/AccettazioneOrdiniPickingListAdapter.java
@@ -114,7 +114,7 @@ public class AccettazioneOrdiniPickingListAdapter extends SectionedRecyclerViewA
         } else if (position % 2 == 1) {
             holder.mBinding.getRoot().setBackgroundColor(Color.WHITE);
         } else {
-            holder.mBinding.getRoot().setBackgroundColor(mContext.getResources().getColor(R.color.letturaFacilitataBG));
+            holder.mBinding.getRoot().setBackgroundColor(mContext.getResources().getColor(R.color.letturaFacilitataBGLight));
         }
 
         holder.mBinding.deactivatedOverBg.setVisibility(!pickingObjectDTO.isActive() ? View.VISIBLE : View.GONE);
diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/ordini_uscita_elenco/filters/OrdiniUscitaElencoFiltroViewModel.java b/app/src/main/java/it/integry/integrywmsnative/gest/ordini_uscita_elenco/filters/OrdiniUscitaElencoFiltroViewModel.java
index 9450607c..dc770015 100644
--- a/app/src/main/java/it/integry/integrywmsnative/gest/ordini_uscita_elenco/filters/OrdiniUscitaElencoFiltroViewModel.java
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/ordini_uscita_elenco/filters/OrdiniUscitaElencoFiltroViewModel.java
@@ -251,6 +251,9 @@ public class OrdiniUscitaElencoFiltroViewModel {
                 .distinct()
                 .toList();
 
+        if(codMdeps.isEmpty())
+            return new ArrayList<>();
+
         return Stream.of(Objects.requireNonNull(mtbDepoFullList))
                 .filter(x -> codMdeps.contains(x.getCodMdep()))
                 .distinct()
diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/picking_resi/ui/PickingResiListAdapter.java b/app/src/main/java/it/integry/integrywmsnative/gest/picking_resi/ui/PickingResiListAdapter.java
index b7af8dfe..859915af 100644
--- a/app/src/main/java/it/integry/integrywmsnative/gest/picking_resi/ui/PickingResiListAdapter.java
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/picking_resi/ui/PickingResiListAdapter.java
@@ -102,7 +102,7 @@ public class PickingResiListAdapter extends SectionedRecyclerViewAdapter<Picking
         } else if (position % 2 == 1) {
             holder.mBinding.getRoot().setBackgroundColor(Color.WHITE);
         } else {
-            holder.mBinding.getRoot().setBackgroundColor(mContext.getResources().getColor(R.color.letturaFacilitataBG));
+            holder.mBinding.getRoot().setBackgroundColor(mContext.getResources().getColor(R.color.letturaFacilitataBGLight));
         }
 
         holder.mBinding.deactivatedOverBg.setVisibility(!pickingResiListModel.isActive() ? View.VISIBLE : View.GONE);
diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/spedizione/ui/SpedizioneListAdapter.java b/app/src/main/java/it/integry/integrywmsnative/gest/spedizione/ui/SpedizioneListAdapter.java
index 88e2bab4..a31e85c9 100644
--- a/app/src/main/java/it/integry/integrywmsnative/gest/spedizione/ui/SpedizioneListAdapter.java
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/spedizione/ui/SpedizioneListAdapter.java
@@ -30,6 +30,7 @@ import it.integry.integrywmsnative.core.model.MtbColr;
 import it.integry.integrywmsnative.core.model.MtbColt;
 import it.integry.integrywmsnative.core.utility.UtilityExceptions;
 import it.integry.integrywmsnative.core.utility.UtilityNumber;
+import it.integry.integrywmsnative.core.utility.UtilityResources;
 import it.integry.integrywmsnative.core.utility.UtilityString;
 import it.integry.integrywmsnative.databinding.SpedizioneMainListGroupHeaderBinding;
 import it.integry.integrywmsnative.databinding.SpedizioneMainListGroupItemBinding;
@@ -123,9 +124,9 @@ public class SpedizioneListAdapter extends SectionedRecyclerViewAdapter<Spedizio
         } else if (pickingObjectDTO.getQtaEvasa().floatValue() > 0) {
             holder.mBinding.getRoot().setBackgroundColor(mContext.getResources().getColor(R.color.orange_600_with_alpha));
         } else if (position % 2 == 1) {
-            holder.mBinding.getRoot().setBackgroundColor(Color.WHITE);
+            holder.mBinding.getRoot().setBackgroundColor(0);
         } else {
-            holder.mBinding.getRoot().setBackgroundColor(mContext.getResources().getColor(R.color.letturaFacilitataBG));
+            holder.mBinding.getRoot().setBackgroundColor(UtilityResources.getColorResourceFromAttr(mContext, R.attr.colorLetturaFacilitataSurface));
         }
 
         holder.mBinding.deactivatedOverBg.setVisibility(!pickingObjectDTO.isActive() ? View.VISIBLE : View.GONE);
@@ -135,8 +136,10 @@ public class SpedizioneListAdapter extends SectionedRecyclerViewAdapter<Spedizio
         holder.mBinding.qtaEvasa.setTextColor(ResourcesCompat.getColor(mContext.getResources(), !pickingObjectDTO.isActive() ? R.color.gray_600 : R.color.green_700, null));
 
         holder.mBinding.descrizione.setText(pickingObjectDTO.getDescrizione());
-        holder.mBinding.descrizione.setTextColor(pickingObjectDTO.isDescrizionePresente() ? Color.BLACK : Color.GRAY);
-
+        if(pickingObjectDTO.isDescrizionePresente())
+            holder.mBinding.descrizione.setTextColor(UtilityResources.getColorResourceFromAttr(mContext, android.R.attr.colorForeground));
+        else
+            holder.mBinding.descrizione.setTextColor(Color.GRAY);
 
         holder.mBinding.badge1.setText(pickingObjectDTO.getBadge1());
         holder.mBinding.badge2.setText(pickingObjectDTO.getBadge2());
diff --git a/app/src/main/java/it/integry/integrywmsnative/view/bottom_sheet__lu_content/BottomSheetFragmentLUContentListAdapter.java b/app/src/main/java/it/integry/integrywmsnative/view/bottom_sheet__lu_content/BottomSheetFragmentLUContentListAdapter.java
index 30fb1104..702c77e0 100644
--- a/app/src/main/java/it/integry/integrywmsnative/view/bottom_sheet__lu_content/BottomSheetFragmentLUContentListAdapter.java
+++ b/app/src/main/java/it/integry/integrywmsnative/view/bottom_sheet__lu_content/BottomSheetFragmentLUContentListAdapter.java
@@ -91,7 +91,7 @@ public class BottomSheetFragmentLUContentListAdapter extends RecyclerView.Adapte
         holder.mViewDataBinding.executePendingBindings();
 
         if (position % 2 == 1)
-            holder.mViewDataBinding.getRoot().setBackgroundColor(mContext.getResources().getColor(R.color.letturaFacilitataBG));
+            holder.mViewDataBinding.getRoot().setBackgroundColor(mContext.getResources().getColor(R.color.letturaFacilitataBGLight));
 
         holder.mViewDataBinding.getRoot().setOnClickListener(new OnSingleClickListener() {
             @Override
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 ddeaa3a9..740b3d2f 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
@@ -214,6 +214,8 @@ public class DialogInputQuantityV2View extends BaseDialogFragment implements Dia
                 }
             });
         }
+
+
         return mBindings.getRoot();
     }
 
diff --git a/app/src/main/res/layout-land-hdpi/dialog_input_lu_prod.xml b/app/src/main/res/layout-land-hdpi/dialog_input_lu_prod.xml
index cb768358..98019791 100644
--- a/app/src/main/res/layout-land-hdpi/dialog_input_lu_prod.xml
+++ b/app/src/main/res/layout-land-hdpi/dialog_input_lu_prod.xml
@@ -218,7 +218,8 @@
                                 android:imeOptions="actionDone"
                                 android:inputType="numberDecimal"
                                 android:textColor="@{ContextCompat.getColor(context, view.enabledQtaCnf ? android.R.color.black : R.color.gray_400)}"
-                                app:binding="@{view.currentPesoCollo}" />
+                                app:binding="@{view.currentPesoCollo}"
+                                app:useLocaleDecimalInput="@{true}" />
 
                         </com.google.android.material.textfield.TextInputLayout>
 
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 958bdcfe..34899652 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
@@ -799,7 +799,8 @@
                                 android:hint="@string/qty_x_pck"
                                 android:imeOptions="actionDone"
                                 android:inputType="numberDecimal"
-                                app:binding="@{view.currentQtaCnf}" />
+                                app:binding="@{view.currentQtaCnf}"
+                                app:useLocaleDecimalInput="@{true}" />
 
                         </com.google.android.material.textfield.TextInputLayout>
 
@@ -822,7 +823,8 @@
                                 android:digits="0123456789"
                                 android:hint="@string/tot_qty"
                                 android:inputType="number"
-                                app:binding="@{view.currentQtaTot}" />
+                                app:binding="@{view.currentQtaTot}"
+                                app:useLocaleDecimalInput="@{true}" />
 
                         </com.google.android.material.textfield.TextInputLayout>
 
@@ -857,7 +859,8 @@
                                 android:hint="@string/tare_art"
                                 android:inputType="number"
                                 android:textColor="@color/gray_400"
-                                app:binding="@{view.currentTaraArticolo}" />
+                                app:binding="@{view.currentTaraArticolo}"
+                                app:useLocaleDecimalInput="@{true}" />
 
                         </com.google.android.material.textfield.TextInputLayout>
 
@@ -881,7 +884,8 @@
                                 android:imeOptions="actionDone"
                                 android:inputType="numberDecimal"
                                 android:textColor="@color/gray_400"
-                                app:binding="@{view.currentTaraTot}" />
+                                app:binding="@{view.currentTaraTot}"
+                                app:useLocaleDecimalInput="@{true}" />
 
                         </com.google.android.material.textfield.TextInputLayout>
 
@@ -904,7 +908,8 @@
                                 android:hint="@string/LU_weight"
                                 android:inputType="number"
                                 android:visibility="@{view.enabledNotes ? View.VISIBLE : View.GONE }"
-                                app:binding="@{view.currentPesoLordo}" />
+                                app:binding="@{view.currentPesoLordo}"
+                                app:useLocaleDecimalInput="@{true}" />
 
                         </com.google.android.material.textfield.TextInputLayout>
 
diff --git a/app/src/main/res/layout/activity_spedizione.xml b/app/src/main/res/layout/activity_spedizione.xml
index 588cff86..09c86213 100644
--- a/app/src/main/res/layout/activity_spedizione.xml
+++ b/app/src/main/res/layout/activity_spedizione.xml
@@ -20,7 +20,6 @@
     <androidx.coordinatorlayout.widget.CoordinatorLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:background="@color/full_white"
         android:fitsSystemWindows="false"
         tools:context=".gest.spedizione.SpedizioneActivity">
 
@@ -44,7 +43,6 @@
                         android:id="@+id/appbar"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        android:background="@color/full_white"
                         android:minHeight="?attr/actionBarSize">
 
                         <androidx.appcompat.widget.Toolbar
@@ -200,6 +198,7 @@
                                 android:layout_width="72dp"
                                 android:layout_height="wrap_content"
                                 android:adjustViewBounds="true"
+                                android:tint="?attr/colorControlNormal"
                                 android:src="@drawable/ic_playlist_add_check_24dp" />
 
                             <androidx.appcompat.widget.AppCompatTextView
@@ -207,7 +206,6 @@
                                 android:layout_height="wrap_content"
                                 android:gravity="center_horizontal"
                                 android:text="@string/no_item_to_pick_text"
-                                android:textColor="@android:color/black"
                                 android:textSize="18sp" />
                         </androidx.appcompat.widget.LinearLayoutCompat>
 
diff --git a/app/src/main/res/layout/dialog_choose_batch_lot.xml b/app/src/main/res/layout/dialog_choose_batch_lot.xml
index 2c98b991..72c1922f 100644
--- a/app/src/main/res/layout/dialog_choose_batch_lot.xml
+++ b/app/src/main/res/layout/dialog_choose_batch_lot.xml
@@ -41,6 +41,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginBottom="16dp"
                 android:gravity="center_horizontal"
+                android:maxLines="2"
                 android:text="@string/select_batch_lot" />
 
             <androidx.recyclerview.widget.RecyclerView
diff --git a/app/src/main/res/layout/dialog_choose_batch_lot_item_model.xml b/app/src/main/res/layout/dialog_choose_batch_lot_item_model.xml
index b61c9965..7a7ea4bf 100644
--- a/app/src/main/res/layout/dialog_choose_batch_lot_item_model.xml
+++ b/app/src/main/res/layout/dialog_choose_batch_lot_item_model.xml
@@ -75,8 +75,7 @@
                 android:layout_height="wrap_content"
                 android:ellipsize="end"
                 android:text="@{UtilityString.isNull(mtbPartitaMag.descrizione, &quot;Nessuna descrizione&quot;)}"
-                android:textColor="@android:color/black"
-                android:textSize="16sp"
+                style="@style/TextAppearance.Material3.BodyLarge"
                 tools:text="Descrizione lunga articolo" />
 
 
diff --git a/app/src/main/res/layout/dialog_create_new_art.xml b/app/src/main/res/layout/dialog_create_new_art.xml
index 4133b5e7..c5af8a04 100644
--- a/app/src/main/res/layout/dialog_create_new_art.xml
+++ b/app/src/main/res/layout/dialog_create_new_art.xml
@@ -258,7 +258,8 @@
                                 android:inputType="numberDecimal"
                                 android:nextFocusDown="@id/input_default_pos_text"
                                 android:singleLine="true"
-                                app:binding="@{viewmodel.qtaCnf}" />
+                                app:binding="@{viewmodel.qtaCnf}"
+                                app:useLocaleDecimalInput="@{true}" />
 
                         </com.google.android.material.textfield.TextInputLayout>
 
diff --git a/app/src/main/res/layout/dialog_input_lu_prod.xml b/app/src/main/res/layout/dialog_input_lu_prod.xml
index ec50c34a..a3c5ac33 100644
--- a/app/src/main/res/layout/dialog_input_lu_prod.xml
+++ b/app/src/main/res/layout/dialog_input_lu_prod.xml
@@ -203,7 +203,8 @@
                         android:hint="@string/kg_x_pck"
                         android:imeOptions="actionDone"
                         android:inputType="numberDecimal"
-                        app:binding="@{view.currentPesoCollo}" />
+                        app:binding="@{view.currentPesoCollo}"
+                        app:useLocaleDecimalInput="@{true}" />
 
                 </com.google.android.material.textfield.TextInputLayout>
 
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 845a6c88..23f3dcd6 100644
--- a/app/src/main/res/layout/dialog_input_quantity_v2.xml
+++ b/app/src/main/res/layout/dialog_input_quantity_v2.xml
@@ -623,6 +623,7 @@
                                 android:layout_gravity="center"
                                 android:orientation="horizontal">
 
+
                                 <androidx.appcompat.widget.AppCompatTextView
                                     style="@style/TextAppearance.Material3.BodyLarge"
                                     android:layout_width="wrap_content"
@@ -815,7 +816,8 @@
                                 android:inputType="numberDecimal"
                                 android:nextFocusForward="@+id/input_qta_tot_text"
                                 android:selectAllOnFocus="true"
-                                app:binding="@{view.currentQtaCnf}" />
+                                app:binding="@{view.currentQtaCnf}"
+                                app:useLocaleDecimalInput="@{true}" />
 
                         </com.google.android.material.textfield.TextInputLayout>
 
@@ -839,7 +841,8 @@
                                 android:imeOptions="actionDone"
                                 android:inputType="number"
                                 android:selectAllOnFocus="true"
-                                app:binding="@{view.currentQtaTot}" />
+                                app:binding="@{view.currentQtaTot}"
+                                app:useLocaleDecimalInput="@{true}" />
 
                         </com.google.android.material.textfield.TextInputLayout>
 
@@ -874,7 +877,8 @@
                                 android:hint="@string/tare_art"
                                 android:inputType="number"
                                 android:textColor="@color/gray_400"
-                                app:binding="@{view.currentTaraArticolo}" />
+                                app:binding="@{view.currentTaraArticolo}"
+                                app:useLocaleDecimalInput="@{true}" />
 
                         </com.google.android.material.textfield.TextInputLayout>
 
@@ -898,7 +902,8 @@
                                 android:imeOptions="actionDone"
                                 android:inputType="numberDecimal"
                                 android:textColor="@color/gray_400"
-                                app:binding="@{view.currentTaraTot}" />
+                                app:binding="@{view.currentTaraTot}"
+                                app:useLocaleDecimalInput="@{true}" />
 
                         </com.google.android.material.textfield.TextInputLayout>
 
@@ -921,7 +926,8 @@
                                 android:layout_height="wrap_content"
                                 android:hint="@string/LU_weight"
                                 android:inputType="number"
-                                app:binding="@{view.currentPesoLordo}" />
+                                app:binding="@{view.currentPesoLordo}"
+                                app:useLocaleDecimalInput="@{true}" />
 
                         </com.google.android.material.textfield.TextInputLayout>
 
diff --git a/app/src/main/res/layout/dialog_pv_edit_articolo.xml b/app/src/main/res/layout/dialog_pv_edit_articolo.xml
index 62bae6e3..4676cdc6 100644
--- a/app/src/main/res/layout/dialog_pv_edit_articolo.xml
+++ b/app/src/main/res/layout/dialog_pv_edit_articolo.xml
@@ -534,6 +534,7 @@
                         android:layout_gravity="center"
                         android:orientation="horizontal">
 
+
                         <androidx.appcompat.widget.AppCompatTextView
                             style="@style/TextAppearance.Material3.BodyLarge"
                             android:layout_width="wrap_content"
@@ -665,7 +666,8 @@
                         android:hint="@string/qty_x_pck"
                         android:imeOptions="actionDone"
                         android:inputType="numberDecimal"
-                        app:binding="@{view.currentQtaCnf}" />
+                        app:binding="@{view.currentQtaCnf}"
+                        app:useLocaleDecimalInput="@{true}" />
 
                 </com.google.android.material.textfield.TextInputLayout>
 
diff --git a/app/src/main/res/layout/fragment_main_ordini_uscita.xml b/app/src/main/res/layout/fragment_main_ordini_uscita.xml
index cdd15b7f..ff4619ec 100644
--- a/app/src/main/res/layout/fragment_main_ordini_uscita.xml
+++ b/app/src/main/res/layout/fragment_main_ordini_uscita.xml
@@ -48,7 +48,9 @@
                 android:id="@+id/vendita_main_list"
                 android:scrollbars="vertical"
                 android:layout_width="match_parent"
-                android:layout_height="match_parent"/>
+                android:layout_height="match_parent"
+                app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
+                tools:listitem="@layout/fragment_main_ordini_uscita__list_group_model"/>
 
             <androidx.constraintlayout.widget.ConstraintLayout
                 android:id="@+id/ordini_vendita_empty_view"
@@ -90,14 +92,14 @@
                         android:layout_width="72dp"
                         android:layout_height="wrap_content"
                         android:adjustViewBounds="true"
-                        android:src="@drawable/ic_playlist_add_check_24dp" />
+                        android:src="@drawable/ic_playlist_add_check_24dp"
+                        android:tint="?attr/colorControlNormal" />
 
                     <androidx.appcompat.widget.AppCompatTextView
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:gravity="center_horizontal"
                         android:text="@string/no_orders_found_message"
-                        android:textColor="@android:color/black"
                         android:textSize="18sp" />
                 </androidx.appcompat.widget.LinearLayoutCompat>
 
diff --git a/app/src/main/res/layout/fragment_main_ordini_uscita__list_group_model.xml b/app/src/main/res/layout/fragment_main_ordini_uscita__list_group_model.xml
index 9bf0e87e..29c6b4be 100644
--- a/app/src/main/res/layout/fragment_main_ordini_uscita__list_group_model.xml
+++ b/app/src/main/res/layout/fragment_main_ordini_uscita__list_group_model.xml
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <layout xmlns:app="http://schemas.android.com/apk/res-auto">
     <data>
+        <import type="android.text.Html" />
+        <import type="it.integry.integrywmsnative.core.utility.UtilityDate" />
         <import type="it.integry.integrywmsnative.core.di.BindableBoolean" />
         <variable
             name="selected"
@@ -15,7 +17,8 @@
         android:layout_height="wrap_content"
         android:paddingStart="4dp"
         android:paddingEnd="12dp"
-        android:paddingVertical="4dp">
+        android:paddingVertical="8dp"
+        android:background="?attr/selectableItemBackground">
 
         <!-- 2. Lo spazio di 8dp è ora gestito con constraint -->
         <View
@@ -38,55 +41,57 @@
             app:layout_constraintBottom_toBottomOf="parent" />
 
         <!-- 4. Descrizione principale a destra del checkbox -->
-        <androidx.appcompat.widget.AppCompatTextView
+        <TextView
+            style="@style/TextAppearance.Material3.BodyMedium"
             android:id="@+id/descrizione"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             tools:text="Ord. Ven. 39 del 27 ott 2017"
             android:ellipsize="end"
             android:maxLines="1"
-            style="@style/TextAppearance.Material3.BodyMedium"
+            android:layout_marginStart="8dp"
+            android:layout_marginEnd="8dp"
             app:layout_constraintStart_toEndOf="@id/checkbox"
             app:layout_constraintEnd_toStartOf="@id/right_descrizione"
-            app:layout_constraintTop_toTopOf="parent"
-            android:layout_marginStart="8dp"
-            android:layout_marginEnd="8dp"/>
+            app:layout_constraintTop_toTopOf="parent"/>
 
         <!-- 5. Descrizione secondaria a destra del checkbox, sotto la principale -->
-        <androidx.appcompat.widget.AppCompatTextView
+        <TextView
+            style="@style/TextAppearance.Material3.BodySmall"
             android:id="@+id/sub_descrizione"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:maxLines="1"
+            android:maxLines="2"
             android:ellipsize="end"
+            android:layout_marginEnd="8dp"
             tools:text="TextView"
-            style="@style/TextAppearance.Material3.BodyMedium"
             app:layout_constraintStart_toStartOf="@id/descrizione"
             app:layout_constraintEnd_toStartOf="@id/right_sub_descrizione"
-            app:layout_constraintTop_toBottomOf="@+id/descrizione"
-            android:layout_marginEnd="8dp"/>
+            app:layout_constraintTop_toBottomOf="@+id/descrizione"/>
 
         <!-- 6. Right descrizione allineata a destra -->
-        <androidx.appcompat.widget.AppCompatTextView
+        <TextView
+            style="@style/TextAppearance.Material3.BodyMedium"
             android:id="@+id/right_descrizione"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             tools:text="Cons 07 nov 2018"
-            style="@style/TextAppearance.Material3.BodyMedium"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintTop_toTopOf="parent"
             app:layout_constraintBaseline_toBaselineOf="@id/descrizione" />
 
         <!-- 7. Right sub-descrizione allineata a destra -->
-        <androidx.appcompat.widget.AppCompatTextView
+        <TextView
+            style="@style/TextAppearance.Material3.BodySmall"
             android:id="@+id/right_sub_descrizione"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:background="@drawable/badge_round_corner"
+            android:backgroundTint="?attr/colorSecondaryContainer"
+            android:textColor="?attr/colorOnSecondaryContainer"
             tools:text="Cod Jcom"
-            style="@style/TextAppearance.Material3.BodyMedium"
             app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/right_descrizione"
-            app:layout_constraintBaseline_toBaselineOf="@id/sub_descrizione" />
+            app:layout_constraintTop_toBottomOf="@id/right_descrizione" />
 
     </androidx.constraintlayout.widget.ConstraintLayout>
 </layout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/spedizione_main_list__group_item.xml b/app/src/main/res/layout/spedizione_main_list__group_item.xml
index 9ea33c06..b99b32cf 100644
--- a/app/src/main/res/layout/spedizione_main_list__group_item.xml
+++ b/app/src/main/res/layout/spedizione_main_list__group_item.xml
@@ -5,8 +5,7 @@
     <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
         xmlns:tools="http://schemas.android.com/tools"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:background="@color/full_white">
+        android:layout_height="wrap_content">
 
         <androidx.appcompat.widget.LinearLayoutCompat
             android:id="@+id/content_view_child"
@@ -63,7 +62,6 @@
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:textStyle="bold"
-                        android:textColor="@android:color/black"
                         style="@android:style/TextAppearance.Medium"
                         android:text=" / " />
 
@@ -72,7 +70,6 @@
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:textStyle="bold"
-                        android:textColor="@android:color/black"
                         style="@style/TextAppearance.Material3.BodyLarge"
                         tools:text="QTA" />
 
@@ -81,7 +78,6 @@
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:textStyle="bold"
-                        android:textColor="@android:color/black"
                         android:layout_marginStart="4dp"
                         android:textAllCaps="true"
                         android:layout_gravity="center_vertical"
@@ -109,9 +105,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="4dp"
-                android:textSize="16sp"
-                android:textColor="@android:color/black"
-                style="@style/TextAppearance.Material3.BodyMedium"
+                style="@style/TextAppearance.Material3.BodyLarge"
                 tools:text="DESCRIZIONE" />
 
             <RelativeLayout
@@ -129,7 +123,6 @@
                         android:id="@+id/subdescrizione1"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:textSize="14sp"
                         style="@style/TextAppearance.Material3.BodyMedium"
                         tools:text="SUB DESCRIZIONE" />
 
@@ -138,7 +131,6 @@
                         android:id="@+id/subdescrizione2"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:textSize="14sp"
                         style="@style/TextAppearance.Material3.BodyMedium"
                         tools:text="SUB DESCRIZIONE" />
 
@@ -181,7 +173,7 @@
             android:layout_alignTop="@id/content_view_child"
             android:layout_alignBottom="@id/content_view_child"
             android:alpha="0.15"
-            android:background="@android:color/black" />
+            android:background="?attr/colorDisabledSurface" />
 
     </RelativeLayout>
 </layout>
\ No newline at end of file
diff --git a/app/src/main/res/values-night/themes.xml b/app/src/main/res/values-night/themes.xml
index c817c91c..96508226 100644
--- a/app/src/main/res/values-night/themes.xml
+++ b/app/src/main/res/values-night/themes.xml
@@ -27,5 +27,7 @@
         <item name="colorOnSurfaceInverse">@color/md_theme_dark_inverseOnSurface</item>
         <item name="colorSurfaceInverse">@color/md_theme_dark_inverseSurface</item>
         <item name="colorPrimaryInverse">@color/md_theme_dark_inversePrimary</item>
+        <item name="colorDisabledSurface">@android:color/white</item>
+        <item name="colorLetturaFacilitataSurface">@color/letturaFacilitataBGDark</item>
     </style>
 </resources>
diff --git a/app/src/main/res/values/attr.xml b/app/src/main/res/values/attr.xml
index 318884eb..6a6cd4f5 100644
--- a/app/src/main/res/values/attr.xml
+++ b/app/src/main/res/values/attr.xml
@@ -26,4 +26,18 @@
 		<attr name="confirmTitle" format="string" />
 		<attr name="confirmMessage" format="string" />
 	</declare-styleable>
+
+
+    <attr name="colorSuccess" format="color" />
+    <attr name="colorSuccessContainer" format="color" />
+    <attr name="colorOnSuccess" format="color" />
+    <attr name="colorOnSuccessContainer" format="color" />
+
+    <attr name="colorWarning" format="color" />
+    <attr name="colorWarningContainer" format="color" />
+    <attr name="colorOnWarning" format="color" />
+    <attr name="colorOnWarningContainer" format="color" />
+
+    <attr name="colorDisabledSurface" format="color" />
+    <attr name="colorLetturaFacilitataSurface" format="color" />
 </resources>
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 3b7bb0a5..82bc2659 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -7,8 +7,8 @@
     <color name="md_theme_light_onPrimaryContainer">#08006C</color>
     <color name="md_theme_light_secondary">#0059C5</color>
     <color name="md_theme_light_onSecondary">#FFFFFF</color>
-    <color name="md_theme_light_secondaryContainer">#D8E2FF</color>
-    <color name="md_theme_light_onSecondaryContainer">#001A43</color>
+    <color name="md_theme_light_secondaryContainer">#FFE0C2</color>
+    <color name="md_theme_light_onSecondaryContainer">#4C2700</color>
     <color name="md_theme_light_tertiary">#795369</color>
     <color name="md_theme_light_onTertiary">#FFFFFF</color>
     <color name="md_theme_light_tertiaryContainer">#FFD8EC</color>
@@ -17,6 +17,14 @@
     <color name="md_theme_light_errorContainer">#FFDAD6</color>
     <color name="md_theme_light_onError">#FFFFFF</color>
     <color name="md_theme_light_onErrorContainer">#410002</color>
+    <color name="md_theme_light_success">#006E1C</color>
+    <color name="md_theme_light_successContainer">#D1FADF</color>
+    <color name="md_theme_light_onSuccess">#FFFFFF</color>
+    <color name="md_theme_light_onSuccessContainer">#00210A</color>
+    <color name="md_theme_light_warning">#FFB300</color> <!-- Amber 700 -->
+    <color name="md_theme_light_warningContainer">#FFF8E1</color> <!-- Amber 50 -->
+    <color name="md_theme_light_onWarning">#212121</color> <!-- Grey 900 -->
+    <color name="md_theme_light_onWarningContainer">#664400</color> <!-- Deep amber -->
     <color name="md_theme_light_background">#F6FEFF</color>
     <color name="md_theme_light_onBackground">#001F24</color>
     <color name="md_theme_light_surface">#F6FEFF</color>
@@ -46,6 +54,14 @@
     <color name="md_theme_dark_errorContainer">#93000A</color>
     <color name="md_theme_dark_onError">#690005</color>
     <color name="md_theme_dark_onErrorContainer">#FFDAD6</color>
+    <color name="md_theme_dark_success">#5FF59C</color>
+    <color name="md_theme_dark_successContainer">#00531A</color>
+    <color name="md_theme_dark_onSuccess">#003915</color>
+    <color name="md_theme_dark_onSuccessContainer">#85FFB8</color>
+    <color name="md_theme_dark_warning">#FFD54F</color> <!-- Amber 300, più visibile su sfondo scuro -->
+    <color name="md_theme_dark_warningContainer">#534300</color> <!-- Amber 900 -->
+    <color name="md_theme_dark_onWarning">#332200</color> <!-- Molto scuro per testo su warning -->
+    <color name="md_theme_dark_onWarningContainer">#FFF8E1</color> <!-- Amber 50 -->
     <color name="md_theme_dark_background">#001F24</color>
     <color name="md_theme_dark_onBackground">#97F0FF</color>
     <color name="md_theme_dark_surface">#001F24</color>
diff --git a/app/src/main/res/values/custom_colors.xml b/app/src/main/res/values/custom_colors.xml
index 72dab875..c940865c 100644
--- a/app/src/main/res/values/custom_colors.xml
+++ b/app/src/main/res/values/custom_colors.xml
@@ -13,7 +13,8 @@
 
     <color name="mainGreen">@color/green_500</color>
     <color name="mainOrange">@color/orange_700</color>
-    <color name="letturaFacilitataBG">#eeeeee</color>
+    <color name="letturaFacilitataBGLight">#eeeeee</color>
+    <color name="letturaFacilitataBGDark">#111111</color>
 
     <!-- FAB DEFINITIONS -->
     <color name="black_semi_transparent">#B2000000</color>
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index eaa0adc1..e98060f6 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -27,6 +27,8 @@
         <item name="colorOnSurfaceInverse">@color/md_theme_light_inverseOnSurface</item>
         <item name="colorSurfaceInverse">@color/md_theme_light_inverseSurface</item>
         <item name="colorPrimaryInverse">@color/md_theme_light_inversePrimary</item>
+        <item name="colorDisabledSurface">@android:color/black</item>
+        <item name="colorLetturaFacilitataSurface">@color/letturaFacilitataBGLight</item>
 
 
         <item name="android:fontFamily">@font/google_sans_regular</item>

From 81507938b1860ef6f54d9e49dd8744cb02699cb3 Mon Sep 17 00:00:00 2001
From: GiuseppeS <g.scorrano@integry.it>
Date: Wed, 8 Oct 2025 19:29:23 +0200
Subject: [PATCH 5/5] -> v1.47.22 (535)

---
 app/build.gradle | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index a80010ef..e56edd3d 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -11,8 +11,8 @@ apply plugin: 'com.google.gms.google-services'
 
 android {
 
-    def appVersionCode = 534
-    def appVersionName = '1.47.21'
+    def appVersionCode = 535
+    def appVersionName = '1.47.22'
 
     signingConfigs {
         release {