From b02eaf02a8663ac3913fda72db1a4adef269a455 Mon Sep 17 00:00:00 2001
From: ValerioC <v.castellana@integry.it>
Date: Mon, 13 Feb 2023 17:46:57 +0100
Subject: [PATCH] aggiornamento progetto a AGP 8.1

---
 .idea/kotlinc.xml                             |  6 ++++
 .idea/runConfigurations/app_base.xml          |  5 ++--
 .idea/runConfigurations/app_vglimenti.xml     |  5 ++--
 app/build.gradle                              |  1 +
 .../AccettazionePickingActivity.java          | 20 ++++++-------
 .../gest/main/MainActivity.java               | 29 +++++++------------
 .../ui/expandablelayout/ExpandableLayout.java | 12 ++++----
 .../DialogInputQuantityV2View.java            |  6 ++--
 .../view/dialogs/yes_no/DialogYesNoView.java  |  7 ++---
 build.gradle                                  |  3 +-
 gradle/wrapper/gradle-wrapper.properties      |  6 ++--
 11 files changed, 47 insertions(+), 53 deletions(-)
 create mode 100644 .idea/kotlinc.xml

diff --git a/.idea/kotlinc.xml b/.idea/kotlinc.xml
new file mode 100644
index 00000000..2b8a50fc
--- /dev/null
+++ b/.idea/kotlinc.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="KotlinJpsPluginSettings">
+    <option name="version" value="1.8.0" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/runConfigurations/app_base.xml b/.idea/runConfigurations/app_base.xml
index f55876a3..07234dec 100644
--- a/.idea/runConfigurations/app_base.xml
+++ b/.idea/runConfigurations/app_base.xml
@@ -1,6 +1,6 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="app_base" type="AndroidRunConfigurationType" factoryName="Android App" activateToolWindowBeforeRun="false">
-    <module name="WMS.app" />
+    <module name="WMS.app.main" />
     <option name="DEPLOY" value="true" />
     <option name="DEPLOY_APK_FROM_BUNDLE" value="false" />
     <option name="DEPLOY_AS_INSTANT" value="false" />
@@ -8,13 +8,12 @@
     <option name="PM_INSTALL_OPTIONS" value="" />
     <option name="ALL_USERS" value="false" />
     <option name="ALWAYS_INSTALL_WITH_PM" value="false" />
+    <option name="CLEAR_APP_STORAGE" value="false" />
     <option name="DYNAMIC_FEATURES_DISABLED_LIST" value="WMS.dynamic_vgalimenti" />
     <option name="ACTIVITY_EXTRA_FLAGS" value="" />
     <option name="MODE" value="default_activity" />
     <option name="CLEAR_LOGCAT" value="true" />
     <option name="SHOW_LOGCAT_AUTOMATICALLY" value="true" />
-    <option name="SKIP_NOOP_APK_INSTALLATIONS" value="true" />
-    <option name="FORCE_STOP_RUNNING_APP" value="true" />
     <option name="INSPECTION_WITHOUT_ACTIVITY_RESTART" value="false" />
     <option name="TARGET_SELECTION_MODE" value="SHOW_DIALOG" />
     <option name="SELECTED_CLOUD_MATRIX_CONFIGURATION_ID" value="-1" />
diff --git a/.idea/runConfigurations/app_vglimenti.xml b/.idea/runConfigurations/app_vglimenti.xml
index 9ed66857..b450dd99 100644
--- a/.idea/runConfigurations/app_vglimenti.xml
+++ b/.idea/runConfigurations/app_vglimenti.xml
@@ -1,6 +1,6 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="app_vglimenti" type="AndroidRunConfigurationType" factoryName="Android App" activateToolWindowBeforeRun="false">
-    <module name="WMS.app" />
+    <module name="WMS.app.main" />
     <option name="DEPLOY" value="true" />
     <option name="DEPLOY_APK_FROM_BUNDLE" value="false" />
     <option name="DEPLOY_AS_INSTANT" value="false" />
@@ -8,13 +8,12 @@
     <option name="PM_INSTALL_OPTIONS" value="" />
     <option name="ALL_USERS" value="false" />
     <option name="ALWAYS_INSTALL_WITH_PM" value="false" />
+    <option name="CLEAR_APP_STORAGE" value="false" />
     <option name="DYNAMIC_FEATURES_DISABLED_LIST" value="WMS.dynamic__base" />
     <option name="ACTIVITY_EXTRA_FLAGS" value="" />
     <option name="MODE" value="default_activity" />
     <option name="CLEAR_LOGCAT" value="true" />
     <option name="SHOW_LOGCAT_AUTOMATICALLY" value="true" />
-    <option name="SKIP_NOOP_APK_INSTALLATIONS" value="true" />
-    <option name="FORCE_STOP_RUNNING_APP" value="true" />
     <option name="INSPECTION_WITHOUT_ACTIVITY_RESTART" value="false" />
     <option name="TARGET_SELECTION_MODE" value="SHOW_DIALOG" />
     <option name="SELECTED_CLOUD_MATRIX_CONFIGURATION_ID" value="-1" />
diff --git a/app/build.gradle b/app/build.gradle
index 797d03c5..6b148756 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -62,6 +62,7 @@ android {
     }
 
     android.buildFeatures.dataBinding true
+    android.buildFeatures.buildConfig true
 
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_11
diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_picking/AccettazionePickingActivity.java b/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_picking/AccettazionePickingActivity.java
index 3641df5d..b7509dec 100644
--- a/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_picking/AccettazionePickingActivity.java
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/accettazione_picking/AccettazionePickingActivity.java
@@ -335,13 +335,11 @@ public class AccettazionePickingActivity extends BaseActivity implements Accetta
     @Override
     public boolean onOptionsItemSelected(MenuItem item) {
         // Handle item selection
-        switch (item.getItemId()) {
-            case R.id.action_filter:
-                showOrderByDialog();
-                return true;
-            default:
-                return super.onOptionsItemSelected(item);
+        if (item.getItemId() == R.id.action_filter) {
+            showOrderByDialog();
+            return true;
         }
+        return super.onOptionsItemSelected(item);
     }
 
     private void initVars() {
@@ -752,11 +750,11 @@ public class AccettazionePickingActivity extends BaseActivity implements Accetta
     public void onLUPrintError(Exception ex, Runnable onComplete) {
         this.onLoadingEnded();
         DialogSimpleMessageView.makeErrorDialog(
-                new SpannableString(ex.getMessage()),
-                null,
-                null,
-                R.string.button_ignore_print,
-                onComplete)
+                        new SpannableString(ex.getMessage()),
+                        null,
+                        null,
+                        R.string.button_ignore_print,
+                        onComplete)
                 .show(getSupportFragmentManager(), "tag");
     }
 
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 d3e84641..4879924b 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
@@ -181,23 +181,16 @@ public class MainActivity extends BaseActivity
             fragment = menuItem.getFragmentFactory().run();
             this.adaptViewToFragment(fragment);
         } else {
-            switch (id) {
-                case R.id.nav_home:
-                    this.pop();
-                    break;
-
-                case R.id.nav_settings:
-                    fragment = new MainSettingsFragment();
-                    this.adaptViewToFragment(fragment);
-                    break;
-
-                case R.id.nav_logout:
-                    ServerStatusChecker.dispose();
-                    this.mainContext.logout(() -> {
-                        startLoginActivity();
-                    });
-
-                    break;
+            if (id == R.id.nav_home) {
+                this.pop();
+            } else if (id == R.id.nav_settings) {
+                fragment = new MainSettingsFragment();
+                this.adaptViewToFragment(fragment);
+            } else if (id == R.id.nav_logout) {
+                ServerStatusChecker.dispose();
+                this.mainContext.logout(() -> {
+                    startLoginActivity();
+                });
             }
         }
 
@@ -226,7 +219,7 @@ public class MainActivity extends BaseActivity
 
                     for (MenuConfiguration.MenuItem menuItem : menuGroup.getItems()) {
 
-                        if(menuService.isItemEnabled(menuItem)) {
+                        if (menuService.isItemEnabled(menuItem)) {
                             subMenu
                                     .add(menuGroup.getGroupId(), menuItem.getID(), 0, menuItem.getTitleText())
                                     .setIcon(menuItem.getDrawerIcon());
diff --git a/app/src/main/java/it/integry/integrywmsnative/ui/expandablelayout/ExpandableLayout.java b/app/src/main/java/it/integry/integrywmsnative/ui/expandablelayout/ExpandableLayout.java
index 68642696..000f42f8 100644
--- a/app/src/main/java/it/integry/integrywmsnative/ui/expandablelayout/ExpandableLayout.java
+++ b/app/src/main/java/it/integry/integrywmsnative/ui/expandablelayout/ExpandableLayout.java
@@ -19,8 +19,6 @@ import android.view.animation.Interpolator;
 import android.widget.FrameLayout;
 import android.widget.LinearLayout;
 
-import it.integry.integrywmsnative.R;
-
 public class ExpandableLayout extends FrameLayout {
     public interface State {
         int COLLAPSED = 0;
@@ -56,11 +54,11 @@ public class ExpandableLayout extends FrameLayout {
         super(context, attrs);
 
         if (attrs != null) {
-            TypedArray a = getContext().obtainStyledAttributes(attrs, R.styleable.ExpandableLayout);
-            duration = a.getInt(R.styleable.ExpandableLayout_el_duration, DEFAULT_DURATION);
-            expansion = a.getBoolean(R.styleable.ExpandableLayout_el_expanded, false) ? 1 : 0;
-            orientation = a.getInt(R.styleable.ExpandableLayout_android_orientation, VERTICAL);
-            parallax = a.getFloat(R.styleable.ExpandableLayout_el_parallax, 1);
+            TypedArray a = getContext().obtainStyledAttributes(attrs, net.cachapa.expandablelayout.R.styleable.ExpandableLayout);
+            duration = a.getInt(net.cachapa.expandablelayout.R.styleable.ExpandableLayout_el_duration, DEFAULT_DURATION);
+            expansion = a.getBoolean(net.cachapa.expandablelayout.R.styleable.ExpandableLayout_el_expanded, false) ? 1 : 0;
+            orientation = a.getInt(net.cachapa.expandablelayout.R.styleable.ExpandableLayout_android_orientation, VERTICAL);
+            parallax = a.getFloat(net.cachapa.expandablelayout.R.styleable.ExpandableLayout_el_parallax, 1);
             a.recycle();
 
             state = expansion == 0 ? COLLAPSED : EXPANDED;
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 7d870f63..ccbfd2bb 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
@@ -217,15 +217,15 @@ public class DialogInputQuantityV2View extends BaseDialogFragment implements Dia
         switch (statoPartitaMag) {
             case SCADUTO:
                 this.mBindings.inputDataScadLayout.setEndIconDrawable(R.drawable.ic_baseline_warning_24);
-                this.mBindings.inputDataScadLayout.setEndIconTintList(ColorStateList.valueOf(ContextCompat.getColor(requireContext(), R.color.warn_color)));
+                this.mBindings.inputDataScadLayout.setEndIconTintList(ColorStateList.valueOf(ContextCompat.getColor(requireContext(), com.tfb.fbtoast.R.color.warn_color)));
                 break;
             case IN_SCADENZA:
                 this.mBindings.inputDataScadLayout.setEndIconDrawable(R.drawable.ic_baseline_warning_24);
-                this.mBindings.inputDataScadLayout.setEndIconTintList(ColorStateList.valueOf(ContextCompat.getColor(requireContext(), R.color.error_color)));
+                this.mBindings.inputDataScadLayout.setEndIconTintList(ColorStateList.valueOf(ContextCompat.getColor(requireContext(), com.tfb.fbtoast.R.color.error_color)));
                 break;
             default:
                 this.mBindings.inputDataScadLayout.setEndIconDrawable(R.drawable.ic_check_white_24dp);
-                this.mBindings.inputDataScadLayout.setEndIconTintList(ColorStateList.valueOf(ContextCompat.getColor(requireContext(), R.color.success_color)));
+                this.mBindings.inputDataScadLayout.setEndIconTintList(ColorStateList.valueOf(ContextCompat.getColor(requireContext(), com.tfb.fbtoast.R.color.success_color)));
 
         }
     }
diff --git a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/yes_no/DialogYesNoView.java b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/yes_no/DialogYesNoView.java
index 62891bbe..7151f400 100644
--- a/app/src/main/java/it/integry/integrywmsnative/view/dialogs/yes_no/DialogYesNoView.java
+++ b/app/src/main/java/it/integry/integrywmsnative/view/dialogs/yes_no/DialogYesNoView.java
@@ -11,7 +11,6 @@ import androidx.fragment.app.DialogFragment;
 
 import com.google.android.material.dialog.MaterialAlertDialogBuilder;
 
-import it.integry.integrywmsnative.R;
 import it.integry.integrywmsnative.core.expansion.RunnableArgs;
 import it.integry.integrywmsnative.core.utility.UtilityString;
 import it.integry.integrywmsnative.databinding.DialogYesNoBinding;
@@ -42,13 +41,13 @@ public class DialogYesNoView extends DialogFragment {
         var binding = DialogYesNoBinding.inflate(LayoutInflater.from(requireContext()));
         binding.executePendingBindings();
 
-        if(UtilityString.isNullOrEmpty(title)) {
+        if (UtilityString.isNullOrEmpty(title)) {
             binding.titleText.setVisibility(View.GONE);
-            binding.descriptionText.setTextAppearance(requireContext(), R.style.TextAppearance_Material3_BodyLarge);
+            binding.descriptionText.setTextAppearance(requireContext(), com.google.android.material.R.style.TextAppearance_Material3_BodyLarge);
         } else {
             binding.titleText.setText(title);
             binding.titleText.setVisibility(View.VISIBLE);
-            binding.descriptionText.setTextAppearance(requireContext(), R.style.TextAppearance_Material3_BodyMedium);
+            binding.descriptionText.setTextAppearance(requireContext(), com.google.android.material.R.style.TextAppearance_Material3_BodyMedium);
         }
 
         binding.descriptionText.setText(description);
diff --git a/build.gradle b/build.gradle
index eb7b1b5a..8131e71a 100644
--- a/build.gradle
+++ b/build.gradle
@@ -3,6 +3,7 @@
 buildscript {
     ext {
         kotlin_version = '1.8.0'
+        agp_version = '8.1.0-alpha04'
     }
 
     repositories {
@@ -10,7 +11,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.4.1'
+        classpath "com.android.tools.build:gradle:$agp_version"
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         classpath 'com.google.gms:google-services:4.3.15'
 
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 5cda5fac..4c8dc7c7 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Wed Oct 14 10:44:19 CEST 2020
+#Mon Feb 13 15:14:43 CET 2023
 distributionBase=GRADLE_USER_HOME
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip
 distributionPath=wrapper/dists
-zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-all.zip
+zipStoreBase=GRADLE_USER_HOME