Version 23.2-Fallos precontrol-Directo Ubicador desde histórico-Inventario no se cierra-Botón solo Agregar
This commit is contained in:
parent
88ecc0209e
commit
b9cbc99dd1
|
|
@ -5,9 +5,10 @@
|
||||||
<option name="linkedExternalProjectsSettings">
|
<option name="linkedExternalProjectsSettings">
|
||||||
<GradleProjectSettings>
|
<GradleProjectSettings>
|
||||||
<option name="testRunner" value="GRADLE" />
|
<option name="testRunner" value="GRADLE" />
|
||||||
<option name="disableWrapperSourceDistributionNotification" value="true" />
|
|
||||||
<option name="distributionType" value="DEFAULT_WRAPPED" />
|
<option name="distributionType" value="DEFAULT_WRAPPED" />
|
||||||
<option name="externalProjectPath" value="$PROJECT_DIR$" />
|
<option name="externalProjectPath" value="$PROJECT_DIR$" />
|
||||||
|
<option name="gradleHome" value="$PROJECT_DIR$/../../../../gradle/gradle-7.5" />
|
||||||
|
<option name="gradleJvm" value="11" />
|
||||||
<option name="modules">
|
<option name="modules">
|
||||||
<set>
|
<set>
|
||||||
<option value="$PROJECT_DIR$" />
|
<option value="$PROJECT_DIR$" />
|
||||||
|
|
|
||||||
|
|
@ -276,7 +276,7 @@
|
||||||
</option>
|
</option>
|
||||||
</component>
|
</component>
|
||||||
<component name="ExternalStorageConfigurationManager" enabled="true" />
|
<component name="ExternalStorageConfigurationManager" enabled="true" />
|
||||||
<component name="ProjectRootManager" version="2" languageLevel="JDK_11" default="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
|
<component name="ProjectRootManager" version="2" languageLevel="JDK_11" project-jdk-name="1.8" project-jdk-type="JavaSDK">
|
||||||
<output url="file://$PROJECT_DIR$/build/classes" />
|
<output url="file://$PROJECT_DIR$/build/classes" />
|
||||||
</component>
|
</component>
|
||||||
<component name="ProjectType">
|
<component name="ProjectType">
|
||||||
|
|
|
||||||
|
|
@ -44,8 +44,8 @@
|
||||||
</shared>
|
</shared>
|
||||||
</component>
|
</component>
|
||||||
<component name="AndroidLogFilters">
|
<component name="AndroidLogFilters">
|
||||||
<option name="TOOL_WINDOW_CUSTOM_FILTER" value="verdnatura" />
|
<option name="TOOL_WINDOW_CUSTOM_FILTER" value="verdnatura::" />
|
||||||
<option name="TOOL_WINDOW_LOG_LEVEL" value="error" />
|
<option name="TOOL_WINDOW_LOG_LEVEL" value="debug" />
|
||||||
<option name="TOOL_WINDOW_CONFIGURED_FILTER" value="verdnatura" />
|
<option name="TOOL_WINDOW_CONFIGURED_FILTER" value="verdnatura" />
|
||||||
<option name="TOOL_WINDOW_REGEXP_FILTER" value="false" />
|
<option name="TOOL_WINDOW_REGEXP_FILTER" value="false" />
|
||||||
</component>
|
</component>
|
||||||
|
|
@ -83,15 +83,204 @@
|
||||||
</select>
|
</select>
|
||||||
</component>
|
</component>
|
||||||
<component name="ChangeListManager">
|
<component name="ChangeListManager">
|
||||||
<list default="true" id="fa688d1c-dbee-4864-9e33-4d84ef9afca8" name="Default Changelist" comment="Version 23.2Beta en scaleFusion">
|
<list default="true" id="fa688d1c-dbee-4864-9e33-4d84ef9afca8" name="Default Changelist" comment="Version 23.2 Cambiado collection_assign a String.">
|
||||||
<change beforePath="$PROJECT_DIR$/.idea/deploymentTargetDropDown.xml" beforeDir="false" />
|
<change afterPath="$PROJECT_DIR$/mylibrary/build/generated/source/buildConfig/debug/com/example/mylibrary/BuildConfig.java" afterDir="false" />
|
||||||
|
<change afterPath="$PROJECT_DIR$/mylibrary/build/generated/source/buildConfig/release/com/example/mylibrary/BuildConfig.java" afterDir="false" />
|
||||||
|
<change afterPath="$PROJECT_DIR$/mylibrary/build/intermediates/aapt_friendly_merged_manifests/debug/aapt/AndroidManifest.xml" afterDir="false" />
|
||||||
|
<change afterPath="$PROJECT_DIR$/mylibrary/build/intermediates/aapt_friendly_merged_manifests/debug/aapt/output-metadata.json" afterDir="false" />
|
||||||
|
<change afterPath="$PROJECT_DIR$/mylibrary/build/intermediates/aapt_friendly_merged_manifests/release/aapt/AndroidManifest.xml" afterDir="false" />
|
||||||
|
<change afterPath="$PROJECT_DIR$/mylibrary/build/intermediates/aapt_friendly_merged_manifests/release/aapt/output-metadata.json" afterDir="false" />
|
||||||
|
<change afterPath="$PROJECT_DIR$/mylibrary/build/intermediates/aar_metadata/debug/aar-metadata.properties" afterDir="false" />
|
||||||
|
<change afterPath="$PROJECT_DIR$/mylibrary/build/intermediates/aar_metadata/release/aar-metadata.properties" afterDir="false" />
|
||||||
|
<change afterPath="$PROJECT_DIR$/mylibrary/build/intermediates/annotation_processor_list/debug/annotationProcessors.json" afterDir="false" />
|
||||||
|
<change afterPath="$PROJECT_DIR$/mylibrary/build/intermediates/annotation_processor_list/release/annotationProcessors.json" afterDir="false" />
|
||||||
|
<change afterPath="$PROJECT_DIR$/mylibrary/build/intermediates/annotations_typedef_file/debug/typedefs.txt" afterDir="false" />
|
||||||
|
<change afterPath="$PROJECT_DIR$/mylibrary/build/intermediates/annotations_typedef_file/release/typedefs.txt" afterDir="false" />
|
||||||
|
<change afterPath="$PROJECT_DIR$/mylibrary/build/intermediates/compile_symbol_list/debug/R.txt" afterDir="false" />
|
||||||
|
<change afterPath="$PROJECT_DIR$/mylibrary/build/intermediates/compile_symbol_list/release/R.txt" afterDir="false" />
|
||||||
|
<change afterPath="$PROJECT_DIR$/mylibrary/build/intermediates/incremental/debug-mergeJavaRes/merge-state" afterDir="false" />
|
||||||
|
<change afterPath="$PROJECT_DIR$/mylibrary/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml" afterDir="false" />
|
||||||
|
<change afterPath="$PROJECT_DIR$/mylibrary/build/intermediates/incremental/mergeDebugShaders/merger.xml" afterDir="false" />
|
||||||
|
<change afterPath="$PROJECT_DIR$/mylibrary/build/intermediates/incremental/mergeReleaseJniLibFolders/merger.xml" afterDir="false" />
|
||||||
|
<change afterPath="$PROJECT_DIR$/mylibrary/build/intermediates/incremental/mergeReleaseShaders/merger.xml" afterDir="false" />
|
||||||
|
<change afterPath="$PROJECT_DIR$/mylibrary/build/intermediates/incremental/packageDebugAssets/merger.xml" afterDir="false" />
|
||||||
|
<change afterPath="$PROJECT_DIR$/mylibrary/build/intermediates/incremental/packageDebugResources/compile-file-map.properties" afterDir="false" />
|
||||||
|
<change afterPath="$PROJECT_DIR$/mylibrary/build/intermediates/incremental/packageDebugResources/merger.xml" afterDir="false" />
|
||||||
|
<change afterPath="$PROJECT_DIR$/mylibrary/build/intermediates/incremental/packageReleaseAssets/merger.xml" afterDir="false" />
|
||||||
|
<change afterPath="$PROJECT_DIR$/mylibrary/build/intermediates/incremental/packageReleaseResources/compile-file-map.properties" afterDir="false" />
|
||||||
|
<change afterPath="$PROJECT_DIR$/mylibrary/build/intermediates/incremental/packageReleaseResources/merger.xml" afterDir="false" />
|
||||||
|
<change afterPath="$PROJECT_DIR$/mylibrary/build/intermediates/incremental/release-mergeJavaRes/merge-state" afterDir="false" />
|
||||||
|
<change afterPath="$PROJECT_DIR$/mylibrary/build/intermediates/javac/debug/classes/com/example/mylibrary/BuildConfig.class" afterDir="false" />
|
||||||
|
<change afterPath="$PROJECT_DIR$/mylibrary/build/intermediates/javac/release/classes/com/example/mylibrary/BuildConfig.class" afterDir="false" />
|
||||||
|
<change afterPath="$PROJECT_DIR$/mylibrary/build/intermediates/local_only_symbol_list/debug/R-def.txt" afterDir="false" />
|
||||||
|
<change afterPath="$PROJECT_DIR$/mylibrary/build/intermediates/local_only_symbol_list/release/R-def.txt" afterDir="false" />
|
||||||
|
<change afterPath="$PROJECT_DIR$/mylibrary/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt" afterDir="false" />
|
||||||
|
<change afterPath="$PROJECT_DIR$/mylibrary/build/intermediates/manifest_merge_blame_file/release/manifest-merger-blame-release-report.txt" afterDir="false" />
|
||||||
|
<change afterPath="$PROJECT_DIR$/mylibrary/build/intermediates/merged_consumer_proguard_file/debug/proguard.txt" afterDir="false" />
|
||||||
|
<change afterPath="$PROJECT_DIR$/mylibrary/build/intermediates/merged_consumer_proguard_file/release/proguard.txt" afterDir="false" />
|
||||||
|
<change afterPath="$PROJECT_DIR$/mylibrary/build/intermediates/merged_manifest/debug/AndroidManifest.xml" afterDir="false" />
|
||||||
|
<change afterPath="$PROJECT_DIR$/mylibrary/build/intermediates/merged_manifest/release/AndroidManifest.xml" afterDir="false" />
|
||||||
|
<change afterPath="$PROJECT_DIR$/mylibrary/build/intermediates/packaged_manifests/debug/output-metadata.json" afterDir="false" />
|
||||||
|
<change afterPath="$PROJECT_DIR$/mylibrary/build/intermediates/packaged_manifests/release/output-metadata.json" afterDir="false" />
|
||||||
|
<change afterPath="$PROJECT_DIR$/mylibrary/build/intermediates/symbol_list_with_package_name/debug/package-aware-r.txt" afterDir="false" />
|
||||||
|
<change afterPath="$PROJECT_DIR$/mylibrary/build/intermediates/symbol_list_with_package_name/release/package-aware-r.txt" afterDir="false" />
|
||||||
|
<change afterPath="$PROJECT_DIR$/mylibrary/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/inputs/source-to-output.tab" afterDir="false" />
|
||||||
|
<change afterPath="$PROJECT_DIR$/mylibrary/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/inputs/source-to-output.tab.keystream" afterDir="false" />
|
||||||
|
<change afterPath="$PROJECT_DIR$/mylibrary/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/inputs/source-to-output.tab.keystream.len" afterDir="false" />
|
||||||
|
<change afterPath="$PROJECT_DIR$/mylibrary/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/inputs/source-to-output.tab.len" afterDir="false" />
|
||||||
|
<change afterPath="$PROJECT_DIR$/mylibrary/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/inputs/source-to-output.tab.values.at" afterDir="false" />
|
||||||
|
<change afterPath="$PROJECT_DIR$/mylibrary/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/inputs/source-to-output.tab_i" afterDir="false" />
|
||||||
|
<change afterPath="$PROJECT_DIR$/mylibrary/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/inputs/source-to-output.tab_i.len" afterDir="false" />
|
||||||
|
<change afterPath="$PROJECT_DIR$/mylibrary/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/class-attributes.tab" afterDir="false" />
|
||||||
|
<change afterPath="$PROJECT_DIR$/mylibrary/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/class-attributes.tab.keystream" afterDir="false" />
|
||||||
|
<change afterPath="$PROJECT_DIR$/mylibrary/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/class-attributes.tab.keystream.len" afterDir="false" />
|
||||||
|
<change afterPath="$PROJECT_DIR$/mylibrary/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/class-attributes.tab.len" afterDir="false" />
|
||||||
|
<change afterPath="$PROJECT_DIR$/mylibrary/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/class-attributes.tab.values.at" afterDir="false" />
|
||||||
|
<change afterPath="$PROJECT_DIR$/mylibrary/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/class-attributes.tab_i" afterDir="false" />
|
||||||
|
<change afterPath="$PROJECT_DIR$/mylibrary/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/class-attributes.tab_i.len" afterDir="false" />
|
||||||
|
<change afterPath="$PROJECT_DIR$/mylibrary/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab" afterDir="false" />
|
||||||
|
<change afterPath="$PROJECT_DIR$/mylibrary/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab.keystream" afterDir="false" />
|
||||||
|
<change afterPath="$PROJECT_DIR$/mylibrary/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab.keystream.len" afterDir="false" />
|
||||||
|
<change afterPath="$PROJECT_DIR$/mylibrary/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab.len" afterDir="false" />
|
||||||
|
<change afterPath="$PROJECT_DIR$/mylibrary/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab.values.at" afterDir="false" />
|
||||||
|
<change afterPath="$PROJECT_DIR$/mylibrary/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab_i" afterDir="false" />
|
||||||
|
<change afterPath="$PROJECT_DIR$/mylibrary/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab_i.len" afterDir="false" />
|
||||||
|
<change afterPath="$PROJECT_DIR$/mylibrary/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/internal-name-to-source.tab" afterDir="false" />
|
||||||
|
<change afterPath="$PROJECT_DIR$/mylibrary/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/internal-name-to-source.tab.keystream" afterDir="false" />
|
||||||
|
<change afterPath="$PROJECT_DIR$/mylibrary/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/internal-name-to-source.tab.keystream.len" afterDir="false" />
|
||||||
|
<change afterPath="$PROJECT_DIR$/mylibrary/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/internal-name-to-source.tab.len" afterDir="false" />
|
||||||
|
<change afterPath="$PROJECT_DIR$/mylibrary/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/internal-name-to-source.tab.values.at" afterDir="false" />
|
||||||
|
<change afterPath="$PROJECT_DIR$/mylibrary/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/internal-name-to-source.tab_i" afterDir="false" />
|
||||||
|
<change afterPath="$PROJECT_DIR$/mylibrary/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/internal-name-to-source.tab_i.len" afterDir="false" />
|
||||||
|
<change afterPath="$PROJECT_DIR$/mylibrary/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/proto.tab" afterDir="false" />
|
||||||
|
<change afterPath="$PROJECT_DIR$/mylibrary/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/proto.tab.keystream" afterDir="false" />
|
||||||
|
<change afterPath="$PROJECT_DIR$/mylibrary/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/proto.tab.keystream.len" afterDir="false" />
|
||||||
|
<change afterPath="$PROJECT_DIR$/mylibrary/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/proto.tab.len" afterDir="false" />
|
||||||
|
<change afterPath="$PROJECT_DIR$/mylibrary/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/proto.tab.values.at" afterDir="false" />
|
||||||
|
<change afterPath="$PROJECT_DIR$/mylibrary/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/proto.tab_i" afterDir="false" />
|
||||||
|
<change afterPath="$PROJECT_DIR$/mylibrary/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/proto.tab_i.len" afterDir="false" />
|
||||||
|
<change afterPath="$PROJECT_DIR$/mylibrary/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/source-to-classes.tab" afterDir="false" />
|
||||||
|
<change afterPath="$PROJECT_DIR$/mylibrary/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/source-to-classes.tab.keystream" afterDir="false" />
|
||||||
|
<change afterPath="$PROJECT_DIR$/mylibrary/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/source-to-classes.tab.keystream.len" afterDir="false" />
|
||||||
|
<change afterPath="$PROJECT_DIR$/mylibrary/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/source-to-classes.tab.len" afterDir="false" />
|
||||||
|
<change afterPath="$PROJECT_DIR$/mylibrary/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/source-to-classes.tab.values.at" afterDir="false" />
|
||||||
|
<change afterPath="$PROJECT_DIR$/mylibrary/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/source-to-classes.tab_i" afterDir="false" />
|
||||||
|
<change afterPath="$PROJECT_DIR$/mylibrary/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/jvm/kotlin/source-to-classes.tab_i.len" afterDir="false" />
|
||||||
|
<change afterPath="$PROJECT_DIR$/mylibrary/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/lookups/counters.tab" afterDir="false" />
|
||||||
|
<change afterPath="$PROJECT_DIR$/mylibrary/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/lookups/file-to-id.tab" afterDir="false" />
|
||||||
|
<change afterPath="$PROJECT_DIR$/mylibrary/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/lookups/file-to-id.tab.keystream" afterDir="false" />
|
||||||
|
<change afterPath="$PROJECT_DIR$/mylibrary/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/lookups/file-to-id.tab.keystream.len" afterDir="false" />
|
||||||
|
<change afterPath="$PROJECT_DIR$/mylibrary/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/lookups/file-to-id.tab.len" afterDir="false" />
|
||||||
|
<change afterPath="$PROJECT_DIR$/mylibrary/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/lookups/file-to-id.tab.values.at" afterDir="false" />
|
||||||
|
<change afterPath="$PROJECT_DIR$/mylibrary/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/lookups/file-to-id.tab_i" afterDir="false" />
|
||||||
|
<change afterPath="$PROJECT_DIR$/mylibrary/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/lookups/file-to-id.tab_i.len" afterDir="false" />
|
||||||
|
<change afterPath="$PROJECT_DIR$/mylibrary/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/lookups/id-to-file.tab" afterDir="false" />
|
||||||
|
<change afterPath="$PROJECT_DIR$/mylibrary/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/lookups/id-to-file.tab.keystream" afterDir="false" />
|
||||||
|
<change afterPath="$PROJECT_DIR$/mylibrary/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/lookups/id-to-file.tab.keystream.len" afterDir="false" />
|
||||||
|
<change afterPath="$PROJECT_DIR$/mylibrary/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/lookups/id-to-file.tab.len" afterDir="false" />
|
||||||
|
<change afterPath="$PROJECT_DIR$/mylibrary/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/lookups/id-to-file.tab.values.at" afterDir="false" />
|
||||||
|
<change afterPath="$PROJECT_DIR$/mylibrary/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/lookups/lookups.tab" afterDir="false" />
|
||||||
|
<change afterPath="$PROJECT_DIR$/mylibrary/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/lookups/lookups.tab.keystream" afterDir="false" />
|
||||||
|
<change afterPath="$PROJECT_DIR$/mylibrary/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/lookups/lookups.tab.keystream.len" afterDir="false" />
|
||||||
|
<change afterPath="$PROJECT_DIR$/mylibrary/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/lookups/lookups.tab.len" afterDir="false" />
|
||||||
|
<change afterPath="$PROJECT_DIR$/mylibrary/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/lookups/lookups.tab.values.at" afterDir="false" />
|
||||||
|
<change afterPath="$PROJECT_DIR$/mylibrary/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/lookups/lookups.tab_i" afterDir="false" />
|
||||||
|
<change afterPath="$PROJECT_DIR$/mylibrary/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/lookups/lookups.tab_i.len" afterDir="false" />
|
||||||
|
<change afterPath="$PROJECT_DIR$/mylibrary/build/kotlin/compileDebugKotlin/cacheable/last-build.bin" afterDir="false" />
|
||||||
|
<change afterPath="$PROJECT_DIR$/mylibrary/build/kotlin/compileDebugKotlin/local-state/build-history.bin" afterDir="false" />
|
||||||
|
<change afterPath="$PROJECT_DIR$/mylibrary/build/kotlin/compileReleaseKotlin/cacheable/caches-jvm/inputs/source-to-output.tab" afterDir="false" />
|
||||||
|
<change afterPath="$PROJECT_DIR$/mylibrary/build/kotlin/compileReleaseKotlin/cacheable/caches-jvm/inputs/source-to-output.tab.keystream" afterDir="false" />
|
||||||
|
<change afterPath="$PROJECT_DIR$/mylibrary/build/kotlin/compileReleaseKotlin/cacheable/caches-jvm/inputs/source-to-output.tab.keystream.len" afterDir="false" />
|
||||||
|
<change afterPath="$PROJECT_DIR$/mylibrary/build/kotlin/compileReleaseKotlin/cacheable/caches-jvm/inputs/source-to-output.tab.len" afterDir="false" />
|
||||||
|
<change afterPath="$PROJECT_DIR$/mylibrary/build/kotlin/compileReleaseKotlin/cacheable/caches-jvm/inputs/source-to-output.tab.values.at" afterDir="false" />
|
||||||
|
<change afterPath="$PROJECT_DIR$/mylibrary/build/kotlin/compileReleaseKotlin/cacheable/caches-jvm/inputs/source-to-output.tab_i" afterDir="false" />
|
||||||
|
<change afterPath="$PROJECT_DIR$/mylibrary/build/kotlin/compileReleaseKotlin/cacheable/caches-jvm/inputs/source-to-output.tab_i.len" afterDir="false" />
|
||||||
|
<change afterPath="$PROJECT_DIR$/mylibrary/build/kotlin/compileReleaseKotlin/cacheable/caches-jvm/jvm/kotlin/class-attributes.tab" afterDir="false" />
|
||||||
|
<change afterPath="$PROJECT_DIR$/mylibrary/build/kotlin/compileReleaseKotlin/cacheable/caches-jvm/jvm/kotlin/class-attributes.tab.keystream" afterDir="false" />
|
||||||
|
<change afterPath="$PROJECT_DIR$/mylibrary/build/kotlin/compileReleaseKotlin/cacheable/caches-jvm/jvm/kotlin/class-attributes.tab.keystream.len" afterDir="false" />
|
||||||
|
<change afterPath="$PROJECT_DIR$/mylibrary/build/kotlin/compileReleaseKotlin/cacheable/caches-jvm/jvm/kotlin/class-attributes.tab.len" afterDir="false" />
|
||||||
|
<change afterPath="$PROJECT_DIR$/mylibrary/build/kotlin/compileReleaseKotlin/cacheable/caches-jvm/jvm/kotlin/class-attributes.tab.values.at" afterDir="false" />
|
||||||
|
<change afterPath="$PROJECT_DIR$/mylibrary/build/kotlin/compileReleaseKotlin/cacheable/caches-jvm/jvm/kotlin/class-attributes.tab_i" afterDir="false" />
|
||||||
|
<change afterPath="$PROJECT_DIR$/mylibrary/build/kotlin/compileReleaseKotlin/cacheable/caches-jvm/jvm/kotlin/class-attributes.tab_i.len" afterDir="false" />
|
||||||
|
<change afterPath="$PROJECT_DIR$/mylibrary/build/kotlin/compileReleaseKotlin/cacheable/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab" afterDir="false" />
|
||||||
|
<change afterPath="$PROJECT_DIR$/mylibrary/build/kotlin/compileReleaseKotlin/cacheable/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab.keystream" afterDir="false" />
|
||||||
|
<change afterPath="$PROJECT_DIR$/mylibrary/build/kotlin/compileReleaseKotlin/cacheable/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab.keystream.len" afterDir="false" />
|
||||||
|
<change afterPath="$PROJECT_DIR$/mylibrary/build/kotlin/compileReleaseKotlin/cacheable/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab.len" afterDir="false" />
|
||||||
|
<change afterPath="$PROJECT_DIR$/mylibrary/build/kotlin/compileReleaseKotlin/cacheable/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab.values.at" afterDir="false" />
|
||||||
|
<change afterPath="$PROJECT_DIR$/mylibrary/build/kotlin/compileReleaseKotlin/cacheable/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab_i" afterDir="false" />
|
||||||
|
<change afterPath="$PROJECT_DIR$/mylibrary/build/kotlin/compileReleaseKotlin/cacheable/caches-jvm/jvm/kotlin/class-fq-name-to-source.tab_i.len" afterDir="false" />
|
||||||
|
<change afterPath="$PROJECT_DIR$/mylibrary/build/kotlin/compileReleaseKotlin/cacheable/caches-jvm/jvm/kotlin/internal-name-to-source.tab" afterDir="false" />
|
||||||
|
<change afterPath="$PROJECT_DIR$/mylibrary/build/kotlin/compileReleaseKotlin/cacheable/caches-jvm/jvm/kotlin/internal-name-to-source.tab.keystream" afterDir="false" />
|
||||||
|
<change afterPath="$PROJECT_DIR$/mylibrary/build/kotlin/compileReleaseKotlin/cacheable/caches-jvm/jvm/kotlin/internal-name-to-source.tab.keystream.len" afterDir="false" />
|
||||||
|
<change afterPath="$PROJECT_DIR$/mylibrary/build/kotlin/compileReleaseKotlin/cacheable/caches-jvm/jvm/kotlin/internal-name-to-source.tab.len" afterDir="false" />
|
||||||
|
<change afterPath="$PROJECT_DIR$/mylibrary/build/kotlin/compileReleaseKotlin/cacheable/caches-jvm/jvm/kotlin/internal-name-to-source.tab.values.at" afterDir="false" />
|
||||||
|
<change afterPath="$PROJECT_DIR$/mylibrary/build/kotlin/compileReleaseKotlin/cacheable/caches-jvm/jvm/kotlin/internal-name-to-source.tab_i" afterDir="false" />
|
||||||
|
<change afterPath="$PROJECT_DIR$/mylibrary/build/kotlin/compileReleaseKotlin/cacheable/caches-jvm/jvm/kotlin/internal-name-to-source.tab_i.len" afterDir="false" />
|
||||||
|
<change afterPath="$PROJECT_DIR$/mylibrary/build/kotlin/compileReleaseKotlin/cacheable/caches-jvm/jvm/kotlin/proto.tab" afterDir="false" />
|
||||||
|
<change afterPath="$PROJECT_DIR$/mylibrary/build/kotlin/compileReleaseKotlin/cacheable/caches-jvm/jvm/kotlin/proto.tab.keystream" afterDir="false" />
|
||||||
|
<change afterPath="$PROJECT_DIR$/mylibrary/build/kotlin/compileReleaseKotlin/cacheable/caches-jvm/jvm/kotlin/proto.tab.keystream.len" afterDir="false" />
|
||||||
|
<change afterPath="$PROJECT_DIR$/mylibrary/build/kotlin/compileReleaseKotlin/cacheable/caches-jvm/jvm/kotlin/proto.tab.len" afterDir="false" />
|
||||||
|
<change afterPath="$PROJECT_DIR$/mylibrary/build/kotlin/compileReleaseKotlin/cacheable/caches-jvm/jvm/kotlin/proto.tab.values.at" afterDir="false" />
|
||||||
|
<change afterPath="$PROJECT_DIR$/mylibrary/build/kotlin/compileReleaseKotlin/cacheable/caches-jvm/jvm/kotlin/proto.tab_i" afterDir="false" />
|
||||||
|
<change afterPath="$PROJECT_DIR$/mylibrary/build/kotlin/compileReleaseKotlin/cacheable/caches-jvm/jvm/kotlin/proto.tab_i.len" afterDir="false" />
|
||||||
|
<change afterPath="$PROJECT_DIR$/mylibrary/build/kotlin/compileReleaseKotlin/cacheable/caches-jvm/jvm/kotlin/source-to-classes.tab" afterDir="false" />
|
||||||
|
<change afterPath="$PROJECT_DIR$/mylibrary/build/kotlin/compileReleaseKotlin/cacheable/caches-jvm/jvm/kotlin/source-to-classes.tab.keystream" afterDir="false" />
|
||||||
|
<change afterPath="$PROJECT_DIR$/mylibrary/build/kotlin/compileReleaseKotlin/cacheable/caches-jvm/jvm/kotlin/source-to-classes.tab.keystream.len" afterDir="false" />
|
||||||
|
<change afterPath="$PROJECT_DIR$/mylibrary/build/kotlin/compileReleaseKotlin/cacheable/caches-jvm/jvm/kotlin/source-to-classes.tab.len" afterDir="false" />
|
||||||
|
<change afterPath="$PROJECT_DIR$/mylibrary/build/kotlin/compileReleaseKotlin/cacheable/caches-jvm/jvm/kotlin/source-to-classes.tab.values.at" afterDir="false" />
|
||||||
|
<change afterPath="$PROJECT_DIR$/mylibrary/build/kotlin/compileReleaseKotlin/cacheable/caches-jvm/jvm/kotlin/source-to-classes.tab_i" afterDir="false" />
|
||||||
|
<change afterPath="$PROJECT_DIR$/mylibrary/build/kotlin/compileReleaseKotlin/cacheable/caches-jvm/jvm/kotlin/source-to-classes.tab_i.len" afterDir="false" />
|
||||||
|
<change afterPath="$PROJECT_DIR$/mylibrary/build/kotlin/compileReleaseKotlin/cacheable/caches-jvm/lookups/counters.tab" afterDir="false" />
|
||||||
|
<change afterPath="$PROJECT_DIR$/mylibrary/build/kotlin/compileReleaseKotlin/cacheable/caches-jvm/lookups/file-to-id.tab" afterDir="false" />
|
||||||
|
<change afterPath="$PROJECT_DIR$/mylibrary/build/kotlin/compileReleaseKotlin/cacheable/caches-jvm/lookups/file-to-id.tab.keystream" afterDir="false" />
|
||||||
|
<change afterPath="$PROJECT_DIR$/mylibrary/build/kotlin/compileReleaseKotlin/cacheable/caches-jvm/lookups/file-to-id.tab.keystream.len" afterDir="false" />
|
||||||
|
<change afterPath="$PROJECT_DIR$/mylibrary/build/kotlin/compileReleaseKotlin/cacheable/caches-jvm/lookups/file-to-id.tab.len" afterDir="false" />
|
||||||
|
<change afterPath="$PROJECT_DIR$/mylibrary/build/kotlin/compileReleaseKotlin/cacheable/caches-jvm/lookups/file-to-id.tab.values.at" afterDir="false" />
|
||||||
|
<change afterPath="$PROJECT_DIR$/mylibrary/build/kotlin/compileReleaseKotlin/cacheable/caches-jvm/lookups/file-to-id.tab_i" afterDir="false" />
|
||||||
|
<change afterPath="$PROJECT_DIR$/mylibrary/build/kotlin/compileReleaseKotlin/cacheable/caches-jvm/lookups/file-to-id.tab_i.len" afterDir="false" />
|
||||||
|
<change afterPath="$PROJECT_DIR$/mylibrary/build/kotlin/compileReleaseKotlin/cacheable/caches-jvm/lookups/id-to-file.tab" afterDir="false" />
|
||||||
|
<change afterPath="$PROJECT_DIR$/mylibrary/build/kotlin/compileReleaseKotlin/cacheable/caches-jvm/lookups/id-to-file.tab.keystream" afterDir="false" />
|
||||||
|
<change afterPath="$PROJECT_DIR$/mylibrary/build/kotlin/compileReleaseKotlin/cacheable/caches-jvm/lookups/id-to-file.tab.keystream.len" afterDir="false" />
|
||||||
|
<change afterPath="$PROJECT_DIR$/mylibrary/build/kotlin/compileReleaseKotlin/cacheable/caches-jvm/lookups/id-to-file.tab.len" afterDir="false" />
|
||||||
|
<change afterPath="$PROJECT_DIR$/mylibrary/build/kotlin/compileReleaseKotlin/cacheable/caches-jvm/lookups/id-to-file.tab.values.at" afterDir="false" />
|
||||||
|
<change afterPath="$PROJECT_DIR$/mylibrary/build/kotlin/compileReleaseKotlin/cacheable/caches-jvm/lookups/lookups.tab" afterDir="false" />
|
||||||
|
<change afterPath="$PROJECT_DIR$/mylibrary/build/kotlin/compileReleaseKotlin/cacheable/caches-jvm/lookups/lookups.tab.keystream" afterDir="false" />
|
||||||
|
<change afterPath="$PROJECT_DIR$/mylibrary/build/kotlin/compileReleaseKotlin/cacheable/caches-jvm/lookups/lookups.tab.keystream.len" afterDir="false" />
|
||||||
|
<change afterPath="$PROJECT_DIR$/mylibrary/build/kotlin/compileReleaseKotlin/cacheable/caches-jvm/lookups/lookups.tab.len" afterDir="false" />
|
||||||
|
<change afterPath="$PROJECT_DIR$/mylibrary/build/kotlin/compileReleaseKotlin/cacheable/caches-jvm/lookups/lookups.tab.values.at" afterDir="false" />
|
||||||
|
<change afterPath="$PROJECT_DIR$/mylibrary/build/kotlin/compileReleaseKotlin/cacheable/caches-jvm/lookups/lookups.tab_i" afterDir="false" />
|
||||||
|
<change afterPath="$PROJECT_DIR$/mylibrary/build/kotlin/compileReleaseKotlin/cacheable/caches-jvm/lookups/lookups.tab_i.len" afterDir="false" />
|
||||||
|
<change afterPath="$PROJECT_DIR$/mylibrary/build/kotlin/compileReleaseKotlin/cacheable/last-build.bin" afterDir="false" />
|
||||||
|
<change afterPath="$PROJECT_DIR$/mylibrary/build/kotlin/compileReleaseKotlin/local-state/build-history.bin" afterDir="false" />
|
||||||
|
<change afterPath="$PROJECT_DIR$/mylibrary/build/outputs/aar/mylibrary-debug.aar" afterDir="false" />
|
||||||
|
<change afterPath="$PROJECT_DIR$/mylibrary/build/outputs/aar/mylibrary-release.aar" afterDir="false" />
|
||||||
|
<change afterPath="$PROJECT_DIR$/mylibrary/build/outputs/logs/manifest-merger-debug-report.txt" afterDir="false" />
|
||||||
|
<change afterPath="$PROJECT_DIR$/mylibrary/build/outputs/logs/manifest-merger-release-report.txt" afterDir="false" />
|
||||||
|
<change afterPath="$PROJECT_DIR$/mylibrary/build/tmp/compileDebugJavaWithJavac/source-classes-mapping.txt" afterDir="false" />
|
||||||
|
<change afterPath="$PROJECT_DIR$/mylibrary/build/tmp/compileReleaseJavaWithJavac/source-classes-mapping.txt" afterDir="false" />
|
||||||
|
<change afterPath="$PROJECT_DIR$/mylibrary/build/tmp/kotlin-classes/debug/META-INF/mylibrary_debug.kotlin_module" afterDir="false" />
|
||||||
|
<change afterPath="$PROJECT_DIR$/mylibrary/build/tmp/kotlin-classes/debug/com/example/mylibrary/testLibrary.class" afterDir="false" />
|
||||||
|
<change afterPath="$PROJECT_DIR$/mylibrary/build/tmp/kotlin-classes/release/META-INF/mylibrary_release.kotlin_module" afterDir="false" />
|
||||||
|
<change afterPath="$PROJECT_DIR$/mylibrary/build/tmp/kotlin-classes/release/com/example/mylibrary/testLibrary.class" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/.idea/gradle.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/gradle.xml" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/.idea/misc.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/misc.xml" afterDir="false" />
|
||||||
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
|
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
|
||||||
<change beforePath="$PROJECT_DIR$/app/build.gradle" beforeDir="false" afterPath="$PROJECT_DIR$/app/build.gradle" afterDir="false" />
|
<change beforePath="$PROJECT_DIR$/app/build.gradle" beforeDir="false" afterPath="$PROJECT_DIR$/app/build.gradle" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/google-services.json" beforeDir="false" afterPath="$PROJECT_DIR$/app/google-services.json" afterDir="false" />
|
||||||
<change beforePath="$PROJECT_DIR$/app/release/output-metadata.json" beforeDir="false" afterPath="$PROJECT_DIR$/app/release/output-metadata.json" afterDir="false" />
|
<change beforePath="$PROJECT_DIR$/app/release/output-metadata.json" beforeDir="false" afterPath="$PROJECT_DIR$/app/release/output-metadata.json" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/src/main/AndroidManifest.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/AndroidManifest.xml" afterDir="false" />
|
||||||
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/domain/VerdnaturaService.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/domain/VerdnaturaService.kt" afterDir="false" />
|
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/domain/VerdnaturaService.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/domain/VerdnaturaService.kt" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/component/CustomDialogList.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/component/CustomDialogList.kt" afterDir="false" />
|
||||||
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/collection/fragment/CollectionFragment.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/collection/fragment/CollectionFragment.kt" afterDir="false" />
|
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/collection/fragment/CollectionFragment.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/collection/fragment/CollectionFragment.kt" afterDir="false" />
|
||||||
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/collection/fragment/CollectionViewModel.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/collection/fragment/CollectionViewModel.kt" afterDir="false" />
|
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/collection/fragment/CollectionViewModel.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/collection/fragment/CollectionViewModel.kt" afterDir="false" />
|
||||||
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/collection/fragment/ShowTicketFragment.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/collection/fragment/ShowTicketFragment.kt" afterDir="false" />
|
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/historicoshelving/adapter/ItemShelvingLogAdapter.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/historicoshelving/adapter/ItemShelvingLogAdapter.kt" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/historicoshelving/fragment/ItemShelvingLogFragment.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/historicoshelving/fragment/ItemShelvingLogFragment.kt" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/historicoshelving/fragment/ItemShelvingLogViewModel.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/historicoshelving/fragment/ItemShelvingLogViewModel.kt" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/inventario/fragment/InventaryFragment.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/inventario/fragment/InventaryFragment.kt" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/presacador/fragment/EndSacadorFragment.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/presacador/fragment/EndSacadorFragment.kt" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/presacador/fragment/PreSacadorViewModel.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/presacador/fragment/PreSacadorViewModel.kt" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/reubication/fragment/ReubicationCollectionFragment.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/reubication/fragment/ReubicationCollectionFragment.kt" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/app/src/main/res/values-es/strings.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/res/values-es/strings.xml" afterDir="false" />
|
||||||
</list>
|
</list>
|
||||||
<option name="SHOW_DIALOG" value="false" />
|
<option name="SHOW_DIALOG" value="false" />
|
||||||
<option name="HIGHLIGHT_CONFLICTS" value="true" />
|
<option name="HIGHLIGHT_CONFLICTS" value="true" />
|
||||||
|
|
@ -102,7 +291,7 @@
|
||||||
<component name="CodeInsightWorkspaceSettings">
|
<component name="CodeInsightWorkspaceSettings">
|
||||||
<option name="optimizeImportsOnTheFly" value="true" />
|
<option name="optimizeImportsOnTheFly" value="true" />
|
||||||
</component>
|
</component>
|
||||||
<component name="ExecutionTargetManager" SELECTED_TARGET="device_and_snapshot_combo_box_target[21114523025303]" />
|
<component name="ExecutionTargetManager" SELECTED_TARGET="device_and_snapshot_combo_box_target[C:\Users\sergiodt\.android\avd\Pixel_2_API_24.avd]" />
|
||||||
<component name="ExportToHTMLSettings">
|
<component name="ExportToHTMLSettings">
|
||||||
<option name="OPEN_IN_BROWSER" value="true" />
|
<option name="OPEN_IN_BROWSER" value="true" />
|
||||||
<option name="OUTPUT_DIRECTORY" value="C:\Program Files\Android\Android Studio\inspections" />
|
<option name="OUTPUT_DIRECTORY" value="C:\Program Files\Android\Android Studio\inspections" />
|
||||||
|
|
@ -203,8 +392,20 @@
|
||||||
</file-type-list>
|
</file-type-list>
|
||||||
</component>
|
</component>
|
||||||
<component name="HighlightingSettingsPerFile">
|
<component name="HighlightingSettingsPerFile">
|
||||||
<setting file="file://$PROJECT_DIR$/app/src/main/res/values-es/strings.xml" root0="FORCE_HIGHLIGHTING" />
|
<setting file="file://$PROJECT_DIR$/app/src/main/java/es/verdnatura/domain/SalixService.kt" root0="FORCE_HIGHLIGHTING" />
|
||||||
|
<setting file="file://$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/base/BaseViewModel.kt" root0="FORCE_HIGHLIGHTING" />
|
||||||
|
<setting file="file://$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/collection/fragment/CollectionFragment.kt" root0="FORCE_HIGHLIGHTING" />
|
||||||
|
<setting file="file://$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/collection/fragment/CollectionViewModel.kt" root0="FORCE_HIGHLIGHTING" />
|
||||||
|
<setting file="file://$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/historicoshelvinglog/fragment/shelvingLogFragment.kt" root0="FORCE_HIGHLIGHTING" />
|
||||||
|
<setting file="file://$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/presacador/fragment/InitPreSacadorFragment.kt" root0="FORCE_HIGHLIGHTING" />
|
||||||
|
<setting file="file://$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/presacador/fragment/PreSacadorViewModel.kt" root0="FORCE_HIGHLIGHTING" />
|
||||||
|
<setting file="file://$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/ubicador/fragment/AutomaticAddItemFragment.kt" root0="FORCE_HIGHLIGHTING" />
|
||||||
|
<setting file="file://$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/ubicador/fragment/AutomaticAddItemViewModel.kt" root0="FORCE_HIGHLIGHTING" />
|
||||||
<setting file="file://$PROJECT_DIR$/app/src/main/res/layout/toolbar_fragment.xml" root0="FORCE_HIGHLIGHTING" />
|
<setting file="file://$PROJECT_DIR$/app/src/main/res/layout/toolbar_fragment.xml" root0="FORCE_HIGHLIGHTING" />
|
||||||
|
<setting file="file://$PROJECT_DIR$/app/src/main/res/values-es/strings.xml" root0="FORCE_HIGHLIGHTING" />
|
||||||
|
</component>
|
||||||
|
<component name="MarkdownSettingsMigration">
|
||||||
|
<option name="stateVersion" value="1" />
|
||||||
</component>
|
</component>
|
||||||
<component name="ProblemsViewState">
|
<component name="ProblemsViewState">
|
||||||
<option name="proportion" value="0.50190353" />
|
<option name="proportion" value="0.50190353" />
|
||||||
|
|
@ -219,57 +420,26 @@
|
||||||
<option name="showLibraryContents" value="true" />
|
<option name="showLibraryContents" value="true" />
|
||||||
<option name="showMembers" value="true" />
|
<option name="showMembers" value="true" />
|
||||||
</component>
|
</component>
|
||||||
<component name="PropertiesComponent">
|
<component name="PropertiesComponent"><![CDATA[{
|
||||||
<property name="ASKED_ADD_EXTERNAL_FILES" value="true" />
|
"keyToString": {
|
||||||
<property name="ASKED_MARK_IGNORED_FILES_AS_EXCLUDED" value="true" />
|
"ApkExportedModule": "Gestor_Almacén.app",
|
||||||
<property name="ApkExportedModule" value="Gestor_Almacén.app" />
|
"ExportApk.ApkPathForGestor_Almacén.app": "C:\\Users\\sergiodt\\AndroidStudioProjects\\vn-warehouseManager\\app",
|
||||||
<property name="BundleExportedModule" value="Gestor_Almacén.app" />
|
"RunOnceActivity.cidr.known.project.marker": "true",
|
||||||
<property name="ChangesTree.GroupingKeys" value="directory" />
|
"cidr.known.project.marker": "true",
|
||||||
<property name="DEBUGGABLE_DEVICE" value="wiko-w_p611_eea-HUHESK79F6NFBAPF" />
|
"com.google.services.firebase.aqiPopupShown": "true",
|
||||||
<property name="DEBUGGABLE_PROCESS" value="es.verdnatura" />
|
"last_opened_file_path": "C:/Users/sergiodt/proyectos/vn-picture/platforms/android",
|
||||||
<property name="DEBUGGER_ID" value="Auto" />
|
"project.structure.last.edited": "Modules",
|
||||||
<property name="DeviceAndSnapshotComboBoxAction.selectedDevice" value="SerialNumber@20211523021031" />
|
"project.structure.proportion": "0.17",
|
||||||
<property name="DeviceAndSnapshotComboBoxAction.selectionTime" value="2021-08-12T14:29:19.760785500Z" />
|
"project.structure.side.proportion": "0.2",
|
||||||
<property name="ExportApk.ApkPath" value="C:\Users\sergiodt\AndroidStudioProjects\vn-warehouseManager\app" />
|
"run.code.analysis.last.selected.profile": "pProject Default",
|
||||||
<property name="ExportApk.BuildVariants" value="release" />
|
"settings.editor.selected.configurable": "reference.settingsdialog.project.gradle"
|
||||||
<property name="ExportApk.SignV1" value="true" />
|
},
|
||||||
<property name="ExportApk.SignV2" value="true" />
|
"keyToStringList": {
|
||||||
<property name="I18N_FIX_LAST_USED_CONTEXT" value="Gestor_Almacén.app.main" />
|
"ExportApk.BuildVariants": [
|
||||||
<property name="ResourceManagerPrefKey.ResourceType" value="DRAWABLE" />
|
"release"
|
||||||
<property name="RunOnceActivity.OpenProjectViewOnStart" value="true" />
|
]
|
||||||
<property name="RunOnceActivity.ShowReadmeOnStart" value="true" />
|
}
|
||||||
<property name="RunOnceActivity.cidr.known.project.marker" value="true" />
|
}]]></component>
|
||||||
<property name="SHARE_PROJECT_CONFIGURATION_FILES" value="true" />
|
|
||||||
<property name="SHOW_ALL_PROCESSES" value="false" />
|
|
||||||
<property name="ScreenRecorderTask.SavePath" value="C:\Users\sergiodt\device-2021-11-25-073850.mp4" />
|
|
||||||
<property name="TODO_SCOPE" value="All Places" />
|
|
||||||
<property name="android-custom-viewC:/Users/sergiodt/.gradle/caches/modules-2/files-2.1/androidx.appcompat/appcompat/1.1.0/9865019bbd2d95e41dede3d8ebf964aa93f97766/appcompat-1.1.0-sources.jar!/androidx/appcompat/widget/AppCompatImageView.java_SELECTED" value="AppCompatImageView" />
|
|
||||||
<property name="android-custom-viewC:/Users/sergiodt/.gradle/caches/modules-2/files-2.1/androidx.recyclerview/recyclerview/1.0.0/2151d26c3b241f0a887f2dadb9ab091649fcf020/recyclerview-1.0.0-sources.jar!/androidx/recyclerview/widget/RecyclerView.java_RecyclerView_DIMENSIONS" value="1080 1920" />
|
|
||||||
<property name="android-custom-viewC:/Users/sergiodt/.gradle/caches/modules-2/files-2.1/androidx.recyclerview/recyclerview/1.0.0/2151d26c3b241f0a887f2dadb9ab091649fcf020/recyclerview-1.0.0-sources.jar!/androidx/recyclerview/widget/RecyclerView.java_SELECTED" value="RecyclerView" />
|
|
||||||
<property name="android-custom-viewC:/Users/sergiodt/.gradle/caches/modules-2/files-2.1/androidx.recyclerview/recyclerview/1.2.1/f0f93e67af3f7417bdd560d5142f6dec4fe629c3/recyclerview-1.2.1-sources.jar!/androidx/recyclerview/widget/RecyclerView.java_SELECTED" value="RecyclerView" />
|
|
||||||
<property name="android-custom-viewC:/Users/sergiodt/AppData/Local/Android/Sdk/sources/android-29/android/view/View.java_SELECTED" value="View" />
|
|
||||||
<property name="android-custom-viewC:/Users/sergiodt/AppData/Local/Android/Sdk/sources/android-29/android/widget/EditText.java_SELECTED" value="EditText" />
|
|
||||||
<property name="android-custom-viewC:/Users/sergiodt/AppData/Local/Android/Sdk/sources/android-29/android/widget/ImageView.java_SELECTED" value="ImageView" />
|
|
||||||
<property name="android-custom-viewC:/Users/sergiodt/AppData/Local/Android/Sdk/sources/android-29/android/widget/TextView.java_SELECTED" value="TextView" />
|
|
||||||
<property name="android-custom-viewC:/Users/sergiodt/AppData/Local/Android/Sdk/sources/android-29/android/widget/TextView.java_TextView_DIMENSIONS" value="1080 1920" />
|
|
||||||
<property name="android-custom-viewC:/Users/sergiodt/AppData/Local/Android/Sdk/sources/android-30/android/view/View.java_SELECTED" value="View" />
|
|
||||||
<property name="android-custom-viewC:/Users/sergiodt/AppData/Local/Android/Sdk/sources/android-30/android/widget/ImageView.java_SELECTED" value="ImageView" />
|
|
||||||
<property name="android-custom-viewC:/Users/sergiodt/AppData/Local/Android/Sdk/sources/android-30/android/widget/TextView.java_SELECTED" value="TextView" />
|
|
||||||
<property name="android.recentlyUsedThemes" value="Base.Theme.AppCompat" />
|
|
||||||
<property name="cidr.known.project.marker" value="true" />
|
|
||||||
<property name="com.developerphil.adbidea.selecteddevices" value="21114523025303" />
|
|
||||||
<property name="last_directory_selection" value="$PROJECT_DIR$/app/src/main/res/drawable" />
|
|
||||||
<property name="last_opened_file_path" value="$PROJECT_DIR$/../Rocket.Chat.Android" />
|
|
||||||
<property name="multi-representation-previewC:/Users/sergiodt/.gradle/caches/modules-2/files-2.1/androidx.recyclerview/recyclerview/1.0.0/2151d26c3b241f0a887f2dadb9ab091649fcf020/recyclerview-1.0.0-sources.jar!/androidx/recyclerview/widget/RecyclerView.java_selected" value="Custom views" />
|
|
||||||
<property name="multi-representation-previewC:/Users/sergiodt/AppData/Local/Android/Sdk/sources/android-29/android/view/View.java_selected" value="Custom views" />
|
|
||||||
<property name="multi-representation-previewC:/Users/sergiodt/AppData/Local/Android/Sdk/sources/android-29/android/widget/TextView.java_selected" value="Custom views" />
|
|
||||||
<property name="project.structure.last.edited" value="Dependencies" />
|
|
||||||
<property name="project.structure.proportion" value="0.17" />
|
|
||||||
<property name="project.structure.side.proportion" value="0.2" />
|
|
||||||
<property name="recommended.upgrade.last.time.stamp" value="1641190974236" />
|
|
||||||
<property name="run.code.analysis.last.selected.profile" value="pProject Default" />
|
|
||||||
<property name="settings.editor.selected.configurable" value="configurable.group.appearance" />
|
|
||||||
</component>
|
|
||||||
<component name="PsdUISettings">
|
<component name="PsdUISettings">
|
||||||
<option name="MODULE_TAB" value="Default Config" />
|
<option name="MODULE_TAB" value="Default Config" />
|
||||||
<option name="LAST_EDITED_SIGNING_CONFIG" value="debug" />
|
<option name="LAST_EDITED_SIGNING_CONFIG" value="debug" />
|
||||||
|
|
@ -312,8 +482,8 @@
|
||||||
<option name="Android.Gradle.BeforeRunTask" enabled="true" />
|
<option name="Android.Gradle.BeforeRunTask" enabled="true" />
|
||||||
</method>
|
</method>
|
||||||
</configuration>
|
</configuration>
|
||||||
<configuration name="app" type="AndroidRunConfigurationType" factoryName="Android App" activateToolWindowBeforeRun="false">
|
<configuration name="app" type="AndroidRunConfigurationType" factoryName="Android App">
|
||||||
<module name="Gestor_Almacén.app" />
|
<module name="Gestor_Almacén.app.main" />
|
||||||
<option name="DEPLOY" value="true" />
|
<option name="DEPLOY" value="true" />
|
||||||
<option name="DEPLOY_APK_FROM_BUNDLE" value="false" />
|
<option name="DEPLOY_APK_FROM_BUNDLE" value="false" />
|
||||||
<option name="DEPLOY_AS_INSTANT" value="false" />
|
<option name="DEPLOY_AS_INSTANT" value="false" />
|
||||||
|
|
@ -321,6 +491,7 @@
|
||||||
<option name="PM_INSTALL_OPTIONS" value="" />
|
<option name="PM_INSTALL_OPTIONS" value="" />
|
||||||
<option name="ALL_USERS" value="false" />
|
<option name="ALL_USERS" value="false" />
|
||||||
<option name="ALWAYS_INSTALL_WITH_PM" value="false" />
|
<option name="ALWAYS_INSTALL_WITH_PM" value="false" />
|
||||||
|
<option name="CLEAR_APP_STORAGE" value="false" />
|
||||||
<option name="DYNAMIC_FEATURES_DISABLED_LIST" value="" />
|
<option name="DYNAMIC_FEATURES_DISABLED_LIST" value="" />
|
||||||
<option name="ACTIVITY_EXTRA_FLAGS" value="" />
|
<option name="ACTIVITY_EXTRA_FLAGS" value="" />
|
||||||
<option name="MODE" value="default_activity" />
|
<option name="MODE" value="default_activity" />
|
||||||
|
|
@ -357,7 +528,7 @@
|
||||||
<option name="ADVANCED_PROFILING_ENABLED" value="false" />
|
<option name="ADVANCED_PROFILING_ENABLED" value="false" />
|
||||||
<option name="STARTUP_PROFILING_ENABLED" value="false" />
|
<option name="STARTUP_PROFILING_ENABLED" value="false" />
|
||||||
<option name="STARTUP_CPU_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="STARTUP_NATIVE_MEMORY_PROFILING_ENABLED" value="false" />
|
||||||
<option name="NATIVE_MEMORY_SAMPLE_RATE_BYTES" value="2048" />
|
<option name="NATIVE_MEMORY_SAMPLE_RATE_BYTES" value="2048" />
|
||||||
</Profilers>
|
</Profilers>
|
||||||
|
|
@ -410,13 +581,6 @@
|
||||||
<option name="presentableId" value="Default" />
|
<option name="presentableId" value="Default" />
|
||||||
<updated>1618825571576</updated>
|
<updated>1618825571576</updated>
|
||||||
</task>
|
</task>
|
||||||
<task id="LOCAL-00056" summary="Version 8.2 Subida de ficheros que no estaban versionados">
|
|
||||||
<created>1651648467597</created>
|
|
||||||
<option name="number" value="00056" />
|
|
||||||
<option name="presentableId" value="LOCAL-00056" />
|
|
||||||
<option name="project" value="LOCAL" />
|
|
||||||
<updated>1651648467597</updated>
|
|
||||||
</task>
|
|
||||||
<task id="LOCAL-00057" summary="Version 8.3 Diseño grafico, llamadas a Salix y return "Finish"">
|
<task id="LOCAL-00057" summary="Version 8.3 Diseño grafico, llamadas a Salix y return "Finish"">
|
||||||
<created>1652788345754</created>
|
<created>1652788345754</created>
|
||||||
<option name="number" value="00057" />
|
<option name="number" value="00057" />
|
||||||
|
|
@ -753,7 +917,14 @@
|
||||||
<option name="project" value="LOCAL" />
|
<option name="project" value="LOCAL" />
|
||||||
<updated>1670915898013</updated>
|
<updated>1670915898013</updated>
|
||||||
</task>
|
</task>
|
||||||
<option name="localTasksCounter" value="105" />
|
<task id="LOCAL-00105" summary="Version 23.2 Cambiado collection_assign a String.">
|
||||||
|
<created>1673601175078</created>
|
||||||
|
<option name="number" value="00105" />
|
||||||
|
<option name="presentableId" value="LOCAL-00105" />
|
||||||
|
<option name="project" value="LOCAL" />
|
||||||
|
<updated>1673601175078</updated>
|
||||||
|
</task>
|
||||||
|
<option name="localTasksCounter" value="106" />
|
||||||
<servers />
|
<servers />
|
||||||
</component>
|
</component>
|
||||||
<component name="Vcs.Log.History.Properties">
|
<component name="Vcs.Log.History.Properties">
|
||||||
|
|
@ -851,11 +1022,9 @@
|
||||||
</entry>
|
</entry>
|
||||||
</map>
|
</map>
|
||||||
</option>
|
</option>
|
||||||
<option name="oldMeFiltersMigrated" value="true" />
|
|
||||||
</component>
|
</component>
|
||||||
<component name="VcsManagerConfiguration">
|
<component name="VcsManagerConfiguration">
|
||||||
<option name="ADD_EXTERNAL_FILES_SILENTLY" value="true" />
|
<option name="ADD_EXTERNAL_FILES_SILENTLY" value="true" />
|
||||||
<MESSAGE value="Version 9.2Beta-Controlador sin animacion y vuelve al sitio" />
|
|
||||||
<MESSAGE value="Version 9 Arreglado vuelta atrás controlador" />
|
<MESSAGE value="Version 9 Arreglado vuelta atrás controlador" />
|
||||||
<MESSAGE value="Version 9.2.1 Refactor Inicio" />
|
<MESSAGE value="Version 9.2.1 Refactor Inicio" />
|
||||||
<MESSAGE value="Version 9.2.1 Refactor Inicio, pintar a través del rgb, modificado diseño,se añade shelvingLog y muestra colección a través de ticket" />
|
<MESSAGE value="Version 9.2.1 Refactor Inicio, pintar a través del rgb, modificado diseño,se añade shelvingLog y muestra colección a través de ticket" />
|
||||||
|
|
@ -880,7 +1049,8 @@
|
||||||
<MESSAGE value="Version 9.6Beta. TEST6-final: Modificando llamadas con clase" />
|
<MESSAGE value="Version 9.6Beta. TEST6-final: Modificando llamadas con clase" />
|
||||||
<MESSAGE value="Version 9.6Beta. TEST6-final: Modificando llamadas a SilexCallback (AjustesFragment)" />
|
<MESSAGE value="Version 9.6Beta. TEST6-final: Modificando llamadas a SilexCallback (AjustesFragment)" />
|
||||||
<MESSAGE value="Version 9.6Beta. TEST6-13122022. Dos revisiones de ubicador." />
|
<MESSAGE value="Version 9.6Beta. TEST6-13122022. Dos revisiones de ubicador." />
|
||||||
<option name="LAST_COMMIT_MESSAGE" value="Version 9.6Beta. TEST6-13122022. Dos revisiones de ubicador." />
|
<MESSAGE value="Version 23.2 Cambiado collection_assign a String." />
|
||||||
|
<option name="LAST_COMMIT_MESSAGE" value="Version 23.2 Cambiado collection_assign a String." />
|
||||||
</component>
|
</component>
|
||||||
<component name="XDebuggerManager">
|
<component name="XDebuggerManager">
|
||||||
<breakpoint-manager>
|
<breakpoint-manager>
|
||||||
|
|
|
||||||
|
|
@ -6,14 +6,14 @@ apply plugin: 'com.google.gms.google-services'
|
||||||
|
|
||||||
|
|
||||||
android {
|
android {
|
||||||
compileSdkVersion 30
|
compileSdkVersion 33
|
||||||
// buildToolsVersion "29.0.3"
|
// buildToolsVersion "29.0.3"
|
||||||
|
|
||||||
defaultConfig {
|
defaultConfig {
|
||||||
applicationId "es.verdnatura"
|
applicationId "es.verdnatura"
|
||||||
minSdkVersion 24 //21
|
minSdkVersion 24 //21
|
||||||
targetSdkVersion 30
|
targetSdkVersion 33
|
||||||
versionCode 153
|
versionCode 154
|
||||||
//versionName = "9.8Beta" version 148
|
//versionName = "9.8Beta" version 148
|
||||||
//versionName = "23.2Beta" 150
|
//versionName = "23.2Beta" 150
|
||||||
versionName = "23.2Beta"
|
versionName = "23.2Beta"
|
||||||
|
|
|
||||||
|
|
@ -10,7 +10,7 @@
|
||||||
"client_info": {
|
"client_info": {
|
||||||
"mobilesdk_app_id": "1:519813071137:android:3de54686c580a6f79dfe60",
|
"mobilesdk_app_id": "1:519813071137:android:3de54686c580a6f79dfe60",
|
||||||
"android_client_info": {
|
"android_client_info": {
|
||||||
"package_name": "es.verdnatura"
|
"package_name": "es.verdnatura.sfusion"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"oauth_client": [
|
"oauth_client": [
|
||||||
|
|
|
||||||
|
|
@ -11,7 +11,7 @@
|
||||||
"type": "SINGLE",
|
"type": "SINGLE",
|
||||||
"filters": [],
|
"filters": [],
|
||||||
"attributes": [],
|
"attributes": [],
|
||||||
"versionCode": 152,
|
"versionCode": 154,
|
||||||
"versionName": "23.2Beta",
|
"versionName": "23.2Beta",
|
||||||
"outputFile": "app-release.apk"
|
"outputFile": "app-release.apk"
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -40,7 +40,8 @@
|
||||||
<activity
|
<activity
|
||||||
android:name=".presentation.view.feature.login.activity.LoginActivity"
|
android:name=".presentation.view.feature.login.activity.LoginActivity"
|
||||||
android:configChanges="orientation"
|
android:configChanges="orientation"
|
||||||
android:screenOrientation="portrait">
|
android:screenOrientation="portrait"
|
||||||
|
android:exported="true">
|
||||||
<intent-filter>
|
<intent-filter>
|
||||||
<action android:name="android.intent.action.MAIN" />
|
<action android:name="android.intent.action.MAIN" />
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -329,12 +329,12 @@ interface VerdnaturaService {
|
||||||
@Body vararg params: Any
|
@Body vararg params: Any
|
||||||
):
|
):
|
||||||
Call<Any>
|
Call<Any>
|
||||||
|
/*
|
||||||
@POST("almacennew/collectionMissingTrash")//REVISADA
|
@POST("almacennew/collectionMissingTrash")//REVISADA
|
||||||
fun collectionMissingTrash(
|
fun collectionMissingTrash(
|
||||||
@Body vararg params: Any
|
@Body vararg params: Any
|
||||||
):
|
):
|
||||||
Call<Any>
|
Call<Any>*/
|
||||||
|
|
||||||
@POST("almacennew/saleTrackingDel")//REVISADA
|
@POST("almacennew/saleTrackingDel")//REVISADA
|
||||||
fun saleTrackingDel(
|
fun saleTrackingDel(
|
||||||
|
|
|
||||||
|
|
@ -133,5 +133,10 @@ class CustomDialogList (context: Context) : Dialog(context, R.style.DialogTheme)
|
||||||
|
|
||||||
return this
|
return this
|
||||||
}
|
}
|
||||||
|
fun hideTextInput():CustomDialogList{
|
||||||
|
binding.textinputlayoutUsername.visibility = View.INVISIBLE
|
||||||
|
|
||||||
|
return this
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
@ -609,7 +609,7 @@ class CollectionFragment(
|
||||||
|
|
||||||
})
|
})
|
||||||
|
|
||||||
responseMissingTrash.observe(viewLifecycleOwner, Observer {
|
/* responseMissingTrash.observe(viewLifecycleOwner, Observer {
|
||||||
|
|
||||||
if (!goBack) {
|
if (!goBack) {
|
||||||
if (it.isError) {
|
if (it.isError) {
|
||||||
|
|
@ -622,7 +622,7 @@ class CollectionFragment(
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
})
|
})*/
|
||||||
//Tarea 4280
|
//Tarea 4280
|
||||||
/* responseTicketClosure.observe(viewLifecycleOwner, Observer {
|
/* responseTicketClosure.observe(viewLifecycleOwner, Observer {
|
||||||
binding.splashProgress.visibility = GONE
|
binding.splashProgress.visibility = GONE
|
||||||
|
|
@ -1070,12 +1070,11 @@ class CollectionFragment(
|
||||||
}, object : OnMistakeClickListener {
|
}, object : OnMistakeClickListener {
|
||||||
override fun onMistakeClickListener(sale: SaleVO) {
|
override fun onMistakeClickListener(sale: SaleVO) {
|
||||||
//Tarea #4969
|
//Tarea #4969
|
||||||
if (type != "PRECHECKER") {
|
|
||||||
binding.splashProgress.visibility = VISIBLE
|
binding.splashProgress.visibility = VISIBLE
|
||||||
viewModel.mistakeType()
|
viewModel.mistakeType()
|
||||||
mistakeSale = sale
|
mistakeSale = sale
|
||||||
goMistakeBack = false
|
goMistakeBack = false
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}, object : onPackingClickListener {
|
}, object : onPackingClickListener {
|
||||||
override fun onPackingClick(sale: SaleVO) {
|
override fun onPackingClick(sale: SaleVO) {
|
||||||
|
|
@ -2173,7 +2172,7 @@ class CollectionFragment(
|
||||||
|
|
||||||
//Tarea4495
|
//Tarea4495
|
||||||
// if (type != SACADOR) {
|
// if (type != SACADOR) {
|
||||||
customDialogThreeButtons.setOkButton(getString(R.string.titleFaults)) {
|
/* customDialogThreeButtons.setOkButton(getString(R.string.titleFaults)) {
|
||||||
checkAndCall(
|
checkAndCall(
|
||||||
position,
|
position,
|
||||||
customDialogThreeButtons.getValue(),
|
customDialogThreeButtons.getValue(),
|
||||||
|
|
@ -2202,25 +2201,27 @@ class CollectionFragment(
|
||||||
position,
|
position,
|
||||||
customDialogThreeButtons.getValue(),
|
customDialogThreeButtons.getValue(),
|
||||||
getString(R.string.Split)
|
getString(R.string.Split)
|
||||||
)
|
)*/
|
||||||
|
|
||||||
|
|
||||||
}.setOkButtonAdd(getString(R.string.Agregar)) {
|
.setOkButtonAdd(getString(R.string.Agregar)) {
|
||||||
checkAndCall(
|
/* checkAndCall(
|
||||||
position,
|
position,
|
||||||
customDialogThreeButtons.getValue(),
|
customDialogThreeButtons.getValue(),
|
||||||
getString(R.string.Agregar)
|
getString(R.string.Agregar)
|
||||||
)
|
)*/
|
||||||
|
increaseQuantity(position, customDialogThreeButtons.getValue().toInt())
|
||||||
|
scanRequest()
|
||||||
|
customDialogThreeButtons.dismiss()
|
||||||
|
|
||||||
}.setKoButton(getString(R.string.cancel)) {
|
}.setKoButton(getString(R.string.cancel)) {
|
||||||
scanRequest()
|
scanRequest()
|
||||||
customDialogThreeButtons.dismiss()
|
customDialogThreeButtons.dismiss()
|
||||||
}.show()
|
}.show()
|
||||||
|
customDialogThreeButtons.setFocusDialogValue()
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private fun checkAndCall(position: Int, value: String, action: String) {
|
/* private fun checkAndCall(position: Int, value: String, action: String) {
|
||||||
if (value.trim().isNullOrEmpty()) {
|
if (value.trim().isNullOrEmpty()) {
|
||||||
getString(R.string.Indicanuevacantidad).toast(requireContext())
|
getString(R.string.Indicanuevacantidad).toast(requireContext())
|
||||||
} else {
|
} else {
|
||||||
|
|
@ -2249,9 +2250,9 @@ class CollectionFragment(
|
||||||
scanRequest()
|
scanRequest()
|
||||||
customDialogThreeButtons.dismiss()
|
customDialogThreeButtons.dismiss()
|
||||||
}
|
}
|
||||||
}
|
}*/
|
||||||
|
|
||||||
private fun split(position: Int, quantity: Int) {
|
/* private fun split(position: Int, quantity: Int) {
|
||||||
|
|
||||||
//sergio: SPLIT SALIX
|
//sergio: SPLIT SALIX
|
||||||
|
|
||||||
|
|
@ -2271,9 +2272,9 @@ class CollectionFragment(
|
||||||
quantity = totalQuantity.toString()
|
quantity = totalQuantity.toString()
|
||||||
)
|
)
|
||||||
|
|
||||||
}
|
}*/
|
||||||
|
|
||||||
private fun TrashMissingReject(
|
/* private fun TrashMissingReject(
|
||||||
position: Int,
|
position: Int,
|
||||||
quantity: Int,
|
quantity: Int,
|
||||||
typeCollectionTrashMissingReject: String
|
typeCollectionTrashMissingReject: String
|
||||||
|
|
@ -2296,7 +2297,7 @@ class CollectionFragment(
|
||||||
originalQuantity = quantity
|
originalQuantity = quantity
|
||||||
)
|
)
|
||||||
|
|
||||||
}
|
}*/
|
||||||
|
|
||||||
|
|
||||||
private fun missingTrashSuccesful() {
|
private fun missingTrashSuccesful() {
|
||||||
|
|
@ -2508,6 +2509,7 @@ class CollectionFragment(
|
||||||
}
|
}
|
||||||
|
|
||||||
customDialogList.setTitle(getString(R.string.errorCause))
|
customDialogList.setTitle(getString(R.string.errorCause))
|
||||||
|
customDialogList.hideTextInput()
|
||||||
.setKoButton(getString(R.string.cancel)) {
|
.setKoButton(getString(R.string.cancel)) {
|
||||||
scanRequest()
|
scanRequest()
|
||||||
hideKeyboards()
|
hideKeyboards()
|
||||||
|
|
|
||||||
|
|
@ -106,9 +106,9 @@ class CollectionViewModel(val context: Context) : BaseViewModel(context) {
|
||||||
get() = _responseCollectionUnchecked
|
get() = _responseCollectionUnchecked
|
||||||
|
|
||||||
|
|
||||||
private val _responseMissingTrash by lazy { MutableLiveData<ResponseItemVO>() }
|
/* private val _responseMissingTrash by lazy { MutableLiveData<ResponseItemVO>() }
|
||||||
val responseMissingTrash: LiveData<ResponseItemVO>
|
val responseMissingTrash: LiveData<ResponseItemVO>
|
||||||
get() = _responseMissingTrash
|
get() = _responseMissingTrash*/
|
||||||
|
|
||||||
private val _responseSplit by lazy { MutableLiveData<ResponseItemVO>() }
|
private val _responseSplit by lazy { MutableLiveData<ResponseItemVO>() }
|
||||||
val responseSplit: LiveData<ResponseItemVO>
|
val responseSplit: LiveData<ResponseItemVO>
|
||||||
|
|
@ -564,7 +564,7 @@ class CollectionViewModel(val context: Context) : BaseViewModel(context) {
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
fun collectionMissingTrash(
|
/* fun collectionMissingTrash(
|
||||||
saleFk: Int,
|
saleFk: Int,
|
||||||
quantity: String,
|
quantity: String,
|
||||||
type: String,
|
type: String,
|
||||||
|
|
@ -590,7 +590,7 @@ class CollectionViewModel(val context: Context) : BaseViewModel(context) {
|
||||||
ResponseItemVO(isError = false, response = response.message())
|
ResponseItemVO(isError = false, response = response.message())
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
}
|
}*/
|
||||||
|
|
||||||
|
|
||||||
fun saleTrackingDel(saleFk: Int) {
|
fun saleTrackingDel(saleFk: Int) {
|
||||||
|
|
|
||||||
|
|
@ -32,7 +32,7 @@ class ItemShelvingLogAdapter (
|
||||||
holder.binding.root.setOnClickListener {
|
holder.binding.root.setOnClickListener {
|
||||||
onPasillerosItemClickListener.onPasillerosItemClickListener(
|
onPasillerosItemClickListener.onPasillerosItemClickListener(
|
||||||
PasillerosItemVO(title = holder.binding.root.context.getString(
|
PasillerosItemVO(title = holder.binding.root.context.getString(
|
||||||
R.string.titleUbicator)),items[position].code)
|
R.string.titleUbicator)),items[position].shelvingFk)
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,13 +1,13 @@
|
||||||
package es.verdnatura.presentation.view.feature.historicoshelving.fragment
|
package es.verdnatura.presentation.view.feature.historicoshelving.fragment
|
||||||
|
|
||||||
import android.content.Context
|
import android.content.Context
|
||||||
|
import android.util.Log
|
||||||
import android.view.View
|
import android.view.View
|
||||||
import android.view.inputmethod.EditorInfo
|
import android.view.inputmethod.EditorInfo
|
||||||
import androidx.lifecycle.Observer
|
import androidx.lifecycle.Observer
|
||||||
import androidx.recyclerview.widget.LinearLayoutManager
|
import androidx.recyclerview.widget.LinearLayoutManager
|
||||||
import es.verdnatura.R
|
import es.verdnatura.R
|
||||||
import es.verdnatura.databinding.FragmentItemshelvinglogBinding
|
import es.verdnatura.databinding.FragmentItemshelvinglogBinding
|
||||||
import es.verdnatura.domain.notNull
|
|
||||||
import es.verdnatura.presentation.base.BaseFragment
|
import es.verdnatura.presentation.base.BaseFragment
|
||||||
import es.verdnatura.presentation.common.OnPasillerosItemClickListener
|
import es.verdnatura.presentation.common.OnPasillerosItemClickListener
|
||||||
import es.verdnatura.presentation.view.component.CustomDialog
|
import es.verdnatura.presentation.view.component.CustomDialog
|
||||||
|
|
@ -75,6 +75,10 @@ class itemShelvingLogFragment(
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public override fun onResume() {
|
||||||
|
Log.d("VERDNATURA::","has vuelto")
|
||||||
|
super.onResume()
|
||||||
|
}
|
||||||
|
|
||||||
private fun itemShelvingLog_get(vShelvingFK: String) {
|
private fun itemShelvingLog_get(vShelvingFK: String) {
|
||||||
binding.splashProgress.visibility = View.VISIBLE
|
binding.splashProgress.visibility = View.VISIBLE
|
||||||
|
|
@ -84,7 +88,7 @@ class itemShelvingLogFragment(
|
||||||
override fun observeViewModel() {
|
override fun observeViewModel() {
|
||||||
with(viewModel) {
|
with(viewModel) {
|
||||||
|
|
||||||
loadItemShelvingLogList.observe(viewLifecycleOwner, Observer { event ->
|
/* loadItemShelvingLogList.observe(viewLifecycleOwner, Observer { event ->
|
||||||
event.getContentIfNotHandled().notNull {
|
event.getContentIfNotHandled().notNull {
|
||||||
binding.splashProgress.visibility = View.GONE
|
binding.splashProgress.visibility = View.GONE
|
||||||
adapter = ItemShelvingLogAdapter(
|
adapter = ItemShelvingLogAdapter(
|
||||||
|
|
@ -114,9 +118,38 @@ class itemShelvingLogFragment(
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
})*/
|
||||||
|
|
||||||
|
itemShelvingLogList.observe(viewLifecycleOwner, Observer {
|
||||||
|
binding.splashProgress.visibility = View.GONE
|
||||||
|
adapter = ItemShelvingLogAdapter(
|
||||||
|
it.list,
|
||||||
|
onPasillerosItemClickListener = pasillerosItemClickListener!!
|
||||||
|
)
|
||||||
|
binding.itemshelvinglogRecyclerview.adapter = adapter
|
||||||
|
binding.itemshelvinglogRecyclerview.layoutManager =
|
||||||
|
LinearLayoutManager(requireContext(), LinearLayoutManager.VERTICAL, false)
|
||||||
|
setToolBar(getString(R.string.itemShelvingLog) + ":" + itemScan)
|
||||||
|
|
||||||
|
if (it.list.isEmpty()) {
|
||||||
|
customDialog.setTitle(getString(R.string.noResults))
|
||||||
|
.setDescription(getString(R.string.noDataLabelScanned))
|
||||||
|
.setOkButton(getString(R.string.close)) {
|
||||||
|
customDialog.dismiss()
|
||||||
|
}.show()
|
||||||
|
} else {
|
||||||
|
|
||||||
|
if (it.list.get(0).isError) {
|
||||||
|
customDialog.setTitle(getString(R.string.error))
|
||||||
|
.setDescription(it.list.get(0).errorMessage)
|
||||||
|
.setOkButton(getString(R.string.close)) {
|
||||||
|
customDialog.dismiss()
|
||||||
|
}.show()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
})
|
})
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -2,6 +2,7 @@ package es.verdnatura.presentation.view.feature.historicoshelving.fragment
|
||||||
|
|
||||||
|
|
||||||
import android.content.Context
|
import android.content.Context
|
||||||
|
import androidx.lifecycle.LiveData
|
||||||
import androidx.lifecycle.MutableLiveData
|
import androidx.lifecycle.MutableLiveData
|
||||||
import androidx.lifecycle.Transformations
|
import androidx.lifecycle.Transformations
|
||||||
import es.verdnatura.domain.SilexCallback
|
import es.verdnatura.domain.SilexCallback
|
||||||
|
|
@ -16,6 +17,8 @@ import retrofit2.Response
|
||||||
class itemShelvingLogViewModel(val context: Context) : BaseViewModel(context) {
|
class itemShelvingLogViewModel(val context: Context) : BaseViewModel(context) {
|
||||||
|
|
||||||
private val _itemShelvingLogList by lazy { MutableLiveData<ItemShelvingLogList>() }
|
private val _itemShelvingLogList by lazy { MutableLiveData<ItemShelvingLogList>() }
|
||||||
|
val itemShelvingLogList: LiveData<ItemShelvingLogList>
|
||||||
|
get() = _itemShelvingLogList
|
||||||
|
|
||||||
|
|
||||||
val loadItemShelvingLogList = Transformations.map(_itemShelvingLogList) { Event(it) }
|
val loadItemShelvingLogList = Transformations.map(_itemShelvingLogList) { Event(it) }
|
||||||
|
|
|
||||||
|
|
@ -4,6 +4,7 @@ import android.annotation.SuppressLint
|
||||||
import android.content.Context
|
import android.content.Context
|
||||||
import android.graphics.drawable.Drawable
|
import android.graphics.drawable.Drawable
|
||||||
import android.os.Build
|
import android.os.Build
|
||||||
|
import android.util.Log
|
||||||
import android.view.View
|
import android.view.View
|
||||||
import android.widget.ImageView
|
import android.widget.ImageView
|
||||||
import androidx.lifecycle.Observer
|
import androidx.lifecycle.Observer
|
||||||
|
|
@ -69,7 +70,7 @@ class InventaryFragment :
|
||||||
buyerId = getData(BUYERID)
|
buyerId = getData(BUYERID)
|
||||||
if (!buyerId.isBlank()) {
|
if (!buyerId.isBlank()) {
|
||||||
binding.splashProgress.visibility = View.VISIBLE
|
binding.splashProgress.visibility = View.VISIBLE
|
||||||
viewModel.getInventory( buyerId.toInt(), getDataInt(WAREHOUSEFK))
|
viewModel.getInventory(buyerId.toInt(), getDataInt(WAREHOUSEFK))
|
||||||
}
|
}
|
||||||
binding.filterBuyer.setOnClickListener {
|
binding.filterBuyer.setOnClickListener {
|
||||||
//SimpleSearchDialogCompat(context,getString(R.string.compradores),getString(R.string.escribirparteNombre),null,initData(),
|
//SimpleSearchDialogCompat(context,getString(R.string.compradores),getString(R.string.escribirparteNombre),null,initData(),
|
||||||
|
|
@ -265,9 +266,12 @@ class InventaryFragment :
|
||||||
|
|
||||||
@SuppressLint("NotifyDataSetChanged")
|
@SuppressLint("NotifyDataSetChanged")
|
||||||
private fun changeOfflineValue(item: ItemInventaryVO) {
|
private fun changeOfflineValue(item: ItemInventaryVO) {
|
||||||
|
try {
|
||||||
listInvetory.removeAt(listInvetory.indexOf(item))
|
listInvetory.removeAt(listInvetory.indexOf(item))
|
||||||
listInvetoryAux.removeAt(listInvetoryAux.indexOf(item))
|
listInvetoryAux.removeAt(listInvetoryAux.indexOf(item))
|
||||||
//listInvetory.filter { it.itemFk.contains("996") }
|
} catch (excep: Exception) {
|
||||||
|
Log.d("VERDNATURA::", "Para evitar cierres inesperados.")
|
||||||
|
}
|
||||||
adapter?.notifyDataSetChanged()
|
adapter?.notifyDataSetChanged()
|
||||||
//reload = true
|
//reload = true
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -290,7 +290,7 @@ class EndSacadorFragment(
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
|
|
||||||
responseMissingTrash.observe(viewLifecycleOwner, Observer {
|
/* responseMissingTrash.observe(viewLifecycleOwner, Observer {
|
||||||
|
|
||||||
if (it.isError) {
|
if (it.isError) {
|
||||||
ma.messageWithSound(it.errorMessage, isError = true, true)
|
ma.messageWithSound(it.errorMessage, isError = true, true)
|
||||||
|
|
@ -299,7 +299,7 @@ class EndSacadorFragment(
|
||||||
missingTrashSuccesful()
|
missingTrashSuccesful()
|
||||||
setTotalLines()
|
setTotalLines()
|
||||||
}
|
}
|
||||||
})
|
})*/
|
||||||
|
|
||||||
responseSaleGroupAdd.observe(viewLifecycleOwner, Observer {
|
responseSaleGroupAdd.observe(viewLifecycleOwner, Observer {
|
||||||
binding.splashProgress.visibility = GONE
|
binding.splashProgress.visibility = GONE
|
||||||
|
|
@ -1158,7 +1158,7 @@ class EndSacadorFragment(
|
||||||
try {
|
try {
|
||||||
customDialogThreeButtons.setDescription(getString(R.string.txtnuevacantidad))
|
customDialogThreeButtons.setDescription(getString(R.string.txtnuevacantidad))
|
||||||
.setValue("")
|
.setValue("")
|
||||||
.setOkButton(getString(R.string.titleFaults)) {
|
/* .setOkButton(getString(R.string.titleFaults)) {
|
||||||
checkAndCall(
|
checkAndCall(
|
||||||
position,
|
position,
|
||||||
customDialogThreeButtons.getValue().toInt(),
|
customDialogThreeButtons.getValue().toInt(),
|
||||||
|
|
@ -1187,39 +1187,43 @@ class EndSacadorFragment(
|
||||||
getString(R.string.Split)
|
getString(R.string.Split)
|
||||||
)
|
)
|
||||||
|
|
||||||
|
*/
|
||||||
|
.setOkButtonAdd(getString(R.string.Agregar)) {
|
||||||
|
increaseQuantity(position, customDialogThreeButtons.getValue().toInt())
|
||||||
|
scanRequest()
|
||||||
|
customDialogThreeButtons.dismiss()
|
||||||
|
|
||||||
}.setOkButtonAdd(getString(R.string.Agregar)) {
|
/* checkAndCall(
|
||||||
checkAndCall(
|
|
||||||
position,
|
position,
|
||||||
customDialogThreeButtons.getValue().toInt(),
|
customDialogThreeButtons.getValue().toInt(),
|
||||||
getString(R.string.Agregar)
|
getString(R.string.Agregar)
|
||||||
)
|
)*/
|
||||||
|
|
||||||
}.setKoButton(getString(R.string.cancel)) {
|
}.setKoButton(getString(R.string.cancel)) {
|
||||||
scanRequest()
|
scanRequest()
|
||||||
customDialogThreeButtons.dismiss()
|
customDialogThreeButtons.dismiss()
|
||||||
}.show()
|
}.show()
|
||||||
|
customDialogThreeButtons.setFocusDialogValue()
|
||||||
}catch (ex:Exception){
|
}catch (ex:Exception){
|
||||||
getString(R.string.errorQuantity).toast(context)
|
getString(R.string.errorQuantity).toast(context)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private fun checkAndCall(position: Int, value: Int, action: String) {
|
/*private fun checkAndCall(position: Int, value: Int, action: String) {
|
||||||
|
|
||||||
when (action) {
|
when (action) {
|
||||||
getString(R.string.Agregar) -> increaseQuantity(position, value)
|
getString(R.string.Agregar) -> increaseQuantity(position, value)
|
||||||
getString(R.string.BasuraRechazar) -> TrashMissingReject(position, value, "TRUE")
|
*//* getString(R.string.BasuraRechazar) -> TrashMissingReject(position, value, "TRUE")
|
||||||
getString(R.string.titleFaults) -> TrashMissingReject(position, value, "FALSE")
|
getString(R.string.titleFaults) -> TrashMissingReject(position, value, "FALSE")
|
||||||
getString(R.string.Reject) -> TrashMissingReject(position, value, "reject")
|
getString(R.string.Reject) -> TrashMissingReject(position, value, "reject")
|
||||||
getString(R.string.Split) -> split(position, value)
|
getString(R.string.Split) -> split(position, value)*//*
|
||||||
|
|
||||||
}
|
}
|
||||||
scanRequest()
|
scanRequest()
|
||||||
customDialogThreeButtons.dismiss()
|
customDialogThreeButtons.dismiss()
|
||||||
}
|
}*/
|
||||||
|
|
||||||
private fun TrashMissingReject(
|
/* private fun TrashMissingReject(
|
||||||
position: Int,
|
position: Int,
|
||||||
quantity: Int,
|
quantity: Int,
|
||||||
typeCollectionTrashMissingReject: String
|
typeCollectionTrashMissingReject: String
|
||||||
|
|
@ -1264,7 +1268,7 @@ class EndSacadorFragment(
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
||||||
}
|
}*/
|
||||||
|
|
||||||
|
|
||||||
private fun increaseQuantity(position: Int, quantity: Int) {
|
private fun increaseQuantity(position: Int, quantity: Int) {
|
||||||
|
|
|
||||||
|
|
@ -71,9 +71,9 @@ class PreSacadorViewModel(val context: Context) : BaseViewModel(context) {
|
||||||
val responseSalixMessage: LiveData<ResponseItemVO>
|
val responseSalixMessage: LiveData<ResponseItemVO>
|
||||||
get() = _responseSalixMessage
|
get() = _responseSalixMessage
|
||||||
|
|
||||||
private val _responseMissingTrash by lazy { MutableLiveData<ResponseItemVO>() }
|
/* private val _responseMissingTrash by lazy { MutableLiveData<ResponseItemVO>() }
|
||||||
val responseMissingTrash: LiveData<ResponseItemVO>
|
val responseMissingTrash: LiveData<ResponseItemVO>
|
||||||
get() = _responseMissingTrash
|
get() = _responseMissingTrash*/
|
||||||
|
|
||||||
private val _responseItemShelvingUpdate by lazy { MutableLiveData<ResponseItemVO>() }
|
private val _responseItemShelvingUpdate by lazy { MutableLiveData<ResponseItemVO>() }
|
||||||
val responseItemShelvingUpdate: LiveData<ResponseItemVO>
|
val responseItemShelvingUpdate: LiveData<ResponseItemVO>
|
||||||
|
|
@ -340,7 +340,7 @@ class PreSacadorViewModel(val context: Context) : BaseViewModel(context) {
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
fun collectionMissingTrash(
|
/* fun collectionMissingTrash(
|
||||||
saleFk: Int,
|
saleFk: Int,
|
||||||
quantity: String,
|
quantity: String,
|
||||||
type: String,
|
type: String,
|
||||||
|
|
@ -366,7 +366,7 @@ class PreSacadorViewModel(val context: Context) : BaseViewModel(context) {
|
||||||
ResponseItemVO(isError = false, response = response.message())
|
ResponseItemVO(isError = false, response = response.message())
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
}
|
}*/
|
||||||
|
|
||||||
fun collectionIncreaseQuantity(
|
fun collectionIncreaseQuantity(
|
||||||
saleFk: Int,
|
saleFk: Int,
|
||||||
|
|
|
||||||
|
|
@ -170,6 +170,8 @@ class ReubicationCollectionFragment(
|
||||||
getString(R.string.scanPlateToLeave) + itemReubication.itemFk + "-" + itemReubication.longName
|
getString(R.string.scanPlateToLeave) + itemReubication.itemFk + "-" + itemReubication.longName
|
||||||
|
|
||||||
customDialogInputTwoValues.setEnableValue(false)
|
customDialogInputTwoValues.setEnableValue(false)
|
||||||
|
customDialogInputTwoValues.setInfoTex(getString(R.string.quantity))
|
||||||
|
customDialogInputTwoValues.setInfoTextTwo(getString(R.string.shelving))
|
||||||
|
|
||||||
customDialogInputTwoValues.setDescription(messageDescrip)
|
customDialogInputTwoValues.setDescription(messageDescrip)
|
||||||
.setValue(itemReubication.quantity)
|
.setValue(itemReubication.quantity)
|
||||||
|
|
|
||||||
|
|
@ -202,7 +202,7 @@
|
||||||
<string name="noprinter">Sin impresora</string>
|
<string name="noprinter">Sin impresora</string>
|
||||||
<string name="dateFormat">yyyy-MM-dd</string>
|
<string name="dateFormat">yyyy-MM-dd</string>
|
||||||
<string name="cancel">Cancelar</string>
|
<string name="cancel">Cancelar</string>
|
||||||
<string name="errorCause">Causa de error para :</string>
|
<string name="errorCause">Causa del error :</string>
|
||||||
<string name="scanShelving">Escanea una matrícula</string>
|
<string name="scanShelving">Escanea una matrícula</string>
|
||||||
<string name="parkingShelving">Aparcar carro</string>
|
<string name="parkingShelving">Aparcar carro</string>
|
||||||
<string name="parking">Parking</string>
|
<string name="parking">Parking</string>
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1,10 @@
|
||||||
|
/**
|
||||||
|
* Automatically generated file. DO NOT MODIFY
|
||||||
|
*/
|
||||||
|
package com.example.mylibrary;
|
||||||
|
|
||||||
|
public final class BuildConfig {
|
||||||
|
public static final boolean DEBUG = Boolean.parseBoolean("true");
|
||||||
|
public static final String LIBRARY_PACKAGE_NAME = "com.example.mylibrary";
|
||||||
|
public static final String BUILD_TYPE = "debug";
|
||||||
|
}
|
||||||
|
|
@ -0,0 +1,10 @@
|
||||||
|
/**
|
||||||
|
* Automatically generated file. DO NOT MODIFY
|
||||||
|
*/
|
||||||
|
package com.example.mylibrary;
|
||||||
|
|
||||||
|
public final class BuildConfig {
|
||||||
|
public static final boolean DEBUG = false;
|
||||||
|
public static final String LIBRARY_PACKAGE_NAME = "com.example.mylibrary";
|
||||||
|
public static final String BUILD_TYPE = "release";
|
||||||
|
}
|
||||||
|
|
@ -0,0 +1,9 @@
|
||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
|
package="com.example.mylibrary" >
|
||||||
|
|
||||||
|
<uses-sdk
|
||||||
|
android:minSdkVersion="21"
|
||||||
|
android:targetSdkVersion="32" />
|
||||||
|
|
||||||
|
</manifest>
|
||||||
|
|
@ -0,0 +1,18 @@
|
||||||
|
{
|
||||||
|
"version": 3,
|
||||||
|
"artifactType": {
|
||||||
|
"type": "AAPT_FRIENDLY_MERGED_MANIFESTS",
|
||||||
|
"kind": "Directory"
|
||||||
|
},
|
||||||
|
"applicationId": "com.example.mylibrary",
|
||||||
|
"variantName": "debug",
|
||||||
|
"elements": [
|
||||||
|
{
|
||||||
|
"type": "SINGLE",
|
||||||
|
"filters": [],
|
||||||
|
"attributes": [],
|
||||||
|
"outputFile": "AndroidManifest.xml"
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"elementType": "File"
|
||||||
|
}
|
||||||
|
|
@ -0,0 +1,9 @@
|
||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
|
package="com.example.mylibrary" >
|
||||||
|
|
||||||
|
<uses-sdk
|
||||||
|
android:minSdkVersion="21"
|
||||||
|
android:targetSdkVersion="32" />
|
||||||
|
|
||||||
|
</manifest>
|
||||||
|
|
@ -0,0 +1,18 @@
|
||||||
|
{
|
||||||
|
"version": 3,
|
||||||
|
"artifactType": {
|
||||||
|
"type": "AAPT_FRIENDLY_MERGED_MANIFESTS",
|
||||||
|
"kind": "Directory"
|
||||||
|
},
|
||||||
|
"applicationId": "com.example.mylibrary",
|
||||||
|
"variantName": "release",
|
||||||
|
"elements": [
|
||||||
|
{
|
||||||
|
"type": "SINGLE",
|
||||||
|
"filters": [],
|
||||||
|
"attributes": [],
|
||||||
|
"outputFile": "AndroidManifest.xml"
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"elementType": "File"
|
||||||
|
}
|
||||||
|
|
@ -0,0 +1,3 @@
|
||||||
|
aarFormatVersion=1.0
|
||||||
|
aarMetadataVersion=1.0
|
||||||
|
minCompileSdk=1
|
||||||
|
|
@ -0,0 +1,3 @@
|
||||||
|
aarFormatVersion=1.0
|
||||||
|
aarMetadataVersion=1.0
|
||||||
|
minCompileSdk=1
|
||||||
|
|
@ -0,0 +1 @@
|
||||||
|
{}
|
||||||
|
|
@ -0,0 +1 @@
|
||||||
|
{}
|
||||||
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
Binary file not shown.
|
|
@ -0,0 +1,2 @@
|
||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="C:\Users\sergiodt\AndroidStudioProjects\vn-warehouseManager\mylibrary\src\main\jniLibs"/></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="C:\Users\sergiodt\AndroidStudioProjects\vn-warehouseManager\mylibrary\src\debug\jniLibs"/></dataSet></merger>
|
||||||
|
|
@ -0,0 +1,2 @@
|
||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="C:\Users\sergiodt\AndroidStudioProjects\vn-warehouseManager\mylibrary\src\main\shaders"/></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="C:\Users\sergiodt\AndroidStudioProjects\vn-warehouseManager\mylibrary\src\debug\shaders"/></dataSet></merger>
|
||||||
|
|
@ -0,0 +1,2 @@
|
||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="C:\Users\sergiodt\AndroidStudioProjects\vn-warehouseManager\mylibrary\src\main\jniLibs"/></dataSet><dataSet config="release" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="C:\Users\sergiodt\AndroidStudioProjects\vn-warehouseManager\mylibrary\src\release\jniLibs"/></dataSet></merger>
|
||||||
|
|
@ -0,0 +1,2 @@
|
||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="C:\Users\sergiodt\AndroidStudioProjects\vn-warehouseManager\mylibrary\src\main\shaders"/></dataSet><dataSet config="release" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="C:\Users\sergiodt\AndroidStudioProjects\vn-warehouseManager\mylibrary\src\release\shaders"/></dataSet></merger>
|
||||||
|
|
@ -0,0 +1,2 @@
|
||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="C:\Users\sergiodt\AndroidStudioProjects\vn-warehouseManager\mylibrary\src\main\assets"/><source path="C:\Users\sergiodt\AndroidStudioProjects\vn-warehouseManager\mylibrary\build\intermediates\shader_assets\debug\out"/></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="C:\Users\sergiodt\AndroidStudioProjects\vn-warehouseManager\mylibrary\src\debug\assets"/></dataSet></merger>
|
||||||
|
|
@ -0,0 +1 @@
|
||||||
|
#Mon Jan 09 16:53:11 CET 2023
|
||||||
|
|
@ -0,0 +1,2 @@
|
||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<merger version="3"><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="main$Generated" generated="true" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="C:\Users\sergiodt\AndroidStudioProjects\vn-warehouseManager\mylibrary\src\main\res"/><source path="C:\Users\sergiodt\AndroidStudioProjects\vn-warehouseManager\mylibrary\build\generated\res\rs\debug"/><source path="C:\Users\sergiodt\AndroidStudioProjects\vn-warehouseManager\mylibrary\build\generated\res\resValues\debug"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="main" generated-set="main$Generated" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="C:\Users\sergiodt\AndroidStudioProjects\vn-warehouseManager\mylibrary\src\main\res"/><source path="C:\Users\sergiodt\AndroidStudioProjects\vn-warehouseManager\mylibrary\build\generated\res\rs\debug"/><source path="C:\Users\sergiodt\AndroidStudioProjects\vn-warehouseManager\mylibrary\build\generated\res\resValues\debug"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="debug$Generated" generated="true" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="C:\Users\sergiodt\AndroidStudioProjects\vn-warehouseManager\mylibrary\src\debug\res"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="debug" generated-set="debug$Generated" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="C:\Users\sergiodt\AndroidStudioProjects\vn-warehouseManager\mylibrary\src\debug\res"/></dataSet><mergedItems/></merger>
|
||||||
|
|
@ -0,0 +1,2 @@
|
||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="C:\Users\sergiodt\AndroidStudioProjects\vn-warehouseManager\mylibrary\src\main\assets"/><source path="C:\Users\sergiodt\AndroidStudioProjects\vn-warehouseManager\mylibrary\build\intermediates\shader_assets\release\out"/></dataSet><dataSet config="release" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="C:\Users\sergiodt\AndroidStudioProjects\vn-warehouseManager\mylibrary\src\release\assets"/></dataSet></merger>
|
||||||
|
|
@ -0,0 +1 @@
|
||||||
|
#Mon Jan 09 17:06:25 CET 2023
|
||||||
|
|
@ -0,0 +1,2 @@
|
||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<merger version="3"><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="main$Generated" generated="true" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="C:\Users\sergiodt\AndroidStudioProjects\vn-warehouseManager\mylibrary\src\main\res"/><source path="C:\Users\sergiodt\AndroidStudioProjects\vn-warehouseManager\mylibrary\build\generated\res\rs\release"/><source path="C:\Users\sergiodt\AndroidStudioProjects\vn-warehouseManager\mylibrary\build\generated\res\resValues\release"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="main" generated-set="main$Generated" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="C:\Users\sergiodt\AndroidStudioProjects\vn-warehouseManager\mylibrary\src\main\res"/><source path="C:\Users\sergiodt\AndroidStudioProjects\vn-warehouseManager\mylibrary\build\generated\res\rs\release"/><source path="C:\Users\sergiodt\AndroidStudioProjects\vn-warehouseManager\mylibrary\build\generated\res\resValues\release"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="release$Generated" generated="true" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="C:\Users\sergiodt\AndroidStudioProjects\vn-warehouseManager\mylibrary\src\release\res"/></dataSet><dataSet aapt-namespace="http://schemas.android.com/apk/res-auto" config="release" generated-set="release$Generated" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="C:\Users\sergiodt\AndroidStudioProjects\vn-warehouseManager\mylibrary\src\release\res"/></dataSet><mergedItems/></merger>
|
||||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
|
|
@ -0,0 +1,2 @@
|
||||||
|
R_DEF: Internal format may change without notice
|
||||||
|
local
|
||||||
|
|
@ -0,0 +1,2 @@
|
||||||
|
R_DEF: Internal format may change without notice
|
||||||
|
local
|
||||||
|
|
@ -0,0 +1,11 @@
|
||||||
|
1<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
2<manifest xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
|
3 package="com.example.mylibrary" >
|
||||||
|
4
|
||||||
|
5 <uses-sdk
|
||||||
|
6 android:minSdkVersion="21"
|
||||||
|
6-->C:\Users\sergiodt\AndroidStudioProjects\vn-warehouseManager\mylibrary\src\main\AndroidManifest.xml
|
||||||
|
7 android:targetSdkVersion="32" />
|
||||||
|
7-->C:\Users\sergiodt\AndroidStudioProjects\vn-warehouseManager\mylibrary\src\main\AndroidManifest.xml
|
||||||
|
8
|
||||||
|
9</manifest>
|
||||||
|
|
@ -0,0 +1,11 @@
|
||||||
|
1<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
2<manifest xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
|
3 package="com.example.mylibrary" >
|
||||||
|
4
|
||||||
|
5 <uses-sdk
|
||||||
|
6 android:minSdkVersion="21"
|
||||||
|
6-->C:\Users\sergiodt\AndroidStudioProjects\vn-warehouseManager\mylibrary\src\main\AndroidManifest.xml
|
||||||
|
7 android:targetSdkVersion="32" />
|
||||||
|
7-->C:\Users\sergiodt\AndroidStudioProjects\vn-warehouseManager\mylibrary\src\main\AndroidManifest.xml
|
||||||
|
8
|
||||||
|
9</manifest>
|
||||||
|
|
@ -0,0 +1,9 @@
|
||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
|
package="com.example.mylibrary" >
|
||||||
|
|
||||||
|
<uses-sdk
|
||||||
|
android:minSdkVersion="21"
|
||||||
|
android:targetSdkVersion="32" />
|
||||||
|
|
||||||
|
</manifest>
|
||||||
|
|
@ -0,0 +1,9 @@
|
||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
|
package="com.example.mylibrary" >
|
||||||
|
|
||||||
|
<uses-sdk
|
||||||
|
android:minSdkVersion="21"
|
||||||
|
android:targetSdkVersion="32" />
|
||||||
|
|
||||||
|
</manifest>
|
||||||
|
|
@ -0,0 +1,18 @@
|
||||||
|
{
|
||||||
|
"version": 3,
|
||||||
|
"artifactType": {
|
||||||
|
"type": "PACKAGED_MANIFESTS",
|
||||||
|
"kind": "Directory"
|
||||||
|
},
|
||||||
|
"applicationId": "com.example.mylibrary",
|
||||||
|
"variantName": "debug",
|
||||||
|
"elements": [
|
||||||
|
{
|
||||||
|
"type": "SINGLE",
|
||||||
|
"filters": [],
|
||||||
|
"attributes": [],
|
||||||
|
"outputFile": "../../merged_manifest/debug/AndroidManifest.xml"
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"elementType": "File"
|
||||||
|
}
|
||||||
|
|
@ -0,0 +1,18 @@
|
||||||
|
{
|
||||||
|
"version": 3,
|
||||||
|
"artifactType": {
|
||||||
|
"type": "PACKAGED_MANIFESTS",
|
||||||
|
"kind": "Directory"
|
||||||
|
},
|
||||||
|
"applicationId": "com.example.mylibrary",
|
||||||
|
"variantName": "release",
|
||||||
|
"elements": [
|
||||||
|
{
|
||||||
|
"type": "SINGLE",
|
||||||
|
"filters": [],
|
||||||
|
"attributes": [],
|
||||||
|
"outputFile": "../../merged_manifest/release/AndroidManifest.xml"
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"elementType": "File"
|
||||||
|
}
|
||||||
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue