Finish v1.32.19(359)

Fix on start dei docInterni.

.idea/.gitignore

@@ -0,0 +1 @@
+/saveactions_settings.xml

.idea/codeStyles/Project.xml

@@ -1,24 +1,12 @@
 <component name="ProjectCodeStyleConfiguration">
   <code_scheme name="Project" version="173">
     <JetCodeStyleSettings>
-      <option name="PACKAGES_TO_USE_STAR_IMPORTS">
-        <value>
-          <package name="java.util" alias="false" withSubpackages="false" />
-          <package name="kotlinx.android.synthetic" alias="false" withSubpackages="true" />
-          <package name="io.ktor" alias="false" withSubpackages="true" />
-        </value>
-      </option>
-      <option name="PACKAGES_IMPORT_LAYOUT">
-        <value>
-          <package name="" alias="false" withSubpackages="true" />
-          <package name="java" alias="false" withSubpackages="true" />
-          <package name="javax" alias="false" withSubpackages="true" />
-          <package name="kotlin" alias="false" withSubpackages="true" />
-          <package name="" alias="true" withSubpackages="true" />
-        </value>
-      </option>
+      <option name="CODE_STYLE_DEFAULTS" value="KOTLIN_OFFICIAL" />
     </JetCodeStyleSettings>
     <codeStyleSettings language="XML">
+      <indentOptions>
+        <option name="CONTINUATION_INDENT_SIZE" value="4" />
+      </indentOptions>
       <arrangement>
         <rules>
           <section>
@@ -127,5 +115,8 @@
         </rules>
       </arrangement>
     </codeStyleSettings>
+    <codeStyleSettings language="kotlin">
+      <option name="CODE_STYLE_DEFAULTS" value="KOTLIN_OFFICIAL" />
+    </codeStyleSettings>
   </code_scheme>
 </component>

.idea/codeStyles/codeStyleConfig.xml

@@ -0,0 +1,5 @@
+<component name="ProjectCodeStyleConfiguration">
+  <state>
+    <option name="USE_PER_PROJECT_SETTINGS" value="true" />
+  </state>
+</component>

.idea/git_toolbox_prj.xml

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="GitToolBoxProjectSettings">
+    <option name="commitMessageIssueKeyValidationOverride">
+      <BoolValueOverride>
+        <option name="enabled" value="true" />
+      </BoolValueOverride>
+    </option>
+    <option name="commitMessageValidationEnabledOverride">
+      <BoolValueOverride>
+        <option name="enabled" value="true" />
+      </BoolValueOverride>
+    </option>
+  </component>
+</project>

.idea/inspectionProfiles/Project_Default.xml

@@ -0,0 +1,8 @@
+<component name="InspectionProjectProfileManager">
+  <profile version="1.0">
+    <option name="myName" value="Project Default" />
+    <inspection_tool class="AutoCloseableResource" enabled="true" level="WARNING" enabled_by_default="true">
+      <option name="METHOD_MATCHER_CONFIG" value="java.util.Formatter,format,java.io.Writer,append,com.google.common.base.Preconditions,checkNotNull,org.hibernate.Session,close,java.io.PrintWriter,printf,java.io.PrintStream,printf,com.annimon.stream.Stream,of" />
+    </inspection_tool>
+  </profile>
+</component>

.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>

.idea/runConfigurations.xml

@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="RunConfigurationProducerService">
-    <option name="ignoredProducers">
-      <set>
-        <option value="org.jetbrains.plugins.gradle.execution.test.runner.AllInPackageGradleConfigurationProducer" />
-        <option value="org.jetbrains.plugins.gradle.execution.test.runner.TestClassGradleConfigurationProducer" />
-        <option value="org.jetbrains.plugins.gradle.execution.test.runner.TestMethodGradleConfigurationProducer" />
-      </set>
-    </option>
-  </component>
-</project>

.idea/runConfigurations/app.xml

@@ -1,19 +1,20 @@
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="app_saporiveri_pv" type="AndroidRunConfigurationType" factoryName="Android App" activateToolWindowBeforeRun="false">
-    <module name="WMS_Native.app" />
+  <configuration default="false" name="app" type="AndroidRunConfigurationType" factoryName="Android 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" />
     <option name="ARTIFACT_NAME" value="" />
     <option name="PM_INSTALL_OPTIONS" value="" />
     <option name="ALL_USERS" value="false" />
-    <option name="DYNAMIC_FEATURES_DISABLED_LIST" value="WMS_Native.dynamic__base,WMS_Native.dynamic_frudis,WMS_Native.dynamic_gramm,WMS_Native.dynamic_ime,WMS_Native.dynamic_saporiveri,WMS_Native.dynamic_vgalimenti,dynamic__base,dynamic_frudis,dynamic_gramm,dynamic_ime,dynamic_saporiveri,dynamic_vgalimenti" />
+    <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,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="CLEAR_LOGCAT" value="false" />
+    <option name="SHOW_LOGCAT_AUTOMATICALLY" value="false" />
+    <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" />
     <option name="SELECTED_CLOUD_MATRIX_PROJECT_ID" value="" />
@@ -44,7 +45,7 @@
       <option name="ADVANCED_PROFILING_ENABLED" value="false" />
       <option name="STARTUP_PROFILING_ENABLED" value="false" />
       <option name="STARTUP_CPU_PROFILING_ENABLED" value="false" />
-      <option name="STARTUP_CPU_PROFILING_CONFIGURATION_NAME" value="Sample Java Methods" />
+      <option name="STARTUP_CPU_PROFILING_CONFIGURATION_NAME" value="Java/Kotlin Method Sample (legacy)" />
       <option name="STARTUP_NATIVE_MEMORY_PROFILING_ENABLED" value="false" />
       <option name="NATIVE_MEMORY_SAMPLE_RATE_BYTES" value="2048" />
     </Profilers>

.idea/runConfigurations/app_base.xml

@@ -1,59 +0,0 @@
-<component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="app_base" type="AndroidRunConfigurationType" factoryName="Android App" activateToolWindowBeforeRun="false">
-    <module name="WMS_Native.app" />
-    <option name="DEPLOY" value="true" />
-    <option name="DEPLOY_APK_FROM_BUNDLE" value="false" />
-    <option name="DEPLOY_AS_INSTANT" value="false" />
-    <option name="ARTIFACT_NAME" value="" />
-    <option name="PM_INSTALL_OPTIONS" value="" />
-    <option name="ALL_USERS" value="false" />
-    <option name="DYNAMIC_FEATURES_DISABLED_LIST" value="WMS_Native.dynamic_frudis,WMS_Native.dynamic_gramm,WMS_Native.dynamic_ime,WMS_Native.dynamic_saporiveri,WMS_Native.dynamic_saporiveri_pv,WMS_Native.dynamic_vgalimenti,dynamic_frudis,dynamic_gramm,dynamic_ime,dynamic_saporiveri,dynamic_saporiveri_pv,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="TARGET_SELECTION_MODE" value="SHOW_DIALOG" />
-    <option name="SELECTED_CLOUD_MATRIX_CONFIGURATION_ID" value="-1" />
-    <option name="SELECTED_CLOUD_MATRIX_PROJECT_ID" value="" />
-    <option name="DEBUGGER_TYPE" value="Auto" />
-    <Auto>
-      <option name="USE_JAVA_AWARE_DEBUGGER" value="false" />
-      <option name="SHOW_STATIC_VARS" value="true" />
-      <option name="WORKING_DIR" value="" />
-      <option name="TARGET_LOGGING_CHANNELS" value="lldb process:gdb-remote packets" />
-      <option name="SHOW_OPTIMIZED_WARNING" value="true" />
-    </Auto>
-    <Hybrid>
-      <option name="USE_JAVA_AWARE_DEBUGGER" value="false" />
-      <option name="SHOW_STATIC_VARS" value="true" />
-      <option name="WORKING_DIR" value="" />
-      <option name="TARGET_LOGGING_CHANNELS" value="lldb process:gdb-remote packets" />
-      <option name="SHOW_OPTIMIZED_WARNING" value="true" />
-    </Hybrid>
-    <Java />
-    <Native>
-      <option name="USE_JAVA_AWARE_DEBUGGER" value="false" />
-      <option name="SHOW_STATIC_VARS" value="true" />
-      <option name="WORKING_DIR" value="" />
-      <option name="TARGET_LOGGING_CHANNELS" value="lldb process:gdb-remote packets" />
-      <option name="SHOW_OPTIMIZED_WARNING" value="true" />
-    </Native>
-    <Profilers>
-      <option name="ADVANCED_PROFILING_ENABLED" value="false" />
-      <option name="STARTUP_PROFILING_ENABLED" value="false" />
-      <option name="STARTUP_CPU_PROFILING_ENABLED" value="false" />
-      <option name="STARTUP_CPU_PROFILING_CONFIGURATION_NAME" value="Sample Java Methods" />
-      <option name="STARTUP_NATIVE_MEMORY_PROFILING_ENABLED" value="false" />
-      <option name="NATIVE_MEMORY_SAMPLE_RATE_BYTES" value="2048" />
-    </Profilers>
-    <option name="DEEP_LINK" value="" />
-    <option name="ACTIVITY_CLASS" value="" />
-    <option name="SEARCH_ACTIVITY_IN_GLOBAL_SCOPE" value="false" />
-    <option name="SKIP_ACTIVITY_VALIDATION" value="false" />
-    <method v="2">
-      <option name="Android.Gradle.BeforeRunTask" enabled="true" />
-    </method>
-  </configuration>
-</component>

.idea/runConfigurations/app_frudis.xml

@@ -1,59 +0,0 @@
-<component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="app_frudis" type="AndroidRunConfigurationType" factoryName="Android App" activateToolWindowBeforeRun="false">
-    <module name="WMS_Native.app" />
-    <option name="DEPLOY" value="true" />
-    <option name="DEPLOY_APK_FROM_BUNDLE" value="false" />
-    <option name="DEPLOY_AS_INSTANT" value="false" />
-    <option name="ARTIFACT_NAME" value="" />
-    <option name="PM_INSTALL_OPTIONS" value="" />
-    <option name="ALL_USERS" value="false" />
-    <option name="DYNAMIC_FEATURES_DISABLED_LIST" value="WMS_Native.dynamic__base,WMS_Native.dynamic_gramm,WMS_Native.dynamic_ime,WMS_Native.dynamic_saporiveri,WMS_Native.dynamic_saporiveri_pv,WMS_Native.dynamic_vgalimenti,dynamic__base,dynamic_gramm,dynamic_ime,dynamic_saporiveri,dynamic_saporiveri_pv,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="TARGET_SELECTION_MODE" value="SHOW_DIALOG" />
-    <option name="SELECTED_CLOUD_MATRIX_CONFIGURATION_ID" value="-1" />
-    <option name="SELECTED_CLOUD_MATRIX_PROJECT_ID" value="" />
-    <option name="DEBUGGER_TYPE" value="Auto" />
-    <Auto>
-      <option name="USE_JAVA_AWARE_DEBUGGER" value="false" />
-      <option name="SHOW_STATIC_VARS" value="true" />
-      <option name="WORKING_DIR" value="" />
-      <option name="TARGET_LOGGING_CHANNELS" value="lldb process:gdb-remote packets" />
-      <option name="SHOW_OPTIMIZED_WARNING" value="true" />
-    </Auto>
-    <Hybrid>
-      <option name="USE_JAVA_AWARE_DEBUGGER" value="false" />
-      <option name="SHOW_STATIC_VARS" value="true" />
-      <option name="WORKING_DIR" value="" />
-      <option name="TARGET_LOGGING_CHANNELS" value="lldb process:gdb-remote packets" />
-      <option name="SHOW_OPTIMIZED_WARNING" value="true" />
-    </Hybrid>
-    <Java />
-    <Native>
-      <option name="USE_JAVA_AWARE_DEBUGGER" value="false" />
-      <option name="SHOW_STATIC_VARS" value="true" />
-      <option name="WORKING_DIR" value="" />
-      <option name="TARGET_LOGGING_CHANNELS" value="lldb process:gdb-remote packets" />
-      <option name="SHOW_OPTIMIZED_WARNING" value="true" />
-    </Native>
-    <Profilers>
-      <option name="ADVANCED_PROFILING_ENABLED" value="true" />
-      <option name="STARTUP_PROFILING_ENABLED" value="false" />
-      <option name="STARTUP_CPU_PROFILING_ENABLED" value="false" />
-      <option name="STARTUP_CPU_PROFILING_CONFIGURATION_NAME" value="Sample Java Methods" />
-      <option name="STARTUP_NATIVE_MEMORY_PROFILING_ENABLED" value="false" />
-      <option name="NATIVE_MEMORY_SAMPLE_RATE_BYTES" value="2048" />
-    </Profilers>
-    <option name="DEEP_LINK" value="" />
-    <option name="ACTIVITY_CLASS" value="" />
-    <option name="SEARCH_ACTIVITY_IN_GLOBAL_SCOPE" value="false" />
-    <option name="SKIP_ACTIVITY_VALIDATION" value="false" />
-    <method v="2">
-      <option name="Android.Gradle.BeforeRunTask" enabled="true" />
-    </method>
-  </configuration>
-</component>

.idea/runConfigurations/app_gramm.xml

@@ -1,59 +0,0 @@
-<component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="app_gramm" type="AndroidRunConfigurationType" factoryName="Android App" activateToolWindowBeforeRun="false">
-    <module name="WMS_Native.app" />
-    <option name="DEPLOY" value="true" />
-    <option name="DEPLOY_APK_FROM_BUNDLE" value="false" />
-    <option name="DEPLOY_AS_INSTANT" value="false" />
-    <option name="ARTIFACT_NAME" value="" />
-    <option name="PM_INSTALL_OPTIONS" value="" />
-    <option name="ALL_USERS" value="false" />
-    <option name="DYNAMIC_FEATURES_DISABLED_LIST" value="WMS_Native.dynamic__base,WMS_Native.dynamic_frudis,WMS_Native.dynamic_ime,WMS_Native.dynamic_saporiveri,WMS_Native.dynamic_saporiveri_pv,WMS_Native.dynamic_vgalimenti,dynamic__base,dynamic_frudis,dynamic_ime,dynamic_saporiveri,dynamic_saporiveri_pv,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="false" />
-    <option name="FORCE_STOP_RUNNING_APP" value="true" />
-    <option name="TARGET_SELECTION_MODE" value="SHOW_DIALOG" />
-    <option name="SELECTED_CLOUD_MATRIX_CONFIGURATION_ID" value="-1" />
-    <option name="SELECTED_CLOUD_MATRIX_PROJECT_ID" value="" />
-    <option name="DEBUGGER_TYPE" value="Auto" />
-    <Auto>
-      <option name="USE_JAVA_AWARE_DEBUGGER" value="false" />
-      <option name="SHOW_STATIC_VARS" value="true" />
-      <option name="WORKING_DIR" value="" />
-      <option name="TARGET_LOGGING_CHANNELS" value="lldb process:gdb-remote packets" />
-      <option name="SHOW_OPTIMIZED_WARNING" value="true" />
-    </Auto>
-    <Hybrid>
-      <option name="USE_JAVA_AWARE_DEBUGGER" value="false" />
-      <option name="SHOW_STATIC_VARS" value="true" />
-      <option name="WORKING_DIR" value="" />
-      <option name="TARGET_LOGGING_CHANNELS" value="lldb process:gdb-remote packets" />
-      <option name="SHOW_OPTIMIZED_WARNING" value="true" />
-    </Hybrid>
-    <Java />
-    <Native>
-      <option name="USE_JAVA_AWARE_DEBUGGER" value="false" />
-      <option name="SHOW_STATIC_VARS" value="true" />
-      <option name="WORKING_DIR" value="" />
-      <option name="TARGET_LOGGING_CHANNELS" value="lldb process:gdb-remote packets" />
-      <option name="SHOW_OPTIMIZED_WARNING" value="true" />
-    </Native>
-    <Profilers>
-      <option name="ADVANCED_PROFILING_ENABLED" value="false" />
-      <option name="STARTUP_PROFILING_ENABLED" value="false" />
-      <option name="STARTUP_CPU_PROFILING_ENABLED" value="false" />
-      <option name="STARTUP_CPU_PROFILING_CONFIGURATION_NAME" value="Sample Java Methods" />
-      <option name="STARTUP_NATIVE_MEMORY_PROFILING_ENABLED" value="false" />
-      <option name="NATIVE_MEMORY_SAMPLE_RATE_BYTES" value="2048" />
-    </Profilers>
-    <option name="DEEP_LINK" value="" />
-    <option name="ACTIVITY_CLASS" value="" />
-    <option name="SEARCH_ACTIVITY_IN_GLOBAL_SCOPE" value="false" />
-    <option name="SKIP_ACTIVITY_VALIDATION" value="false" />
-    <method v="2">
-      <option name="Android.Gradle.BeforeRunTask" enabled="true" />
-    </method>
-  </configuration>
-</component>

.idea/runConfigurations/app_ime.xml

@@ -1,59 +0,0 @@
-<component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="app_ime" type="AndroidRunConfigurationType" factoryName="Android App" activateToolWindowBeforeRun="false">
-    <module name="WMS_Native.app" />
-    <option name="DEPLOY" value="true" />
-    <option name="DEPLOY_APK_FROM_BUNDLE" value="false" />
-    <option name="DEPLOY_AS_INSTANT" value="false" />
-    <option name="ARTIFACT_NAME" value="" />
-    <option name="PM_INSTALL_OPTIONS" value="" />
-    <option name="ALL_USERS" value="false" />
-    <option name="DYNAMIC_FEATURES_DISABLED_LIST" value="WMS_Native.dynamic__base,WMS_Native.dynamic_frudis,WMS_Native.dynamic_gramm,WMS_Native.dynamic_saporiveri,WMS_Native.dynamic_saporiveri_pv,WMS_Native.dynamic_vgalimenti,dynamic__base,dynamic_frudis,dynamic_gramm,dynamic_saporiveri,dynamic_saporiveri_pv,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="false" />
-    <option name="FORCE_STOP_RUNNING_APP" value="true" />
-    <option name="TARGET_SELECTION_MODE" value="SHOW_DIALOG" />
-    <option name="SELECTED_CLOUD_MATRIX_CONFIGURATION_ID" value="-1" />
-    <option name="SELECTED_CLOUD_MATRIX_PROJECT_ID" value="" />
-    <option name="DEBUGGER_TYPE" value="Auto" />
-    <Auto>
-      <option name="USE_JAVA_AWARE_DEBUGGER" value="false" />
-      <option name="SHOW_STATIC_VARS" value="true" />
-      <option name="WORKING_DIR" value="" />
-      <option name="TARGET_LOGGING_CHANNELS" value="lldb process:gdb-remote packets" />
-      <option name="SHOW_OPTIMIZED_WARNING" value="true" />
-    </Auto>
-    <Hybrid>
-      <option name="USE_JAVA_AWARE_DEBUGGER" value="false" />
-      <option name="SHOW_STATIC_VARS" value="true" />
-      <option name="WORKING_DIR" value="" />
-      <option name="TARGET_LOGGING_CHANNELS" value="lldb process:gdb-remote packets" />
-      <option name="SHOW_OPTIMIZED_WARNING" value="true" />
-    </Hybrid>
-    <Java />
-    <Native>
-      <option name="USE_JAVA_AWARE_DEBUGGER" value="false" />
-      <option name="SHOW_STATIC_VARS" value="true" />
-      <option name="WORKING_DIR" value="" />
-      <option name="TARGET_LOGGING_CHANNELS" value="lldb process:gdb-remote packets" />
-      <option name="SHOW_OPTIMIZED_WARNING" value="true" />
-    </Native>
-    <Profilers>
-      <option name="ADVANCED_PROFILING_ENABLED" value="false" />
-      <option name="STARTUP_PROFILING_ENABLED" value="false" />
-      <option name="STARTUP_CPU_PROFILING_ENABLED" value="false" />
-      <option name="STARTUP_CPU_PROFILING_CONFIGURATION_NAME" value="Sample Java Methods" />
-      <option name="STARTUP_NATIVE_MEMORY_PROFILING_ENABLED" value="false" />
-      <option name="NATIVE_MEMORY_SAMPLE_RATE_BYTES" value="2048" />
-    </Profilers>
-    <option name="DEEP_LINK" value="" />
-    <option name="ACTIVITY_CLASS" value="" />
-    <option name="SEARCH_ACTIVITY_IN_GLOBAL_SCOPE" value="false" />
-    <option name="SKIP_ACTIVITY_VALIDATION" value="false" />
-    <method v="2">
-      <option name="Android.Gradle.BeforeRunTask" enabled="true" />
-    </method>
-  </configuration>
-</component>

.idea/runConfigurations/app_saporiveri.xml

@@ -1,59 +0,0 @@
-<component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="app_saporiveri" type="AndroidRunConfigurationType" factoryName="Android App" activateToolWindowBeforeRun="false">
-    <module name="WMS_Native.app" />
-    <option name="DEPLOY" value="true" />
-    <option name="DEPLOY_APK_FROM_BUNDLE" value="false" />
-    <option name="DEPLOY_AS_INSTANT" value="false" />
-    <option name="ARTIFACT_NAME" value="" />
-    <option name="PM_INSTALL_OPTIONS" value="" />
-    <option name="ALL_USERS" value="false" />
-    <option name="DYNAMIC_FEATURES_DISABLED_LIST" value="WMS_Native.dynamic__base,WMS_Native.dynamic_frudis,WMS_Native.dynamic_gramm,WMS_Native.dynamic_ime,WMS_Native.dynamic_saporiveri_pv,WMS_Native.dynamic_vgalimenti,dynamic__base,dynamic_frudis,dynamic_gramm,dynamic_ime,dynamic_saporiveri_pv,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="TARGET_SELECTION_MODE" value="SHOW_DIALOG" />
-    <option name="SELECTED_CLOUD_MATRIX_CONFIGURATION_ID" value="-1" />
-    <option name="SELECTED_CLOUD_MATRIX_PROJECT_ID" value="" />
-    <option name="DEBUGGER_TYPE" value="Auto" />
-    <Auto>
-      <option name="USE_JAVA_AWARE_DEBUGGER" value="false" />
-      <option name="SHOW_STATIC_VARS" value="true" />
-      <option name="WORKING_DIR" value="" />
-      <option name="TARGET_LOGGING_CHANNELS" value="lldb process:gdb-remote packets" />
-      <option name="SHOW_OPTIMIZED_WARNING" value="true" />
-    </Auto>
-    <Hybrid>
-      <option name="USE_JAVA_AWARE_DEBUGGER" value="false" />
-      <option name="SHOW_STATIC_VARS" value="true" />
-      <option name="WORKING_DIR" value="" />
-      <option name="TARGET_LOGGING_CHANNELS" value="lldb process:gdb-remote packets" />
-      <option name="SHOW_OPTIMIZED_WARNING" value="true" />
-    </Hybrid>
-    <Java />
-    <Native>
-      <option name="USE_JAVA_AWARE_DEBUGGER" value="false" />
-      <option name="SHOW_STATIC_VARS" value="true" />
-      <option name="WORKING_DIR" value="" />
-      <option name="TARGET_LOGGING_CHANNELS" value="lldb process:gdb-remote packets" />
-      <option name="SHOW_OPTIMIZED_WARNING" value="true" />
-    </Native>
-    <Profilers>
-      <option name="ADVANCED_PROFILING_ENABLED" value="false" />
-      <option name="STARTUP_PROFILING_ENABLED" value="false" />
-      <option name="STARTUP_CPU_PROFILING_ENABLED" value="false" />
-      <option name="STARTUP_CPU_PROFILING_CONFIGURATION_NAME" value="Sample Java Methods" />
-      <option name="STARTUP_NATIVE_MEMORY_PROFILING_ENABLED" value="false" />
-      <option name="NATIVE_MEMORY_SAMPLE_RATE_BYTES" value="2048" />
-    </Profilers>
-    <option name="DEEP_LINK" value="" />
-    <option name="ACTIVITY_CLASS" value="" />
-    <option name="SEARCH_ACTIVITY_IN_GLOBAL_SCOPE" value="false" />
-    <option name="SKIP_ACTIVITY_VALIDATION" value="false" />
-    <method v="2">
-      <option name="Android.Gradle.BeforeRunTask" enabled="true" />
-    </method>
-  </configuration>
-</component>

.idea/runConfigurations/app_vglimenti.xml

@@ -1,59 +0,0 @@
-<component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="app_vglimenti" type="AndroidRunConfigurationType" factoryName="Android App" activateToolWindowBeforeRun="false">
-    <module name="WMS_Native.app" />
-    <option name="DEPLOY" value="true" />
-    <option name="DEPLOY_APK_FROM_BUNDLE" value="false" />
-    <option name="DEPLOY_AS_INSTANT" value="false" />
-    <option name="ARTIFACT_NAME" value="" />
-    <option name="PM_INSTALL_OPTIONS" value="" />
-    <option name="ALL_USERS" value="false" />
-    <option name="DYNAMIC_FEATURES_DISABLED_LIST" value="WMS_Native.dynamic__base,WMS_Native.dynamic_frudis,WMS_Native.dynamic_gramm,WMS_Native.dynamic_ime,WMS_Native.dynamic_saporiveri,WMS_Native.dynamic_saporiveri_pv,dynamic__base,dynamic_frudis,dynamic_gramm,dynamic_ime,dynamic_saporiveri,dynamic_saporiveri_pv" />
-    <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="TARGET_SELECTION_MODE" value="SHOW_DIALOG" />
-    <option name="SELECTED_CLOUD_MATRIX_CONFIGURATION_ID" value="-1" />
-    <option name="SELECTED_CLOUD_MATRIX_PROJECT_ID" value="" />
-    <option name="DEBUGGER_TYPE" value="Auto" />
-    <Auto>
-      <option name="USE_JAVA_AWARE_DEBUGGER" value="false" />
-      <option name="SHOW_STATIC_VARS" value="true" />
-      <option name="WORKING_DIR" value="" />
-      <option name="TARGET_LOGGING_CHANNELS" value="lldb process:gdb-remote packets" />
-      <option name="SHOW_OPTIMIZED_WARNING" value="true" />
-    </Auto>
-    <Hybrid>
-      <option name="USE_JAVA_AWARE_DEBUGGER" value="false" />
-      <option name="SHOW_STATIC_VARS" value="true" />
-      <option name="WORKING_DIR" value="" />
-      <option name="TARGET_LOGGING_CHANNELS" value="lldb process:gdb-remote packets" />
-      <option name="SHOW_OPTIMIZED_WARNING" value="true" />
-    </Hybrid>
-    <Java />
-    <Native>
-      <option name="USE_JAVA_AWARE_DEBUGGER" value="false" />
-      <option name="SHOW_STATIC_VARS" value="true" />
-      <option name="WORKING_DIR" value="" />
-      <option name="TARGET_LOGGING_CHANNELS" value="lldb process:gdb-remote packets" />
-      <option name="SHOW_OPTIMIZED_WARNING" value="true" />
-    </Native>
-    <Profilers>
-      <option name="ADVANCED_PROFILING_ENABLED" value="false" />
-      <option name="STARTUP_PROFILING_ENABLED" value="false" />
-      <option name="STARTUP_CPU_PROFILING_ENABLED" value="false" />
-      <option name="STARTUP_CPU_PROFILING_CONFIGURATION_NAME" value="Sample Java Methods" />
-      <option name="STARTUP_NATIVE_MEMORY_PROFILING_ENABLED" value="false" />
-      <option name="NATIVE_MEMORY_SAMPLE_RATE_BYTES" value="2048" />
-    </Profilers>
-    <option name="DEEP_LINK" value="" />
-    <option name="ACTIVITY_CLASS" value="" />
-    <option name="SEARCH_ACTIVITY_IN_GLOBAL_SCOPE" value="false" />
-    <option name="SKIP_ACTIVITY_VALIDATION" value="false" />
-    <method v="2">
-      <option name="Android.Gradle.BeforeRunTask" enabled="true" />
-    </method>
-  </configuration>
-</component>

app/build.gradle

@@ -1,13 +1,17 @@
 apply plugin: 'com.android.application'
-apply plugin: 'com.google.firebase.firebase-perf'
+
+if (!project.hasProperty("disable-performance-plugin")) {
+    apply plugin: 'com.google.firebase.firebase-perf'
+}
+
 apply plugin: 'com.google.firebase.crashlytics'
 apply plugin: 'kotlin-android'
 apply plugin: 'com.google.gms.google-services'
 
 android {
 
-    def appVersionCode = 201
-    def appVersionName = '1.16.19'
+    def appVersionCode = 359
+    def appVersionName = '1.32.19'
 
     signingConfigs {
         release {
@@ -15,6 +19,9 @@ android {
             keyPassword 'inpmiy'
             storeFile file('Integry.jks')
             storePassword 'inpmiy'
+
+            enableV3Signing true
+            enableV4Signing true
         }
     }
 
@@ -24,16 +31,23 @@ android {
         }
     }
 
-    compileSdkVersion 29
+    compileSdkVersion 33
 
     defaultConfig {
         applicationId "it.integry.integrywmsnative"
         minSdkVersion 21
-        targetSdkVersion 29
+        targetSdkVersion 33
         versionCode appVersionCode
         versionName appVersionName
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         signingConfig signingConfigs.release
+
+        javaCompileOptions {
+            annotationProcessorOptions {
+                arguments += ["room.schemaLocation":
+                                      "$projectDir/schemas".toString()]
+            }
+        }
     }
 
     buildTypes {
@@ -48,11 +62,14 @@ android {
     }
 
     android.buildFeatures.dataBinding true
+    android.buildFeatures.buildConfig true
 
     compileOptions {
-        targetCompatibility 1.8
-        sourceCompatibility 1.8
+        sourceCompatibility JavaVersion.VERSION_11
+        targetCompatibility JavaVersion.VERSION_11
+        coreLibraryDesugaringEnabled true
     }
+
     productFlavors {
     }
 
@@ -69,77 +86,81 @@ android {
             options.compilerArgs << "-Xmaxerrs" << "10000"
         }
     }
-
-    lintOptions {
+    lint {
         abortOnError false
     }
-
-    dynamicFeatures = [":dynamic__base", ":dynamic_vgalimenti", ":dynamic_ime", ":dynamic_frudis", ":dynamic_saporiveri_pv", ":dynamic_saporiveri", ':dynamic_gramm']
+    namespace 'it.integry.integrywmsnative'
 
 
 }
 
 dependencies {
+    coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:2.0.2'
     implementation fileTree(include: ['*.jar'], dir: 'libs')
     androidTestImplementation('androidx.test.espresso:espresso-core:3.3.0', {
         exclude group: 'com.android.support', module: 'support-annotations'
     })
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
-    implementation 'com.orhanobut:logger:2.2.0'
+    implementation 'com.github.lupaulus:logger:2.3.2'
 
     //Firebase
 
     // Import the Firebase BoM
-    implementation platform('com.google.firebase:firebase-bom:26.3.0')
+    implementation platform('com.google.firebase:firebase-bom:29.1.0')
     implementation 'com.google.firebase:firebase-analytics'
     implementation 'com.google.firebase:firebase-core'
-    implementation 'com.google.firebase:firebase-crash'
     implementation 'com.google.firebase:firebase-crashlytics'
     implementation 'com.google.firebase:firebase-perf'
-    implementation 'com.google.android.gms:play-services-basement:17.6.0'
+    implementation 'com.google.android.gms:play-services-basement:18.1.0'
 
 
-    implementation 'androidx.appcompat:appcompat:1.2.0'
+    implementation 'androidx.appcompat:appcompat:1.6.1'
     implementation 'androidx.legacy:legacy-support-v4:1.0.0'
-    implementation 'com.google.android.material:material:1.3.0-rc01'
-    implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
+    implementation 'com.google.android.material:material:1.8.0'
+    implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
     implementation 'androidx.cardview:cardview:1.0.0'
-    implementation 'androidx.recyclerview:recyclerview:1.1.0'
-    implementation 'androidx.preference:preference-ktx:1.1.1'
-    implementation 'com.squareup.okhttp3:okhttp:4.9.0'
+    implementation 'androidx.recyclerview:recyclerview:1.2.1'
+
+    implementation('androidx.preference:preference-ktx:1.2.0') {
+        exclude group: 'androidx.lifecycle', module: 'lifecycle-viewmodel'
+        exclude group: 'androidx.lifecycle', module: 'lifecycle-viewmodel-ktx'
+    }
+
+    implementation "androidx.slidingpanelayout:slidingpanelayout:1.2.0"
+    implementation 'com.squareup.okhttp3:okhttp:4.9.1'
     implementation 'com.squareup.retrofit2:retrofit:2.9.0'
     implementation 'com.squareup.retrofit2:converter-gson:2.9.0'
-    implementation 'com.annimon:stream:1.2.1'
-    implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.3.0'
-    implementation 'androidx.lifecycle:lifecycle-extensions:2.2.0'
-    implementation 'androidx.lifecycle:lifecycle-common-java8:2.3.0'
+    implementation 'com.annimon:stream:1.2.2'
+    implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.5.1'
+//    implementation 'androidx.lifecycle:lifecycle-extensions:2.2.0'
     implementation 'org.apache.commons:commons-text:1.9'
 
     //MVVM
-    def dagger2_version = '2.29.1'
+    def dagger2_version = '2.40.1'
     api "com.google.dagger:dagger:$dagger2_version"
     annotationProcessor "com.google.dagger:dagger-compiler:$dagger2_version"
     api "com.google.dagger:dagger-android:$dagger2_version"
-    api "com.google.dagger:dagger-android-support:$dagger2_version" // if you use the support libraries
+    api "com.google.dagger:dagger-android-support:$dagger2_version"
+    // if you use the support libraries
     annotationProcessor "com.google.dagger:dagger-android-processor:$dagger2_version"
 
     //FAB
     implementation 'com.github.clans:fab:1.6.4'
     //CUSTOM VIEWS
     implementation 'com.github.NaimishTrivedi:FBToast:1.0'
-    implementation 'net.cachapa.expandablelayout:expandablelayout:2.9.2'
+    implementation 'com.github.cachapa:ExpandableLayout:2.9.2'
     implementation 'com.github.frankiesardo:linearlistview:1.0.1@aar'
-    implementation 'com.fede987:status-bar-alert:1.0.1'
-    implementation 'com.fxn769:stash:1.2'
-    testImplementation 'junit:junit:4.13.1'
+    implementation 'com.github.fede87:StatusBarAlert:1.0.1'
     implementation 'com.github.zhukic:sectioned-recyclerview:1.2.3'
     implementation 'com.github.pedromassango:doubleClick:3.0'
 
     //SQLite ROOM
-    def room_version = "2.2.6"
+    def room_version = "2.5.0"
 
     implementation "androidx.room:room-runtime:$room_version"
     annotationProcessor "androidx.room:room-compiler:$room_version"
+    implementation "androidx.room:room-rxjava3:$room_version"
+    androidTestImplementation "androidx.room:room-testing:2.5.0"
 
     //AppUpdate
     implementation 'com.github.javiersantos:AppUpdater:2.7'
@@ -150,11 +171,26 @@ dependencies {
     implementation project(':barcode_base_android_library')
     implementation project(':honeywellscannerlibrary')
     implementation project(':keyobardemulatorscannerlibrary')
-    implementation project(':barcode_kaiteki')
-    androidTestImplementation 'org.junit.jupiter:junit-jupiter-api:5.7.0'
-    androidTestImplementation 'org.testng:testng:7.3.0'
+
+
+    implementation 'com.github.RaviKoradiya:LiveAdapter:1.3.4'
+
+    // Required -- JUnit 4 framework
+//    testImplementation "org.junit.jupiter:junit-jupiter-api:5.8.1"
+//    androidTestImplementation 'org.junit.jupiter:junit-jupiter-api:5.8.1'
+//    androidTestImplementation 'org.testng:testng:7.4.0'
+
+
+    //Bluetooth device manager
+    implementation 'com.github.harry1453:android-bluetooth-serial:v1.1'
+
+    // RxJava is also required.
+    implementation 'io.reactivex.rxjava2:rxjava:2.1.12'
+    implementation 'io.reactivex.rxjava2:rxandroid:2.0.2'
 }
+
 repositories {
     mavenCentral()
     google()
+    maven { url 'https://jitpack.io' }
 }

app/src/androidTest/java/it/integry/integrywmsnative/ExampleInstrumentedTest.java

@@ -1,26 +0,0 @@
-package it.integry.integrywmsnative;
-
-import android.content.Context;
-import androidx.test.InstrumentationRegistry;
-import androidx.test.runner.AndroidJUnit4;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
-import static org.junit.Assert.*;
-
-/**
- * Instrumentation test, which will execute on an Android device.
- *
- * @see <a href="http://d.android.com/tools/testing">Testing documentation</a>
- */
-@RunWith(AndroidJUnit4.class)
-public class ExampleInstrumentedTest {
-    @Test
-    public void useAppContext() throws Exception {
-        // Context of the app under test.
-        Context appContext = InstrumentationRegistry.getTargetContext();
-
-        assertEquals("it.integry.integrywmsnative", appContext.getPackageName());
-    }
-}

app/src/androidTest/java/it/integry/integrywmsnative/gest/spedizione/SpedizioneViewModelTest.java

@@ -1,8 +0,0 @@
-package it.integry.integrywmsnative.gest.spedizione;
-
-class SpedizioneViewModelTest {
-
-    @org.junit.jupiter.api.Test
-    void createNewLU() {
-    }
-}

app/src/main/AndroidManifest.xml

@@ -1,12 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="it.integry.integrywmsnative">
+<manifest xmlns:tools="http://schemas.android.com/tools"
+    xmlns:android="http://schemas.android.com/apk/res/android">
 
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
-    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
-    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
     <uses-permission android:name="android.permission.REQUEST_INSTALL_PACKAGES" />
+    <uses-permission android:name="android.permission.CAMERA" />
+    <uses-permission android:name="android.permission.BLUETOOTH_CONNECT" />
+
+    <uses-permission android:name="android.permission.READ_MEDIA_IMAGES" />
+    <uses-permission android:name="android.permission.READ_MEDIA_AUDIO" />
+    <uses-permission android:name="android.permission.READ_MEDIA_VIDEO" />
+
+
+    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"
+        android:maxSdkVersion="32" />
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"
+        android:maxSdkVersion="32"
+        tools:ignore="ScopedStorage" />
 
     <application
         android:name=".MainApplication"
@@ -18,47 +29,68 @@
         android:supportsRtl="true"
         android:theme="@style/AppTheme"
         android:usesCleartextTraffic="true"
-        android:fullBackupContent="@xml/backup_descriptor">
+        android:fullBackupContent="@xml/backup_descriptor"
+        android:requestLegacyExternalStorage="true">
         <activity
             android:name=".gest.spedizione.SpedizioneActivity"
-            android:screenOrientation="portrait"
             android:theme="@style/Light"
-            android:windowSoftInputMode="adjustNothing" />
-        <activity android:name=".gest.pv_ordine_acquisto_edit.PVOrdineAcquistoEditActivity" />
+            android:windowSoftInputMode="adjustNothing"
+            android:configChanges="orientation|screenSize|keyboardHidden" />
+        <activity
+            android:name=".gest.pv_ordine_acquisto_edit.PVOrdineAcquistoEditActivity"
+            android:theme="@style/Light"
+            android:windowSoftInputMode="adjustNothing"
+            android:configChanges="orientation|screenSize|keyboardHidden" />
+        <activity
+            android:name=".gest.prod_dettaglio_linea.ProdDettaglioLineaActivity"
+            android:theme="@style/Light"
+            android:windowSoftInputMode="adjustNothing"
+            android:configChanges="orientation|screenSize|keyboardHidden" />
+        <activity
+            android:name=".gest.contab_doc_interni.edit_form.DocInterniEditFormActivity"
+            android:theme="@style/Light"
+            android:windowSoftInputMode="adjustNothing"
+            android:configChanges="orientation|screenSize|keyboardHidden" />
         <activity
             android:name=".gest.picking_resi.PickingResiActivity"
-            android:screenOrientation="portrait"
-            android:theme="@style/Light" />
-        <activity
-            android:name=".MainActivity"
-            android:screenOrientation="portrait"
             android:theme="@style/Light"
-            android:windowSoftInputMode="adjustPan">
+            android:configChanges="orientation|screenSize|keyboardHidden" />
+        <activity
+            android:name=".gest.main.MainActivity"
+            android:theme="@style/Light"
+            android:windowSoftInputMode="adjustNothing"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.CLIENTBARCODEACTIVITY" />
 
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
         </activity>
-        <activity
-            android:name=".gest.accettazione_picking.AccettazionePickingActivity"
-            android:screenOrientation="portrait"
-            android:theme="@style/Light"
-            android:windowSoftInputMode="adjustNothing" />
         <activity
             android:name=".gest.login.LoginActivity"
-            android:screenOrientation="portrait"
-            android:theme="@style/Light" />
+            android:theme="@style/Light"
+            android:configChanges="orientation|screenSize|keyboardHidden" />
+        <activity
+            android:name=".gest.accettazione_picking.AccettazionePickingActivity"
+            android:theme="@style/Light"
+            android:windowSoftInputMode="adjustNothing"
+            android:configChanges="orientation|screenSize|keyboardHidden" />
         <activity
             android:name=".gest.lista_bancali.ListaBancaliActivity"
             android:label="@string/activity_lista_bancali_title"
-            android:screenOrientation="portrait"
-            android:theme="@style/Light" />
+            android:theme="@style/Light"
+            android:configChanges="orientation|screenSize|keyboardHidden" />
         <activity
             android:name=".gest.contenuto_bancale.ContenutoBancaleActivity"
             android:label="@string/activity_contenuto_bancale_title"
-            android:screenOrientation="portrait"
-            android:theme="@style/Light" />
+            android:theme="@style/Light"
+            android:configChanges="orientation|screenSize|keyboardHidden" />
+        <activity
+            android:name=".gest.inventario.picking.PickingInventarioActivity"
+            android:label="@string/activity_picking_inventario_title"
+            android:windowSoftInputMode="adjustNothing"
+            android:theme="@style/Light"
+            android:configChanges="orientation|screenSize|keyboardHidden"/>
 
         <meta-data
             android:name="firebase_crashlytics_collection_enabled"
@@ -67,7 +99,8 @@
         <activity
             android:name=".SplashActivity"
             android:label="@string/app_name"
-            android:theme="@style/SplashTheme">
+            android:theme="@style/SplashTheme"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 

app/src/main/java/it/integry/integrywmsnative/MainApplication.java

@@ -3,9 +3,13 @@ package it.integry.integrywmsnative;
 import android.app.Application;
 import android.content.res.Configuration;
 import android.content.res.Resources;
+import android.util.Log;
+
+import javax.inject.Inject;
 
 import it.integry.integrywmsnative.core.context.AppContext;
 import it.integry.integrywmsnative.core.data_store.db.RoomModule;
+import it.integry.integrywmsnative.core.utility.UtilityLogger;
 
 
 public class MainApplication extends Application {
@@ -17,7 +21,10 @@ public class MainApplication extends Application {
     public static MainApplicationModule appModule;
     public static RoomModule roomModule;
 
-    private AppContext appContext = new AppContext(this);
+    private Thread.UncaughtExceptionHandler defaultUncaughtExceptionHandler;
+
+    @Inject
+    AppContext appContext;
 
 
 
@@ -27,17 +34,19 @@ public class MainApplication extends Application {
     public void onCreate() {
         super.onCreate();
 
-        appModule = new MainApplicationModule(MainApplication.this, this);
+        appModule = new MainApplicationModule(this);
         roomModule = new RoomModule(this);
         appComponent = DaggerMainApplicationComponent.builder()
                 .mainApplicationModule(appModule)
                 .roomModule(roomModule)
                 .build();
 
-        appComponent.inject(appContext);
+        appComponent.inject(this);
 
-        appContext.init();
         res = getResources();
+
+        defaultUncaughtExceptionHandler = Thread.getDefaultUncaughtExceptionHandler();
+        Thread.setDefaultUncaughtExceptionHandler(_unCaughtExceptionHandler);
     }
 
     // Called by the system when the device configuration changes while your component is running.
@@ -59,4 +68,22 @@ public class MainApplication extends Application {
         System.exit(0);
     }
 
+
+    // handler listener
+    private final Thread.UncaughtExceptionHandler _unCaughtExceptionHandler =
+            new Thread.UncaughtExceptionHandler() {
+                @Override
+                public void uncaughtException(Thread thread, Throwable ex) {
+                    // re-throw critical exception further to the os (important)
+                    defaultUncaughtExceptionHandler.uncaughtException(thread, ex);
+
+                    try {
+                        UtilityLogger.error(new Exception(ex));
+                        MainApplication.exit();
+                    } catch (Exception e) {
+                        Log.e("Uncaught error", "Exception Logger failed!", e);
+                    }
+                }
+            };
+
 }

app/src/main/java/it/integry/integrywmsnative/MainApplicationComponent.java

@@ -5,26 +5,83 @@ import javax.inject.Singleton;
 import dagger.Component;
 import it.integry.integrywmsnative.core.context.AppContext;
 import it.integry.integrywmsnative.core.data_store.db.RoomModule;
+import it.integry.integrywmsnative.core.expansion.BaseActivityComponent;
+import it.integry.integrywmsnative.core.expansion.BaseActivityModule;
+import it.integry.integrywmsnative.core.expansion.BaseDialogFragmentComponent;
+import it.integry.integrywmsnative.core.expansion.BaseDialogFragmentModule;
+import it.integry.integrywmsnative.core.expansion.BaseFragmentComponent;
+import it.integry.integrywmsnative.core.expansion.BaseFragmentModule;
+import it.integry.integrywmsnative.gest.accettazione.MainAccettazioneComponent;
+import it.integry.integrywmsnative.gest.accettazione.MainAccettazioneModule;
 import it.integry.integrywmsnative.gest.accettazione_picking.AccettazionePickingComponent;
 import it.integry.integrywmsnative.gest.accettazione_picking.AccettazionePickingModule;
+import it.integry.integrywmsnative.gest.contab_doc_interni.DocInterniComponent;
+import it.integry.integrywmsnative.gest.contab_doc_interni.DocInterniModule;
+import it.integry.integrywmsnative.gest.contab_doc_interni.dialog.DialogSelectDocInfoComponent;
+import it.integry.integrywmsnative.gest.contab_doc_interni.dialog.DialogSelectDocInfoModule;
+import it.integry.integrywmsnative.gest.contab_doc_interni.edit_form.DocInterniEditFormComponent;
+import it.integry.integrywmsnative.gest.contab_doc_interni.edit_form.DocInterniEditFormModule;
+import it.integry.integrywmsnative.gest.contab_doc_interni.edit_form.dialog.selectDocRows.DialogSelectDocRowsComponent;
+import it.integry.integrywmsnative.gest.contab_doc_interni.edit_form.dialog.selectDocRows.DialogSelectDocRowsModule;
+import it.integry.integrywmsnative.gest.contenuto_bancale.ContenutoBancaleComponent;
+import it.integry.integrywmsnative.gest.contenuto_bancale.ContenutoBancaleModule;
+import it.integry.integrywmsnative.gest.inventario.ElencoInventariComponent;
+import it.integry.integrywmsnative.gest.inventario.ElencoInventariModule;
+import it.integry.integrywmsnative.gest.inventario.bottom_sheet__inventario_actions.BottomSheetInventarioActionsComponent;
+import it.integry.integrywmsnative.gest.inventario.bottom_sheet__inventario_actions.BottomSheetInventarioActionsModule;
+import it.integry.integrywmsnative.gest.inventario.bottom_sheet__inventario_row_actions.BottomSheetInventarioRowActionsComponent;
+import it.integry.integrywmsnative.gest.inventario.bottom_sheet__inventario_row_actions.BottomSheetInventarioRowActionsModule;
+import it.integry.integrywmsnative.gest.inventario.dialogs.ask_info_inventario.DialogAskInfoInventarioComponent;
+import it.integry.integrywmsnative.gest.inventario.dialogs.ask_info_inventario.DialogAskInfoInventarioModule;
+import it.integry.integrywmsnative.gest.inventario.picking.PickingInventarioComponent;
+import it.integry.integrywmsnative.gest.inventario.picking.PickingInventarioModule;
+import it.integry.integrywmsnative.gest.lista_bancali.ListaBancaliComponent;
+import it.integry.integrywmsnative.gest.lista_bancali.ListaBancaliModule;
+import it.integry.integrywmsnative.gest.login.LoginComponent;
+import it.integry.integrywmsnative.gest.login.LoginModule;
+import it.integry.integrywmsnative.gest.main.MainActivityComponent;
+import it.integry.integrywmsnative.gest.main.MainActivityModule;
+import it.integry.integrywmsnative.gest.main.MainFragmentComponent;
+import it.integry.integrywmsnative.gest.main.MainFragmentModule;
 import it.integry.integrywmsnative.gest.ordini_uscita_elenco.OrdiniUscitaElencoComponent;
 import it.integry.integrywmsnative.gest.ordini_uscita_elenco.OrdiniUscitaElencoModule;
 import it.integry.integrywmsnative.gest.picking_libero.PickingLiberoComponent;
 import it.integry.integrywmsnative.gest.picking_libero.PickingLiberoModule;
 import it.integry.integrywmsnative.gest.picking_resi.PickingResiComponent;
 import it.integry.integrywmsnative.gest.picking_resi.PickingResiModule;
+import it.integry.integrywmsnative.gest.prod_accettazione_ord_produzione.ProdOrdineProduzioneElencoComponent;
+import it.integry.integrywmsnative.gest.prod_accettazione_ord_produzione.ProdOrdineProduzioneElencoModule;
+import it.integry.integrywmsnative.gest.prod_dettaglio_linea.ProdDettaglioLineaComponent;
+import it.integry.integrywmsnative.gest.prod_dettaglio_linea.ProdDettaglioLineaModule;
 import it.integry.integrywmsnative.gest.prod_fabbisogno_linee_prod.ProdFabbisognoLineeProdComponent;
 import it.integry.integrywmsnative.gest.prod_fabbisogno_linee_prod.ProdFabbisognoLineeProdModule;
 import it.integry.integrywmsnative.gest.prod_fabbisogno_linee_prod.dialog_ask_mag_prossimita.DialogAskMagazzinoProssimitaComponent;
 import it.integry.integrywmsnative.gest.prod_fabbisogno_linee_prod.dialog_ask_mag_prossimita.DialogAskMagazzinoProssimitaModule;
+import it.integry.integrywmsnative.gest.prod_linee_produzione.ProdLineeProduzioneComponent;
+import it.integry.integrywmsnative.gest.prod_linee_produzione.ProdLineeProduzioneModule;
+import it.integry.integrywmsnative.gest.prod_recupero_materiale.ProdRecuperoMaterialeComponent;
+import it.integry.integrywmsnative.gest.prod_recupero_materiale.ProdRecuperoMaterialeModule;
+import it.integry.integrywmsnative.gest.prod_rientro_merce.ProdRientroMerceComponent;
+import it.integry.integrywmsnative.gest.prod_rientro_merce.order_detail.ProdRientroMerceOrderDetailComponent;
+import it.integry.integrywmsnative.gest.prod_versamento_materiale.ProdVersamentoMaterialeComponent;
+import it.integry.integrywmsnative.gest.prod_versamento_materiale.ProdVersamentoMaterialeModule;
 import it.integry.integrywmsnative.gest.pv_ordine_acquisto_edit.PVOrdineAcquistoEditComponent;
 import it.integry.integrywmsnative.gest.pv_ordine_acquisto_edit.PVOrdineAcquistoEditModule;
-import it.integry.integrywmsnative.gest.pv_ordini_acquisto.PVOrdineAcquistoGrigliaComponent;
-import it.integry.integrywmsnative.gest.pv_ordini_acquisto.PVOrdineAcquistoGrigliaModule;
+import it.integry.integrywmsnative.gest.pv_ordine_acquisto_edit.dialog.DialogEditArticoloComponent;
+import it.integry.integrywmsnative.gest.pv_ordine_acquisto_edit.dialog.DialogEditArticoloModule;
+import it.integry.integrywmsnative.gest.pv_ordini_acquisto.PVOrdiniAcquistoGrigliaComponent;
+import it.integry.integrywmsnative.gest.pv_ordini_acquisto.PVOrdiniAcquistoGrigliaModule;
+import it.integry.integrywmsnative.gest.pv_ordini_acquisto.dialogs.DialogScanGrigliaAcquistoComponent;
 import it.integry.integrywmsnative.gest.rettifica_giacenze.RettificaGiacenzeComponent;
 import it.integry.integrywmsnative.gest.rettifica_giacenze.RettificaGiacenzeModule;
+import it.integry.integrywmsnative.gest.settings.MainSettingsComponent;
+import it.integry.integrywmsnative.gest.settings.MainSettingsModule;
 import it.integry.integrywmsnative.gest.spedizione.SpedizioneComponent;
 import it.integry.integrywmsnative.gest.spedizione.SpedizioneModule;
+import it.integry.integrywmsnative.gest.spedizione.dialogs.print_sscc_list.DialogPrintOrderSSCCListComponent;
+import it.integry.integrywmsnative.gest.spedizione.dialogs.print_sscc_list.DialogPrintOrderSSCCListModule;
+import it.integry.integrywmsnative.gest.spedizione.dialogs.row_info.info_situazione_articolo.DialogInfoSituazioneArticoloComponent;
+import it.integry.integrywmsnative.gest.spedizione.dialogs.row_info.info_situazione_articolo.DialogInfoSituazioneArticoloModule;
 import it.integry.integrywmsnative.gest.spedizione.dialogs.row_info.prod_fabbisogno_linee_prod.DialogRowInfoProdFabbisognoLineeProdComponent;
 import it.integry.integrywmsnative.gest.spedizione.dialogs.row_info.prod_fabbisogno_linee_prod.DialogRowInfoProdFabbisognoLineeProdModule;
 import it.integry.integrywmsnative.gest.ultime_consegne_cliente.UltimeConsegneClienteComponent;
@@ -33,8 +90,27 @@ import it.integry.integrywmsnative.gest.ultimi_arrivi_fornitore.UltimiArriviForn
 import it.integry.integrywmsnative.gest.ultimi_arrivi_fornitore.UltimiArriviFornitoreModule;
 import it.integry.integrywmsnative.gest.versamento_merce.VersamentoMerceComponent;
 import it.integry.integrywmsnative.gest.versamento_merce.VersamentoMerceModule;
+import it.integry.integrywmsnative.view.bottom_sheet__item_edit.BottomSheetItemEditComponent;
+import it.integry.integrywmsnative.view.bottom_sheet__item_edit.BottomSheetItemEditModule;
+import it.integry.integrywmsnative.view.bottom_sheet__mtb_colr_edit.BottomSheetMtbColrEditModalComponent;
+import it.integry.integrywmsnative.view.bottom_sheet__mtb_colr_edit.BottomSheetMtbColrEditModalModule;
+import it.integry.integrywmsnative.view.dialogs.ask_cliente.DialogAskClienteComponent;
+import it.integry.integrywmsnative.view.dialogs.ask_cliente.DialogAskClienteModule;
+import it.integry.integrywmsnative.view.dialogs.choose_arts_from_lista_arts.DialogChooseArtsFromMtbAartListComponent;
+import it.integry.integrywmsnative.view.dialogs.choose_arts_from_lista_arts.DialogChooseArtsFromMtbAartListModule;
+import it.integry.integrywmsnative.view.dialogs.choose_arts_from_mtbcolr_list.DialogChooseArtsFromMtbColrListComponent;
+import it.integry.integrywmsnative.view.dialogs.choose_arts_from_mtbcolr_list.DialogChooseArtsFromMtbColrListModule;
+import it.integry.integrywmsnative.view.dialogs.choose_batch_lot.DialogChooseBatchLotComponent;
+import it.integry.integrywmsnative.view.dialogs.choose_batch_lot.DialogChooseBatchLotModule;
+import it.integry.integrywmsnative.view.dialogs.info_aggiuntive_lu.InfoAggiuntiveLUDialogComponent;
+import it.integry.integrywmsnative.view.dialogs.input_lu_prod.DialogInputLUProdComponent;
+import it.integry.integrywmsnative.view.dialogs.input_lu_prod.DialogInputLUProdModule;
+import it.integry.integrywmsnative.view.dialogs.input_peso_lu.DialogInputPesoLUComponent;
+import it.integry.integrywmsnative.view.dialogs.input_peso_lu.DialogInputPesoLUModule;
 import it.integry.integrywmsnative.view.dialogs.input_quantity_v2.DialogInputQuantityV2Component;
 import it.integry.integrywmsnative.view.dialogs.input_quantity_v2.DialogInputQuantityV2Module;
+import it.integry.integrywmsnative.view.dialogs.printSsccUl.DialogPrintUlSSCCComponent;
+import it.integry.integrywmsnative.view.dialogs.printSsccUl.DialogPrintUlSSCCModule;
 import it.integry.integrywmsnative.view.dialogs.scan_art.DialogScanArtComponent;
 import it.integry.integrywmsnative.view.dialogs.scan_art.DialogScanArtModule;
 import it.integry.integrywmsnative.view.dialogs.scan_or_create_lu.DialogScanOrCreateLUComponent;
@@ -43,13 +119,23 @@ import it.integry.integrywmsnative.view.dialogs.scan_or_create_lu.DialogScanOrCr
 // Definition of the Application graph
 @Singleton
 @Component(modules = {
-        MainApplicationModule.class,
         RoomModule.class,
+        SplashActivityModule.class,
+        MainApplicationModule.class,
+        BaseActivityModule.class,
+        BaseFragmentModule.class,
+        BaseDialogFragmentModule.class,
+        LoginModule.class,
         MainActivityModule.class,
-        PVOrdineAcquistoGrigliaModule.class,
+        MainFragmentModule.class,
+        MainAccettazioneModule.class,
+        ListaBancaliModule.class,
+        ContenutoBancaleModule.class,
+        PVOrdiniAcquistoGrigliaModule.class,
         PVOrdineAcquistoEditModule.class,
         PickingLiberoModule.class,
         RettificaGiacenzeModule.class,
+        ElencoInventariModule.class,
         SpedizioneModule.class,
         AccettazionePickingModule.class,
         UltimeConsegneClienteModule.class,
@@ -57,34 +143,159 @@ import it.integry.integrywmsnative.view.dialogs.scan_or_create_lu.DialogScanOrCr
         PickingResiModule.class,
         OrdiniUscitaElencoModule.class,
         DialogInputQuantityV2Module.class,
+        DialogInputLUProdModule.class,
         DialogScanArtModule.class,
         DialogScanOrCreateLUModule.class,
         ProdFabbisognoLineeProdModule.class,
         VersamentoMerceModule.class,
         DialogAskMagazzinoProssimitaModule.class,
-        DialogRowInfoProdFabbisognoLineeProdModule.class})
+        DialogChooseBatchLotModule.class,
+        DialogRowInfoProdFabbisognoLineeProdModule.class,
+        ProdOrdineProduzioneElencoModule.class,
+        ProdRecuperoMaterialeModule.class,
+        ProdVersamentoMaterialeModule.class,
+        DialogChooseArtsFromMtbColrListModule.class,
+        DocInterniModule.class,
+        DialogSelectDocInfoModule.class,
+        DocInterniEditFormModule.class,
+        DialogSelectDocRowsModule.class,
+        DialogAskClienteModule.class,
+        DialogEditArticoloModule.class,
+        DialogPrintOrderSSCCListModule.class,
+        ProdLineeProduzioneModule.class,
+        ProdDettaglioLineaModule.class,
+        DialogPrintUlSSCCModule.class,
+        DialogAskInfoInventarioModule.class,
+        DialogInputPesoLUModule.class,
+        PickingInventarioModule.class,
+        BottomSheetItemEditModule.class,
+        BottomSheetInventarioActionsModule.class,
+        BottomSheetInventarioRowActionsModule.class,
+        BottomSheetMtbColrEditModalModule.class,
+        DialogChooseArtsFromMtbAartListModule.class,
+        MainSettingsModule.class,
+        DialogInfoSituazioneArticoloModule.class
+})
 public interface MainApplicationComponent {
 
+    BaseActivityComponent.Factory baseActivityComponent();
+
+    BaseFragmentComponent.Factory baseFragmentComponent();
+
+    BaseDialogFragmentComponent.Factory baseDialogFragmentComponent();
+
+    SplashActivityComponent.Factory splashActivityComponent();
+
+    LoginComponent.Factory loginActivityComponent();
+
     MainActivityComponent.Factory mainActivityComponent();
-    PVOrdineAcquistoGrigliaComponent.Factory pvOrdineAcquistoGrigliaComponent();
+
+    MainFragmentComponent.Factory mainFragmentComponent();
+
+    MainAccettazioneComponent.Factory mainAccettazioneComponent();
+
+    ListaBancaliComponent.Factory listaBancaliComponent();
+
+    ContenutoBancaleComponent.Factory contenutoBancaleComponent();
+
+    PVOrdiniAcquistoGrigliaComponent.Factory pvOrdineAcquistoGrigliaComponent();
+
     PVOrdineAcquistoEditComponent.Factory pvOrdineAcquistoEditComponent();
+
     PickingLiberoComponent.Factory pickingLiberoComponent();
+
     RettificaGiacenzeComponent.Factory rettificaGiacenzeComponent();
+
+    ElencoInventariComponent.Factory inventarioComponent();
+
     SpedizioneComponent.Factory spedizioneComponent();
+
     AccettazionePickingComponent.Factory accettazionePickingComponent();
+
     UltimeConsegneClienteComponent.Factory ultimeConsegneClienteComponent();
+
     UltimiArriviFornitoreComponent.Factory ultimiArriviFornitoreComponent();
+
     PickingResiComponent.Factory pickingResiComponent();
+
     OrdiniUscitaElencoComponent.Factory prodOrdineLavorazioneElencoComponent();
+
+    DialogAskClienteComponent.Factory dialogAskClienteComponent();
+
     DialogInputQuantityV2Component.Factory dialogInputQuantityV2Component();
+
+    DialogInputLUProdComponent.Factory dialogInputLUProdComponent();
+
     DialogScanArtComponent.Factory dialogScanArtComponent();
+
     DialogScanOrCreateLUComponent.Factory dialogScanOrCreateLUComponent();
+
     ProdFabbisognoLineeProdComponent.Factory prodFabbisognoLineeProdComponent();
+
     VersamentoMerceComponent.Factory versamentoMerceComponent();
+
     DialogAskMagazzinoProssimitaComponent.Factory dialogAskMagazzinoProssimitaComponent();
+
+    DialogScanGrigliaAcquistoComponent.Factory dialogScanLisAComponent();
+
+    DialogChooseBatchLotComponent.Factory dialogChooseBatchLotComponent();
+
     DialogRowInfoProdFabbisognoLineeProdComponent.Factory dialogRowInfoProdFabbisognoLineeProdComponent();
 
+    ProdRientroMerceComponent.Factory prodRientroMerceComponent();
 
-    void inject(AppContext appContext);
+    ProdRientroMerceOrderDetailComponent.Factory prodRientroMerceOrderDetailComponent();
+
+    ProdOrdineProduzioneElencoComponent.Factory prodOrdineProduzioneElencoComponent();
+
+    ProdRecuperoMaterialeComponent.Factory prodRecuperoMaterialeComponent();
+
+    ProdVersamentoMaterialeComponent.Factory prodVersamentoMaterialeComponent();
+
+    DialogChooseArtsFromMtbColrListComponent.Factory dialogChooseArtsFromListaArtsComponent();
+
+    DocInterniComponent.Factory docInterniComponent();
+
+    DialogSelectDocInfoComponent.Factory dialogSelectDocInfoNewViewComponent();
+
+    DialogSelectDocRowsComponent.Factory dialogSelectDocRowsComponent();
+
+    DocInterniEditFormComponent.Factory docInterniEditFormComponent();
+
+    InfoAggiuntiveLUDialogComponent.Factory infoAggiuntiveLUDialogComponent();
+
+    DialogEditArticoloComponent.Factory dialogEditArticoloComponent();
+
+    DialogPrintOrderSSCCListComponent.Factory dialogPrintOrderSSCCListComponent();
+
+    ProdLineeProduzioneComponent.Factory prodLineeProduzioneComponent();
+
+    ProdDettaglioLineaComponent.Factory prodDettaglioLineaComponent();
+
+    DialogPrintUlSSCCComponent.Factory dialogPrintUlSSCCComponent();
+
+    DialogAskInfoInventarioComponent.Factory dialogAskInfoInventarioComponent();
+
+    DialogInputPesoLUComponent.Factory dialogInputPesoLUComponent();
+
+    PickingInventarioComponent.Factory pickingInventarioComponent();
+
+    BottomSheetItemEditComponent.Factory bottomSheetItemEditComponent();
+
+    BottomSheetInventarioActionsComponent.Factory bottomSheetInventarioActionsComponent();
+
+    BottomSheetInventarioRowActionsComponent.Factory bottomSheetInventarioRowActionsComponent();
+
+    BottomSheetMtbColrEditModalComponent.Factory bottomSheetMtbColrEditModalComponent();
+
+    DialogChooseArtsFromMtbAartListComponent.Factory dialogDialogDialogChooseArtsFromMtbAartListViewComponent();
+
+    MainSettingsComponent.Factory mainSettingsFragmentComponent();
+
+    DialogInfoSituazioneArticoloComponent.Factory dialogInfoSituazioneArticoloComponent();
+
+    void inject(MainApplication mainApplication);
+
+    void inject(AppContext mainApplication);
 
 }

app/src/main/java/it/integry/integrywmsnative/MainApplicationModule.java

@@ -1,31 +1,59 @@
 package it.integry.integrywmsnative;
 
 import android.app.Application;
-import android.content.Context;
+import android.os.Handler;
+import android.os.Looper;
+
+import androidx.core.os.HandlerCompat;
+
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
 
 import javax.inject.Singleton;
 
 import dagger.Module;
 import dagger.Provides;
+import it.integry.integrywmsnative.core.context.AppContext;
+import it.integry.integrywmsnative.core.context.MainContext;
 import it.integry.integrywmsnative.core.data_recover.ColliDataRecoverService;
+import it.integry.integrywmsnative.core.data_store.db.AppDatabase;
+import it.integry.integrywmsnative.core.menu.MenuRESTConsumer;
+import it.integry.integrywmsnative.core.menu.MenuService;
 import it.integry.integrywmsnative.core.rest.consumers.ArticoloRESTConsumer;
+import it.integry.integrywmsnative.core.rest.consumers.AziendaRESTConsumer;
 import it.integry.integrywmsnative.core.rest.consumers.BarcodeRESTConsumer;
+import it.integry.integrywmsnative.core.rest.consumers.ColliLavorazioneRESTConsumer;
 import it.integry.integrywmsnative.core.rest.consumers.ColliMagazzinoRESTConsumer;
+import it.integry.integrywmsnative.core.rest.consumers.ColliSpedizioneRESTConsumer;
+import it.integry.integrywmsnative.core.rest.consumers.CommessaRESTConsumer;
+import it.integry.integrywmsnative.core.rest.consumers.DepositoRESTConsumer;
+import it.integry.integrywmsnative.core.rest.consumers.DocumentRESTConsumer;
+import it.integry.integrywmsnative.core.rest.consumers.EntityRESTConsumer;
 import it.integry.integrywmsnative.core.rest.consumers.GestSetupRESTConsumer;
+import it.integry.integrywmsnative.core.rest.consumers.GiacenzaRESTConsumer;
+import it.integry.integrywmsnative.core.rest.consumers.MagazzinoAutomaticoRESTConsumer;
+import it.integry.integrywmsnative.core.rest.consumers.MagazzinoRESTConsumer;
+import it.integry.integrywmsnative.core.rest.consumers.MesRESTConsumer;
 import it.integry.integrywmsnative.core.rest.consumers.OrdiniRESTConsumer;
+import it.integry.integrywmsnative.core.rest.consumers.PVOrdiniAcquistoRESTConsumer;
 import it.integry.integrywmsnative.core.rest.consumers.PosizioniRESTConsumer;
 import it.integry.integrywmsnative.core.rest.consumers.PrinterRESTConsumer;
+import it.integry.integrywmsnative.core.rest.consumers.ProductionLinesRESTConsumer;
 import it.integry.integrywmsnative.core.rest.consumers.SystemRESTConsumer;
+import it.integry.integrywmsnative.core.services.inventario.InventarioService;
+import it.integry.integrywmsnative.core.settings.SettingsManager;
+import it.integry.integrywmsnative.core.update.UpdatesManager;
+import it.integry.integrywmsnative.gest.contab_doc_interni.rest.DocInterniRESTConsumer;
 import it.integry.integrywmsnative.gest.prod_fabbisogno_linee_prod.rest.ProdFabbisognoLineeProdRESTConsumer;
+import it.integry.integrywmsnative.view.dialogs.DialogProgressView;
+import it.integry.integrywmsnative.view.dialogs.input_quantity_v2.DialogInputQuantityV2View;
 
 @Module
 public class MainApplicationModule {
 
-    private final Context mContext;
     private final Application mApplication;
 
-    public MainApplicationModule(Context context, Application application) {
-        this.mContext = context;
+    public MainApplicationModule(Application application) {
         this.mApplication = application;
     }
 
@@ -37,14 +65,70 @@ public class MainApplicationModule {
 
     @Provides
     @Singleton
-    ColliDataRecoverService provideColliDataRecoverService() {
-        return new ColliDataRecoverService();
+    public ExecutorService providesExecutorService() {
+        return Executors.newFixedThreadPool(Runtime.getRuntime().availableProcessors());
     }
 
     @Provides
     @Singleton
-    OrdiniRESTConsumer provideOrdiniRESTConsumer(SystemRESTConsumer systemRESTConsumer) {
-        return new OrdiniRESTConsumer(systemRESTConsumer);
+    public Handler providesMainThreadHandler() {
+        return HandlerCompat.createAsync(Looper.getMainLooper());
+    }
+
+    @Provides
+    @Singleton
+    public SettingsManager provideSettingsManager(SystemRESTConsumer systemRESTConsumer, AziendaRESTConsumer aziendaRESTConsumer, PosizioniRESTConsumer posizioniRESTConsumer, GestSetupRESTConsumer gestSetupRESTConsumer) {
+        return new SettingsManager(mApplication, systemRESTConsumer, aziendaRESTConsumer, gestSetupRESTConsumer, posizioniRESTConsumer);
+    }
+
+    @Provides
+    @Singleton
+    AppContext providesAppContext() {
+        return new AppContext(mApplication);
+    }
+
+    @Provides
+    @Singleton
+    MainContext providesMainContextNew(MenuService menuService, AppDatabase appDatabase) {
+        return new MainContext(mApplication.getApplicationContext(), menuService, appDatabase);
+    }
+
+    @Provides
+    @Singleton
+    ColliDataRecoverService provideColliDataRecoverService() {
+        ColliDataRecoverService colliDataRecoverService = new ColliDataRecoverService(mApplication.getApplicationContext());
+        colliDataRecoverService.init();
+        return colliDataRecoverService;
+    }
+
+    @Provides
+    @Singleton
+    MenuService provideMenuService(MenuRESTConsumer menuRESTConsumer) {
+        return new MenuService(menuRESTConsumer);
+    }
+
+    @Provides
+    @Singleton
+    UpdatesManager provideUpdatesManager() {
+        return new UpdatesManager();
+    }
+
+    @Provides
+    @Singleton
+    DialogProgressView providesDialogProgressView() {
+        return DialogProgressView.newInstance();
+    }
+
+    @Provides
+    @Singleton
+    DialogInputQuantityV2View providesDialogInputQuantityV2View() {
+        return new DialogInputQuantityV2View();
+    }
+
+    @Provides
+    @Singleton
+    OrdiniRESTConsumer provideOrdiniRESTConsumer(SystemRESTConsumer systemRESTConsumer, EntityRESTConsumer entityRESTConsumer) {
+        return new OrdiniRESTConsumer(systemRESTConsumer, entityRESTConsumer);
     }
 
     @Provides
@@ -55,14 +139,56 @@ public class MainApplicationModule {
 
     @Provides
     @Singleton
-    ArticoloRESTConsumer provideArticoloRESTConsumer() {
-        return new ArticoloRESTConsumer();
+    ArticoloRESTConsumer provideArticoloRESTConsumer(SystemRESTConsumer systemRESTConsumer) {
+        return new ArticoloRESTConsumer(systemRESTConsumer);
     }
 
     @Provides
     @Singleton
-    ColliMagazzinoRESTConsumer provideColliMagazzinoRESTConsumer(ArticoloRESTConsumer articoloRESTConsumer) {
-        return new ColliMagazzinoRESTConsumer(articoloRESTConsumer);
+    CommessaRESTConsumer provideCommessaRESTConsumer(SystemRESTConsumer systemRESTConsumer) {
+        return new CommessaRESTConsumer(systemRESTConsumer);
+    }
+
+    @Provides
+    @Singleton
+    DepositoRESTConsumer provideDepositoRESTConsumer(EntityRESTConsumer entityRESTConsumer, SystemRESTConsumer systemRESTConsumer) {
+        return new DepositoRESTConsumer(entityRESTConsumer, systemRESTConsumer);
+    }
+
+    @Provides
+    @Singleton
+    MenuRESTConsumer provideMenuRESTConsumer() {
+        return new MenuRESTConsumer();
+    }
+
+    @Provides
+    @Singleton
+    MagazzinoRESTConsumer provideMagazzinoRESTConsumer(SystemRESTConsumer systemRESTConsumer) {
+        return new MagazzinoRESTConsumer(systemRESTConsumer);
+    }
+
+    @Provides
+    @Singleton
+    MesRESTConsumer provideMesRESTConsumer(SystemRESTConsumer systemRESTConsumer) {
+        return new MesRESTConsumer(systemRESTConsumer);
+    }
+
+    @Provides
+    @Singleton
+    EntityRESTConsumer provideEntityRESTConsumer() {
+        return new EntityRESTConsumer();
+    }
+
+    @Provides
+    @Singleton
+    ColliMagazzinoRESTConsumer provideColliMagazzinoRESTConsumer(SystemRESTConsumer systemRESTConsumer, ArticoloRESTConsumer articoloRESTConsumer, EntityRESTConsumer entityRESTConsumer) {
+        return new ColliMagazzinoRESTConsumer(systemRESTConsumer, articoloRESTConsumer, entityRESTConsumer);
+    }
+
+    @Provides
+    @Singleton
+    AziendaRESTConsumer provideAziendaRESTConsumer() {
+        return new AziendaRESTConsumer();
     }
 
     @Provides
@@ -83,6 +209,12 @@ public class MainApplicationModule {
         return new SystemRESTConsumer();
     }
 
+    @Provides
+    @Singleton
+    PVOrdiniAcquistoRESTConsumer providesPVOrdiniAcquistoRESTConsumer(MagazzinoRESTConsumer magazzinoRESTConsumer) {
+        return new PVOrdiniAcquistoRESTConsumer(magazzinoRESTConsumer);
+    }
+
     @Provides
     @Singleton
     PosizioniRESTConsumer providesPosizioniRESTConsumer(SystemRESTConsumer systemRESTConsumer) {
@@ -95,6 +227,52 @@ public class MainApplicationModule {
         return new ProdFabbisognoLineeProdRESTConsumer(systemRESTConsumer);
     }
 
+    @Provides
+    @Singleton
+    DocInterniRESTConsumer provideDocInterniRESTConsumer(MagazzinoRESTConsumer magazzinoRESTConsumer) {
+        return new DocInterniRESTConsumer(magazzinoRESTConsumer);
+    }
 
+    @Provides
+    @Singleton
+    GiacenzaRESTConsumer provideGiacenzaRESTConsumer(SystemRESTConsumer systemRESTConsumer, ArticoloRESTConsumer articoloRESTConsumer) {
+        return new GiacenzaRESTConsumer(systemRESTConsumer, articoloRESTConsumer);
+    }
+
+    @Provides
+    @Singleton
+    InventarioService provideInventarioService(GiacenzaRESTConsumer giacenzaRESTConsumer) {
+        return new InventarioService(giacenzaRESTConsumer);
+    }
+
+    @Provides
+    @Singleton
+    ProductionLinesRESTConsumer provideProductionLinesRESTConsumer() {
+        return new ProductionLinesRESTConsumer();
+    }
+
+    @Provides
+    @Singleton
+    DocumentRESTConsumer provideDocumentiRESTConsumer() {
+        return new DocumentRESTConsumer();
+    }
+
+    @Provides
+    @Singleton
+    ColliSpedizioneRESTConsumer provideColliSpedizioneRESTConsumer() {
+        return new ColliSpedizioneRESTConsumer();
+    }
+
+    @Provides
+    @Singleton
+    ColliLavorazioneRESTConsumer provideColliLavorazioneRESTConsumer() {
+        return new ColliLavorazioneRESTConsumer();
+    }
+
+    @Provides
+    @Singleton
+    MagazzinoAutomaticoRESTConsumer provideMagazzinoAutomaticoRESTConsumer() {
+        return new MagazzinoAutomaticoRESTConsumer();
+    }
 
 }

app/src/main/java/it/integry/integrywmsnative/SplashActivity.java

@@ -1,10 +1,12 @@
 package it.integry.integrywmsnative;
 
+import android.content.Context;
 import android.content.Intent;
 import android.content.pm.PackageInfo;
 import android.content.pm.PackageManager;
 import android.os.Bundle;
 import android.text.SpannableString;
+import android.text.Spanned;
 import android.view.LayoutInflater;
 
 import androidx.databinding.DataBindingUtil;
@@ -12,6 +14,8 @@ import androidx.databinding.DataBindingUtil;
 import java.util.ArrayList;
 import java.util.List;
 
+import javax.inject.Inject;
+
 import it.integry.integrywmsnative.core.context.MainContext;
 import it.integry.integrywmsnative.core.expansion.BaseActivity;
 import it.integry.integrywmsnative.core.expansion.RunnableArgsss;
@@ -20,47 +24,48 @@ import it.integry.integrywmsnative.core.utility.PermissionsHelper;
 import it.integry.integrywmsnative.core.utility.UtilityContext;
 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;
 
-public class SplashActivity extends BaseActivity {
+public class SplashActivity extends BaseActivity implements MainContext.Listener {
 
 
     private ActivitySplashBinding mBinding;
 
-    private MainContext mainContext = new MainContext(this);
+//    private MainContext mainContext = new MainContext(this);
+
+    @Inject
+    MainContext mainContext;
 
     private RunnableArgsss<Integer, String[], List<Integer>> onRequestPermissionResult;
 
+    public static void startActivity(Context context) {
+        Intent intent = new Intent(context, SplashActivity.class);
+        context.startActivity(intent);
+    }
+
+
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
 
+        MainApplication.appComponent
+                .splashActivityComponent()
+                .create()
+                .inject(this);
+
+        mainContext.setListener(this);
+
         mBinding = DataBindingUtil.inflate(LayoutInflater.from(this), R.layout.activity_splash, null, false);
         setContentView(mBinding.getRoot());
 
         UtilityContext.initMainActivity(this);
 
-        initAppVersion();
 
+        initAppVersion();
         initPermissions(this::init);
     }
 
-    private void initPermissions(Runnable onComplete) {
-        PermissionsHelper.askPermissions(this, () -> {
-            onComplete.run();
-        }, permanentlyDenied -> {
-            if(permanentlyDenied) {
-                DialogSimpleMessageView.makeErrorDialog(new SpannableString(getText(R.string.permissions_permanently_denied)), null, () -> {
-                            this.finish();
-                        })
-                        .show(getSupportFragmentManager(), "tag");
-            } else {
-                initPermissions(onComplete);
-            }
-        });
-    }
-
-
     private void initAppVersion() {
         try {
             PackageInfo pInfo = getPackageManager().getPackageInfo(getPackageName(), 0);
@@ -68,7 +73,7 @@ public class SplashActivity extends BaseActivity {
 
             String debugText = "";
 
-            if(BuildConfig.DEBUG) debugText += "\n[DEBUG VERSION]";
+            if (BuildConfig.DEBUG) debugText += "\n[DEBUG VERSION]";
 
             mBinding.appVersionTextview.setText("v" + version + debugText);
         } catch (PackageManager.NameNotFoundException e) {
@@ -76,15 +81,40 @@ public class SplashActivity extends BaseActivity {
         }
     }
 
+    private void initPermissions(Runnable onComplete) {
+        PermissionsHelper.askPermissions(this, onComplete, permanentlyDenied -> {
+            if (permanentlyDenied)
+                onError(new SpannableString(getText(R.string.permissions_permanently_denied)));
+
+
+//            else {
+//                initPermissions(onComplete);
+//            }
+        });
+    }
+
     private void init() {
-        if(!SettingsManager.i().isUserLoggedIn()){
+        if (!SettingsManager.i().isUserLoggedIn()) {
             startLoginActivity();
         } else {
-            mainContext.init(this::startMainActivity);
+            mainContext.init();
         }
     }
 
+    @Override
+    public void onDBDataLoading(String item) {
+        mBinding.loadingInfoTextview.setText("Caricamento " + item);
+    }
 
+    @Override
+    public void onMenuLoading() {
+        mBinding.loadingInfoTextview.setText("Caricamento menù");
+    }
+
+    @Override
+    public void onContextInitialized() {
+        startMainActivity();
+    }
 
 
     public void setOnRequestPermissionsResult(RunnableArgsss<Integer, String[], List<Integer>> onRequestPermissionResult) {
@@ -94,9 +124,10 @@ public class SplashActivity extends BaseActivity {
 
     @Override
     public void onRequestPermissionsResult(int requestCode, String permissions[], int[] grantResults) {
-        if(this.onRequestPermissionResult != null) {
+        super.onRequestPermissionsResult(requestCode, permissions, grantResults);
+        if (this.onRequestPermissionResult != null) {
             List<Integer> grantResultsList = new ArrayList<>();
-            for(int i = 0; i < grantResults.length; i++) {
+            for (int i = 0; i < grantResults.length; i++) {
                 grantResultsList.add(grantResults[i]);
             }
 
@@ -105,20 +136,26 @@ public class SplashActivity extends BaseActivity {
     }
 
 
-
-
-
-    private void startLoginActivity(){
+    private void startLoginActivity() {
         this.finish();
         Intent myIntent = new Intent(this, LoginActivity.class);
         startActivity(myIntent);
     }
 
-    private void startMainActivity(){
+    private void startMainActivity() {
         this.finish();
         Intent myIntent = new Intent(this, MainActivity.class);
         startActivity(myIntent);
     }
 
 
+    @Override
+    public void onError(Spanned message) {
+
+        DialogSimpleMessageView.makeErrorDialog(
+                message, null, this::finish, R.string.logout, () -> {
+                    this.mainContext.logout(MainApplication::exit);
+                })
+                .show(this.getSupportFragmentManager(), "tag");
+    }
 }

app/src/main/java/it/integry/integrywmsnative/SplashActivityComponent.java

@@ -0,0 +1,15 @@
+package it.integry.integrywmsnative;
+
+import dagger.Subcomponent;
+
+@Subcomponent
+public interface SplashActivityComponent {
+
+    @Subcomponent.Factory
+    interface Factory {
+
+        SplashActivityComponent create();
+    }
+
+    void inject(SplashActivity mainActivity);
+}

app/src/main/java/it/integry/integrywmsnative/SplashActivityModule.java

@@ -0,0 +1,7 @@
+package it.integry.integrywmsnative;
+
+import dagger.Module;
+
+@Module(subcomponents = SplashActivityComponent.class)
+public class SplashActivityModule {
+}

app/src/main/java/it/integry/integrywmsnative/core/CommonConst.java

@@ -5,8 +5,9 @@ public class CommonConst {
     public static class Login {
 
         public static class Azienda {
+            public static String protocol = "https";
             public static String host = "www2.studioml.it";
-            public static int port = 80;
+            public static int port = 443;
         }
 
     }
@@ -16,7 +17,7 @@ public class CommonConst {
 
         public static String DEFAULT_ANONYMOUS_UL_SERIE = "UL";
 
-        public static int NUMBER_OF_DECIMAL_DIGITS = 3;
+        public static int NUMBER_OF_DECIMAL_DIGITS = 5;
     }
 
     public static class Files {

app/src/main/java/it/integry/integrywmsnative/core/barcode_reader/BarcodeCallbackDTO.java

@@ -23,7 +23,7 @@ public class BarcodeCallbackDTO {
         return onScanSuccessfull;
     }
 
-    public BarcodeCallbackDTO setOnScanSuccessfull(RunnableArgs<BarcodeScanDTO> onScanSuccessfull) {
+    public BarcodeCallbackDTO setOnScanSuccessful(RunnableArgs<BarcodeScanDTO> onScanSuccessfull) {
         this.onScanSuccessfull = onScanSuccessfull;
         return this;
     }

app/src/main/java/it/integry/integrywmsnative/core/barcode_reader/BarcodeManager.java

@@ -1,107 +1,100 @@
 package it.integry.integrywmsnative.core.barcode_reader;
 
+import android.content.Context;
+import android.content.SharedPreferences;
+import android.util.Pair;
 import android.view.KeyEvent;
 
-import androidx.appcompat.app.AppCompatActivity;
+import androidx.preference.PreferenceManager;
 
 import java.lang.reflect.Constructor;
 import java.util.ArrayList;
 import java.util.List;
 
-import it.integry.barcode_base_android_library.exception.BarcodeAdapterNotFoundException;
 import it.integry.barcode_base_android_library.interfaces.BarcodeReaderInterface;
+import it.integry.barcode_base_android_library.model.BarcodeSetting;
 import it.integry.honeywellscannerlibrary.HoneyWellBarcodeReader;
-import it.integry.integrywmsnative.core.utility.UtilityExceptions;
-import it.integry.integrywmsnative.core.utility.UtilityLogger;
+import it.integry.integrywmsnative.gest.settings.MainSettingsFragment;
 import it.integry.keyobardemulatorscannerlibrary.KeyboardEmulatorBarcodeReader;
 import it.integry.pointmobilescannerlibrary.PointMobileBarcodeReader;
 import it.integry.zebrascannerlibrary.ZebraBarcodeReader;
 
 public class BarcodeManager {
 
-    private static AppCompatActivity context;
-
     private static BarcodeReaderInterface mCurrentBarcodeInterface;
-    private static List<BarcodeCallbackDTO> mBarcodeCallbacksStacktrace = new ArrayList<>();
+    private static final List<BarcodeCallbackDTO> mBarcodeCallbacksStacktrace = new ArrayList<>();
 
     private static boolean mEnabled = true;
 
 
-    private static Class<? extends BarcodeReaderInterface>[] registeredBarcodeReaderInterfaces = new Class[]{
-            PointMobileBarcodeReader.class,
-            ZebraBarcodeReader.class,
-            HoneyWellBarcodeReader.class,
-            KeyboardEmulatorBarcodeReader.class
-    };
+    private static final Class<? extends BarcodeReaderInterface>[] registeredBarcodeReaderInterfaces = new Class[]{PointMobileBarcodeReader.class, ZebraBarcodeReader.class, HoneyWellBarcodeReader.class, KeyboardEmulatorBarcodeReader.class};
 
 
-    public static void init(AppCompatActivity context) {
-        BarcodeManager.context = context;
+    public static void init(Context applicationContext) throws Exception {
 
-        initBarcodeReader();
+        initBarcodeReader(applicationContext);
     }
 
-    private static void initBarcodeReader() {
+    private static void initBarcodeReader(Context applicationContext) throws Exception {
 
-        for (Class<? extends BarcodeReaderInterface> readerInterface : registeredBarcodeReaderInterfaces){
+        for (Class<? extends BarcodeReaderInterface> readerInterface : registeredBarcodeReaderInterfaces) {
 
-            Constructor<?> cons = null;
-            try {
-                cons = Class.forName(readerInterface.getName()).getConstructors()[0];
-                BarcodeReaderInterface object = (BarcodeReaderInterface) cons.newInstance(context);
+            Constructor<?> cons = Class.forName(readerInterface.getName()).getConstructors()[0];
+            BarcodeReaderInterface object = (BarcodeReaderInterface) cons.newInstance(applicationContext);
 
-                if(object.isRightAdapter()) {
+            if (object.isRightAdapter()) {
                 mCurrentBarcodeInterface = object;
                 break;
             }
 
 
-            } catch (Exception e) {
-                UtilityExceptions.defaultException(context,e);
-            }
         }
 
-        if(mCurrentBarcodeInterface != null) {
+        if (mCurrentBarcodeInterface != null) {
 
-            try {
             mCurrentBarcodeInterface.init(() -> {
 
                 mCurrentBarcodeInterface.register(data -> {
                     BarcodeCallbackDTO callback = getValidCallback();
-                        if(callback != null && mEnabled) {
+                    if (callback != null && mEnabled) {
                         callback.getOnScanSuccessfull().run(data);
                     }
                 }, ex -> {
                     BarcodeCallbackDTO callback = getValidCallback();
-                        if(callback != null && mEnabled) {
+                    if (callback != null && mEnabled) {
                         callback.getOnScanFailed().run(ex);
                     }
                 });
 
+                SharedPreferences sharedPreferences = PreferenceManager.getDefaultSharedPreferences(applicationContext);
+                var additionalSettings = new ArrayList<Pair<String, Object>>();
+                var scanDelay = sharedPreferences.getString(MainSettingsFragment.KEY_TRIGGER_SCAN_DELAY, null);
+                var scanDelaySetting = new Pair<String, Object>(BarcodeSetting.P_TRIGGER_SCAN_DELAY, scanDelay);
+                additionalSettings.add(scanDelaySetting);
+
+                var scanMode = sharedPreferences.getString(MainSettingsFragment.KEY_TRIGGER_SCAN_MODE, null);
+                var scanModeSetting = new Pair<String, Object>(BarcodeSetting.P_TRIGGER_SCAN_MODE, scanMode);
+                additionalSettings.add(scanModeSetting);
+                
+                BarcodeManager.changeSettings(additionalSettings);
+
             });
-            } catch (BarcodeAdapterNotFoundException ex) {
-                UtilityExceptions.defaultException(context, ex);
         }
-
-
-        }
-
     }
 
 
     private static BarcodeCallbackDTO getValidCallback() {
 
-        if(mBarcodeCallbacksStacktrace.size() > 0) {
-            return mBarcodeCallbacksStacktrace.get(mBarcodeCallbacksStacktrace.size() -1);
+        if (mBarcodeCallbacksStacktrace.size() > 0) {
+            return mBarcodeCallbacksStacktrace.get(mBarcodeCallbacksStacktrace.size() - 1);
         } else {
             return null;
         }
 
     }
 
-    public static boolean onKeyDown(int keyCode, KeyEvent keyEvent){
-        if (mCurrentBarcodeInterface != null)
-        mCurrentBarcodeInterface.onKeyEvent(keyEvent);
+    public static boolean onKeyDown(int keyCode, KeyEvent keyEvent) {
+        if (mCurrentBarcodeInterface != null) mCurrentBarcodeInterface.onKeyEvent(keyEvent);
         return true;
     }
 
@@ -113,8 +106,8 @@ public class BarcodeManager {
 
         int newID = -1;
 
-        if(mBarcodeCallbacksStacktrace.size() > 0) {
-            newID = mBarcodeCallbacksStacktrace.get(mBarcodeCallbacksStacktrace.size() -1).getID() + 1;
+        if (mBarcodeCallbacksStacktrace.size() > 0) {
+            newID = mBarcodeCallbacksStacktrace.get(mBarcodeCallbacksStacktrace.size() - 1).getID() + 1;
         } else {
             newID = 1;
         }
@@ -131,7 +124,7 @@ public class BarcodeManager {
         //Rimuovo la callback con l'ID trovato e tutte quelle con >ID in modo che rimuovo tutte le call aggiunte successivamente
 
         for (int i = 0; i < mBarcodeCallbacksStacktrace.size(); i++) {
-            if(mBarcodeCallbacksStacktrace.get(i).getID() == ID || callbackObjFound) {
+            if (mBarcodeCallbacksStacktrace.get(i).getID() == ID || callbackObjFound) {
                 mBarcodeCallbacksStacktrace.remove(i);
 
                 callbackObjFound = true;
@@ -142,16 +135,21 @@ public class BarcodeManager {
 
     public static void disable() {
         mEnabled = false;
+//        UtilityLogger.info("Barcode reader disabled");
     }
 
     public static void enable() {
         mEnabled = true;
+//        UtilityLogger.info("Barcode reader enabled");
     }
 
     public static boolean isEnabled() {
         return mEnabled;
     }
 
+    public static void changeSettings(List<Pair<String, Object>> settings) {
+        mCurrentBarcodeInterface.changeSettings(settings);
+    }
 
     public static boolean isKeyboardEmulator() {
         return mCurrentBarcodeInterface instanceof KeyboardEmulatorBarcodeReader;

app/src/main/java/it/integry/integrywmsnative/core/class_router/BaseCustomConfiguration.java

@@ -1,32 +0,0 @@
-package it.integry.integrywmsnative.core.class_router;
-
-import java.util.HashMap;
-
-import it.integry.integrywmsnative.core.class_router.configs.MenuConfiguration;
-import it.integry.integrywmsnative.core.class_router.interfaces.ICustomConfiguration;
-import it.integry.integrywmsnative.core.utility.UtilityHashMap;
-
-public class BaseCustomConfiguration implements ICustomConfiguration {
-
-
-    public static class Keys {
-        public static int MENU_CONFIGURATION = 0;
-        public static int FLAG_SHOW_COD_FORN_IN_SPEDIZIONE = 1;
-        public static int CUSTOM_DYNAMIC_VERSION_PATH = 2;
-        public static int FLAG_SPEDIZIONE_GROUP_BY_GRP_MERC = 3;
-    }
-
-    protected HashMap<Integer, Object> configurations = new HashMap<Integer, Object>() {{
-        put(Keys.MENU_CONFIGURATION, new MenuConfiguration());
-        put(Keys.FLAG_SHOW_COD_FORN_IN_SPEDIZIONE, true);
-        put(Keys.FLAG_SPEDIZIONE_GROUP_BY_GRP_MERC, false);
-    }};
-
-
-
-    @Override
-    public <T> T getConfig(int key) {
-        return UtilityHashMap.getValue(configurations, key);
-    }
-
-}

app/src/main/java/it/integry/integrywmsnative/core/class_router/ClassRouter.java

@@ -1,88 +0,0 @@
-package it.integry.integrywmsnative.core.class_router;
-
-import android.content.Context;
-import android.util.Pair;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import it.integry.integrywmsnative.core.class_router.exceptions.MethodPathNotRegisteredException;
-
-public class ClassRouter {
-
-    public enum PATH {
-        FILTRO_ORDINI_VENDITA,
-        ORDINI_VENDITA,
-        CUSTOM_CONFIGURATION,
-        BARCODE_CUSTOMIZATION
-    }
-
-    private static Context context;
-
-    private static List<Pair<PATH, Object>> mRouteClasses = new ArrayList<>();
-
-    public static void init(Context context) {
-        ClassRouter.context = context;
-    }
-
-    private static boolean checkIClassExists(PATH path) {
-        boolean methodAlreadyDeclared = false;
-
-        for(int i = 0; i < mRouteClasses.size() && !methodAlreadyDeclared; i++) {
-            if(mRouteClasses.get(i).first == path) methodAlreadyDeclared = true;
-        }
-
-        return methodAlreadyDeclared;
-    }
-
-
-    private static int getClassIndex(PATH path) {
-        for(int i = 0; i < mRouteClasses.size(); i++) {
-            if(mRouteClasses.get(i).first == path) return i;
-        }
-
-        return -1;
-    }
-
-    public static void registerPath(PATH path, Class clazz) {
-        if(checkIClassExists(path)) {
-            //throw new MethodPathAlreadyDeclaredException(path);
-        }
-
-        try {
-            mRouteClasses.add(new Pair<>(path, clazz.newInstance()));
-        } catch (IllegalAccessException e) {
-            e.printStackTrace();
-        } catch (InstantiationException e) {
-            e.printStackTrace();
-        }
-    }
-
-    public static void deregisterPath(PATH path) {
-        if(checkIClassExists(path)) {
-            mRouteClasses.remove(getClassIndex(path));
-        }
-    }
-
-
-    public static <T> T getInstance(PATH path) {
-        try {
-
-            if (!checkIClassExists(path)) {
-                throw new MethodPathNotRegisteredException(path);
-            }
-
-            Object instance = mRouteClasses.get(getClassIndex(path)).second;
-
-            return (T)instance;
-
-        } catch (MethodPathNotRegisteredException ex) {
-            // UtilityExceptions.defaultException(null, ex, true);
-        }
-
-        return null;
-    }
-
-
-
-}

app/src/main/java/it/integry/integrywmsnative/core/class_router/configs/BaseMenuConfiguration.java

@@ -32,6 +32,8 @@ public class BaseMenuConfiguration {
         @IdRes
         private int mGroupId;
 
+        private String codMenu;
+
         private List<MenuItem> mItems = new ArrayList<>();
 
         public @IdRes int getGroupId() {
@@ -52,6 +54,15 @@ public class BaseMenuConfiguration {
             return this;
         }
 
+        public String getCodMenu() {
+            return codMenu;
+        }
+
+        public MenuGroup setCodMenu(String codMenu) {
+            this.codMenu = codMenu;
+            return this;
+        }
+
         public List<MenuItem> getItems() {
             return mItems;
         }
@@ -67,6 +78,7 @@ public class BaseMenuConfiguration {
         @StringRes private int mTitleText;
         @DrawableRes private int mTitleIcon;
         @DrawableRes private int mDrawerIcon;
+        private String codMenu;
         private RunnableWithReturn<Fragment> fragmentFactory;
 
         public int getID() {
@@ -105,6 +117,15 @@ public class BaseMenuConfiguration {
             return this;
         }
 
+        public String getCodMenu() {
+            return codMenu;
+        }
+
+        public MenuItem setCodMenu(String codMenu) {
+            this.codMenu = codMenu;
+            return this;
+        }
+
         public RunnableWithReturn<Fragment> getFragmentFactory() {
             return fragmentFactory;
         }

app/src/main/java/it/integry/integrywmsnative/core/class_router/configs/MenuConfiguration.java

@@ -3,13 +3,19 @@ package it.integry.integrywmsnative.core.class_router.configs;
 import it.integry.integrywmsnative.R;
 import it.integry.integrywmsnative.core.model.secondary.GestioneEnum;
 import it.integry.integrywmsnative.gest.accettazione.MainAccettazioneFragment;
+import it.integry.integrywmsnative.gest.contab_doc_interni.DocInterniFragment;
+import it.integry.integrywmsnative.gest.inventario.ElencoInventariFragment;
 import it.integry.integrywmsnative.gest.ordini_uscita_elenco.OrdiniUscitaElencoFragment;
 import it.integry.integrywmsnative.gest.picking_libero.PickingLiberoFragment;
 import it.integry.integrywmsnative.gest.prod_accettazione_ord_produzione.ProdOrdineProduzioneElencoFragment;
 import it.integry.integrywmsnative.gest.prod_fabbisogno_linee_prod.ProdFabbisognoLineeProdFragment;
+import it.integry.integrywmsnative.gest.prod_linee_produzione.ProdLineeProduzioneFragment;
 import it.integry.integrywmsnative.gest.prod_recupero_materiale.ProdRecuperoMaterialeFragment;
+import it.integry.integrywmsnative.gest.prod_rientro_merce.ProdRientroMerceFragment;
 import it.integry.integrywmsnative.gest.prod_versamento_materiale.ProdVersamentoMaterialeFragment;
+import it.integry.integrywmsnative.gest.pv_ordini_acquisto.PVOrdiniAcquistoGrigliaFragment;
 import it.integry.integrywmsnative.gest.rettifica_giacenze.RettificaGiacenzeFragment;
+import it.integry.integrywmsnative.gest.spedizione.dialogs.row_info.info_situazione_articolo.DialogInfoSituazioneArticoloView;
 import it.integry.integrywmsnative.gest.ultime_consegne_cliente.UltimeConsegneClienteFragment;
 import it.integry.integrywmsnative.gest.ultimi_arrivi_fornitore.UltimiArriviFornitoreFragment;
 import it.integry.integrywmsnative.gest.versamento_merce.VersamentoMerceFragment;
@@ -24,9 +30,11 @@ public class MenuConfiguration extends BaseMenuConfiguration {
                         new MenuGroup()
                                 .setGroupText(R.string.purchase)
                                 .setGroupId(R.id.nav_group_acquisto)
+                                .setCodMenu("MM008")
 
                                 .addItem(new MenuItem()
                                         .setID(R.id.nav_accettazione)
+                                        .setCodMenu("MG044")
                                         .setTitleText(R.string.accettazione_title_fragment)
                                         .setTitleIcon(R.drawable.ic_dashboard_accettazione)
                                         .setDrawerIcon(R.drawable.ic_black_download)
@@ -34,6 +42,7 @@ public class MenuConfiguration extends BaseMenuConfiguration {
 
                                 .addItem(new MenuItem()
                                         .setID(R.id.nav_resi_fornitore)
+                                        .setCodMenu("MG045")
                                         .setTitleText(R.string.fragment_ultime_arrivi_fornitore_title)
                                         .setTitleIcon(R.drawable.ic_latest_delivery)
                                         .setDrawerIcon(R.drawable.ic_black_latest_delivery)
@@ -42,16 +51,27 @@ public class MenuConfiguration extends BaseMenuConfiguration {
                         new MenuGroup()
                                 .setGroupText(R.string.checkout)
                                 .setGroupId(R.id.nav_group_spedizione)
+                                .setCodMenu("MM010")
 
                                 .addItem(new MenuItem()
                                         .setID(R.id.nav_spedizione)
+                                        .setCodMenu("MG046")
                                         .setTitleText(R.string.vendita_title_fragment)
                                         .setTitleIcon(R.drawable.ic_dashboard_spedizione)
-                                .setDrawerIcon(R.drawable.ic_black_upload)
-                                .setFragmentFactory(() -> OrdiniUscitaElencoFragment.newInstance(GestioneEnum.VENDITA, null, -1, null)))
+                                        .setDrawerIcon(R.drawable.ic_upload)
+                                        .setFragmentFactory(() -> OrdiniUscitaElencoFragment.newInstance(GestioneEnum.VENDITA, null, -1, DialogInfoSituazioneArticoloView.class)))
+
+                                .addItem(new MenuItem()
+                                        .setID(R.id.nav_rettifica_spedizione)
+                                        .setCodMenu("MG064")
+                                        .setTitleText(R.string.rettifica_spedizione_fragment_title)
+                                        .setTitleIcon(R.drawable.ic_dashboard_rettifica_spedizione)
+                                        .setDrawerIcon(R.drawable.ic_rettifica_spedizione_drawer)
+                                        .setFragmentFactory(() -> RettificaGiacenzeFragment.newInstance(GestioneEnum.VENDITA)))
 
                                 .addItem(new MenuItem()
                                         .setID(R.id.nav_free_picking)
+                                        .setCodMenu("MG047")
                                         .setTitleText(R.string.free_picking)
                                         .setTitleIcon(R.drawable.ic_dashboard_picking_libero)
                                         .setDrawerIcon(R.drawable.ic_black_barcode_scanner)
@@ -59,6 +79,7 @@ public class MenuConfiguration extends BaseMenuConfiguration {
 
                                 .addItem(new MenuItem()
                                         .setID(R.id.nav_resi_cliente)
+                                        .setCodMenu("MG048")
                                         .setTitleText(R.string.fragment_ultime_consegne_cliente_title)
                                         .setTitleIcon(R.drawable.ic_latest_delivery_customer)
                                         .setDrawerIcon(R.drawable.ic_black_latest_delivery)
@@ -66,9 +87,11 @@ public class MenuConfiguration extends BaseMenuConfiguration {
                 ).addGroup(new MenuGroup()
                         .setGroupText(R.string.manufacture)
                         .setGroupId(R.id.nav_group_produzione)
+                        .setCodMenu("MM009")
 
                         .addItem(new MenuItem()
                                 .setID(R.id.nav_prod_ordine_produzione)
+                                .setCodMenu("MG049")
                                 .setTitleText(R.string.prod_ordine_produzione_title_fragment)
                                 .setTitleIcon(R.drawable.ic_dashboard_prod_accettazione_produzione)
                                 .setDrawerIcon(R.drawable.ic_black_external)
@@ -76,6 +99,7 @@ public class MenuConfiguration extends BaseMenuConfiguration {
 
                         .addItem(new MenuItem()
                                 .setID(R.id.nav_prod_ordine_lavorazione)
+                                .setCodMenu("MG050")
                                 .setTitleText(R.string.prod_ordine_lavorazione_title_fragment)
                                 .setTitleIcon(R.drawable.ic_dashboard_prod_picking_lavorazione)
                                 .setDrawerIcon(R.drawable.ic_black_external)
@@ -83,20 +107,23 @@ public class MenuConfiguration extends BaseMenuConfiguration {
 
                         .addItem(new MenuItem()
                                 .setID(R.id.nav_free_lav_picking)
-                        .setTitleText(it.integry.integrywmsnative.R.string.free_lav_picking)
+                                .setCodMenu("MG051")
+                                .setTitleText(R.string.free_lav_picking)
                                 .setTitleIcon(R.drawable.ic_dashboard_prod_picking_libero)
-                        .setDrawerIcon(it.integry.integrywmsnative.R.drawable.ic_black_barcode_scanner)
+                                .setDrawerIcon(R.drawable.ic_black_barcode_scanner)
                                 .setFragmentFactory(() -> PickingLiberoFragment.newInstance(GestioneEnum.LAVORAZIONE)))
 
                         .addItem(new MenuItem()
                                 .setID(R.id.nav_prod_posizionamento_da_ord)
+                                .setCodMenu("MG052")
                                 .setTitleText(R.string.prod_fabbisogno_linee_prod_title)
                                 .setTitleIcon(R.drawable.ic_dashboard_prod_versamento_merce)
-                        .setDrawerIcon(it.integry.integrywmsnative.R.drawable.ic_black_load_shelf)
+                                .setDrawerIcon(R.drawable.ic_black_load_shelf)
                                 .setFragmentFactory(ProdFabbisognoLineeProdFragment::newInstance))
 
                         .addItem(new MenuItem()
                                 .setID(R.id.nav_prod_versamento_materiale)
+                                .setCodMenu("MG053")
                                 .setTitleText(R.string.prod_versamento_materiale_title_fragment)
                                 .setTitleIcon(R.drawable.ic_dashboard_prod_versamento_materiale)
                                 .setDrawerIcon(R.drawable.ic_black_external)
@@ -104,18 +131,36 @@ public class MenuConfiguration extends BaseMenuConfiguration {
 
                         .addItem(new MenuItem()
                                 .setID(R.id.nav_prod_recupero_materiale)
+                                .setCodMenu("MG054")
                                 .setTitleText(R.string.prod_recupero_materiale_title_fragment)
                                 .setTitleIcon(R.drawable.ic_dashboard_prod_recupero_materiale)
                                 .setDrawerIcon(R.drawable.ic_black_external)
                                 .setFragmentFactory(ProdRecuperoMaterialeFragment::newInstance))
-        )
-                .addGroup(
+
+                        .addItem(new MenuItem()
+                                .setID(R.id.nav_prod_rientro_merce)
+                                .setCodMenu("MG059")
+                                .setTitleText(R.string.rientro_merce_fragment_title)
+                                .setTitleIcon(R.drawable.ic_dashboard_prod_accettazione_produzione)
+                                .setDrawerIcon(R.drawable.ic_black_external)
+                                .setFragmentFactory(ProdRientroMerceFragment::newInstance))
+
+                        .addItem(new MenuItem()
+                                .setID(R.id.nav_prod_linee)
+                                .setCodMenu("MG061")
+                                .setTitleText(R.string.nav_prod_linee_title)
+                                .setTitleIcon(R.drawable.ic_production_line)
+                                .setDrawerIcon(R.drawable.ic_production_line)
+                                .setFragmentFactory(ProdLineeProduzioneFragment::newInstance))
+                ).addGroup(
                         new MenuGroup()
                                 .setGroupText(R.string.internal_handling)
                                 .setGroupId(R.id.nav_group_movimentazione_interna)
+                                .setCodMenu("MM011")
 
                                 .addItem(new MenuItem()
                                         .setID(R.id.nav_versamento_merce)
+                                        .setCodMenu("MG055")
                                         .setTitleText(R.string.versamento_merce_fragment_title)
                                         .setTitleIcon(R.drawable.ic_dashboard_versamento_merce)
                                         .setDrawerIcon(R.drawable.ic_black_load_shelf)
@@ -123,12 +168,48 @@ public class MenuConfiguration extends BaseMenuConfiguration {
 
                                 .addItem(new MenuItem()
                                         .setID(R.id.nav_rettifica_giacenze)
+                                        .setCodMenu("MG056")
                                         .setTitleText(R.string.rettifica_giacenze_fragment_title)
                                         .setTitleIcon(R.drawable.ic_dashboard_rettifica_giacenze)
                                         .setDrawerIcon(R.drawable.ic_black_empty_box)
                                         .setFragmentFactory(RettificaGiacenzeFragment::newInstance))
 
+                                .addItem(new MenuItem()
+                                        .setID(R.id.nav_inventario)
+                                        .setCodMenu("MG062")
+                                        .setTitleText(R.string.inventario_fragment_title)
+                                        .setTitleIcon(R.drawable.ic_dashboard_rettifica_giacenze)
+                                        .setDrawerIcon(R.drawable.ic_black_empty_box)
+                                        .setFragmentFactory(ElencoInventariFragment::newInstance))
 
+
+                ).addGroup(
+                        new MenuGroup()
+                                .setCodMenu("MM012")
+                                .setGroupText(it.integry.integrywmsnative.R.string.punto_vendita)
+                                .setGroupId(it.integry.integrywmsnative.R.id.nav_group_puntivendita)
+
+                                .addItem(new MenuItem()
+                                        .setCodMenu("MG057")
+                                        .setID(it.integry.integrywmsnative.R.id.nav_pv_ordini_acquisto)
+                                        .setTitleText(it.integry.integrywmsnative.R.string.generate_orders)
+                                        .setTitleIcon(it.integry.integrywmsnative.R.drawable.ic_dashboard_purchase_orders_pv)
+                                        .setDrawerIcon(it.integry.integrywmsnative.R.drawable.ic_dashboard_purchase_orders_pv)
+                                        .setFragmentFactory(PVOrdiniAcquistoGrigliaFragment::newInstance))
+                                .addItem(new MenuItem()
+                                        .setCodMenu("MG058")
+                                        .setID(it.integry.integrywmsnative.R.id.nav_pv_doc_interni)
+                                        .setTitleText(it.integry.integrywmsnative.R.string.doc_interni)
+                                        .setTitleIcon(R.drawable.ic_dashboard_contab_doc_interni)
+                                        .setDrawerIcon(it.integry.integrywmsnative.R.drawable.ic_dashboard_contab_doc_interni)
+                                        .setFragmentFactory(DocInterniFragment::newInstance))
+
+//                                .addItem(new MenuItem()
+//                                        .setID(it.integry.integrywmsnative.R.id.nav_pv_ordini_acquisto_trasmessi)
+//                                        .setTitleText(it.integry.integrywmsnative.R.string.transmitted_orders)
+//                                        .setTitleIcon(it.integry.integrywmsnative.R.drawable.ic_dashboard_trasmitted_orders_list)
+//                                        .setDrawerIcon(it.integry.integrywmsnative.R.drawable.ic_dashboard_trasmitted_orders_list)
+//                                        .setFragmentClass(PVOrdiniAcquistoTransmittedListFragment.newInstance()))
                 );
 
     }

app/src/main/java/it/integry/integrywmsnative/core/class_router/exceptions/MethodPathNotRegisteredException.java

@@ -1,11 +0,0 @@
-package it.integry.integrywmsnative.core.class_router.exceptions;
-
-import it.integry.integrywmsnative.core.class_router.ClassRouter;
-
-public class MethodPathNotRegisteredException extends Exception {
-
-    public MethodPathNotRegisteredException(ClassRouter.PATH path) {
-        super(String.format("Path %s is not registered", path.toString()));
-    }
-
-}

app/src/main/java/it/integry/integrywmsnative/core/class_router/interfaces/IBarcodeCustomization.java

@@ -1,7 +0,0 @@
-package it.integry.integrywmsnative.core.class_router.interfaces;
-
-public interface IBarcodeCustomization {
-
-    boolean shouldForceToEan13(String barcode);
-
-}

app/src/main/java/it/integry/integrywmsnative/core/class_router/interfaces/ICustomConfiguration.java

@@ -1,7 +0,0 @@
-package it.integry.integrywmsnative.core.class_router.interfaces;
-
-public interface ICustomConfiguration {
-
-    <T>T getConfig(int key);
-
-}

app/src/main/java/it/integry/integrywmsnative/core/class_router/interfaces/IFiltroOrdiniVendita.java

@@ -1,11 +0,0 @@
-package it.integry.integrywmsnative.core.class_router.interfaces;
-
-public interface IFiltroOrdiniVendita {
-
-    boolean shoudShowCodMdepFilter();
-
-    boolean shoudShowIdViaggioFilter();
-
-    boolean shoudShowAgenteFilter();
-
-}

app/src/main/java/it/integry/integrywmsnative/core/class_router/interfaces/IOrdiniVendita.java

@@ -1,13 +0,0 @@
-package it.integry.integrywmsnative.core.class_router.interfaces;
-
-import java.util.List;
-
-import it.integry.integrywmsnative.core.expansion.RunnableArgs;
-import it.integry.integrywmsnative.core.model.MtbColt;
-import it.integry.integrywmsnative.core.rest.model.OrdineUscitaInevasoDTO;
-
-public interface IOrdiniVendita {
-
-    void distribuisciCollo(MtbColt mtbColt, List<OrdineUscitaInevasoDTO> testateOrdini, RunnableArgs<List<MtbColt>> onComplete, RunnableArgs<Exception> onFailed);
-
-}

app/src/main/java/it/integry/integrywmsnative/core/context/AppContext.java

@@ -2,36 +2,50 @@ package it.integry.integrywmsnative.core.context;
 
 import android.content.Context;
 
+import com.annimon.stream.Stream;
 import com.google.firebase.crashlytics.FirebaseCrashlytics;
 import com.orhanobut.logger.AndroidLogAdapter;
+import com.orhanobut.logger.DiskLogAdapter;
 import com.orhanobut.logger.Logger;
 
+import java.io.File;
+
 import javax.inject.Inject;
+import javax.inject.Singleton;
 
 import it.integry.integrywmsnative.BuildConfig;
+import it.integry.integrywmsnative.MainApplication;
 import it.integry.integrywmsnative.core.data_store.db.AppDatabase;
 import it.integry.integrywmsnative.core.settings.SettingsManager;
 import it.integry.integrywmsnative.core.settings.Stash;
 import it.integry.integrywmsnative.core.utility.UtilityContext;
 import it.integry.integrywmsnative.core.utility.UtilityResources;
-import it.integry.integrywmsnative.core.utility.UtilitySettings;
 import it.integry.integrywmsnative.core.utility.UtilityString;
 import it.integry.integrywmsnative.core.utility.UtilityToast;
 
+@Singleton
 public class AppContext {
 
     //Note: this is the Application Context NOT the Activity Context
-    private final Context mContext;
+    private final Context mApplicationContext;
 
     @Inject
     AppDatabase mAppDatabase;
 
+    @Inject
+    SettingsManager mSettingsManager;
+
+    private File logsFolder;
+
     public AppContext(Context context) {
-        this.mContext = context;
+        this.mApplicationContext = context;
+
+        MainApplication.appComponent
+                .inject(this);
     }
 
 
-
+    @Inject
     public void init() {
         this.initUtilities();
 
@@ -42,18 +56,21 @@ public class AppContext {
         this.initLogger();
     }
 
+    public File getLogFilePath() {
+        return logsFolder;
+    }
 
 
     private void initSettings() {
-        Stash.init(mContext);
-        SettingsManager.init(mContext);
+        Stash.init(mApplicationContext);
+        mSettingsManager.init();
     }
 
     private void initCrashlytics() {
-        if(!BuildConfig.DEBUG) {
+        if (!BuildConfig.DEBUG) {
             FirebaseCrashlytics crashlytics = FirebaseCrashlytics.getInstance();
 
-            if(     SettingsManager.isInstanceAvailable() &&
+            if (SettingsManager.isInstanceAvailable() &&
                     (SettingsManager.i().getUserSession() != null && !UtilityString.isNullOrEmpty(SettingsManager.i().getUserSession().getProfileDB())) &&
                     (SettingsManager.i().getUser() != null && !UtilityString.isNullOrEmpty(SettingsManager.i().getUser().getFullname()))) {
 
@@ -64,15 +81,43 @@ public class AppContext {
     }
 
     private void initUtilities() {
-        UtilityContext.initApplicationContext(mContext);
-        UtilityResources.init(mContext);
-        UtilityToast.init(mContext);
-        UtilitySettings.init(mAppDatabase);
+        UtilityContext.initApplicationContext(mApplicationContext);
+        UtilityResources.init(mApplicationContext);
+        UtilityToast.init(mApplicationContext);
     }
 
     private void initLogger() {
         Logger.addLogAdapter(new AndroidLogAdapter());
+
+        logsFolder = new File(mApplicationContext.getExternalFilesDir(null).getAbsolutePath());
+        int maxBytesSize = 5 * 1024 * 1024;
+        Logger.addLogAdapter(new DiskLogAdapter(logsFolder, maxBytesSize));
+
+        removeOldLogs(logsFolder);
     }
 
+    private void removeOldLogs(File logsFolder) {
+        var files = logsFolder.listFiles();
+
+        if (files == null || files.length <= 1)
+            return;
+
+        var logFiles = Stream.of(files)
+                .sortBy(x -> -1 * x.lastModified())
+                .skip(1)
+                .toList();
+
+        for (var logFile : logFiles) {
+            boolean isDeleted = logFile.delete();
+        }
+
+        files = logsFolder.listFiles();
+
+        if (files == null || files.length > 1)
+            return;
+
+        final boolean isRenamed = files[0].renameTo(new File(files[0].getParentFile().getAbsolutePath() + "/" + "logs_0.csv"));
+
+    }
 
 }

app/src/main/java/it/integry/integrywmsnative/core/context/MainContext.java

@@ -4,54 +4,78 @@ import android.content.Context;
 import android.text.Html;
 import android.text.SpannableString;
 import android.text.Spanned;
+import android.text.SpannedString;
 
-import androidx.appcompat.app.AppCompatActivity;
-
-import java.lang.reflect.Method;
 import java.net.ConnectException;
 
-import it.integry.integrywmsnative.MainApplication;
-import it.integry.integrywmsnative.R;
+import javax.inject.Singleton;
+
 import it.integry.integrywmsnative.core.barcode_reader.BarcodeManager;
-import it.integry.integrywmsnative.core.class_router.ClassRouter;
-import it.integry.integrywmsnative.core.data_recover.ColliDataRecover;
+import it.integry.integrywmsnative.core.data_store.db.AppDatabase;
+import it.integry.integrywmsnative.core.menu.MenuService;
 import it.integry.integrywmsnative.core.rest.watcher.ServerStatusChecker;
 import it.integry.integrywmsnative.core.settings.SettingsManager;
-import it.integry.integrywmsnative.core.utility.UtilityExceptions;
-import it.integry.integrywmsnative.core.utility.UtilitySettings;
-import it.integry.integrywmsnative.view.dialogs.base.DialogSimpleMessageView;
+import it.integry.integrywmsnative.core.utility.UtilityThread;
 
+@Singleton
 public class MainContext {
 
-    private final AppCompatActivity mContext;
+    private final Context applicationContext;
+    private final MenuService menuService;
+    private final AppDatabase appDatabase;
 
-    public MainContext(AppCompatActivity context) {
-        this.mContext = context;
+    private Listener mListener;
+
+    public MainContext(Context applicationContext, MenuService menuService, AppDatabase appDatabase) {
+        this.applicationContext = applicationContext;
+        this.menuService = menuService;
+        this.appDatabase = appDatabase;
     }
 
+    public void init() {
 
-    public void init(Runnable onContextInitialized) {
-
-        BarcodeManager.init(mContext);
+        try {
+            BarcodeManager.init(applicationContext);
+        } catch (Exception exception) {
+            exception.printStackTrace();
+        }
 
         this.initDBData(() -> {
-            onContextInitialized.run();
+            this.initMenu(() -> {
+                
+                if (mListener != null) mListener.onContextInitialized();
+            });
         });
 
-        this.initReflections();
 
         this.initServerStatusChecker();
 
-        ColliDataRecover.init(mContext);
     }
 
+    public void logout(Runnable onLoggedOut) {
+        menuService.invalidateCache();
+        UtilityThread.executeParallel(() -> {
+            SettingsManager.i().setUser(null);
+            SettingsManager.i().setUserSession(null);
+            SettingsManager.update();
+            appDatabase.clearAllTables();
+
+            onLoggedOut.run();
+        }, true);
+    }
 
     private void initServerStatusChecker() {
         ServerStatusChecker.init();
     }
 
     private void initDBData(Runnable onComplete) {
-        SettingsManager.loadDBVariables(onComplete, ex -> {
+
+
+        SettingsManager.loadDBVariables(item -> {
+                    if (mListener != null) mListener.onDBDataLoading(item);
+                },
+                onComplete,
+                ex -> {
 
                     Spanned message = null;
 
@@ -63,38 +87,32 @@ public class MainContext {
                         message = new SpannableString(ex.getMessage());
                     }
 
-                    DialogSimpleMessageView.makeErrorDialog(
-                            message, null, mContext::finish, R.string.logout, () -> {
-                                UtilitySettings.logout();
-                                MainApplication.exit();
-                            })
-                            .show(mContext.getSupportFragmentManager(), "tag");
+                    if (mListener != null) mListener.onError(message);
+
                 }
         );
     }
 
-    private void initReflections() {
-        ClassRouter.init(mContext);
-
-        try {
-            String initMethod = "init";
-
-            Class dynamicContextClass = Class.forName("it.integry.wms.dynamic_customization.DynamicContext");
-
-            Method[] methods = dynamicContextClass.getMethods();
-            for (Method m : methods) {
-                if (initMethod.equals(m.getName())) {
-                    // for static methods we can use null as instance of class
-                    final Object newInstance = dynamicContextClass.newInstance();
-
-                    m.invoke(newInstance, (Context) mContext);
-                    break;
-                }
+    private void initMenu(Runnable onComplete) {
+        if (mListener != null) mListener.onMenuLoading();
+        this.menuService.init(onComplete, ex -> {
+            if (mListener != null) mListener.onError(new SpannedString(ex.getMessage()));
+        });
     }
 
-        } catch (Exception e) {
-            UtilityExceptions.defaultException(mContext, e, true);
-        }
+
+    public MainContext setListener(Listener listener) {
+        this.mListener = listener;
+        return this;
     }
 
+    public interface Listener {
+        void onDBDataLoading(String item);
+
+        void onMenuLoading();
+
+        void onContextInitialized();
+
+        void onError(Spanned message);
+    }
 }

app/src/main/java/it/integry/integrywmsnative/core/coollection/Coollection.java

@@ -1,49 +0,0 @@
-package it.integry.integrywmsnative.core.coollection;
-
-import it.integry.integrywmsnative.core.coollection.matcher.Matcher;
-import it.integry.integrywmsnative.core.coollection.matcher.custom.Contains;
-import it.integry.integrywmsnative.core.coollection.matcher.custom.Equals;
-import it.integry.integrywmsnative.core.coollection.matcher.custom.EqualsIgnoreCase;
-import it.integry.integrywmsnative.core.coollection.matcher.custom.GreaterThan;
-import it.integry.integrywmsnative.core.coollection.matcher.custom.IsNull;
-import it.integry.integrywmsnative.core.coollection.matcher.custom.LessThan;
-import it.integry.integrywmsnative.core.coollection.matcher.custom.Not;
-import it.integry.integrywmsnative.core.coollection.query.Query;
-
-import java.util.Collection;
-
-public class Coollection {
-
-  public static <T> Query<T> from(Collection<T> collection) {
-    return new Query<T>(collection);
-  }
-
-  public static Matcher eq(Object value) {
-    return new Equals(value);
-  }
-
-  public static Matcher contains(String value) {
-    return new Contains(value);
-  }
-
-  public static Matcher eqIgnoreCase(String value) {
-    return new EqualsIgnoreCase(value);
-  }
-
-  public static Matcher not(Matcher matcher) {
-    return new Not(matcher);
-  }
-
-  public static Matcher greaterThan(Number value) {
-    return new GreaterThan(value);
-  }
-
-  public static Matcher lessThan(Number value) {
-    return new LessThan(value);
-  }
-
-  public static Matcher isNull() {
-    return new IsNull();
-  }
-
-}

app/src/main/java/it/integry/integrywmsnative/core/coollection/matcher/Matcher.java

@@ -1,7 +0,0 @@
-package it.integry.integrywmsnative.core.coollection.matcher;
-
-public interface Matcher {
-
-  boolean match(Object value);
-
-}

app/src/main/java/it/integry/integrywmsnative/core/coollection/matcher/custom/Contains.java

@@ -1,18 +0,0 @@
-package it.integry.integrywmsnative.core.coollection.matcher.custom;
-
-import it.integry.integrywmsnative.core.coollection.matcher.Matcher;
-
-public class Contains implements Matcher {
-
-  private final String matcherValue;
-
-  public Contains(String matcherValue) {
-    this.matcherValue = matcherValue;
-  }
-
-  @Override
-  public boolean match(Object value) {
-    return String.valueOf(value).contains(matcherValue);
-  }
-
-}

app/src/main/java/it/integry/integrywmsnative/core/coollection/matcher/custom/Equals.java

@@ -1,18 +0,0 @@
-package it.integry.integrywmsnative.core.coollection.matcher.custom;
-
-import it.integry.integrywmsnative.core.coollection.matcher.Matcher;
-
-public class Equals implements Matcher {
-
-  private final Object value;
-
-  public Equals(Object value) {
-    this.value = value;
-  }
-
-  @Override
-  public boolean match(Object anotherValue) {
-    return value.equals(anotherValue);
-  }
-
-}

app/src/main/java/it/integry/integrywmsnative/core/coollection/matcher/custom/EqualsIgnoreCase.java

@@ -1,18 +0,0 @@
-package it.integry.integrywmsnative.core.coollection.matcher.custom;
-
-import it.integry.integrywmsnative.core.coollection.matcher.Matcher;
-
-public class EqualsIgnoreCase implements Matcher {
-
-  private final String value;
-
-  public EqualsIgnoreCase(String value) {
-    this.value = value;
-  }
-
-  @Override
-  public boolean match(Object anotherValue) {
-    return (value).equalsIgnoreCase((String) anotherValue);
-  }
-
-}

app/src/main/java/it/integry/integrywmsnative/core/coollection/matcher/custom/GreaterThan.java

@@ -1,21 +0,0 @@
-package it.integry.integrywmsnative.core.coollection.matcher.custom;
-
-import it.integry.integrywmsnative.core.coollection.matcher.Matcher;
-
-public class GreaterThan implements Matcher {
-
-  private final Number value;
-
-  public GreaterThan(Number value) {
-    this.value = value;
-  }
-
-  @Override
-  public boolean match(Object matchValue) {
-    if (matchValue == null) {
-      return false;
-    }
-    return ((Number) matchValue).doubleValue() > value.doubleValue();
-  }
-
-}

app/src/main/java/it/integry/integrywmsnative/core/coollection/matcher/custom/IsNull.java

@@ -1,12 +0,0 @@
-package it.integry.integrywmsnative.core.coollection.matcher.custom;
-
-import it.integry.integrywmsnative.core.coollection.matcher.Matcher;
-
-public class IsNull implements Matcher {
-
-  @Override
-  public boolean match(Object value) {
-    return value == null;
-  }
-
-}

app/src/main/java/it/integry/integrywmsnative/core/coollection/matcher/custom/LessThan.java

@@ -1,21 +0,0 @@
-package it.integry.integrywmsnative.core.coollection.matcher.custom;
-
-import it.integry.integrywmsnative.core.coollection.matcher.Matcher;
-
-public class LessThan implements Matcher {
-
-  private final Number value;
-
-  public LessThan(Number value) {
-    this.value = value;
-  }
-
-  @Override
-  public boolean match(Object matchValue) {
-    if (matchValue == null) {
-      return false;
-    }
-    return ((Number) matchValue).doubleValue() < value.doubleValue();
-  }
-
-}

app/src/main/java/it/integry/integrywmsnative/core/coollection/matcher/custom/Not.java

@@ -1,18 +0,0 @@
-package it.integry.integrywmsnative.core.coollection.matcher.custom;
-
-import it.integry.integrywmsnative.core.coollection.matcher.Matcher;
-
-public class Not implements Matcher {
-
-  private final Matcher matcher;
-
-  public Not(Matcher matcher) {
-    this.matcher = matcher;
-  }
-
-  @Override
-  public boolean match(Object value) {
-    return !matcher.match(value);
-  }
-
-}

app/src/main/java/it/integry/integrywmsnative/core/coollection/query/Query.java

@@ -1,90 +0,0 @@
-package it.integry.integrywmsnative.core.coollection.query;
-
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-import it.integry.integrywmsnative.core.coollection.matcher.Matcher;
-import it.integry.integrywmsnative.core.coollection.query.criteria.Criteria;
-import it.integry.integrywmsnative.core.coollection.query.criteria.CriteriaList;
-import it.integry.integrywmsnative.core.coollection.query.order.Order;
-import it.integry.integrywmsnative.core.coollection.query.order.OrderCriteria;
-import it.integry.integrywmsnative.core.coollection.query.specification.custom.AndSpecification;
-import it.integry.integrywmsnative.core.coollection.query.specification.custom.OrSpecification;
-
-public class Query<T> {
-
-  private final Collection<T> collection;
-  private CriteriaList<T> criterias;
-  private OrderCriteria<T> orderCriteria;
-
-  public Query(Collection<T> collection) {
-    this.collection = collection;
-    criterias = new CriteriaList<T>();
-  }
-
-  public Query<T> where(String method, Matcher matcher) {
-    Criteria<T> criteria = new Criteria<T>(method, matcher);
-    criterias.add(criteria);
-    return this;
-  }
-
-  public Query<T> and(String method, Matcher matcher) {
-    Criteria<T> criteria = new Criteria<T>(method, matcher);
-    criteria.setSpecification(new AndSpecification<T>());
-    criterias.add(criteria);
-    return this;
-  }
-
-  public Query<T> or(String method, Matcher matcher) {
-    Criteria<T> criteria = new Criteria<T>(method, matcher);
-    criteria.setSpecification(new OrSpecification<T>());
-    criterias.add(criteria);
-    return this;
-  }
-
-  public Query<T> orderBy(String method, Order order) {
-    orderCriteria = new OrderCriteria<T>(method, order);
-    return this;
-  }
-
-  public Query<T> orderBy(String method) {
-    return orderBy(method, Order.ASC);
-  }
-
-  public List<T> all() {
-    List<T> all = new ArrayList<T>();
-    for (T item : collection) {
-      if (criterias.match(item)) {
-        all.add(item);
-      }
-    }
-    if (orderCriteria != null) {
-      all = orderCriteria.sort(all);
-    }
-    return all;
-  }
-
-  public T first() {
-    List<T> all = cloneCollection(collection);
-    if (orderCriteria != null) {
-      all = orderCriteria.sort(all);
-    }
-    for (T item : all) {
-      if (criterias.match(item)) {
-        return item;
-      }
-    }
-    return null;
-  }
-
-  private List<T> cloneCollection(Collection<T> collection) {
-    List<T> list = new ArrayList<T>();
-    for (T item : collection) {
-      list.add(item);
-    }
-    return list;
-  }
-
-}

app/src/main/java/it/integry/integrywmsnative/core/coollection/query/criteria/Criteria.java

@@ -1,34 +0,0 @@
-package it.integry.integrywmsnative.core.coollection.query.criteria;
-
-import it.integry.integrywmsnative.core.coollection.matcher.Matcher;
-import it.integry.integrywmsnative.core.coollection.query.specification.Specification;
-import it.integry.integrywmsnative.core.coollection.reflection.Phanton;
-
-public class Criteria<T> {
-
-  private final String method;
-  private final Matcher matcher;
-  private Specification<T> specification;
-
-  public Criteria(String method, Matcher matcher) {
-    this.method = method;
-    this.matcher = matcher;
-  }
-
-  public void setSpecification(Specification<T> specification) {
-    this.specification = specification;
-  }
-
-  public Specification<T> specification() {
-    return specification;
-  }
-
-  public boolean match(T item) {
-    try {
-      Object value = Phanton.from(item).call(method);
-      return matcher.match(value);
-    } catch (Exception err) {
-      throw new RuntimeException(err);
-    }
-  }
-}

app/src/main/java/it/integry/integrywmsnative/core/coollection/query/criteria/CriteriaList.java

@@ -1,34 +0,0 @@
-package it.integry.integrywmsnative.core.coollection.query.criteria;
-
-import java.util.ArrayList;
-import java.util.List;
-
-public class CriteriaList<T> {
-
-  private List<Criteria<T>> criterias;
-
-  public CriteriaList() {
-    criterias = new ArrayList<Criteria<T>>();
-  }
-
-  public void add(Criteria<T> criteria) {
-    criterias.add(criteria);
-  }
-
-  public boolean match(T item) {
-    if (criterias.size() == 0) {
-      return true;
-    }
-    if (criterias.size() == 1) {
-      return criterias.get(0).match(item);
-    }
-    boolean matched = true;
-    for (int i = criterias.size() - 1; i > 0; i--) {
-      Criteria<T> one = criterias.get(i);
-      Criteria<T> other = criterias.get(i - 1);
-      matched = matched && one.specification().match(item, one, other);
-    }
-    return matched;
-  }
-
-}

app/src/main/java/it/integry/integrywmsnative/core/coollection/query/order/Order.java

@@ -1,5 +0,0 @@
-package it.integry.integrywmsnative.core.coollection.query.order;
-
-public enum Order {
-  ASC, DESC
-}

app/src/main/java/it/integry/integrywmsnative/core/coollection/query/order/OrderComparator.java

@@ -1,30 +0,0 @@
-package it.integry.integrywmsnative.core.coollection.query.order;
-
-import it.integry.integrywmsnative.core.coollection.reflection.Phanton;
-
-import java.util.Comparator;
-
-public class OrderComparator<T> implements Comparator<T> {
-
-  private final String method;
-
-  public OrderComparator(String method) {
-    this.method = method;
-  }
-
-  @Override
-  @SuppressWarnings("unchecked")
-  public int compare(T one, T other) {
-    Object oneValue = Phanton.from(one).call(method);
-    Object otherValue = Phanton.from(other).call(method);
-    if (oneValue == null || otherValue == null) {
-      return 0;
-    }
-    if (oneValue instanceof Comparable) {
-      return ((Comparable<Object>) oneValue).compareTo(otherValue);
-    } else {
-      return 0;
-    }
-  }
-
-}

app/src/main/java/it/integry/integrywmsnative/core/coollection/query/order/OrderCriteria.java

@@ -1,24 +0,0 @@
-package it.integry.integrywmsnative.core.coollection.query.order;
-
-import java.util.Collections;
-import java.util.List;
-
-public class OrderCriteria<T> {
-
-  private final String method;
-  private final Order order;
-
-  public OrderCriteria(String method, Order order) {
-    this.method = method;
-    this.order = order;
-  }
-
-  public List<T> sort(List<T> list) {
-    Collections.sort(list, new OrderComparator<T>(method));
-    if (order == Order.DESC) {
-      Collections.reverse(list);
-    }
-    return list;
-  }
-
-}

app/src/main/java/it/integry/integrywmsnative/core/coollection/query/specification/Specification.java

@@ -1,9 +0,0 @@
-package it.integry.integrywmsnative.core.coollection.query.specification;
-
-import it.integry.integrywmsnative.core.coollection.query.criteria.Criteria;
-
-public interface Specification<T> {
-
-  boolean match(T item, Criteria<T> one, Criteria<T> other);
-
-}

app/src/main/java/it/integry/integrywmsnative/core/coollection/query/specification/custom/AndSpecification.java

@@ -1,13 +0,0 @@
-package it.integry.integrywmsnative.core.coollection.query.specification.custom;
-
-import it.integry.integrywmsnative.core.coollection.query.criteria.Criteria;
-import it.integry.integrywmsnative.core.coollection.query.specification.Specification;
-
-public class AndSpecification<T> implements Specification<T> {
-
-  @Override
-  public boolean match(T item, Criteria<T> one, Criteria<T> other) {
-    return one.match(item) && other.match(item);
-  }
-
-}

app/src/main/java/it/integry/integrywmsnative/core/coollection/query/specification/custom/OrSpecification.java

@@ -1,14 +0,0 @@
-package it.integry.integrywmsnative.core.coollection.query.specification.custom;
-
-import it.integry.integrywmsnative.core.coollection.query.criteria.Criteria;
-import it.integry.integrywmsnative.core.coollection.query.specification.Specification;
-
-public class OrSpecification<T> implements Specification<T> {
-
-  @Override
-  public boolean match(T item, Criteria<T> one, Criteria<T> other) {
-    return one.match(item) || other.match(item);
-  }
-
-
-}

app/src/main/java/it/integry/integrywmsnative/core/coollection/reflection/Phanton.java

@@ -1,37 +0,0 @@
-package it.integry.integrywmsnative.core.coollection.reflection;
-
-import java.lang.reflect.Field;
-
-public class Phanton<T> {
-
-  private final T target;
-  private Class<?> clazz;
-
-  private Phanton(T target) {
-    this.target = target;
-    clazz = target.getClass();
-  }
-
-  public static <T> Phanton<T> from(T target) {
-    return new Phanton<T>(target);
-  }
-
-  public Object call(String name) {
-    return invoke(name);
-  }
-
-  private Object invoke(String name) {
-    for (final Field field : clazz.getDeclaredFields()) {
-      try {
-        if (name.equals(field.getName())) {
-          field.setAccessible(Boolean.TRUE);
-          return field.get(target);
-        }
-      } catch (final IllegalAccessException e) {
-        throw new RuntimeException(e);
-      }
-    }
-    throw new RuntimeException("No such property with name " + name);
-  }
-
-}

app/src/main/java/it/integry/integrywmsnative/core/data_cache/DataCache.java

@@ -8,7 +8,7 @@ import java.util.UUID;
 
 public class DataCache {
 
-    private static List<DataCacheDTO> dataCacheList = new ArrayList<>();
+    private static final List<DataCacheDTO> dataCacheList = new ArrayList<>();
 
 
     public static String addItem(Object item) {

app/src/main/java/it/integry/integrywmsnative/core/data_recover/ColliDataRecover.java

@@ -1,233 +0,0 @@
-package it.integry.integrywmsnative.core.data_recover;
-
-import android.content.Context;
-
-import androidx.appcompat.app.AppCompatActivity;
-
-import com.annimon.stream.Optional;
-import com.annimon.stream.Stream;
-import com.google.android.gms.common.util.IOUtils;
-import com.google.gson.Gson;
-import com.google.gson.reflect.TypeToken;
-
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.InputStream;
-import java.lang.reflect.Type;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Random;
-
-import it.integry.integrywmsnative.core.CommonConst;
-import it.integry.integrywmsnative.core.model.MtbColt;
-import it.integry.integrywmsnative.core.rest.model.OrdineUscitaInevasoDTO;
-import it.integry.integrywmsnative.core.utility.UtilityExceptions;
-
-public class ColliDataRecover {
-
-    public static class RecoverDTO {
-        private int id;
-        private int numCollo;
-        private String serCollo;
-        private String dataCollo;
-        private String gestioneCollo;
-        private String filtro;
-
-        private List<OrdineUscitaInevasoDTO> testateOrdini;
-
-        public int getId() {
-            return id;
-        }
-
-        public RecoverDTO setId(int id) {
-            this.id = id;
-            return this;
-        }
-
-        public int getNumCollo() {
-            return numCollo;
-        }
-
-        public RecoverDTO setNumCollo(int numCollo) {
-            this.numCollo = numCollo;
-            return this;
-        }
-
-        public String getSerCollo() {
-            return serCollo;
-        }
-
-        public RecoverDTO setSerCollo(String serCollo) {
-            this.serCollo = serCollo;
-            return this;
-        }
-
-        public String getDataCollo() {
-            return dataCollo;
-        }
-
-        public RecoverDTO setDataCollo(String dataCollo) {
-            this.dataCollo = dataCollo;
-            return this;
-        }
-
-        public String getGestioneCollo() {
-            return gestioneCollo;
-        }
-
-        public RecoverDTO setGestioneCollo(String gestioneCollo) {
-            this.gestioneCollo = gestioneCollo;
-            return this;
-        }
-
-        public String getFiltro() {
-            return filtro;
-        }
-
-        public RecoverDTO setFiltro(String filtro) {
-            this.filtro = filtro;
-            return this;
-        }
-
-        public List<OrdineUscitaInevasoDTO> getTestateOrdini() {
-            return testateOrdini;
-        }
-
-        public RecoverDTO setTestateOrdini(List<OrdineUscitaInevasoDTO> testateOrdini) {
-            this.testateOrdini = testateOrdini;
-            return this;
-        }
-
-
-        public MtbColt getMtbColt() {
-            return new MtbColt()
-                    .setNumCollo(getNumCollo())
-                    .setSerCollo(getSerCollo())
-                    .setGestione(getGestioneCollo())
-                    .setDataCollo(getDataCollo())
-                    .setFiltroOrdini(getFiltro());
-        }
-    }
-
-    private static AppCompatActivity mContext;
-
-    private static List<RecoverDTO> mtbColtsSessions = new ArrayList<>();
-
-    public static void init(AppCompatActivity context) {
-        mContext = context;
-
-        if(isFilePresent(CommonConst.Files.RECOVER_COLLO_FILE)) {
-            loadLocalFile();
-        }
-    }
-
-    public static boolean thereIsAnExistantSession() {
-        return mtbColtsSessions.size() > 0;
-    }
-
-    public static List<Integer> getAllSessionIDs() {
-        if(thereIsAnExistantSession()) {
-
-            return Stream.of(mtbColtsSessions)
-                    .map(RecoverDTO::getId)
-                    .toList();
-
-        } else return null;
-    }
-
-    public static RecoverDTO getSession(Integer sessionID) {
-
-        if(sessionID == null) return null;
-
-        return getIfExists(sessionID);
-    }
-
-    private static RecoverDTO getIfExists(int id) {
-        Optional<RecoverDTO> recoverDTOOptional = Stream.of(mtbColtsSessions)
-                .filter(x -> x.getId() == id)
-                .findSingle();
-
-
-        return recoverDTOOptional.isPresent() ? recoverDTOOptional.get() : null;
-    }
-
-    public static int startNewSession(MtbColt mtbColtSession, List<OrdineUscitaInevasoDTO> testateOrdini) {
-        Integer newId = null;
-
-        while(newId == null) {
-            int randomId = new Random().nextInt(1000);
-            RecoverDTO dto = getIfExists(randomId);
-            if(dto == null) newId = randomId;
-        }
-
-
-        RecoverDTO recoverDTO = new RecoverDTO()
-                .setId(newId)
-                .setDataCollo(mtbColtSession.getDataColloS())
-                .setNumCollo(mtbColtSession.getNumCollo())
-                .setSerCollo(mtbColtSession.getSerCollo())
-                .setGestioneCollo(mtbColtSession.getGestione())
-                .setFiltro(mtbColtSession.getFiltroOrdini())
-                .setTestateOrdini(testateOrdini);
-
-        mtbColtsSessions.add(recoverDTO);
-        updateLocalFile();
-        return newId;
-    }
-
-    public static void closeSession(int ID) {
-        RecoverDTO dto = getIfExists(ID);
-
-        if(dto != null) {
-            mtbColtsSessions.remove(dto);
-            updateLocalFile();
-        }
-    }
-
-
-    private static void loadLocalFile() {
-        InputStream inputStream;
-
-        Gson gson = new Gson();
-
-        try {
-            inputStream = mContext.openFileInput(CommonConst.Files.RECOVER_COLLO_FILE);
-
-            byte[] bytes = IOUtils.readInputStreamFully(inputStream);
-            String jsonString = new String(bytes);
-
-            Type listType = new TypeToken<ArrayList<RecoverDTO>>(){}.getType();
-            mtbColtsSessions = gson.fromJson(jsonString, listType);
-
-            inputStream.close();
-        } catch (Exception e) {
-            e.printStackTrace();
-            UtilityExceptions.defaultException(mContext, e);
-        }
-    }
-
-
-    private static void updateLocalFile() {
-        FileOutputStream outputStream;
-
-        Gson gson = new Gson();
-        String jsonText = gson.toJson(mtbColtsSessions);
-
-        try {
-            outputStream = mContext.openFileOutput(CommonConst.Files.RECOVER_COLLO_FILE, Context.MODE_PRIVATE);
-            outputStream.write(jsonText.getBytes());
-            outputStream.close();
-        } catch (Exception e) {
-            e.printStackTrace();
-            UtilityExceptions.defaultException(mContext, e);
-        }
-    }
-
-    private static boolean isFilePresent(String fileName) {
-        String path = mContext.getFilesDir().getAbsolutePath() + "/" + fileName;
-        File file = new File(path);
-        return file.exists();
-    }
-
-
-}

app/src/main/java/it/integry/integrywmsnative/core/data_recover/ColliDataRecoverService.java

@@ -2,8 +2,6 @@ package it.integry.integrywmsnative.core.data_recover;
 
 import android.content.Context;
 
-import androidx.appcompat.app.AppCompatActivity;
-
 import com.annimon.stream.Optional;
 import com.annimon.stream.Stream;
 import com.google.android.gms.common.util.IOUtils;
@@ -24,34 +22,34 @@ import javax.inject.Singleton;
 import it.integry.integrywmsnative.core.CommonConst;
 import it.integry.integrywmsnative.core.model.MtbColt;
 import it.integry.integrywmsnative.core.rest.model.OrdineUscitaInevasoDTO;
-import it.integry.integrywmsnative.core.utility.UtilityExceptions;
 
 @Singleton
 public class ColliDataRecoverService {
 
 
-    private AppCompatActivity mContext;
+    private final Context mApplicationContext;
     private List<ColliDataRecoverDTO> mtbColtsSessions = new ArrayList<>();
 
-    @Inject
-    public ColliDataRecoverService() {
+    public ColliDataRecoverService(Context applicationContext) {
+        this.mApplicationContext = applicationContext;
     }
 
-    public void init(AppCompatActivity appCompatActivity) {
-        this.mContext = appCompatActivity;
-
+    @Inject
+    public void init() {
         if(isFilePresent(CommonConst.Files.RECOVER_COLLO_FILE)) {
             loadLocalFile();
         }
+
+        if(mtbColtsSessions == null)
+            mtbColtsSessions = new ArrayList<>();
     }
 
     public boolean thereIsAnExistantSession() {
-        return mtbColtsSessions.size() > 0;
+        return mtbColtsSessions != null && mtbColtsSessions.size() > 0;
     }
 
     public List<Integer> getAllSessionIDs() {
         if(thereIsAnExistantSession()) {
-
             return Stream.of(mtbColtsSessions)
                     .map(ColliDataRecoverDTO::getId)
                     .toList();
@@ -60,7 +58,6 @@ public class ColliDataRecoverService {
     }
 
     public ColliDataRecoverDTO getSession(Integer sessionID) {
-
         if(sessionID == null) return null;
 
         return getIfExists(sessionID);
@@ -114,7 +111,7 @@ public class ColliDataRecoverService {
         Gson gson = new Gson();
 
         try {
-            inputStream = mContext.openFileInput(CommonConst.Files.RECOVER_COLLO_FILE);
+            inputStream = mApplicationContext.openFileInput(CommonConst.Files.RECOVER_COLLO_FILE);
 
             byte[] bytes = IOUtils.readInputStreamFully(inputStream);
             String jsonString = new String(bytes);
@@ -125,7 +122,7 @@ public class ColliDataRecoverService {
             inputStream.close();
         } catch (Exception e) {
             e.printStackTrace();
-            UtilityExceptions.defaultException(mContext, e);
+//            UtilityExceptions.defaultException(mContext, e);
         }
     }
 
@@ -137,17 +134,17 @@ public class ColliDataRecoverService {
         String jsonText = gson.toJson(mtbColtsSessions);
 
         try {
-            outputStream = mContext.openFileOutput(CommonConst.Files.RECOVER_COLLO_FILE, Context.MODE_PRIVATE);
+            outputStream = mApplicationContext.openFileOutput(CommonConst.Files.RECOVER_COLLO_FILE, Context.MODE_PRIVATE);
             outputStream.write(jsonText.getBytes());
             outputStream.close();
         } catch (Exception e) {
             e.printStackTrace();
-            UtilityExceptions.defaultException(mContext, e);
+//            UtilityExceptions.defaultException(mContext, e);
         }
     }
 
     private boolean isFilePresent(String fileName) {
-        String path = mContext.getFilesDir().getAbsolutePath() + "/" + fileName;
+        String path = mApplicationContext.getFilesDir().getAbsolutePath() + "/" + fileName;
         File file = new File(path);
         return file.exists();
     }

app/src/main/java/it/integry/integrywmsnative/core/data_store/db/AppDatabase.java

@@ -1,26 +1,78 @@
 package it.integry.integrywmsnative.core.data_store.db;
 
+import android.content.Context;
+
+import androidx.annotation.NonNull;
 import androidx.room.Database;
+import androidx.room.Room;
 import androidx.room.RoomDatabase;
 import androidx.room.TypeConverters;
+import androidx.room.migration.Migration;
+import androidx.sqlite.db.SupportSQLiteDatabase;
 
+import it.integry.integrywmsnative.core.data_store.db.converter.AppDatabaseConverters;
+import it.integry.integrywmsnative.core.data_store.db.converter.BigDecimalConverter;
 import it.integry.integrywmsnative.core.data_store.db.converter.DateConverter;
 import it.integry.integrywmsnative.core.data_store.db.dao.ArticoloGrigliaDao;
 import it.integry.integrywmsnative.core.data_store.db.dao.ArticoloOrdineDao;
 import it.integry.integrywmsnative.core.data_store.db.dao.GrigliaDao;
+import it.integry.integrywmsnative.core.data_store.db.dao.InventarioDao;
+import it.integry.integrywmsnative.core.data_store.db.dao.InventarioRowDao;
+import it.integry.integrywmsnative.core.data_store.db.dao.MtbColrDao;
+import it.integry.integrywmsnative.core.data_store.db.dao.MtbColtDao;
 import it.integry.integrywmsnative.core.data_store.db.dao.OrdineDao;
 import it.integry.integrywmsnative.core.data_store.db.entity.ArticoloGriglia;
 import it.integry.integrywmsnative.core.data_store.db.entity.ArticoloOrdine;
 import it.integry.integrywmsnative.core.data_store.db.entity.Griglia;
+import it.integry.integrywmsnative.core.data_store.db.entity.InventarioRoomDTO;
+import it.integry.integrywmsnative.core.data_store.db.entity.InventarioRowRoomDTO;
 import it.integry.integrywmsnative.core.data_store.db.entity.Ordine;
+import it.integry.integrywmsnative.core.data_store.db.entity.SqlMtbColr;
+import it.integry.integrywmsnative.core.data_store.db.entity.SqlMtbColt;
 
-@Database(entities = {ArticoloGriglia.class, Griglia.class, Ordine.class, ArticoloOrdine.class}, version = 1, exportSchema = false)
+@Database(entities = {
+        ArticoloGriglia.class,
+        Griglia.class,
+        Ordine.class,
+        ArticoloOrdine.class,
+        SqlMtbColt.class,
+        SqlMtbColr.class,
+        InventarioRoomDTO.class,
+        InventarioRowRoomDTO.class
+},
+        version = 15)
 @TypeConverters({
-        DateConverter.class
+        DateConverter.class,
+        BigDecimalConverter.class,
+        AppDatabaseConverters.class
 })
 public abstract class AppDatabase extends RoomDatabase {
 
-//    private AppDatabase mRoomInstance;
+    /**
+     * The only instance
+     */
+    private static AppDatabase sInstance;
+
+    /**
+     * Gets the singleton instance of SampleDatabase.
+     *
+     * @param applicationContext The context.
+     * @return The singleton instance of SampleDatabase.
+     */
+    public static synchronized AppDatabase getInstance(Context applicationContext) {
+        if (sInstance == null) {
+            var builder = Room.databaseBuilder(applicationContext,
+                            AppDatabase.class, "integry_wms")
+                    .addMigrations(MIGRATION_10_11)
+                    .addMigrations(MIGRATION_11_12)
+                    .addMigrations(MIGRATION_12_13)
+                    .addMigrations(MIGRATION_13_14)
+                    .addMigrations(MIGRATION_14_15);
+
+            sInstance = builder.build();
+        }
+        return sInstance;
+    }
 
     public abstract ArticoloGrigliaDao articoloGrigliaDao();
 
@@ -30,26 +82,77 @@ public abstract class AppDatabase extends RoomDatabase {
 
     public abstract ArticoloOrdineDao articoloOrdineDao();
 
-//    public static AppDatabase getDatabase(final Context context) {
-//        if (INSTANCE == null) {
-//            synchronized (AppDatabase.class) {
-//                if (INSTANCE == null) {
-//                    INSTANCE = Room.databaseBuilder(context.getApplicationContext(),
-//                            AppDatabase.class, "integry_wms")
-//                            .fallbackToDestructiveMigration()
-//                            .build();
-//                }
-//            }
-//        }
-//        return INSTANCE;
-//    }
+    public abstract MtbColtDao mtbColtDao();
 
-//    public AppDatabase(Application application) {
-//        mRoomInstance = Room.databaseBuilder(application,
-//                AppDatabase.class, "integry_wms")
-//                .fallbackToDestructiveMigration()
-//                .build();
-//    }
+    public abstract MtbColrDao mtbColrDao();
+
+    public abstract InventarioDao inventarioDao();
+
+    public abstract InventarioRowDao inventarioRowDao();
 
 
+    static final Migration MIGRATION_10_11 = new Migration(10, 11) {
+        @Override
+        public void migrate(SupportSQLiteDatabase database) {
+            database.execSQL("CREATE TABLE IF NOT EXISTS inventari (_id INTEGER PRIMARY KEY AUTOINCREMENT, id_inventario INTEGER, cod_mdep TEXT NOT NULL, zona TEXT, data_inventario INTEGER, data_reg INTEGER, data_ver INTEGER, filtro TEXT, flag_stato TEXT, flag_operazione TEXT, cod_anag TEXT, cod_dtip TEXT, inserito_da TEXT, registrato_da TEXT, verificato_da TEXT, data_ora_inizio INTEGER, data_ora_fine INTEGER, causale TEXT, remote_sync_date INTEGER)");
+            database.execSQL("CREATE INDEX IF NOT EXISTS index_inventari__id ON inventari (_id)");
+            database.execSQL("CREATE INDEX IF NOT EXISTS index_inventari_id_inventario ON inventari (id_inventario)");
+
+
+            database.execSQL("CREATE TABLE IF NOT EXISTS inventario_rows (_id INTEGER PRIMARY KEY AUTOINCREMENT, parent_id INTEGER, cod_mart TEXT NOT NULL, descrizione TEXT, partita_mag TEXT, qta REAL NOT NULL DEFAULT 0, num_cnf REAL NOT NULL DEFAULT 0, qta_cnf REAL NOT NULL DEFAULT 0, unt_mis TEXT NOT NULL DEFAULT '0', data_ora_inv INTEGER, scan_cod_barre TEXT, zona TEXT, remote_sync_date INTEGER, FOREIGN KEY(parent_id) REFERENCES inventari(_id) ON UPDATE NO ACTION ON DELETE NO ACTION )");
+            database.execSQL("CREATE INDEX IF NOT EXISTS index_inventario_rows__id ON inventario_rows (_id)");
+            database.execSQL("CREATE INDEX IF NOT EXISTS index_inventario_rows__parent_id ON inventario_rows (parent_id)");
+        }
+    };
+
+    static final Migration MIGRATION_11_12 = new Migration(11, 12) {
+        @Override
+        public void migrate(SupportSQLiteDatabase database) {
+            database.execSQL("DROP TABLE IF EXISTS ordini_tmp;");
+            database.execSQL("CREATE TABLE ordini_tmp (ordine_id INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, data_ins INTEGER, annotazioni TEXT, transmitted INTEGER NOT NULL, transmission_date INTEGER, gestione TEXT, data_ord INTEGER, num_ord INTEGER, cod_mdep TEXT, id_griglia INTEGER NOT NULL, cod_alis TEXT NOT NULL);");
+            database.execSQL("INSERT INTO ordini_tmp(ordine_id,data_ins,annotazioni,transmitted,transmission_date,gestione,data_ord,num_ord,cod_mdep,id_griglia,cod_alis) SELECT ordini.ordine_id,ordini.data_ins,ordini.annotazioni,ordini.transmitted,ordini.transmission_date,ordini.gestione,ordini.data_ord,ordini.num_ord,ordini.cod_mdep,ordini.id_griglia,griglie.cod_alis from ordini left outer join griglie on ordini.id_griglia = griglie.griglia_id;");
+            database.execSQL("DROP TABLE ordini;");
+            database.execSQL("ALTER TABLE ordini_tmp RENAME TO ordini;");
+        }
+    };
+
+    static final Migration MIGRATION_12_13 = new Migration(12, 13) {
+        @Override
+        public void migrate(@NonNull SupportSQLiteDatabase database) {
+            database.execSQL("CREATE TABLE IF NOT EXISTS inventario_rows_tmp (_id INTEGER PRIMARY KEY AUTOINCREMENT, parent_id INTEGER, cod_mart TEXT, descrizione TEXT, partita_mag TEXT, qta REAL NOT NULL DEFAULT 0, num_cnf REAL NOT NULL DEFAULT 0, qta_cnf REAL NOT NULL DEFAULT 0, unt_mis TEXT NOT NULL DEFAULT '0', data_ora_inv INTEGER, scan_cod_barre TEXT, zona TEXT, remote_sync_date INTEGER, FOREIGN KEY(parent_id) REFERENCES inventari(_id) ON UPDATE NO ACTION ON DELETE NO ACTION )");
+            database.execSQL("INSERT INTO inventario_rows_tmp SELECT * FROM inventario_rows");
+            database.execSQL("DROP TABLE inventario_rows;");
+            database.execSQL("ALTER TABLE inventario_rows_tmp RENAME TO inventario_rows;");
+            database.execSQL("CREATE INDEX IF NOT EXISTS index_inventario_rows__id ON inventario_rows (_id)");
+            database.execSQL("CREATE INDEX IF NOT EXISTS index_inventario_rows__parent_id ON inventario_rows (parent_id)");
+        }
+    };
+
+    static final Migration MIGRATION_13_14 = new Migration(13, 14) {
+        @Override
+        public void migrate(@NonNull SupportSQLiteDatabase database) {
+            database.execSQL("ALTER TABLE inventari"
+                    + " ADD COLUMN new INTEGER");
+        }
+    };
+
+    static final Migration MIGRATION_14_15 = new Migration(14, 15) {
+        @Override
+        public void migrate(@NonNull SupportSQLiteDatabase database) {
+            // rimuovo vincoli "not null" dai campi id_griglia e cod_alis
+            database.execSQL("DROP TABLE IF EXISTS ordini_tmp;");
+            database.execSQL("CREATE TABLE ordini_tmp (ordine_id INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, data_ins INTEGER, annotazioni TEXT, transmitted INTEGER NOT NULL, transmission_date INTEGER, gestione TEXT, data_ord INTEGER, num_ord INTEGER, cod_mdep TEXT, id_griglia INTEGER, cod_alis TEXT);");
+            database.execSQL("INSERT INTO ordini_tmp(ordine_id,data_ins,annotazioni,transmitted,transmission_date,gestione,data_ord,num_ord,cod_mdep,id_griglia,cod_alis) SELECT ordini.ordine_id,ordini.data_ins,ordini.annotazioni,ordini.transmitted,ordini.transmission_date,ordini.gestione,ordini.data_ord,ordini.num_ord,ordini.cod_mdep,ordini.id_griglia,griglie.cod_alis from ordini left outer join griglie on ordini.id_griglia = griglie.griglia_id;");
+            database.execSQL("DROP TABLE ordini;");
+            database.execSQL("ALTER TABLE ordini_tmp RENAME TO ordini;");
+            // aggiungo campo cod_alis sulle righe dell'ordine
+            database.execSQL("DROP TABLE IF EXISTS art_ord_tmp;");
+            database.execSQL("CREATE TABLE IF NOT EXISTS art_ord_tmp( articolo_ordine_id INTEGER PRIMARY KEY AUTOINCREMENT, cod_mart TEXT, descrizione TEXT, unt_mis TEXT, qta_cnf REAL NOT NULL, bar_code TEXT, merce_da_ric REAL NOT NULL, media_sett REAL NOT NULL, flag_qta_multipla TEXT, qta_min_ordinabile REAL NOT NULL, id_ordine INTEGER NOT NULL, qta_ord REAL NOT NULL, data_ins INTEGER, new_no_promo INTEGER NOT NULL, system_note TEXT, cod_alis TEXT , FOREIGN KEY(id_ordine) REFERENCES ordini(ordine_id) ON UPDATE NO ACTION ON DELETE CASCADE );");
+            database.execSQL("INSERT INTO art_ord_tmp(articolo_ordine_id, cod_mart, descrizione, unt_mis, qta_cnf, bar_code, merce_da_ric, media_sett, flag_qta_multipla, qta_min_ordinabile, id_ordine, qta_ord, data_ins, new_no_promo, system_note, cod_alis) SELECT articolo_ordine_id, cod_mart, descrizione, unt_mis, qta_cnf, bar_code, merce_da_ric, media_sett, flag_qta_multipla, qta_min_ordinabile, id_ordine, qta_ord, data_ins, new_no_promo, system_note, null from articoli_ordine;");
+            database.execSQL("DROP TABLE articoli_ordine;");
+            database.execSQL("ALTER TABLE art_ord_tmp RENAME TO articoli_ordine;");
+            database.execSQL("CREATE INDEX IF NOT EXISTS index_articoli_ordine_id_ordine ON articoli_ordine (id_ordine);");
+            database.execSQL("CREATE UNIQUE INDEX IF NOT EXISTS index_articoli_ordine_id_ordine_cod_mart ON articoli_ordine (id_ordine, cod_mart);");
+        }
+    };
 }

app/src/main/java/it/integry/integrywmsnative/core/data_store/db/RoomModule.java

@@ -1,8 +1,9 @@
 package it.integry.integrywmsnative.core.data_store.db;
 
 import android.app.Application;
+import android.os.Handler;
 
-import androidx.room.Room;
+import java.util.concurrent.ExecutorService;
 
 import javax.inject.Singleton;
 
@@ -11,26 +12,38 @@ import dagger.Provides;
 import it.integry.integrywmsnative.core.data_store.db.dao.ArticoloGrigliaDao;
 import it.integry.integrywmsnative.core.data_store.db.dao.ArticoloOrdineDao;
 import it.integry.integrywmsnative.core.data_store.db.dao.GrigliaDao;
+import it.integry.integrywmsnative.core.data_store.db.dao.InventarioDao;
+import it.integry.integrywmsnative.core.data_store.db.dao.InventarioRowDao;
+import it.integry.integrywmsnative.core.data_store.db.dao.MtbColrDao;
+import it.integry.integrywmsnative.core.data_store.db.dao.MtbColtDao;
 import it.integry.integrywmsnative.core.data_store.db.dao.OrdineDao;
 import it.integry.integrywmsnative.core.data_store.db.repository.ArticoliOrdineRepository;
 import it.integry.integrywmsnative.core.data_store.db.repository.ArticoloGrigliaRepository;
 import it.integry.integrywmsnative.core.data_store.db.repository.GrigliaRepository;
+import it.integry.integrywmsnative.core.data_store.db.repository.MtbColrDataSource;
+import it.integry.integrywmsnative.core.data_store.db.repository.MtbColtRepository;
 import it.integry.integrywmsnative.core.data_store.db.repository.OrdineRepository;
-import it.integry.integrywmsnative.core.data_store.db.repository.implementations.ArticoliGrigliaDataSource;
-import it.integry.integrywmsnative.core.data_store.db.repository.implementations.ArticoliOrdineDataSource;
-import it.integry.integrywmsnative.core.data_store.db.repository.implementations.GrigliaDataSource;
-import it.integry.integrywmsnative.core.data_store.db.repository.implementations.OrdineDataSource;
+import it.integry.integrywmsnative.core.data_store.db.repository.datasource.ArticoliGrigliaDataSource;
+import it.integry.integrywmsnative.core.data_store.db.repository.datasource.ArticoliOrdineDataSource;
+import it.integry.integrywmsnative.core.data_store.db.repository.datasource.GrigliaDataSource;
+import it.integry.integrywmsnative.core.data_store.db.repository.datasource.OrdineDataSource;
+import it.integry.integrywmsnative.core.data_store.db.repository.datasource.SqlMtbColrDataSource;
+import it.integry.integrywmsnative.core.data_store.db.repository.datasource.SqlMtbColtDataSource;
+import it.integry.integrywmsnative.core.data_store.db.respository_new.InventarioRepository;
+import it.integry.integrywmsnative.core.data_store.db.respository_new.InventarioRowRepository;
+import it.integry.integrywmsnative.core.data_store.db.respository_new.data_source.InventarioLocalDataSource;
+import it.integry.integrywmsnative.core.data_store.db.respository_new.data_source.InventarioRowLocalDataSource;
+import it.integry.integrywmsnative.core.mapper.InventarioMapper;
+import it.integry.integrywmsnative.core.mapper.InventarioRowMapper;
+import it.integry.integrywmsnative.core.rest.consumers.InventarioRESTConsumer;
 
 @Module
 public class RoomModule {
 
     private AppDatabase appDatabase;
 
-    public RoomModule(Application application) {
-        appDatabase = Room.databaseBuilder(application,
-                AppDatabase.class, "integry_wms")
-                .fallbackToDestructiveMigration()
-                .build();
+    public RoomModule(Application applicationContext) {
+        appDatabase = AppDatabase.getInstance(applicationContext);
     }
 
     @Singleton
@@ -66,34 +79,121 @@ public class RoomModule {
         return appDatabase.articoloOrdineDao();
     }
 
-
-
-
-
-
-
     @Singleton
     @Provides
-    ArticoloGrigliaRepository providesArticoloGrigliaRepository(ArticoloGrigliaDao articoloGrigliaDao) {
-        return new ArticoliGrigliaDataSource(articoloGrigliaDao);
+    MtbColtDao providesMtbColtDao(AppDatabase appDatabase) {
+        return appDatabase.mtbColtDao();
     }
 
     @Singleton
     @Provides
-    ArticoliOrdineRepository providesArticoliOrdineRepository(ArticoloOrdineDao articoloOrdineDao) {
-        return new ArticoliOrdineDataSource(articoloOrdineDao);
+    MtbColrDao providesMtbColrDao(AppDatabase appDatabase) {
+        return appDatabase.mtbColrDao();
     }
 
     @Singleton
     @Provides
-    GrigliaRepository providesGrigliaRepository(GrigliaDao grigliaDao) {
-        return new GrigliaDataSource(grigliaDao);
+    InventarioDao providesInventarioDao(AppDatabase appDatabase) {
+        return appDatabase.inventarioDao();
     }
 
     @Singleton
     @Provides
-    OrdineRepository providesOrdineRepository(OrdineDao ordineDao) {
-        return new OrdineDataSource(ordineDao);
+    InventarioRowDao providesInventarioRowDao(AppDatabase appDatabase) {
+        return appDatabase.inventarioRowDao();
+    }
+
+
+
+
+
+
+
+
+    @Singleton
+    @Provides
+    InventarioRowMapper providesInventarioRowMapper() {
+        return new InventarioRowMapper();
+    }
+
+    @Singleton
+    @Provides
+    InventarioMapper providesInventarioMapper(InventarioRowMapper inventarioRowMapper) {
+        return new InventarioMapper(inventarioRowMapper);
+    }
+
+
+    @Singleton
+    @Provides
+    InventarioLocalDataSource providesInventarioLocalDataSource(ExecutorService executorService, InventarioDao inventarioDao) {
+        return new InventarioLocalDataSource(executorService, inventarioDao);
+    }
+
+
+    @Singleton
+    @Provides
+    InventarioRowLocalDataSource providesInventarioRowLocalDataSource(ExecutorService executorService, InventarioRowDao inventarioRowDao) {
+        return new InventarioRowLocalDataSource(executorService, inventarioRowDao);
+    }
+
+
+
+
+
+
+
+    @Singleton
+    @Provides
+    ArticoloGrigliaRepository providesArticoloGrigliaRepository(ExecutorService executorService, Handler handler, ArticoloGrigliaDao articoloGrigliaDao) {
+        return new ArticoliGrigliaDataSource(executorService, handler, articoloGrigliaDao);
+    }
+
+    @Singleton
+    @Provides
+    ArticoliOrdineRepository providesArticoliOrdineRepository(ExecutorService executorService, Handler handler, ArticoloOrdineDao articoloOrdineDao) {
+        return new ArticoliOrdineDataSource(executorService, handler, articoloOrdineDao);
+    }
+
+    @Singleton
+    @Provides
+    GrigliaRepository providesGrigliaRepository(ExecutorService executorService, Handler handler, GrigliaDao grigliaDao) {
+        return new GrigliaDataSource(executorService, handler, grigliaDao);
+    }
+
+    @Singleton
+    @Provides
+    OrdineRepository providesOrdineRepository(ExecutorService executorService, Handler handler, OrdineDao ordineDao) {
+        return new OrdineDataSource(executorService, handler, ordineDao);
+    }
+
+    @Singleton
+    @Provides
+    MtbColtRepository providesMtbColtRepository(ExecutorService executorService, Handler handler, MtbColtDao mtbColtDao) {
+        return new SqlMtbColtDataSource(executorService, handler, mtbColtDao);
+    }
+
+    @Singleton
+    @Provides
+    MtbColrDataSource providesMtbColrRepository(ExecutorService executorService, Handler handler, MtbColrDao mtbColrDao) {
+        return new SqlMtbColrDataSource(executorService, handler, mtbColrDao);
+    }
+
+    @Singleton
+    @Provides
+    InventarioRepository providesInventarioRepository(ExecutorService executorService, Handler handler,
+                                                      InventarioLocalDataSource inventarioLocalDataSource,
+                                                      InventarioRESTConsumer inventarioRESTConsumer,
+                                                      InventarioMapper inventarioMapper) {
+        return new InventarioRepository(inventarioLocalDataSource, inventarioRESTConsumer, inventarioMapper, handler, executorService);
+    }
+
+    @Singleton
+    @Provides
+    InventarioRowRepository providesInventarioRowRepository(ExecutorService executorService, Handler handler,
+                                                            InventarioRowLocalDataSource inventarioRowLocalDataSource,
+                                                            InventarioRESTConsumer inventarioRESTConsumer,
+                                                            InventarioRowMapper inventarioRowMapper) {
+        return new InventarioRowRepository(inventarioRowLocalDataSource, inventarioRESTConsumer, inventarioRowMapper, handler);
     }
 
 }

app/src/main/java/it/integry/integrywmsnative/core/data_store/db/converter/AppDatabaseConverters.java

@@ -0,0 +1,49 @@
+package it.integry.integrywmsnative.core.data_store.db.converter;
+
+import androidx.room.TypeConverter;
+
+import com.google.gson.Gson;
+import com.google.gson.reflect.TypeToken;
+
+import java.lang.reflect.Type;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.util.ArrayList;
+
+import it.integry.integrywmsnative.core.utility.UtilityDate;
+
+public class AppDatabaseConverters {
+    @TypeConverter
+    public static LocalDateTime longToLocalDateTime(Long value) {
+        return value == null ? null : UtilityDate.timeToLocalDateTime(value, null);
+    }
+
+    @TypeConverter
+    public static Long localDateTimeToTimestamp(LocalDateTime date) {
+        return date == null ? null : UtilityDate.localDateTimeToTime(date, null);
+    }
+
+    @TypeConverter
+    public static LocalDate longToLocalDate(Long value) {
+        return value == null ? null : UtilityDate.timeToLocalDate(value, null);
+    }
+
+    @TypeConverter
+    public static Long localDateToTimestamp(LocalDate date) {
+        return date == null ? null : UtilityDate.localDateToTime(date);
+    }
+
+    @TypeConverter
+    public static ArrayList<String> fromString(String value) {
+        Type listType = new TypeToken<ArrayList<String>>() {}.getType();
+        return new Gson().fromJson(value, listType);
+    }
+
+    @TypeConverter
+    public static String fromArrayList(ArrayList<String> list) {
+        Gson gson = new Gson();
+        String json = gson.toJson(list);
+        return json;
+    }
+
+}

app/src/main/java/it/integry/integrywmsnative/core/data_store/db/converter/BigDecimalConverter.java

@@ -0,0 +1,17 @@
+package it.integry.integrywmsnative.core.data_store.db.converter;
+
+import androidx.room.TypeConverter;
+
+import java.math.BigDecimal;
+
+public class BigDecimalConverter {
+    @TypeConverter
+    public static BigDecimal fromFloat(Float value) {
+        return value == null ? null : BigDecimal.valueOf(value.doubleValue());
+    }
+
+    @TypeConverter
+    public static Float dateToTimestamp(BigDecimal value) {
+        return value == null ? null : value.floatValue();
+    }
+}

app/src/main/java/it/integry/integrywmsnative/core/data_store/db/dao/ArticoloGrigliaDao.java

@@ -4,9 +4,10 @@ import androidx.room.Dao;
 import androidx.room.Delete;
 import androidx.room.Insert;
 import androidx.room.Query;
+import androidx.room.RawQuery;
 import androidx.room.Update;
+import androidx.sqlite.db.SupportSQLiteQuery;
 
-import java.util.ArrayList;
 import java.util.List;
 
 import it.integry.integrywmsnative.core.data_store.db.entity.ArticoloGriglia;
@@ -21,10 +22,13 @@ public interface ArticoloGrigliaDao {
 
     @Insert
     void insertAll(List<ArticoloGriglia> articoli);
+
     @Insert
     Long insert(ArticoloGriglia articolo);
+
     @Update
     void updateAll(List<ArticoloGriglia> articoli);
+
     @Update
     void update(ArticoloGriglia articolo);
 
@@ -37,12 +41,18 @@ public interface ArticoloGrigliaDao {
     @Query("SELECT * FROM articoli_griglia WHERE cod_mart = :codMart AND id_griglia = :idGriglia LIMIT 1")
     ArticoloGriglia findArticoloByCodMartAndGriglia(String codMart, int idGriglia);
 
-    @Query("SELECT * FROM articoli_griglia WHERE (cod_mart = :scan OR bar_code =:scan )AND id_griglia = :idGriglia LIMIT 1")
+    @Query("SELECT * FROM articoli_griglia WHERE (cod_mart = :scan OR bar_code =:scan) AND id_griglia = :idGriglia LIMIT 1")
     ArticoloGriglia findArticoloByScanAndGriglia(String scan, int idGriglia);
 
-    @Query("SELECT articolo_griglia_id FROM articoli_griglia WHERE (cod_mart = :codMart AND bar_code =:barCode )AND id_griglia = :idGriglia LIMIT 1")
+    @Query("SELECT articolo_griglia_id FROM articoli_griglia WHERE (cod_mart = :codMart AND bar_code =:barCode) AND id_griglia = :idGriglia LIMIT 1")
     Integer getIdArticoloByGrigliaAndBarcodeAndCodMart(int idGriglia, String barCode, String codMart);
 
+    @RawQuery(observedEntities = ArticoloGriglia.class)
+    List<ArticoloGriglia> getArticoli(SupportSQLiteQuery query);
+
     @Query("SELECT * FROM articoli_griglia WHERE id_griglia = :grigliaId")
     List<ArticoloGriglia> getArticoliFromGriglia(int grigliaId);
+
+    @Query("SELECT * FROM articoli_griglia WHERE id_griglia = :grigliaId AND qta_ord >= 1")
+    List<ArticoloGriglia> getNewArticoliInGriglia(int grigliaId);
 }

app/src/main/java/it/integry/integrywmsnative/core/data_store/db/dao/ArticoloOrdineDao.java

@@ -8,9 +8,7 @@ import androidx.room.Update;
 
 import java.util.List;
 
-import it.integry.integrywmsnative.core.data_store.db.entity.ArticoloGriglia;
 import it.integry.integrywmsnative.core.data_store.db.entity.ArticoloOrdine;
-import it.integry.integrywmsnative.core.data_store.db.entity.Ordine;
 
 @Dao
 public interface ArticoloOrdineDao {
@@ -34,7 +32,9 @@ public interface ArticoloOrdineDao {
     @Update
     void update(ArticoloOrdine articolo);
 
-    @Query("SELECT * FROM articoli_ordine where id_ordine = :ordineId")
+    @Query("SELECT *" +
+            "FROM articoli_ordine " +
+            "where id_ordine = :ordineId")
     List<ArticoloOrdine> findArticoliByOrdine(int ordineId);
 
     @Query("SELECt * from articoli_ordine where cod_mart = :codMart and id_ordine = :ordineId LIMIT 1")

app/src/main/java/it/integry/integrywmsnative/core/data_store/db/dao/GrigliaDao.java

@@ -8,17 +8,15 @@ import androidx.room.Update;
 
 import java.util.List;
 
-import it.integry.integrywmsnative.core.data_store.db.entity.ArticoloGriglia;
 import it.integry.integrywmsnative.core.data_store.db.entity.Griglia;
-import it.integry.integrywmsnative.core.data_store.db.wrappers.GrigliaWrapper;
 
 @Dao
 public interface GrigliaDao {
     @Query("SELECT * from griglie")
     List<Griglia> getAll();
 
-    @Query("SELECT *, COUNT(articoli_griglia.articolo_griglia_id) as countArticoli from griglie LEFT JOIN articoli_griglia ON (griglie.griglia_id = articoli_griglia.id_griglia) where cod_alis = :codAlis GROUP BY griglie.griglia_id")
-    GrigliaWrapper findByCodAlis(String codAlis);
+    @Query("SELECT * from griglie where cod_alis = :codAlis")
+    Griglia findByCodAlis(String codAlis);
 
     @Insert
     long insert(Griglia griglia);

app/src/main/java/it/integry/integrywmsnative/core/data_store/db/dao/InventarioDao.java

@@ -0,0 +1,27 @@
+package it.integry.integrywmsnative.core.data_store.db.dao;
+
+import androidx.room.Dao;
+import androidx.room.Query;
+
+import java.util.List;
+
+import io.reactivex.rxjava3.core.Flowable;
+import it.integry.integrywmsnative.core.data_store.db.entity.BaseSyncDTO;
+import it.integry.integrywmsnative.core.data_store.db.entity.InventarioRoomDTO;
+import it.integry.integrywmsnative.core.data_store.db.interfaces.EntityDaoInterface;
+
+@Dao
+public interface InventarioDao extends EntityDaoInterface<InventarioRoomDTO> {
+
+
+    @Query("SELECT * FROM " + InventarioRoomDTO.TABLE_NAME +
+            " WHERE ((:toBeSync = 1 AND " + BaseSyncDTO.Columns.COLUMN_REMOTE_SYNC_DATE + " IS NULL) OR (:toBeSync = 0))")
+    List<InventarioRoomDTO> selectAll(boolean toBeSync);
+
+
+    @Query("SELECT * FROM " + InventarioRoomDTO.TABLE_NAME +
+            " WHERE ((:toBeSync = 1 AND " + BaseSyncDTO.Columns.COLUMN_REMOTE_SYNC_DATE + " IS NULL) OR (:toBeSync = 0))" +
+            " ORDER BY " + InventarioRoomDTO.Columns.DATA_INVENTARIO + " DESC")
+    Flowable<List<InventarioRoomDTO>> selectAllFlowable(boolean toBeSync);
+
+}

app/src/main/java/it/integry/integrywmsnative/core/data_store/db/dao/InventarioRowDao.java

@@ -0,0 +1,28 @@
+package it.integry.integrywmsnative.core.data_store.db.dao;
+
+import androidx.room.Dao;
+import androidx.room.Query;
+
+import java.util.List;
+
+import io.reactivex.rxjava3.core.Flowable;
+import it.integry.integrywmsnative.core.data_store.db.entity.BaseSyncDTO;
+import it.integry.integrywmsnative.core.data_store.db.entity.InventarioRowRoomDTO;
+import it.integry.integrywmsnative.core.data_store.db.interfaces.EntityDaoInterface;
+
+@Dao
+public interface InventarioRowDao extends EntityDaoInterface<InventarioRowRoomDTO> {
+
+    @Query("SELECT * FROM " + InventarioRowRoomDTO.TABLE_NAME +
+            " WHERE ((:toBeSync = 1 AND " + BaseSyncDTO.Columns.COLUMN_REMOTE_SYNC_DATE + " IS NULL) OR (:toBeSync = 0))")
+    List<InventarioRowRoomDTO> selectAll(boolean toBeSync);
+
+
+    @Query("SELECT * FROM " + InventarioRowRoomDTO.TABLE_NAME +
+            " WHERE ((:toBeSync = 1 AND " + BaseSyncDTO.Columns.COLUMN_REMOTE_SYNC_DATE + " IS NULL) OR (:toBeSync = 0))" +
+            "       AND " + InventarioRowRoomDTO.Columns.PARENT_ID + " = :parentId " +
+            " ORDER BY " +
+            "       CASE WHEN :reversed = 1 THEN " + BaseSyncDTO.Columns.ID + " END DESC," +
+            "       CASE WHEN :reversed = 0 THEN " + BaseSyncDTO.Columns.ID + " END ASC")
+    Flowable<List<InventarioRowRoomDTO>> selectAllFlowable(long parentId, boolean reversed, boolean toBeSync);
+}

app/src/main/java/it/integry/integrywmsnative/core/data_store/db/dao/MtbColrDao.java

@@ -0,0 +1,29 @@
+package it.integry.integrywmsnative.core.data_store.db.dao;
+
+import androidx.room.Dao;
+import androidx.room.Delete;
+import androidx.room.Insert;
+import androidx.room.Query;
+import androidx.room.Update;
+
+import java.util.List;
+
+import it.integry.integrywmsnative.core.data_store.db.entity.SqlMtbColr;
+
+@Dao
+public interface MtbColrDao {
+    @Query("SELECT * from mtb_colr ")
+    List<SqlMtbColr> getAll();
+
+    @Insert
+    Long insert(SqlMtbColr mtbColr);
+
+    @Update
+    void update(SqlMtbColr mtbColr);
+
+    @Delete
+    void delete(SqlMtbColr mtbColr);
+
+    @Query("SELECT * from mtb_colr where id_collo = :idDocument")
+    List<SqlMtbColr> getDocumentRows(long idDocument);
+}

app/src/main/java/it/integry/integrywmsnative/core/data_store/db/dao/MtbColtDao.java

@@ -0,0 +1,40 @@
+package it.integry.integrywmsnative.core.data_store.db.dao;
+
+import androidx.room.Dao;
+import androidx.room.Delete;
+import androidx.room.Insert;
+import androidx.room.Query;
+import androidx.room.Update;
+
+import java.util.Date;
+import java.util.List;
+
+import it.integry.integrywmsnative.core.data_store.db.entity.SqlMtbColt;
+import it.integry.integrywmsnative.core.data_store.db.wrappers.DocInternoWrapper;
+ 
+@Dao
+public interface MtbColtDao {
+    @Query("SELECT * from mtb_colt")
+    List<SqlMtbColt> getAll();
+
+    @Insert
+    Long insert(SqlMtbColt mtbColt);
+
+    @Update
+    void update(SqlMtbColt mtbColt);
+
+    @Delete
+    void delete(SqlMtbColt mtbColt);
+
+    @Query("SELECT mtb_colt.*, count(mtb_colr.id) as countArticoli from mtb_colt left outer join mtb_colr on (mtb_colr.id_collo = mtb_colt.id) where" +
+            " cod_dtip_provv = :codDtip " +
+            " AND ( cod_anag = :codAnag OR (cod_anag is null and :codAnag is null)) " +
+            " AND ( cod_vdes = :codVdes OR (cod_vdes is null and :codVdes is null)) " +
+            " AND ( mtb_colt.data_doc = :dataDoc OR (mtb_colt.data_doc is null and :dataDoc is null)) " +
+            " AND ( mtb_colt.num_doc = :numDoc OR (mtb_colt.num_doc is null and :numDoc is null)) " +
+            " and cod_dtip is null group by mtb_colt.id")
+    List<DocInternoWrapper> getLocalDocumentsByCodDtip(String codDtip, String codAnag, String codVdes, Date dataDoc, String numDoc);
+
+    @Query("SELECT ifnull(MAX(num_collo),0) +1 as num_collo from mtb_colt")
+    Integer getNextNumCollo();
+}

app/src/main/java/it/integry/integrywmsnative/core/data_store/db/dao/OrdineDao.java

@@ -9,7 +9,6 @@ import androidx.room.Update;
 import java.util.List;
 
 import it.integry.integrywmsnative.core.data_store.db.entity.Ordine;
-import it.integry.integrywmsnative.core.data_store.db.view_model.OrdineWithGriglia;
 import it.integry.integrywmsnative.core.data_store.db.wrappers.OrdineWrapper;
 
 @Dao
@@ -17,11 +16,11 @@ public interface OrdineDao {
     @Query("SELECT * from ordini ")
     List<Ordine> getAll();
 
-    @Query("SELECT ordini.*, griglie.* from ordini inner join griglie ON id_griglia = griglie.griglia_id where ordini.transmitted = 1")
-    List<OrdineWithGriglia> getAllTrasnmitted();
+    @Query("SELECT ordini.* from ordini where ordini.transmitted = 1")
+    List<Ordine> getAllTrasnmitted();
 
-    @Query("SELECT ordini.*, count(articolo_ordine_id) as countArticoli from ordini left join articoli_ordine ON ordini.ordine_id = articoli_ordine.id_ordine where ordini.transmitted = 0 and ordini.id_griglia = :idGriglia group by ordini.ordine_id")
-    List<OrdineWrapper> getAllOpenOrdersByGriglia(int idGriglia);
+    @Query("SELECT ordini.*, count(articolo_ordine_id) as countArticoli from ordini left join articoli_ordine ON ordini.ordine_id = articoli_ordine.id_ordine where ordini.transmitted = 0 and ((:codAlis is null and ordini.cod_alis is null) OR (ordini.cod_alis = :codAlis)) group by ordini.ordine_id")
+    List<OrdineWrapper> getAllOpenOrdersByGriglia(String codAlis);
 
     @Insert
     Long insert(Ordine ordine);

app/src/main/java/it/integry/integrywmsnative/core/data_store/db/entity/ArticoloGriglia.java

@@ -6,8 +6,6 @@ import androidx.room.ForeignKey;
 import androidx.room.Index;
 import androidx.room.PrimaryKey;
 
-import it.integry.integrywmsnative.core.utility.UtilityDate;
-
 @Entity(
         tableName = "articoli_griglia",
         indices = {
@@ -25,7 +23,7 @@ import it.integry.integrywmsnative.core.utility.UtilityDate;
 public class ArticoloGriglia {
     @PrimaryKey(autoGenerate = true)
     @ColumnInfo(name = "articolo_griglia_id")
-    private int articoloGrigliaId;
+    private Integer articoloGrigliaId;
 
     @ColumnInfo(name = "cod_mart")
     private String codMart;
@@ -54,14 +52,32 @@ public class ArticoloGriglia {
     @ColumnInfo(name = "qta_min_ordinabile")
     private float qtaMinOrdinabile;
 
+    @ColumnInfo(name = "gg_scadenza")
+    private int ggScadenza;
+
+    @ColumnInfo(name = "giacenza")
+    private float giacenza;
+
+    @ColumnInfo(name = "qta_prevista_vendita")
+    private float qtaPrevistaVendita;
+
+    @ColumnInfo(name = "qta_proposta")
+    private float qtaProposta;
+
+    @ColumnInfo(name = "qta_ord")
+    private float qtaOrd;
+
     @ColumnInfo(name = "id_griglia")
     private int idGriglia;
 
-    public int getArticoloGrigliaId() {
+    @ColumnInfo(name = "new_no_promo")
+    private boolean newNoPromo = false;
+
+    public Integer getArticoloGrigliaId() {
         return articoloGrigliaId;
     }
 
-    public void setArticoloGrigliaId(int articoloGrigliaId) {
+    public void setArticoloGrigliaId(Integer articoloGrigliaId) {
         this.articoloGrigliaId = articoloGrigliaId;
     }
 
@@ -145,23 +161,51 @@ public class ArticoloGriglia {
         this.idGriglia = idGriglia;
     }
 
-    public ArticoloOrdine convertToArticoloOrdine(Ordine ordine) {
-        ArticoloOrdine articolo = new ArticoloOrdine();
+    public int getGgScadenza() {
+        return ggScadenza;
+    }
 
-        articolo.setIdOrdine(ordine.getOrdineId());
+    public void setGgScadenza(int ggScadenza) {
+        this.ggScadenza = ggScadenza;
+    }
 
-        articolo.setBarCode(this.getBarCode());
-        articolo.setCodMart(this.getCodMart());
-        articolo.setMediaSett(this.getMediaSett());
-        articolo.setFlagQtaMultipla(this.getFlagQtaMultipla());
-        articolo.setQtaMinOrdinabile(this.getQtaMinOrdinabile());
-        articolo.setMerceDaRic(this.getMerceDaRic());
-        articolo.setQtaCnf(this.getQtaCnf());
-        articolo.setUntMis(this.getUntMis());
-        articolo.setDescrizione(this.getDescrizione());
-        articolo.setDataIns(UtilityDate.getDateInstance());
-        articolo.setQtaOrd(0);
+    public float getGiacenza() {
+        return giacenza;
+    }
 
-        return articolo;
+    public void setGiacenza(float giacenza) {
+        this.giacenza = giacenza;
+    }
+
+    public float getQtaPrevistaVendita() {
+        return qtaPrevistaVendita;
+    }
+
+    public void setQtaPrevistaVendita(float qtaPrevistaVendita) {
+        this.qtaPrevistaVendita = qtaPrevistaVendita;
+    }
+
+    public float getQtaProposta() {
+        return qtaProposta;
+    }
+
+    public void setQtaProposta(float qtaProposta) {
+        this.qtaProposta = qtaProposta;
+    }
+
+    public boolean isNewNoPromo() {
+        return newNoPromo;
+    }
+
+    public void setNewNoPromo(boolean newNoPromo) {
+        this.newNoPromo = newNoPromo;
+    }
+
+    public float getQtaOrd() {
+        return qtaOrd;
+    }
+
+    public void setQtaOrd(float qtaOrd) {
+        this.qtaOrd = qtaOrd;
     }
 }

app/src/main/java/it/integry/integrywmsnative/core/data_store/db/entity/ArticoloOrdine.java

@@ -3,16 +3,19 @@ package it.integry.integrywmsnative.core.data_store.db.entity;
 import androidx.room.ColumnInfo;
 import androidx.room.Entity;
 import androidx.room.ForeignKey;
+import androidx.room.Ignore;
 import androidx.room.Index;
 import androidx.room.PrimaryKey;
 
+import java.math.BigDecimal;
+import java.math.RoundingMode;
 import java.util.Date;
 
 @Entity(
         tableName = "articoli_ordine",
         indices = {
                 @Index(value = "id_ordine"),
-                @Index(value = {"id_ordine","cod_mart"}, unique = true)
+                @Index(value = {"id_ordine", "cod_mart"}, unique = true)
         },
         foreignKeys = {
                 @ForeignKey(
@@ -22,11 +25,11 @@ import java.util.Date;
                         onDelete = ForeignKey.CASCADE
                 )
         }
-        )
+)
 public class ArticoloOrdine {
     @PrimaryKey(autoGenerate = true)
     @ColumnInfo(name = "articolo_ordine_id")
-    private int articoloOrdineId;
+    private Integer articoloOrdineId;
 
     @ColumnInfo(name = "cod_mart")
     private String codMart;
@@ -64,11 +67,39 @@ public class ArticoloOrdine {
     @ColumnInfo(name = "data_ins")
     private Date dataIns;
 
-    public int getArticoloOrdineId() {
+    @ColumnInfo(name = "new_no_promo")
+    private boolean newNoPromo;
+
+    @ColumnInfo(name = "system_note")
+    private String systemNote;
+
+    @ColumnInfo(name = "cod_alis")
+    private String codAlis;
+
+    @Ignore
+    private int ggScadenza = 0;
+
+    @Ignore
+    private BigDecimal giacenza = BigDecimal.ZERO;
+
+    @Ignore
+    private BigDecimal qtaPrevistaVendita = BigDecimal.ZERO;
+
+    @Ignore
+    private BigDecimal qtaProposta = BigDecimal.ZERO;
+
+    @Ignore
+    private BigDecimal ctMaxOrd = BigDecimal.ZERO;
+
+    @Ignore
+    private int bgTint;
+
+
+    public Integer getArticoloOrdineId() {
         return articoloOrdineId;
     }
 
-    public void setArticoloOrdineId(int articoloOrdineId) {
+    public void setArticoloOrdineId(Integer articoloOrdineId) {
         this.articoloOrdineId = articoloOrdineId;
     }
 
@@ -167,4 +198,106 @@ public class ArticoloOrdine {
     public void setDataIns(Date dataIns) {
         this.dataIns = dataIns;
     }
+
+    public int getGgScadenza() {
+        return ggScadenza;
+    }
+
+    public ArticoloOrdine setGgScadenza(int ggScadenza) {
+        this.ggScadenza = ggScadenza;
+        return this;
+    }
+
+    public BigDecimal getGiacenza() {
+        return giacenza;
+    }
+
+    public ArticoloOrdine setGiacenza(BigDecimal giacenza) {
+        this.giacenza = giacenza;
+        return this;
+    }
+
+    public BigDecimal getQtaPrevistaVendita() {
+        return qtaPrevistaVendita;
+    }
+
+    public ArticoloOrdine setQtaPrevistaVendita(BigDecimal qtaPrevistaVendita) {
+        this.qtaPrevistaVendita = qtaPrevistaVendita;
+        return this;
+    }
+
+    public BigDecimal getQtaProposta() {
+        return qtaProposta;
+    }
+
+    public ArticoloOrdine setQtaProposta(BigDecimal qtaProposta) {
+        this.qtaProposta = qtaProposta;
+        return this;
+    }
+
+    public BigDecimal getQtaCnfPrevistaVendita() {
+        return qtaPrevistaVendita.equals(BigDecimal.ZERO) ? BigDecimal.ZERO : qtaPrevistaVendita.divide(BigDecimal.valueOf(qtaCnf), 0, RoundingMode.CEILING);
+    }
+
+    public BigDecimal getQtaCnfProposta() {
+        return qtaProposta.equals(BigDecimal.ZERO) ? BigDecimal.ZERO : qtaProposta.divide(BigDecimal.valueOf(qtaCnf), 0, RoundingMode.CEILING);
+    }
+
+    public BigDecimal getQtaCnfGiacenza() {
+        return giacenza.equals(BigDecimal.ZERO) ? BigDecimal.ZERO : giacenza.divide(BigDecimal.valueOf(qtaCnf), 0, RoundingMode.CEILING);
+    }
+
+    public boolean isNewNoPromo() {
+        return newNoPromo;
+    }
+
+    public void setNewNoPromo(boolean newNoPromo) {
+        this.newNoPromo = newNoPromo;
+    }
+
+    public float getCnfDaRic() {
+        return qtaCnf > 0.f ? merceDaRic * qtaCnf : 0;
+    }
+
+    public int checkQtaProposta() {
+        int check = 0;
+        if (qtaProposta != null && !qtaProposta.equals(BigDecimal.ZERO)) {
+            check = BigDecimal.valueOf(qtaOrd).compareTo(qtaProposta);
+        }
+        return check;
+    }
+
+    public int getBgTint() {
+        return bgTint;
+    }
+
+    public ArticoloOrdine setBgTint(int bgTint) {
+        this.bgTint = bgTint;
+        return this;
+    }
+
+    public String getSystemNote() {
+        return systemNote;
+    }
+
+    public void setSystemNote(String systemNote) {
+        this.systemNote = systemNote;
+    }
+
+    public String getCodAlis() {
+        return codAlis;
+    }
+
+    public void setCodAlis(String codAlis) {
+        this.codAlis = codAlis;
+    }
+
+    public BigDecimal getCtMaxOrd() {
+        return ctMaxOrd;
+    }
+
+    public ArticoloOrdine setCtMaxOrd(BigDecimal ctMaxOrd) {
+        this.ctMaxOrd = ctMaxOrd;
+        return this;
+    }
 }

app/src/main/java/it/integry/integrywmsnative/core/data_store/db/entity/BaseRoomDTO.java

@@ -0,0 +1,4 @@
+package it.integry.integrywmsnative.core.data_store.db.entity;
+
+public abstract class BaseRoomDTO {
+}

app/src/main/java/it/integry/integrywmsnative/core/data_store/db/entity/BaseSyncDTO.java

@@ -0,0 +1,45 @@
+package it.integry.integrywmsnative.core.data_store.db.entity;
+
+import android.provider.BaseColumns;
+
+import androidx.room.ColumnInfo;
+import androidx.room.PrimaryKey;
+
+import java.util.Date;
+
+public abstract class BaseSyncDTO extends BaseRoomDTO {
+
+
+    public static class Columns {
+        public static final String ID = BaseColumns._ID;
+        public static final String COLUMN_REMOTE_SYNC_DATE = "remote_sync_date";
+    }
+
+    /** The unique ID of the cheese. */
+    @PrimaryKey(autoGenerate = true)
+    @ColumnInfo(index = true, name = Columns.ID)
+    private Long id;
+
+    @ColumnInfo(name = Columns.COLUMN_REMOTE_SYNC_DATE)
+    private Date remoteSyncDate;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public Date getRemoteSyncDate() {
+        return remoteSyncDate;
+    }
+
+    public void setRemoteSyncDate(Date remoteSyncDate) {
+        this.remoteSyncDate = remoteSyncDate;
+    }
+
+    public boolean isSyncronized() {
+        return getRemoteSyncDate() != null;
+    }
+}

app/src/main/java/it/integry/integrywmsnative/core/data_store/db/entity/Griglia.java

@@ -2,15 +2,15 @@ package it.integry.integrywmsnative.core.data_store.db.entity;
 
 import androidx.room.ColumnInfo;
 import androidx.room.Entity;
-import androidx.room.Ignore;
 import androidx.room.Index;
 import androidx.room.PrimaryKey;
 
-@Entity(tableName ="griglie",
+@Entity(tableName = "griglie",
         indices = {
                 @Index(value = "cod_alis", unique = true)
         }
 )
+
 public class Griglia {
     @PrimaryKey(autoGenerate = true)
     @ColumnInfo(name = "griglia_id")
@@ -21,8 +21,6 @@ public class Griglia {
     private String descrLisa;
     @ColumnInfo(name = "descr_depo")
     private String descrDepo;
-    @Ignore
-    private int countArticoli = 0;
 
 
     public int getGrigliaId() {
@@ -57,11 +55,4 @@ public class Griglia {
         this.descrDepo = descrDepo;
     }
 
-    public int getCountArticoli() {
-        return countArticoli;
-    }
-
-    public void setCountArticoli(int countArticoli) {
-        this.countArticoli = countArticoli;
-    }
 }

app/src/main/java/it/integry/integrywmsnative/core/data_store/db/entity/InventarioRoomDTO.java

@@ -0,0 +1,257 @@
+package it.integry.integrywmsnative.core.data_store.db.entity;
+
+import androidx.annotation.NonNull;
+import androidx.room.ColumnInfo;
+import androidx.room.Entity;
+import androidx.room.Ignore;
+import androidx.room.PrimaryKey;
+
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.util.List;
+
+import it.integry.integrywmsnative.core.data_store.db.interfaces.EntityModelInterface;
+
+@Entity(tableName = InventarioRoomDTO.TABLE_NAME)
+public class InventarioRoomDTO extends BaseSyncDTO implements EntityModelInterface {
+
+    public static final String TABLE_NAME = "inventari";
+
+    public static class Columns {
+        public static final String ID_INVENTARIO = "id_inventario";
+        public static final String COD_MDEP = "cod_mdep";
+        public static final String DATA_INVENTARIO = "data_inventario";
+        public static final String DATA_REG = "data_reg";
+        public static final String DATA_VER = "data_ver";
+        public static final String FILTRO = "filtro";
+        public static final String FLAG_STATO = "flag_stato";
+        public static final String FLAG_OPERAZIONE = "flag_operazione";
+        public static final String COD_ANAG = "cod_anag";
+        public static final String COD_DTIP = "cod_dtip";
+        public static final String INSERITO_DA = "inserito_da";
+        public static final String REGISTRATO_DA = "registrato_da";
+        public static final String VERIFICATO_DA = "verificato_da";
+        public static final String DATA_ORA_INIZIO = "data_ora_inizio";
+        public static final String DATA_ORA_FINE = "data_ora_fine";
+        public static final String CAUSALE = "causale";
+        public static final String ZONA = "zona";
+        public static final String IS_NEW = "new";
+    }
+
+    /** The unique ID of the cheese. */
+    @PrimaryKey(autoGenerate = true)
+    @ColumnInfo(index = true, name = BaseSyncDTO.Columns.ID)
+    private Long id;
+
+    /** The unique ID of the cheese. */
+    @ColumnInfo(index = true, name = Columns.ID_INVENTARIO)
+    private Long idInventario;
+
+    @NonNull
+    @ColumnInfo(name = Columns.COD_MDEP)
+    private String codMdep;
+
+    @ColumnInfo(name = Columns.DATA_INVENTARIO)
+    private LocalDate dataInventario;
+
+    @ColumnInfo(name = Columns.DATA_REG)
+    private LocalDateTime dataReg;
+
+    @ColumnInfo(name = Columns.DATA_VER)
+    private LocalDateTime dataVer;
+
+    @ColumnInfo(name = Columns.FILTRO)
+    private String filtro;
+
+    @ColumnInfo(name = Columns.FLAG_STATO)
+    private String flagStato;
+
+    @ColumnInfo(name = Columns.FLAG_OPERAZIONE)
+    private String flagOperazione;
+
+    @ColumnInfo(name = Columns.COD_ANAG)
+    private String codAnag;
+
+    @ColumnInfo(name = Columns.COD_DTIP)
+    private String codDtip;
+
+    @ColumnInfo(name = Columns.INSERITO_DA)
+    private String inseritoDa;
+
+    @ColumnInfo(name = Columns.REGISTRATO_DA)
+    private String registratoDa;
+
+    @ColumnInfo(name = Columns.VERIFICATO_DA)
+    private String verificatoDa;
+
+    @ColumnInfo(name = Columns.DATA_ORA_INIZIO)
+    private LocalDateTime dataOraInizio;
+
+    @ColumnInfo(name = Columns.DATA_ORA_FINE)
+    private LocalDateTime dataOraFine;
+
+    @ColumnInfo(name = Columns.CAUSALE)
+    private String causale;
+
+    @ColumnInfo(name = Columns.ZONA)
+    private String zona;
+
+    @ColumnInfo(name = Columns.IS_NEW)
+    private Boolean isNew = Boolean.TRUE;
+
+    @Ignore
+    private List<InventarioRowRoomDTO> inventarioRowList;
+
+    public Long getIdInventario() {
+        return idInventario;
+    }
+
+    public void setIdInventario(Long idInventario) {
+        this.idInventario = idInventario;
+    }
+
+    @NonNull
+    public String getCodMdep() {
+        return codMdep;
+    }
+
+    public void setCodMdep(@NonNull String codMdep) {
+        this.codMdep = codMdep;
+    }
+
+    public LocalDate getDataInventario() {
+        return dataInventario;
+    }
+
+    public void setDataInventario(LocalDate dataInventario) {
+        this.dataInventario = dataInventario;
+    }
+
+    public LocalDateTime getDataReg() {
+        return dataReg;
+    }
+
+    public void setDataReg(LocalDateTime dataReg) {
+        this.dataReg = dataReg;
+    }
+
+    public LocalDateTime getDataVer() {
+        return dataVer;
+    }
+
+    public void setDataVer(LocalDateTime dataVer) {
+        this.dataVer = dataVer;
+    }
+
+    public String getFiltro() {
+        return filtro;
+    }
+
+    public void setFiltro(String filtro) {
+        this.filtro = filtro;
+    }
+
+    public String getFlagStato() {
+        return flagStato;
+    }
+
+    public void setFlagStato(String flagStato) {
+        this.flagStato = flagStato;
+    }
+
+    public String getFlagOperazione() {
+        return flagOperazione;
+    }
+
+    public void setFlagOperazione(String flagOperazione) {
+        this.flagOperazione = flagOperazione;
+    }
+
+    public String getCodAnag() {
+        return codAnag;
+    }
+
+    public void setCodAnag(String codAnag) {
+        this.codAnag = codAnag;
+    }
+
+    public String getCodDtip() {
+        return codDtip;
+    }
+
+    public void setCodDtip(String codDtip) {
+        this.codDtip = codDtip;
+    }
+
+    public String getInseritoDa() {
+        return inseritoDa;
+    }
+
+    public void setInseritoDa(String inseritoDa) {
+        this.inseritoDa = inseritoDa;
+    }
+
+    public String getRegistratoDa() {
+        return registratoDa;
+    }
+
+    public void setRegistratoDa(String registratoDa) {
+        this.registratoDa = registratoDa;
+    }
+
+    public String getVerificatoDa() {
+        return verificatoDa;
+    }
+
+    public void setVerificatoDa(String verificatoDa) {
+        this.verificatoDa = verificatoDa;
+    }
+
+    public LocalDateTime getDataOraInizio() {
+        return dataOraInizio;
+    }
+
+    public void setDataOraInizio(LocalDateTime dataOraInizio) {
+        this.dataOraInizio = dataOraInizio;
+    }
+
+    public LocalDateTime getDataOraFine() {
+        return dataOraFine;
+    }
+
+    public void setDataOraFine(LocalDateTime dataOraFine) {
+        this.dataOraFine = dataOraFine;
+    }
+
+    public String getCausale() {
+        return causale;
+    }
+
+    public void setCausale(String causale) {
+        this.causale = causale;
+    }
+
+    public String getZona() {
+        return zona;
+    }
+
+    public void setZona(String zona) {
+        this.zona = zona;
+    }
+
+    public Boolean isNew() {
+        return isNew;
+    }
+
+    public void setNew(Boolean aNew) {
+        isNew = aNew;
+    }
+
+    public List<InventarioRowRoomDTO> getInventarioRowList() {
+        return inventarioRowList;
+    }
+
+    public void setInventarioRowList(List<InventarioRowRoomDTO> inventarioRowList) {
+        this.inventarioRowList = inventarioRowList;
+    }
+}

app/src/main/java/it/integry/integrywmsnative/core/data_store/db/entity/InventarioRowRoomDTO.java

@@ -0,0 +1,222 @@
+package it.integry.integrywmsnative.core.data_store.db.entity;
+
+import androidx.annotation.NonNull;
+import androidx.room.ColumnInfo;
+import androidx.room.Entity;
+import androidx.room.ForeignKey;
+import androidx.room.PrimaryKey;
+
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+
+import it.integry.integrywmsnative.core.data_store.db.interfaces.EntityModelInterface;
+
+@Entity(
+        tableName = InventarioRowRoomDTO.TABLE_NAME,
+        foreignKeys = {
+                @ForeignKey(
+                        entity = InventarioRoomDTO.class,
+                        parentColumns = {BaseSyncDTO.Columns.ID},
+                        childColumns = {InventarioRowRoomDTO.Columns.PARENT_ID}
+                )
+        }
+)
+public class InventarioRowRoomDTO extends BaseSyncDTO implements EntityModelInterface {
+
+    public static final String TABLE_NAME = "inventario_rows";
+
+    public static class Columns {
+        public static final String PARENT_ID = "parent_id";
+        public static final String COD_MART = "cod_mart";
+        public static final String PARTITA_MAG = "partita_mag";
+        public static final String DESCRIZIONE = "descrizione";
+        public static final String QTA = "qta";
+        public static final String NUM_CNF = "num_cnf";
+        public static final String QTA_CNF = "qta_cnf";
+        public static final String UNT_MIS = "unt_mis";
+        public static final String DATA_ORA_INV = "data_ora_inv";
+        public static final String SCAN_COD_BARRE = "scan_cod_barre";
+        public static final String ZONA = "zona";
+    }
+
+    /**
+     * The unique ID
+     */
+    @PrimaryKey(autoGenerate = true)
+    @ColumnInfo(index = true, name = BaseSyncDTO.Columns.ID)
+    private Long id;
+
+    @ColumnInfo(index = true, name = Columns.PARENT_ID)
+    private Long parentId;
+
+    @ColumnInfo(name = Columns.COD_MART)
+    private String codMart;
+
+    @ColumnInfo(name = Columns.PARTITA_MAG)
+    private String partitaMag;
+
+    @ColumnInfo(name = Columns.DESCRIZIONE)
+    private String descrizione;
+
+    @NonNull
+    @ColumnInfo(name = Columns.QTA, defaultValue = "0")
+    private BigDecimal qta;
+
+    @NonNull
+    @ColumnInfo(name = Columns.NUM_CNF, defaultValue = "0")
+    private BigDecimal numConf;
+
+    @NonNull
+    @ColumnInfo(name = Columns.QTA_CNF, defaultValue = "0")
+    private BigDecimal qtaConf;
+
+    @NonNull
+    @ColumnInfo(name = Columns.UNT_MIS, defaultValue = "0")
+    private String untMis;
+
+    @ColumnInfo(name = Columns.DATA_ORA_INV)
+    private LocalDateTime dataOraInv;
+
+    @ColumnInfo(name = Columns.SCAN_COD_BARRE)
+    private String scanCodBarre;
+
+    @ColumnInfo(name = Columns.ZONA)
+    private String zona;
+
+
+    public Long getParentId() {
+        return parentId;
+    }
+
+    public void setParentId(Long parentId) {
+        this.parentId = parentId;
+    }
+
+    public String getCodMart() {
+        return codMart;
+    }
+
+    public void setCodMart(@NonNull String codMart) {
+        this.codMart = codMart;
+    }
+
+    public String getPartitaMag() {
+        return partitaMag;
+    }
+
+    public void setPartitaMag(String partitaMag) {
+        this.partitaMag = partitaMag;
+    }
+
+    public String getDescrizione() {
+        return descrizione;
+    }
+
+    public void setDescrizione(String descrizione) {
+        this.descrizione = descrizione;
+    }
+
+    @NonNull
+    public BigDecimal getQta() {
+        return qta;
+    }
+
+    public void setQta(@NonNull BigDecimal qta) {
+        this.qta = qta;
+    }
+
+    @NonNull
+    public BigDecimal getNumConf() {
+        return numConf;
+    }
+
+    public void setNumConf(@NonNull BigDecimal numConf) {
+        this.numConf = numConf;
+    }
+
+    @NonNull
+    public BigDecimal getQtaConf() {
+        return qtaConf;
+    }
+
+    public void setQtaConf(@NonNull BigDecimal qtaConf) {
+        this.qtaConf = qtaConf;
+    }
+
+    @NonNull
+    public String getUntMis() {
+        return untMis;
+    }
+
+    public void setUntMis(@NonNull String untMis) {
+        this.untMis = untMis;
+    }
+
+    public LocalDateTime getDataOraInv() {
+        return dataOraInv;
+    }
+
+    public void setDataOraInv(LocalDateTime dataOraInv) {
+        this.dataOraInv = dataOraInv;
+    }
+
+    public String getScanCodBarre() {
+        return scanCodBarre;
+    }
+
+    public void setScanCodBarre(String scanCodBarre) {
+        this.scanCodBarre = scanCodBarre;
+    }
+
+    public String getZona() {
+        return zona;
+    }
+
+    public void setZona(String zona) {
+        this.zona = zona;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) return true;
+        if (o == null || getClass() != o.getClass()) return false;
+
+        InventarioRowRoomDTO that = (InventarioRowRoomDTO) o;
+
+        if (getId() != null ? !getId().equals(that.getId()) : that.getId() != null) return false;
+        if (getParentId() != null ? !getParentId().equals(that.getParentId()) : that.getParentId() != null)
+            return false;
+        if (getCodMart() != null ? !getCodMart().equals(that.getCodMart()) : that.getCodMart() != null)
+            return false;
+        if (getPartitaMag() != null ? !getPartitaMag().equals(that.getPartitaMag()) : that.getPartitaMag() != null)
+            return false;
+        if (getDescrizione() != null ? !getDescrizione().equals(that.getDescrizione()) : that.getDescrizione() != null)
+            return false;
+        if (!getQta().equals(that.getQta())) return false;
+        if (!getNumConf().equals(that.getNumConf())) return false;
+        if (!getQtaConf().equals(that.getQtaConf())) return false;
+        if (!getUntMis().equals(that.getUntMis())) return false;
+        if (getDataOraInv() != null ? !getDataOraInv().equals(that.getDataOraInv()) : that.getDataOraInv() != null)
+            return false;
+        if (getScanCodBarre() != null ? !getScanCodBarre().equals(that.getScanCodBarre()) : that.getScanCodBarre() != null)
+            return false;
+        return getZona() != null ? getZona().equals(that.getZona()) : that.getZona() == null;
+    }
+
+    @Override
+    public int hashCode() {
+        int result = getId() != null ? getId().hashCode() : 0;
+        result = 31 * result + (getParentId() != null ? getParentId().hashCode() : 0);
+        result = 31 * result + (getCodMart() != null ? getCodMart().hashCode() : 0);
+        result = 31 * result + (getPartitaMag() != null ? getPartitaMag().hashCode() : 0);
+        result = 31 * result + (getDescrizione() != null ? getDescrizione().hashCode() : 0);
+        result = 31 * result + getQta().hashCode();
+        result = 31 * result + getNumConf().hashCode();
+        result = 31 * result + getQtaConf().hashCode();
+        result = 31 * result + getUntMis().hashCode();
+        result = 31 * result + (getDataOraInv() != null ? getDataOraInv().hashCode() : 0);
+        result = 31 * result + (getScanCodBarre() != null ? getScanCodBarre().hashCode() : 0);
+        result = 31 * result + (getZona() != null ? getZona().hashCode() : 0);
+        return result;
+    }
+}

app/src/main/java/it/integry/integrywmsnative/core/data_store/db/entity/Ordine.java

@@ -48,10 +48,13 @@ public class Ordine {
     private String codMdep;
 
     @Ignore
-    private int countArticoli = 0;
+    private boolean orderNewProducts = false;
 
     @ColumnInfo(name = "id_griglia")
-    private int idGriglia;
+    private Integer idGriglia;
+
+    @ColumnInfo(name = "cod_alis")
+    private String codAlis;
 
     public int getOrdineId() {
         return ordineId;
@@ -102,14 +105,6 @@ public class Ordine {
         this.transmissionDate = transmissionDate;
     }
 
-    public int getCountArticoli() {
-        return countArticoli;
-    }
-
-    public void setCountArticoli(int countArticoli) {
-        this.countArticoli = countArticoli;
-    }
-
     @Nullable
     public String getGestione() {
         return gestione;
@@ -149,4 +144,20 @@ public class Ordine {
     public void setDataOrdS(String dataOrd) {
         setDataOrd(UtilityDate.recognizeDateWithExceptionHandler(dataOrd));
     }
+
+    public boolean isOrderNewProducts() {
+        return orderNewProducts;
+    }
+
+    public void setOrderNewProducts(boolean orderNewProducts) {
+        this.orderNewProducts = orderNewProducts;
+    }
+
+    public String getCodAlis() {
+        return codAlis;
+    }
+
+    public void setCodAlis(String codAlis) {
+        this.codAlis = codAlis;
+    }
 }

app/src/main/java/it/integry/integrywmsnative/core/data_store/db/entity/SqlMtbColr.java

@@ -0,0 +1,438 @@
+package it.integry.integrywmsnative.core.data_store.db.entity;
+
+import androidx.room.ColumnInfo;
+import androidx.room.Entity;
+import androidx.room.ForeignKey;
+import androidx.room.Index;
+import androidx.room.PrimaryKey;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+@Entity(
+        tableName = "mtb_colr",
+        indices = {
+                @Index(value = {"data_collo", "ser_collo", "num_collo", "gestione","riga"}, unique = true),
+                @Index(value = {"id_collo"})
+        },
+        foreignKeys = {
+                @ForeignKey(
+                        entity = SqlMtbColt.class,
+                        parentColumns = "id",
+                        childColumns = "id_collo",
+                        onDelete = ForeignKey.CASCADE
+                )
+        }
+)
+
+public class SqlMtbColr {
+
+    @PrimaryKey(autoGenerate = true)
+    @ColumnInfo(name = "id")
+    private int id;
+
+    @ColumnInfo(name = "id_collo")
+    private int idCollo;
+
+
+    @ColumnInfo(name = "data_collo")
+    private Date dataCollo;
+
+    @ColumnInfo(name = "gestione")
+    private String gestione;
+
+    @ColumnInfo(name = "ser_collo")
+    private String serCollo;
+
+    @ColumnInfo(name = "descrizione")
+    private String descrizione;
+
+    @ColumnInfo(name = "num_collo")
+    private Integer numCollo;
+
+
+    @ColumnInfo(name = "riga")
+    private Integer riga;
+
+    @ColumnInfo(name = "riga_ord")
+    private Integer rigaOrd;
+
+    @ColumnInfo(name = "cod_mart")
+    private String codMart;
+
+    @ColumnInfo(name = "cod_barre")
+    private String codBarre;
+
+    @ColumnInfo(name = "cod_col")
+    private String codCol;
+
+    @ColumnInfo(name = "cod_tagl")
+    private String codTagl;
+
+    @ColumnInfo(name = "partita_mag")
+    private String partitaMag;
+
+    @ColumnInfo(name = "gestione_rif")
+    private String gestioneRif;
+
+    @ColumnInfo(name = "ser_collo_rif")
+    private String serColloRif;
+
+    @ColumnInfo(name = "note")
+    private String note;
+
+    @ColumnInfo(name = "data_ord")
+    private Date dataOrd;
+
+    @ColumnInfo(name = "data_collo_rif")
+    private Date dataColloRif;
+
+    @ColumnInfo(name = "qta_cnf")
+    private Float qtaCnf;
+
+    @ColumnInfo(name = "qta_col")
+    private Float qtaCol;
+
+    @ColumnInfo(name = "num_ord")
+    private Integer numOrd;
+
+    @ColumnInfo(name = "num_etich")
+    private Integer numEtich;
+
+    @ColumnInfo(name = "num_collo_rif")
+    private Integer numColloRif;
+
+    @ColumnInfo(name = "datetime_row")
+    private Date datetimeRow;
+
+    @ColumnInfo(name = "cod_jcom")
+    private String codJcom;
+
+    @ColumnInfo(name = "num_cnf")
+    private Float numCnf;
+
+    @ColumnInfo(name = "causale")
+    private String causale;
+
+    @ColumnInfo(name = "utente")
+    private String utente;
+
+    @ColumnInfo(name = "cod_anag_doc")
+    private String codAnagDoc;
+
+    @ColumnInfo(name = "cod_dtip_doc")
+    private String codDtipDoc;
+
+    @ColumnInfo(name = "data_doc")
+    private Date dataDoc;
+
+    @ColumnInfo(name = "ser_doc")
+    private String serDoc;
+
+    @ColumnInfo(name = "num_doc")
+    private Integer numDoc;
+
+    @ColumnInfo(name = "id_riga_doc")
+    private Integer idRigaDoc;
+
+    @ColumnInfo(name = "unt_mis")
+    private String untMis;
+    @ColumnInfo(name = "data_scad")
+    private Date dataScad;
+
+    public int getId() {
+        return id;
+    }
+
+    public void setId(int id) {
+        this.id = id;
+    }
+
+    public int getIdCollo() {
+        return idCollo;
+    }
+
+    public void setIdCollo(int idCollo) {
+        this.idCollo = idCollo;
+    }
+
+    public Date getDataCollo() {
+        return dataCollo;
+    }
+
+    public void setDataCollo(Date dataCollo) {
+        this.dataCollo = dataCollo;
+    }
+
+    public String getGestione() {
+        return gestione;
+    }
+
+    public void setGestione(String gestione) {
+        this.gestione = gestione;
+    }
+
+    public String getSerCollo() {
+        return serCollo;
+    }
+
+    public void setSerCollo(String serCollo) {
+        this.serCollo = serCollo;
+    }
+
+    public Integer getNumCollo() {
+        return numCollo;
+    }
+
+    public void setNumCollo(Integer numCollo) {
+        this.numCollo = numCollo;
+    }
+
+    public Integer getRiga() {
+        return riga;
+    }
+
+    public void setRiga(Integer riga) {
+        this.riga = riga;
+    }
+
+    public Integer getRigaOrd() {
+        return rigaOrd;
+    }
+
+    public void setRigaOrd(Integer rigaOrd) {
+        this.rigaOrd = rigaOrd;
+    }
+
+    public String getCodMart() {
+        return codMart;
+    }
+
+    public void setCodMart(String codMart) {
+        this.codMart = codMart;
+    }
+
+    public String getCodBarre() {
+        return codBarre;
+    }
+
+    public void setCodBarre(String codBarre) {
+        this.codBarre = codBarre;
+    }
+
+    public String getCodCol() {
+        return codCol;
+    }
+
+    public void setCodCol(String codCol) {
+        this.codCol = codCol;
+    }
+
+    public String getCodTagl() {
+        return codTagl;
+    }
+
+    public void setCodTagl(String codTagl) {
+        this.codTagl = codTagl;
+    }
+
+    public String getPartitaMag() {
+        return partitaMag;
+    }
+
+    public void setPartitaMag(String partitaMag) {
+        this.partitaMag = partitaMag;
+    }
+
+    public String getGestioneRif() {
+        return gestioneRif;
+    }
+
+    public void setGestioneRif(String gestioneRif) {
+        this.gestioneRif = gestioneRif;
+    }
+
+    public String getSerColloRif() {
+        return serColloRif;
+    }
+
+    public void setSerColloRif(String serColloRif) {
+        this.serColloRif = serColloRif;
+    }
+
+    public String getNote() {
+        return note;
+    }
+
+    public void setNote(String note) {
+        this.note = note;
+    }
+
+    public Date getDataOrd() {
+        return dataOrd;
+    }
+
+    public void setDataOrd(Date dataOrd) {
+        this.dataOrd = dataOrd;
+    }
+
+    public Date getDataColloRif() {
+        return dataColloRif;
+    }
+
+    public void setDataColloRif(Date dataColloRif) {
+        this.dataColloRif = dataColloRif;
+    }
+
+    public Float getQtaCnf() {
+        return qtaCnf;
+    }
+
+    public void setQtaCnf(Float qtaCnf) {
+        this.qtaCnf = qtaCnf;
+    }
+
+    public Float getQtaCol() {
+        return qtaCol;
+    }
+
+    public void setQtaCol(Float qtaCol) {
+        this.qtaCol = qtaCol;
+    }
+
+    public Integer getNumOrd() {
+        return numOrd;
+    }
+
+    public void setNumOrd(Integer numOrd) {
+        this.numOrd = numOrd;
+    }
+
+    public Integer getNumEtich() {
+        return numEtich;
+    }
+
+    public void setNumEtich(Integer numEtich) {
+        this.numEtich = numEtich;
+    }
+
+    public Integer getNumColloRif() {
+        return numColloRif;
+    }
+
+    public void setNumColloRif(Integer numColloRif) {
+        this.numColloRif = numColloRif;
+    }
+
+    public Date getDatetimeRow() {
+        return datetimeRow;
+    }
+
+    public void setDatetimeRow(Date datetimeRow) {
+        this.datetimeRow = datetimeRow;
+    }
+
+    public String getCodJcom() {
+        return codJcom;
+    }
+
+    public void setCodJcom(String codJcom) {
+        this.codJcom = codJcom;
+    }
+
+    public Float getNumCnf() {
+        return numCnf;
+    }
+
+    public void setNumCnf(Float numCnf) {
+        this.numCnf = numCnf;
+    }
+
+    public String getCausale() {
+        return causale;
+    }
+
+    public void setCausale(String causale) {
+        this.causale = causale;
+    }
+
+    public String getUtente() {
+        return utente;
+    }
+
+    public void setUtente(String utente) {
+        this.utente = utente;
+    }
+
+    public String getCodAnagDoc() {
+        return codAnagDoc;
+    }
+
+    public void setCodAnagDoc(String codAnagDoc) {
+        this.codAnagDoc = codAnagDoc;
+    }
+
+    public String getCodDtipDoc() {
+        return codDtipDoc;
+    }
+
+    public void setCodDtipDoc(String codDtipDoc) {
+        this.codDtipDoc = codDtipDoc;
+    }
+
+    public Date getDataDoc() {
+        return dataDoc;
+    }
+
+    public void setDataDoc(Date dataDoc) {
+        this.dataDoc = dataDoc;
+    }
+
+    public String getSerDoc() {
+        return serDoc;
+    }
+
+    public void setSerDoc(String serDoc) {
+        this.serDoc = serDoc;
+    }
+
+    public Integer getNumDoc() {
+        return numDoc;
+    }
+
+    public void setNumDoc(Integer numDoc) {
+        this.numDoc = numDoc;
+    }
+
+    public Integer getIdRigaDoc() {
+        return idRigaDoc;
+    }
+
+    public void setIdRigaDoc(Integer idRigaDoc) {
+        this.idRigaDoc = idRigaDoc;
+    }
+
+    public String getUntMis() {
+        return untMis;
+    }
+
+    public void setUntMis(String untMis) {
+        this.untMis = untMis;
+    }
+
+    public String getDescrizione() {
+        return descrizione;
+    }
+
+    public void setDescrizione(String descrizione) {
+        this.descrizione = descrizione;
+    }
+
+    public Date getDataScad() {
+        return dataScad;
+    }
+
+    public void setDataScad(Date dataScad) {
+        this.dataScad = dataScad;
+    }
+}

app/src/main/java/it/integry/integrywmsnative/core/data_store/db/entity/SqlMtbColt.java

@@ -0,0 +1,341 @@
+package it.integry.integrywmsnative.core.data_store.db.entity;
+
+import androidx.room.ColumnInfo;
+import androidx.room.Entity;
+import androidx.room.Ignore;
+import androidx.room.Index;
+import androidx.room.PrimaryKey;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+@Entity(
+        tableName = "mtb_colt",
+        indices = {
+                @Index(value = {"data_collo", "ser_collo", "num_collo", "gestione"}, unique = true)
+        }
+)
+
+public class SqlMtbColt {
+
+    @PrimaryKey(autoGenerate = true)
+    @ColumnInfo(name = "id")
+    private int id;
+
+    @ColumnInfo(name = "username")
+    private String username;
+
+    @ColumnInfo
+    private String gestione;
+
+    @ColumnInfo(name = "data_collo")
+    private Date dataCollo;
+
+    @ColumnInfo(name = "ser_collo")
+    private String serCollo;
+
+    @ColumnInfo(name = "num_collo")
+    private Integer numCollo;
+
+    @ColumnInfo(name = "rif_ord")
+    private String rifOrd;
+
+    @ColumnInfo(name = "cod_anag")
+    private String codAnag;
+
+    @ColumnInfo(name = "cod_vdes")
+    private String codVdes;
+
+    @ColumnInfo(name = "cod_mdep")
+    private String codMdep;
+
+    @ColumnInfo(name = "cod_vlis")
+    private String codVlis;
+
+    @ColumnInfo(name = "cod_dtip")
+    private String codDtip;
+
+    @ColumnInfo(name = "cod_tcol")
+    private String codTcol;
+
+    @ColumnInfo(name = "ser_doc")
+    private String serDoc;
+
+    @ColumnInfo(name = "annotazioni")
+    private String annotazioni;
+
+    @ColumnInfo(name = "posizione")
+    private String posizione;
+
+    @ColumnInfo(name = "cod_dtip_provv")
+    private String codDtipProvv;
+
+    @ColumnInfo(name = "ser_doc_provv")
+    private String serDocProvv;
+
+    @ColumnInfo(name = "cod_jfas")
+    private String codJfas;
+
+    @ColumnInfo(name = "data_ord")
+    private Date dataOrd;
+
+    @ColumnInfo(name = "data_doc")
+    private Date dataDoc;
+
+    @ColumnInfo(name = "data_doc_provv")
+    private Date dataDocProvv;
+
+    @ColumnInfo(name = "cod_mgrp")
+    private String codMgrp;
+
+    @ColumnInfo(name = "data_vers")
+    private Date dataVers;
+
+    @ColumnInfo(name = "segno")
+    private Integer segno;
+
+    @ColumnInfo(name = "num_ord")
+    private Integer numOrd;
+
+    @ColumnInfo(name = "num_doc")
+    private Integer numDoc;
+
+    @ColumnInfo(name = "num_doc_provv")
+    private Integer numDocProvv;
+
+    @Ignore
+    private List<SqlMtbColr> sqlMtbColrs = new ArrayList<>();
+
+    public int getId() {
+        return id;
+    }
+
+    public void setId(int id) {
+        this.id = id;
+    }
+
+    public String getUsername() {
+        return username;
+    }
+
+    public void setUsername(String username) {
+        this.username = username;
+    }
+
+    public String getGestione() {
+        return gestione;
+    }
+
+    public void setGestione(String gestione) {
+        this.gestione = gestione;
+    }
+
+    public Date getDataCollo() {
+        return dataCollo;
+    }
+
+    public void setDataCollo(Date dataCollo) {
+        this.dataCollo = dataCollo;
+    }
+
+    public String getSerCollo() {
+        return serCollo;
+    }
+
+    public void setSerCollo(String serCollo) {
+        this.serCollo = serCollo;
+    }
+
+    public Integer getNumCollo() {
+        return numCollo;
+    }
+
+    public void setNumCollo(Integer numCollo) {
+        this.numCollo = numCollo;
+    }
+
+    public String getRifOrd() {
+        return rifOrd;
+    }
+
+    public void setRifOrd(String rifOrd) {
+        this.rifOrd = rifOrd;
+    }
+
+    public String getCodAnag() {
+        return codAnag;
+    }
+
+    public void setCodAnag(String codAnag) {
+        this.codAnag = codAnag;
+    }
+
+    public String getCodVdes() {
+        return codVdes;
+    }
+
+    public void setCodVdes(String codVdes) {
+        this.codVdes = codVdes;
+    }
+
+    public String getCodMdep() {
+        return codMdep;
+    }
+
+    public void setCodMdep(String codMdep) {
+        this.codMdep = codMdep;
+    }
+
+    public String getCodVlis() {
+        return codVlis;
+    }
+
+    public void setCodVlis(String codVlis) {
+        this.codVlis = codVlis;
+    }
+
+    public String getCodDtip() {
+        return codDtip;
+    }
+
+    public void setCodDtip(String codDtip) {
+        this.codDtip = codDtip;
+    }
+
+    public String getCodTcol() {
+        return codTcol;
+    }
+
+    public void setCodTcol(String codTcol) {
+        this.codTcol = codTcol;
+    }
+
+    public String getSerDoc() {
+        return serDoc;
+    }
+
+    public void setSerDoc(String serDoc) {
+        this.serDoc = serDoc;
+    }
+
+    public String getAnnotazioni() {
+        return annotazioni;
+    }
+
+    public void setAnnotazioni(String annotazioni) {
+        this.annotazioni = annotazioni;
+    }
+
+    public String getPosizione() {
+        return posizione;
+    }
+
+    public void setPosizione(String posizione) {
+        this.posizione = posizione;
+    }
+
+    public String getCodDtipProvv() {
+        return codDtipProvv;
+    }
+
+    public void setCodDtipProvv(String codDtipProvv) {
+        this.codDtipProvv = codDtipProvv;
+    }
+
+    public String getSerDocProvv() {
+        return serDocProvv;
+    }
+
+    public void setSerDocProvv(String serDocProvv) {
+        this.serDocProvv = serDocProvv;
+    }
+
+    public String getCodJfas() {
+        return codJfas;
+    }
+
+    public void setCodJfas(String codJfas) {
+        this.codJfas = codJfas;
+    }
+
+    public Date getDataOrd() {
+        return dataOrd;
+    }
+
+    public void setDataOrd(Date dataOrd) {
+        this.dataOrd = dataOrd;
+    }
+
+    public Date getDataDoc() {
+        return dataDoc;
+    }
+
+    public void setDataDoc(Date dataDoc) {
+        this.dataDoc = dataDoc;
+    }
+
+    public Date getDataDocProvv() {
+        return dataDocProvv;
+    }
+
+    public void setDataDocProvv(Date dataDocProvv) {
+        this.dataDocProvv = dataDocProvv;
+    }
+
+    public Date getDataVers() {
+        return dataVers;
+    }
+
+    public void setDataVers(Date dataVers) {
+        this.dataVers = dataVers;
+    }
+
+    public Integer getSegno() {
+        return segno;
+    }
+
+    public void setSegno(Integer segno) {
+        this.segno = segno;
+    }
+
+    public Integer getNumOrd() {
+        return numOrd;
+    }
+
+    public void setNumOrd(Integer numOrd) {
+        this.numOrd = numOrd;
+    }
+
+    public Integer getNumDoc() {
+        return numDoc;
+    }
+
+    public void setNumDoc(Integer numDoc) {
+        this.numDoc = numDoc;
+    }
+
+    public Integer getNumDocProvv() {
+        return numDocProvv;
+    }
+
+    public void setNumDocProvv(Integer numDocProvv) {
+        this.numDocProvv = numDocProvv;
+    }
+
+    public List<SqlMtbColr> getSqlMtbColrs() {
+        return sqlMtbColrs;
+    }
+
+    public void setSqlMtbColrs(List<SqlMtbColr> sqlMtbColrs) {
+        this.sqlMtbColrs = sqlMtbColrs;
+    }
+
+    public String getCodMgrp() {
+        return codMgrp;
+    }
+
+    public void setCodMgrp(String codMgrp) {
+        this.codMgrp = codMgrp;
+    }
+}

app/src/main/java/it/integry/integrywmsnative/core/data_store/db/interfaces/EntityDaoInterface.java

@@ -0,0 +1,31 @@
+package it.integry.integrywmsnative.core.data_store.db.interfaces;
+
+import androidx.room.Delete;
+import androidx.room.Insert;
+import androidx.room.RawQuery;
+import androidx.room.Update;
+import androidx.sqlite.db.SupportSQLiteQuery;
+
+import java.util.List;
+
+public interface EntityDaoInterface<R> {
+
+    @RawQuery()
+    List<R> execRaw(SupportSQLiteQuery query);
+
+    @Insert
+    long insert(R objectToInsert);
+
+    @Insert
+    List<Long> insertAll(List<R> objectToInsert);
+
+    @Delete
+    void delete(R objectToInsert);
+
+    @Update
+    void updateAll(List<R> cheese);
+
+    @Update
+    int update(R cheese);
+
+}

app/src/main/java/it/integry/integrywmsnative/core/data_store/db/interfaces/EntityModelInterface.java

@@ -0,0 +1,9 @@
+package it.integry.integrywmsnative.core.data_store.db.interfaces;
+
+public interface EntityModelInterface {
+
+    void setId(Long id);
+
+    Long getId();
+
+}

app/src/main/java/it/integry/integrywmsnative/core/data_store/db/repository/ArticoloGrigliaRepository.java

@@ -16,4 +16,6 @@ public interface ArticoloGrigliaRepository {
 
     void findArticoloByScanAndGriglia(String scan, int idGriglia, RunnableArgs<ArticoloGriglia> onSuccess, RunnableArgs<Exception> onFail);
 
+    void findNewArticoliInGrigla(int idGriglia, RunnableArgs<List<ArticoloGriglia>> onSuccess, RunnableArgs<Exception> onFail);
+
 }

app/src/main/java/it/integry/integrywmsnative/core/data_store/db/repository/GrigliaRepository.java

@@ -3,16 +3,15 @@ package it.integry.integrywmsnative.core.data_store.db.repository;
 import java.util.List;
 
 import it.integry.integrywmsnative.core.data_store.db.entity.Griglia;
-import it.integry.integrywmsnative.core.data_store.db.wrappers.GrigliaWrapper;
 import it.integry.integrywmsnative.core.expansion.RunnableArgs;
 
 public interface GrigliaRepository {
 
     void selectAll(RunnableArgs<List<Griglia>> onSuccess, RunnableArgs<Exception> onError);
 
-    void findByCodAlis(String codAlis , RunnableArgs<GrigliaWrapper> onSuccess, RunnableArgs<Exception> onError);
+    void findByCodAlis(String codAlis, RunnableArgs<Griglia> onSuccess, RunnableArgs<Exception> onError);
 
-    void saveGriglia(Griglia griglia, RunnableArgs<Integer> onSuccess,RunnableArgs<Exception> onFail);
+    void saveGriglia(Griglia griglia, RunnableArgs<Integer> onSuccess, RunnableArgs<Exception> onFail);
 
     void findGrigliaById(int idGriglia, RunnableArgs<Griglia> onLoad, RunnableArgs<Exception> onFail);
 }

app/src/main/java/it/integry/integrywmsnative/core/data_store/db/repository/MtbColrDataSource.java

@@ -0,0 +1,20 @@
+package it.integry.integrywmsnative.core.data_store.db.repository;
+
+import java.util.List;
+
+import it.integry.integrywmsnative.core.data_store.db.entity.SqlMtbColr;
+import it.integry.integrywmsnative.core.expansion.RunnableArgs;
+
+public interface MtbColrDataSource {
+
+    void selectAll(RunnableArgs<List<SqlMtbColr>> onSuccess, RunnableArgs<Exception> onError);
+
+    void selectAllByDocumentID(long documentID, RunnableArgs<List<SqlMtbColr>> onSuccess, RunnableArgs<Exception> onError);
+
+    void insert(SqlMtbColr mtbColr, RunnableArgs<Integer> onSuccess, RunnableArgs<Exception> onError);
+
+    void update(SqlMtbColr mtbColr, RunnableArgs<SqlMtbColr> onSuccess, RunnableArgs<Exception> onError);
+
+    void delete(SqlMtbColr mtbColr, Runnable onSuccess, RunnableArgs<Exception> onError);
+
+}

app/src/main/java/it/integry/integrywmsnative/core/data_store/db/repository/MtbColtRepository.java

@@ -0,0 +1,24 @@
+package it.integry.integrywmsnative.core.data_store.db.repository;
+
+import java.util.Date;
+import java.util.List;
+
+import it.integry.integrywmsnative.core.data_store.db.entity.SqlMtbColt;
+import it.integry.integrywmsnative.core.data_store.db.wrappers.DocInternoWrapper;
+import it.integry.integrywmsnative.core.expansion.RunnableArgs;
+
+public interface MtbColtRepository {
+
+    void selectAll(RunnableArgs<List<SqlMtbColt>> onSuccess, RunnableArgs<Exception> onError);
+
+    void insert(SqlMtbColt mtbColt, RunnableArgs<Integer> onSuccess, RunnableArgs<Exception> onError);
+
+    void update(SqlMtbColt mtbColt, RunnableArgs<SqlMtbColt> onSuccess, RunnableArgs<Exception> onError);
+
+    void delete(SqlMtbColt mtbColt, Runnable onSuccess, RunnableArgs<Exception> onError);
+
+    void getLocalDocumentsByCodDtip(String codDtip, String codAnag, String codVdes, Date dataDoc, String numDoc, RunnableArgs<List<DocInternoWrapper>> onSuccess, RunnableArgs<Exception> onError);
+
+    void getNextNumCollo(RunnableArgs<Integer> onSuccess, RunnableArgs<Exception> onError);
+
+}

app/src/main/java/it/integry/integrywmsnative/core/data_store/db/repository/OrdineRepository.java

@@ -2,9 +2,7 @@ package it.integry.integrywmsnative.core.data_store.db.repository;
 
 import java.util.List;
 
-import it.integry.integrywmsnative.core.data_store.db.entity.Griglia;
 import it.integry.integrywmsnative.core.data_store.db.entity.Ordine;
-import it.integry.integrywmsnative.core.data_store.db.view_model.OrdineWithGriglia;
 import it.integry.integrywmsnative.core.data_store.db.wrappers.OrdineWrapper;
 import it.integry.integrywmsnative.core.expansion.RunnableArgs;
 
@@ -12,9 +10,9 @@ public interface OrdineRepository {
 
     void selectAll(RunnableArgs<List<Ordine>> onSuccess, RunnableArgs<Exception> onError);
 
-    void selectAllTransmitted(RunnableArgs<List<OrdineWithGriglia>> onSuccess, RunnableArgs<Exception> onError);
+    void selectAllTransmitted(RunnableArgs<List<Ordine>> onSuccess, RunnableArgs<Exception> onError);
 
-    void selectAllOpenOrders(Griglia griglia, RunnableArgs<List<OrdineWrapper>> onSuccess, RunnableArgs<Exception> onError);
+    void selectAllOpenOrders(String codAlis, RunnableArgs<List<OrdineWrapper>> onSuccess, RunnableArgs<Exception> onError);
 
     void insert(Ordine ordine, RunnableArgs<Integer> onSuccess, RunnableArgs<Exception> onError);
 

app/src/main/java/it/integry/integrywmsnative/core/data_store/db/repository/datasource/ArticoliGrigliaDataSource.java

@@ -0,0 +1,142 @@
+package it.integry.integrywmsnative.core.data_store.db.repository.datasource;
+
+import android.os.Handler;
+
+import com.annimon.stream.Stream;
+
+import org.apache.commons.lang3.StringUtils;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.concurrent.Callable;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Future;
+import java.util.concurrent.TimeUnit;
+
+import javax.inject.Inject;
+
+import it.integry.integrywmsnative.core.data_store.db.dao.ArticoloGrigliaDao;
+import it.integry.integrywmsnative.core.data_store.db.entity.ArticoloGriglia;
+import it.integry.integrywmsnative.core.data_store.db.entity.Griglia;
+import it.integry.integrywmsnative.core.data_store.db.repository.ArticoloGrigliaRepository;
+import it.integry.integrywmsnative.core.expansion.RunnableArgs;
+import it.integry.integrywmsnative.core.utility.UtilityHashMap;
+
+public class ArticoliGrigliaDataSource extends BaseDataSource implements ArticoloGrigliaRepository {
+
+    private final ArticoloGrigliaDao mArticoloGrigliaDao;
+
+    @Inject
+    public ArticoliGrigliaDataSource(ExecutorService executorService,
+                                     Handler handler,
+                                     ArticoloGrigliaDao articoloGrigliaDao) {
+        super(executorService, handler);
+        this.mArticoloGrigliaDao = articoloGrigliaDao;
+    }
+
+    public void saveArticoliToGriglia(List<ArticoloGriglia> updatedArts, Griglia griglia, Runnable onSuccess, RunnableArgs<Exception> onError) {
+
+        try {
+            var tmp = calcItemsToInsertAndUpdate(updatedArts);
+            var toInsert = UtilityHashMap.<List<ArticoloGriglia>>getValue(tmp, "toInsert");
+            var toUpdate = UtilityHashMap.<List<ArticoloGriglia>>getValue(tmp, "toUpdate");
+            var codMarts = UtilityHashMap.<List<String>>getValue(tmp, "codMarts");
+
+            executorService.execute(() -> {
+                mArticoloGrigliaDao.insertAll(toInsert);
+                mArticoloGrigliaDao.updateAll(toUpdate);
+
+                List<ArticoloGriglia> articoliGriglia = mArticoloGrigliaDao.getArticoliFromGriglia(griglia.getGrigliaId());
+                List<ArticoloGriglia> toDelete = Stream.of(articoliGriglia).filter(articolo -> !codMarts.contains(articolo.getCodMart())).toList();
+                mArticoloGrigliaDao.deleteList(toDelete);
+
+                handler.post(onSuccess);
+            });
+
+        } catch (Exception e) {
+            onError.run(e);
+        }
+    }
+
+    private HashMap<String, Object> calcItemsToInsertAndUpdate(List<ArticoloGriglia> updatedArts) throws InterruptedException, ExecutionException {
+        var toInsert = new ArrayList<ArticoloGriglia>();
+        var toUpdate = new ArrayList<ArticoloGriglia>();
+        var codMarts = new ArrayList<String>();
+
+        List<Callable<ArticoloGriglia>> calls = new ArrayList<>();
+
+        for (int i = 0; i < updatedArts.size(); i++) {
+            int finalI = i;
+
+            Callable<ArticoloGriglia> callableTask = () -> {
+                var updatedArt = updatedArts.get(finalI);
+                Integer id = mArticoloGrigliaDao.getIdArticoloByGrigliaAndBarcodeAndCodMart(updatedArt.getIdGriglia(), updatedArt.getBarCode(), updatedArt.getCodMart());
+
+                if (id != null) {
+                    updatedArt.setArticoloGrigliaId(id);
+                }
+
+                return updatedArt;
+            };
+
+            calls.add(callableTask);
+        }
+
+        List<Future<ArticoloGriglia>> futures = executorService.invokeAll(calls, Long.MAX_VALUE, TimeUnit.MILLISECONDS);
+
+        for (Future<ArticoloGriglia> future : futures) {
+            if (future.isDone()) {
+                codMarts.add(future.get().getCodMart());
+                if (future.get().getArticoloGrigliaId() == null) toInsert.add(future.get());
+                else toUpdate.add(future.get());
+            } else {
+                future.cancel(true);
+            }
+        }
+
+        var tmp = new HashMap<String, Object>();
+
+        tmp.put("toInsert", toInsert);
+        tmp.put("toUpdate", toUpdate);
+        tmp.put("codMarts", codMarts);
+
+        return tmp;
+    }
+
+    public void findArticoloByBarcodeAndGriglia(String barcode, int idGriglia, RunnableArgs<ArticoloGriglia> onSuccess, RunnableArgs<Exception> onError) {
+        execute(() -> mArticoloGrigliaDao.findArticoloByBarcodeAndGriglia(barcode, idGriglia), onSuccess, onError);
+    }
+
+    public void findArticoloByCodMartAndGriglia(String codMart, int idGriglia, RunnableArgs<ArticoloGriglia> onSuccess, RunnableArgs<Exception> onError) {
+        execute(() -> mArticoloGrigliaDao.findArticoloByCodMartAndGriglia(codMart, idGriglia), onSuccess, onError);
+    }
+
+    public void findArticoloByScanAndGriglia(String scan, int idGriglia, RunnableArgs<ArticoloGriglia> onSuccess, RunnableArgs<Exception> onError) {
+
+        executorService.execute(() -> {
+            try {
+                ArticoloGriglia articolo = mArticoloGrigliaDao.findArticoloByCodMartAndGriglia(scan, idGriglia);
+
+                if (articolo == null) {
+                    articolo = mArticoloGrigliaDao.findArticoloByBarcodeAndGriglia(scan, idGriglia);
+                }
+
+                if (articolo == null) {
+                    String barcode = StringUtils.leftPad(scan, 13, "0");
+                    articolo = mArticoloGrigliaDao.findArticoloByBarcodeAndGriglia(barcode, idGriglia);
+                }
+
+                final ArticoloGriglia finalArticolo = articolo;
+                handler.post(() -> onSuccess.run(finalArticolo));
+            } catch (Exception e) {
+                onError.run(e);
+            }
+        });
+    }
+
+    public void findNewArticoliInGrigla(int idGriglia, RunnableArgs<List<ArticoloGriglia>> onSuccess, RunnableArgs<Exception> onError) {
+        execute(() -> mArticoloGrigliaDao.getNewArticoliInGriglia(idGriglia), onSuccess, onError);
+    }
+}

app/src/main/java/it/integry/integrywmsnative/core/data_store/db/repository/datasource/ArticoliOrdineDataSource.java

@@ -0,0 +1,101 @@
+package it.integry.integrywmsnative.core.data_store.db.repository.datasource;
+
+import android.os.Handler;
+
+import org.apache.commons.lang3.StringUtils;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.concurrent.ExecutorService;
+
+import javax.inject.Inject;
+
+import it.integry.integrywmsnative.core.data_store.db.dao.ArticoloOrdineDao;
+import it.integry.integrywmsnative.core.data_store.db.entity.ArticoloOrdine;
+import it.integry.integrywmsnative.core.data_store.db.entity.Ordine;
+import it.integry.integrywmsnative.core.data_store.db.repository.ArticoliOrdineRepository;
+import it.integry.integrywmsnative.core.expansion.RunnableArgs;
+import it.integry.integrywmsnative.core.utility.UtilityDate;
+
+public class ArticoliOrdineDataSource extends BaseDataSource implements ArticoliOrdineRepository {
+
+    private final ArticoloOrdineDao mArticoloOrdineDao;
+
+    @Inject
+    public ArticoliOrdineDataSource(ExecutorService executorService,
+                                    Handler handler,
+                                    ArticoloOrdineDao articoloOrdineDao) {
+        super(executorService, handler);
+        this.mArticoloOrdineDao = articoloOrdineDao;
+    }
+
+    public void saveArticoliToOrdine(List<ArticoloOrdine> articoli, Runnable onSuccess, RunnableArgs<Exception> onError) {
+        executorService.execute(() -> {
+            try {
+                List<ArticoloOrdine> toUpdate = new ArrayList<>();
+                List<ArticoloOrdine> toInsert = new ArrayList<>();
+                for (ArticoloOrdine art : articoli) {
+                    if (art.getArticoloOrdineId() != null && art.getArticoloOrdineId() > 0) {
+                        toUpdate.add(art);
+                    } else {
+                        toInsert.add(art);
+                    }
+                }
+                for (ArticoloOrdine newArt : toInsert) {
+                    mArticoloOrdineDao.insert(newArt);
+                }
+                mArticoloOrdineDao.updateAll(toUpdate);
+                handler.post(onSuccess);
+
+            } catch (Exception e) {
+                onError.run(e);
+            }
+        });
+    }
+
+    public void saveArticoloToOrdine(ArticoloOrdine articolo, Runnable onSuccess, RunnableArgs<Exception> onError) {
+        articolo.setDataIns(UtilityDate.getDateInstance());
+        if (articolo.getArticoloOrdineId() != null && articolo.getArticoloOrdineId() > 0) {
+            execute(() -> mArticoloOrdineDao.update(articolo), onSuccess, onError);
+        } else {
+            execute(() -> mArticoloOrdineDao.insert(articolo), onSuccess, onError);
+        }
+    }
+
+    public void findArticoloByOrdineAndBarcode(Ordine ordine, String barcode, RunnableArgs<ArticoloOrdine> onSuccess, RunnableArgs<Exception> onError) {
+        execute(() -> mArticoloOrdineDao.findArticoloByOrdineAndBarcode(ordine.getOrdineId(), barcode), onSuccess, onError);
+    }
+
+    public void findArticoloByScanAndOrdine(Ordine ordine, String barcode, RunnableArgs<ArticoloOrdine> onSuccess, RunnableArgs<Exception> onError) {
+        executorService.execute(() -> {
+            try {
+                ArticoloOrdine articolo = mArticoloOrdineDao.findArticoloByCodMartAndOrdine(ordine.getOrdineId(), barcode);
+
+                if (articolo == null) {
+                    articolo = mArticoloOrdineDao.findArticoloByBarcodeAndOrdine(ordine.getOrdineId(), barcode);
+                }
+
+                if (articolo == null) {
+                    String scannedCode = StringUtils.leftPad(barcode, 13, '0');
+                    articolo = mArticoloOrdineDao.findArticoloByBarcodeAndOrdine(ordine.getOrdineId(), scannedCode);
+                }
+
+                final ArticoloOrdine finalArticolo = articolo;
+                handler.post(() -> onSuccess.run(finalArticolo));
+            } catch (Exception e) {
+                onError.run(e);
+            }
+        });
+    }
+
+    public void findArticoliByOrdine(Ordine ordine, RunnableArgs<List<ArticoloOrdine>> onSuccess, RunnableArgs<Exception> onError) {
+        execute(() -> mArticoloOrdineDao.findArticoliByOrdine(ordine.getOrdineId()), onSuccess, onError);
+    }
+
+    public void deleteArticolo(ArticoloOrdine articolo, Runnable onSuccess, RunnableArgs<Exception> onError) {
+        execute(() -> mArticoloOrdineDao.delete(articolo),
+                onSuccess,
+                onError);
+    }
+
+}

app/src/main/java/it/integry/integrywmsnative/core/data_store/db/repository/datasource/BaseDataSource.java

@@ -0,0 +1,41 @@
+package it.integry.integrywmsnative.core.data_store.db.repository.datasource;
+
+import android.os.Handler;
+
+import java.util.concurrent.ExecutorService;
+
+import it.integry.integrywmsnative.core.expansion.RunnableArgs;
+import it.integry.integrywmsnative.core.expansion.RunnableWithReturn;
+
+public class BaseDataSource {
+
+    protected final ExecutorService executorService;
+    protected final Handler handler;
+
+    protected BaseDataSource(ExecutorService executorService, Handler handler) {
+        this.executorService = executorService;
+        this.handler = handler;
+    }
+
+    protected <T> void execute(RunnableWithReturn<T> query, RunnableArgs<T> onSuccess, RunnableArgs<Exception> onError) {
+        executorService.execute(() -> {
+            try {
+                var data = query.run();
+                handler.post(() -> onSuccess.run(data));
+            } catch (Exception ex) {
+                handler.post(() -> onError.run(ex));
+            }
+        });
+    }
+
+    protected void execute(Runnable query, Runnable onSuccess, RunnableArgs<Exception> onError) {
+        executorService.execute(() -> {
+            try {
+                query.run();
+                handler.post(onSuccess);
+            } catch (Exception ex) {
+                handler.post(() -> onError.run(ex));
+            }
+        });
+    }
+}

app/src/main/java/it/integry/integrywmsnative/core/data_store/db/repository/datasource/GrigliaDataSource.java

@@ -0,0 +1,51 @@
+package it.integry.integrywmsnative.core.data_store.db.repository.datasource;
+
+import android.os.Handler;
+
+import java.util.List;
+import java.util.concurrent.ExecutorService;
+
+import javax.inject.Inject;
+
+import it.integry.integrywmsnative.core.data_store.db.dao.GrigliaDao;
+import it.integry.integrywmsnative.core.data_store.db.entity.Griglia;
+import it.integry.integrywmsnative.core.data_store.db.repository.GrigliaRepository;
+import it.integry.integrywmsnative.core.expansion.RunnableArgs;
+
+public class GrigliaDataSource extends BaseDataSource implements GrigliaRepository {
+
+    private final GrigliaDao mGrigliaDao;
+
+    @Inject
+    public GrigliaDataSource(ExecutorService executorService,
+                             Handler handler,
+                             GrigliaDao grigliaDao) {
+        super(executorService, handler);
+        this.mGrigliaDao = grigliaDao;
+    }
+
+    public void selectAll(RunnableArgs<List<Griglia>> onSuccess, RunnableArgs<Exception> onError) {
+        execute(mGrigliaDao::getAll, onSuccess, onError);
+    }
+
+    public void findByCodAlis(String codAlis, RunnableArgs<Griglia> onSuccess, RunnableArgs<Exception> onError) {
+        execute(() -> mGrigliaDao.findByCodAlis(codAlis), onSuccess, onError);
+    }
+
+
+    public void saveGriglia(Griglia griglia, RunnableArgs<Integer> onSuccess, RunnableArgs<Exception> onFail) {
+        if (griglia.getGrigliaId() <= 0) {
+            execute(() -> (int) mGrigliaDao.insert(griglia), grigliaId -> {
+                griglia.setGrigliaId(grigliaId);
+                onSuccess.run(grigliaId);
+            }, onFail);
+        } else {
+            execute(() -> mGrigliaDao.update(griglia), () -> onSuccess.run(griglia.getGrigliaId()), onFail);
+        }
+
+    }
+
+    public void findGrigliaById(int idGriglia, RunnableArgs<Griglia> onSuccess, RunnableArgs<Exception> onError) {
+        execute(() -> mGrigliaDao.findGrigliaById(idGriglia), onSuccess, onError);
+    }
+}

app/src/main/java/it/integry/integrywmsnative/core/data_store/db/repository/datasource/OrdineDataSource.java

@@ -0,0 +1,58 @@
+package it.integry.integrywmsnative.core.data_store.db.repository.datasource;
+
+import android.os.Handler;
+
+import java.util.List;
+import java.util.concurrent.ExecutorService;
+
+import javax.inject.Inject;
+
+import it.integry.integrywmsnative.core.data_store.db.dao.OrdineDao;
+import it.integry.integrywmsnative.core.data_store.db.entity.Ordine;
+import it.integry.integrywmsnative.core.data_store.db.repository.OrdineRepository;
+import it.integry.integrywmsnative.core.data_store.db.wrappers.OrdineWrapper;
+import it.integry.integrywmsnative.core.expansion.RunnableArgs;
+
+public class OrdineDataSource extends BaseDataSource implements OrdineRepository {
+
+    private final OrdineDao mOrdineDao;
+
+    @Inject
+    public OrdineDataSource(ExecutorService executorService,
+                            Handler handler,
+                            OrdineDao ordineDao) {
+        super(executorService, handler);
+        this.mOrdineDao = ordineDao;
+    }
+
+    public void selectAll(RunnableArgs<List<Ordine>> onSuccess, RunnableArgs<Exception> onError) {
+        execute(mOrdineDao::getAll, onSuccess, onError);
+    }
+
+    public void selectAllTransmitted(RunnableArgs<List<Ordine>> onSuccess, RunnableArgs<Exception> onError) {
+        execute(mOrdineDao::getAllTrasnmitted, onSuccess, onError);
+    }
+
+    public void selectAllOpenOrders(String codAlis, RunnableArgs<List<OrdineWrapper>> onSuccess, RunnableArgs<Exception> onError) {
+        execute(() -> mOrdineDao.getAllOpenOrdersByGriglia(codAlis), onSuccess, onError);
+    }
+
+    public void insert(Ordine ordine, RunnableArgs<Integer> onSuccess, RunnableArgs<Exception> onError) {
+        execute(() -> mOrdineDao.insert(ordine),
+                ordineId -> onSuccess.run(ordineId.intValue()),
+                onError);
+    }
+
+
+    public void updateOrder(Ordine ordine, RunnableArgs<Ordine> onSuccess, RunnableArgs<Exception> onError) {
+        execute(() -> mOrdineDao.update(ordine),
+                () -> onSuccess.run(ordine),
+                onError);
+    }
+
+    public void delete(Ordine ordine, Runnable onSuccess, RunnableArgs<Exception> onError) {
+        execute(() -> mOrdineDao.delete(ordine),
+                onSuccess,
+                onError);
+    }
+}