diff --git a/.gitignore b/.gitignore
index 39fb081a..00dcad77 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,9 +1,151 @@
+### Android ###
+# Built application files
+*.apk
+*.ap_
+*.aab
+# Files for the ART/Dalvik VM
+*.dex
+# Java class files
+*.class
+# Generated files
+bin/
+gen/
+out/
+release/
+# Gradle files
+.gradle/
+build/
+# Local configuration file (sdk path, etc)
+local.properties
+# Proguard folder generated by Eclipse
+proguard/
+# Log Files
+*.log
+# Android Studio Navigation editor temp files
+.navigation/
+# Android Studio captures folder
+captures/
+# IntelliJ
*.iml
-.gradle
-/local.properties
-/.idea/workspace.xml
-/.idea/libraries
-.DS_Store
-/build
-/captures
+.idea/workspace.xml
+.idea/tasks.xml
+.idea/gradle.xml
+.idea/assetWizardSettings.xml
+.idea/dictionaries
+.idea/libraries
+# Android Studio 3 in .gitignore file.
+.idea/caches
+.idea/modules.xml
+# Comment next line if keeping position of elements in Navigation Editor is relevant for you
+.idea/navEditor.xml
+# Keystore files
+# Uncomment the following lines if you do not want to check your keystore files in.
+#*.jks
+#*.keystore
+# External native build folder generated in Android Studio 2.2 and later
.externalNativeBuild
+# Google Services (e.g. APIs or Firebase)
+# google-services.json
+# Freeline
+freeline.py
+freeline/
+freeline_project_description.json
+# fastlane
+fastlane/report.xml
+fastlane/Preview.html
+fastlane/screenshots
+fastlane/test_output
+fastlane/readme.md
+# Version control
+vcs.xml
+# lint
+lint/intermediates/
+lint/generated/
+lint/outputs/
+lint/tmp/
+# lint/reports/
+### Android Patch ###
+gen-external-apklibs
+output.json
+# Replacement of .externalNativeBuild directories introduced
+# with Android Studio 3.5.
+.cxx/
+### AndroidStudio ###
+# Covers files to be ignored for android development using Android Studio.
+# Built application files
+# Files for the ART/Dalvik VM
+# Java class files
+# Generated files
+# Gradle files
+.gradle
+# Signing files
+.signing/
+# Local configuration file (sdk path, etc)
+# Proguard folder generated by Eclipse
+# Log Files
+# Android Studio
+/*/build/
+/*/local.properties
+/*/out
+/*/*/build
+/*/*/production
+*.ipr
+*~
+*.swp
+# Android Patch
+# External native build folder generated in Android Studio 2.2 and later
+# NDK
+obj/
+# IntelliJ IDEA
+*.iws
+/out/
+# User-specific configurations
+.idea/caches/
+.idea/libraries/
+.idea/shelf/
+.idea/.name
+.idea/compiler.xml
+.idea/copyright/profiles_settings.xml
+.idea/encodings.xml
+.idea/misc.xml
+.idea/scopes/scope_settings.xml
+.idea/vcs.xml
+.idea/jsLibraryMappings.xml
+.idea/datasources.xml
+.idea/dataSources.ids
+.idea/sqlDataSources.xml
+.idea/dynamic.xml
+.idea/uiDesigner.xml
+# OS-specific files
+.DS_Store
+.DS_Store?
+._*
+.Spotlight-V100
+.Trashes
+ehthumbs.db
+Thumbs.db
+# Legacy Eclipse project files
+.classpath
+.project
+.cproject
+.settings/
+# Mobile Tools for Java (J2ME)
+.mtj.tmp/
+# Package Files #
+*.war
+*.ear
+# virtual machine crash logs (Reference: http://www.java.com/en/download/help/error_hotspot.xml)
+hs_err_pid*
+## Plugin-specific files:
+# mpeltonen/sbt-idea plugin
+.idea_modules/
+# JIRA plugin
+atlassian-ide-plugin.xml
+# Mongo Explorer plugin
+.idea/mongoSettings.xml
+# Crashlytics plugin (for Android Studio and IntelliJ)
+com_crashlytics_export_strings.xml
+crashlytics.properties
+crashlytics-build.properties
+### AndroidStudio Patch ###
+!/gradle/wrapper/gradle-wrapper.jar
diff --git a/.idea/assetWizardSettings.xml b/.idea/assetWizardSettings.xml
deleted file mode 100644
index 4c3dfb58..00000000
--- a/.idea/assetWizardSettings.xml
+++ /dev/null
@@ -1,46 +0,0 @@
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
deleted file mode 100644
index 947b3bad..00000000
--- a/.idea/gradle.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
deleted file mode 100644
index b6ea2b11..00000000
--- a/.idea/misc.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/modules.xml b/.idea/modules.xml
deleted file mode 100644
index 97fed5af..00000000
--- a/.idea/modules.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
deleted file mode 100644
index 35eb1ddf..00000000
--- a/.idea/vcs.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
-
-
-
-
\ No newline at end of file
diff --git a/app/build.gradle b/app/build.gradle
index 65fafba6..41c1d63d 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -17,8 +17,8 @@ apply plugin: 'com.google.gms.google-services'
android {
- def appVersionCode = 92
- def appVersionName = '1.8.5'
+ def appVersionCode = 93
+ def appVersionName = '1.8.6'
signingConfigs {
release {
diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/main/MainFragment.java b/app/src/main/java/it/integry/integrywmsnative/gest/main/MainFragment.java
index 5f346755..c8f80e5b 100644
--- a/app/src/main/java/it/integry/integrywmsnative/gest/main/MainFragment.java
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/main/MainFragment.java
@@ -34,6 +34,7 @@ import it.integry.integrywmsnative.core.model.MtbColt;
import it.integry.integrywmsnative.core.model.secondary.GestioneEnum;
import it.integry.integrywmsnative.core.settings.SettingsManager;
import it.integry.integrywmsnative.core.utility.UtilityExceptions;
+import it.integry.integrywmsnative.core.utility.UtilityResources;
import it.integry.integrywmsnative.core.utility.UtilityString;
import it.integry.integrywmsnative.databinding.FragmentMainBinding;
import it.integry.integrywmsnative.databinding.FragmentMainMenuGroupLayoutBinding;
@@ -80,6 +81,7 @@ public class MainFragment extends Fragment implements ITitledFragment, IScrollab
init();
initGestMenu();
+ initVersion();
return mBindings.getRoot();
}
@@ -241,4 +243,9 @@ public class MainFragment extends Fragment implements ITitledFragment, IScrollab
private void onMenuClick(MenuConfiguration.MenuItem menuItem) {
((MainActivity) getActivity()).setMenuItem(menuItem.getID());
}
+
+ private void initVersion() {
+ String appVersion = UtilityResources.getAppVersion();
+ mBindings.currentAppVersionName.setText("v" + appVersion);
+ }
}
diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/rettifica_giacenze/viewmodel/RettificaGiacenzeViewModel.java b/app/src/main/java/it/integry/integrywmsnative/gest/rettifica_giacenze/viewmodel/RettificaGiacenzeViewModel.java
index 7d993376..67bf4e97 100644
--- a/app/src/main/java/it/integry/integrywmsnative/gest/rettifica_giacenze/viewmodel/RettificaGiacenzeViewModel.java
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/rettifica_giacenze/viewmodel/RettificaGiacenzeViewModel.java
@@ -478,7 +478,7 @@ public class RettificaGiacenzeViewModel implements IRecyclerItemClicked
}
public void openLU() {
- DialogScanOrCreateLU.make(mContext, mtbColt -> {
+ DialogScanOrCreateLU.make(mContext, false, false, mtbColt -> {
if(mtbColt == null) {
((IPoppableActivity)mContext).pop();
} else {
@@ -635,6 +635,7 @@ public class RettificaGiacenzeViewModel implements IRecyclerItemClicked
mtbColrToEditClone
.setQtaCol(value.qtaTot.getBigDecimal())
+ .setMtbAart(mtbColrToEdit.getMtbAart())
.setOperation(CommonModelConsts.OPERATION.NO_OP);
mtbColt.get().getMtbColr().add(index, mtbColrToEditClone);
diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/vendita/dialogs/DialogVenditaFiltroAvanzato.java b/app/src/main/java/it/integry/integrywmsnative/gest/vendita/dialogs/DialogVenditaFiltroAvanzato.java
index 6f05b426..85a80e9a 100644
--- a/app/src/main/java/it/integry/integrywmsnative/gest/vendita/dialogs/DialogVenditaFiltroAvanzato.java
+++ b/app/src/main/java/it/integry/integrywmsnative/gest/vendita/dialogs/DialogVenditaFiltroAvanzato.java
@@ -133,6 +133,10 @@ public class DialogVenditaFiltroAvanzato {
private void initView(DialogVenditaFiltroAvanzatoBinding bindings, DialogVenditaFiltroAvanzatoViewModel viewModel) {
IFiltroOrdiniVendita filtroOrdiniVendita = ClassRouter.getIstance(ClassRouter.PATH.FILTRO_ORDINI_VENDITA);
+// bindings.filledExposedDropdownDataCons.setOnFocusChangeListener((v, hasFocus) -> {
+// bindings.filledExposedDropdownDataCons.callOnClick();
+// });
+
bindings.filledExposedDropdownDataCons.setOnClickListener(view -> {
Calendar c = UtilityDate.getCalendarInstance();
diff --git a/app/src/main/res/layout/dialog_vendita_filtro_avanzato.xml b/app/src/main/res/layout/dialog_vendita_filtro_avanzato.xml
index 2e3cfb83..5a35575b 100644
--- a/app/src/main/res/layout/dialog_vendita_filtro_avanzato.xml
+++ b/app/src/main/res/layout/dialog_vendita_filtro_avanzato.xml
@@ -47,6 +47,8 @@
style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.Dense.ExposedDropdownMenu"
android:layout_width="match_parent"
android:layout_height="wrap_content"
+ android:imeOptions="actionNext"
+ android:nextFocusDown="@id/input_id_viaggio"
android:hint="@string/deposit">
@@ -73,6 +77,8 @@
android:layout_height="wrap_content"
android:singleLine="true"
android:ellipsize="end"
+ android:imeOptions="actionNext"
+ android:nextFocusForward="@id/filled_exposed_dropdown_num_ords"
app:binding="@{viewmodel.idViaggio}" />
@@ -93,6 +99,8 @@
android:inputType="number|text"
android:singleLine="true"
android:ellipsize="end"
+ android:imeOptions="actionNext"
+ android:nextFocusForward="@id/filled_exposed_dropdown_cliente"
app:binding="@{viewmodel.numOrds}"/>
@@ -112,6 +120,8 @@
android:inputType="textNoSuggestions"
android:singleLine="true"
android:ellipsize="end"
+ android:imeOptions="actionNext"
+ android:nextFocusForward="@id/filled_exposed_dropdown_vettore"
app:binding="@{viewmodel.cliente}"/>
@@ -131,6 +141,8 @@
android:inputType="textNoSuggestions"
android:singleLine="true"
android:ellipsize="end"
+ android:imeOptions="actionNext"
+ android:nextFocusForward="@id/filled_exposed_dropdown_automezzo"
app:binding="@{viewmodel.vettore}"/>
@@ -150,6 +162,8 @@
android:inputType="textNoSuggestions"
android:singleLine="true"
android:ellipsize="end"
+ android:imeOptions="actionNext"
+ android:nextFocusForward="@id/filled_exposed_dropdown_agente"
app:binding="@{viewmodel.automezzo}"/>
@@ -169,6 +183,8 @@
android:inputType="textNoSuggestions"
android:singleLine="true"
android:ellipsize="end"
+ android:imeOptions="actionNext"
+ android:nextFocusForward="@id/filled_exposed_dropdown_term_cons"
app:binding="@{viewmodel.agente}"/>
@@ -182,13 +198,13 @@
+ android:id="@+id/filled_exposed_dropdown_data_cons"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:inputType="textNoSuggestions"
+ android:focusable="false"
+ android:singleLine="true"
+ app:binding="@{viewmodel.dataConsegna}"/>
@@ -201,12 +217,13 @@
android:hint="@string/terms_of_delivery">
diff --git a/app/src/main/res/layout/fragment_main.xml b/app/src/main/res/layout/fragment_main.xml
index 042748b4..352485ac 100644
--- a/app/src/main/res/layout/fragment_main.xml
+++ b/app/src/main/res/layout/fragment_main.xml
@@ -54,7 +54,6 @@
android:layout_height="wrap_content">
@@ -193,6 +192,22 @@
+
+
+
+
+
+