Version 23.2-Fallo item_card
This commit is contained in:
parent
b9cbc99dd1
commit
4e4dbaba15
|
|
@ -276,7 +276,7 @@
|
|||
</option>
|
||||
</component>
|
||||
<component name="ExternalStorageConfigurationManager" enabled="true" />
|
||||
<component name="ProjectRootManager" version="2" languageLevel="JDK_11" project-jdk-name="1.8" project-jdk-type="JavaSDK">
|
||||
<component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
|
||||
<output url="file://$PROJECT_DIR$/build/classes" />
|
||||
</component>
|
||||
<component name="ProjectType">
|
||||
|
|
|
|||
|
|
@ -83,204 +83,11 @@
|
|||
</select>
|
||||
</component>
|
||||
<component name="ChangeListManager">
|
||||
<list default="true" id="fa688d1c-dbee-4864-9e33-4d84ef9afca8" name="Default Changelist" comment="Version 23.2 Cambiado collection_assign a String.">
|
||||
<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" />
|
||||
<list default="true" id="fa688d1c-dbee-4864-9e33-4d84ef9afca8" name="Default Changelist" comment="Version 23.2-Fallos precontrol-Directo Ubicador desde histórico-Inventario no se cierra-Botón solo Agregar">
|
||||
<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$/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/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/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/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/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" />
|
||||
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/base/BaseFragment.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/base/BaseFragment.kt" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/articulo/fragment/ItemCardFragment.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/articulo/fragment/ItemCardFragment.kt" afterDir="false" />
|
||||
</list>
|
||||
<option name="SHOW_DIALOG" value="false" />
|
||||
<option name="HIGHLIGHT_CONFLICTS" value="true" />
|
||||
|
|
@ -420,26 +227,26 @@
|
|||
<option name="showLibraryContents" value="true" />
|
||||
<option name="showMembers" value="true" />
|
||||
</component>
|
||||
<component name="PropertiesComponent"><![CDATA[{
|
||||
"keyToString": {
|
||||
"ApkExportedModule": "Gestor_Almacén.app",
|
||||
"ExportApk.ApkPathForGestor_Almacén.app": "C:\\Users\\sergiodt\\AndroidStudioProjects\\vn-warehouseManager\\app",
|
||||
"RunOnceActivity.cidr.known.project.marker": "true",
|
||||
"cidr.known.project.marker": "true",
|
||||
"com.google.services.firebase.aqiPopupShown": "true",
|
||||
"last_opened_file_path": "C:/Users/sergiodt/proyectos/vn-picture/platforms/android",
|
||||
"project.structure.last.edited": "Modules",
|
||||
"project.structure.proportion": "0.17",
|
||||
"project.structure.side.proportion": "0.2",
|
||||
"run.code.analysis.last.selected.profile": "pProject Default",
|
||||
"settings.editor.selected.configurable": "reference.settingsdialog.project.gradle"
|
||||
<component name="PropertiesComponent">{
|
||||
"keyToString": {
|
||||
"ApkExportedModule": "Gestor_Almacén.app",
|
||||
"ExportApk.ApkPathForGestor_Almacén.app": "C:\\Users\\sergiodt\\AndroidStudioProjects\\vn-warehouseManager\\app",
|
||||
"RunOnceActivity.cidr.known.project.marker": "true",
|
||||
"cidr.known.project.marker": "true",
|
||||
"com.google.services.firebase.aqiPopupShown": "true",
|
||||
"last_opened_file_path": "C:/Users/sergiodt/proyectos/vn-picture/platforms/android",
|
||||
"project.structure.last.edited": "Modules",
|
||||
"project.structure.proportion": "0.17",
|
||||
"project.structure.side.proportion": "0.2",
|
||||
"run.code.analysis.last.selected.profile": "pProject Default",
|
||||
"settings.editor.selected.configurable": "reference.settingsdialog.project.gradle"
|
||||
},
|
||||
"keyToStringList": {
|
||||
"ExportApk.BuildVariants": [
|
||||
"release"
|
||||
"keyToStringList": {
|
||||
"ExportApk.BuildVariants": [
|
||||
"release"
|
||||
]
|
||||
}
|
||||
}]]></component>
|
||||
}</component>
|
||||
<component name="PsdUISettings">
|
||||
<option name="MODULE_TAB" value="Default Config" />
|
||||
<option name="LAST_EDITED_SIGNING_CONFIG" value="debug" />
|
||||
|
|
@ -1065,6 +872,46 @@
|
|||
<line>123</line>
|
||||
<option name="timeStamp" value="4" />
|
||||
</line-breakpoint>
|
||||
<line-breakpoint enabled="true" type="kotlin-line">
|
||||
<url>file://$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/articulo/fragment/ItemCardFragment.kt</url>
|
||||
<line>520</line>
|
||||
<option name="timeStamp" value="5" />
|
||||
</line-breakpoint>
|
||||
<line-breakpoint enabled="true" type="kotlin-line">
|
||||
<url>file://$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/articulo/fragment/ItemCardFragment.kt</url>
|
||||
<line>563</line>
|
||||
<option name="timeStamp" value="6" />
|
||||
</line-breakpoint>
|
||||
<line-breakpoint enabled="true" type="kotlin-line">
|
||||
<url>file://$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/articulo/fragment/ItemCardFragment.kt</url>
|
||||
<line>566</line>
|
||||
<option name="timeStamp" value="7" />
|
||||
</line-breakpoint>
|
||||
<line-breakpoint enabled="true" type="kotlin-line">
|
||||
<url>file://$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/articulo/fragment/ItemCardFragment.kt</url>
|
||||
<line>567</line>
|
||||
<option name="timeStamp" value="8" />
|
||||
</line-breakpoint>
|
||||
<line-breakpoint enabled="true" type="kotlin-line">
|
||||
<url>file://$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/articulo/fragment/ItemCardFragment.kt</url>
|
||||
<line>576</line>
|
||||
<option name="timeStamp" value="9" />
|
||||
</line-breakpoint>
|
||||
<line-breakpoint enabled="true" type="kotlin-line">
|
||||
<url>file://$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/articulo/fragment/ItemCardFragment.kt</url>
|
||||
<line>610</line>
|
||||
<option name="timeStamp" value="10" />
|
||||
</line-breakpoint>
|
||||
<line-breakpoint enabled="true" type="kotlin-line">
|
||||
<url>file://$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/articulo/fragment/ItemCardFragment.kt</url>
|
||||
<line>613</line>
|
||||
<option name="timeStamp" value="11" />
|
||||
</line-breakpoint>
|
||||
<line-breakpoint enabled="true" type="kotlin-line">
|
||||
<url>file://$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/articulo/fragment/ItemCardFragment.kt</url>
|
||||
<line>616</line>
|
||||
<option name="timeStamp" value="12" />
|
||||
</line-breakpoint>
|
||||
</breakpoints>
|
||||
</breakpoint-manager>
|
||||
<pin-to-top-manager>
|
||||
|
|
|
|||
|
|
@ -516,7 +516,6 @@ abstract class BaseFragment<T : ViewDataBinding, V : BaseViewModel>(viewModelCla
|
|||
PASSWORD -> prefs.getString(PASSWORD, "").toString()
|
||||
SECTORFK -> prefs.getInt(name, SECTORFKDEFAULT).toString()
|
||||
WAREHOUSEFK -> prefs.getInt(name, WAREHOUSEFKDEFAULT).toString()
|
||||
//VOZ->prefs.getString(name, "NO").toString()
|
||||
WAGON -> prefs.getInt(name, 2).toString()
|
||||
TAGSTYPE -> prefs.getString(name, getString(R.string.stickers)).toString()
|
||||
SECTORDESCRIP -> prefs.getString(name, getString(R.string.Sinsector)).toString()
|
||||
|
|
|
|||
|
|
@ -38,7 +38,7 @@ class ItemCardFragment(
|
|||
private var titleImage: String = ""
|
||||
private var user = ""
|
||||
private var password = ""
|
||||
private var warehouseFk:Int? = null
|
||||
private var warehouseFk: Int? = null
|
||||
private var adapter: ItemCardAdapter? = null
|
||||
private var barcodeAdapter: BarcodeAdapter? = null
|
||||
private var listItemsRow: ArrayList<ItemCardRowVO> = ArrayList()
|
||||
|
|
@ -62,7 +62,7 @@ class ItemCardFragment(
|
|||
@RequiresApi(Build.VERSION_CODES.O)
|
||||
override fun init() {
|
||||
|
||||
binding.itemcardLayout.visibility =GONE
|
||||
binding.itemcardLayout.visibility = GONE
|
||||
ma.hideBottomNavigation(GONE)
|
||||
|
||||
setEvents()
|
||||
|
|
@ -97,7 +97,7 @@ class ItemCardFragment(
|
|||
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
|
||||
iconReload.tooltipText = getTooltip(R.drawable.ic_autorenew_black_24dp)
|
||||
iconHistory.tooltipText = getTooltip(R.drawable.ic_history_black_24dp)
|
||||
iconSalix.tooltipText= getTooltip(R.drawable.ic_logo_salix)
|
||||
iconSalix.tooltipText = getTooltip(R.drawable.ic_logo_salix)
|
||||
}
|
||||
listIcons.add(iconSalix)
|
||||
listIcons.add(iconReload)
|
||||
|
|
@ -130,12 +130,19 @@ class ItemCardFragment(
|
|||
binding.splashProgress.visibility = View.VISIBLE
|
||||
//getItemCard(itemFk)
|
||||
|
||||
// ma.openFragmentWeb(itemInfoG!!.id)
|
||||
var itemId=itemInfoG!!.id
|
||||
var entryPoint = Gson().toJson(mutableMapOf("entryPoint" to itemId, "web" to "https://salix.verdnatura.es/#!/item/$itemId/summary"))
|
||||
// ma.openFragmentWeb(itemInfoG!!.id)
|
||||
var itemId = itemInfoG!!.id
|
||||
var entryPoint = Gson().toJson(
|
||||
mutableMapOf(
|
||||
"entryPoint" to itemId,
|
||||
"web" to "https://salix.verdnatura.es/#!/item/$itemId/summary"
|
||||
)
|
||||
)
|
||||
ma.onPasillerosItemClickListener(
|
||||
PasillerosItemVO(title = getString(R.string.titleWebViewer),
|
||||
), entryPoint = entryPoint)
|
||||
PasillerosItemVO(
|
||||
title = getString(R.string.titleWebViewer),
|
||||
), entryPoint = entryPoint
|
||||
)
|
||||
|
||||
}
|
||||
}
|
||||
|
|
@ -181,12 +188,7 @@ class ItemCardFragment(
|
|||
}
|
||||
|
||||
private fun getItemCard(itemFk: String) {
|
||||
|
||||
user = getData(USER)
|
||||
password = getData(PASSWORD)
|
||||
warehouseFk = getDataInt(WAREHOUSEFK)
|
||||
this.itemFk = itemFk
|
||||
|
||||
binding.splashProgressTwo.visibility = View.VISIBLE
|
||||
viewModel.getItemCard(itemFk, warehouseFk!!)
|
||||
//binding.splashProgress.visibility = View.VISIBLE
|
||||
|
|
@ -204,7 +206,7 @@ class ItemCardFragment(
|
|||
ma.messageWithSound(it.errorMessage, true, false)
|
||||
|
||||
} else {
|
||||
if (it.id!=0) {
|
||||
if (it.id != 0) {
|
||||
binding.itemcardLayout.visibility = View.VISIBLE
|
||||
setItemCard(it)
|
||||
binding.mainToolbar.toolbarIcons.visibility = View.VISIBLE
|
||||
|
|
@ -235,7 +237,7 @@ class ItemCardFragment(
|
|||
if (it.isError) {
|
||||
ma.messageWithSound(it.errorMessage, true, false)
|
||||
} else {
|
||||
getItemCard(itemFk)
|
||||
getItemCard(itemInfoG!!.id.toString())
|
||||
}
|
||||
|
||||
})
|
||||
|
|
@ -266,7 +268,7 @@ class ItemCardFragment(
|
|||
binding.itemcardTag2.text = itemInfo.value5
|
||||
binding.itemcardTag3.text = itemInfo.value6
|
||||
binding.itemcardTag4.text = itemInfo.value7 + " " + itemInfo.origin
|
||||
binding.itemcardBuyer.text =itemInfo.buyer
|
||||
binding.itemcardBuyer.text = itemInfo.buyer
|
||||
listItemsRow = ArrayList()
|
||||
|
||||
//sergio itemcard por item_getInfo
|
||||
|
|
@ -386,8 +388,8 @@ class ItemCardFragment(
|
|||
action = "updatePacking"
|
||||
)
|
||||
)
|
||||
//sergio: quitar de back cuando ya tengan la app actualizada todos
|
||||
listItemsRow.add(
|
||||
//sergio: quitar de back cuando ya tengan la app actualizada todos
|
||||
listItemsRow.add(
|
||||
ItemCardRowVO(
|
||||
title = getString(R.string.stems),
|
||||
value = itemInfo.stems,
|
||||
|
|
@ -413,14 +415,14 @@ class ItemCardFragment(
|
|||
)
|
||||
|
||||
//sergio para itemTypePacking
|
||||
/* listItemsRow.add(
|
||||
ItemCardRowVO(
|
||||
title = getString(R.string.tipodeencajado),
|
||||
value = itemInfo.itemPackingTypeFk,
|
||||
isEditable = true,
|
||||
action = "updateSector"
|
||||
)
|
||||
)*/
|
||||
/* listItemsRow.add(
|
||||
ItemCardRowVO(
|
||||
title = getString(R.string.tipodeencajado),
|
||||
value = itemInfo.itemPackingTypeFk,
|
||||
isEditable = true,
|
||||
action = "updateSector"
|
||||
)
|
||||
)*/
|
||||
// listItemsRow.add(ItemCardRowVO(title = "Artículos similares",value = itemInfo.itemPackingTypeFk,isEditable = true, action = "itemProposal"))
|
||||
|
||||
|
||||
|
|
@ -434,7 +436,7 @@ class ItemCardFragment(
|
|||
ma.onPasillerosItemClickListener(
|
||||
PasillerosItemVO(
|
||||
title = getString(R.string.titleSearchSimilarItems)
|
||||
), itemFk
|
||||
), itemInfoG!!.id.toString()
|
||||
)
|
||||
|
||||
} else {
|
||||
|
|
@ -443,7 +445,11 @@ class ItemCardFragment(
|
|||
} else {
|
||||
if (item.action != "toBarcode" && item.action != "buscarItem" && item.action != "itemStockUpdateAdd" && item.action != "itemStockUpdateRemove") {
|
||||
customDialogInput.setTitle(item.title!!)
|
||||
.setDescription(getString(R.string.currentVAlue) + if(item.value.isNullOrEmpty()) "" else{item.value})
|
||||
.setDescription(
|
||||
getString(R.string.currentVAlue) + if (item.value.isNullOrEmpty()) "" else {
|
||||
item.value
|
||||
}
|
||||
)
|
||||
.setOkButton(getString(R.string.save)) {
|
||||
ma.hideKeyboard(customDialogInput.getEditText())
|
||||
editItemCardRow(item, customDialogInput.getValue().toInt())
|
||||
|
|
@ -459,7 +465,10 @@ class ItemCardFragment(
|
|||
|
||||
if (actionId == EditorInfo.IME_ACTION_SEARCH || actionId == EditorInfo.IME_ACTION_DONE || actionId == 0) {
|
||||
if (!customDialogInput.getValue().isNullOrEmpty())
|
||||
editItemCardRow(item, customDialogInput.getValue().toInt())
|
||||
editItemCardRow(
|
||||
item,
|
||||
customDialogInput.getValue().toInt()
|
||||
)
|
||||
customDialogInput.setValue("")
|
||||
customDialogInput.dismiss()
|
||||
ma.hideKeyboard(customDialogInput.getEditText())
|
||||
|
|
@ -493,7 +502,10 @@ class ItemCardFragment(
|
|||
.setOnEditorActionListener { _, actionId, _ ->
|
||||
if (actionId == EditorInfo.IME_ACTION_SEARCH || actionId == EditorInfo.IME_ACTION_DONE || actionId == 0) {
|
||||
if (!customDialogInput.getValue().isNullOrEmpty())
|
||||
editItemCardRow(item, customDialogInput.getValue().toInt())
|
||||
editItemCardRow(
|
||||
item,
|
||||
customDialogInput.getValue().toInt()
|
||||
)
|
||||
customDialogInput.setValue("")
|
||||
customDialogInput.dismiss()
|
||||
ma.hideKeyboard(customDialogInput.getEditText())
|
||||
|
|
@ -518,7 +530,10 @@ class ItemCardFragment(
|
|||
.setOnEditorActionListener { _, actionId, _ ->
|
||||
if (actionId == EditorInfo.IME_ACTION_SEARCH || actionId == EditorInfo.IME_ACTION_DONE || actionId == 0) {
|
||||
if (!customDialogInput.getValue().isNullOrEmpty())
|
||||
editItemCardRow(item, customDialogInput.getValue().toInt())
|
||||
editItemCardRow(
|
||||
item,
|
||||
customDialogInput.getValue().toInt()
|
||||
)
|
||||
customDialogInput.setValue("")
|
||||
customDialogInput.dismiss()
|
||||
ma.hideKeyboard(customDialogInput.getEditText())
|
||||
|
|
@ -600,7 +615,7 @@ class ItemCardFragment(
|
|||
.setDescription(getString(R.string.deleteStock))
|
||||
.setOkButton(getString(R.string.fault)) {
|
||||
viewModel.itemTrash(
|
||||
itemFk = itemFk.toInt(),
|
||||
itemFk = itemInfoG!!.id,
|
||||
warehouseFk = warehouseFk!!,
|
||||
newValue = value,
|
||||
isTrash = false
|
||||
|
|
@ -612,7 +627,7 @@ class ItemCardFragment(
|
|||
|
||||
}.setOkButtonTwo(getString(R.string.trash)) {
|
||||
viewModel.itemTrash(
|
||||
itemFk = itemFk.toInt(),
|
||||
itemFk = itemInfoG!!.id,
|
||||
warehouseFk = warehouseFk!!,
|
||||
newValue = value,
|
||||
isTrash = true
|
||||
|
|
@ -630,7 +645,7 @@ class ItemCardFragment(
|
|||
//changeOfflineValue(itemB,value, listBarcodes)
|
||||
showProgress()
|
||||
viewModel.itemTrash(
|
||||
itemFk = itemFk.toInt(),
|
||||
itemFk = itemInfoG!!.id,
|
||||
warehouseFk = warehouseFk!!,
|
||||
newValue = (value * -1),
|
||||
isTrash = false
|
||||
|
|
@ -646,13 +661,14 @@ class ItemCardFragment(
|
|||
|
||||
private fun prepareBarcodeDialog(itemB: ItemCardRowVO) {
|
||||
|
||||
customDialogList.setTitle(getString(R.string.barcodes)).setOkButton(getString(R.string.save)) {
|
||||
ma.hideKeyboard(customDialogList.getEditText())
|
||||
if (!customDialogList.getValue().isEmpty())
|
||||
updateBarcode(customDialogList.getValue(), false)
|
||||
customDialogList.dismiss()
|
||||
customDialogList.setTitle(getString(R.string.barcodes))
|
||||
.setOkButton(getString(R.string.save)) {
|
||||
ma.hideKeyboard(customDialogList.getEditText())
|
||||
if (!customDialogList.getValue().isEmpty())
|
||||
updateBarcode(customDialogList.getValue(), false)
|
||||
customDialogList.dismiss()
|
||||
|
||||
}.setKoButton(getString(R.string.close)) {
|
||||
}.setKoButton(getString(R.string.close)) {
|
||||
ma.hideKeyboard(customDialogList.getEditText())
|
||||
customDialogList.dismiss()
|
||||
}.setValue("").show()
|
||||
|
|
@ -685,7 +701,7 @@ class ItemCardFragment(
|
|||
}
|
||||
|
||||
private fun updateBarcode(code: String, delete: Boolean) {
|
||||
d("VERDNATURA::","El bacode se va actualizar"+code+delete)
|
||||
d("VERDNATURA::", "El bacode se va actualizar" + code + delete)
|
||||
if (delete) {
|
||||
var i = 0
|
||||
var posDelete = 0
|
||||
|
|
@ -704,7 +720,8 @@ class ItemCardFragment(
|
|||
listBarcodes.add(BarcodeVO(code))
|
||||
viewModel.barcodesEditSalix(
|
||||
itemFk = itemInfoG!!.id,
|
||||
barCodeValue = code)
|
||||
barCodeValue = code
|
||||
)
|
||||
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue