Version 23.8Beta Modificado para app reparto
This commit is contained in:
parent
7b625e77cf
commit
6c354182b8
|
|
@ -1,928 +0,0 @@
|
||||||
<?xml version="1.0" encoding="UTF-8"?>
|
|
||||||
<project version="4">
|
|
||||||
<component name="AnalysisUIOptions">
|
|
||||||
<option name="SPLITTER_PROPORTION" value="0.5641026" />
|
|
||||||
<option name="GROUP_BY_SEVERITY" value="true" />
|
|
||||||
<option name="SCOPE_TYPE" value="8" />
|
|
||||||
<option name="CUSTOM_SCOPE_NAME" value="All Places" />
|
|
||||||
<option name="SHOW_STRUCTURE" value="true" />
|
|
||||||
</component>
|
|
||||||
<component name="AndroidConfiguredLogFilters">
|
|
||||||
<filters>
|
|
||||||
<filter>
|
|
||||||
<option name="logLevel" value="debug" />
|
|
||||||
<option name="logMessageIsRegex" value="false" />
|
|
||||||
<option name="logMessagePattern" value="" />
|
|
||||||
<option name="logTagIsRegex" value="false" />
|
|
||||||
<option name="logTagPattern" value="verdnatura::" />
|
|
||||||
<option name="name" value="VERDNATURA::" />
|
|
||||||
<option name="packageNameIsRegex" value="false" />
|
|
||||||
<option name="packageNamePattern" value="es.verdnatura" />
|
|
||||||
</filter>
|
|
||||||
<filter>
|
|
||||||
<option name="logLevel" value="verbose" />
|
|
||||||
<option name="logMessagePattern" value="" />
|
|
||||||
<option name="logTagPattern" value="" />
|
|
||||||
<option name="name" value="verdnatura" />
|
|
||||||
<option name="packageNamePattern" value="" />
|
|
||||||
</filter>
|
|
||||||
</filters>
|
|
||||||
</component>
|
|
||||||
<component name="AndroidGradleBuildConfiguration">
|
|
||||||
<option name="COMMAND_LINE_OPTIONS" value="--warning-mode all --stacktrace" />
|
|
||||||
</component>
|
|
||||||
<component name="AndroidLayouts">
|
|
||||||
<shared>
|
|
||||||
<config>
|
|
||||||
<device id="pixel_4" />
|
|
||||||
<device id="pixel_5" />
|
|
||||||
<device id="_device_class_phone" />
|
|
||||||
<locale>es</locale>
|
|
||||||
<option name="nonWearDeviceLastStateName" value="Portrait" />
|
|
||||||
<target>android-28</target>
|
|
||||||
</config>
|
|
||||||
</shared>
|
|
||||||
</component>
|
|
||||||
<component name="AndroidLogFilters">
|
|
||||||
<option name="TOOL_WINDOW_CUSTOM_FILTER" value="verdnatura::" />
|
|
||||||
<option name="TOOL_WINDOW_LOG_LEVEL" value="debug" />
|
|
||||||
<option name="TOOL_WINDOW_CONFIGURED_FILTER" value="verdnatura" />
|
|
||||||
<option name="TOOL_WINDOW_REGEXP_FILTER" value="false" />
|
|
||||||
</component>
|
|
||||||
<component name="AutoImportSettings">
|
|
||||||
<option name="autoReloadType" value="NONE" />
|
|
||||||
</component>
|
|
||||||
<component name="BranchesTreeState">
|
|
||||||
<expand>
|
|
||||||
<path>
|
|
||||||
<item name="ROOT" type="e8cecc67:BranchNodeDescriptor" />
|
|
||||||
<item name="LOCAL_ROOT" type="e8cecc67:BranchNodeDescriptor" />
|
|
||||||
</path>
|
|
||||||
<path>
|
|
||||||
<item name="ROOT" type="e8cecc67:BranchNodeDescriptor" />
|
|
||||||
<item name="REMOTE_ROOT" type="e8cecc67:BranchNodeDescriptor" />
|
|
||||||
</path>
|
|
||||||
<path>
|
|
||||||
<item name="ROOT" type="e8cecc67:BranchNodeDescriptor" />
|
|
||||||
<item name="REMOTE_ROOT" type="e8cecc67:BranchNodeDescriptor" />
|
|
||||||
<item name="GROUP_NODE:appverdnatura" type="e8cecc67:BranchNodeDescriptor" />
|
|
||||||
</path>
|
|
||||||
<path>
|
|
||||||
<item name="ROOT" type="e8cecc67:BranchNodeDescriptor" />
|
|
||||||
<item name="REMOTE_ROOT" type="e8cecc67:BranchNodeDescriptor" />
|
|
||||||
<item name="GROUP_NODE:origin" type="e8cecc67:BranchNodeDescriptor" />
|
|
||||||
</path>
|
|
||||||
</expand>
|
|
||||||
<select>
|
|
||||||
<path>
|
|
||||||
<item name="ROOT" type="e8cecc67:BranchNodeDescriptor" />
|
|
||||||
<item name="REMOTE_ROOT" type="e8cecc67:BranchNodeDescriptor" />
|
|
||||||
<item name="GROUP_NODE:appverdnatura" type="e8cecc67:BranchNodeDescriptor" />
|
|
||||||
<item name="BRANCH:appverdnatura/test" type="e8cecc67:BranchNodeDescriptor" />
|
|
||||||
</path>
|
|
||||||
</select>
|
|
||||||
</component>
|
|
||||||
<component name="ChangeListManager">
|
|
||||||
<list default="true" id="fa688d1c-dbee-4864-9e33-4d84ef9afca8" name="Default Changelist" comment="Version 23.6Beta">
|
|
||||||
<change afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/delivery/adapters/ExpeditionLogAdapter.kt" afterDir="false" />
|
|
||||||
<change afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/delivery/fragments/LogExpeditionFragment.kt" afterDir="false" />
|
|
||||||
<change afterPath="$PROJECT_DIR$/app/src/main/res/drawable/camion.png" afterDir="false" />
|
|
||||||
<change afterPath="$PROJECT_DIR$/app/src/main/res/drawable/camion_descarga.png" afterDir="false" />
|
|
||||||
<change afterPath="$PROJECT_DIR$/app/src/main/res/drawable/ic_delivery_truck.xml" afterDir="false" />
|
|
||||||
<change afterPath="$PROJECT_DIR$/app/src/main/res/layout/fragment_expedition_log_delivery.xml" afterDir="false" />
|
|
||||||
<change afterPath="$PROJECT_DIR$/app/src/main/res/layout/item_expeditionlog_row.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$/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/di/viewModelModule.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/di/viewModelModule.kt" afterDir="false" />
|
|
||||||
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/domain/SilexCallback.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/domain/SilexCallback.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/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/delivery/InfoFragment.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/delivery/fragments/InfoFragment.kt" afterDir="false" />
|
|
||||||
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/delivery/InfoViewModel.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/delivery/viewmodels/DeliveryViewModel.kt" afterDir="false" />
|
|
||||||
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/delivery/model/InfoCompany.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/delivery/model/InfoCompany.kt" afterDir="false" />
|
|
||||||
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/main/activity/MainActivity.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/main/activity/MainActivity.kt" afterDir="false" />
|
|
||||||
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/pasillero/fragment/PasilleroViewModel.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/pasillero/fragment/PasilleroViewModel.kt" afterDir="false" />
|
|
||||||
<change beforePath="$PROJECT_DIR$/app/src/main/res/layout/fragment_info.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/res/layout/fragment_info_delivery.xml" afterDir="false" />
|
|
||||||
<change beforePath="$PROJECT_DIR$/app/src/main/res/layout/toolbar_fragment.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/res/layout/toolbar_fragment.xml" 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/res/values/strings.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/res/values/strings.xml" afterDir="false" />
|
|
||||||
</list>
|
|
||||||
<option name="SHOW_DIALOG" value="false" />
|
|
||||||
<option name="HIGHLIGHT_CONFLICTS" value="true" />
|
|
||||||
<option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
|
|
||||||
<option name="LAST_RESOLUTION" value="IGNORE" />
|
|
||||||
</component>
|
|
||||||
<component name="ChangesViewManager" show_ignored="true" />
|
|
||||||
<component name="CodeInsightWorkspaceSettings">
|
|
||||||
<option name="optimizeImportsOnTheFly" value="true" />
|
|
||||||
</component>
|
|
||||||
<component name="ExecutionTargetManager" SELECTED_TARGET="device_and_snapshot_combo_box_target[21114523025303]" />
|
|
||||||
<component name="ExportToHTMLSettings">
|
|
||||||
<option name="OPEN_IN_BROWSER" value="true" />
|
|
||||||
<option name="OUTPUT_DIRECTORY" value="C:\Program Files\Android\Android Studio\inspections" />
|
|
||||||
</component>
|
|
||||||
<component name="ExternalProjectsData">
|
|
||||||
<projectState path="$PROJECT_DIR$">
|
|
||||||
<ProjectState />
|
|
||||||
</projectState>
|
|
||||||
</component>
|
|
||||||
<component name="ExternalProjectsManager">
|
|
||||||
<system id="GRADLE">
|
|
||||||
<state>
|
|
||||||
<task path="$PROJECT_DIR$">
|
|
||||||
<activation />
|
|
||||||
</task>
|
|
||||||
<projects_view>
|
|
||||||
<tree_state>
|
|
||||||
<expand />
|
|
||||||
<select />
|
|
||||||
</tree_state>
|
|
||||||
</projects_view>
|
|
||||||
</state>
|
|
||||||
</system>
|
|
||||||
</component>
|
|
||||||
<component name="FileTemplateManagerImpl">
|
|
||||||
<option name="RECENT_TEMPLATES">
|
|
||||||
<list>
|
|
||||||
<option value="navigationResourceFile" />
|
|
||||||
<option value="resourceFile" />
|
|
||||||
<option value="layoutResourceFile" />
|
|
||||||
<option value="Class" />
|
|
||||||
<option value="Kotlin Class" />
|
|
||||||
</list>
|
|
||||||
</option>
|
|
||||||
</component>
|
|
||||||
<component name="GenerateSignedApkSettings">
|
|
||||||
<option name="KEY_STORE_PATH" value="C:\Users\sergiodt\proyectos\androidkeys_quique\keystore.jks" />
|
|
||||||
<option name="KEY_ALIAS" value="keystore" />
|
|
||||||
<option name="REMEMBER_PASSWORDS" value="true" />
|
|
||||||
<option name="BUILD_TARGET_KEY" value="apk" />
|
|
||||||
</component>
|
|
||||||
<component name="Git.Merge.Settings">
|
|
||||||
<option name="BRANCH" value="master" />
|
|
||||||
</component>
|
|
||||||
<component name="Git.Settings">
|
|
||||||
<excluded-from-favorite>
|
|
||||||
<branch-storage>
|
|
||||||
<map>
|
|
||||||
<entry type="REMOTE">
|
|
||||||
<value>
|
|
||||||
<list>
|
|
||||||
<branch-info repo="$PROJECT_DIR$" source="origin/master" />
|
|
||||||
</list>
|
|
||||||
</value>
|
|
||||||
</entry>
|
|
||||||
</map>
|
|
||||||
</branch-storage>
|
|
||||||
</excluded-from-favorite>
|
|
||||||
<favorite-branches>
|
|
||||||
<branch-storage>
|
|
||||||
<map>
|
|
||||||
<entry type="REMOTE">
|
|
||||||
<value>
|
|
||||||
<list>
|
|
||||||
<branch-info repo="$PROJECT_DIR$" source="appverdnatura/test" />
|
|
||||||
</list>
|
|
||||||
</value>
|
|
||||||
</entry>
|
|
||||||
</map>
|
|
||||||
</branch-storage>
|
|
||||||
</favorite-branches>
|
|
||||||
<option name="PREVIOUS_COMMIT_AUTHORS">
|
|
||||||
<list>
|
|
||||||
<option value="sergiodt@verdnatura.es" />
|
|
||||||
<option value="Sergio dt" />
|
|
||||||
</list>
|
|
||||||
</option>
|
|
||||||
<option name="PUSH_TAGS">
|
|
||||||
<GitPushTagMode>
|
|
||||||
<option name="argument" value="--tags" />
|
|
||||||
<option name="title" value="All" />
|
|
||||||
</GitPushTagMode>
|
|
||||||
</option>
|
|
||||||
<option name="RECENT_BRANCH_BY_REPOSITORY">
|
|
||||||
<map>
|
|
||||||
<entry key="$PROJECT_DIR$" value="master" />
|
|
||||||
</map>
|
|
||||||
</option>
|
|
||||||
<option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
|
|
||||||
<option name="RESET_MODE" value="MIXED" />
|
|
||||||
</component>
|
|
||||||
<component name="GitSEFilterConfiguration">
|
|
||||||
<file-type-list>
|
|
||||||
<filtered-out-file-type name="LOCAL_BRANCH" />
|
|
||||||
<filtered-out-file-type name="REMOTE_BRANCH" />
|
|
||||||
<filtered-out-file-type name="TAG" />
|
|
||||||
<filtered-out-file-type name="COMMIT_BY_MESSAGE" />
|
|
||||||
</file-type-list>
|
|
||||||
</component>
|
|
||||||
<component name="HighlightingSettingsPerFile">
|
|
||||||
<setting file="file://$PROJECT_DIR$/app/build.gradle" 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/values-es/strings.xml" root0="FORCE_HIGHLIGHTING" />
|
|
||||||
<setting file="file://$PROJECT_DIR$/app/src/main/res/values/strings.xml" root0="FORCE_HIGHLIGHTING" />
|
|
||||||
</component>
|
|
||||||
<component name="MarkdownSettingsMigration">
|
|
||||||
<option name="stateVersion" value="1" />
|
|
||||||
</component>
|
|
||||||
<component name="ProblemsViewState">
|
|
||||||
<option name="proportion" value="0.50190353" />
|
|
||||||
<option name="selectedTabId" value="CurrentFile" />
|
|
||||||
<option name="sortByName" value="true" />
|
|
||||||
</component>
|
|
||||||
<component name="ProjectId" id="1rNnmCWH3aNvnQwcp2vPrEIlvP2" />
|
|
||||||
<component name="ProjectLevelVcsManager">
|
|
||||||
<ConfirmationsSetting value="2" id="Add" />
|
|
||||||
</component>
|
|
||||||
<component name="ProjectViewState">
|
|
||||||
<option name="hideEmptyMiddlePackages" value="true" />
|
|
||||||
<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.OpenProjectViewOnStart": "true",
|
|
||||||
"RunOnceActivity.ShowReadmeOnStart": "true",
|
|
||||||
"RunOnceActivity.cidr.known.project.marker": "true",
|
|
||||||
"ScreenRecorder.SavePath": "C:\\Users\\sergiodt\\redmine_4679_reparto_picking.mp4",
|
|
||||||
"android-custom-viewC:/Users/sergiodt/.gradle/caches/modules-2/files-2.1/androidx.appcompat/appcompat/1.3.0/45a346a05e7ff27a01c59452379c5939cbb53c03/appcompat-1.3.0-sources.jar!/androidx/appcompat/widget/AppCompatEditText.java_SELECTED": "AppCompatEditText",
|
|
||||||
"cidr.known.project.marker": "true",
|
|
||||||
"com.google.services.firebase.aqiPopupShown": "true",
|
|
||||||
"last_opened_file_path": "C:/Users/sergiodt",
|
|
||||||
"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": [
|
|
||||||
"generalRelease"
|
|
||||||
]
|
|
||||||
}
|
|
||||||
}]]></component>
|
|
||||||
<component name="PsdUISettings">
|
|
||||||
<option name="MODULE_TAB" value="Default Config" />
|
|
||||||
<option name="LAST_EDITED_SIGNING_CONFIG" value="debug" />
|
|
||||||
<option name="LAST_EDITED_BUILD_TYPE" value="release" />
|
|
||||||
</component>
|
|
||||||
<component name="RecentsManager">
|
|
||||||
<key name="CopyFile.RECENT_KEYS">
|
|
||||||
<recent name="C:\Users\sergiodt\AndroidStudioProjects\vn-warehouseManager\app\src\main\res\drawable" />
|
|
||||||
<recent name="C:\Users\sergiodt\AndroidStudioProjects\vn-warehouseManager\app\src\main\res\layout" />
|
|
||||||
<recent name="C:\Users\sergiodt\AndroidStudioProjects\vn-warehouseManager\app\src\main\java\es\verdnatura\presentation\view\feature\delivery" />
|
|
||||||
<recent name="C:\Users\sergiodt\AndroidStudioProjects\vn-warehouseManager\app\src\main\res\drawable-v24" />
|
|
||||||
<recent name="C:\Users\sergiodt\AndroidStudioProjects\vn-warehouseManager\app\src\main\res\raw" />
|
|
||||||
</key>
|
|
||||||
<key name="MoveFile.RECENT_KEYS">
|
|
||||||
<recent name="C:\Users\sergiodt\AndroidStudioProjects\vn-warehouseManager\app\src\main\res\drawable" />
|
|
||||||
<recent name="C:\Users\sergiodt\AndroidStudioProjects\vn-warehouseManager\app\src\main\res\drawable-v24" />
|
|
||||||
<recent name="C:\Users\sergiodt\AndroidStudioProjects\vn-warehouseManager\app\src\main\res\raw" />
|
|
||||||
<recent name="C:\Users\sergiodt\AndroidStudioProjects\vn-warehouseManager\app\src\main\res\assets" />
|
|
||||||
<recent name="C:\Users\sergiodt\AndroidStudioProjects\vn-warehouseManager\app\src\main\res\font" />
|
|
||||||
</key>
|
|
||||||
<key name="MoveKotlinTopLevelDeclarationsDialog.RECENTS_KEY">
|
|
||||||
<recent name="es.verdnatura.presentation.view.feature.delivery.fragments" />
|
|
||||||
<recent name="es.verdnatura.presentation.view.feature.delivery.viewmodels" />
|
|
||||||
<recent name="es.verdnatura.presentation.view.feature.delivery.fragment.info" />
|
|
||||||
<recent name="es.verdnatura.presentation.view.feature.delivery.fragment" />
|
|
||||||
<recent name="es.verdnatura.presentation.view.feature.packaging.fragment.SupplierViewModel" />
|
|
||||||
</key>
|
|
||||||
<key name="CopyKotlinDeclarationDialog.RECENTS_KEY">
|
|
||||||
<recent name="es.verdnatura.presentation.view.feature.delivery.adapters" />
|
|
||||||
<recent name="es.verdnatura.presentation.view.feature.delivery" />
|
|
||||||
<recent name="es.verdnatura.domain" />
|
|
||||||
<recent name="es.verdnatura.presentation.view.feature.packaging.fragment" />
|
|
||||||
<recent name="es.verdnatura.presentation.view.component" />
|
|
||||||
</key>
|
|
||||||
</component>
|
|
||||||
<component name="RunManager" selected="Android App.app">
|
|
||||||
<configuration default="true" type="AndroidJUnit" factoryName="Android JUnit">
|
|
||||||
<option name="TEST_OBJECT" value="class" />
|
|
||||||
<option name="WORKING_DIRECTORY" value="$MODULE_DIR$" />
|
|
||||||
<method v="2">
|
|
||||||
<option name="Android.Gradle.BeforeRunTask" enabled="true" />
|
|
||||||
</method>
|
|
||||||
</configuration>
|
|
||||||
<configuration name="app" type="AndroidRunConfigurationType" factoryName="Android App">
|
|
||||||
<module name="Gestor_Almacén.app.main" />
|
|
||||||
<option name="DEPLOY" value="true" />
|
|
||||||
<option name="DEPLOY_APK_FROM_BUNDLE" value="false" />
|
|
||||||
<option name="DEPLOY_AS_INSTANT" value="false" />
|
|
||||||
<option name="ARTIFACT_NAME" value="" />
|
|
||||||
<option name="PM_INSTALL_OPTIONS" value="" />
|
|
||||||
<option name="ALL_USERS" value="false" />
|
|
||||||
<option name="ALWAYS_INSTALL_WITH_PM" value="false" />
|
|
||||||
<option name="CLEAR_APP_STORAGE" value="false" />
|
|
||||||
<option name="DYNAMIC_FEATURES_DISABLED_LIST" value="" />
|
|
||||||
<option name="ACTIVITY_EXTRA_FLAGS" value="" />
|
|
||||||
<option name="MODE" value="default_activity" />
|
|
||||||
<option name="CLEAR_LOGCAT" value="false" />
|
|
||||||
<option name="SHOW_LOGCAT_AUTOMATICALLY" value="false" />
|
|
||||||
<option name="INSPECTION_WITHOUT_ACTIVITY_RESTART" value="false" />
|
|
||||||
<option name="TARGET_SELECTION_MODE" value="DEVICE_AND_SNAPSHOT_COMBO_BOX" />
|
|
||||||
<option name="SELECTED_CLOUD_MATRIX_CONFIGURATION_ID" value="-1" />
|
|
||||||
<option name="SELECTED_CLOUD_MATRIX_PROJECT_ID" value="" />
|
|
||||||
<option name="DEBUGGER_TYPE" value="Auto" />
|
|
||||||
<Auto>
|
|
||||||
<option name="USE_JAVA_AWARE_DEBUGGER" value="false" />
|
|
||||||
<option name="SHOW_STATIC_VARS" value="true" />
|
|
||||||
<option name="WORKING_DIR" value="" />
|
|
||||||
<option name="TARGET_LOGGING_CHANNELS" value="lldb process:gdb-remote packets" />
|
|
||||||
<option name="SHOW_OPTIMIZED_WARNING" value="true" />
|
|
||||||
</Auto>
|
|
||||||
<Hybrid>
|
|
||||||
<option name="USE_JAVA_AWARE_DEBUGGER" value="false" />
|
|
||||||
<option name="SHOW_STATIC_VARS" value="true" />
|
|
||||||
<option name="WORKING_DIR" value="" />
|
|
||||||
<option name="TARGET_LOGGING_CHANNELS" value="lldb process:gdb-remote packets" />
|
|
||||||
<option name="SHOW_OPTIMIZED_WARNING" value="true" />
|
|
||||||
</Hybrid>
|
|
||||||
<Java />
|
|
||||||
<Native>
|
|
||||||
<option name="USE_JAVA_AWARE_DEBUGGER" value="false" />
|
|
||||||
<option name="SHOW_STATIC_VARS" value="true" />
|
|
||||||
<option name="WORKING_DIR" value="" />
|
|
||||||
<option name="TARGET_LOGGING_CHANNELS" value="lldb process:gdb-remote packets" />
|
|
||||||
<option name="SHOW_OPTIMIZED_WARNING" value="true" />
|
|
||||||
</Native>
|
|
||||||
<Profilers>
|
|
||||||
<option name="ADVANCED_PROFILING_ENABLED" value="false" />
|
|
||||||
<option name="STARTUP_PROFILING_ENABLED" value="false" />
|
|
||||||
<option name="STARTUP_CPU_PROFILING_ENABLED" value="false" />
|
|
||||||
<option name="STARTUP_CPU_PROFILING_CONFIGURATION_NAME" value="Java/Kotlin Method Sample (legacy)" />
|
|
||||||
<option name="STARTUP_NATIVE_MEMORY_PROFILING_ENABLED" value="false" />
|
|
||||||
<option name="NATIVE_MEMORY_SAMPLE_RATE_BYTES" value="2048" />
|
|
||||||
</Profilers>
|
|
||||||
<option name="DEEP_LINK" value="" />
|
|
||||||
<option name="ACTIVITY_CLASS" value="" />
|
|
||||||
<option name="SEARCH_ACTIVITY_IN_GLOBAL_SCOPE" value="false" />
|
|
||||||
<option name="SKIP_ACTIVITY_VALIDATION" value="false" />
|
|
||||||
<method v="2">
|
|
||||||
<option name="Android.Gradle.BeforeRunTask" enabled="true" />
|
|
||||||
</method>
|
|
||||||
</configuration>
|
|
||||||
<configuration name="vn-warehouseManager" type="GradleRunConfiguration" factoryName="Gradle" temporary="true">
|
|
||||||
<ExternalSystemSettings>
|
|
||||||
<option name="executionName" />
|
|
||||||
<option name="externalProjectPath" value="$PROJECT_DIR$" />
|
|
||||||
<option name="externalSystemIdString" value="GRADLE" />
|
|
||||||
<option name="scriptParameters" value="" />
|
|
||||||
<option name="taskDescriptions">
|
|
||||||
<list />
|
|
||||||
</option>
|
|
||||||
<option name="taskNames">
|
|
||||||
<list />
|
|
||||||
</option>
|
|
||||||
<option name="vmOptions" value="" />
|
|
||||||
</ExternalSystemSettings>
|
|
||||||
<ExternalSystemDebugServerProcess>true</ExternalSystemDebugServerProcess>
|
|
||||||
<ExternalSystemReattachDebugProcess>true</ExternalSystemReattachDebugProcess>
|
|
||||||
<DebugAllEnabled>false</DebugAllEnabled>
|
|
||||||
<method v="2" />
|
|
||||||
</configuration>
|
|
||||||
<recent_temporary>
|
|
||||||
<list>
|
|
||||||
<item itemvalue="Gradle.vn-warehouseManager" />
|
|
||||||
<item itemvalue="Gradle.vn-warehouseManager" />
|
|
||||||
<item itemvalue="Gradle.vn-warehouseManager" />
|
|
||||||
<item itemvalue="Gradle.vn-warehouseManager" />
|
|
||||||
<item itemvalue="Gradle.vn-warehouseManager" />
|
|
||||||
</list>
|
|
||||||
</recent_temporary>
|
|
||||||
</component>
|
|
||||||
<component name="SpellCheckerSettings" RuntimeDictionaries="0" Folders="0" CustomDictionaries="0" DefaultDictionary="application-level" UseSingleDictionary="true" transferred="true" />
|
|
||||||
<component name="SvnConfiguration">
|
|
||||||
<configuration>C:\Users\sergiodt\AppData\Roaming\Subversion</configuration>
|
|
||||||
</component>
|
|
||||||
<component name="TaskManager">
|
|
||||||
<task active="true" id="Default" summary="Default task">
|
|
||||||
<changelist id="fa688d1c-dbee-4864-9e33-4d84ef9afca8" name="Default Changelist" comment="" />
|
|
||||||
<created>1618825571576</created>
|
|
||||||
<option name="number" value="Default" />
|
|
||||||
<option name="presentableId" value="Default" />
|
|
||||||
<updated>1618825571576</updated>
|
|
||||||
</task>
|
|
||||||
<task id="LOCAL-00061" summary="Version 8.4.1Beta,Tarea #3958">
|
|
||||||
<created>1653663791334</created>
|
|
||||||
<option name="number" value="00061" />
|
|
||||||
<option name="presentableId" value="LOCAL-00061" />
|
|
||||||
<option name="project" value="LOCAL" />
|
|
||||||
<updated>1653663791335</updated>
|
|
||||||
</task>
|
|
||||||
<task id="LOCAL-00062" summary="Version 8.4.1Beta=8.4 Master,sin envio rockets de sacador/controlador y quitar strings.">
|
|
||||||
<created>1654145430078</created>
|
|
||||||
<option name="number" value="00062" />
|
|
||||||
<option name="presentableId" value="LOCAL-00062" />
|
|
||||||
<option name="project" value="LOCAL" />
|
|
||||||
<updated>1654145430079</updated>
|
|
||||||
</task>
|
|
||||||
<task id="LOCAL-00063" summary="Version 8.5Beta, strings, body =null y muestra coger vehículo">
|
|
||||||
<created>1654670479261</created>
|
|
||||||
<option name="number" value="00063" />
|
|
||||||
<option name="presentableId" value="LOCAL-00063" />
|
|
||||||
<option name="project" value="LOCAL" />
|
|
||||||
<updated>1654670479262</updated>
|
|
||||||
</task>
|
|
||||||
<task id="LOCAL-00064" summary="Version 8.5.1Beta, strings, muestra previa y comentar smarttads">
|
|
||||||
<created>1654772518409</created>
|
|
||||||
<option name="number" value="00064" />
|
|
||||||
<option name="presentableId" value="LOCAL-00064" />
|
|
||||||
<option name="project" value="LOCAL" />
|
|
||||||
<updated>1654772518410</updated>
|
|
||||||
</task>
|
|
||||||
<task id="LOCAL-00065" summary="Version 8.5.1Beta acceso a control vehiculo ok">
|
|
||||||
<created>1654781827179</created>
|
|
||||||
<option name="number" value="00065" />
|
|
||||||
<option name="presentableId" value="LOCAL-00065" />
|
|
||||||
<option name="project" value="LOCAL" />
|
|
||||||
<updated>1654781827179</updated>
|
|
||||||
</task>
|
|
||||||
<task id="LOCAL-00066" summary="Version 8.5.2Beta, quitado color del item, quitado back de revisor y control de previa solo sus líneas">
|
|
||||||
<created>1655369652090</created>
|
|
||||||
<option name="number" value="00066" />
|
|
||||||
<option name="presentableId" value="LOCAL-00066" />
|
|
||||||
<option name="project" value="LOCAL" />
|
|
||||||
<updated>1655369652090</updated>
|
|
||||||
</task>
|
|
||||||
<task id="LOCAL-00067" summary="Version 8.6.1Beta, añadido ticketColor más grande, quitados colores items y permutado quantity por cel2. Quitados warnings">
|
|
||||||
<created>1655960861634</created>
|
|
||||||
<option name="number" value="00067" />
|
|
||||||
<option name="presentableId" value="LOCAL-00067" />
|
|
||||||
<option name="project" value="LOCAL" />
|
|
||||||
<updated>1655960861634</updated>
|
|
||||||
</task>
|
|
||||||
<task id="LOCAL-00068" summary="Version 8.6.1Beta tareas #3601 refactor ivnentario.Tarea #3959(warnings deprecated,typedate,neverused)">
|
|
||||||
<created>1656322885999</created>
|
|
||||||
<option name="number" value="00068" />
|
|
||||||
<option name="presentableId" value="LOCAL-00068" />
|
|
||||||
<option name="project" value="LOCAL" />
|
|
||||||
<updated>1656322886000</updated>
|
|
||||||
</task>
|
|
||||||
<task id="LOCAL-00069" summary="Version 8.7 Reubicación, sector = SACADOR V, controlador no puede hacer parking si no están revisados todos los tickets,">
|
|
||||||
<created>1656930096719</created>
|
|
||||||
<option name="number" value="00069" />
|
|
||||||
<option name="presentableId" value="LOCAL-00069" />
|
|
||||||
<option name="project" value="LOCAL" />
|
|
||||||
<updated>1656930096719</updated>
|
|
||||||
</task>
|
|
||||||
<task id="LOCAL-00070" summary="Version 8.8Beta precio coste artículo, modificar tallos, mensajes error para items sin buyFk y ticket eliminado o viejo">
|
|
||||||
<created>1659005042067</created>
|
|
||||||
<option name="number" value="00070" />
|
|
||||||
<option name="presentableId" value="LOCAL-00070" />
|
|
||||||
<option name="project" value="LOCAL" />
|
|
||||||
<updated>1659005042068</updated>
|
|
||||||
</task>
|
|
||||||
<task id="LOCAL-00071" summary="Version 9Beta, dos opciones a Paletizadores y carros de operator">
|
|
||||||
<created>1662699501924</created>
|
|
||||||
<option name="number" value="00071" />
|
|
||||||
<option name="presentableId" value="LOCAL-00071" />
|
|
||||||
<option name="project" value="LOCAL" />
|
|
||||||
<updated>1662699501924</updated>
|
|
||||||
</task>
|
|
||||||
<task id="LOCAL-00072" summary="Version 9Beta-Tarea3420">
|
|
||||||
<created>1662982877783</created>
|
|
||||||
<option name="number" value="00072" />
|
|
||||||
<option name="presentableId" value="LOCAL-00072" />
|
|
||||||
<option name="project" value="LOCAL" />
|
|
||||||
<updated>1662982877783</updated>
|
|
||||||
</task>
|
|
||||||
<task id="LOCAL-00073" summary="Version 9Beta-Borrados comentarios">
|
|
||||||
<created>1663050116723</created>
|
|
||||||
<option name="number" value="00073" />
|
|
||||||
<option name="presentableId" value="LOCAL-00073" />
|
|
||||||
<option name="project" value="LOCAL" />
|
|
||||||
<updated>1663050116723</updated>
|
|
||||||
</task>
|
|
||||||
<task id="LOCAL-00074" summary="Version 9.1Beta- Rgb,trasaccion marcar lineas, new collection,shelvingLog, y ajustes">
|
|
||||||
<created>1663770280710</created>
|
|
||||||
<option name="number" value="00074" />
|
|
||||||
<option name="presentableId" value="LOCAL-00074" />
|
|
||||||
<option name="project" value="LOCAL" />
|
|
||||||
<updated>1663770280712</updated>
|
|
||||||
</task>
|
|
||||||
<task id="LOCAL-00075" summary="Version 9.1Beta- Rgb,trasaccion marcar lineas, new collection,shelvingLog, y ajustes">
|
|
||||||
<created>1663770314650</created>
|
|
||||||
<option name="number" value="00075" />
|
|
||||||
<option name="presentableId" value="LOCAL-00075" />
|
|
||||||
<option name="project" value="LOCAL" />
|
|
||||||
<updated>1663770314650</updated>
|
|
||||||
</task>
|
|
||||||
<task id="LOCAL-00076" summary="Version 9.1Beta- Filtro inventario">
|
|
||||||
<created>1663835246994</created>
|
|
||||||
<option name="number" value="00076" />
|
|
||||||
<option name="presentableId" value="LOCAL-00076" />
|
|
||||||
<option name="project" value="LOCAL" />
|
|
||||||
<updated>1663835246994</updated>
|
|
||||||
</task>
|
|
||||||
<task id="LOCAL-00077" summary="Version 9.1Beta- Modificar original y originalQuantity">
|
|
||||||
<created>1663849445751</created>
|
|
||||||
<option name="number" value="00077" />
|
|
||||||
<option name="presentableId" value="LOCAL-00077" />
|
|
||||||
<option name="project" value="LOCAL" />
|
|
||||||
<updated>1663849445751</updated>
|
|
||||||
</task>
|
|
||||||
<task id="LOCAL-00078" summary="Version 9.1Beta-CMR quitado, rgb quitado">
|
|
||||||
<created>1663850881923</created>
|
|
||||||
<option name="number" value="00078" />
|
|
||||||
<option name="presentableId" value="LOCAL-00078" />
|
|
||||||
<option name="project" value="LOCAL" />
|
|
||||||
<updated>1663850881923</updated>
|
|
||||||
</task>
|
|
||||||
<task id="LOCAL-00079" summary="Version 9.1Beta-Compilada versión y formateado Ajustes">
|
|
||||||
<created>1663930085261</created>
|
|
||||||
<option name="number" value="00079" />
|
|
||||||
<option name="presentableId" value="LOCAL-00079" />
|
|
||||||
<option name="project" value="LOCAL" />
|
|
||||||
<updated>1663930085262</updated>
|
|
||||||
</task>
|
|
||||||
<task id="LOCAL-00080" summary="Version 9.1Beta-Quantity_y_originalQuantity_view_to_Integer.toString">
|
|
||||||
<created>1663943604196</created>
|
|
||||||
<option name="number" value="00080" />
|
|
||||||
<option name="presentableId" value="LOCAL-00080" />
|
|
||||||
<option name="project" value="LOCAL" />
|
|
||||||
<updated>1663943604196</updated>
|
|
||||||
</task>
|
|
||||||
<task id="LOCAL-00081" summary="Version 9.2Beta-Controlador sin animacion y vuelve al sitio">
|
|
||||||
<created>1664276655283</created>
|
|
||||||
<option name="number" value="00081" />
|
|
||||||
<option name="presentableId" value="LOCAL-00081" />
|
|
||||||
<option name="project" value="LOCAL" />
|
|
||||||
<updated>1664276655284</updated>
|
|
||||||
</task>
|
|
||||||
<task id="LOCAL-00082" summary="Version 9 Arreglado vuelta atrás controlador">
|
|
||||||
<created>1664430359823</created>
|
|
||||||
<option name="number" value="00082" />
|
|
||||||
<option name="presentableId" value="LOCAL-00082" />
|
|
||||||
<option name="project" value="LOCAL" />
|
|
||||||
<updated>1664430359824</updated>
|
|
||||||
</task>
|
|
||||||
<task id="LOCAL-00083" summary="Version 9.2.1 Refactor Inicio">
|
|
||||||
<created>1664790614473</created>
|
|
||||||
<option name="number" value="00083" />
|
|
||||||
<option name="presentableId" value="LOCAL-00083" />
|
|
||||||
<option name="project" value="LOCAL" />
|
|
||||||
<updated>1664790614473</updated>
|
|
||||||
</task>
|
|
||||||
<task id="LOCAL-00084" summary="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">
|
|
||||||
<created>1665032465280</created>
|
|
||||||
<option name="number" value="00084" />
|
|
||||||
<option name="presentableId" value="LOCAL-00084" />
|
|
||||||
<option name="project" value="LOCAL" />
|
|
||||||
<updated>1665032465281</updated>
|
|
||||||
</task>
|
|
||||||
<task id="LOCAL-00085" summary="Version 9.2.1 Modificado fragment">
|
|
||||||
<created>1665037437997</created>
|
|
||||||
<option name="number" value="00085" />
|
|
||||||
<option name="presentableId" value="LOCAL-00085" />
|
|
||||||
<option name="project" value="LOCAL" />
|
|
||||||
<updated>1665037437997</updated>
|
|
||||||
</task>
|
|
||||||
<task id="LOCAL-00086" summary="Version 9.2.1 Modificado fragment a fragment_general">
|
|
||||||
<created>1665038575752</created>
|
|
||||||
<option name="number" value="00086" />
|
|
||||||
<option name="presentableId" value="LOCAL-00086" />
|
|
||||||
<option name="project" value="LOCAL" />
|
|
||||||
<updated>1665038575752</updated>
|
|
||||||
</task>
|
|
||||||
<task id="LOCAL-00087" summary="Version 9.2.1 añadido error encajado y modificado marcaje">
|
|
||||||
<created>1665118245168</created>
|
|
||||||
<option name="number" value="00087" />
|
|
||||||
<option name="presentableId" value="LOCAL-00087" />
|
|
||||||
<option name="project" value="LOCAL" />
|
|
||||||
<updated>1665118245169</updated>
|
|
||||||
</task>
|
|
||||||
<task id="LOCAL-00088" summary="Version 9.2.1 en producción">
|
|
||||||
<created>1665123288355</created>
|
|
||||||
<option name="number" value="00088" />
|
|
||||||
<option name="presentableId" value="LOCAL-00088" />
|
|
||||||
<option name="project" value="LOCAL" />
|
|
||||||
<updated>1665123288355</updated>
|
|
||||||
</task>
|
|
||||||
<task id="LOCAL-00089" summary="Version 9.2.1 en producción. Borrada Voz y Ajustes impresora">
|
|
||||||
<created>1665470010499</created>
|
|
||||||
<option name="number" value="00089" />
|
|
||||||
<option name="presentableId" value="LOCAL-00089" />
|
|
||||||
<option name="project" value="LOCAL" />
|
|
||||||
<updated>1665470010500</updated>
|
|
||||||
</task>
|
|
||||||
<task id="LOCAL-00090" summary="Version 9.2.1 en producción. Borrada Voz y Ajustes impresora">
|
|
||||||
<created>1665470036509</created>
|
|
||||||
<option name="number" value="00090" />
|
|
||||||
<option name="presentableId" value="LOCAL-00090" />
|
|
||||||
<option name="project" value="LOCAL" />
|
|
||||||
<updated>1665470036509</updated>
|
|
||||||
</task>
|
|
||||||
<task id="LOCAL-00091" summary="Version 9.2 Error encajado y en ver Ticket aparece ver la colección">
|
|
||||||
<created>1666276993765</created>
|
|
||||||
<option name="number" value="00091" />
|
|
||||||
<option name="presentableId" value="LOCAL-00091" />
|
|
||||||
<option name="project" value="LOCAL" />
|
|
||||||
<updated>1666276993765</updated>
|
|
||||||
</task>
|
|
||||||
<task id="LOCAL-00092" summary="Version 9.4Beta Cmr, Control ubicación, volver atrás de Controlador, botón llamadas, volver pantalla anterior parking,">
|
|
||||||
<created>1667385476140</created>
|
|
||||||
<option name="number" value="00092" />
|
|
||||||
<option name="presentableId" value="LOCAL-00092" />
|
|
||||||
<option name="project" value="LOCAL" />
|
|
||||||
<updated>1667385476141</updated>
|
|
||||||
</task>
|
|
||||||
<task id="LOCAL-00093" summary="Modificado control ubicación">
|
|
||||||
<created>1667541612505</created>
|
|
||||||
<option name="number" value="00093" />
|
|
||||||
<option name="presentableId" value="LOCAL-00093" />
|
|
||||||
<option name="project" value="LOCAL" />
|
|
||||||
<updated>1667541612505</updated>
|
|
||||||
</task>
|
|
||||||
<task id="LOCAL-00094" summary="Version 9.5Beta añadido inteceptor y modificado código worker_getId. Subida como 9.4.2Beta">
|
|
||||||
<created>1668156827443</created>
|
|
||||||
<option name="number" value="00094" />
|
|
||||||
<option name="presentableId" value="LOCAL-00094" />
|
|
||||||
<option name="project" value="LOCAL" />
|
|
||||||
<updated>1668156827444</updated>
|
|
||||||
</task>
|
|
||||||
<task id="LOCAL-00095" summary="Version 9.6Beta Interteptors, quitando userCase y arreglado click sobre carita. Cambiado .gitignore">
|
|
||||||
<created>1668763686581</created>
|
|
||||||
<option name="number" value="00095" />
|
|
||||||
<option name="presentableId" value="LOCAL-00095" />
|
|
||||||
<option name="project" value="LOCAL" />
|
|
||||||
<updated>1668763686582</updated>
|
|
||||||
</task>
|
|
||||||
<task id="LOCAL-00096" summary="Version 9.6Beta Añadido a BaseFragment(context). Quitado código repetido de las llamadas">
|
|
||||||
<created>1669105520909</created>
|
|
||||||
<option name="number" value="00096" />
|
|
||||||
<option name="presentableId" value="LOCAL-00096" />
|
|
||||||
<option name="project" value="LOCAL" />
|
|
||||||
<updated>1669105520910</updated>
|
|
||||||
</task>
|
|
||||||
<task id="LOCAL-00097" summary="Version 9.6Beta Cambiadas llamadas y campos( collectionFk). Borrado Presacador">
|
|
||||||
<created>1669186502340</created>
|
|
||||||
<option name="number" value="00097" />
|
|
||||||
<option name="presentableId" value="LOCAL-00097" />
|
|
||||||
<option name="project" value="LOCAL" />
|
|
||||||
<updated>1669186502342</updated>
|
|
||||||
</task>
|
|
||||||
<task id="LOCAL-00098" summary="Version 9.6Beta en test">
|
|
||||||
<created>1669275670424</created>
|
|
||||||
<option name="number" value="00098" />
|
|
||||||
<option name="presentableId" value="LOCAL-00098" />
|
|
||||||
<option name="project" value="LOCAL" />
|
|
||||||
<updated>1669275670424</updated>
|
|
||||||
</task>
|
|
||||||
<task id="LOCAL-00099" summary="Version 9.6Beta en test : ubicador, quality, posicion, buscar item, reclamaciones...">
|
|
||||||
<created>1669631463102</created>
|
|
||||||
<option name="number" value="00099" />
|
|
||||||
<option name="presentableId" value="LOCAL-00099" />
|
|
||||||
<option name="project" value="LOCAL" />
|
|
||||||
<updated>1669631463102</updated>
|
|
||||||
</task>
|
|
||||||
<task id="LOCAL-00100" summary="Version 9.6Beta en test: paletizadores">
|
|
||||||
<created>1669715487611</created>
|
|
||||||
<option name="number" value="00100" />
|
|
||||||
<option name="presentableId" value="LOCAL-00100" />
|
|
||||||
<option name="project" value="LOCAL" />
|
|
||||||
<updated>1669715487612</updated>
|
|
||||||
</task>
|
|
||||||
<task id="LOCAL-00101" summary="Version 9.6Beta en test: paletizadores">
|
|
||||||
<created>1669720979790</created>
|
|
||||||
<option name="number" value="00101" />
|
|
||||||
<option name="presentableId" value="LOCAL-00101" />
|
|
||||||
<option name="project" value="LOCAL" />
|
|
||||||
<updated>1669720979790</updated>
|
|
||||||
</task>
|
|
||||||
<task id="LOCAL-00102" summary="Version 9.6Beta. TEST5: imprimir ok, ubicador ok, no se cierra app sacador">
|
|
||||||
<created>1669975009865</created>
|
|
||||||
<option name="number" value="00102" />
|
|
||||||
<option name="presentableId" value="LOCAL-00102" />
|
|
||||||
<option name="project" value="LOCAL" />
|
|
||||||
<updated>1669975009872</updated>
|
|
||||||
</task>
|
|
||||||
<task id="LOCAL-00103" summary="Version 9.6Beta. TEST6-final: Modificando llamadas a SilexCallback (AjustesFragment)">
|
|
||||||
<created>1670580001733</created>
|
|
||||||
<option name="number" value="00103" />
|
|
||||||
<option name="presentableId" value="LOCAL-00103" />
|
|
||||||
<option name="project" value="LOCAL" />
|
|
||||||
<updated>1670580001733</updated>
|
|
||||||
</task>
|
|
||||||
<task id="LOCAL-00104" summary="Version 9.6Beta. TEST6-13122022. Dos revisiones de ubicador.">
|
|
||||||
<created>1670915898012</created>
|
|
||||||
<option name="number" value="00104" />
|
|
||||||
<option name="presentableId" value="LOCAL-00104" />
|
|
||||||
<option name="project" value="LOCAL" />
|
|
||||||
<updated>1670915898013</updated>
|
|
||||||
</task>
|
|
||||||
<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>
|
|
||||||
<task id="LOCAL-00106" summary="Version 23.2-Fallo item_card">
|
|
||||||
<created>1674486271874</created>
|
|
||||||
<option name="number" value="00106" />
|
|
||||||
<option name="presentableId" value="LOCAL-00106" />
|
|
||||||
<option name="project" value="LOCAL" />
|
|
||||||
<updated>1674486271876</updated>
|
|
||||||
</task>
|
|
||||||
<task id="LOCAL-00107" summary="Version 23.2 Modificado orden ubicador y revisión anterior falta activar icono">
|
|
||||||
<created>1674660080703</created>
|
|
||||||
<option name="number" value="00107" />
|
|
||||||
<option name="presentableId" value="LOCAL-00107" />
|
|
||||||
<option name="project" value="LOCAL" />
|
|
||||||
<updated>1674660080704</updated>
|
|
||||||
</task>
|
|
||||||
<task id="LOCAL-00108" summary="Version 23.2 Modificado actualizar pantalla al transferir en Ubicador. Subida version">
|
|
||||||
<created>1674813532897</created>
|
|
||||||
<option name="number" value="00108" />
|
|
||||||
<option name="presentableId" value="LOCAL-00108" />
|
|
||||||
<option name="project" value="LOCAL" />
|
|
||||||
<updated>1674813532898</updated>
|
|
||||||
</task>
|
|
||||||
<task id="LOCAL-00109" summary="Activado impresion labelCount">
|
|
||||||
<created>1676562624750</created>
|
|
||||||
<option name="number" value="00109" />
|
|
||||||
<option name="presentableId" value="LOCAL-00109" />
|
|
||||||
<option name="project" value="LOCAL" />
|
|
||||||
<updated>1676562624751</updated>
|
|
||||||
</task>
|
|
||||||
<option name="localTasksCounter" value="110" />
|
|
||||||
<servers />
|
|
||||||
</component>
|
|
||||||
<component name="Vcs.Log.History.Properties">
|
|
||||||
<option name="COLUMN_ID_ORDER">
|
|
||||||
<list>
|
|
||||||
<option value="Default.Root" />
|
|
||||||
<option value="Default.Author" />
|
|
||||||
<option value="Default.Date" />
|
|
||||||
<option value="Default.Subject" />
|
|
||||||
</list>
|
|
||||||
</option>
|
|
||||||
</component>
|
|
||||||
<component name="Vcs.Log.Tabs.Properties">
|
|
||||||
<option name="TAB_STATES">
|
|
||||||
<map>
|
|
||||||
<entry key="1">
|
|
||||||
<value>
|
|
||||||
<State>
|
|
||||||
<option name="FILTERS">
|
|
||||||
<map>
|
|
||||||
<entry key="branch">
|
|
||||||
<value>
|
|
||||||
<list>
|
|
||||||
<option value="test" />
|
|
||||||
</list>
|
|
||||||
</value>
|
|
||||||
</entry>
|
|
||||||
</map>
|
|
||||||
</option>
|
|
||||||
</State>
|
|
||||||
</value>
|
|
||||||
</entry>
|
|
||||||
<entry key="MAIN">
|
|
||||||
<value>
|
|
||||||
<State>
|
|
||||||
<option name="BEK_SORT_TYPE" value="1" />
|
|
||||||
<option name="FILTERS">
|
|
||||||
<map>
|
|
||||||
<entry key="branch">
|
|
||||||
<value>
|
|
||||||
<list>
|
|
||||||
<option value="testBeta_crashlytics" />
|
|
||||||
</list>
|
|
||||||
</value>
|
|
||||||
</entry>
|
|
||||||
</map>
|
|
||||||
</option>
|
|
||||||
<option name="COLUMN_ID_WIDTH">
|
|
||||||
<map>
|
|
||||||
<entry key="Table.Default.Author.ColumnIdWidth" value="18" />
|
|
||||||
<entry key="Table.Default.Date.ColumnIdWidth" value="18" />
|
|
||||||
</map>
|
|
||||||
</option>
|
|
||||||
</State>
|
|
||||||
</value>
|
|
||||||
</entry>
|
|
||||||
<entry key="a7a6ac7c-1e79-4c0b-bbb7-6f3f2203baeb">
|
|
||||||
<value>
|
|
||||||
<State>
|
|
||||||
<option name="FILTERS">
|
|
||||||
<map>
|
|
||||||
<entry key="range">
|
|
||||||
<value>
|
|
||||||
<list>
|
|
||||||
<option value="master..test" />
|
|
||||||
</list>
|
|
||||||
</value>
|
|
||||||
</entry>
|
|
||||||
<entry key="roots">
|
|
||||||
<value>
|
|
||||||
<list>
|
|
||||||
<option value="$PROJECT_DIR$" />
|
|
||||||
</list>
|
|
||||||
</value>
|
|
||||||
</entry>
|
|
||||||
</map>
|
|
||||||
</option>
|
|
||||||
</State>
|
|
||||||
</value>
|
|
||||||
</entry>
|
|
||||||
</map>
|
|
||||||
</option>
|
|
||||||
<option name="RECENT_FILTERS">
|
|
||||||
<map>
|
|
||||||
<entry key="Branch">
|
|
||||||
<value>
|
|
||||||
<list>
|
|
||||||
<RecentGroup>
|
|
||||||
<option name="FILTER_VALUES">
|
|
||||||
<option value="appverdnatura/master" />
|
|
||||||
</option>
|
|
||||||
</RecentGroup>
|
|
||||||
</list>
|
|
||||||
</value>
|
|
||||||
</entry>
|
|
||||||
</map>
|
|
||||||
</option>
|
|
||||||
</component>
|
|
||||||
<component name="VcsManagerConfiguration">
|
|
||||||
<option name="ADD_EXTERNAL_FILES_SILENTLY" value="true" />
|
|
||||||
<MESSAGE value="Version 9.2.1 Modificado fragment a fragment_general" />
|
|
||||||
<MESSAGE value="Version 9.2.1 añadido error encajado y modificado marcaje" />
|
|
||||||
<MESSAGE value="Version 9.2.1 en producción" />
|
|
||||||
<MESSAGE value="Version 9.2.1 en producción. Borrada Voz y Ajustes impresora" />
|
|
||||||
<MESSAGE value="Version 9.2 Error encajado y en ver Ticket aparece ver la colección" />
|
|
||||||
<MESSAGE value="Version 9.4Beta Cmr, Control ubicación, volver atrás de Controlador, botón llamadas, volver pantalla anterior parking," />
|
|
||||||
<MESSAGE value="Modificado control ubicación" />
|
|
||||||
<MESSAGE value="Version 9.5Beta añadido inteceptor y modificado código worker_getId. Subida como 9.4.2Beta" />
|
|
||||||
<MESSAGE value="Version 9.6Beta Interteceptors, quitando userCase y arreglado click sobre carita. Cambiado .gitignore" />
|
|
||||||
<MESSAGE value="Version 9.6Beta Interteptors, quitando userCase y arreglado click sobre carita. Cambiado .gitignore" />
|
|
||||||
<MESSAGE value="Version 9.6Beta Añadido a BaseFragment(context). Quitado código repetido de las llamadas" />
|
|
||||||
<MESSAGE value="Version 9.6Beta Borrado referencias a api Nodejs y código relacionado" />
|
|
||||||
<MESSAGE value="Version 9.6Beta Cambiadas llamadas y campos( collectionFk). Borrado Presacador" />
|
|
||||||
<MESSAGE value="Version 9.6Beta en test" />
|
|
||||||
<MESSAGE value="Version 9.6Beta en test : ubicador, quality, posicion, buscar item, reclamaciones..." />
|
|
||||||
<MESSAGE value="Version 9.6Beta en test: paletizadores" />
|
|
||||||
<MESSAGE value="Version 9.6Beta. TEST5: imprimir ok, ubicador ok, no se cierra app sacador" />
|
|
||||||
<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-13122022. Dos revisiones de ubicador." />
|
|
||||||
<MESSAGE value="Version 23.2 Cambiado collection_assign a String." />
|
|
||||||
<MESSAGE value="Version 23.2-Fallo item_card" />
|
|
||||||
<MESSAGE value="Version 23.2 Modificado orden ubicador y revisión anterior falta activar icono" />
|
|
||||||
<MESSAGE value="Version 23.2 Modificado actualizar pantalla al transferir en Ubicador. Subida version" />
|
|
||||||
<MESSAGE value="Activado impresion labelCount" />
|
|
||||||
<option name="LAST_COMMIT_MESSAGE" value="Activado impresion labelCount" />
|
|
||||||
</component>
|
|
||||||
<component name="XDebuggerManager">
|
|
||||||
<breakpoint-manager>
|
|
||||||
<breakpoints>
|
|
||||||
<line-breakpoint enabled="true" suspend="THREAD" type="kotlin-line">
|
|
||||||
<url>file://$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/controlvehiculo/fragment/ControlVehiculoFragment.kt</url>
|
|
||||||
<line>362</line>
|
|
||||||
<option name="timeStamp" value="1" />
|
|
||||||
</line-breakpoint>
|
|
||||||
<line-breakpoint enabled="true" suspend="THREAD" type="kotlin-line">
|
|
||||||
<url>file://$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/controlvehiculo/fragment/ControlVehiculoViewModel.kt</url>
|
|
||||||
<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/delivery/fragments/LogExpeditionFragment.kt</url>
|
|
||||||
<line>163</line>
|
|
||||||
<option name="timeStamp" value="18" />
|
|
||||||
</line-breakpoint>
|
|
||||||
</breakpoints>
|
|
||||||
</breakpoint-manager>
|
|
||||||
<pin-to-top-manager>
|
|
||||||
<pinned-members>
|
|
||||||
<PinnedItemInfo parentTag="java.net.SocketException" memberName="detailMessage" />
|
|
||||||
<PinnedItemInfo parentTag="es.verdnatura.MobileApplication" memberName="silex" />
|
|
||||||
<PinnedItemInfo parentTag="retrofit2.ExecutorCallAdapterFactory$ExecutorCallbackCall" memberName="delegate" />
|
|
||||||
<PinnedItemInfo parentTag="retrofit2.Response" memberName="errorBody" />
|
|
||||||
<PinnedItemInfo parentTag="java.lang.Error" memberName="shadow$_klass_" />
|
|
||||||
<PinnedItemInfo parentTag="es.verdnatura.presentation.view.feature.sacador.fragment.SacadorViewModel" memberName="_registerSmarttagInsert$delegate" />
|
|
||||||
</pinned-members>
|
|
||||||
</pin-to-top-manager>
|
|
||||||
<watches-manager>
|
|
||||||
<configuration name="app">
|
|
||||||
<watch expression="((SocketTimeoutException)((SocketTimeoutException)t).cause).cause" custom="java.net.SocketTimeoutException" />
|
|
||||||
<watch expression="this" />
|
|
||||||
<watch expression="t" />
|
|
||||||
<watch expression="t" />
|
|
||||||
</configuration>
|
|
||||||
</watches-manager>
|
|
||||||
</component>
|
|
||||||
</project>
|
|
||||||
|
|
@ -13,9 +13,9 @@ android {
|
||||||
applicationId "es.verdnatura"
|
applicationId "es.verdnatura"
|
||||||
minSdkVersion 24 //21
|
minSdkVersion 24 //21
|
||||||
targetSdkVersion 33
|
targetSdkVersion 33
|
||||||
versionCode 161
|
versionCode 170
|
||||||
//versionName = "23.4" versionCode 157
|
//versionName = "23.4" versionCode 157
|
||||||
versionName = "23.4Beta"
|
versionName = "23.8Beta"
|
||||||
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
|
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -86,13 +86,9 @@ class LogExpeditionFragment(
|
||||||
private fun openAppDelivery() {
|
private fun openAppDelivery() {
|
||||||
val i = Intent()
|
val i = Intent()
|
||||||
i.setClassName(
|
i.setClassName(
|
||||||
"verdnatura.es.repartoverdnatura",
|
"verdnatura.es.repartoverdnatura.sfusion",
|
||||||
"verdnatura.es.repartoverdnatura.ExpeditionSummaryActivity"
|
"verdnatura.es.repartoverdnatura.ExpeditionSummaryActivity"
|
||||||
)
|
)
|
||||||
/* i.putExtra("token", getData(TOKEN))
|
|
||||||
i.putExtra("user", getData(USER))
|
|
||||||
i.putExtra("userId", getDataInt(USER))
|
|
||||||
i.putExtra("password", getData(PASSWORD))*/
|
|
||||||
i.putExtra("routeId", binding.route.text)
|
i.putExtra("routeId", binding.route.text)
|
||||||
i.putExtra("app", "picking")
|
i.putExtra("app", "picking")
|
||||||
startActivity(i)
|
startActivity(i)
|
||||||
|
|
|
||||||
|
|
@ -3,15 +3,12 @@ package es.verdnatura.presentation.view.feature.main.activity
|
||||||
|
|
||||||
import android.content.SharedPreferences
|
import android.content.SharedPreferences
|
||||||
import android.media.MediaPlayer
|
import android.media.MediaPlayer
|
||||||
import android.util.Log
|
|
||||||
import android.view.Menu
|
import android.view.Menu
|
||||||
import android.widget.Toast
|
import android.widget.Toast
|
||||||
import androidx.core.content.ContextCompat
|
import androidx.core.content.ContextCompat
|
||||||
import androidx.databinding.ktx.BuildConfig
|
|
||||||
import androidx.fragment.app.Fragment
|
import androidx.fragment.app.Fragment
|
||||||
import androidx.fragment.app.FragmentManager
|
import androidx.fragment.app.FragmentManager
|
||||||
import com.google.android.material.bottomnavigation.LabelVisibilityMode.LABEL_VISIBILITY_UNLABELED
|
import com.google.android.material.bottomnavigation.LabelVisibilityMode.LABEL_VISIBILITY_UNLABELED
|
||||||
import es.verdnatura.MobileApplication
|
|
||||||
import es.verdnatura.R
|
import es.verdnatura.R
|
||||||
import es.verdnatura.databinding.ActivityMainBinding
|
import es.verdnatura.databinding.ActivityMainBinding
|
||||||
import es.verdnatura.domain.ConstAndValues.MAINACTIVITY
|
import es.verdnatura.domain.ConstAndValues.MAINACTIVITY
|
||||||
|
|
@ -76,7 +73,6 @@ import kotlinx.coroutines.DelicateCoroutinesApi
|
||||||
import kotlinx.coroutines.Dispatchers
|
import kotlinx.coroutines.Dispatchers
|
||||||
import kotlinx.coroutines.GlobalScope
|
import kotlinx.coroutines.GlobalScope
|
||||||
import kotlinx.coroutines.launch
|
import kotlinx.coroutines.launch
|
||||||
import timber.log.Timber
|
|
||||||
|
|
||||||
|
|
||||||
class MainActivity : BaseActivity<ActivityMainBinding>(), OnPasillerosItemClickListener,
|
class MainActivity : BaseActivity<ActivityMainBinding>(), OnPasillerosItemClickListener,
|
||||||
|
|
@ -107,9 +103,13 @@ class MainActivity : BaseActivity<ActivityMainBinding>(), OnPasillerosItemClickL
|
||||||
if (extras != null && extras.containsKey("menu")) {
|
if (extras != null && extras.containsKey("menu")) {
|
||||||
comeFromDelivery = true
|
comeFromDelivery = true
|
||||||
val option = extras.getString("menu")
|
val option = extras.getString("menu")
|
||||||
val prefs = (applicationContext as MobileApplication).getPrefs()
|
|
||||||
prefs.putString("USER", extras.getString("user"))
|
saveDataInt("USERFK", extras.getString("userfk")!!.toInt())
|
||||||
prefs.putString("PASSWORD", extras.getString("password"))
|
saveUserAccesPref(
|
||||||
|
extras.getString("user").toString(),
|
||||||
|
extras.getString("password").toString()
|
||||||
|
)
|
||||||
|
|
||||||
when (option) {
|
when (option) {
|
||||||
"log" -> onPasillerosItemClickListener(
|
"log" -> onPasillerosItemClickListener(
|
||||||
PasillerosItemVO(
|
PasillerosItemVO(
|
||||||
|
|
@ -126,7 +126,7 @@ class MainActivity : BaseActivity<ActivityMainBinding>(), OnPasillerosItemClickL
|
||||||
"info" -> onPasillerosItemClickListener(
|
"info" -> onPasillerosItemClickListener(
|
||||||
PasillerosItemVO(
|
PasillerosItemVO(
|
||||||
30,
|
30,
|
||||||
R.drawable.expedition_find,
|
R.drawable.ic_info,
|
||||||
getString(R.string.titleInfo),
|
getString(R.string.titleInfo),
|
||||||
R.string.titleInfo,
|
R.string.titleInfo,
|
||||||
getString(
|
getString(
|
||||||
|
|
@ -165,6 +165,24 @@ class MainActivity : BaseActivity<ActivityMainBinding>(), OnPasillerosItemClickL
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
fun saveDataInt(name: String, value: Int) {
|
||||||
|
val prefs: SharedPreferences = getSharedPreferences("es.verdnatura.user.prefs", 0)
|
||||||
|
val editor = prefs.edit()
|
||||||
|
|
||||||
|
when (name) {
|
||||||
|
name -> editor.putInt(name, value)
|
||||||
|
}
|
||||||
|
editor.apply()
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
private fun saveUserAccesPref(user: String, password: String) {
|
||||||
|
val prefs: SharedPreferences = this.getSharedPreferences("es.verdnatura.user.prefs", 0)
|
||||||
|
val editor = prefs.edit()
|
||||||
|
editor.putString("user", user)
|
||||||
|
editor.putString("password", password)
|
||||||
|
editor.apply()
|
||||||
|
}
|
||||||
|
|
||||||
fun havePrinter(): Boolean {
|
fun havePrinter(): Boolean {
|
||||||
val prefs: SharedPreferences = getSharedPreferences("es.verdnatura.user.prefs", 0)
|
val prefs: SharedPreferences = getSharedPreferences("es.verdnatura.user.prefs", 0)
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue