refs #6284 feat:update and review xml
This commit is contained in:
parent
f5def21b26
commit
27267c08a6
|
|
@ -116,42 +116,112 @@
|
|||
</select>
|
||||
</component>
|
||||
<component name="ChangeListManager">
|
||||
<list default="true" id="fa688d1c-dbee-4864-9e33-4d84ef9afca8" name="Default Changelist" comment="version 24.8beta">
|
||||
<list default="true" id="fa688d1c-dbee-4864-9e33-4d84ef9afca8" name="Default Changelist" comment="refs #6284 feat:update and review xml">
|
||||
<change afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/main/activity/MainActivityViewModel.kt" 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/beta/release/output-metadata.json" beforeDir="false" afterPath="$PROJECT_DIR$/app/beta/release/output-metadata.json" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/common/ResponseItemVO.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/common/ResponseItemVO.kt" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/build.gradle" beforeDir="false" afterPath="$PROJECT_DIR$/app/build.gradle" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/ajustes/fragment/AjustesViewModel.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/ajustes/fragment/AjustesViewModel.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" />
|
||||
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/buscaritem/fragment/BuscarItemViewModel.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/buscaritem/fragment/BuscarItemViewModel.kt" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/collection/adapter/SaleAdapterNew.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/collection/adapter/SaleAdapterNew.kt" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/collection/fragment/CollectionFragmentPickerNew.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/collection/fragment/CollectionFragmentPickerNew.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/delivery/viewmodels/DeliveryViewModel.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/diadeventa/fragment/DayOfSaleViewModel.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/diadeventa/fragment/DayOfSaleViewModel.kt" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/historicoarticulo/fragment/HistoricoArticuloViewModel.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/historicoarticulo/fragment/HistoricoArticuloViewModel.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/historicoshelvinglog/fragment/shelvingLogViewModel.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/historicoshelvinglog/fragment/shelvingLogViewModel.kt" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/historicovehiculo/fragment/HistoricoVehiculoViewModel.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/historicovehiculo/fragment/HistoricoVehiculoViewModel.kt" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/imageview/activity/ImageViewActivity.kt" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/inventario/fragment/InventaryParkingFragment.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/inventario/fragment/InventaryParkingFragment.kt" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/inventario/fragment/InventaryViewModel.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/inventario/fragment/InventaryViewModel.kt" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/login/fragment/LoginViewModel.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/login/fragment/LoginViewModel.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/main/model/ItemMenuVO.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/main/model/ItemMenuVO.kt" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/paletizador/fragment/ExpeditionPalletDetailViewModel.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/paletizador/fragment/ExpeditionPalletDetailViewModel.kt" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/paletizador/fragment/ExpeditionPalletViewModel.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/paletizador/fragment/ExpeditionPalletViewModel.kt" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/paletizador/fragment/ExpeditionScanViewModel.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/paletizador/fragment/ExpeditionScanViewModel.kt" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/paletizador/fragment/ExpeditionTruckListViewModel.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/paletizador/fragment/ExpeditionTruckListViewModel.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/sacador/fragment/SacadorFragmentNew.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/sacador/fragment/SacadorFragmentNew.kt" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/delivery/adapters/RouteAdapter.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/delivery/adapters/RouteAdapter.kt" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/delivery/adapters/TicketAdapter.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/delivery/adapters/TicketAdapter.kt" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/delivery/fragments/TicketsFragment.kt" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/es/verdnatura/presentation/view/feature/delivery/fragments/TicketsFragment.kt" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/src/main/res/layout/activity_imageview.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/res/layout/activity_imageview.xml" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/src/main/res/layout/activity_sign.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/res/layout/activity_sign.xml" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/src/main/res/layout/component_custom_dynamic_dialog.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/res/layout/component_custom_dynamic_dialog.xml" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/src/main/res/layout/component_custom_hour.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/res/layout/component_custom_hour.xml" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/src/main/res/layout/component_custom_list_dialog.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/res/layout/component_custom_list_dialog.xml" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/src/main/res/layout/component_custom_ubicador_dialog.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/res/layout/component_custom_ubicador_dialog.xml" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/src/main/res/layout/component_custom_ubicador_dialog_new.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/res/layout/component_custom_ubicador_dialog_new.xml" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/src/main/res/layout/fragment_ajustes.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/res/layout/fragment_ajustes.xml" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/src/main/res/layout/fragment_buscar_item.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/res/layout/fragment_buscar_item.xml" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/src/main/res/layout/fragment_collection.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/res/layout/fragment_collection.xml" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/src/main/res/layout/fragment_collection_new.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/res/layout/fragment_collection_new.xml" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/src/main/res/layout/fragment_expedition_loadunload_delivery.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/res/layout/fragment_expedition_loadunload_delivery.xml" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/src/main/res/layout/fragment_expedition_log_delivery.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/res/layout/fragment_expedition_log_delivery.xml" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/src/main/res/layout/fragment_expedition_pallet.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/res/layout/fragment_expedition_pallet.xml" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/src/main/res/layout/fragment_expedition_pallet_detail.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/res/layout/fragment_expedition_pallet_detail.xml" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/src/main/res/layout/fragment_expedition_scan.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/res/layout/fragment_expedition_scan.xml" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/src/main/res/layout/fragment_expedition_summary.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/res/layout/fragment_expedition_summary.xml" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/src/main/res/layout/fragment_expedition_truck_list.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/res/layout/fragment_expedition_truck_list.xml" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/src/main/res/layout/fragment_expeditionscan_sorter.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/res/layout/fragment_expeditionscan_sorter.xml" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/src/main/res/layout/fragment_general_black.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/res/layout/fragment_general_black.xml" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/src/main/res/layout/fragment_historico.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/res/layout/fragment_historico.xml" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/src/main/res/layout/fragment_historicovehiculo.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/res/layout/fragment_historicovehiculo.xml" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/src/main/res/layout/fragment_info_delivery.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/fragment_inventary.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/res/layout/fragment_inventary.xml" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/src/main/res/layout/fragment_inventory_parking.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/res/layout/fragment_inventory_parking.xml" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/src/main/res/layout/fragment_item_card.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/res/layout/fragment_item_card.xml" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/src/main/res/layout/fragment_itemdayofsale_card.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/res/layout/fragment_itemdayofsale_card.xml" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/src/main/res/layout/fragment_itemproposal.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/res/layout/fragment_itemproposal.xml" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/src/main/res/layout/fragment_itemshelvinglog.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/res/layout/fragment_itemshelvinglog.xml" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/src/main/res/layout/fragment_login.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/res/layout/fragment_login.xml" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/src/main/res/layout/fragment_packaging.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/res/layout/fragment_packaging.xml" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/src/main/res/layout/fragment_packaging_count.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/res/layout/fragment_packaging_count.xml" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/src/main/res/layout/fragment_packaging_obs.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/res/layout/fragment_packaging_obs.xml" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/src/main/res/layout/fragment_packaging_summary.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/res/layout/fragment_packaging_summary.xml" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/src/main/res/layout/fragment_photos.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/res/layout/fragment_photos.xml" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/src/main/res/layout/fragment_pre_sacador.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/res/layout/fragment_pre_sacador.xml" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/src/main/res/layout/fragment_route.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/res/layout/fragment_route.xml" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/src/main/res/layout/fragment_route_config.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/res/layout/fragment_route_config.xml" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/src/main/res/layout/fragment_shelvinglog.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/res/layout/fragment_shelvinglog.xml" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/src/main/res/layout/fragment_tickets.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/res/layout/fragment_tickets.xml" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/src/main/res/layout/fragment_ubicador.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/res/layout/fragment_ubicador.xml" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/src/main/res/layout/fragment_vehiclecontrol_user.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/res/layout/fragment_vehiclecontrol_user.xml" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/src/main/res/layout/fragment_workermistake.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/res/layout/fragment_workermistake.xml" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/src/main/res/layout/item_ajustes_row.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/res/layout/item_ajustes_row.xml" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/src/main/res/layout/item_article_row.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/res/layout/item_article_row.xml" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/src/main/res/layout/item_article_row_fragment.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/res/layout/item_article_row_fragment.xml" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/src/main/res/layout/item_article_row_presacador.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/res/layout/item_article_row_presacador.xml" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/src/main/res/layout/item_article_row_reubication_fragment.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/res/layout/item_article_row_reubication_fragment.xml" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/src/main/res/layout/item_barcode_row.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/res/layout/item_barcode_row.xml" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/src/main/res/layout/item_card_row.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/res/layout/item_card_row.xml" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/src/main/res/layout/item_collection_row.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/res/layout/item_collection_row.xml" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/src/main/res/layout/item_collection_row_new.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/res/layout/item_collection_row_new.xml" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/src/main/res/layout/item_escaner_row.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/res/layout/item_escaner_row.xml" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/src/main/res/layout/item_expedition_loadunload_row.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/res/layout/item_expedition_loadunload_row.xml" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/src/main/res/layout/item_expedition_summary_row.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/res/layout/item_expedition_summary_row.xml" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/src/main/res/layout/item_expedition_view_row.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/res/layout/item_expedition_view_row.xml" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/src/main/res/layout/item_expeditionlog_row.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/res/layout/item_expeditionlog_row.xml" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/src/main/res/layout/item_expeditionpallet_row.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/res/layout/item_expeditionpallet_row.xml" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/src/main/res/layout/item_expeditionscan_row.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/res/layout/item_expeditionscan_row.xml" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/src/main/res/layout/item_expeditionstate_row.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/res/layout/item_expeditionstate_row.xml" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/src/main/res/layout/item_expeditiontruck_row.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/res/layout/item_expeditiontruck_row.xml" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/src/main/res/layout/item_general_row.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/res/layout/item_general_row.xml" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/src/main/res/layout/item_general_row_image.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/res/layout/item_general_row_image.xml" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/src/main/res/layout/item_historico_row.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/res/layout/item_historico_row.xml" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/src/main/res/layout/item_historicovehiculo_row.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/res/layout/item_historicovehiculo_row.xml" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/src/main/res/layout/item_image_row.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/res/layout/item_image_row.xml" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/src/main/res/layout/item_inventary_row.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/res/layout/item_inventary_row.xml" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/src/main/res/layout/item_inventory_parking_row.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/res/layout/item_inventory_parking_row.xml" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/src/main/res/layout/item_itemsupplier_row.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/res/layout/item_itemsupplier_row.xml" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/src/main/res/layout/item_last_ticket_row.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/res/layout/item_last_ticket_row.xml" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/src/main/res/layout/item_location_row.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/res/layout/item_location_row.xml" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/src/main/res/layout/item_main_menu.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/res/layout/item_main_menu.xml" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/src/main/res/layout/item_pasilleros_main_menu.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/res/layout/item_pasilleros_main_menu.xml" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/src/main/res/layout/item_placement_reubication_row.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/res/layout/item_placement_reubication_row.xml" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/src/main/res/layout/item_proposal_row.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/res/layout/item_proposal_row.xml" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/src/main/res/layout/item_route_row.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/res/layout/item_route_row.xml" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/src/main/res/layout/item_shelvingdayofsale_row.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/res/layout/item_shelvingdayofsale_row.xml" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/src/main/res/layout/item_shelvinglog_row.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/res/layout/item_shelvinglog_row.xml" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/src/main/res/layout/item_smarttag_row.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/res/layout/item_smarttag_row.xml" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/src/main/res/layout/item_ticket_row.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/res/layout/item_ticket_row.xml" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/src/main/res/layout/item_ticket_sub_row.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/res/layout/item_ticket_sub_row.xml" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/src/main/res/layout/item_ubication_row.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/res/layout/item_ubication_row.xml" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/src/main/res/layout/item_ubication_row_new.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/res/layout/item_ubication_row_new.xml" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/src/main/res/layout/item_work_forms_row.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/res/layout/item_work_forms_row.xml" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/src/main/res/layout/item_workermistake_row.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/res/layout/item_workermistake_row.xml" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/src/main/res/layout/layout.xml" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/src/main/res/layout/sale_row_fragment.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/res/layout/sale_row_fragment.xml" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/src/main/res/layout/sale_row_fragment_old.xml" beforeDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/src/main/res/layout/shelvinglog_row.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/res/layout/shelvinglog_row.xml" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/src/main/res/layout/toolbar.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/res/layout/toolbar.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-fr/strings.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/res/values-fr/strings.xml" afterDir="false" />
|
||||
<change beforePath="$PROJECT_DIR$/app/src/main/res/values-pt/strings.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/res/values-pt/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" />
|
||||
<change beforePath="$PROJECT_DIR$/app/src/main/res/values/styles.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/res/values/styles.xml" afterDir="false" />
|
||||
</list>
|
||||
<option name="SHOW_DIALOG" value="false" />
|
||||
<option name="HIGHLIGHT_CONFLICTS" value="true" />
|
||||
|
|
@ -522,20 +592,6 @@
|
|||
<option name="presentableId" value="Default" />
|
||||
<updated>1618825571576</updated>
|
||||
</task>
|
||||
<task id="LOCAL-00217" summary="refs #6460 fix:date">
|
||||
<created>1701936308931</created>
|
||||
<option name="number" value="00217" />
|
||||
<option name="presentableId" value="LOCAL-00217" />
|
||||
<option name="project" value="LOCAL" />
|
||||
<updated>1701936308933</updated>
|
||||
</task>
|
||||
<task id="LOCAL-00218" summary="refs #6276: prepare Salixback">
|
||||
<created>1704287624399</created>
|
||||
<option name="number" value="00218" />
|
||||
<option name="presentableId" value="LOCAL-00218" />
|
||||
<option name="project" value="LOCAL" />
|
||||
<updated>1704287624400</updated>
|
||||
</task>
|
||||
<task id="LOCAL-00219" summary="refs #6276: prepare Salixback">
|
||||
<created>1704287791903</created>
|
||||
<option name="number" value="00219" />
|
||||
|
|
@ -865,7 +921,21 @@
|
|||
<option name="project" value="LOCAL" />
|
||||
<updated>1709023728220</updated>
|
||||
</task>
|
||||
<option name="localTasksCounter" value="266" />
|
||||
<task id="LOCAL-00266" summary="modify gitIgnore">
|
||||
<created>1709194756823</created>
|
||||
<option name="number" value="00266" />
|
||||
<option name="presentableId" value="LOCAL-00266" />
|
||||
<option name="project" value="LOCAL" />
|
||||
<updated>1709194756823</updated>
|
||||
</task>
|
||||
<task id="LOCAL-00267" summary="refs #6284 feat:update and review xml">
|
||||
<created>1709195011705</created>
|
||||
<option name="number" value="00267" />
|
||||
<option name="presentableId" value="LOCAL-00267" />
|
||||
<option name="project" value="LOCAL" />
|
||||
<updated>1709195011705</updated>
|
||||
</task>
|
||||
<option name="localTasksCounter" value="268" />
|
||||
<servers />
|
||||
</component>
|
||||
<component name="Vcs.Log.History.Properties">
|
||||
|
|
@ -973,7 +1043,6 @@
|
|||
</component>
|
||||
<component name="VcsManagerConfiguration">
|
||||
<option name="ADD_EXTERNAL_FILES_SILENTLY" value="true" />
|
||||
<MESSAGE value="refs #6786 inventaryParking" />
|
||||
<MESSAGE value="refs #6108 feat: add language" />
|
||||
<MESSAGE value="refs #6107 feat: refactor fields" />
|
||||
<MESSAGE value="refs #6458 feat:showDialogChecker" />
|
||||
|
|
@ -994,11 +1063,12 @@
|
|||
<MESSAGE value="refs #6004 feat:preferences by dataStore" />
|
||||
<MESSAGE value="refs #6188 feat:UI changes" />
|
||||
<MESSAGE value="refs #6413 feat:refactor ubicador" />
|
||||
<MESSAGE value="refs #6284 feat:update and review xml" />
|
||||
<MESSAGE value="refs #6413 feat:refactor Ubicador" />
|
||||
<MESSAGE value="refs #6531 feat:last tickets" />
|
||||
<MESSAGE value="version 24.8beta" />
|
||||
<option name="LAST_COMMIT_MESSAGE" value="version 24.8beta" />
|
||||
<MESSAGE value="modify gitIgnore" />
|
||||
<MESSAGE value="refs #6284 feat:update and review xml" />
|
||||
<option name="LAST_COMMIT_MESSAGE" value="refs #6284 feat:update and review xml" />
|
||||
</component>
|
||||
<component name="XDebuggerManager">
|
||||
<pin-to-top-manager>
|
||||
|
|
|
|||
|
|
@ -186,6 +186,17 @@ class AjustesViewModel(val context: Context) : BaseViewModel(context) {
|
|||
true
|
||||
)
|
||||
)
|
||||
_ajustesitem.add(
|
||||
AjustesItemVO(
|
||||
9,
|
||||
"Iniciar parada",
|
||||
selected = "",
|
||||
0,
|
||||
0,
|
||||
0, "",
|
||||
false
|
||||
)
|
||||
)
|
||||
_ajustesitem.add(
|
||||
AjustesItemVO(
|
||||
5,
|
||||
|
|
|
|||
|
|
@ -20,27 +20,15 @@ class TicketAdapter(
|
|||
|
||||
) : RecyclerView.Adapter<TicketAdapter.ItemHolder>() {
|
||||
|
||||
|
||||
override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ItemHolder {
|
||||
// items = setHeaders(items)
|
||||
return ItemHolder(
|
||||
ItemTicketRowBinding.inflate(
|
||||
LayoutInflater.from(parent.context),
|
||||
parent,
|
||||
false
|
||||
LayoutInflater.from(parent.context), parent, false
|
||||
)
|
||||
)
|
||||
}
|
||||
|
||||
fun setHeaders(list: MutableList<ClientTicketSalix>): MutableList<ClientTicketSalix> {
|
||||
|
||||
/* var prevCreated = ""
|
||||
for (route in list) {
|
||||
if (route.created.toString() != prevCreated) {
|
||||
route.header = true
|
||||
prevCreated = route.created.toString()
|
||||
}
|
||||
}*/
|
||||
return list
|
||||
}
|
||||
|
||||
|
|
@ -52,13 +40,8 @@ class TicketAdapter(
|
|||
override fun getItemCount() = items.size
|
||||
|
||||
override fun onBindViewHolder(holder: ItemHolder, position: Int) {
|
||||
// items = setHeaders(items)
|
||||
|
||||
holder.bind(items[position])
|
||||
|
||||
/* holder.binding.root.setOnClickListener {
|
||||
//onAddressRowClickListener.onAddressRowClickListener(items[position])
|
||||
}*/
|
||||
|
||||
val viewTickets = holder.itemView.findViewById<LinearLayout>(R.id.layoutTickets)
|
||||
viewTickets.removeAllViews()
|
||||
|
||||
|
|
@ -94,46 +77,39 @@ class TicketAdapter(
|
|||
if (!item.ticketObservation.isNullOrEmpty()) {
|
||||
note.setColorFilter(
|
||||
ContextCompat.getColor(
|
||||
note.context,
|
||||
R.color.verdnatura_dark_sky_blue
|
||||
note.context, R.color.verdnatura_dark_sky_blue
|
||||
)
|
||||
)
|
||||
} else {
|
||||
note.setColorFilter(
|
||||
ContextCompat.getColor(
|
||||
note.context,
|
||||
R.color.verdnatura_white
|
||||
note.context, R.color.verdnatura_white
|
||||
)
|
||||
)
|
||||
}
|
||||
note.setOnClickListener {
|
||||
onItemButtonTicketRowClickListener.onItemButtonTicketRowClickListener(
|
||||
item,
|
||||
"note"
|
||||
item, "note"
|
||||
)
|
||||
}
|
||||
addNote.setOnClickListener {
|
||||
onItemButtonTicketRowClickListener.onItemButtonTicketRowClickListener(
|
||||
item,
|
||||
"addNote"
|
||||
item, "addNote"
|
||||
)
|
||||
}
|
||||
phone.setOnClickListener {
|
||||
onItemButtonTicketRowClickListener.onItemButtonTicketRowClickListener(
|
||||
item,
|
||||
"call"
|
||||
item, "call"
|
||||
)
|
||||
}
|
||||
map.setOnClickListener {
|
||||
onItemButtonTicketRowClickListener.onItemButtonTicketRowClickListener(
|
||||
item,
|
||||
"map"
|
||||
item, "map"
|
||||
)
|
||||
}
|
||||
unload.setOnClickListener {
|
||||
onItemButtonTicketRowClickListener.onItemButtonTicketRowClickListener(
|
||||
item,
|
||||
"unload"
|
||||
item, "unload"
|
||||
)
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -8,11 +8,9 @@ import android.content.Intent
|
|||
import android.content.pm.PackageManager
|
||||
import android.graphics.drawable.Drawable
|
||||
import android.net.Uri
|
||||
import android.os.Build
|
||||
import android.view.View
|
||||
import android.widget.ImageView
|
||||
import android.widget.TextView
|
||||
import androidx.annotation.RequiresApi
|
||||
import androidx.core.app.ActivityCompat
|
||||
import androidx.core.content.ContextCompat
|
||||
import androidx.core.view.isVisible
|
||||
|
|
@ -27,7 +25,17 @@ import es.verdnatura.domain.notNull
|
|||
import es.verdnatura.domain.toast
|
||||
import es.verdnatura.presentation.base.BaseFragment
|
||||
import es.verdnatura.presentation.base.database
|
||||
import es.verdnatura.presentation.common.*
|
||||
import es.verdnatura.presentation.common.GeneralAdapter
|
||||
import es.verdnatura.presentation.common.GeneralItem
|
||||
import es.verdnatura.presentation.common.ItemDescorationCustomized
|
||||
import es.verdnatura.presentation.common.OnGeneralItemRowClickListener
|
||||
import es.verdnatura.presentation.common.OnItemButtonCMRRowClickListener
|
||||
import es.verdnatura.presentation.common.OnItemButtonTicketRowClickListener
|
||||
import es.verdnatura.presentation.common.OnOptionsSelectedListener
|
||||
import es.verdnatura.presentation.common.OnPasillerosItemClickListener
|
||||
import es.verdnatura.presentation.common.ToolBarAdapterTooltip
|
||||
import es.verdnatura.presentation.common.addDateToTime
|
||||
import es.verdnatura.presentation.common.getHourDay
|
||||
import es.verdnatura.presentation.view.component.CustomDialogInputNotes
|
||||
import es.verdnatura.presentation.view.component.CustomDialogList
|
||||
import es.verdnatura.presentation.view.feature.delivery.adapters.TicketAdapter
|
||||
|
|
@ -67,7 +75,6 @@ class TicketsFragment(
|
|||
|
||||
override fun getLayoutId(): Int = R.layout.fragment_tickets
|
||||
|
||||
@RequiresApi(Build.VERSION_CODES.O)
|
||||
override fun init() {
|
||||
super.init()
|
||||
setEvents()
|
||||
|
|
@ -88,7 +95,6 @@ class TicketsFragment(
|
|||
customDialogList = CustomDialogList(requireContext())
|
||||
}
|
||||
|
||||
@RequiresApi(Build.VERSION_CODES.O)
|
||||
private fun setToolBar() {
|
||||
ma.hideBottomNavigation(View.GONE)
|
||||
binding.mainToolbar.toolbarSubtitle.setTextColor(requireContext().getColor((R.color.verdnatura_pumpkin_orange)))
|
||||
|
|
@ -107,13 +113,11 @@ class TicketsFragment(
|
|||
iconSigned.setImageResource(R.drawable.ic_sign_ticket)
|
||||
iconSend.setImageResource(R.drawable.ic_send)
|
||||
|
||||
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
|
||||
iconSettings.tooltipText = getTooltip(R.drawable.ic_setting_ui)
|
||||
iconSort.tooltipText = getTooltip(R.drawable.ic_sort)
|
||||
iconSigned.tooltipText = getTooltip(R.drawable.ic_sign_ticket)
|
||||
iconSend.tooltipText = getTooltip(R.drawable.ic_send)
|
||||
iconSettings.tooltipText = getTooltip(R.drawable.ic_setting_ui)
|
||||
iconSort.tooltipText = getTooltip(R.drawable.ic_sort)
|
||||
iconSigned.tooltipText = getTooltip(R.drawable.ic_sign_ticket)
|
||||
iconSend.tooltipText = getTooltip(R.drawable.ic_send)
|
||||
|
||||
}
|
||||
listIcons.add(iconSigned)
|
||||
listIcons.add(iconSend)
|
||||
listIcons.add(iconSettings)
|
||||
|
|
@ -246,7 +250,6 @@ class TicketsFragment(
|
|||
}
|
||||
}
|
||||
|
||||
@RequiresApi(Build.VERSION_CODES.O)
|
||||
override fun observeViewModel() {
|
||||
with(viewModel) {
|
||||
loadRouteList.observe(viewLifecycleOwner) { event ->
|
||||
|
|
@ -421,7 +424,7 @@ class TicketsFragment(
|
|||
private fun addNotes(itemClient: ClientTicketSalix) {
|
||||
|
||||
val customDialogInput = CustomDialogInputNotes(requireContext())
|
||||
customDialogInput.setTitle("Notas")
|
||||
customDialogInput.setTitle(getString(R.string.notes))
|
||||
|
||||
val adapter: GeneralAdapter
|
||||
val itemsNotes: List<GeneralItem> = listOf(
|
||||
|
|
@ -570,7 +573,10 @@ class TicketsFragment(
|
|||
val minute = mcurrentTime[Calendar.MINUTE]
|
||||
val mTimePicker = TimePickerDialog(
|
||||
requireContext(),
|
||||
{ _, selectedHour, selectedMinute -> textV.text = "$selectedHour:$selectedMinute" },
|
||||
{ _, selectedHour, selectedMinute ->
|
||||
textV.text =
|
||||
getString(R.string.hourMinute, selectedHour, selectedMinute)
|
||||
},
|
||||
hour,
|
||||
minute,
|
||||
true
|
||||
|
|
|
|||
|
|
@ -15,10 +15,12 @@
|
|||
android:layout_width="0dp"
|
||||
android:layout_height="0dp"
|
||||
android:src="@drawable/loadphoto"
|
||||
android:contentDescription="@string/selectImage"
|
||||
app:layout_constraintBottom_toBottomOf="parent"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintTop_toTopOf="parent" />
|
||||
app:layout_constraintTop_toTopOf="parent"
|
||||
/>
|
||||
<include
|
||||
android:id="@+id/main_toolbar"
|
||||
layout="@layout/toolbar_fragment"
|
||||
|
|
|
|||
|
|
@ -16,13 +16,6 @@
|
|||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintTop_toTopOf="parent">
|
||||
|
||||
<LinearLayout
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:orientation="horizontal">
|
||||
|
||||
</LinearLayout>
|
||||
|
||||
<LinearLayout
|
||||
android:id="@+id/layoutInfoTicket"
|
||||
android:layout_width="match_parent"
|
||||
|
|
@ -30,15 +23,15 @@
|
|||
android:layout_marginTop="@dimen/layout_margin_min"
|
||||
android:layout_marginBottom="@dimen/layout_margin_1"
|
||||
android:orientation="vertical"
|
||||
android:paddingLeft="@dimen/layout_margin_min"
|
||||
android:paddingRight="@dimen/layout_margin_min">
|
||||
android:paddingStart="@dimen/layout_margin_min"
|
||||
android:paddingEnd="@dimen/layout_margin_min">
|
||||
|
||||
<TextView
|
||||
android:id="@+id/nameAddress"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_weight="1"
|
||||
android:gravity="left"
|
||||
android:gravity="start"
|
||||
android:text="@string/Cliente"
|
||||
android:textColor="@color/verdnatura_pumpkin_orange"
|
||||
android:textSize="@dimen/body1" />
|
||||
|
|
@ -47,7 +40,7 @@
|
|||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_weight="1"
|
||||
android:gravity="left"
|
||||
android:gravity="start"
|
||||
android:text="@string/tickets"
|
||||
android:textColor="@color/verdnatura_white"
|
||||
android:textSize="@dimen/body2" />
|
||||
|
|
@ -57,7 +50,7 @@
|
|||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_weight="1"
|
||||
android:gravity="left"
|
||||
android:gravity="start"
|
||||
android:text="@string/Entrada"
|
||||
android:textColor="@color/verdnatura_pumpkin_orange"
|
||||
android:textSize="@dimen/body1" />
|
||||
|
|
@ -66,7 +59,7 @@
|
|||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_weight="1"
|
||||
android:gravity="left"
|
||||
android:gravity="start"
|
||||
android:text="@string/packages"
|
||||
android:textColor="@color/verdnatura_white"
|
||||
android:textSize="@dimen/body2" />
|
||||
|
|
@ -76,7 +69,7 @@
|
|||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_weight="1"
|
||||
android:gravity="left"
|
||||
android:gravity="start"
|
||||
android:text="@string/packages"
|
||||
android:textColor="@color/verdnatura_pumpkin_orange"
|
||||
android:textSize="@dimen/body1" />
|
||||
|
|
@ -91,7 +84,7 @@
|
|||
<com.simplify.ink.InkView
|
||||
android:id="@+id/ink"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_height="0dp"
|
||||
android:layout_marginStart="8dp"
|
||||
android:layout_marginTop="8dp"
|
||||
android:layout_marginEnd="8dp"
|
||||
|
|
@ -116,7 +109,7 @@
|
|||
android:text="@string/save"
|
||||
android:textAlignment="center"
|
||||
android:textColor="@color/verdnatura_pumpkin_orange"
|
||||
android:textSize="16dp" />
|
||||
android:textSize="16sp" />
|
||||
</LinearLayout>
|
||||
|
||||
</LinearLayout>
|
||||
|
|
|
|||
|
|
@ -40,13 +40,12 @@
|
|||
tools:visibility="visible" />
|
||||
|
||||
|
||||
|
||||
<LinearLayout
|
||||
android:id="@+id/layoutButtons"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_margin="@dimen/default_layout_margin"
|
||||
android:orientation="vertical"></LinearLayout>
|
||||
<LinearLayout
|
||||
android:id="@+id/layoutButtons"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_margin="@dimen/default_layout_margin"
|
||||
android:orientation="vertical" />
|
||||
|
||||
</LinearLayout>
|
||||
|
||||
|
|
|
|||
|
|
@ -46,7 +46,7 @@
|
|||
|
||||
<com.google.android.material.textfield.TextInputLayout
|
||||
android:id="@+id/textinputlayout_hour"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="wrap_content"
|
||||
android:textColorHint="@android:color/darker_gray"
|
||||
android:layout_marginTop="@dimen/default_layout_margin"
|
||||
|
|
|
|||
|
|
@ -87,7 +87,7 @@
|
|||
<androidx.recyclerview.widget.RecyclerView
|
||||
android:id="@+id/item_recyclerview"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:layout_height="0dp"
|
||||
android:layout_weight="1"
|
||||
android:clipToPadding="false"
|
||||
tools:listitem="@layout/item_barcode_row"/>
|
||||
|
|
|
|||
|
|
@ -41,7 +41,7 @@
|
|||
style="@style/InputLineTextSearch"
|
||||
android:layout_width="match_parent"
|
||||
android:backgroundTint="@android:color/white"
|
||||
android:hint="ItemFk"
|
||||
android:hint="@string/itemfk"
|
||||
android:lines="1"
|
||||
android:maxLines="1"
|
||||
android:textColor="@color/verdnatura_white"
|
||||
|
|
@ -51,7 +51,8 @@
|
|||
<LinearLayout
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:orientation="horizontal">
|
||||
android:orientation="horizontal"
|
||||
android:baselineAligned="false">
|
||||
|
||||
<com.google.android.material.textfield.TextInputLayout
|
||||
android:id="@+id/textinputlayout_packing"
|
||||
|
|
@ -66,7 +67,7 @@
|
|||
style="@style/InputLineTextSearch"
|
||||
android:layout_width="match_parent"
|
||||
android:backgroundTint="@android:color/white"
|
||||
android:hint="Packing"
|
||||
android:hint="@string/Packing"
|
||||
android:inputType="number"
|
||||
android:lines="1"
|
||||
android:maxLines="1"
|
||||
|
|
@ -87,7 +88,7 @@
|
|||
style="@style/InputLineTextSearch"
|
||||
android:layout_width="match_parent"
|
||||
android:backgroundTint="@android:color/white"
|
||||
android:hint="Grouping"
|
||||
android:hint="@string/Grouping"
|
||||
android:inputType="number"
|
||||
android:lines="1"
|
||||
android:maxLines="1"
|
||||
|
|
@ -102,7 +103,8 @@
|
|||
<LinearLayout
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:orientation="horizontal">
|
||||
android:orientation="horizontal"
|
||||
android:baselineAligned="false">
|
||||
|
||||
<com.google.android.material.textfield.TextInputLayout
|
||||
android:id="@+id/textinputlayout_etiquetas"
|
||||
|
|
|
|||
|
|
@ -51,7 +51,8 @@
|
|||
<LinearLayout
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:orientation="horizontal">
|
||||
android:orientation="horizontal"
|
||||
android:baselineAligned="false">
|
||||
|
||||
<com.google.android.material.textfield.TextInputLayout
|
||||
android:id="@+id/textinputlayout_packing"
|
||||
|
|
@ -66,7 +67,7 @@
|
|||
style="@style/InputLineTextSearch"
|
||||
android:layout_width="match_parent"
|
||||
android:backgroundTint="@android:color/white"
|
||||
android:hint="Packing"
|
||||
android:hint="@string/Packing"
|
||||
android:inputType="number"
|
||||
android:lines="1"
|
||||
android:maxLines="1"
|
||||
|
|
@ -88,7 +89,7 @@
|
|||
style="@style/InputLineTextSearch"
|
||||
android:layout_width="match_parent"
|
||||
android:backgroundTint="@android:color/white"
|
||||
android:hint="Unidades"
|
||||
android:hint="@string/unityTicket"
|
||||
android:inputType="number"
|
||||
android:lines="1"
|
||||
android:maxLines="1"
|
||||
|
|
@ -104,7 +105,8 @@
|
|||
<LinearLayout
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:orientation="horizontal">
|
||||
android:orientation="horizontal"
|
||||
android:baselineAligned="false">
|
||||
|
||||
<com.google.android.material.textfield.TextInputLayout
|
||||
android:id="@+id/textinputlayout_etiquetas"
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<layout xmlns:tools="http://schemas.android.com/tools"
|
||||
<layout
|
||||
xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
xmlns:app="http://schemas.android.com/apk/res-auto"
|
||||
>
|
||||
|
|
@ -9,13 +9,7 @@
|
|||
android:layout_height="match_parent"
|
||||
android:background="@color/verdnatura_black">
|
||||
|
||||
<LinearLayout
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
app:layout_constraintTop_toBottomOf="@+id/main_toolbar">
|
||||
|
||||
|
||||
</LinearLayout>
|
||||
<View
|
||||
android:id="@+id/divider"
|
||||
android:layout_width="match_parent"
|
||||
|
|
@ -32,7 +26,7 @@
|
|||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintTop_toBottomOf="@id/divider"
|
||||
android:layout_marginLeft="@dimen/pasilleros_margin_main_menu"
|
||||
android:layout_marginStart="@dimen/pasilleros_margin_main_menu"
|
||||
android:padding="@dimen/navigation_row_min_padding"
|
||||
android:visibility="gone"
|
||||
>
|
||||
|
|
@ -48,7 +42,7 @@
|
|||
<TextView
|
||||
android:layout_width="120dp"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginRight="@dimen/default_layout_margin"
|
||||
android:layout_marginEnd="@dimen/default_layout_margin"
|
||||
android:text="@string/Versión"
|
||||
android:textColor="@color/verdnatura_white"
|
||||
android:textSize="@dimen/body1"
|
||||
|
|
@ -59,7 +53,7 @@
|
|||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:text=""
|
||||
android:layout_marginLeft="@dimen/layout_margin_4"
|
||||
android:layout_marginStart="@dimen/layout_margin_4"
|
||||
android:textColor="@color/verdnatura_white"
|
||||
android:textSize="@dimen/body1"/>
|
||||
|
||||
|
|
@ -77,14 +71,14 @@
|
|||
android:textColor="@color/verdnatura_white"
|
||||
android:textSize="@dimen/body1"
|
||||
android:textStyle="bold"
|
||||
android:layout_marginRight="@dimen/default_layout_margin"/>
|
||||
android:layout_marginEnd="@dimen/default_layout_margin"/>
|
||||
|
||||
<TextView
|
||||
android:id="@+id/user_text"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:text=""
|
||||
android:layout_marginLeft="@dimen/layout_margin_4"
|
||||
android:layout_marginStart="@dimen/layout_margin_4"
|
||||
android:textColor="@color/verdnatura_white"
|
||||
android:textSize="@dimen/body1"/>
|
||||
|
||||
|
|
@ -99,14 +93,14 @@
|
|||
android:textColor="@color/verdnatura_white"
|
||||
android:textSize="@dimen/body1"
|
||||
android:textStyle="bold"
|
||||
android:layout_marginRight="@dimen/default_layout_margin"/>
|
||||
android:layout_marginEnd="@dimen/default_layout_margin"/>
|
||||
|
||||
<TextView
|
||||
android:id="@+id/androidid_text"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:text=""
|
||||
android:layout_marginLeft="@dimen/layout_margin_4"
|
||||
android:layout_marginStart="@dimen/layout_margin_4"
|
||||
android:tooltipText="@string/copied"
|
||||
android:textColor="@color/verdnatura_white"
|
||||
android:textSize="@dimen/body1"/>
|
||||
|
|
@ -120,7 +114,7 @@
|
|||
android:id="@+id/serial_text"
|
||||
android:layout_width="120dp"
|
||||
android:layout_height="match_parent"
|
||||
android:layout_marginRight="@dimen/default_layout_margin"
|
||||
android:layout_marginEnd="@dimen/default_layout_margin"
|
||||
android:text="@string/serialNumber"
|
||||
android:textColor="@color/verdnatura_white"
|
||||
android:textSize="@dimen/body1"
|
||||
|
|
@ -131,7 +125,7 @@
|
|||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:text=""
|
||||
android:layout_marginLeft="@dimen/layout_margin_4"
|
||||
android:layout_marginStart="@dimen/layout_margin_4"
|
||||
android:textColor="@color/verdnatura_white"
|
||||
android:textSize="@dimen/body1"/>
|
||||
</LinearLayout>
|
||||
|
|
@ -148,21 +142,23 @@
|
|||
<TextView
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="Server:"
|
||||
android:text="@string/server"
|
||||
android:textColor="@color/verdnatura_white"
|
||||
android:textSize="@dimen/body1"
|
||||
android:textStyle="bold"
|
||||
android:layout_marginRight="@dimen/default_layout_margin"/>
|
||||
android:layout_marginEnd="@dimen/default_layout_margin"/>
|
||||
|
||||
<EditText
|
||||
android:id="@+id/txtserver"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_weight="1"
|
||||
android:background="@color/verdnatura_white"
|
||||
android:padding="5dp"
|
||||
android:ems="10"
|
||||
android:inputType="text"
|
||||
android:hint="@string/server"
|
||||
android:autofillHints="name"
|
||||
android:layout_marginTop="4dp"/>
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -33,15 +33,15 @@
|
|||
android:layout_marginTop="@dimen/layout_margin_min"
|
||||
android:layout_marginBottom="@dimen/layout_margin_1"
|
||||
android:orientation="horizontal"
|
||||
android:paddingLeft="@dimen/layout_margin_min"
|
||||
android:paddingRight="@dimen/layout_margin_min">
|
||||
android:paddingStart="@dimen/layout_margin_min"
|
||||
android:paddingEnd="@dimen/layout_margin_min">
|
||||
|
||||
<TextView
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_weight="1"
|
||||
android:gravity="center"
|
||||
android:text="Parking"
|
||||
android:text="@string/parking"
|
||||
android:textColor="@color/verdnatura_white"
|
||||
android:textSize="@dimen/body2" />
|
||||
|
||||
|
|
@ -68,7 +68,7 @@
|
|||
android:layout_height="wrap_content"
|
||||
android:layout_weight="1"
|
||||
android:gravity="center"
|
||||
android:text="Prioridad"
|
||||
android:text="@string/priority"
|
||||
android:textColor="@color/verdnatura_white"
|
||||
android:textSize="@dimen/body2" />
|
||||
|
||||
|
|
|
|||
|
|
@ -26,7 +26,8 @@
|
|||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintTop_toTopOf="@+id/main_toolbar"
|
||||
android:paddingLeft="@dimen/default_layout_margin"/>
|
||||
android:paddingStart="@dimen/default_layout_margin"
|
||||
android:autofillHints="name"/>
|
||||
|
||||
<ImageView
|
||||
android:id="@+id/previaButton"
|
||||
|
|
@ -37,6 +38,7 @@
|
|||
app:srcCompat="@drawable/ic_streetview_black_24dp"
|
||||
app:layout_constraintStart_toEndOf="@+id/scan_input"
|
||||
app:layout_constraintTop_toTopOf="@+id/scan_input"
|
||||
android:contentDescription="@string/error"
|
||||
/>
|
||||
|
||||
<androidx.swiperefreshlayout.widget.SwipeRefreshLayout
|
||||
|
|
|
|||
|
|
@ -23,17 +23,19 @@
|
|||
android:inputType="textVisiblePassword"
|
||||
android:lines="1"
|
||||
android:maxLines="1"
|
||||
android:autofillHints="text"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintTop_toTopOf="@+id/main_toolbar"
|
||||
android:paddingLeft="@dimen/default_layout_margin"/>
|
||||
android:paddingStart="@dimen/default_layout_margin"/>
|
||||
|
||||
<ImageView
|
||||
android:id="@+id/previaButton"
|
||||
android:layout_width="32dp"
|
||||
android:layout_height="32dp"
|
||||
android:visibility="invisible"
|
||||
android:tooltipText="Permite marcar las líneas de previa escaneando ticket"
|
||||
android:tooltipText="@string/allowMarkSalesPrevia"
|
||||
android:contentDescription="@string/previousCollected"
|
||||
app:srcCompat="@drawable/ic_streetview_black_24dp"
|
||||
app:layout_constraintStart_toEndOf="@+id/scan_input"
|
||||
app:layout_constraintTop_toTopOf="@+id/scan_input"
|
||||
|
|
|
|||
|
|
@ -35,8 +35,8 @@
|
|||
android:layout_marginTop="@dimen/layout_margin_min"
|
||||
android:layout_marginBottom="@dimen/layout_margin_1"
|
||||
android:orientation="horizontal"
|
||||
android:paddingLeft="@dimen/layout_margin_1"
|
||||
android:paddingRight="@dimen/layout_margin_1"
|
||||
android:paddingStart="@dimen/layout_margin_1"
|
||||
android:paddingEnd="@dimen/layout_margin_1"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintTop_toBottomOf="@+id/scan_input">
|
||||
|
|
@ -46,7 +46,6 @@
|
|||
android:layout_height="wrap_content"
|
||||
android:layout_weight="1"
|
||||
android:gravity="start"
|
||||
android:paddingStart="@dimen/layout_margin_min"
|
||||
android:text="@string/expedition"
|
||||
android:textColor="@color/verdnatura_white"
|
||||
android:textSize="@dimen/body1" />
|
||||
|
|
|
|||
|
|
@ -38,8 +38,8 @@
|
|||
android:layout_marginBottom="@dimen/layout_margin_1"
|
||||
android:background="@color/verdnatura_pumpkin_orange"
|
||||
android:orientation="horizontal"
|
||||
android:paddingLeft="@dimen/layout_margin_1"
|
||||
android:paddingRight="@dimen/layout_margin_1"
|
||||
android:paddingStart="@dimen/layout_margin_1"
|
||||
android:paddingEnd="@dimen/layout_margin_1"
|
||||
android:visibility="gone"
|
||||
tools:visibility="visible">
|
||||
|
||||
|
|
@ -48,8 +48,7 @@
|
|||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_weight="1.25"
|
||||
android:gravity="left"
|
||||
android:paddingLeft="@dimen/layout_margin_min"
|
||||
android:gravity="start"
|
||||
android:text="@string/Ruta"
|
||||
android:textColor="@color/verdnatura_white"
|
||||
android:textSize="@dimen/body1" />
|
||||
|
|
@ -59,7 +58,7 @@
|
|||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_weight="1.25"
|
||||
android:gravity="left"
|
||||
android:gravity="start"
|
||||
android:text="@string/zone"
|
||||
android:textColor="@color/verdnatura_white"
|
||||
android:textSize="@dimen/body2" />
|
||||
|
|
@ -69,7 +68,7 @@
|
|||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_weight="1.25"
|
||||
android:gravity="right"
|
||||
android:gravity="end"
|
||||
android:text="@string/Fecha"
|
||||
android:textColor="@color/verdnatura_white"
|
||||
android:textSize="@dimen/body2" />
|
||||
|
|
@ -82,15 +81,14 @@
|
|||
android:layout_marginTop="@dimen/layout_margin_min"
|
||||
android:layout_marginBottom="@dimen/layout_margin_1"
|
||||
android:orientation="horizontal"
|
||||
android:paddingLeft="@dimen/layout_margin_1"
|
||||
android:paddingRight="@dimen/layout_margin_1">
|
||||
android:paddingStart="@dimen/layout_margin_1"
|
||||
android:paddingEnd="@dimen/layout_margin_1">
|
||||
|
||||
<TextView
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_weight="1"
|
||||
android:gravity="left"
|
||||
android:paddingLeft="@dimen/layout_margin_min"
|
||||
android:gravity="start"
|
||||
android:text="@string/Fecha"
|
||||
android:textColor="@color/verdnatura_white"
|
||||
android:textSize="@dimen/body2" />
|
||||
|
|
@ -99,7 +97,7 @@
|
|||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_weight="1.25"
|
||||
android:gravity="left"
|
||||
android:gravity="start"
|
||||
android:text="@string/Worker"
|
||||
android:textColor="@color/verdnatura_white"
|
||||
android:textSize="@dimen/body2" />
|
||||
|
|
@ -109,7 +107,7 @@
|
|||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_weight="1.25"
|
||||
android:gravity="right"
|
||||
android:gravity="end"
|
||||
android:text="@string/state"
|
||||
android:textColor="@color/verdnatura_white"
|
||||
android:textSize="@dimen/body2" />
|
||||
|
|
@ -123,12 +121,6 @@
|
|||
android:orientation="vertical"
|
||||
android:padding="10dp"
|
||||
tools:ignore="ExtraText">
|
||||
|
||||
<RelativeLayout
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:descendantFocusability="blocksDescendants">
|
||||
|
||||
<androidx.recyclerview.widget.RecyclerView
|
||||
android:id="@+id/itemexpeditionlog_recyclerview"
|
||||
android:layout_width="match_parent"
|
||||
|
|
@ -136,7 +128,6 @@
|
|||
android:clipToPadding="false"
|
||||
android:visibility="visible"
|
||||
tools:listitem="@layout/item_expeditionlog_row" />
|
||||
</RelativeLayout>
|
||||
</LinearLayout>
|
||||
|
||||
</LinearLayout>
|
||||
|
|
|
|||
|
|
@ -14,8 +14,8 @@
|
|||
android:layout_height="wrap_content"
|
||||
android:layout_marginTop="8dp"
|
||||
android:orientation="horizontal"
|
||||
android:paddingLeft="@dimen/layout_margin_min"
|
||||
android:paddingRight="@dimen/layout_margin_min"
|
||||
android:paddingStart="@dimen/layout_margin_min"
|
||||
android:paddingEnd="@dimen/layout_margin_min"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintTop_toBottomOf="@+id/main_toolbar">
|
||||
|
|
@ -43,7 +43,7 @@
|
|||
android:layout_height="wrap_content"
|
||||
android:layout_weight="1"
|
||||
android:gravity="center"
|
||||
android:text="Eti"
|
||||
android:text="@string/eti"
|
||||
android:textColor="@color/verdnatura_white"
|
||||
android:textSize="@dimen/body2" />
|
||||
|
||||
|
|
|
|||
|
|
@ -15,8 +15,8 @@
|
|||
android:layout_height="wrap_content"
|
||||
android:layout_marginTop="8dp"
|
||||
android:orientation="horizontal"
|
||||
android:paddingLeft="@dimen/layout_margin_min"
|
||||
android:paddingRight="@dimen/layout_margin_min"
|
||||
android:paddingStart="@dimen/layout_margin_min"
|
||||
android:paddingEnd="@dimen/layout_margin_min"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintTop_toBottomOf="@+id/main_toolbar">
|
||||
|
|
@ -37,8 +37,8 @@
|
|||
android:layout_height="wrap_content"
|
||||
android:layout_marginTop="8dp"
|
||||
android:orientation="horizontal"
|
||||
android:paddingLeft="@dimen/layout_margin_min"
|
||||
android:paddingRight="@dimen/layout_margin_min"
|
||||
android:paddingStart="@dimen/layout_margin_min"
|
||||
android:paddingEnd="@dimen/layout_margin_min"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintTop_toBottomOf="@+id/linearLayout">
|
||||
|
|
@ -94,7 +94,7 @@
|
|||
android:layout_marginEnd="16dp"
|
||||
android:layout_marginBottom="16dp"
|
||||
android:background="@drawable/btn_orange"
|
||||
android:text="Ok"
|
||||
android:text="@string/ok"
|
||||
android:textColor="@color/verdnatura_white"
|
||||
app:layout_constraintBottom_toBottomOf="parent"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
|
|
|
|||
|
|
@ -15,8 +15,8 @@
|
|||
android:layout_height="wrap_content"
|
||||
android:layout_marginTop="8dp"
|
||||
android:orientation="horizontal"
|
||||
android:paddingLeft="@dimen/layout_margin_min"
|
||||
android:paddingRight="@dimen/layout_margin_min"
|
||||
android:paddingStart="@dimen/layout_margin_min"
|
||||
android:paddingEnd="@dimen/layout_margin_min"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintTop_toBottomOf="@+id/main_toolbar">
|
||||
|
|
@ -26,7 +26,7 @@
|
|||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:gravity="center"
|
||||
android:text="Pallet: "
|
||||
android:text="@string/palletExpScan"
|
||||
android:textColor="@color/verdnatura_pumpkin_orange"
|
||||
android:textSize="@dimen/h6" />
|
||||
</LinearLayout>
|
||||
|
|
@ -37,8 +37,8 @@
|
|||
android:layout_height="wrap_content"
|
||||
android:layout_marginTop="8dp"
|
||||
android:orientation="horizontal"
|
||||
android:paddingLeft="@dimen/layout_margin_min"
|
||||
android:paddingRight="@dimen/layout_margin_min"
|
||||
android:paddingStart="@dimen/layout_margin_min"
|
||||
android:paddingEnd="@dimen/layout_margin_min"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintTop_toBottomOf="@+id/linearLayout">
|
||||
|
|
|
|||
|
|
@ -36,7 +36,7 @@
|
|||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_weight="1"
|
||||
android:text="Consign"
|
||||
android:text="@string/consign"
|
||||
android:textColor="@color/verdnatura_white"
|
||||
android:textSize="18sp"
|
||||
android:textStyle="bold" />
|
||||
|
|
@ -124,12 +124,9 @@
|
|||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintTop_toTopOf="@+id/divider"
|
||||
tools:ignore="ExtraText">
|
||||
tools:ignore="ExtraText"
|
||||
android:descendantFocusability="blocksDescendants">
|
||||
|
||||
<RelativeLayout
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:descendantFocusability="blocksDescendants">
|
||||
|
||||
<androidx.recyclerview.widget.RecyclerView
|
||||
android:id="@+id/expeditionSummary_recyclerview"
|
||||
|
|
@ -138,7 +135,7 @@
|
|||
android:clipToPadding="false"
|
||||
android:visibility="visible"
|
||||
tools:listitem="@layout/item_expedition_summary_row" />
|
||||
</RelativeLayout>
|
||||
|
||||
</LinearLayout>
|
||||
|
||||
<ScrollView
|
||||
|
|
|
|||
|
|
@ -14,8 +14,8 @@
|
|||
android:layout_height="wrap_content"
|
||||
android:layout_marginTop="8dp"
|
||||
android:orientation="horizontal"
|
||||
android:paddingLeft="@dimen/layout_margin_min"
|
||||
android:paddingRight="@dimen/layout_margin_min"
|
||||
android:paddingStart="@dimen/layout_margin_min"
|
||||
android:paddingEnd="@dimen/layout_margin_min"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintTop_toBottomOf="@+id/main_toolbar">
|
||||
|
|
@ -25,7 +25,7 @@
|
|||
android:layout_height="wrap_content"
|
||||
android:layout_weight="1"
|
||||
android:gravity="center"
|
||||
android:text="ETD"
|
||||
android:text="@string/etd"
|
||||
android:textColor="@color/verdnatura_white"
|
||||
android:textSize="@dimen/body2" />
|
||||
|
||||
|
|
|
|||
|
|
@ -83,7 +83,7 @@
|
|||
android:layout_gravity="center"
|
||||
android:layout_marginTop="0dp"
|
||||
android:background="@drawable/btn_orange"
|
||||
android:text="ESCANEAR CARROS"
|
||||
android:text="@string/scanWagoons"
|
||||
android:textColor="@color/verdnatura_white"
|
||||
android:visibility="gone"
|
||||
tools:visibility="gone" />
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<layout xmlns:tools="http://schemas.android.com/tools"
|
||||
<layout
|
||||
xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
xmlns:app="http://schemas.android.com/apk/res-auto">
|
||||
|
||||
|
|
|
|||
|
|
@ -27,7 +27,7 @@
|
|||
<com.google.android.material.textfield.TextInputEditText
|
||||
android:id="@+id/filter_nameordateitem"
|
||||
style="@style/InputLineTextSearch"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_width="0dp"
|
||||
android:layout_weight="1"
|
||||
android:backgroundTint="@android:color/white"
|
||||
android:hint="@string/Filtrocliente"
|
||||
|
|
@ -38,16 +38,6 @@
|
|||
android:textColor="@color/verdnatura_white"
|
||||
android:textColorHint="@android:color/darker_gray" />
|
||||
|
||||
|
||||
<ImageView
|
||||
|
||||
android:id="@+id/item_image"
|
||||
android:layout_width="30dp"
|
||||
android:layout_height="30dp"
|
||||
android:layout_gravity="center"
|
||||
android:scaleType="centerCrop"
|
||||
android:src="@drawable/ic_chevron_right_black_24dp"
|
||||
android:visibility="gone" />
|
||||
</LinearLayout>
|
||||
|
||||
<LinearLayout
|
||||
|
|
@ -56,8 +46,8 @@
|
|||
android:layout_marginTop="@dimen/layout_margin_min"
|
||||
android:layout_marginBottom="@dimen/layout_margin_1"
|
||||
android:orientation="horizontal"
|
||||
android:paddingLeft="@dimen/layout_margin_min"
|
||||
android:paddingRight="@dimen/layout_margin_min">
|
||||
android:paddingStart="@dimen/layout_margin_min"
|
||||
android:paddingEnd="@dimen/layout_margin_min">
|
||||
|
||||
<TextView
|
||||
android:layout_width="match_parent"
|
||||
|
|
|
|||
|
|
@ -23,14 +23,14 @@
|
|||
android:layout_marginTop="@dimen/layout_margin_min"
|
||||
android:layout_marginBottom="@dimen/layout_margin_1"
|
||||
android:orientation="horizontal"
|
||||
android:paddingLeft="@dimen/layout_margin_min"
|
||||
android:paddingRight="@dimen/layout_margin_min">
|
||||
android:paddingStart="@dimen/layout_margin_min"
|
||||
android:paddingEnd="@dimen/layout_margin_min">
|
||||
|
||||
<TextView
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_weight="1"
|
||||
android:gravity="left"
|
||||
android:gravity="start"
|
||||
android:text="@string/Worker"
|
||||
android:textColor="@color/verdnatura_white"
|
||||
android:textSize="@dimen/body2" />
|
||||
|
|
@ -39,7 +39,7 @@
|
|||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_weight="1"
|
||||
android:gravity="left"
|
||||
android:gravity="start"
|
||||
android:text="@string/InTimed"
|
||||
android:textColor="@color/verdnatura_white"
|
||||
android:textSize="@dimen/body2" />
|
||||
|
|
|
|||
|
|
@ -21,8 +21,8 @@
|
|||
android:id="@+id/linearLayout"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginLeft="@dimen/pasilleros_margin_main_menu"
|
||||
android:layout_marginRight="@dimen/pasilleros_margin_main_menu"
|
||||
android:layout_marginStart="@dimen/pasilleros_margin_main_menu"
|
||||
android:layout_marginEnd="@dimen/pasilleros_margin_main_menu"
|
||||
android:orientation="vertical"
|
||||
android:padding="@dimen/navigation_row_limit_padding"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
|
|
@ -125,8 +125,8 @@
|
|||
android:id="@+id/linearInfoFreelance"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginLeft="@dimen/pasilleros_margin_main_menu"
|
||||
android:layout_marginRight="@dimen/pasilleros_margin_main_menu"
|
||||
android:layout_marginStart="@dimen/pasilleros_margin_main_menu"
|
||||
android:layout_marginEnd="@dimen/pasilleros_margin_main_menu"
|
||||
android:orientation="vertical"
|
||||
android:padding="@dimen/navigation_row_limit_padding"
|
||||
android:visibility="gone"
|
||||
|
|
@ -221,8 +221,8 @@
|
|||
<TextView
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginRight="@dimen/default_layout_margin"
|
||||
android:text="Server:"
|
||||
android:layout_marginEnd="@dimen/default_layout_margin"
|
||||
android:text="@string/server"
|
||||
android:textColor="@color/verdnatura_white"
|
||||
android:textSize="@dimen/body1"
|
||||
android:textStyle="bold" />
|
||||
|
|
|
|||
|
|
@ -49,7 +49,6 @@
|
|||
android:layout_width="match_parent"
|
||||
android:layout_weight="1"
|
||||
android:backgroundTint="@android:color/white"
|
||||
android:drawableEnd="@drawable/ic_arrow_drop_down_black_24dp"
|
||||
android:focusable="false"
|
||||
android:hint="@string/buscarcomprador"
|
||||
android:lines="1"
|
||||
|
|
@ -58,7 +57,8 @@
|
|||
android:textColor="@color/verdnatura_pumpkin_orange"
|
||||
android:textColorHint="#78909C"
|
||||
android:visibility="visible"
|
||||
tools:ignore="TextContrastCheck" />
|
||||
tools:ignore="TextContrastCheck"
|
||||
app:drawableEndCompat="@drawable/ic_arrow_drop_down_black_24dp" />
|
||||
|
||||
</LinearLayout>
|
||||
|
||||
|
|
@ -70,8 +70,8 @@
|
|||
android:layout_marginTop="@dimen/layout_margin_min"
|
||||
android:layout_marginBottom="@dimen/layout_margin_1"
|
||||
android:orientation="horizontal"
|
||||
android:paddingLeft="@dimen/layout_margin_min"
|
||||
android:paddingRight="@dimen/layout_margin_min">
|
||||
android:paddingStart="@dimen/layout_margin_min"
|
||||
android:paddingEnd="@dimen/layout_margin_min">
|
||||
|
||||
<TextView
|
||||
android:layout_width="match_parent"
|
||||
|
|
|
|||
|
|
@ -60,7 +60,7 @@
|
|||
style="@style/InputLineTextSearch"
|
||||
android:layout_width="match_parent"
|
||||
android:backgroundTint="@android:color/white"
|
||||
android:hint="Prioridad:"
|
||||
android:hint="@string/priority"
|
||||
android:inputType="number"
|
||||
android:lines="1"
|
||||
android:maxLines="1"
|
||||
|
|
@ -73,6 +73,7 @@
|
|||
android:layout_width="@dimen/options_image_width"
|
||||
android:layout_height="match_parent"
|
||||
android:padding="@dimen/options_image_padding"
|
||||
android:contentDescription="@string/selectAction"
|
||||
android:src="@drawable/ic_delete_forever_black_24dp"
|
||||
android:visibility="gone" />
|
||||
|
||||
|
|
@ -81,6 +82,7 @@
|
|||
android:layout_width="@dimen/options_image_width"
|
||||
android:layout_height="match_parent"
|
||||
android:padding="@dimen/options_image_padding"
|
||||
android:contentDescription="@string/selectAction"
|
||||
android:src="@drawable/ic_mode_edit_black_24dp"
|
||||
android:visibility="gone" />
|
||||
|
||||
|
|
@ -89,6 +91,7 @@
|
|||
android:layout_width="@dimen/options_image_width"
|
||||
android:layout_height="match_parent"
|
||||
android:padding="@dimen/options_image_padding"
|
||||
android:contentDescription="@string/selectAction"
|
||||
android:src="@drawable/ic_local_parking_black_24dp"
|
||||
android:visibility="gone" />
|
||||
|
||||
|
|
@ -97,6 +100,7 @@
|
|||
android:layout_width="@dimen/options_image_width"
|
||||
android:layout_height="match_parent"
|
||||
android:padding="@dimen/options_image_padding"
|
||||
android:contentDescription="@string/selectAction"
|
||||
android:src="@drawable/ic_flash_auto_black_24dp"
|
||||
android:visibility="gone" />
|
||||
</LinearLayout>
|
||||
|
|
|
|||
|
|
@ -47,6 +47,7 @@
|
|||
android:layout_width="match_parent"
|
||||
android:layout_height="@dimen/itemcard_image_height"
|
||||
android:scaleType="centerCrop"
|
||||
android:contentDescription="@string/selectImage"
|
||||
android:src="@drawable/loadphoto" />
|
||||
<!-- TAGS ======================================================================================================= -->
|
||||
<LinearLayout
|
||||
|
|
@ -54,6 +55,7 @@
|
|||
android:layout_height="wrap_content"
|
||||
android:orientation="horizontal"
|
||||
android:padding="@dimen/layout_margin_min"
|
||||
android:baselineAligned="false"
|
||||
android:layout_marginBottom="@dimen/layout_margin_min">
|
||||
<LinearLayout
|
||||
android:layout_width="match_parent"
|
||||
|
|
@ -154,11 +156,7 @@
|
|||
</LinearLayout>
|
||||
|
||||
</LinearLayout>
|
||||
<LinearLayout
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:orientation="vertical"
|
||||
android:layout_weight="1">
|
||||
|
||||
<LinearLayout
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
|
|
@ -175,7 +173,7 @@
|
|||
android:id="@+id/itemcard_buyer"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="buyer"
|
||||
android:text="@string/buyer"
|
||||
android:textColor="@color/verdnatura_white"
|
||||
android:textSize="@dimen/body2"
|
||||
android:textStyle="bold" />
|
||||
|
|
@ -200,7 +198,6 @@
|
|||
|
||||
</LinearLayout>
|
||||
|
||||
</LinearLayout>
|
||||
</ScrollView>
|
||||
|
||||
<include
|
||||
|
|
|
|||
|
|
@ -39,15 +39,15 @@
|
|||
android:layout_marginTop="@dimen/layout_margin_min"
|
||||
android:layout_marginBottom="@dimen/layout_margin_1"
|
||||
android:orientation="horizontal"
|
||||
android:paddingLeft="@dimen/layout_margin_min"
|
||||
android:paddingRight="@dimen/layout_margin_min">
|
||||
android:paddingStart="@dimen/layout_margin_min"
|
||||
android:paddingEnd="@dimen/layout_margin_min">
|
||||
|
||||
<TextView
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_weight="1"
|
||||
android:gravity="left"
|
||||
android:text="ItemFk"
|
||||
android:gravity="start"
|
||||
android:text="@string/itemfk"
|
||||
android:textColor="@color/verdnatura_white"
|
||||
android:textSize="@dimen/body2" />
|
||||
|
||||
|
|
@ -55,8 +55,8 @@
|
|||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_weight="1"
|
||||
android:gravity="left"
|
||||
android:text="Nombre"
|
||||
android:gravity="start"
|
||||
android:text="@string/name"
|
||||
android:textColor="@color/verdnatura_white"
|
||||
android:textSize="@dimen/body2" />
|
||||
|
||||
|
|
@ -66,7 +66,7 @@
|
|||
android:layout_height="wrap_content"
|
||||
android:layout_weight="1"
|
||||
android:gravity="center"
|
||||
android:text="Fecha"
|
||||
android:text="@string/Fecha"
|
||||
android:textColor="@color/verdnatura_white"
|
||||
android:textSize="@dimen/body2" />
|
||||
|
||||
|
|
@ -75,7 +75,7 @@
|
|||
android:layout_height="wrap_content"
|
||||
android:layout_weight="1"
|
||||
android:gravity="center"
|
||||
android:text="Ubicado"
|
||||
android:text="@string/ubicado"
|
||||
android:textColor="@color/verdnatura_white"
|
||||
android:textSize="@dimen/body2" />
|
||||
|
||||
|
|
@ -84,20 +84,12 @@
|
|||
android:layout_height="wrap_content"
|
||||
android:layout_weight="1"
|
||||
android:gravity="center"
|
||||
android:text="Stock"
|
||||
android:text="@string/stock"
|
||||
android:textColor="@color/verdnatura_white"
|
||||
android:textSize="@dimen/body2" />
|
||||
|
||||
</LinearLayout>
|
||||
|
||||
<LinearLayout
|
||||
android:id="@+id/itemcard_layout"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:orientation="vertical"
|
||||
android:padding="10dp"
|
||||
tools:ignore="ExtraText">
|
||||
|
||||
<RelativeLayout
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
|
|
@ -114,7 +106,7 @@
|
|||
|
||||
</LinearLayout>
|
||||
|
||||
</LinearLayout>
|
||||
|
||||
</ScrollView>
|
||||
|
||||
<include
|
||||
|
|
|
|||
|
|
@ -25,8 +25,8 @@
|
|||
android:layout_marginTop="@dimen/layout_margin_min"
|
||||
android:layout_marginBottom="@dimen/layout_margin_1"
|
||||
android:orientation="horizontal"
|
||||
android:paddingLeft="@dimen/layout_margin_min"
|
||||
android:paddingRight="@dimen/layout_margin_min">
|
||||
android:paddingStart="@dimen/layout_margin_min"
|
||||
android:paddingEnd="@dimen/layout_margin_min">
|
||||
|
||||
<TextView
|
||||
android:layout_width="match_parent"
|
||||
|
|
|
|||
|
|
@ -36,15 +36,15 @@
|
|||
android:layout_marginTop="@dimen/layout_margin_min"
|
||||
android:layout_marginBottom="@dimen/layout_margin_1"
|
||||
android:orientation="horizontal"
|
||||
android:paddingLeft="@dimen/layout_margin_min"
|
||||
android:paddingRight="@dimen/layout_margin_min">
|
||||
android:paddingStart="@dimen/layout_margin_min"
|
||||
android:paddingEnd="@dimen/layout_margin_min">
|
||||
|
||||
<TextView
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:gravity="center"
|
||||
android:paddingLeft="@dimen/layout_margin_min"
|
||||
android:text="Item"
|
||||
|
||||
android:text="@string/itemfk"
|
||||
android:textColor="@color/verdnatura_white"
|
||||
android:textSize="@dimen/body2" />
|
||||
|
||||
|
|
@ -53,7 +53,7 @@
|
|||
android:layout_height="wrap_content"
|
||||
android:layout_weight="1"
|
||||
android:gravity="center"
|
||||
android:text="Nombre"
|
||||
android:text="@string/name"
|
||||
android:textColor="@color/verdnatura_white"
|
||||
android:textSize="@dimen/body2" />
|
||||
|
||||
|
|
@ -61,8 +61,8 @@
|
|||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_weight="1.25"
|
||||
android:gravity="right"
|
||||
android:text="Parking"
|
||||
android:gravity="end"
|
||||
android:text="@string/parking"
|
||||
android:textColor="@color/verdnatura_white"
|
||||
android:textSize="@dimen/body2"
|
||||
android:visibility="gone" />
|
||||
|
|
@ -72,35 +72,25 @@
|
|||
android:layout_height="wrap_content"
|
||||
android:layout_weight="2"
|
||||
android:gravity="center"
|
||||
android:text="Carro"
|
||||
android:text="@string/wagoon"
|
||||
android:textColor="@color/verdnatura_white"
|
||||
android:textSize="@dimen/body2" />
|
||||
|
||||
<TextView
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:gravity="right"
|
||||
android:paddingRight="@dimen/layout_margin_min"
|
||||
android:text="Cantidad"
|
||||
android:gravity="end"
|
||||
android:text="@string/quantity"
|
||||
android:textColor="@color/verdnatura_white"
|
||||
android:textSize="@dimen/body2" />
|
||||
|
||||
</LinearLayout>
|
||||
|
||||
<LinearLayout
|
||||
android:id="@+id/itemcard_layout"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:orientation="vertical"
|
||||
android:padding="10dp"
|
||||
tools:ignore="ExtraText">
|
||||
|
||||
<RelativeLayout
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:descendantFocusability="blocksDescendants">
|
||||
|
||||
<!--android:id="@+id/itemexpeditionstate_recyclerview"-->
|
||||
<androidx.recyclerview.widget.RecyclerView
|
||||
android:id="@+id/itemshelvinglog_recyclerview"
|
||||
android:layout_width="match_parent"
|
||||
|
|
@ -112,7 +102,6 @@
|
|||
|
||||
</LinearLayout>
|
||||
|
||||
</LinearLayout>
|
||||
|
||||
</ScrollView>
|
||||
|
||||
|
|
|
|||
|
|
@ -26,7 +26,7 @@
|
|||
android:layout_marginTop="16dp"
|
||||
android:text="@string/Bienvenido"
|
||||
android:textColor="@android:color/white"
|
||||
android:textSize="14dp"
|
||||
android:textSize="14sp"
|
||||
android:textStyle="bold"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintTop_toTopOf="parent" />
|
||||
|
|
@ -49,8 +49,8 @@
|
|||
android:layout_margin="8dp"
|
||||
android:backgroundTint="@android:color/white"
|
||||
android:clickable="true"
|
||||
android:drawableRight="@drawable/ic_chevron_right_black_24dp"
|
||||
android:hint="Server:"
|
||||
android:drawableEnd="@drawable/ic_chevron_right_black_24dp"
|
||||
android:hint="@string/server"
|
||||
android:inputType="text"
|
||||
android:lines="1"
|
||||
android:maxLines="1"
|
||||
|
|
@ -102,7 +102,7 @@
|
|||
android:layout_margin="8dp"
|
||||
android:backgroundTint="@android:color/white"
|
||||
android:gravity="center_vertical"
|
||||
android:hint="Password"
|
||||
android:hint="@string/password"
|
||||
android:inputType="textPassword"
|
||||
android:lines="1"
|
||||
android:maxLines="1"
|
||||
|
|
@ -125,7 +125,7 @@
|
|||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintTop_toBottomOf="@id/textinputlayout_password" />
|
||||
|
||||
<Switch
|
||||
<androidx.appcompat.widget.SwitchCompat
|
||||
android:id="@+id/switch_remember"
|
||||
style="@style/DefaultButton"
|
||||
android:layout_width="70dp"
|
||||
|
|
|
|||
|
|
@ -35,7 +35,7 @@
|
|||
android:layout_width="match_parent"
|
||||
android:layout_weight="1.5"
|
||||
android:backgroundTint="@android:color/white"
|
||||
android:hint="Nombre o apellido"
|
||||
android:hint="@string/nameSurname"
|
||||
android:inputType="text"
|
||||
android:lines="1"
|
||||
android:maxLines="1"
|
||||
|
|
@ -50,16 +50,15 @@
|
|||
android:layout_width="match_parent"
|
||||
android:layout_weight="1"
|
||||
android:backgroundTint="@android:color/white"
|
||||
android:drawableEnd="@drawable/ic_arrow_drop_down_black_24dp"
|
||||
android:focusable="false"
|
||||
android:hint="Proveedor"
|
||||
android:inputType="text"
|
||||
android:hint="@string/suppliers"
|
||||
android:lines="1"
|
||||
android:maxLines="1"
|
||||
android:textAlignment="center"
|
||||
android:textColor="@color/verdnatura_pumpkin_orange"
|
||||
android:textColorHint="@android:color/darker_gray"
|
||||
android:visibility="visible" />
|
||||
android:visibility="visible"
|
||||
app:drawableEndCompat="@drawable/ic_arrow_drop_down_black_24dp" />
|
||||
|
||||
|
||||
</LinearLayout>
|
||||
|
|
|
|||
|
|
@ -36,7 +36,7 @@
|
|||
android:layout_width="match_parent"
|
||||
android:layout_weight="1.5"
|
||||
android:backgroundTint="@android:color/white"
|
||||
android:hint="Nombre o apellido"
|
||||
android:hint="@string/nameSurname"
|
||||
android:inputType="text"
|
||||
android:lines="1"
|
||||
android:maxLines="1"
|
||||
|
|
@ -51,16 +51,15 @@
|
|||
android:layout_width="match_parent"
|
||||
android:layout_weight="1"
|
||||
android:backgroundTint="@android:color/white"
|
||||
android:drawableEnd="@drawable/ic_arrow_drop_down_black_24dp"
|
||||
android:focusable="false"
|
||||
android:hint="Embalajes"
|
||||
android:inputType="text"
|
||||
android:hint="@string/packages"
|
||||
android:lines="1"
|
||||
android:maxLines="1"
|
||||
android:textAlignment="center"
|
||||
android:textColor="@color/verdnatura_pumpkin_orange"
|
||||
android:textColorHint="@android:color/darker_gray"
|
||||
android:visibility="gone" />
|
||||
android:visibility="gone"
|
||||
app:drawableEndCompat="@drawable/ic_arrow_drop_down_black_24dp"/>
|
||||
|
||||
|
||||
</LinearLayout>
|
||||
|
|
@ -71,14 +70,14 @@
|
|||
android:layout_marginTop="@dimen/layout_margin_min"
|
||||
android:layout_marginBottom="@dimen/layout_margin_1"
|
||||
android:orientation="horizontal"
|
||||
android:paddingLeft="@dimen/layout_margin_min"
|
||||
android:paddingRight="@dimen/layout_margin_min">
|
||||
android:paddingStart="@dimen/layout_margin_min"
|
||||
android:paddingEnd="@dimen/layout_margin_min">
|
||||
|
||||
<TextView
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_weight="0.75"
|
||||
android:text="Descripción"
|
||||
android:text="@string/description"
|
||||
android:textAlignment="viewStart"
|
||||
android:textColor="@color/verdnatura_white"
|
||||
android:textSize="@dimen/body2" />
|
||||
|
|
@ -98,7 +97,7 @@
|
|||
android:layout_height="wrap_content"
|
||||
android:layout_weight="0.75"
|
||||
android:paddingStart="@dimen/layout_margin_3"
|
||||
android:text="Total"
|
||||
android:text="@string/total"
|
||||
android:textAlignment="textStart"
|
||||
android:textColor="@color/verdnatura_white"
|
||||
android:textSize="@dimen/body2" />
|
||||
|
|
|
|||
|
|
@ -12,9 +12,9 @@
|
|||
android:id="@+id/textObs"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="Observaciones : "
|
||||
android:text="@string/observations"
|
||||
android:textColor="#FFF"
|
||||
android:textSize="18dp"
|
||||
android:textSize="18sp"
|
||||
app:layout_constraintStart_toEndOf="@+id/main_toolbar"
|
||||
app:layout_constraintTop_toBottomOf="@+id/main_toolbar" />
|
||||
|
||||
|
|
@ -23,7 +23,7 @@
|
|||
android:layout_width="match_parent"
|
||||
android:layout_height="100dp"
|
||||
android:gravity="center"
|
||||
android:hint="Observaciones"
|
||||
android:hint="@string/observations"
|
||||
android:inputType="textCapSentences|textMultiLine"
|
||||
android:textColor="@color/verdnatura_white"
|
||||
android:textColorHint="@android:color/tertiary_text_light"
|
||||
|
|
@ -35,9 +35,9 @@
|
|||
android:id="@+id/textImage"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="Imágenes : "
|
||||
android:text="@string/images"
|
||||
android:textColor="#FFF"
|
||||
android:textSize="18dp"
|
||||
android:textSize="18sp"
|
||||
app:layout_constraintStart_toEndOf="@+id/observations"
|
||||
app:layout_constraintTop_toBottomOf="@+id/observations" />
|
||||
|
||||
|
|
@ -48,18 +48,18 @@
|
|||
android:layout_marginTop="@dimen/layout_margin_min"
|
||||
android:layout_marginBottom="@dimen/layout_margin_1"
|
||||
android:orientation="horizontal"
|
||||
android:paddingLeft="@dimen/layout_margin_min"
|
||||
android:paddingRight="@dimen/layout_margin_min"
|
||||
android:paddingStart="@dimen/layout_margin_min"
|
||||
android:paddingEnd="@dimen/layout_margin_min"
|
||||
app:layout_constraintStart_toEndOf="@+id/textImage"
|
||||
app:layout_constraintTop_toBottomOf="@+id/textImage">
|
||||
|
||||
<TextView
|
||||
android:id="@+id/openPickerImages"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="48dp"
|
||||
android:layout_weight="1"
|
||||
android:gravity="center"
|
||||
android:text="Añadir nueva..."
|
||||
android:text="@string/addNew"
|
||||
android:textColor="@color/verdnatura_white"
|
||||
android:textSize="@dimen/body2" />
|
||||
</LinearLayout>
|
||||
|
|
|
|||
|
|
@ -36,15 +36,15 @@
|
|||
android:layout_marginTop="@dimen/layout_margin_min"
|
||||
android:layout_marginBottom="@dimen/layout_margin_1"
|
||||
android:orientation="horizontal"
|
||||
android:paddingLeft="@dimen/layout_margin_min"
|
||||
android:paddingRight="@dimen/layout_margin_min">
|
||||
android:paddingStart="@dimen/layout_margin_min"
|
||||
android:paddingEnd="@dimen/layout_margin_min">
|
||||
|
||||
<TextView
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_weight="1.25"
|
||||
android:gravity="center"
|
||||
android:text="Descripción"
|
||||
android:text="@string/description"
|
||||
android:textColor="@color/verdnatura_white"
|
||||
android:textSize="@dimen/body2" />
|
||||
|
||||
|
|
@ -54,7 +54,7 @@
|
|||
android:layout_height="wrap_content"
|
||||
android:layout_weight="1"
|
||||
android:gravity="center"
|
||||
android:text="Total"
|
||||
android:text="@string/total"
|
||||
android:textColor="@color/verdnatura_white"
|
||||
android:textSize="@dimen/body2" />
|
||||
|
||||
|
|
@ -66,17 +66,17 @@
|
|||
android:layout_marginTop="@dimen/layout_margin_min"
|
||||
android:layout_marginBottom="@dimen/layout_margin_1"
|
||||
android:orientation="horizontal"
|
||||
android:paddingLeft="@dimen/layout_margin_min"
|
||||
android:paddingRight="@dimen/layout_margin_min">
|
||||
android:paddingStart="@dimen/layout_margin_min"
|
||||
android:paddingEnd="@dimen/layout_margin_min">
|
||||
|
||||
<TextView
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_weight="1"
|
||||
android:gravity="center"
|
||||
android:text="CC ROJO"
|
||||
android:textColor="@color/verdnatura_white"
|
||||
android:textSize="@dimen/body2" />
|
||||
android:textSize="@dimen/body2"
|
||||
tools:text="CC ROJO"/>
|
||||
|
||||
|
||||
<TextView
|
||||
|
|
@ -84,26 +84,18 @@
|
|||
android:layout_height="wrap_content"
|
||||
android:layout_weight="1"
|
||||
android:gravity="center"
|
||||
android:text="220"
|
||||
android:textColor="@color/verdnatura_white"
|
||||
android:textSize="@dimen/body2" />
|
||||
android:textSize="@dimen/body2"
|
||||
tools:text="220"/>
|
||||
|
||||
<ImageButton
|
||||
android:layout_width="25dp"
|
||||
android:layout_height="25dp"
|
||||
android:background="@drawable/ic_delete_black_24dp" />
|
||||
|
||||
android:background="@drawable/ic_delete_black_24dp"
|
||||
android:contentDescription="@string/trash"/>
|
||||
|
||||
</LinearLayout>
|
||||
|
||||
<LinearLayout
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginTop="@dimen/layout_margin_min"
|
||||
android:layout_marginBottom="@dimen/layout_margin_1"
|
||||
android:orientation="horizontal"
|
||||
android:paddingLeft="@dimen/layout_margin_min"
|
||||
android:paddingRight="@dimen/layout_margin_min" />
|
||||
|
||||
<LinearLayout
|
||||
android:layout_width="match_parent"
|
||||
|
|
@ -111,17 +103,17 @@
|
|||
android:layout_marginTop="@dimen/layout_margin_min"
|
||||
android:layout_marginBottom="@dimen/layout_margin_1"
|
||||
android:orientation="horizontal"
|
||||
android:paddingLeft="@dimen/layout_margin_min"
|
||||
android:paddingRight="@dimen/layout_margin_min">
|
||||
android:paddingStart="@dimen/layout_margin_min"
|
||||
android:paddingEnd="@dimen/layout_margin_min">
|
||||
|
||||
<TextView
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_weight="1"
|
||||
android:gravity="center"
|
||||
android:text="DC"
|
||||
android:textColor="@color/verdnatura_white"
|
||||
android:textSize="@dimen/body2" />
|
||||
android:textSize="@dimen/body2"
|
||||
tools:text="DC"/>
|
||||
|
||||
|
||||
<TextView
|
||||
|
|
@ -129,26 +121,19 @@
|
|||
android:layout_height="wrap_content"
|
||||
android:layout_weight="1"
|
||||
android:gravity="center"
|
||||
android:text="30"
|
||||
android:textColor="@color/verdnatura_white"
|
||||
android:textSize="@dimen/body2" />
|
||||
android:textSize="@dimen/body2"
|
||||
tools:text="30"/>
|
||||
|
||||
<ImageButton
|
||||
android:layout_width="25dp"
|
||||
android:layout_height="25dp"
|
||||
android:background="@drawable/ic_delete_black_24dp" />
|
||||
android:background="@drawable/ic_delete_black_24dp"
|
||||
android:contentDescription="@string/trash"/>
|
||||
|
||||
|
||||
</LinearLayout>
|
||||
|
||||
<LinearLayout
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginTop="@dimen/layout_margin_min"
|
||||
android:layout_marginBottom="@dimen/layout_margin_1"
|
||||
android:orientation="horizontal"
|
||||
android:paddingLeft="@dimen/layout_margin_min"
|
||||
android:paddingRight="@dimen/layout_margin_min" />
|
||||
|
||||
<LinearLayout
|
||||
android:id="@+id/layout_total_images"
|
||||
|
|
@ -157,13 +142,13 @@
|
|||
android:layout_marginTop="@dimen/layout_margin_min"
|
||||
android:layout_marginBottom="@dimen/layout_margin_1"
|
||||
android:orientation="horizontal"
|
||||
android:paddingLeft="@dimen/layout_margin_min"
|
||||
android:paddingRight="@dimen/layout_margin_min">
|
||||
android:paddingStart="@dimen/layout_margin_min"
|
||||
android:paddingEnd="@dimen/layout_margin_min">
|
||||
|
||||
<TextView
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="Imágenes adjuntas:"
|
||||
android:text="@string/imageToSend"
|
||||
android:textColor="@color/verdnatura_white"
|
||||
android:textSize="@dimen/body2"
|
||||
android:textStyle="bold" />
|
||||
|
|
@ -172,16 +157,16 @@
|
|||
android:id="@+id/totalImages"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="0"
|
||||
android:textColor="@color/verdnatura_white"
|
||||
android:textSize="@dimen/body2"
|
||||
android:textStyle="bold" />
|
||||
android:textStyle="bold"
|
||||
tools:text="0"/>
|
||||
</LinearLayout>
|
||||
|
||||
<TextView
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="Observaciones:"
|
||||
android:text="@string/observationsTxt"
|
||||
android:textColor="@color/verdnatura_white"
|
||||
android:textSize="@dimen/body2"
|
||||
android:textStyle="bold" />
|
||||
|
|
@ -193,16 +178,15 @@
|
|||
android:layout_marginTop="@dimen/layout_margin_min"
|
||||
android:layout_marginBottom="@dimen/layout_margin_1"
|
||||
android:orientation="horizontal"
|
||||
android:paddingLeft="@dimen/layout_margin_min"
|
||||
android:paddingRight="@dimen/layout_margin_min">
|
||||
android:paddingStart="@dimen/layout_margin_min"
|
||||
android:paddingEnd="@dimen/layout_margin_min">
|
||||
|
||||
<TextView
|
||||
android:id="@+id/observations"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="100dp"
|
||||
android:gravity="center"
|
||||
android:hint="Observaciones"
|
||||
android:inputType="textCapSentences|textMultiLine"
|
||||
android:hint="@string/observations"
|
||||
android:textColor="@color/verdnatura_white"
|
||||
android:textColorHint="@android:color/tertiary_text_light"
|
||||
android:visibility="visible"
|
||||
|
|
@ -217,16 +201,16 @@
|
|||
android:layout_marginTop="@dimen/layout_margin_min"
|
||||
android:layout_marginBottom="@dimen/layout_margin_1"
|
||||
android:orientation="horizontal"
|
||||
android:paddingLeft="@dimen/layout_margin_min"
|
||||
android:paddingRight="@dimen/layout_margin_min">
|
||||
android:paddingStart="@dimen/layout_margin_min"
|
||||
android:paddingEnd="@dimen/layout_margin_min">
|
||||
|
||||
<TextView
|
||||
android:id="@+id/sign"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_weight="1"
|
||||
android:gravity="left"
|
||||
android:text="Firma:"
|
||||
android:gravity="start"
|
||||
android:text="@string/signPackaging"
|
||||
android:textColor="@color/verdnatura_white"
|
||||
android:textSize="@dimen/body2"
|
||||
android:textStyle="bold" />
|
||||
|
|
@ -238,8 +222,8 @@
|
|||
android:layout_marginTop="@dimen/layout_margin_min"
|
||||
android:layout_marginBottom="@dimen/layout_margin_1"
|
||||
android:orientation="horizontal"
|
||||
android:paddingLeft="@dimen/layout_margin_min"
|
||||
android:paddingRight="@dimen/layout_margin_min">
|
||||
android:paddingStart="@dimen/layout_margin_min"
|
||||
android:paddingEnd="@dimen/layout_margin_min">
|
||||
|
||||
<com.simplify.ink.InkView
|
||||
android:id="@+id/ink"
|
||||
|
|
|
|||
|
|
@ -44,6 +44,7 @@
|
|||
android:layout_gravity="center"
|
||||
android:layout_marginBottom="@dimen/layout_margin_1"
|
||||
android:scaleType="centerCrop"
|
||||
android:contentDescription="@string/imageToUpload"
|
||||
android:src="@drawable/loadphoto" />
|
||||
|
||||
<TextView
|
||||
|
|
@ -65,6 +66,7 @@
|
|||
android:layout_gravity="center"
|
||||
android:scaleType="centerCrop"
|
||||
android:src="@drawable/loadphoto"
|
||||
android:contentDescription="@string/imageItem"
|
||||
android:visibility="invisible" />
|
||||
|
||||
</LinearLayout>
|
||||
|
|
|
|||
|
|
@ -19,7 +19,7 @@
|
|||
android:lines="1"
|
||||
android:maxLines="1"
|
||||
android:textColor="@color/verdnatura_white"
|
||||
|
||||
android:autofillHints="text"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintTop_toTopOf="@+id/main_toolbar" />
|
||||
|
|
|
|||
|
|
@ -43,21 +43,15 @@
|
|||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintTop_toBottomOf="@+id/txtDescriptions" />
|
||||
|
||||
<LinearLayout
|
||||
android:id="@+id/itemcard_layout"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="0dp"
|
||||
android:orientation="vertical"
|
||||
android:padding="5dp"
|
||||
app:layout_constraintBottom_toBottomOf="parent"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintTop_toTopOf="@+id/divider"
|
||||
tools:ignore="ExtraText">
|
||||
|
||||
<RelativeLayout
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:orientation="vertical"
|
||||
android:layout_marginTop="110dp"
|
||||
app:layout_constraintBottom_toBottomOf="parent"
|
||||
app:layout_constraintEnd_toEndOf="@+id/divider"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintTop_toBottomOf="@+id/divider"
|
||||
android:descendantFocusability="blocksDescendants">
|
||||
|
||||
<androidx.recyclerview.widget.RecyclerView
|
||||
|
|
@ -68,7 +62,7 @@
|
|||
android:visibility="visible"
|
||||
tools:listitem="@layout/item_route_row" />
|
||||
</RelativeLayout>
|
||||
</LinearLayout>
|
||||
|
||||
|
||||
<ScrollView
|
||||
android:id="@+id/scroll_view"
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<layout xmlns:tools="http://schemas.android.com/tools"
|
||||
<layout
|
||||
xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
xmlns:app="http://schemas.android.com/apk/res-auto">
|
||||
|
||||
|
|
@ -81,9 +81,11 @@
|
|||
android:layout_weight="1"
|
||||
android:background="@color/verdnatura_white"
|
||||
android:ems="10"
|
||||
android:autofillHints="phone"
|
||||
android:inputType="number"
|
||||
android:padding="5dp"
|
||||
android:text="0"
|
||||
android:text="@string/zero"
|
||||
android:hint="@string/zero"
|
||||
android:imeOptions="actionDone"
|
||||
android:maxLines="1"/>
|
||||
|
||||
|
|
@ -97,6 +99,7 @@
|
|||
android:layout_marginTop="8dp"
|
||||
android:layout_marginEnd="8dp"
|
||||
android:orientation="horizontal"
|
||||
android:inputType="number"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintHorizontal_bias="0.0"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
|
|
@ -119,10 +122,10 @@
|
|||
android:layout_weight="1"
|
||||
android:background="@color/verdnatura_white"
|
||||
android:ems="10"
|
||||
|
||||
android:autofillHints="phone"
|
||||
android:inputType="number"
|
||||
android:padding="5dp"
|
||||
android:text="0"
|
||||
android:text="@string/zero"
|
||||
android:imeOptions="actionDone"
|
||||
android:maxLines="1"/>
|
||||
|
||||
|
|
@ -170,9 +173,10 @@
|
|||
android:layout_weight="1"
|
||||
android:background="@color/verdnatura_white"
|
||||
android:ems="10"
|
||||
|
||||
android:padding="5dp"
|
||||
android:text="00:00"
|
||||
android:inputType="text"
|
||||
android:autofillHints="text"
|
||||
android:text="@string/zeroHour"
|
||||
android:imeOptions="actionDone"
|
||||
android:maxLines="1"
|
||||
android:focusable="false"/>
|
||||
|
|
@ -206,8 +210,10 @@
|
|||
android:background="@color/verdnatura_white"
|
||||
android:ems="10"
|
||||
android:padding="5dp"
|
||||
android:text="00:00"
|
||||
android:text="@string/zeroHour"
|
||||
android:imeOptions="actionDone"
|
||||
android:inputType="text"
|
||||
android:autofillHints="text"
|
||||
android:maxLines="1"
|
||||
android:focusable="false"/>
|
||||
</LinearLayout>
|
||||
|
|
|
|||
|
|
@ -39,20 +39,19 @@
|
|||
android:layout_marginTop="@dimen/layout_margin_min"
|
||||
android:layout_marginBottom="@dimen/layout_margin_1"
|
||||
android:orientation="horizontal"
|
||||
android:paddingLeft="@dimen/layout_margin_min"
|
||||
android:paddingRight="@dimen/layout_margin_min">
|
||||
android:paddingStart="@dimen/layout_margin_min"
|
||||
android:paddingEnd="@dimen/layout_margin_min">
|
||||
|
||||
<TextView
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:gravity="center"
|
||||
android:paddingLeft="@dimen/layout_margin_min"
|
||||
android:text="@string/user"
|
||||
android:textColor="@color/verdnatura_white"
|
||||
android:textSize="@dimen/body2" />
|
||||
|
||||
<TextView
|
||||
android:layout_width="match_parent"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_weight="1"
|
||||
android:gravity="center"
|
||||
|
|
@ -62,14 +61,6 @@
|
|||
|
||||
</LinearLayout>
|
||||
|
||||
<LinearLayout
|
||||
android:id="@+id/itemcard_layout"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:orientation="vertical"
|
||||
android:padding="10dp"
|
||||
tools:ignore="ExtraText">
|
||||
|
||||
<RelativeLayout
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
|
|
@ -86,7 +77,7 @@
|
|||
|
||||
</LinearLayout>
|
||||
|
||||
</LinearLayout>
|
||||
|
||||
|
||||
</ScrollView>
|
||||
|
||||
|
|
|
|||
|
|
@ -89,7 +89,9 @@
|
|||
android:inputType="number"
|
||||
android:maxLines="1"
|
||||
android:padding="5dp"
|
||||
android:text="0" />
|
||||
android:autofillHints="phone"
|
||||
android:hint="@string/zero"
|
||||
android:text="@string/zero" />
|
||||
|
||||
</LinearLayout>
|
||||
|
||||
|
|
@ -127,7 +129,8 @@
|
|||
android:inputType="number"
|
||||
android:maxLines="1"
|
||||
android:padding="5dp"
|
||||
android:text="0" />
|
||||
android:text="@string/zero"
|
||||
android:autofillHints="phone"/>
|
||||
|
||||
</LinearLayout>
|
||||
|
||||
|
|
@ -190,7 +193,9 @@
|
|||
android:imeOptions="actionDone"
|
||||
android:maxLines="1"
|
||||
android:padding="5dp"
|
||||
android:text="00:00" />
|
||||
android:inputType="number"
|
||||
android:text="@string/zeroHour"
|
||||
android:autofillHints="phone"/>
|
||||
|
||||
</LinearLayout>
|
||||
|
||||
|
|
@ -225,7 +230,9 @@
|
|||
android:imeOptions="actionDone"
|
||||
android:maxLines="1"
|
||||
android:padding="5dp"
|
||||
android:text="00:00" />
|
||||
android:inputType="number"
|
||||
android:text="@string/zeroHour"
|
||||
android:autofillHints="phone"/>
|
||||
</LinearLayout>
|
||||
|
||||
<TextView
|
||||
|
|
@ -257,11 +264,6 @@
|
|||
app:layout_constraintTop_toTopOf="@+id/divider"
|
||||
tools:ignore="ExtraText">
|
||||
|
||||
<RelativeLayout
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:descendantFocusability="blocksDescendants">
|
||||
|
||||
<androidx.recyclerview.widget.RecyclerView
|
||||
android:id="@+id/tickets_recyclerview"
|
||||
android:layout_width="match_parent"
|
||||
|
|
@ -271,7 +273,6 @@
|
|||
tools:listitem="@layout/item_ticket_row"
|
||||
tools:visibility="gone" />
|
||||
|
||||
</RelativeLayout>
|
||||
</LinearLayout>
|
||||
|
||||
<ScrollView
|
||||
|
|
|
|||
|
|
@ -22,7 +22,8 @@
|
|||
<LinearLayout
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:orientation="horizontal">
|
||||
android:orientation="horizontal"
|
||||
android:baselineAligned="false">
|
||||
|
||||
<com.google.android.material.textfield.TextInputLayout
|
||||
android:id="@+id/textinputlayout_matricula"
|
||||
|
|
@ -54,9 +55,8 @@
|
|||
|
||||
<com.google.android.material.textfield.TextInputLayout
|
||||
android:id="@+id/textinputlayout_prioridad"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_width="100dp"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_weight="1"
|
||||
android:textColorHint="@android:color/darker_gray">
|
||||
|
||||
<com.google.android.material.textfield.TextInputEditText
|
||||
|
|
@ -64,7 +64,7 @@
|
|||
style="@style/InputLineTextSearch"
|
||||
android:layout_width="match_parent"
|
||||
android:backgroundTint="@android:color/white"
|
||||
android:hint="Prioridad:"
|
||||
android:hint="@string/priority"
|
||||
android:inputType="number"
|
||||
android:lines="1"
|
||||
android:maxLines="1"
|
||||
|
|
@ -77,28 +77,32 @@
|
|||
android:layout_width="@dimen/options_image_width"
|
||||
android:layout_height="match_parent"
|
||||
android:padding="@dimen/options_image_padding"
|
||||
android:src="@drawable/ic_delete_forever_black_24dp" />
|
||||
android:src="@drawable/ic_delete_forever_black_24dp"
|
||||
android:contentDescription="@string/trash"/>
|
||||
|
||||
<ImageView
|
||||
android:id="@+id/edit_img"
|
||||
android:layout_width="@dimen/options_image_width"
|
||||
android:layout_height="match_parent"
|
||||
android:padding="@dimen/options_image_padding"
|
||||
android:src="@drawable/ic_mode_edit_black_24dp" />
|
||||
android:src="@drawable/ic_mode_edit_black_24dp"
|
||||
android:contentDescription="@string/transfer"/>
|
||||
|
||||
<ImageView
|
||||
android:id="@+id/parking_img"
|
||||
android:layout_width="@dimen/options_image_width"
|
||||
android:layout_height="match_parent"
|
||||
android:padding="@dimen/options_image_padding"
|
||||
android:src="@drawable/ic_local_parking_black_24dp" />
|
||||
|
||||
android:src="@drawable/ic_local_parking_black_24dp"
|
||||
android:contentDescription="@string/parking"
|
||||
/>
|
||||
<ImageView
|
||||
android:id="@+id/automatic_img"
|
||||
android:layout_width="@dimen/options_image_width"
|
||||
android:layout_height="match_parent"
|
||||
android:padding="@dimen/options_image_padding"
|
||||
android:src="@drawable/ic_flash_auto_black_24dp" />
|
||||
android:src="@drawable/ic_flash_auto_black_24dp"
|
||||
android:contentDescription="@string/addItem"/>
|
||||
</LinearLayout>
|
||||
|
||||
</LinearLayout>
|
||||
|
|
|
|||
|
|
@ -22,11 +22,7 @@
|
|||
android:layout_height="wrap_content"
|
||||
android:orientation="vertical">
|
||||
|
||||
<LinearLayout
|
||||
android:id="@+id/itemcard_layout"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:orientation="vertical">
|
||||
|
||||
|
||||
<TextView
|
||||
android:id="@+id/name_vehiclecontrol"
|
||||
|
|
@ -34,7 +30,7 @@
|
|||
android:layout_height="wrap_content"
|
||||
android:layout_gravity="center"
|
||||
android:layout_marginTop="@dimen/toolbar_height"
|
||||
android:hint="Nombre del usuario"
|
||||
android:hint="@string/nameUser"
|
||||
android:textColor="@color/verdnatura_white"
|
||||
android:textSize="@dimen/h5"
|
||||
android:textStyle="bold" />
|
||||
|
|
@ -45,7 +41,8 @@
|
|||
android:layout_height="@dimen/itemcard_image_height"
|
||||
android:layout_margin="10dp"
|
||||
android:scaleType="centerCrop"
|
||||
android:src="@drawable/loadphoto" />
|
||||
android:src="@drawable/loadphoto"
|
||||
android:contentDescription="@string/workerImage"/>
|
||||
|
||||
<LinearLayout
|
||||
android:layout_width="match_parent"
|
||||
|
|
@ -58,7 +55,7 @@
|
|||
<LinearLayout
|
||||
android:id="@+id/user_information"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_height="0dp"
|
||||
android:layout_weight="1"
|
||||
android:orientation="vertical">
|
||||
|
||||
|
|
@ -80,7 +77,6 @@
|
|||
android:id="@+id/registered_vehiclecontrol"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="v-10"
|
||||
android:textColor="@color/verdnatura_white"
|
||||
android:textSize="@dimen/h7"
|
||||
android:textStyle="bold" />
|
||||
|
|
@ -104,7 +100,6 @@
|
|||
android:id="@+id/deviceName"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="v-10"
|
||||
android:textColor="@color/verdnatura_white"
|
||||
android:textSize="@dimen/h7"
|
||||
android:textStyle="bold" />
|
||||
|
|
@ -113,14 +108,8 @@
|
|||
<LinearLayout
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_weight="1"
|
||||
android:orientation="vertical">
|
||||
|
||||
<LinearLayout
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:orientation="horizontal">
|
||||
|
||||
<TextView
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="match_parent"
|
||||
|
|
@ -134,18 +123,15 @@
|
|||
android:id="@+id/assigned_devicename"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="sergiodt"
|
||||
android:textColor="@color/verdnatura_white"
|
||||
android:textSize="@dimen/h7"
|
||||
android:textStyle="bold" />
|
||||
|
||||
|
||||
</LinearLayout>
|
||||
</LinearLayout>
|
||||
|
||||
</LinearLayout>
|
||||
|
||||
</LinearLayout>
|
||||
|
||||
|
||||
<RelativeLayout
|
||||
android:layout_width="match_parent"
|
||||
|
|
|
|||
|
|
@ -35,7 +35,7 @@
|
|||
android:layout_width="match_parent"
|
||||
android:layout_weight="1.5"
|
||||
android:backgroundTint="@android:color/white"
|
||||
android:hint="Nombre o apellido"
|
||||
android:hint="@string/nameSurname"
|
||||
android:inputType="text"
|
||||
android:lines="1"
|
||||
android:maxLines="1"
|
||||
|
|
@ -51,7 +51,6 @@
|
|||
android:backgroundTint="@android:color/white"
|
||||
android:focusable="false"
|
||||
android:hint="@string/buscarDepartamento"
|
||||
android:inputType="text"
|
||||
android:lines="1"
|
||||
android:maxLines="1"
|
||||
android:textAlignment="center"
|
||||
|
|
@ -70,8 +69,8 @@
|
|||
android:layout_marginTop="@dimen/layout_margin_min"
|
||||
android:layout_marginBottom="@dimen/layout_margin_1"
|
||||
android:orientation="horizontal"
|
||||
android:paddingLeft="@dimen/layout_margin_min"
|
||||
android:paddingRight="@dimen/layout_margin_min">
|
||||
android:paddingStart="@dimen/layout_margin_min"
|
||||
android:paddingEnd="@dimen/layout_margin_min">
|
||||
|
||||
<TextView
|
||||
android:layout_width="match_parent"
|
||||
|
|
|
|||
|
|
@ -28,14 +28,14 @@
|
|||
|
||||
<TextView
|
||||
android:id="@+id/item_title"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="match_parent"
|
||||
android:layout_weight="1"
|
||||
android:text="@{item.title}"
|
||||
android:textColor="@color/verdnatura_white"
|
||||
android:textSize="@dimen/h7"
|
||||
android:gravity="center_vertical"
|
||||
android:layout_marginLeft="@dimen/pasilleros_margin_main_menu"
|
||||
android:layout_marginStart="@dimen/pasilleros_margin_main_menu"
|
||||
android:textStyle="bold"/>
|
||||
|
||||
<TextView
|
||||
|
|
@ -46,15 +46,16 @@
|
|||
android:textColor="@color/verdnatura_pumpkin_orange"
|
||||
android:textSize="@dimen/h7"
|
||||
android:gravity="center_vertical"
|
||||
android:layout_marginLeft="@dimen/pasilleros_margin_main_menu"/>
|
||||
android:layout_marginStart="@dimen/pasilleros_margin_main_menu"/>
|
||||
|
||||
<ImageView
|
||||
android:id="@+id/item_image"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginLeft="@dimen/default_layout_margin"
|
||||
android:layout_marginStart="@dimen/default_layout_margin"
|
||||
android:scaleType="centerCrop"
|
||||
android:src="@drawable/ic_chevron_right_black_24dp" />
|
||||
android:src="@drawable/ic_chevron_right_black_24dp"
|
||||
android:contentDescription="@string/selectImage"/>
|
||||
</LinearLayout>
|
||||
<LinearLayout
|
||||
android:layout_width="match_parent"
|
||||
|
|
|
|||
|
|
@ -41,7 +41,7 @@
|
|||
android:textColor="@color/verdnatura_white"
|
||||
android:text="@string/Nivel"
|
||||
android:textSize="@dimen/h8"
|
||||
android:layout_marginRight="@dimen/layout_margin_min"/>
|
||||
android:layout_marginEnd="@dimen/layout_margin_min"/>
|
||||
<TextView
|
||||
android:id="@+id/level"
|
||||
android:layout_width="wrap_content"
|
||||
|
|
@ -51,7 +51,7 @@
|
|||
tool:text="2"
|
||||
android:textStyle="bold"
|
||||
android:textSize="@dimen/h8"
|
||||
android:layout_marginRight="@dimen/layout_margin_min"/>
|
||||
android:layout_marginEnd="@dimen/layout_margin_min"/>
|
||||
|
||||
<TextView
|
||||
android:layout_width="wrap_content"
|
||||
|
|
@ -59,7 +59,7 @@
|
|||
android:textColor="@color/verdnatura_white"
|
||||
android:text="@string/Ticket"
|
||||
android:textSize="@dimen/h8"
|
||||
android:layout_marginRight="@dimen/layout_margin_min"/>
|
||||
android:layout_marginEnd="@dimen/layout_margin_min"/>
|
||||
|
||||
<TextView
|
||||
android:layout_width="wrap_content"
|
||||
|
|
@ -83,8 +83,9 @@
|
|||
android:id="@+id/imageErrorMessage"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="match_parent"
|
||||
android:layout_alignParentRight="true"
|
||||
app:srcCompat="@drawable/emoticon_error" />
|
||||
android:layout_alignParentEnd="true"
|
||||
app:srcCompat="@drawable/emoticon_error"
|
||||
android:contentDescription="@string/error"/>
|
||||
</RelativeLayout>
|
||||
|
||||
</LinearLayout>
|
||||
|
|
@ -100,7 +101,7 @@
|
|||
tool:text="MRW"
|
||||
android:textStyle="bold"
|
||||
android:textSize="@dimen/h8"
|
||||
android:layout_marginRight="@dimen/layout_margin_min"
|
||||
android:layout_marginEnd="@dimen/layout_margin_min"
|
||||
android:visibility="gone"/>
|
||||
</LinearLayout>
|
||||
</LinearLayout>
|
||||
|
|
@ -197,8 +198,8 @@
|
|||
tool:text="10"
|
||||
android:textColor="@color/verdnatura_white"
|
||||
android:textSize="@dimen/h6"
|
||||
android:paddingLeft="10dp"
|
||||
android:paddingRight="10dp"
|
||||
android:paddingStart="10dp"
|
||||
android:paddingEnd="10dp"
|
||||
android:textStyle="bold"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintTop_toTopOf="parent"
|
||||
|
|
|
|||
|
|
@ -37,7 +37,6 @@
|
|||
android:id="@+id/rvHeadlines"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_below="@id/content_layout"
|
||||
android:layout_marginTop="6dp"
|
||||
android:visibility="visible"
|
||||
/>
|
||||
|
|
@ -61,7 +60,7 @@
|
|||
<TextView
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginRight="@dimen/layout_margin_min"
|
||||
android:layout_marginEnd="@dimen/layout_margin_min"
|
||||
android:text="@string/Nivel"
|
||||
android:textColor="@color/verdnatura_black"
|
||||
android:textSize="@dimen/h8" />
|
||||
|
|
@ -70,7 +69,7 @@
|
|||
android:id="@+id/level"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginRight="@dimen/layout_margin_min"
|
||||
android:layout_marginEnd="@dimen/layout_margin_min"
|
||||
android:text="@{sale.level}"
|
||||
android:textColor="@color/verdnatura_black"
|
||||
android:textSize="@dimen/h8"
|
||||
|
|
@ -80,7 +79,7 @@
|
|||
<TextView
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginRight="@dimen/layout_margin_min"
|
||||
android:layout_marginEnd="@dimen/layout_margin_min"
|
||||
android:text="@string/Ticket"
|
||||
android:textColor="@color/verdnatura_black"
|
||||
android:textSize="@dimen/h8" />
|
||||
|
|
@ -106,22 +105,24 @@
|
|||
android:layout_width="48dp"
|
||||
android:layout_height="48dp"
|
||||
android:rotation="180"
|
||||
android:layout_alignParentRight="true"
|
||||
android:layout_marginRight="20dp"
|
||||
android:src="@drawable/ic_arrow_down" />
|
||||
android:layout_alignParentEnd="true"
|
||||
android:layout_marginEnd="20dp"
|
||||
android:src="@drawable/ic_arrow_down"
|
||||
android:contentDescription="@string/selectAction"/>
|
||||
<ImageView
|
||||
android:id="@+id/imageErrorMessage"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="match_parent"
|
||||
android:layout_alignParentRight="true"
|
||||
app:srcCompat="@drawable/emoticon_error_fragment" />
|
||||
android:layout_alignParentEnd="true"
|
||||
app:srcCompat="@drawable/emoticon_error_fragment"
|
||||
android:contentDescription="@string/error"/>
|
||||
|
||||
<View
|
||||
android:id="@+id/item_article_row_semaforo_pre"
|
||||
android:layout_width="@dimen/semaforo_next_to_ticket"
|
||||
android:layout_height="@dimen/semaforo_next_to_ticket"
|
||||
android:layout_centerVertical="true"
|
||||
android:layout_marginLeft="1dp"
|
||||
android:layout_marginStart="1dp"
|
||||
android:background="@drawable/background_and_round_collection_fragment" />
|
||||
|
||||
|
||||
|
|
@ -130,7 +131,7 @@
|
|||
android:layout_width="@dimen/semaforo_next_to_ticket"
|
||||
android:layout_height="@dimen/semaforo_next_to_ticket"
|
||||
android:layout_centerVertical="true"
|
||||
android:layout_marginLeft="20dp"
|
||||
android:layout_marginStart="20dp"
|
||||
android:background="@drawable/background_and_round_collection_fragment" />
|
||||
|
||||
<View
|
||||
|
|
@ -138,7 +139,7 @@
|
|||
android:layout_width="@dimen/semaforo_next_to_ticket"
|
||||
android:layout_height="@dimen/semaforo_next_to_ticket"
|
||||
android:layout_centerVertical="true"
|
||||
android:layout_marginLeft="39dp"
|
||||
android:layout_marginStart="39dp"
|
||||
android:background="@drawable/background_and_round_collection_fragment" />
|
||||
|
||||
|
||||
|
|
@ -155,7 +156,7 @@
|
|||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
|
||||
android:layout_marginRight="@dimen/layout_margin_min"
|
||||
android:layout_marginEnd="@dimen/layout_margin_min"
|
||||
android:text="@{sale.agencyName}"
|
||||
android:textSize="@dimen/h8"
|
||||
android:textStyle="bold"
|
||||
|
|
@ -236,8 +237,8 @@
|
|||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginEnd="22dp"
|
||||
android:paddingLeft="10dp"
|
||||
android:paddingRight="10dp"
|
||||
android:paddingStart="10dp"
|
||||
android:paddingEnd="10dp"
|
||||
android:visibility="gone"
|
||||
|
||||
android:text="@{Integer.toString(sale.quantity)}"
|
||||
|
|
@ -254,7 +255,7 @@
|
|||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginEnd="22dp"
|
||||
android:paddingLeft="10dp"
|
||||
android:paddingStart="10dp"
|
||||
android:text="@{sale.cel2}"
|
||||
android:textColor="@color/verdnatura_white"
|
||||
android:textSize="@dimen/body1"
|
||||
|
|
@ -353,7 +354,7 @@
|
|||
android:layout_height="wrap_content"
|
||||
android:paddingTop="@dimen/layout_margin_minest"
|
||||
android:paddingBottom="@dimen/default_layout_margin"
|
||||
android:paddingLeft="@dimen/layout_collection_quantity"
|
||||
android:paddingStart="@dimen/layout_collection_quantity"
|
||||
android:text="@{Integer.toString(sale.quantity)}"
|
||||
android:textColor="@color/verdnatura_white"
|
||||
android:textSize="@dimen/body3"
|
||||
|
|
@ -430,7 +431,7 @@
|
|||
<LinearLayout
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="1dp"
|
||||
android:background="@color/verdnatura_white"></LinearLayout>
|
||||
android:background="@color/verdnatura_white" />
|
||||
|
||||
<androidx.recyclerview.widget.RecyclerView
|
||||
android:id="@+id/item_article_placements"
|
||||
|
|
|
|||
|
|
@ -39,7 +39,7 @@
|
|||
android:textColor="@color/verdnatura_white"
|
||||
android:text="@string/Nivel"
|
||||
android:textSize="@dimen/h8"
|
||||
android:layout_marginRight="@dimen/layout_margin_min"/>
|
||||
android:layout_marginEnd="@dimen/layout_margin_min"/>
|
||||
<TextView
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
|
|
@ -48,7 +48,7 @@
|
|||
tool:text="2"
|
||||
android:textStyle="bold"
|
||||
android:textSize="@dimen/h8"
|
||||
android:layout_marginRight="@dimen/layout_margin_min"/>
|
||||
android:layout_marginEnd="@dimen/layout_margin_min"/>
|
||||
|
||||
<TextView
|
||||
android:layout_width="wrap_content"
|
||||
|
|
@ -56,7 +56,7 @@
|
|||
android:textColor="@color/verdnatura_white"
|
||||
android:text="@string/Ticket"
|
||||
android:textSize="@dimen/h8"
|
||||
android:layout_marginRight="@dimen/layout_margin_min"/>
|
||||
android:layout_marginEnd="@dimen/layout_margin_min"/>
|
||||
<TextView
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
|
|
@ -65,7 +65,7 @@
|
|||
tool:text="123456789"
|
||||
android:textStyle="bold"
|
||||
android:textSize="@dimen/h8"
|
||||
android:layout_marginRight="@dimen/layout_margin_min"/>
|
||||
android:layout_marginEnd="@dimen/layout_margin_min"/>
|
||||
|
||||
<TextView
|
||||
android:layout_width="wrap_content"
|
||||
|
|
@ -73,7 +73,7 @@
|
|||
android:textColor="@color/verdnatura_white"
|
||||
android:text="@string/packingType"
|
||||
android:textSize="@dimen/h8"
|
||||
android:layout_marginRight="@dimen/layout_margin_min"/>
|
||||
android:layout_marginEnd="@dimen/layout_margin_min"/>
|
||||
<TextView
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
|
|
@ -82,7 +82,7 @@
|
|||
tool:text="123456789"
|
||||
android:textStyle="bold"
|
||||
android:textSize="@dimen/h8"
|
||||
android:layout_marginRight="@dimen/layout_margin_min"/>
|
||||
android:layout_marginEnd="@dimen/layout_margin_min"/>
|
||||
|
||||
|
||||
|
||||
|
|
@ -101,7 +101,7 @@
|
|||
tool:text="MRW"
|
||||
android:textStyle="bold"
|
||||
android:textSize="@dimen/h8"
|
||||
android:layout_marginRight="@dimen/layout_margin_min"/>
|
||||
android:layout_marginEnd="@dimen/layout_margin_min"/>
|
||||
</LinearLayout>
|
||||
</LinearLayout>
|
||||
|
||||
|
|
@ -195,8 +195,8 @@
|
|||
tool:text="10"
|
||||
android:textColor="@color/verdnatura_white"
|
||||
android:textSize="@dimen/h6"
|
||||
android:paddingLeft="10dp"
|
||||
android:paddingRight="10dp"
|
||||
android:paddingStart="10dp"
|
||||
android:paddingEnd="10dp"
|
||||
android:textStyle="bold"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintTop_toTopOf="parent" />
|
||||
|
|
|
|||
|
|
@ -24,68 +24,43 @@
|
|||
|
||||
>
|
||||
<!--CABECERA=================================================-->
|
||||
|
||||
|
||||
<LinearLayout
|
||||
android:id="@+id/item_row_layout"
|
||||
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:orientation="vertical"
|
||||
android:background="@color/verdnatura_white"
|
||||
android:orientation="horizontal"
|
||||
android:padding="@dimen/layout_margin_min"
|
||||
android:textColor="@color/verdnatura_black">
|
||||
|
||||
|
||||
>
|
||||
|
||||
<LinearLayout
|
||||
|
||||
android:layout_width="match_parent"
|
||||
<TextView
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:background="@color/verdnatura_white"
|
||||
android:orientation="vertical"
|
||||
android:padding="@dimen/layout_margin_min"
|
||||
android:layout_marginEnd="@dimen/layout_margin_min"
|
||||
android:text="@string/wagoon"
|
||||
android:textColor="@color/verdnatura_black"
|
||||
>
|
||||
android:textSize="@dimen/h8" />
|
||||
|
||||
<LinearLayout
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:orientation="horizontal"
|
||||
>
|
||||
<TextView
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginEnd="@dimen/layout_margin_min"
|
||||
android:text="@{reubication.code}"
|
||||
android:textColor="@color/verdnatura_black"
|
||||
android:textSize="@dimen/h8"
|
||||
android:textStyle="bold"
|
||||
tool:text="XXX" />
|
||||
|
||||
<TextView
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginRight="@dimen/layout_margin_min"
|
||||
android:text="@string/wagoon"
|
||||
android:textColor="@color/verdnatura_black"
|
||||
android:textSize="@dimen/h8" />
|
||||
<TextView
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="@{reubication.code}"
|
||||
android:layout_marginRight="@dimen/layout_margin_min"
|
||||
android:textColor="@color/verdnatura_black"
|
||||
android:textSize="@dimen/h8"
|
||||
android:textStyle="bold"
|
||||
tool:text="XXX"
|
||||
|
||||
/>
|
||||
<TextView
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginRight="@dimen/layout_margin_min"
|
||||
android:text="Code"
|
||||
android:visibility="gone"
|
||||
android:textColor="@color/verdnatura_black"
|
||||
android:textSize="@dimen/h8" />
|
||||
|
||||
<RelativeLayout
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:orientation="horizontal">
|
||||
|
||||
</RelativeLayout>
|
||||
|
||||
</LinearLayout>
|
||||
|
||||
</LinearLayout>
|
||||
<TextView
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginEnd="@dimen/layout_margin_min"
|
||||
android:text="@string/code"
|
||||
android:textColor="@color/verdnatura_black"
|
||||
android:textSize="@dimen/h8"
|
||||
android:visibility="gone" />
|
||||
|
||||
|
||||
</LinearLayout>
|
||||
|
|
@ -119,8 +94,8 @@
|
|||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginEnd="@dimen/layout_margin_min"
|
||||
android:paddingLeft="10dp"
|
||||
android:paddingRight="10dp"
|
||||
android:paddingStart="10dp"
|
||||
android:paddingEnd="10dp"
|
||||
android:text="@{String.valueOf(reubication.quantity)}"
|
||||
android:textColor="@color/verdnatura_white"
|
||||
android:textSize="@dimen/body1"
|
||||
|
|
@ -173,7 +148,7 @@
|
|||
<LinearLayout
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="1dp"
|
||||
android:background="@color/verdnatura_white"></LinearLayout>
|
||||
android:background="@color/verdnatura_white" />
|
||||
|
||||
<androidx.recyclerview.widget.RecyclerView
|
||||
android:id="@+id/item_article_placements"
|
||||
|
|
|
|||
|
|
@ -22,24 +22,25 @@
|
|||
|
||||
<TextView
|
||||
android:id="@+id/item_title"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_weight="1"
|
||||
android:text="@{item.code}"
|
||||
android:textColor="@color/verdnatura_white"
|
||||
android:textSize="@dimen/h7"
|
||||
android:gravity="center_vertical"
|
||||
android:layout_marginLeft="@dimen/pasilleros_margin_main_menu"
|
||||
android:layout_marginStart="@dimen/pasilleros_margin_main_menu"
|
||||
android:textStyle="bold"/>
|
||||
|
||||
|
||||
<ImageView
|
||||
android:layout_marginLeft="@dimen/default_layout_margin"
|
||||
android:layout_marginStart="@dimen/default_layout_margin"
|
||||
android:id="@+id/item_image"
|
||||
android:layout_width="30dp"
|
||||
android:layout_height="27dp"
|
||||
android:scaleType="centerCrop"
|
||||
android:src="@drawable/ic_delete_black_24dp" />
|
||||
android:src="@drawable/ic_delete_black_24dp"
|
||||
android:contentDescription="@string/trash"/>
|
||||
</LinearLayout>
|
||||
<LinearLayout
|
||||
android:layout_width="match_parent"
|
||||
|
|
|
|||
|
|
@ -23,14 +23,14 @@
|
|||
|
||||
<TextView
|
||||
android:id="@+id/item_title"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_weight="1"
|
||||
android:text="@{item.title}"
|
||||
android:textColor="@color/verdnatura_white"
|
||||
android:textSize="@dimen/h8"
|
||||
android:gravity="center_vertical"
|
||||
android:layout_marginLeft="@dimen/pasilleros_margin_main_menu"
|
||||
android:layout_marginStart="@dimen/pasilleros_margin_main_menu"
|
||||
android:textStyle="bold"/>
|
||||
|
||||
<TextView
|
||||
|
|
@ -41,15 +41,16 @@
|
|||
android:textColor="@color/verdnatura_pumpkin_orange"
|
||||
android:textSize="@dimen/h8"
|
||||
android:gravity="center_vertical"
|
||||
android:layout_marginLeft="@dimen/pasilleros_margin_main_menu"/>
|
||||
android:layout_marginStart="@dimen/pasilleros_margin_main_menu"/>
|
||||
|
||||
<ImageView
|
||||
android:layout_marginLeft="@dimen/default_layout_margin"
|
||||
android:layout_marginStart="@dimen/default_layout_margin"
|
||||
android:id="@+id/item_image"
|
||||
android:layout_width="30dp"
|
||||
android:layout_height="27dp"
|
||||
android:scaleType="centerCrop"
|
||||
android:src="@drawable/ic_chevron_right_black_24dp" />
|
||||
android:src="@drawable/ic_chevron_right_black_24dp"
|
||||
android:contentDescription="@string/selectAction"/>
|
||||
</LinearLayout>
|
||||
<LinearLayout
|
||||
android:layout_width="match_parent"
|
||||
|
|
|
|||
|
|
@ -22,14 +22,14 @@
|
|||
|
||||
<TextView
|
||||
android:id="@+id/item_title"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="match_parent"
|
||||
android:layout_weight="1"
|
||||
android:text="@{Integer.toString(item.collectionFk)}"
|
||||
android:textColor="@color/verdnatura_white"
|
||||
android:textSize="@dimen/h7"
|
||||
android:gravity="center_vertical"
|
||||
android:layout_marginLeft="@dimen/pasilleros_margin_main_menu"
|
||||
android:layout_marginStart="@dimen/pasilleros_margin_main_menu"
|
||||
android:textStyle="bold"/>
|
||||
|
||||
<TextView
|
||||
|
|
@ -40,7 +40,7 @@
|
|||
android:textColor="@color/verdnatura_pumpkin_orange"
|
||||
android:textSize="@dimen/h7"
|
||||
android:gravity="center_vertical"
|
||||
android:layout_marginLeft="@dimen/pasilleros_margin_main_menu"/>
|
||||
android:layout_marginStart="@dimen/pasilleros_margin_main_menu"/>
|
||||
<TextView
|
||||
android:id="@+id/totalTicketsId"
|
||||
android:layout_width="wrap_content"
|
||||
|
|
@ -49,15 +49,16 @@
|
|||
android:textColor="@color/verdnatura_white"
|
||||
android:textSize="@dimen/h7"
|
||||
android:gravity="center_vertical"
|
||||
android:layout_marginLeft="@dimen/packaging_margin_main_menu"/>
|
||||
android:layout_marginStart="@dimen/packaging_margin_main_menu"/>
|
||||
|
||||
<ImageView
|
||||
android:layout_marginLeft="@dimen/default_layout_margin"
|
||||
android:layout_marginStart="@dimen/default_layout_margin"
|
||||
android:id="@+id/item_image"
|
||||
android:layout_width="30dp"
|
||||
android:layout_height="30dp"
|
||||
android:scaleType="centerCrop"
|
||||
android:src="@drawable/ic_chevron_right_black_24dp" />
|
||||
android:src="@drawable/ic_chevron_right_black_24dp"
|
||||
android:contentDescription="@string/selectAction"/>
|
||||
</LinearLayout>
|
||||
<LinearLayout
|
||||
android:layout_width="match_parent"
|
||||
|
|
|
|||
|
|
@ -22,14 +22,14 @@
|
|||
|
||||
<TextView
|
||||
android:id="@+id/item_title"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="match_parent"
|
||||
android:layout_weight="1"
|
||||
android:text="@{Integer.toString(item.collectionFk)}"
|
||||
android:textColor="@color/verdnatura_white"
|
||||
android:textSize="@dimen/h7"
|
||||
android:gravity="center_vertical"
|
||||
android:layout_marginLeft="@dimen/pasilleros_margin_main_menu"
|
||||
android:layout_marginStart="@dimen/pasilleros_margin_main_menu"
|
||||
android:textStyle="bold"/>
|
||||
|
||||
<TextView
|
||||
|
|
@ -40,7 +40,7 @@
|
|||
android:textColor="@color/verdnatura_pumpkin_orange"
|
||||
android:textSize="@dimen/h7"
|
||||
android:gravity="center_vertical"
|
||||
android:layout_marginLeft="@dimen/pasilleros_margin_main_menu"/>
|
||||
android:layout_marginStart="@dimen/pasilleros_margin_main_menu"/>
|
||||
<TextView
|
||||
android:id="@+id/totalTicketsId"
|
||||
android:layout_width="wrap_content"
|
||||
|
|
@ -49,15 +49,16 @@
|
|||
android:textColor="@color/verdnatura_white"
|
||||
android:textSize="@dimen/h7"
|
||||
android:gravity="center_vertical"
|
||||
android:layout_marginLeft="@dimen/packaging_margin_main_menu"/>
|
||||
android:layout_marginStart="@dimen/packaging_margin_main_menu"/>
|
||||
|
||||
<ImageView
|
||||
android:layout_marginLeft="@dimen/default_layout_margin"
|
||||
android:layout_marginStart="@dimen/default_layout_margin"
|
||||
android:id="@+id/item_image"
|
||||
android:layout_width="30dp"
|
||||
android:layout_height="30dp"
|
||||
android:scaleType="centerCrop"
|
||||
android:src="@drawable/ic_chevron_right_black_24dp" />
|
||||
android:src="@drawable/ic_chevron_right_black_24dp"
|
||||
android:contentDescription="@string/selectAction"/>
|
||||
</LinearLayout>
|
||||
<LinearLayout
|
||||
android:layout_width="match_parent"
|
||||
|
|
|
|||
|
|
@ -8,54 +8,50 @@
|
|||
name="item"
|
||||
type="es.verdnatura.presentation.view.feature.ubicador.model.ItemEscanerVO" />
|
||||
</data>
|
||||
|
||||
<LinearLayout
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:orientation="vertical">
|
||||
|
||||
<LinearLayout
|
||||
android:id="@+id/item_row_layout"
|
||||
android:orientation="horizontal"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:background="@color/verdnatura_black_5"
|
||||
android:paddingLeft="@dimen/pasilleros_margin_main_menu"
|
||||
android:paddingRight="@dimen/pasilleros_margin_main_menu"
|
||||
android:orientation="horizontal"
|
||||
android:paddingStart="@dimen/pasilleros_margin_main_menu"
|
||||
android:paddingTop="@dimen/pasilleros_margin_main_menu"
|
||||
android:paddingEnd="@dimen/pasilleros_margin_main_menu"
|
||||
android:paddingBottom="@dimen/pasilleros_margin_main_menu">
|
||||
|
||||
<LinearLayout
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:layout_weight="1"
|
||||
android:orientation="horizontal"
|
||||
android:gravity="center"
|
||||
android:layout_marginRight="@dimen/layout_margin_min">
|
||||
|
||||
|
||||
|
||||
<TextView
|
||||
android:id="@+id/itemfk_text"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="match_parent"
|
||||
android:layout_weight="1"
|
||||
android:textSize="@dimen/h5"
|
||||
android:gravity="center_vertical"
|
||||
android:textColor="@color/verdnatura_white"
|
||||
tool:text="45532"
|
||||
android:textSize="@dimen/h5"
|
||||
android:textStyle="bold"
|
||||
android:gravity="center_vertical"/>
|
||||
tool:text="45532" />
|
||||
|
||||
<ImageView
|
||||
android:layout_width="@dimen/item_image_width"
|
||||
android:layout_height="@dimen/item_image_width"
|
||||
android:src="@drawable/ic_delete_black_24dp"/>
|
||||
|
||||
</LinearLayout>
|
||||
android:contentDescription="@string/trash"
|
||||
android:src="@drawable/ic_delete_black_24dp" />
|
||||
|
||||
|
||||
|
||||
</LinearLayout>
|
||||
|
||||
<LinearLayout
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="1dp"
|
||||
android:background="@color/verdnatura_black_9"/>
|
||||
android:background="@color/verdnatura_black_9" />
|
||||
</LinearLayout>
|
||||
</layout>
|
||||
|
|
@ -36,7 +36,7 @@
|
|||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:layout_weight="1"
|
||||
android:gravity="left"
|
||||
android:gravity="start"
|
||||
android:text="@{Integer.toString(item.id)}"
|
||||
android:textColor="@color/verdnatura_white"
|
||||
android:textSize="@dimen/delivery_body_2" />
|
||||
|
|
@ -45,7 +45,7 @@
|
|||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:layout_weight="1.5"
|
||||
android:gravity="left"
|
||||
android:gravity="start"
|
||||
android:singleLine="true"
|
||||
android:text="@{item.itemPackingTypeConcat}"
|
||||
android:textColor="@color/verdnatura_white"
|
||||
|
|
@ -55,7 +55,7 @@
|
|||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:layout_weight="1"
|
||||
android:gravity="right"
|
||||
android:gravity="end"
|
||||
android:singleLine="true"
|
||||
android:text="@{Integer.toString(item.addressFk)}"
|
||||
android:textColor="@color/verdnatura_white"
|
||||
|
|
@ -73,10 +73,10 @@
|
|||
|
||||
<TextView
|
||||
android:id="@+id/itemPackage"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="match_parent"
|
||||
android:layout_weight="1"
|
||||
android:gravity="left"
|
||||
android:gravity="start"
|
||||
android:text="@{item.nickname}"
|
||||
android:textColor="@color/verdnatura_white"
|
||||
android:textSize="@dimen/delivery_body_2"
|
||||
|
|
@ -93,10 +93,10 @@
|
|||
|
||||
<TextView
|
||||
android:id="@+id/itemStreet"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="match_parent"
|
||||
android:layout_weight="1"
|
||||
android:gravity="left"
|
||||
android:gravity="start"
|
||||
android:text="@{item.street + ` - ` + item.city + ` - ` + String.valueOf(item.postalCode)}"
|
||||
android:textColor="@color/verdnatura_white"
|
||||
android:textSize="@dimen/delivery_body_2"
|
||||
|
|
|
|||
|
|
@ -1,114 +1,111 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<layout xmlns:app="http://schemas.android.com/apk/res-auto"
|
||||
xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
<layout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
xmlns:app="http://schemas.android.com/apk/res-auto"
|
||||
xmlns:tools="http://schemas.android.com/tools">
|
||||
<data>
|
||||
|
||||
<variable
|
||||
name="item"
|
||||
type="es.verdnatura.presentation.view.feature.delivery.model.ExpeditionInfoSummary" />
|
||||
</data>
|
||||
<data>
|
||||
|
||||
<variable
|
||||
name="item"
|
||||
type="es.verdnatura.presentation.view.feature.delivery.model.ExpeditionInfoSummary" />
|
||||
</data>
|
||||
|
||||
<LinearLayout
|
||||
android:id="@+id/fondo"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:orientation="vertical"
|
||||
android:paddingBottom="2dp"
|
||||
android:gravity="center_vertical"
|
||||
android:orientation="horizontal"
|
||||
android:paddingStart="2dp"
|
||||
android:paddingTop="2dp"
|
||||
android:paddingLeft="2dp">
|
||||
android:paddingBottom="2dp">
|
||||
|
||||
<LinearLayout
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:orientation="horizontal"
|
||||
android:gravity="center_vertical"
|
||||
>
|
||||
|
||||
<TextView
|
||||
android:id="@+id/txtConsignatario"
|
||||
android:layout_width="55dp"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="@{Integer.toString(item.addressFk)}"
|
||||
android:layout_weight="1"
|
||||
android:textColor="@color/verdnatura_white"
|
||||
android:textSize="22sp"
|
||||
android:textStyle="bold"
|
||||
tools:text="522515"
|
||||
/>
|
||||
<TextView
|
||||
android:id="@+id/txtConsignatario"
|
||||
android:layout_width="55dp"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_weight="1"
|
||||
android:text="@{Integer.toString(item.addressFk)}"
|
||||
android:textColor="@color/verdnatura_white"
|
||||
android:textSize="22sp"
|
||||
android:textStyle="bold"
|
||||
tools:text="522515" />
|
||||
|
||||
<TextView
|
||||
android:id="@+id/txtRoute"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="@{Integer.toString(item.routeFk)}"
|
||||
android:textAlignment="center"
|
||||
android:textColor="@color/verdnatura_white"
|
||||
android:textSize="14sp"
|
||||
android:textStyle="bold"
|
||||
android:visibility="gone"/>
|
||||
<TextView
|
||||
android:id="@+id/txtRoute"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="@{Integer.toString(item.routeFk)}"
|
||||
android:textAlignment="center"
|
||||
android:textColor="@color/verdnatura_white"
|
||||
android:textSize="14sp"
|
||||
android:textStyle="bold"
|
||||
android:visibility="gone" />
|
||||
|
||||
<TextView
|
||||
android:id="@+id/txtTotal"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_weight="1"
|
||||
android:text="@{Integer.toString(item.total)}"
|
||||
android:textColor="@color/verdnatura_white"
|
||||
android:textSize="14sp"
|
||||
android:textStyle="bold"
|
||||
tools:text="10"/>
|
||||
<TextView
|
||||
android:id="@+id/txtPacking"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_weight="1"
|
||||
android:text="@{item.itemPackingType}"
|
||||
android:textColor="@color/verdnatura_white"
|
||||
android:textSize="14sp"
|
||||
android:textStyle="bold"
|
||||
tools:text="H"/>
|
||||
<TextView
|
||||
android:id="@+id/txtScanned"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_weight="1"
|
||||
android:text="@{Integer.toString(item.delivery)}"
|
||||
android:textColor="@color/verdnatura_white"
|
||||
android:textSize="14sp"
|
||||
android:textStyle="bold"
|
||||
tools:text="5"/>
|
||||
<TextView
|
||||
android:id="@+id/txtLost"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_weight="1"
|
||||
android:text="@{Integer.toString(item.lost)}"
|
||||
android:textColor="@color/verdnatura_white"
|
||||
android:textSize="14sp"
|
||||
android:textStyle="bold"
|
||||
tools:text="5"/>
|
||||
<TextView
|
||||
android:id="@+id/txtDelivered"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_weight="1"
|
||||
android:text="@{Integer.toString(item.delivered)}"
|
||||
android:textColor="@color/verdnatura_white"
|
||||
android:textSize="14sp"
|
||||
android:textStyle="bold"
|
||||
tools:text="5"/>
|
||||
<TextView
|
||||
android:id="@+id/txtTotal"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_weight="1"
|
||||
android:text="@{Integer.toString(item.total)}"
|
||||
android:textColor="@color/verdnatura_white"
|
||||
android:textSize="14sp"
|
||||
android:textStyle="bold"
|
||||
tools:text="10" />
|
||||
|
||||
<ImageView
|
||||
android:id="@+id/showExp"
|
||||
android:layout_width="36dp"
|
||||
android:layout_height="36dp"
|
||||
android:layout_marginRight="2dp"
|
||||
android:contentDescription=""
|
||||
android:tooltipText="@string/scanAddressSelected"
|
||||
app:srcCompat="@drawable/camion" />
|
||||
<TextView
|
||||
android:id="@+id/txtPacking"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_weight="1"
|
||||
android:text="@{item.itemPackingType}"
|
||||
android:textColor="@color/verdnatura_white"
|
||||
android:textSize="14sp"
|
||||
android:textStyle="bold"
|
||||
tools:text="H" />
|
||||
|
||||
</LinearLayout>
|
||||
<TextView
|
||||
android:id="@+id/txtScanned"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_weight="1"
|
||||
android:text="@{Integer.toString(item.delivery)}"
|
||||
android:textColor="@color/verdnatura_white"
|
||||
android:textSize="14sp"
|
||||
android:textStyle="bold"
|
||||
tools:text="5" />
|
||||
|
||||
<TextView
|
||||
android:id="@+id/txtLost"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_weight="1"
|
||||
android:text="@{Integer.toString(item.lost)}"
|
||||
android:textColor="@color/verdnatura_white"
|
||||
android:textSize="14sp"
|
||||
android:textStyle="bold"
|
||||
tools:text="5" />
|
||||
|
||||
<TextView
|
||||
android:id="@+id/txtDelivered"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_weight="1"
|
||||
android:text="@{Integer.toString(item.delivered)}"
|
||||
android:textColor="@color/verdnatura_white"
|
||||
android:textSize="14sp"
|
||||
android:textStyle="bold"
|
||||
tools:text="5" />
|
||||
|
||||
<ImageView
|
||||
android:id="@+id/showExp"
|
||||
android:layout_width="36dp"
|
||||
android:layout_height="36dp"
|
||||
android:layout_marginEnd="2dp"
|
||||
android:contentDescription="@string/loadRoute"
|
||||
android:tooltipText="@string/scanAddressSelected"
|
||||
app:srcCompat="@drawable/camion" />
|
||||
|
||||
</LinearLayout>
|
||||
|
||||
|
|
|
|||
|
|
@ -17,8 +17,8 @@
|
|||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:background="@color/verdnatura_black_5"
|
||||
android:paddingLeft="@dimen/layout_margin_min"
|
||||
android:paddingRight="@dimen/layout_margin_min"
|
||||
android:paddingStart="@dimen/layout_margin_min"
|
||||
android:paddingEnd="@dimen/layout_margin_min"
|
||||
android:paddingTop="@dimen/pasilleros_margin_main_menu"
|
||||
android:paddingBottom="@dimen/pasilleros_margin_main_menu">
|
||||
|
||||
|
|
|
|||
|
|
@ -31,7 +31,7 @@
|
|||
android:textSize="@dimen/body2"
|
||||
android:textColor="@color/verdnatura_white"
|
||||
android:layout_weight="1"
|
||||
android:gravity="left"
|
||||
android:gravity="start"
|
||||
|
||||
/>
|
||||
<TextView
|
||||
|
|
@ -42,7 +42,7 @@
|
|||
android:textColor="@color/verdnatura_white"
|
||||
android:singleLine="true"
|
||||
android:layout_weight="1.25"
|
||||
android:gravity="left"/>
|
||||
android:gravity="start"/>
|
||||
|
||||
<TextView
|
||||
android:layout_width="match_parent"
|
||||
|
|
@ -51,7 +51,7 @@
|
|||
android:textSize="@dimen/body2"
|
||||
android:textColor="@color/verdnatura_white"
|
||||
android:layout_weight="1.25"
|
||||
android:gravity="right"/>
|
||||
android:gravity="end"/>
|
||||
|
||||
|
||||
</LinearLayout>
|
||||
|
|
|
|||
|
|
@ -18,8 +18,8 @@
|
|||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:background="@color/verdnatura_black_5"
|
||||
android:paddingLeft="@dimen/layout_margin_min"
|
||||
android:paddingRight="@dimen/layout_margin_min"
|
||||
android:paddingStart="@dimen/layout_margin_min"
|
||||
android:paddingEnd="@dimen/layout_margin_min"
|
||||
android:paddingTop="@dimen/pasilleros_margin_main_menu"
|
||||
android:paddingBottom="@dimen/pasilleros_margin_main_menu">
|
||||
|
||||
|
|
|
|||
|
|
@ -18,8 +18,8 @@
|
|||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:background="@color/verdnatura_black_5"
|
||||
android:paddingLeft="@dimen/layout_margin_min"
|
||||
android:paddingRight="@dimen/layout_margin_min"
|
||||
android:paddingStart="@dimen/layout_margin_min"
|
||||
android:paddingEnd="@dimen/layout_margin_min"
|
||||
android:paddingTop="@dimen/pasilleros_margin_main_menu"
|
||||
android:paddingBottom="@dimen/pasilleros_margin_main_menu">
|
||||
|
||||
|
|
|
|||
|
|
@ -30,7 +30,7 @@
|
|||
android:textColor="@color/verdnatura_white"
|
||||
android:textSize="@dimen/h8"
|
||||
android:gravity="center_vertical"
|
||||
android:layout_marginLeft="@dimen/pasilleros_margin_main_menu"
|
||||
android:layout_marginStart="@dimen/pasilleros_margin_main_menu"
|
||||
android:textStyle="bold"/>
|
||||
|
||||
<TextView
|
||||
|
|
@ -41,7 +41,7 @@
|
|||
android:textColor="@color/verdnatura_pumpkin_orange"
|
||||
android:textSize="@dimen/h8"
|
||||
android:gravity="center_vertical"
|
||||
android:layout_marginLeft="@dimen/pasilleros_margin_main_menu"/>
|
||||
android:layout_marginStart="@dimen/pasilleros_margin_main_menu"/>
|
||||
|
||||
|
||||
</LinearLayout>
|
||||
|
|
|
|||
|
|
@ -18,8 +18,8 @@
|
|||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:background="@color/verdnatura_black_5"
|
||||
android:paddingLeft="@dimen/layout_margin_min"
|
||||
android:paddingRight="@dimen/layout_margin_min"
|
||||
android:paddingStart="@dimen/layout_margin_min"
|
||||
android:paddingEnd="@dimen/layout_margin_min"
|
||||
android:paddingTop="@dimen/pasilleros_margin_main_menu"
|
||||
android:paddingBottom="@dimen/pasilleros_margin_main_menu">
|
||||
|
||||
|
|
|
|||
|
|
@ -30,7 +30,7 @@
|
|||
android:textSize="@dimen/h7"
|
||||
android:gravity="center_vertical"
|
||||
android:visibility="visible"
|
||||
android:layout_marginLeft="@dimen/pasilleros_margin_main_menu"
|
||||
android:layout_marginStart="@dimen/pasilleros_margin_main_menu"
|
||||
android:textStyle="bold"/>
|
||||
|
||||
<TextView
|
||||
|
|
@ -42,19 +42,20 @@
|
|||
android:textColor="@color/verdnatura_white"
|
||||
android:textSize="@dimen/h7"
|
||||
android:gravity="center_vertical"
|
||||
android:layout_marginLeft="@dimen/pasilleros_margin_main_menu"
|
||||
android:layout_marginStart="@dimen/pasilleros_margin_main_menu"
|
||||
android:visibility="visible"
|
||||
android:textStyle="bold"/>
|
||||
|
||||
|
||||
<ImageView
|
||||
android:layout_marginLeft="@dimen/default_layout_margin"
|
||||
android:layout_marginStart="@dimen/default_layout_margin"
|
||||
android:id="@+id/item_image"
|
||||
android:layout_width="30dp"
|
||||
android:layout_height="27dp"
|
||||
android:scaleType="centerCrop"
|
||||
android:visibility="gone"
|
||||
android:src="@drawable/ic_delete_black_24dp" />
|
||||
android:src="@drawable/ic_delete_black_24dp"
|
||||
android:contentDescription="@string/trash"/>
|
||||
</LinearLayout>
|
||||
<LinearLayout
|
||||
android:layout_width="match_parent"
|
||||
|
|
|
|||
|
|
@ -1,6 +1,5 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<layout xmlns:tools="http://schemas.android.com/tools"
|
||||
xmlns:app="http://schemas.android.com/apk/res-auto"
|
||||
xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
>
|
||||
|
||||
|
|
@ -27,7 +26,8 @@
|
|||
android:layout_width="48dp"
|
||||
android:layout_height="48dp"
|
||||
android:layout_weight="1"
|
||||
tools:srcCompat="@tools:sample/avatars" />
|
||||
tools:srcCompat="@tools:sample/avatars"
|
||||
android:contentDescription="@string/images"/>
|
||||
|
||||
<TextView
|
||||
android:id="@+id/item_code"
|
||||
|
|
@ -37,7 +37,7 @@
|
|||
android:layout_gravity="center_vertical"
|
||||
|
||||
|
||||
android:layout_marginRight="48dp"
|
||||
android:layout_marginEnd="48dp"
|
||||
android:gravity="center_vertical"
|
||||
android:text="@{item.code}"
|
||||
android:textColor="@color/verdnatura_white"
|
||||
|
|
@ -48,11 +48,11 @@
|
|||
|
||||
|
||||
<ImageView
|
||||
android:layout_marginLeft="@dimen/default_layout_margin"
|
||||
android:layout_marginStart="@dimen/default_layout_margin"
|
||||
android:id="@+id/item_image_update"
|
||||
android:layout_width="48dp"
|
||||
android:layout_height="48dp"
|
||||
|
||||
android:contentDescription="@string/update"
|
||||
android:gravity="center_vertical"
|
||||
android:scaleType="centerCrop"
|
||||
android:layout_gravity="center"
|
||||
|
|
@ -60,7 +60,7 @@
|
|||
android:src="@drawable/ic_history_black_24dp" />
|
||||
|
||||
<ImageView
|
||||
android:layout_marginLeft="@dimen/default_layout_margin"
|
||||
android:layout_marginStart="@dimen/default_layout_margin"
|
||||
android:id="@+id/item_image_trash"
|
||||
android:layout_width="48dp"
|
||||
android:gravity="center_vertical"
|
||||
|
|
@ -68,7 +68,8 @@
|
|||
android:scaleType="centerCrop"
|
||||
android:layout_gravity="center"
|
||||
android:visibility="visible"
|
||||
android:src="@drawable/ic_delete_black_24dp" />
|
||||
android:src="@drawable/ic_delete_black_24dp"
|
||||
android:contentDescription="@string/trash"/>
|
||||
|
||||
|
||||
</LinearLayout>
|
||||
|
|
|
|||
|
|
@ -19,17 +19,17 @@
|
|||
android:layout_height="wrap_content"
|
||||
android:background="@color/verdnatura_black_5"
|
||||
android:orientation="horizontal"
|
||||
android:paddingLeft="@dimen/layout_margin_min"
|
||||
android:paddingStart="@dimen/layout_margin_min"
|
||||
android:paddingTop="@dimen/pasilleros_margin_main_menu"
|
||||
android:paddingRight="@dimen/layout_margin_min"
|
||||
android:paddingEnd="@dimen/layout_margin_min"
|
||||
android:paddingBottom="@dimen/pasilleros_margin_main_menu">
|
||||
|
||||
<TextView
|
||||
android:id="@+id/historico_date"
|
||||
android:layout_width="100dp"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginRight="@dimen/layout_margin_min"
|
||||
android:gravity="left"
|
||||
android:layout_marginEnd="@dimen/layout_margin_min"
|
||||
android:gravity="start"
|
||||
android:text="@{item.shipped}"
|
||||
android:textColor="@color/verdnatura_white"
|
||||
android:textSize="@dimen/body2" />
|
||||
|
|
@ -38,7 +38,7 @@
|
|||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_weight="1"
|
||||
android:gravity="left"
|
||||
android:gravity="start"
|
||||
android:text="@{item.name}"
|
||||
android:textColor="@color/verdnatura_white"
|
||||
android:textSize="@dimen/body2" />
|
||||
|
|
|
|||
|
|
@ -18,8 +18,8 @@
|
|||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:background="@color/verdnatura_black_5"
|
||||
android:paddingLeft="@dimen/layout_margin_min"
|
||||
android:paddingRight="@dimen/layout_margin_min"
|
||||
android:paddingStart="@dimen/layout_margin_min"
|
||||
android:paddingEnd="@dimen/layout_margin_min"
|
||||
android:paddingTop="@dimen/pasilleros_margin_main_menu"
|
||||
android:paddingBottom="@dimen/pasilleros_margin_main_menu">
|
||||
|
||||
|
|
@ -32,7 +32,7 @@
|
|||
android:textSize="@dimen/body2"
|
||||
android:textColor="@color/verdnatura_white"
|
||||
android:gravity="center"
|
||||
android:layout_marginRight="@dimen/layout_margin_min"/>
|
||||
android:layout_marginEnd="@dimen/layout_margin_min"/>
|
||||
|
||||
<TextView
|
||||
android:layout_width="match_parent"
|
||||
|
|
|
|||
|
|
@ -1,6 +1,5 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<layout xmlns:tools="http://schemas.android.com/tools"
|
||||
xmlns:app="http://schemas.android.com/apk/res-auto"
|
||||
xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
>
|
||||
|
||||
|
|
@ -27,7 +26,8 @@
|
|||
android:layout_width="48dp"
|
||||
android:layout_height="48dp"
|
||||
android:layout_weight="1"
|
||||
tools:srcCompat="@tools:sample/avatars" />
|
||||
tools:srcCompat="@tools:sample/avatars"
|
||||
android:contentDescription="@string/images"/>
|
||||
|
||||
<TextView
|
||||
android:id="@+id/item_name"
|
||||
|
|
@ -35,7 +35,7 @@
|
|||
android:layout_height="wrap_content"
|
||||
android:layout_weight="1"
|
||||
android:layout_gravity="center_vertical"
|
||||
android:layout_marginRight="48dp"
|
||||
android:layout_marginEnd="48dp"
|
||||
android:gravity="center_vertical"
|
||||
android:text="@{item.name}"
|
||||
android:textColor="@color/verdnatura_white"
|
||||
|
|
@ -45,7 +45,7 @@
|
|||
|
||||
|
||||
<ImageView
|
||||
android:layout_marginLeft="@dimen/default_layout_margin"
|
||||
android:layout_marginStart="@dimen/default_layout_margin"
|
||||
android:id="@+id/item_image_update"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
|
|
@ -54,10 +54,11 @@
|
|||
android:scaleType="centerCrop"
|
||||
android:layout_gravity="center"
|
||||
android:visibility="visible"
|
||||
android:src="@drawable/ic_history_black_24dp" />
|
||||
android:src="@drawable/ic_history_black_24dp"
|
||||
android:contentDescription="@string/update"/>
|
||||
|
||||
<ImageView
|
||||
android:layout_marginLeft="@dimen/default_layout_margin"
|
||||
android:layout_marginStart="@dimen/default_layout_margin"
|
||||
android:id="@+id/item_image_trash"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
|
|
@ -66,7 +67,8 @@
|
|||
android:scaleType="centerCrop"
|
||||
android:layout_gravity="center"
|
||||
android:visibility="visible"
|
||||
android:src="@drawable/ic_delete_black_24dp" />
|
||||
android:src="@drawable/ic_delete_black_24dp"
|
||||
android:contentDescription="@string/trash"/>
|
||||
|
||||
|
||||
</LinearLayout>
|
||||
|
|
|
|||
|
|
@ -18,17 +18,17 @@
|
|||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:background="@color/verdnatura_black_5"
|
||||
android:paddingLeft="@dimen/pasilleros_margin_main_menu"
|
||||
android:paddingRight="@dimen/pasilleros_margin_main_menu"
|
||||
android:paddingStart="@dimen/pasilleros_margin_main_menu"
|
||||
android:paddingEnd="@dimen/pasilleros_margin_main_menu"
|
||||
android:paddingTop="@dimen/pasilleros_margin_main_menu">
|
||||
|
||||
|
||||
<TextView
|
||||
android:id="@+id/item_fk"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_weight="1"
|
||||
android:gravity="left"
|
||||
android:gravity="start"
|
||||
android:text="@{Integer.toString(item.itemFk)}"
|
||||
android:textColor="@color/verdnatura_white"
|
||||
android:textSize="@dimen/h7"
|
||||
|
|
@ -41,19 +41,19 @@
|
|||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:background="@color/verdnatura_black_5"
|
||||
android:paddingLeft="@dimen/pasilleros_margin_main_menu"
|
||||
android:paddingRight="@dimen/pasilleros_margin_main_menu">
|
||||
android:paddingStart="@dimen/pasilleros_margin_main_menu"
|
||||
android:paddingEnd="@dimen/pasilleros_margin_main_menu">
|
||||
|
||||
|
||||
<TextView
|
||||
android:layout_width="match_parent"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="@{item.longName}"
|
||||
android:textSize="@dimen/body2"
|
||||
android:textStyle="bold"
|
||||
android:textColor="@color/verdnatura_white"
|
||||
android:layout_weight="1"
|
||||
android:gravity="left"
|
||||
android:gravity="start"
|
||||
tool:text="Alstromeria Blanca"/>
|
||||
|
||||
</LinearLayout>
|
||||
|
|
@ -62,19 +62,19 @@
|
|||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:background="@color/verdnatura_black_5"
|
||||
android:paddingLeft="@dimen/pasilleros_margin_main_menu"
|
||||
android:paddingRight="@dimen/pasilleros_margin_main_menu">
|
||||
android:paddingStart="@dimen/pasilleros_margin_main_menu"
|
||||
android:paddingEnd="@dimen/pasilleros_margin_main_menu">
|
||||
|
||||
<TextView
|
||||
android:id="@+id/itemColor"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="@{item.itemColour}"
|
||||
android:textSize="@dimen/body2"
|
||||
android:textStyle="bold"
|
||||
android:textColor="@color/verdnatura_white"
|
||||
android:layout_weight="2"
|
||||
android:gravity="left"
|
||||
android:gravity="start"
|
||||
tool:text="Amarillo" />
|
||||
</LinearLayout>
|
||||
<LinearLayout
|
||||
|
|
@ -82,19 +82,19 @@
|
|||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:background="@color/verdnatura_black_5"
|
||||
android:paddingLeft="@dimen/pasilleros_margin_main_menu"
|
||||
android:paddingRight="@dimen/pasilleros_margin_main_menu">
|
||||
android:paddingStart="@dimen/pasilleros_margin_main_menu"
|
||||
android:paddingEnd="@dimen/pasilleros_margin_main_menu">
|
||||
|
||||
|
||||
<TextView
|
||||
android:layout_width="match_parent"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="@{String.valueOf(item.size)}"
|
||||
android:textSize="@dimen/body2"
|
||||
android:textStyle="bold"
|
||||
android:textColor="@color/verdnatura_white"
|
||||
android:layout_weight="2"
|
||||
android:gravity="left"
|
||||
android:gravity="start"
|
||||
tool:text="80" />
|
||||
</LinearLayout>
|
||||
|
||||
|
|
@ -103,21 +103,21 @@
|
|||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:background="@color/verdnatura_black_5"
|
||||
android:paddingLeft="@dimen/pasilleros_margin_main_menu"
|
||||
android:paddingRight="@dimen/pasilleros_margin_main_menu"
|
||||
android:paddingStart="@dimen/pasilleros_margin_main_menu"
|
||||
android:paddingEnd="@dimen/pasilleros_margin_main_menu"
|
||||
android:paddingBottom="@dimen/pasilleros_margin_main_menu">
|
||||
|
||||
|
||||
<TextView
|
||||
android:id="@+id/item_producer"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="@{item.producer}"
|
||||
android:textSize="@dimen/body2"
|
||||
android:textStyle="bold"
|
||||
android:textColor="@color/verdnatura_white"
|
||||
android:layout_weight="1"
|
||||
android:gravity="left"
|
||||
android:gravity="start"
|
||||
tool:text="Benchmark"/>
|
||||
|
||||
|
||||
|
|
@ -128,8 +128,8 @@
|
|||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:background="@color/verdnatura_black_5"
|
||||
android:paddingLeft="@dimen/pasilleros_margin_main_menu"
|
||||
android:paddingRight="@dimen/pasilleros_margin_main_menu"
|
||||
android:paddingStart="@dimen/pasilleros_margin_main_menu"
|
||||
android:paddingEnd="@dimen/pasilleros_margin_main_menu"
|
||||
android:paddingBottom="@dimen/pasilleros_margin_main_menu">
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -3,7 +3,6 @@
|
|||
xmlns:app="http://schemas.android.com/apk/res-auto">
|
||||
|
||||
<data>
|
||||
|
||||
<variable
|
||||
name="item"
|
||||
type="es.verdnatura.presentation.view.feature.inventario.model.ItemInventoryParking" />
|
||||
|
|
@ -13,10 +12,7 @@
|
|||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:orientation="vertical">
|
||||
<LinearLayout
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:orientation="horizontal">
|
||||
|
||||
|
||||
<LinearLayout
|
||||
android:id="@+id/item_row_layout"
|
||||
|
|
@ -24,15 +20,16 @@
|
|||
android:layout_height="wrap_content"
|
||||
android:background="@color/verdnatura_black_5"
|
||||
android:orientation="horizontal"
|
||||
android:paddingLeft="@dimen/pasilleros_margin_main_menu"
|
||||
android:paddingStart="@dimen/pasilleros_margin_main_menu"
|
||||
android:paddingTop="@dimen/inventory_item"
|
||||
android:paddingRight="@dimen/inventory_item"
|
||||
android:paddingBottom="@dimen/inventory_item">
|
||||
android:paddingEnd="@dimen/inventory_item"
|
||||
android:paddingBottom="@dimen/inventory_item"
|
||||
android:baselineAligned="false">
|
||||
|
||||
<LinearLayout
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginRight="@dimen/layout_margin_min"
|
||||
android:layout_marginEnd="@dimen/layout_margin_min"
|
||||
android:layout_weight="1"
|
||||
android:gravity="center"
|
||||
android:orientation="horizontal">
|
||||
|
|
@ -40,13 +37,14 @@
|
|||
<androidx.cardview.widget.CardView
|
||||
android:layout_width="@dimen/item_image_width"
|
||||
android:layout_height="@dimen/item_image_width"
|
||||
android:layout_marginRight="@dimen/layout_margin_1"
|
||||
android:layout_marginEnd="@dimen/layout_margin_1"
|
||||
app:cardCornerRadius="100dp">
|
||||
|
||||
<ImageView
|
||||
android:id="@+id/img_item"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent" />
|
||||
android:layout_height="match_parent"
|
||||
android:contentDescription="@string/item"/>
|
||||
</androidx.cardview.widget.CardView>
|
||||
|
||||
<LinearLayout
|
||||
|
|
@ -115,7 +113,7 @@
|
|||
|
||||
<TextView
|
||||
android:id="@+id/buyer_text"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="match_parent"
|
||||
android:layout_weight="1"
|
||||
android:ellipsize="end"
|
||||
|
|
@ -163,14 +161,14 @@
|
|||
android:layout_height="match_parent"
|
||||
android:scaleType="center"
|
||||
android:src="@drawable/ic_more_vert_black_24dp"
|
||||
android:visibility="gone" />
|
||||
android:visibility="gone"
|
||||
android:contentDescription="@string/options"/>
|
||||
</LinearLayout>
|
||||
</LinearLayout>
|
||||
<LinearLayout
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="1dp"
|
||||
android:background="@color/verdnatura_black_9" />
|
||||
</LinearLayout>
|
||||
|
||||
</LinearLayout>
|
||||
<LinearLayout
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="1dp"
|
||||
android:background="@color/verdnatura_black_9" />
|
||||
</LinearLayout>
|
||||
</layout>
|
||||
|
|
|
|||
|
|
@ -31,7 +31,7 @@
|
|||
android:gravity="center_vertical"
|
||||
android:visibility="gone"
|
||||
android:layout_gravity="center"
|
||||
android:layout_marginLeft="@dimen/pasilleros_margin_main_menu"
|
||||
android:layout_marginStart="@dimen/pasilleros_margin_main_menu"
|
||||
tools:text="1" />
|
||||
|
||||
<TextView
|
||||
|
|
@ -52,6 +52,7 @@
|
|||
android:layout_height="wrap_content"
|
||||
android:layout_weight="1.25"
|
||||
android:text="@{Integer.toString(item.quantityTotal)}"
|
||||
android:hint="@string/total"
|
||||
android:textColor="@color/verdnatura_white"
|
||||
android:textSize="@dimen/h8"
|
||||
android:gravity="center_vertical"
|
||||
|
|
@ -59,13 +60,15 @@
|
|||
android:imeOptions="actionDone"
|
||||
android:singleLine="true"
|
||||
android:layout_gravity="center"
|
||||
android:autofillHints="phone"
|
||||
android:inputType="number"
|
||||
tools:text="20" />
|
||||
|
||||
<TextView
|
||||
android:id="@+id/item_quantity"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginLeft="@dimen/pasilleros_margin_main_menu"
|
||||
android:layout_marginStart="@dimen/pasilleros_margin_main_menu"
|
||||
android:layout_weight="1.25"
|
||||
android:layout_gravity="center"
|
||||
android:text="@{Integer.toString(item.quantity)}"
|
||||
|
|
@ -76,7 +79,7 @@
|
|||
|
||||
|
||||
<ImageView
|
||||
android:layout_marginLeft="@dimen/default_layout_margin"
|
||||
android:layout_marginStart="@dimen/default_layout_margin"
|
||||
android:id="@+id/item_image_update"
|
||||
android:layout_width="24dp"
|
||||
android:gravity="center_vertical"
|
||||
|
|
@ -84,10 +87,11 @@
|
|||
android:scaleType="centerCrop"
|
||||
android:layout_gravity="center"
|
||||
android:visibility="visible"
|
||||
android:src="@drawable/ic_history_black_24dp" />
|
||||
android:src="@drawable/ic_history_black_24dp"
|
||||
android:contentDescription="@string/selectAction"/>
|
||||
|
||||
<ImageView
|
||||
android:layout_marginLeft="@dimen/default_layout_margin"
|
||||
android:layout_marginStart="@dimen/default_layout_margin"
|
||||
android:id="@+id/item_image_trash"
|
||||
android:layout_width="24dp"
|
||||
android:gravity="center_vertical"
|
||||
|
|
@ -95,7 +99,8 @@
|
|||
android:scaleType="centerCrop"
|
||||
android:layout_gravity="center"
|
||||
android:visibility="visible"
|
||||
android:src="@drawable/ic_delete_black_24dp" />
|
||||
android:src="@drawable/ic_delete_black_24dp"
|
||||
android:contentDescription="@string/trash"/>
|
||||
</LinearLayout>
|
||||
<LinearLayout
|
||||
android:layout_width="match_parent"
|
||||
|
|
|
|||
|
|
@ -29,7 +29,7 @@
|
|||
android:textColor="@color/verdnatura_white"
|
||||
android:textSize="@dimen/h7"
|
||||
android:gravity="center_vertical"
|
||||
android:layout_marginLeft="@dimen/pasilleros_margin_main_menu"
|
||||
android:layout_marginStart="@dimen/pasilleros_margin_main_menu"
|
||||
android:textStyle="bold"/>
|
||||
|
||||
<TextView
|
||||
|
|
@ -41,7 +41,7 @@
|
|||
android:textColor="@color/verdnatura_pumpkin_orange"
|
||||
android:textSize="@dimen/h7"
|
||||
android:gravity="center_vertical"
|
||||
android:layout_marginLeft="@dimen/pasilleros_margin_main_menu"/>
|
||||
android:layout_marginStart="@dimen/pasilleros_margin_main_menu"/>
|
||||
|
||||
</LinearLayout>
|
||||
<LinearLayout
|
||||
|
|
|
|||
|
|
@ -19,8 +19,8 @@
|
|||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:background="@color/verdnatura_black_5"
|
||||
android:paddingLeft="@dimen/layout_margin_min"
|
||||
android:paddingRight="@dimen/layout_margin_min"
|
||||
android:paddingStart="@dimen/layout_margin_min"
|
||||
android:paddingEnd="@dimen/layout_margin_min"
|
||||
android:paddingTop="@dimen/pasilleros_margin_main_menu"
|
||||
android:paddingBottom="@dimen/pasilleros_margin_main_menu">
|
||||
|
||||
|
|
|
|||
|
|
@ -3,7 +3,6 @@
|
|||
xmlns:app="http://schemas.android.com/apk/res-auto">
|
||||
|
||||
<data>
|
||||
|
||||
<variable
|
||||
name="item"
|
||||
type="es.verdnatura.presentation.view.feature.pasillero.model.PasillerosItemVO" />
|
||||
|
|
@ -14,20 +13,12 @@
|
|||
<LinearLayout
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="70dp"
|
||||
android:orientation="vertical"
|
||||
android:orientation="horizontal"
|
||||
android:layout_marginTop="15dp"
|
||||
android:layout_marginLeft="@dimen/pasilleros_margin_main_menu"
|
||||
android:layout_marginRight="@dimen/pasilleros_margin_main_menu"
|
||||
|
||||
>
|
||||
|
||||
<LinearLayout
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="65dp"
|
||||
android:orientation="horizontal"
|
||||
android:padding="@dimen/pasilleros_margin_main_menu"
|
||||
android:background="@drawable/background_round_square"
|
||||
android:foreground="@drawable/custom_ripple" >
|
||||
android:layout_marginStart="@dimen/pasilleros_margin_main_menu"
|
||||
android:layout_marginEnd="@dimen/pasilleros_margin_main_menu"
|
||||
android:background="@drawable/background_round_square"
|
||||
android:foreground="@drawable/custom_ripple">
|
||||
|
||||
|
||||
<ImageView
|
||||
|
|
@ -36,33 +27,22 @@
|
|||
android:layout_height="30dp"
|
||||
android:scaleType="centerCrop"
|
||||
android:layout_weight="0"
|
||||
/>
|
||||
android:layout_gravity="center"
|
||||
android:contentDescription="@string/selectAction"
|
||||
android:layout_marginStart="@dimen/pasilleros_margin_main_menu"/>
|
||||
|
||||
<TextView
|
||||
android:id="@+id/item_title"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="match_parent"
|
||||
android:layout_marginLeft="30dp"
|
||||
android:layout_marginStart="30dp"
|
||||
android:gravity="center_vertical"
|
||||
android:text="@{title}"
|
||||
android:textColor="@color/verdnatura_white"
|
||||
android:textSize="@dimen/h6"
|
||||
android:layout_weight="1"
|
||||
android:drawableEnd="@drawable/ic_chevron_right_black_24dp"
|
||||
app:drawableEndCompat="@drawable/ic_chevron_right_black_24dp" />
|
||||
|
||||
/>
|
||||
|
||||
<!-- <ImageView
|
||||
android:id="@+id/item_image_end"
|
||||
android:layout_width="30dp"
|
||||
android:layout_height="30dp"
|
||||
android:scaleType="centerCrop"
|
||||
app:srcCompat="@drawable/ic_chevron_right_black_24dp"
|
||||
android:layout_weight="0"/>-->
|
||||
</LinearLayout>
|
||||
<!-- <LinearLayout
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="1dp"
|
||||
android:background="@color/verdnatura_black_9"/>-->
|
||||
</LinearLayout>
|
||||
|
||||
</layout>
|
||||
|
|
@ -30,7 +30,8 @@
|
|||
android:id="@+id/item_image"
|
||||
android:layout_width="30dp"
|
||||
android:layout_height="30dp"
|
||||
android:scaleType="centerCrop"/>
|
||||
android:scaleType="centerCrop"
|
||||
android:contentDescription="@string/selectAction"/>
|
||||
|
||||
<TextView
|
||||
android:id="@+id/item_title"
|
||||
|
|
@ -40,7 +41,7 @@
|
|||
android:textColor="@color/verdnatura_white"
|
||||
android:textSize="@dimen/h7"
|
||||
android:gravity="center_vertical"
|
||||
android:layout_marginLeft="@dimen/pasilleros_margin_main_menu"/>
|
||||
android:layout_marginStart="@dimen/pasilleros_margin_main_menu"/>
|
||||
</LinearLayout>
|
||||
<LinearLayout
|
||||
android:layout_width="match_parent"
|
||||
|
|
|
|||
|
|
@ -57,12 +57,10 @@
|
|||
<TextView
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="28-05"
|
||||
tool:text="28/05 "
|
||||
android:visibility="gone"
|
||||
android:textColor="@color/verdnatura_white"
|
||||
android:textSize="@dimen/h8"
|
||||
android:layout_marginEnd="@dimen/layout_margin_min"/>
|
||||
android:layout_marginEnd="@dimen/layout_margin_min" />
|
||||
<TextView
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
|
|
|
|||
|
|
@ -8,269 +8,226 @@
|
|||
name="item"
|
||||
type="es.verdnatura.presentation.view.feature.articulo.model.ItemProposal" />
|
||||
</data>
|
||||
|
||||
<LinearLayout
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:orientation="vertical">
|
||||
|
||||
<LinearLayout
|
||||
android:id="@+id/item_row_layout"
|
||||
android:orientation="horizontal"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:background="@color/verdnatura_black_5"
|
||||
android:paddingLeft="@dimen/pasilleros_margin_main_menu"
|
||||
android:paddingRight="@dimen/pasilleros_margin_main_menu"
|
||||
android:paddingTop="@dimen/pasilleros_margin_main_menu">
|
||||
android:orientation="horizontal"
|
||||
android:paddingStart="@dimen/pasilleros_margin_main_menu"
|
||||
android:paddingTop="@dimen/pasilleros_margin_main_menu"
|
||||
android:paddingEnd="@dimen/pasilleros_margin_main_menu">
|
||||
|
||||
|
||||
<TextView
|
||||
android:id="@+id/item_fk"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_weight="1"
|
||||
android:gravity="start"
|
||||
android:text="@{String.valueOf(item.itemFk)}"
|
||||
android:textColor="@color/verdnatura_white"
|
||||
android:textSize="@dimen/h6"
|
||||
android:textStyle="bold"
|
||||
android:textColor="@color/verdnatura_white"
|
||||
android:layout_weight="1"
|
||||
android:gravity="left"
|
||||
tool:text="31100"/>
|
||||
|
||||
|
||||
|
||||
<TextView
|
||||
android:id="@+id/item_down"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="@{String.valueOf(item.available)}"
|
||||
android:textSize="@dimen/h6"
|
||||
android:textStyle="bold"
|
||||
android:textColor="@color/verdnatura_pumpkin_orange"
|
||||
android:layout_weight="1"
|
||||
android:gravity="center"
|
||||
tool:text="730"/>
|
||||
|
||||
<TextView
|
||||
android:id="@+id/item_up"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="@{String.valueOf(item.minQuantity)}"
|
||||
android:textSize="@dimen/h6"
|
||||
android:textStyle="bold"
|
||||
android:textColor="@color/verdnatura_pumpkin_orange"
|
||||
android:layout_weight="1"
|
||||
android:gravity="center"
|
||||
tool:text="0" />
|
||||
|
||||
|
||||
|
||||
</LinearLayout>
|
||||
|
||||
|
||||
|
||||
<LinearLayout
|
||||
android:orientation="horizontal"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:background="@color/verdnatura_black_5"
|
||||
android:paddingLeft="@dimen/pasilleros_margin_main_menu"
|
||||
android:paddingRight="@dimen/pasilleros_margin_main_menu">
|
||||
tool:text="31100" />
|
||||
|
||||
|
||||
<TextView
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="@{item.longName}"
|
||||
android:textSize="@dimen/body2"
|
||||
android:textStyle="bold"
|
||||
android:textColor="@color/verdnatura_white"
|
||||
android:layout_weight="1"
|
||||
android:gravity="left"
|
||||
tool:text="Alstromeria Blanca"/>
|
||||
|
||||
|
||||
|
||||
</LinearLayout>
|
||||
<LinearLayout
|
||||
android:orientation="horizontal"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:background="@color/verdnatura_black_5"
|
||||
android:paddingLeft="@dimen/pasilleros_margin_main_menu"
|
||||
android:paddingRight="@dimen/pasilleros_margin_main_menu">
|
||||
|
||||
|
||||
<TextView
|
||||
android:id="@+id/item_producer_text"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="@string/producer"
|
||||
android:textSize="@dimen/body2"
|
||||
android:textStyle="bold"
|
||||
android:textColor="@color/verdnatura_brown_grey"
|
||||
android:gravity="left"
|
||||
tool:text="Productor"/>
|
||||
|
||||
<TextView
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="@{item.subName}"
|
||||
android:textSize="@dimen/body2"
|
||||
android:textStyle="bold"
|
||||
android:textColor="@color/verdnatura_white"
|
||||
android:gravity="left"
|
||||
android:layout_marginLeft="5dp"
|
||||
tool:text="Subname" />
|
||||
|
||||
|
||||
</LinearLayout>
|
||||
<LinearLayout
|
||||
android:orientation="horizontal"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:background="@color/verdnatura_black_5"
|
||||
android:paddingLeft="@dimen/pasilleros_margin_main_menu"
|
||||
android:paddingRight="@dimen/pasilleros_margin_main_menu"
|
||||
android:paddingBottom="@dimen/pasilleros_margin_main_menu">
|
||||
|
||||
<LinearLayout
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_weight="1">
|
||||
<TextView
|
||||
android:id="@+id/item_producertext"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="@string/Origen"
|
||||
android:textSize="@dimen/body2"
|
||||
android:textStyle="bold"
|
||||
android:textColor="@color/verdnatura_brown_grey"
|
||||
android:layout_weight="1"
|
||||
android:gravity="left"
|
||||
tool:text="Origen"/>
|
||||
<TextView
|
||||
android:id="@+id/item_producer"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="@{item.value7}"
|
||||
android:textSize="@dimen/body2"
|
||||
android:textStyle="bold"
|
||||
android:textColor="@color/verdnatura_white"
|
||||
android:layout_weight="1"
|
||||
android:gravity="left"
|
||||
tool:text="Origen"/>
|
||||
|
||||
</LinearLayout>
|
||||
|
||||
<LinearLayout
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_weight="1">
|
||||
<TextView
|
||||
android:id="@+id/item_longitudtext"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="@string/Longitud"
|
||||
android:textSize="@dimen/body2"
|
||||
android:textStyle="bold"
|
||||
android:textColor="@color/verdnatura_brown_grey"
|
||||
android:layout_weight="1"
|
||||
android:gravity="left"
|
||||
tool:text="Longitud"/>
|
||||
<TextView
|
||||
android:id="@+id/item_longitud"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="@{item.value5}"
|
||||
android:textSize="@dimen/body2"
|
||||
android:textStyle="bold"
|
||||
android:textColor="@color/verdnatura_white"
|
||||
android:layout_weight="1"
|
||||
android:gravity="left"
|
||||
tool:text="@string/Longitud"/>
|
||||
|
||||
</LinearLayout>
|
||||
<LinearLayout
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_weight="1">
|
||||
|
||||
<TextView
|
||||
android:id="@+id/item_colortext"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="@string/Color"
|
||||
android:textSize="@dimen/body2"
|
||||
android:textStyle="bold"
|
||||
android:textColor="@color/verdnatura_brown_grey"
|
||||
android:layout_weight="1"
|
||||
android:gravity="left"
|
||||
tool:text="Color"/>
|
||||
<TextView
|
||||
android:id="@+id/item_color"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="@{item.value6}"
|
||||
android:textSize="@dimen/body2"
|
||||
android:textStyle="bold"
|
||||
android:textColor="@color/verdnatura_white"
|
||||
android:layout_weight="1"
|
||||
android:gravity="left"
|
||||
tool:text="Color"/>
|
||||
|
||||
</LinearLayout>
|
||||
|
||||
</LinearLayout>
|
||||
|
||||
<!-- <LinearLayout
|
||||
android:layout_width="253dp"
|
||||
android:layout_height="317dp"
|
||||
android:background="@color/verdnatura_black_5"
|
||||
android:orientation="horizontal"
|
||||
android:paddingLeft="@dimen/pasilleros_margin_main_menu"
|
||||
android:paddingRight="@dimen/pasilleros_margin_main_menu"
|
||||
android:paddingBottom="@dimen/pasilleros_margin_main_menu"
|
||||
android:visibility="gone">
|
||||
|
||||
|
||||
<TextView
|
||||
android:id="@+id/item_down2"
|
||||
android:id="@+id/item_down"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_weight="1"
|
||||
android:gravity="center"
|
||||
android:text="@{item.available}"
|
||||
android:text="@{String.valueOf(item.available)}"
|
||||
android:textColor="@color/verdnatura_pumpkin_orange"
|
||||
android:textSize="@dimen/h6"
|
||||
android:textStyle="bold"
|
||||
tool:text="730" />
|
||||
|
||||
<TextView
|
||||
android:id="@+id/item_up2"
|
||||
android:id="@+id/item_up"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_weight="1"
|
||||
android:gravity="center"
|
||||
android:text="@{item.minQuantity}"
|
||||
android:textColor="@color/verdnatura_pumpkin_orange"
|
||||
android:textSize="@dimen/h6"
|
||||
android:textStyle="bold"
|
||||
tool:text="0" />
|
||||
<TextView
|
||||
android:id="@+id/item_nicho"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_weight="1"
|
||||
android:gravity="center"
|
||||
android:text="@{item.minQuantity}"
|
||||
android:text="@{String.valueOf(item.minQuantity)}"
|
||||
android:textColor="@color/verdnatura_pumpkin_orange"
|
||||
android:textSize="@dimen/h6"
|
||||
android:textStyle="bold"
|
||||
tool:text="0" />
|
||||
|
||||
</LinearLayout>-->
|
||||
|
||||
</LinearLayout>
|
||||
|
||||
|
||||
<LinearLayout
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:background="@color/verdnatura_black_5"
|
||||
android:orientation="horizontal"
|
||||
android:paddingStart="@dimen/pasilleros_margin_main_menu"
|
||||
android:paddingEnd="@dimen/pasilleros_margin_main_menu">
|
||||
|
||||
|
||||
<TextView
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_weight="1"
|
||||
android:gravity="start"
|
||||
android:text="@{item.longName}"
|
||||
android:textColor="@color/verdnatura_white"
|
||||
android:textSize="@dimen/body2"
|
||||
android:textStyle="bold"
|
||||
tool:text="Alstromeria Blanca" />
|
||||
|
||||
|
||||
</LinearLayout>
|
||||
|
||||
<LinearLayout
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:background="@color/verdnatura_black_5"
|
||||
android:orientation="horizontal"
|
||||
android:paddingStart="@dimen/pasilleros_margin_main_menu"
|
||||
android:paddingEnd="@dimen/pasilleros_margin_main_menu">
|
||||
|
||||
|
||||
<TextView
|
||||
android:id="@+id/item_producer_text"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:gravity="start"
|
||||
android:text="@string/producer"
|
||||
android:textColor="@color/verdnatura_brown_grey"
|
||||
android:textSize="@dimen/body2"
|
||||
android:textStyle="bold"
|
||||
tool:text="Productor" />
|
||||
|
||||
<TextView
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginStart="5dp"
|
||||
android:gravity="start"
|
||||
android:text="@{item.subName}"
|
||||
android:textColor="@color/verdnatura_white"
|
||||
android:textSize="@dimen/body2"
|
||||
android:textStyle="bold"
|
||||
tool:text="Subname" />
|
||||
|
||||
|
||||
</LinearLayout>
|
||||
|
||||
<LinearLayout
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:background="@color/verdnatura_black_5"
|
||||
android:baselineAligned="false"
|
||||
android:orientation="horizontal"
|
||||
android:paddingStart="@dimen/pasilleros_margin_main_menu"
|
||||
android:paddingEnd="@dimen/pasilleros_margin_main_menu"
|
||||
android:paddingBottom="@dimen/pasilleros_margin_main_menu">
|
||||
|
||||
<LinearLayout
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_weight="1">
|
||||
|
||||
<TextView
|
||||
android:id="@+id/item_producertext"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:gravity="start"
|
||||
android:text="@string/Origen"
|
||||
android:textColor="@color/verdnatura_brown_grey"
|
||||
android:textSize="@dimen/body2"
|
||||
android:textStyle="bold"
|
||||
tool:text="Origen" />
|
||||
|
||||
<TextView
|
||||
android:id="@+id/item_producer"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:layout_marginStart="@dimen/layout_margin_min"
|
||||
android:gravity="start"
|
||||
android:text="@{item.value7}"
|
||||
android:textColor="@color/verdnatura_white"
|
||||
android:textSize="@dimen/body2"
|
||||
android:textStyle="bold"
|
||||
tool:text="Origen" />
|
||||
|
||||
</LinearLayout>
|
||||
|
||||
<LinearLayout
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_weight="1">
|
||||
|
||||
<TextView
|
||||
android:id="@+id/item_longitudtext"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:gravity="start"
|
||||
android:text="@string/Longitud"
|
||||
android:textColor="@color/verdnatura_brown_grey"
|
||||
android:textSize="@dimen/body2"
|
||||
android:textStyle="bold"
|
||||
tool:text="Longitud" />
|
||||
|
||||
<TextView
|
||||
android:id="@+id/item_longitud"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:layout_marginStart="@dimen/layout_margin_min"
|
||||
android:gravity="start"
|
||||
android:text="@{item.value5}"
|
||||
android:textColor="@color/verdnatura_white"
|
||||
android:textSize="@dimen/body2"
|
||||
android:textStyle="bold"
|
||||
tool:text="@string/Longitud" />
|
||||
|
||||
</LinearLayout>
|
||||
|
||||
<LinearLayout
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_weight="1">
|
||||
|
||||
<TextView
|
||||
android:id="@+id/item_colortext"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:gravity="start"
|
||||
android:text="@string/Color"
|
||||
android:textColor="@color/verdnatura_brown_grey"
|
||||
android:textSize="@dimen/body2"
|
||||
android:textStyle="bold"
|
||||
tool:text="Color" />
|
||||
|
||||
<TextView
|
||||
android:id="@+id/item_color"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginStart="@dimen/layout_margin_min"
|
||||
android:gravity="start"
|
||||
android:text="@{item.value6}"
|
||||
android:textColor="@color/verdnatura_white"
|
||||
android:textSize="@dimen/body2"
|
||||
android:textStyle="bold"
|
||||
tool:text="Color" />
|
||||
|
||||
</LinearLayout>
|
||||
|
||||
</LinearLayout>
|
||||
|
||||
<LinearLayout
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="1dp"
|
||||
android:background="@color/verdnatura_black_9"/>
|
||||
android:background="@color/verdnatura_black_9" />
|
||||
</LinearLayout>
|
||||
</layout>
|
||||
|
|
@ -1,7 +1,6 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<layout xmlns:app="http://schemas.android.com/apk/res-auto"
|
||||
xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
xmlns:tools="http://schemas.android.com/tools">
|
||||
xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<data>
|
||||
|
||||
<variable
|
||||
|
|
@ -32,11 +31,11 @@
|
|||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:paddingTop="1dp"
|
||||
android:paddingLeft="5dp"
|
||||
android:paddingRight="5dp"
|
||||
android:paddingStart="5dp"
|
||||
android:paddingEnd="5dp"
|
||||
android:textColor="@color/verdnatura_white"
|
||||
android:background="@color/verdnatura_pumpkin_orange"
|
||||
android:text="cabecera"
|
||||
android:text="@string/header"
|
||||
|
||||
>
|
||||
|
||||
|
|
@ -62,8 +61,8 @@
|
|||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:paddingTop="1dp"
|
||||
android:paddingLeft="5dp"
|
||||
android:paddingRight="5dp"
|
||||
android:paddingStart="5dp"
|
||||
android:paddingEnd="5dp"
|
||||
android:layout_marginBottom="5dp"
|
||||
>
|
||||
<LinearLayout
|
||||
|
|
@ -112,7 +111,7 @@
|
|||
android:id="@+id/textHour"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginRight="5dp"
|
||||
android:layout_marginEnd="5dp"
|
||||
android:text="@string/hour"
|
||||
android:textColor="@color/verdnatura_brown_grey" />
|
||||
|
||||
|
|
@ -143,13 +142,13 @@
|
|||
android:id="@+id/textPalletNumber"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginRight="5dp"
|
||||
android:layout_marginEnd="5dp"
|
||||
android:text="@string/namePallet"
|
||||
android:textColor="@color/verdnatura_brown_grey" />
|
||||
|
||||
<TextView
|
||||
android:id="@+id/palletNumber"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_weight="1"
|
||||
android:text="@{item.numberPlate}"
|
||||
|
|
@ -165,13 +164,13 @@
|
|||
android:id="@+id/txtM3"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginRight="5dp"
|
||||
android:text="m3"
|
||||
android:layout_marginEnd="5dp"
|
||||
android:text="@string/m3"
|
||||
android:textColor="@color/verdnatura_brown_grey" />
|
||||
|
||||
<TextView
|
||||
android:id="@+id/M3"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_weight="1"
|
||||
android:text="@{String.valueOf(item.m3)}"
|
||||
|
|
@ -191,26 +190,15 @@
|
|||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintTop_toTopOf="parent">
|
||||
|
||||
<LinearLayout
|
||||
android:id="@+id/linearLayoutLoadVan"
|
||||
android:layout_weight="1"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:gravity="center"
|
||||
android:orientation="vertical"
|
||||
app:layout_constraintBottom_toBottomOf="parent"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintTop_toTopOf="parent">
|
||||
|
||||
<ImageView
|
||||
|
||||
android:id="@+id/imageLoadVan"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="30dp"
|
||||
android:layout_marginTop="0dp"
|
||||
android:layout_marginBottom="5dp"
|
||||
android:tooltipText="Permite escanear expediciones a cargar en la furgoneta"
|
||||
app:srcCompat="@drawable/camion" />
|
||||
app:srcCompat="@drawable/camion"
|
||||
android:contentDescription="@string/loadRoute"/>
|
||||
|
||||
<TextView
|
||||
android:id="@+id/loadVanTxt"
|
||||
|
|
@ -221,18 +209,9 @@
|
|||
android:paddingBottom="5dp"
|
||||
android:text="@string/scannerDelivery"
|
||||
android:textColor="@color/colorPrimary" />
|
||||
</LinearLayout>
|
||||
|
||||
<LinearLayout
|
||||
android:id="@+id/linearLayoutShowTickets"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:gravity="center"
|
||||
android:layout_weight="1"
|
||||
android:orientation="vertical"
|
||||
app:layout_constraintBottom_toBottomOf="parent"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintTop_toTopOf="parent">
|
||||
|
||||
|
||||
<ImageView
|
||||
android:id="@+id/showTickets"
|
||||
android:layout_width="match_parent"
|
||||
|
|
@ -241,9 +220,11 @@
|
|||
android:layout_marginTop="0dp"
|
||||
android:tooltipText="Permite escanear expediciones a cargar en la furgoneta"
|
||||
android:layout_marginBottom="5dp"
|
||||
android:contentDescription="@string/tickets"
|
||||
/>
|
||||
|
||||
<TextView
|
||||
android:id="@+id/showTicketsTxt"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:gravity="center"
|
||||
|
|
@ -252,8 +233,6 @@
|
|||
android:text="@string/showTickets"
|
||||
android:textColor="@color/colorPrimary"/>
|
||||
|
||||
|
||||
</LinearLayout>
|
||||
</LinearLayout>
|
||||
</androidx.constraintlayout.widget.ConstraintLayout>
|
||||
</LinearLayout>
|
||||
|
|
|
|||
|
|
@ -19,8 +19,8 @@
|
|||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:background="@color/verdnatura_black_5"
|
||||
android:paddingLeft="@dimen/layout_margin_min"
|
||||
android:paddingRight="@dimen/layout_margin_min"
|
||||
android:paddingStart="@dimen/layout_margin_min"
|
||||
android:paddingEnd="@dimen/layout_margin_min"
|
||||
android:paddingTop="@dimen/pasilleros_margin_main_menu"
|
||||
android:paddingBottom="@dimen/pasilleros_margin_main_menu">
|
||||
|
||||
|
|
@ -33,7 +33,7 @@
|
|||
android:textSize="@dimen/body2"
|
||||
android:textColor="@color/verdnatura_white"
|
||||
android:gravity="center"
|
||||
android:layout_marginRight="@dimen/layout_margin_min"/>
|
||||
android:layout_marginEnd="@dimen/layout_margin_min"/>
|
||||
|
||||
<TextView
|
||||
android:layout_width="match_parent"
|
||||
|
|
|
|||
|
|
@ -20,8 +20,8 @@
|
|||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:background="@color/verdnatura_black_5"
|
||||
android:paddingLeft="@dimen/layout_margin_min"
|
||||
android:paddingRight="@dimen/layout_margin_min"
|
||||
android:paddingStart="@dimen/layout_margin_min"
|
||||
android:paddingEnd="@dimen/layout_margin_min"
|
||||
android:paddingTop="@dimen/layout_margin_min"
|
||||
android:layout_gravity="center_horizontal"
|
||||
android:paddingBottom="@dimen/layout_margin_min"
|
||||
|
|
@ -37,7 +37,7 @@
|
|||
android:textSize="@dimen/body2"
|
||||
android:textColor="@color/verdnatura_white"
|
||||
android:layout_weight="1"
|
||||
android:gravity="left"
|
||||
android:gravity="start"
|
||||
/>
|
||||
<TextView
|
||||
android:layout_width="200dp"
|
||||
|
|
@ -64,7 +64,7 @@
|
|||
android:textSize="@dimen/body2"
|
||||
android:textColor="@color/verdnatura_white"
|
||||
android:layout_weight="1"
|
||||
android:gravity="right"/>
|
||||
android:gravity="end"/>
|
||||
|
||||
|
||||
</LinearLayout>
|
||||
|
|
@ -75,8 +75,8 @@
|
|||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:background="@color/verdnatura_black_5"
|
||||
android:paddingLeft="@dimen/layout_margin_min"
|
||||
android:paddingRight="@dimen/layout_margin_min"
|
||||
android:paddingStart="@dimen/layout_margin_min"
|
||||
android:paddingEnd="@dimen/layout_margin_min"
|
||||
android:paddingTop="@dimen/pasilleros_margin_main_menu"
|
||||
>
|
||||
|
||||
|
|
@ -88,7 +88,7 @@
|
|||
android:textSize="@dimen/body2"
|
||||
android:textColor="@color/verdnatura_white"
|
||||
android:layout_weight="1"
|
||||
android:gravity="left"
|
||||
android:gravity="start"
|
||||
/>
|
||||
<TextView
|
||||
android:layout_width="wrap_content"
|
||||
|
|
@ -106,8 +106,8 @@
|
|||
android:textSize="@dimen/body2"
|
||||
android:textColor="@color/verdnatura_white"
|
||||
android:layout_weight="0.5"
|
||||
android:paddingRight="@dimen/layout_margin_min"
|
||||
android:gravity="right"/>
|
||||
android:paddingEnd="@dimen/layout_margin_min"
|
||||
android:gravity="end"/>
|
||||
|
||||
</LinearLayout>
|
||||
|
||||
|
|
@ -116,7 +116,8 @@
|
|||
android:layout_width="fill_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:src="@android:drawable/divider_horizontal_bright"
|
||||
android:background="@color/verdnatura_pumpkin_orange"/>
|
||||
android:background="@color/verdnatura_pumpkin_orange"
|
||||
android:contentDescription="@string/divider"/>
|
||||
|
||||
|
||||
<LinearLayout
|
||||
|
|
|
|||
|
|
@ -24,24 +24,25 @@
|
|||
|
||||
<TextView
|
||||
android:id="@+id/item_title"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_weight="1"
|
||||
android:text="@{item.text}"
|
||||
android:textColor="@color/verdnatura_white"
|
||||
android:textSize="@dimen/h7"
|
||||
android:gravity="center_vertical"
|
||||
android:layout_marginLeft="@dimen/pasilleros_margin_main_menu"
|
||||
android:layout_marginStart="@dimen/pasilleros_margin_main_menu"
|
||||
android:textStyle="bold"/>
|
||||
|
||||
|
||||
<ImageView
|
||||
android:layout_marginLeft="@dimen/default_layout_margin"
|
||||
android:layout_marginStart="@dimen/default_layout_margin"
|
||||
android:id="@+id/item_image"
|
||||
android:layout_width="30dp"
|
||||
android:layout_height="27dp"
|
||||
android:scaleType="centerCrop"
|
||||
android:src="@drawable/ic_delete_black_24dp" />
|
||||
android:src="@drawable/ic_delete_black_24dp"
|
||||
android:contentDescription="@string/trash"/>
|
||||
</LinearLayout>
|
||||
<LinearLayout
|
||||
android:layout_width="match_parent"
|
||||
|
|
|
|||
|
|
@ -33,7 +33,8 @@
|
|||
<LinearLayout
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:orientation="vertical">
|
||||
android:orientation="vertical"
|
||||
android:background="@color/verdnatura_black_1">
|
||||
|
||||
<LinearLayout
|
||||
android:layout_width="match_parent"
|
||||
|
|
@ -96,8 +97,8 @@
|
|||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:orientation="vertical"
|
||||
android:paddingLeft="5dp"
|
||||
android:paddingRight="5dp"
|
||||
android:paddingStart="5dp"
|
||||
android:paddingEnd="5dp"
|
||||
android:paddingBottom="5dp">
|
||||
|
||||
<TextView
|
||||
|
|
@ -150,7 +151,7 @@
|
|||
android:layout_width="wrap_content"
|
||||
android:layout_height="0dp"
|
||||
android:layout_weight="0"
|
||||
|
||||
|
||||
android:text=""
|
||||
android:textAllCaps="true"
|
||||
android:textColor="@color/verdnatura_white"
|
||||
|
|
@ -186,7 +187,7 @@
|
|||
android:id="@+id/note"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="32dp"
|
||||
|
||||
android:contentDescription="@string/notes"
|
||||
app:srcCompat="@drawable/ic_note" />
|
||||
</LinearLayout>
|
||||
<LinearLayout
|
||||
|
|
@ -202,7 +203,8 @@
|
|||
android:id="@+id/addNote"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="32dp"
|
||||
app:srcCompat="@drawable/ic_note_add" />
|
||||
app:srcCompat="@drawable/ic_note_add"
|
||||
android:contentDescription="@string/notes"/>
|
||||
</LinearLayout>
|
||||
<LinearLayout
|
||||
android:id="@+id/btnPhone"
|
||||
|
|
@ -217,7 +219,8 @@
|
|||
android:id="@+id/phone"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="32dp"
|
||||
app:srcCompat="@drawable/ic_phone" />
|
||||
app:srcCompat="@drawable/ic_phone"
|
||||
android:contentDescription="@string/phone"/>
|
||||
</LinearLayout>
|
||||
|
||||
<LinearLayout
|
||||
|
|
@ -234,7 +237,8 @@
|
|||
android:id="@+id/map"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="32dp"
|
||||
app:srcCompat="@drawable/ic_location" />
|
||||
app:srcCompat="@drawable/ic_location"
|
||||
android:contentDescription="@string/map"/>
|
||||
</LinearLayout>
|
||||
<LinearLayout
|
||||
android:id="@+id/btnUnload"
|
||||
|
|
@ -249,7 +253,8 @@
|
|||
android:id="@+id/unload"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="32dp"
|
||||
app:srcCompat="@drawable/camion_descarga" />
|
||||
app:srcCompat="@drawable/camion_descarga"
|
||||
android:contentDescription="@string/loadRoute"/>
|
||||
</LinearLayout>
|
||||
<LinearLayout
|
||||
android:id="@+id/btnSign"
|
||||
|
|
|
|||
|
|
@ -11,23 +11,18 @@
|
|||
android:layout_width="0dp"
|
||||
android:layout_height="wrap_content"
|
||||
android:background="@color/verdnatura_black"
|
||||
android:orientation="vertical"
|
||||
android:orientation="horizontal"
|
||||
android:padding="5dp"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintTop_toTopOf="parent">
|
||||
|
||||
|
||||
<LinearLayout
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:orientation="horizontal">
|
||||
|
||||
<TextView
|
||||
android:id="@+id/textView30"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginRight="8dp"
|
||||
android:layout_marginEnd="8dp"
|
||||
android:layout_weight="0"
|
||||
android:text="@string/ticket"
|
||||
android:textColor="@color/verdnatura_black_8"
|
||||
|
|
@ -38,9 +33,9 @@
|
|||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_weight="1"
|
||||
android:text="2041368"
|
||||
android:textColor="@color/verdnatura_white"
|
||||
android:textSize="18sp" />
|
||||
android:textSize="18sp"
|
||||
tools:text="2041368"/>
|
||||
<TextView
|
||||
android:id="@+id/btnCmr"
|
||||
android:layout_width="wrap_content"
|
||||
|
|
@ -56,7 +51,7 @@
|
|||
android:id="@+id/textView32"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginRight="8dp"
|
||||
android:layout_marginEnd="8dp"
|
||||
android:layout_weight="0"
|
||||
android:text="@string/packages"
|
||||
android:textColor="@color/verdnatura_black_8"
|
||||
|
|
@ -69,33 +64,30 @@
|
|||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_weight="2"
|
||||
android:text="2"
|
||||
android:textSize="20sp"
|
||||
android:textColor="@color/verdnatura_white"
|
||||
tools:text="2"
|
||||
/>
|
||||
<TextView
|
||||
android:id="@+id/packingType"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_weight="2"
|
||||
android:text="H o V"
|
||||
android:visibility="visible"
|
||||
android:textSize="20sp"
|
||||
android:textColor="@color/verdnatura_white"
|
||||
android:layout_marginLeft="5dp"/>
|
||||
android:layout_marginStart="5dp"
|
||||
tools:text="H o V"/>
|
||||
|
||||
</LinearLayout>
|
||||
</LinearLayout>
|
||||
|
||||
|
||||
|
||||
</LinearLayout>
|
||||
|
||||
<LinearLayout
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:orientation="horizontal"
|
||||
android:gravity="right"
|
||||
android:gravity="end"
|
||||
android:textAlignment="gravity">
|
||||
|
||||
|
||||
|
|
@ -103,19 +95,18 @@
|
|||
android:id="@+id/textView33"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginRight="0dp"
|
||||
android:layout_marginEnd="0dp"
|
||||
android:layout_weight="0"
|
||||
|
||||
android:text="Silla FV"
|
||||
android:textColor="@color/verdnatura_white"
|
||||
android:visibility="gone"
|
||||
tools:visibility="gone" />
|
||||
tools:visibility="gone"
|
||||
tools:text="Silla FV"/>
|
||||
|
||||
<TextView
|
||||
android:id="@+id/packintypedescrp"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginRight="8dp"
|
||||
android:layout_marginEnd="8dp"
|
||||
android:layout_weight="0"
|
||||
android:text="@string/packingType"
|
||||
android:visibility="gone"
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<layout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
xmlns:app="http://schemas.android.com/apk/res-auto"
|
||||
>
|
||||
xmlns:tools="http://schemas.android.com/tools">
|
||||
|
||||
<data>
|
||||
|
||||
|
|
@ -20,10 +20,11 @@
|
|||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:background="@color/verdnatura_black_5"
|
||||
android:paddingLeft="@dimen/pasilleros_margin_main_menu"
|
||||
android:paddingRight="@dimen/pasilleros_margin_main_menu"
|
||||
android:paddingStart="@dimen/pasilleros_margin_main_menu"
|
||||
android:paddingEnd="@dimen/pasilleros_margin_main_menu"
|
||||
android:paddingTop="@dimen/pasilleros_margin_main_menu"
|
||||
android:paddingBottom="@dimen/pasilleros_margin_main_menu">
|
||||
android:paddingBottom="@dimen/pasilleros_margin_main_menu"
|
||||
android:baselineAligned="false">
|
||||
|
||||
<LinearLayout
|
||||
android:layout_width="match_parent"
|
||||
|
|
@ -31,17 +32,17 @@
|
|||
android:layout_weight="1"
|
||||
android:orientation="horizontal"
|
||||
android:gravity="center"
|
||||
android:layout_marginRight="@dimen/layout_margin_min">
|
||||
android:layout_marginEnd="@dimen/layout_margin_min">
|
||||
<androidx.cardview.widget.CardView
|
||||
android:layout_width="@dimen/item_image_width"
|
||||
android:layout_height="@dimen/item_image_width"
|
||||
app:cardCornerRadius="100dp"
|
||||
android:layout_marginRight="@dimen/layout_margin_1">
|
||||
android:layout_marginEnd="@dimen/layout_margin_1">
|
||||
<ImageView
|
||||
android:id="@+id/img_item"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
/>
|
||||
android:contentDescription="@string/item"/>
|
||||
</androidx.cardview.widget.CardView>
|
||||
<LinearLayout
|
||||
android:id="@+id/namelayout"
|
||||
|
|
@ -83,11 +84,11 @@
|
|||
android:layout_height="wrap_content"
|
||||
android:textSize="@dimen/body2"
|
||||
android:textColor="@color/verdnatura_white"
|
||||
android:text="6 x 15"
|
||||
android:ellipsize="end"
|
||||
android:maxLines="1"
|
||||
android:gravity="center"
|
||||
android:textStyle="bold"/>
|
||||
android:textStyle="bold"
|
||||
tools:text="6 x 15"/>
|
||||
<TextView
|
||||
android:id="@+id/visible_text"
|
||||
android:layout_width="match_parent"
|
||||
|
|
@ -110,7 +111,8 @@
|
|||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:scaleType="center"
|
||||
android:src="@drawable/ic_more_vert_black_24dp" />
|
||||
android:src="@drawable/ic_more_vert_black_24dp"
|
||||
android:contentDescription="@string/options"/>
|
||||
</LinearLayout>
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<layout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
xmlns:app="http://schemas.android.com/apk/res-auto"
|
||||
>
|
||||
xmlns:tools="http://schemas.android.com/tools">
|
||||
|
||||
<data>
|
||||
|
||||
|
|
@ -20,10 +20,11 @@
|
|||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:background="@color/verdnatura_black_5"
|
||||
android:paddingLeft="@dimen/pasilleros_margin_main_menu"
|
||||
android:paddingRight="@dimen/pasilleros_margin_main_menu"
|
||||
android:paddingStart="@dimen/pasilleros_margin_main_menu"
|
||||
android:paddingEnd="@dimen/pasilleros_margin_main_menu"
|
||||
android:paddingTop="@dimen/pasilleros_margin_main_menu"
|
||||
android:paddingBottom="@dimen/pasilleros_margin_main_menu">
|
||||
android:paddingBottom="@dimen/pasilleros_margin_main_menu"
|
||||
android:baselineAligned="false">
|
||||
|
||||
<LinearLayout
|
||||
android:layout_width="match_parent"
|
||||
|
|
@ -31,16 +32,17 @@
|
|||
android:layout_weight="1"
|
||||
android:orientation="horizontal"
|
||||
android:gravity="center"
|
||||
android:layout_marginRight="@dimen/layout_margin_min">
|
||||
android:layout_marginEnd="@dimen/layout_margin_min">
|
||||
<androidx.cardview.widget.CardView
|
||||
android:layout_width="@dimen/item_image_width"
|
||||
android:layout_height="@dimen/item_image_width"
|
||||
app:cardCornerRadius="100dp"
|
||||
android:layout_marginRight="@dimen/layout_margin_1">
|
||||
android:layout_marginEnd="@dimen/layout_margin_1">
|
||||
<ImageView
|
||||
android:id="@+id/img_item"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:contentDescription="@string/item"
|
||||
/>
|
||||
</androidx.cardview.widget.CardView>
|
||||
<LinearLayout
|
||||
|
|
@ -83,11 +85,11 @@
|
|||
android:layout_height="wrap_content"
|
||||
android:textSize="@dimen/body2"
|
||||
android:textColor="@color/verdnatura_white"
|
||||
android:text="6 x 15"
|
||||
android:ellipsize="end"
|
||||
android:maxLines="1"
|
||||
android:gravity="center"
|
||||
android:textStyle="bold"/>
|
||||
android:textStyle="bold"
|
||||
tools:text="6 x 15"/>
|
||||
<TextView
|
||||
android:id="@+id/visible_text"
|
||||
android:layout_width="match_parent"
|
||||
|
|
@ -110,7 +112,8 @@
|
|||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:scaleType="center"
|
||||
android:src="@drawable/ic_more_vert_black_24dp" />
|
||||
android:src="@drawable/ic_more_vert_black_24dp"
|
||||
android:contentDescription="@string/options"/>
|
||||
</LinearLayout>
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -30,7 +30,7 @@
|
|||
android:textSize="@dimen/h7"
|
||||
android:gravity="center_vertical"
|
||||
android:visibility="visible"
|
||||
android:layout_marginLeft="@dimen/pasilleros_margin_main_menu"
|
||||
android:layout_marginStart="@dimen/pasilleros_margin_main_menu"
|
||||
android:textStyle="bold"/>
|
||||
|
||||
<TextView
|
||||
|
|
@ -42,19 +42,20 @@
|
|||
android:textColor="@color/verdnatura_white"
|
||||
android:textSize="@dimen/h7"
|
||||
android:gravity="center_vertical"
|
||||
android:layout_marginLeft="@dimen/pasilleros_margin_main_menu"
|
||||
android:layout_marginStart="@dimen/pasilleros_margin_main_menu"
|
||||
android:visibility="gone"
|
||||
android:textStyle="bold"/>
|
||||
|
||||
|
||||
<ImageView
|
||||
android:layout_marginLeft="@dimen/default_layout_margin"
|
||||
android:layout_marginStart="@dimen/default_layout_margin"
|
||||
android:id="@+id/item_image"
|
||||
android:layout_width="30dp"
|
||||
android:layout_height="27dp"
|
||||
android:scaleType="centerCrop"
|
||||
android:visibility="gone"
|
||||
android:src="@drawable/ic_delete_black_24dp" />
|
||||
android:src="@drawable/ic_delete_black_24dp"
|
||||
android:contentDescription="@string/trash"/>
|
||||
</LinearLayout>
|
||||
<LinearLayout
|
||||
android:layout_width="match_parent"
|
||||
|
|
|
|||
|
|
@ -24,30 +24,17 @@
|
|||
android:orientation="horizontal"
|
||||
android:gravity="center"
|
||||
android:layout_gravity="center"
|
||||
android:paddingLeft="@dimen/pasilleros_margin_main_menu"
|
||||
android:paddingRight="@dimen/pasilleros_margin_main_menu"
|
||||
android:paddingStart="@dimen/pasilleros_margin_main_menu"
|
||||
android:paddingEnd="@dimen/pasilleros_margin_main_menu"
|
||||
android:paddingTop="@dimen/pasilleros_margin_main_menu"
|
||||
android:paddingBottom="@dimen/pasilleros_margin_main_menu">
|
||||
|
||||
|
||||
<TextView
|
||||
android:id="@+id/item_id"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_gravity="center"
|
||||
android:paddingRight="@dimen/pasilleros_margin_main_menu"
|
||||
android:text="{Integer.toString(item.id)}"
|
||||
android:textColor="@color/verdnatura_white"
|
||||
android:textSize="@dimen/row"
|
||||
android:textStyle="bold"
|
||||
android:visibility="gone"
|
||||
tool:text="19591" />
|
||||
|
||||
<TextView
|
||||
android:id="@+id/item_firstname"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:gravity="left"
|
||||
android:gravity="start"
|
||||
android:text="@{item.firstName}"
|
||||
android:textColor="@color/verdnatura_pumpkin_orange"
|
||||
android:textSize="@dimen/row"
|
||||
|
|
@ -59,12 +46,12 @@
|
|||
android:id="@+id/item_lastname"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:gravity="left"
|
||||
android:gravity="start"
|
||||
android:text="@{item.lastName}"
|
||||
android:textColor="@color/verdnatura_pumpkin_orange"
|
||||
android:textSize="@dimen/row"
|
||||
android:layout_weight="1"
|
||||
android:layout_marginLeft="5dp"
|
||||
android:layout_marginStart="5dp"
|
||||
tool:text="de la Torre Nebot" />
|
||||
|
||||
<ImageView
|
||||
|
|
@ -72,7 +59,7 @@
|
|||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_gravity="end"
|
||||
|
||||
android:contentDescription="@string/error"
|
||||
app:srcCompat="@drawable/emoticon_error" />
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -1,13 +0,0 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent">
|
||||
<TextView
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:text="Hola Mundo">
|
||||
</TextView>
|
||||
|
||||
|
||||
|
||||
</LinearLayout>
|
||||
|
|
@ -1,686 +0,0 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<layout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
xmlns:app="http://schemas.android.com/apk/res-auto"
|
||||
xmlns:tool="http://schemas.android.com/tools"
|
||||
xmlns:tools="http://schemas.android.com/tools">
|
||||
|
||||
<data>
|
||||
|
||||
<variable
|
||||
name="sale"
|
||||
type="es.verdnatura.presentation.view.feature.sacador.model.Sale" />
|
||||
</data>
|
||||
|
||||
<LinearLayout
|
||||
android:id="@+id/linear_main"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_margin="@dimen/layout_margin_1"
|
||||
android:layout_marginBottom="@dimen/layout_margin_min"
|
||||
android:orientation="vertical"
|
||||
|
||||
>
|
||||
<!--CABECERA=================================================-->
|
||||
<LinearLayout
|
||||
android:id="@+id/item_row_layout"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:orientation="vertical">
|
||||
|
||||
<androidx.recyclerview.widget.RecyclerView
|
||||
android:id="@+id/rvHeadlines"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_below="@id/content_layout"
|
||||
android:layout_marginTop="6dp"
|
||||
android:visibility="visible"
|
||||
/>
|
||||
|
||||
<LinearLayout
|
||||
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:background="@color/verdnatura_white"
|
||||
android:orientation="vertical"
|
||||
android:padding="@dimen/layout_margin_min"
|
||||
android:textColor="@color/verdnatura_black">
|
||||
|
||||
<LinearLayout
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:orientation="horizontal">
|
||||
|
||||
<TextView
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginRight="@dimen/layout_margin_min"
|
||||
android:text="@string/Nivel"
|
||||
android:textColor="@color/verdnatura_black"
|
||||
android:textSize="@dimen/h8" />
|
||||
|
||||
<TextView
|
||||
android:id="@+id/level"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginRight="@dimen/layout_margin_min"
|
||||
android:text="@{sale.level}"
|
||||
android:textColor="@color/verdnatura_black"
|
||||
android:textSize="@dimen/h8"
|
||||
android:textStyle="bold"
|
||||
tool:text="2" />
|
||||
|
||||
<TextView
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginRight="@dimen/layout_margin_min"
|
||||
android:text="@string/Ticket"
|
||||
android:textColor="@color/verdnatura_black"
|
||||
android:textSize="@dimen/h8" />
|
||||
|
||||
<TextView
|
||||
android:id="@+id/ticketFk"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="@{Integer.toString(sale.ticketFk)}"
|
||||
android:textColor="@color/verdnatura_black"
|
||||
android:textSize="@dimen/h8"
|
||||
android:textStyle="bold"
|
||||
tool:text="123456789"
|
||||
|
||||
/>
|
||||
|
||||
|
||||
<TextView
|
||||
android:id="@+id/previous"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="PREVIA"
|
||||
android:layout_marginStart="20dp"
|
||||
android:textColor="@color/verdnatura_black"
|
||||
android:textSize="@dimen/h8"
|
||||
android:textStyle="bold"
|
||||
tool:text="PREVIA"
|
||||
|
||||
/>
|
||||
|
||||
<RelativeLayout
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:orientation="horizontal">
|
||||
|
||||
<ImageView
|
||||
android:id="@+id/ivArrow"
|
||||
android:layout_width="48dp"
|
||||
android:layout_height="48dp"
|
||||
android:layout_alignParentRight="true"
|
||||
android:layout_marginRight="20dp"
|
||||
android:rotation="180"
|
||||
android:src="@drawable/ic_arrow_down" />
|
||||
|
||||
<ImageView
|
||||
android:id="@+id/imageErrorMessage"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="match_parent"
|
||||
android:layout_alignParentRight="true"
|
||||
app:srcCompat="@drawable/emoticon_error_fragment" />
|
||||
|
||||
|
||||
</RelativeLayout>
|
||||
|
||||
</LinearLayout>
|
||||
|
||||
|
||||
</LinearLayout>
|
||||
|
||||
|
||||
</LinearLayout>
|
||||
|
||||
<LinearLayout
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:orientation="horizontal">
|
||||
|
||||
<androidx.constraintlayout.widget.ConstraintLayout
|
||||
android:id="@+id/content_layout"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:background="@color/verdnatura_black"
|
||||
android:paddingTop="@dimen/layout_margin_min"
|
||||
android:paddingBottom="@dimen/layout_margin_min">
|
||||
<!--SEMAFORO=================================================-->
|
||||
|
||||
<LinearLayout
|
||||
android:id="@+id/linearLayoutItem"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="20dp"
|
||||
android:orientation="vertical"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintTop_toTopOf="parent">
|
||||
|
||||
<LinearLayout
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent">
|
||||
|
||||
<TextView
|
||||
android:id="@+id/item_article_itemFkNew"
|
||||
android:layout_width="80dp"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginStart="@dimen/layout_margin_min_to_modify"
|
||||
android:layout_marginEnd="@dimen/layout_margin_min"
|
||||
android:layout_weight="1"
|
||||
android:maxLines="1"
|
||||
android:text="@{Long.toString(sale.itemFk)}"
|
||||
android:textColor="@color/verdnatura_white"
|
||||
android:textSize="@dimen/body1"
|
||||
android:textStyle="bold"
|
||||
tool:text="9999999" />
|
||||
|
||||
<TextView
|
||||
android:id="@+id/item_parking_code"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginStart="1dp"
|
||||
android:layout_marginEnd="@dimen/layout_margin_min"
|
||||
android:layout_weight="0.5"
|
||||
android:maxLines="1"
|
||||
android:text="@{sale.parkingCode}"
|
||||
android:textColor="@color/verdnatura_warm_grey"
|
||||
android:textSize="@dimen/body1"
|
||||
android:textStyle="bold"
|
||||
tool:text="B-01-1" />
|
||||
|
||||
<TextView
|
||||
android:id="@+id/item_code"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginStart="1dp"
|
||||
android:layout_marginEnd="@dimen/layout_margin_min"
|
||||
android:layout_weight="0.5"
|
||||
android:maxLines="1"
|
||||
android:text="@{sale.code}"
|
||||
android:textColor="@color/verdnatura_white"
|
||||
android:textSize="@dimen/body1"
|
||||
android:textStyle="bold"
|
||||
tool:text="dIZXX" />
|
||||
|
||||
|
||||
<TextView
|
||||
android:id="@+id/item_first_to_picker"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginEnd="1dp"
|
||||
android:layout_weight="0.5"
|
||||
android:gravity="right"
|
||||
android:text="25 x 5"
|
||||
android:textColor="@color/verdnatura_white"
|
||||
android:textSize="@dimen/body1"
|
||||
android:textStyle="bold"
|
||||
tool:text="25 x 1" />
|
||||
|
||||
<View
|
||||
android:id="@+id/item_ticket_colors"
|
||||
android:layout_width="@dimen/semaforo_width"
|
||||
android:layout_height="@dimen/ticketColor_height"
|
||||
android:layout_marginBottom="1dp"
|
||||
android:background="@drawable/border" />
|
||||
|
||||
|
||||
</LinearLayout>
|
||||
</LinearLayout>
|
||||
|
||||
<LinearLayout
|
||||
android:id="@+id/linearLayoutLongItem"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="20dp"
|
||||
android:orientation="vertical"
|
||||
app:layout_constraintTop_toBottomOf="@+id/linearLayoutItem">
|
||||
|
||||
<LinearLayout
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:layout_marginEnd="25dp">
|
||||
|
||||
<TextView
|
||||
android:id="@+id/item_article_long_info"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginStart="@dimen/layout_margin_min_to_modify"
|
||||
android:layout_weight="1"
|
||||
android:ellipsize="end"
|
||||
android:maxLines="1"
|
||||
android:text="@{sale.longName}"
|
||||
android:textColor="@color/verdnatura_white"
|
||||
android:textSize="@dimen/body1"
|
||||
tool:text="información de la linea 1" />
|
||||
|
||||
<TextView
|
||||
android:id="@+id/item_second_to_picker"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_weight="0.25"
|
||||
android:gravity="right"
|
||||
android:text="secPicker"
|
||||
android:textColor="@color/verdnatura_white"
|
||||
android:textSize="@dimen/body2"
|
||||
android:textStyle="bold"
|
||||
tool:text="5 x 5" />
|
||||
|
||||
</LinearLayout>
|
||||
</LinearLayout>
|
||||
|
||||
<LinearLayout
|
||||
android:id="@+id/linearLayoutItemOrigin"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="20dp"
|
||||
android:orientation="vertical"
|
||||
app:layout_constraintTop_toBottomOf="@+id/linearLayoutLongItem">
|
||||
|
||||
<LinearLayout
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:layout_marginEnd="25dp">
|
||||
|
||||
<TextView
|
||||
android:id="@+id/item_article_origin"
|
||||
android:layout_width="200dp"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginStart="@dimen/layout_margin_min_to_modify"
|
||||
android:layout_weight="2"
|
||||
android:ellipsize="end"
|
||||
android:maxLines="1"
|
||||
android:text="@{sale.origin}"
|
||||
android:textColor="@color/verdnatura_white"
|
||||
android:textSize="@dimen/body1"
|
||||
tool:text="información de la linea Origin" />
|
||||
|
||||
<TextView
|
||||
android:id="@+id/item_article_first_accumulate"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_weight="0.5"
|
||||
android:gravity="start"
|
||||
android:text="first_accum"
|
||||
android:textColor="@color/verdnatura_brown_grey"
|
||||
android:textSize="@dimen/body2"
|
||||
android:textStyle="bold"
|
||||
tool:text="5 x 5" />
|
||||
|
||||
<TextView
|
||||
android:id="@+id/item_reserved_total_number"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_weight="0.5"
|
||||
android:gravity="end"
|
||||
android:text="reserved_to"
|
||||
android:textColor="@color/verdnatura_brown_grey"
|
||||
android:textSize="@dimen/body2"
|
||||
android:textStyle="bold"
|
||||
android:visibility="invisible"
|
||||
tool:text="5 x 5" />
|
||||
|
||||
|
||||
</LinearLayout>
|
||||
|
||||
</LinearLayout>
|
||||
|
||||
<LinearLayout
|
||||
android:id="@+id/linearLayoutItemColor"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="20dp"
|
||||
android:orientation="vertical"
|
||||
android:layout_marginEnd="25dp"
|
||||
app:layout_constraintTop_toBottomOf="@+id/linearLayoutItemOrigin">
|
||||
|
||||
<LinearLayout
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent">
|
||||
|
||||
<TextView
|
||||
android:id="@+id/item_article_color"
|
||||
android:layout_width="200dp"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginStart="@dimen/layout_margin_min_to_modify"
|
||||
android:layout_weight="2"
|
||||
android:ellipsize="end"
|
||||
android:maxLines="1"
|
||||
android:text="@{sale.color}"
|
||||
android:textColor="@color/verdnatura_white"
|
||||
android:textSize="@dimen/body1"
|
||||
tool:text="información de la linea Color" />
|
||||
|
||||
<TextView
|
||||
android:id="@+id/item_article_second_accumulate"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_weight="0.5"
|
||||
android:gravity="start"
|
||||
android:text="second_a"
|
||||
android:textColor="@color/verdnatura_brown_grey"
|
||||
android:textSize="@dimen/body2"
|
||||
android:textStyle="bold"
|
||||
tool:text="5 x 5" />
|
||||
|
||||
<TextView
|
||||
android:id="@+id/item_reserved_number"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_weight="0.5"
|
||||
android:gravity="end"
|
||||
android:text="reser_n"
|
||||
android:textColor="@color/verdnatura_brown_grey"
|
||||
android:textSize="@dimen/body2"
|
||||
android:textStyle="bold"
|
||||
tool:text="5 x 5" />
|
||||
|
||||
</LinearLayout>
|
||||
|
||||
</LinearLayout>
|
||||
|
||||
<!--CONTENIDO=================================================-->
|
||||
<!--app:layout_constraintEnd_toStartOf="@+id/item_article_quantity_picked"-->
|
||||
|
||||
<TextView
|
||||
android:id="@+id/item_article_itemFk"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginStart="@dimen/layout_margin_min_to_modify"
|
||||
android:layout_marginEnd="@dimen/layout_margin_min"
|
||||
android:maxLines="1"
|
||||
android:text="@{Long.toString(sale.itemFk)}"
|
||||
android:textColor="@color/verdnatura_white"
|
||||
android:textSize="@dimen/body1"
|
||||
android:textStyle="bold"
|
||||
android:visibility="invisible"
|
||||
app:layout_constraintStart_toEndOf="@+id/linearLayoutItem"
|
||||
app:layout_constraintTop_toTopOf="parent"
|
||||
tool:text="85478" />
|
||||
|
||||
<TextView
|
||||
android:id="@+id/item_packing_text"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginStart="10dp"
|
||||
android:layout_marginEnd="@dimen/layout_margin_min"
|
||||
android:maxLines="1"
|
||||
android:text="@{sale.parkingCode}"
|
||||
android:textColor="@color/verdnatura_warm_grey"
|
||||
android:textSize="@dimen/body1"
|
||||
android:textStyle="bold"
|
||||
android:visibility="invisible"
|
||||
app:layout_constraintStart_toEndOf="@+id/item_article_itemFk"
|
||||
app:layout_constraintTop_toTopOf="parent"
|
||||
tool:text="B-01-1" />
|
||||
|
||||
<TextView
|
||||
|
||||
android:id="@+id/item_packing_itemFk"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginStart="5dp"
|
||||
android:layout_marginEnd="@dimen/layout_margin_min"
|
||||
android:maxLines="1"
|
||||
android:text="@{sale.code}"
|
||||
android:textColor="@color/verdnatura_white"
|
||||
android:textSize="@dimen/body1"
|
||||
android:textStyle="bold"
|
||||
android:visibility="invisible"
|
||||
app:layout_constraintStart_toEndOf="@+id/item_packing_text"
|
||||
app:layout_constraintTop_toTopOf="parent"
|
||||
tool:text="IZXX" />
|
||||
|
||||
|
||||
<TextView
|
||||
android:id="@+id/txtde"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginEnd="@dimen/layout_margin_min"
|
||||
android:text="@string/de"
|
||||
android:textColor="@color/verdnatura_white"
|
||||
android:textSize="@dimen/body1"
|
||||
android:visibility="gone"
|
||||
app:layout_constraintEnd_toStartOf="@+id/item_article_quantityOld"
|
||||
app:layout_constraintTop_toTopOf="parent" />
|
||||
|
||||
<TextView
|
||||
android:id="@+id/item_article_quantityOld"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginEnd="22dp"
|
||||
android:paddingLeft="10dp"
|
||||
android:paddingRight="10dp"
|
||||
android:text="@{Integer.toString(sale.saleQuantity)}"
|
||||
|
||||
android:textColor="@color/verdnatura_white"
|
||||
android:textSize="@dimen/body1"
|
||||
android:textStyle="bold"
|
||||
android:visibility="gone"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintTop_toTopOf="parent"
|
||||
tool:text="10" />
|
||||
|
||||
|
||||
<TextView
|
||||
android:id="@+id/item_article_cel2"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginEnd="22dp"
|
||||
android:paddingLeft="10dp"
|
||||
android:text="15 x 5"
|
||||
android:textColor="@color/verdnatura_white"
|
||||
android:textSize="@dimen/body1"
|
||||
android:textStyle="bold"
|
||||
android:visibility="invisible"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintTop_toTopOf="parent"
|
||||
tool:text="5x1" />
|
||||
|
||||
<TextView
|
||||
android:id="@+id/item_article_quantity_line1"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginStart="@dimen/layout_margin_min_to_modify"
|
||||
android:layout_marginEnd="22dp"
|
||||
android:ellipsize="end"
|
||||
android:maxLines="1"
|
||||
android:text="@{sale.longName}"
|
||||
android:textColor="@color/verdnatura_white"
|
||||
android:textSize="@dimen/body1"
|
||||
android:visibility="invisible"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintStart_toEndOf="@+id/linearLayoutItem"
|
||||
app:layout_constraintTop_toBottomOf="@+id/item_article_itemFk"
|
||||
tool:text="información de la linea 1" />
|
||||
|
||||
<TextView
|
||||
|
||||
android:id="@+id/item_article_cel1"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="cel1"
|
||||
android:textColor="@color/verdnatura_white"
|
||||
android:textSize="@dimen/body2"
|
||||
android:textStyle="bold"
|
||||
android:visibility="invisible"
|
||||
app:layout_constraintEnd_toEndOf="@+id/item_article_quantity_line1"
|
||||
app:layout_constraintTop_toTopOf="@+id/item_article_quantity_line1"
|
||||
tool:text="cel1" />
|
||||
|
||||
<TextView
|
||||
android:id="@+id/item_article_quantity_line2"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginStart="@dimen/layout_margin_min_to_modify"
|
||||
android:layout_marginEnd="22dp"
|
||||
android:ellipsize="end"
|
||||
android:maxLines="1"
|
||||
android:text="@{sale.origin}"
|
||||
android:textColor="@color/verdnatura_white"
|
||||
android:textSize="@dimen/body2"
|
||||
android:visibility="invisible"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintStart_toEndOf="@+id/linearLayoutItem"
|
||||
app:layout_constraintTop_toBottomOf="@+id/item_article_quantity_line1"
|
||||
tool:text="información de la linea 2" />
|
||||
|
||||
<TextView
|
||||
android:id="@+id/item_article_quantity_picked"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginStart="@dimen/layout_margin_min_to_modify"
|
||||
android:layout_marginEnd="@dimen/layout_margin_min"
|
||||
android:text="@{Integer.toString(sale.reservedQuantity)}"
|
||||
android:textColor="@color/verdnatura_white"
|
||||
android:textSize="@dimen/body3"
|
||||
android:textStyle="bold"
|
||||
android:visibility="invisible"
|
||||
app:layout_constraintEnd_toStartOf="@+id/txtdeNew"
|
||||
app:layout_constraintTop_toTopOf="@+id/item_article_quantity_line2"
|
||||
tool:text="0" />
|
||||
|
||||
|
||||
<TextView
|
||||
android:id="@+id/txtdeNew"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginEnd="@dimen/layout_margin_min"
|
||||
android:text="@string/de"
|
||||
android:textColor="@color/verdnatura_white"
|
||||
android:textSize="@dimen/body3"
|
||||
android:visibility="invisible"
|
||||
app:layout_constraintEnd_toStartOf="@+id/item_article_quantity"
|
||||
app:layout_constraintTop_toTopOf="@+id/item_article_quantity_line2" />
|
||||
|
||||
<TextView
|
||||
android:id="@+id/item_article_cel2_Old"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="cel2"
|
||||
android:textColor="@color/verdnatura_white"
|
||||
android:textSize="@dimen/body3"
|
||||
android:textStyle="bold"
|
||||
android:visibility="gone"
|
||||
app:layout_constraintEnd_toEndOf="@+id/item_article_quantity_line2"
|
||||
app:layout_constraintTop_toTopOf="@+id/item_article_quantity_line2"
|
||||
tool:text="cel2" />
|
||||
|
||||
|
||||
<TextView
|
||||
android:id="@+id/item_article_quantity"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:paddingLeft="@dimen/layout_collection_quantity"
|
||||
android:paddingTop="@dimen/layout_margin_minest"
|
||||
android:paddingBottom="@dimen/default_layout_margin"
|
||||
android:text="@{Integer.toString(sale.saleQuantity)}"
|
||||
android:textColor="@color/verdnatura_white"
|
||||
android:textSize="@dimen/body3"
|
||||
android:textStyle="bold"
|
||||
android:visibility="invisible"
|
||||
app:layout_constraintEnd_toEndOf="@+id/item_article_quantity_line2"
|
||||
app:layout_constraintTop_toTopOf="@+id/item_article_quantity_line2"
|
||||
tool:text="100" />
|
||||
|
||||
<TextView
|
||||
android:id="@+id/item_article_quantity_line3"
|
||||
android:layout_width="10dp"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginStart="@dimen/layout_margin_min_to_modify"
|
||||
android:layout_marginEnd="22dp"
|
||||
android:ellipsize="end"
|
||||
android:maxLines="1"
|
||||
android:text="@{sale.color}"
|
||||
android:textColor="@color/verdnatura_white"
|
||||
android:textSize="@dimen/body2"
|
||||
android:visibility="invisible"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintStart_toEndOf="@+id/linearLayoutItem"
|
||||
app:layout_constraintTop_toBottomOf="@+id/item_article_quantity_line2"
|
||||
tool:text="información de la linea 3" />
|
||||
|
||||
<TextView
|
||||
android:id="@+id/item_second"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginStart="@dimen/layout_margin_min_to_modify"
|
||||
android:layout_marginEnd="2dp"
|
||||
android:ellipsize="end"
|
||||
android:maxLines="1"
|
||||
android:text="second"
|
||||
android:textColor="@color/verdnatura_brown_grey"
|
||||
android:textSize="@dimen/body2"
|
||||
android:visibility="invisible"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintStart_toEndOf="@+id/item_article_quantity_line3"
|
||||
app:layout_constraintTop_toBottomOf="@+id/item_article_quantity_line2"
|
||||
tool:text="información de la linea 3" />
|
||||
|
||||
<TextView
|
||||
android:id="@+id/item_article_cel3"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="2/2"
|
||||
android:textColor="@color/verdnatura_white"
|
||||
android:textSize="@dimen/body2"
|
||||
android:textStyle="bold"
|
||||
android:visibility="invisible"
|
||||
app:layout_constraintEnd_toEndOf="@+id/item_second"
|
||||
app:layout_constraintTop_toTopOf="@+id/item_second"
|
||||
tool:text="cel3" />
|
||||
|
||||
<LinearLayout
|
||||
android:id="@+id/linearLayoutColor"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:orientation="vertical"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintTop_toTopOf="parent">
|
||||
|
||||
<View
|
||||
android:id="@+id/item_ticketColor"
|
||||
android:layout_width="@dimen/semaforo_width"
|
||||
android:layout_height="@dimen/ticketColor_height"
|
||||
android:layout_marginBottom="1dp"
|
||||
android:background="@drawable/border" />
|
||||
|
||||
</LinearLayout>
|
||||
|
||||
</androidx.constraintlayout.widget.ConstraintLayout>
|
||||
|
||||
<LinearLayout
|
||||
android:layout_width="50dp"
|
||||
android:layout_height="50dp"
|
||||
android:layout_weight="1"></LinearLayout>
|
||||
</LinearLayout>
|
||||
|
||||
<LinearLayout
|
||||
android:id="@+id/layout_error"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:visibility="gone">
|
||||
|
||||
<TextView
|
||||
android:id="@+id/txt_error"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:background="@color/verdnatura_red"
|
||||
android:textColor="@color/verdnatura_white"
|
||||
tool:text="Cantidad original 100" />
|
||||
</LinearLayout>
|
||||
|
||||
<LinearLayout
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="1dp"
|
||||
android:background="@color/verdnatura_white"></LinearLayout>
|
||||
|
||||
<androidx.recyclerview.widget.RecyclerView
|
||||
android:id="@+id/item_article_placements"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:background="@color/verdnatura_background_item_picker"
|
||||
android:clipToPadding="false"
|
||||
android:visibility="gone"
|
||||
tools:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
|
||||
tools:listitem="@layout/item_placement_row"
|
||||
tools:orientation="horizontal" />
|
||||
</LinearLayout>
|
||||
</layout>
|
||||
|
|
@ -1,6 +1,5 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<layout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
>
|
||||
<layout xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
|
||||
<data>
|
||||
|
||||
|
|
@ -9,74 +8,66 @@
|
|||
type="es.verdnatura.presentation.view.feature.historicoshelvinglog.model.ShelvingLog" />
|
||||
|
||||
</data>
|
||||
|
||||
<LinearLayout
|
||||
android:id="@+id/item_row_layout"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:orientation="vertical">
|
||||
|
||||
<LinearLayout
|
||||
|
||||
android:orientation="horizontal"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:background="@color/verdnatura_black_5"
|
||||
android:paddingLeft="@dimen/layout_margin_min"
|
||||
android:paddingRight="@dimen/layout_margin_min"
|
||||
android:paddingTop="@dimen/layout_margin_min"
|
||||
android:layout_gravity="center_horizontal"
|
||||
android:paddingBottom="@dimen/layout_margin_min"
|
||||
>
|
||||
|
||||
android:background="@color/verdnatura_black_5"
|
||||
android:orientation="horizontal"
|
||||
android:paddingStart="@dimen/layout_margin_min"
|
||||
android:paddingTop="@dimen/layout_margin_min"
|
||||
android:paddingEnd="@dimen/layout_margin_min"
|
||||
android:paddingBottom="@dimen/layout_margin_min">
|
||||
|
||||
|
||||
<TextView
|
||||
android:id="@+id/itemFk"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:gravity="start"
|
||||
android:text="@{item.name}"
|
||||
android:textSize="@dimen/body2"
|
||||
android:textColor="@color/verdnatura_white"
|
||||
android:textSize="@dimen/body2" />
|
||||
|
||||
android:gravity="left"
|
||||
/>
|
||||
<TextView
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="@{item.creationDate}"
|
||||
android:textSize="@dimen/body2"
|
||||
android:textColor="@color/verdnatura_white"
|
||||
android:layout_weight="1"
|
||||
android:gravity="center"/>
|
||||
|
||||
|
||||
android:gravity="center"
|
||||
android:text="@{item.creationDate}"
|
||||
android:textColor="@color/verdnatura_white"
|
||||
android:textSize="@dimen/body2" />
|
||||
|
||||
|
||||
</LinearLayout>
|
||||
|
||||
<LinearLayout
|
||||
android:id="@+id/item_rowsub_layout"
|
||||
android:orientation="horizontal"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:background="@color/verdnatura_black_5"
|
||||
android:paddingLeft="@dimen/layout_margin_min"
|
||||
android:paddingRight="@dimen/layout_margin_min"
|
||||
android:orientation="horizontal"
|
||||
android:paddingStart="@dimen/layout_margin_min"
|
||||
android:paddingTop="@dimen/pasilleros_margin_main_menu"
|
||||
>
|
||||
android:paddingEnd="@dimen/layout_margin_min">
|
||||
|
||||
<TextView
|
||||
android:id="@+id/item2"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="@{item.description}"
|
||||
android:textSize="@dimen/body2"
|
||||
android:textColor="@color/verdnatura_white"
|
||||
android:layout_weight="1"
|
||||
android:gravity="left"
|
||||
/>
|
||||
|
||||
|
||||
|
||||
android:gravity="start"
|
||||
android:text="@{item.description}"
|
||||
android:textColor="@color/verdnatura_white"
|
||||
android:textSize="@dimen/body2" />
|
||||
|
||||
</LinearLayout>
|
||||
|
||||
|
|
@ -84,13 +75,14 @@
|
|||
android:id="@+id/imageViewSeparator"
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:background="@color/verdnatura_pumpkin_orange"
|
||||
android:src="@android:drawable/divider_horizontal_bright"
|
||||
android:background="@color/verdnatura_pumpkin_orange"/>
|
||||
android:contentDescription="@string/divider"/>
|
||||
|
||||
|
||||
<LinearLayout
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="1dp"
|
||||
android:background="@color/verdnatura_black_9"/>
|
||||
android:background="@color/verdnatura_black_9" />
|
||||
</LinearLayout>
|
||||
</layout>
|
||||
|
|
@ -20,7 +20,8 @@
|
|||
android:layout_height="match_parent"
|
||||
android:scaleType="center"
|
||||
android:visibility="invisible"
|
||||
android:src="@drawable/ic_arrow_back_black_24dp" />
|
||||
android:src="@drawable/ic_arrow_back_black_24dp"
|
||||
android:contentDescription="@string/back"/>
|
||||
|
||||
<View
|
||||
android:id="@+id/toolbar_title_separator"
|
||||
|
|
@ -31,7 +32,7 @@
|
|||
android:background="@color/verdnatura_pumpkin_orange" />
|
||||
|
||||
<LinearLayout
|
||||
android:layout_width="match_parent"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="match_parent"
|
||||
android:layout_weight="1"
|
||||
android:orientation="vertical"
|
||||
|
|
@ -40,25 +41,22 @@
|
|||
android:id="@+id/toolbar_title"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:layout_weight="1"
|
||||
android:maxLines="1"
|
||||
android:textColor="@color/verdnatura_white"
|
||||
android:textSize="@dimen/h8"
|
||||
android:textStyle="bold"
|
||||
android:text="Title fragment"
|
||||
android:layout_marginLeft="@dimen/layout_margin_min"
|
||||
android:layout_marginStart="@dimen/layout_margin_min"
|
||||
android:gravity="center_vertical"/>
|
||||
|
||||
<TextView
|
||||
android:id="@+id/toolbar_subtitle"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:layout_weight="1"
|
||||
android:layout_height="0dp"
|
||||
android:maxLines="1"
|
||||
android:textColor="@color/verdnatura_white"
|
||||
android:textSize="@dimen/body2"
|
||||
android:text=""
|
||||
android:layout_marginLeft="@dimen/layout_margin_min"
|
||||
android:layout_marginStart="@dimen/layout_margin_min"
|
||||
android:gravity="center_vertical"
|
||||
android:visibility="gone"
|
||||
tool:visibility="visible"
|
||||
|
|
|
|||
|
|
@ -24,7 +24,8 @@
|
|||
android:layout_width="wrap_content"
|
||||
android:layout_height="?android:attr/actionBarSize"
|
||||
android:visibility="gone"
|
||||
app:srcCompat="@drawable/ic_vn_logo_negativo_app_warehouse" />
|
||||
app:srcCompat="@drawable/ic_vn_logo_negativo_app_warehouse"
|
||||
android:contentDescription="@string/title"/>
|
||||
|
||||
|
||||
<RelativeLayout
|
||||
|
|
@ -38,10 +39,11 @@
|
|||
android:id="@+id/backButton"
|
||||
android:layout_width="20dp"
|
||||
android:layout_height="match_parent"
|
||||
android:layout_marginLeft="@dimen/layout_margin_min"
|
||||
android:layout_marginStart="@dimen/layout_margin_min"
|
||||
android:scaleType="center"
|
||||
android:src="@drawable/ic_chevron_left"
|
||||
android:visibility="visible"
|
||||
android:contentDescription="@string/back"
|
||||
|
||||
/>
|
||||
|
||||
|
|
@ -49,21 +51,17 @@
|
|||
<LinearLayout
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:layout_marginLeft="@dimen/default_layout_margin"
|
||||
android:layout_weight="1"
|
||||
android:padding="@dimen/layout_margin_min"
|
||||
|
||||
>
|
||||
android:layout_marginStart="@dimen/default_layout_margin"
|
||||
android:padding="@dimen/layout_margin_min">
|
||||
|
||||
<TextView
|
||||
android:id="@+id/toolbar_title"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="match_parent"
|
||||
android:layout_weight="1"
|
||||
android:ellipsize="end"
|
||||
android:gravity="center|center_vertical"
|
||||
android:maxLines="1"
|
||||
android:text="Title fragment"
|
||||
android:textColor="@color/verdnatura_white"
|
||||
android:textSize="@dimen/h6"
|
||||
android:textStyle="bold" />
|
||||
|
|
@ -72,8 +70,8 @@
|
|||
android:id="@+id/toolbar_subtitle"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="match_parent"
|
||||
android:layout_gravity="right"
|
||||
android:layout_marginLeft="@dimen/layout_margin_min"
|
||||
android:layout_gravity="end"
|
||||
android:layout_marginStart="@dimen/layout_margin_min"
|
||||
android:gravity="center_vertical"
|
||||
android:maxLines="1"
|
||||
android:text=""
|
||||
|
|
@ -91,15 +89,14 @@
|
|||
android:id="@+id/toolbar_icons"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginLeft="@dimen/layout_margin_min"
|
||||
android:layout_marginStart="@dimen/layout_margin_min"
|
||||
tool:listitem="@layout/item_toolbar_row"
|
||||
tool:visibility="visible" />
|
||||
|
||||
<Switch
|
||||
<androidx.appcompat.widget.SwitchCompat
|
||||
android:id="@+id/switchButton"
|
||||
android:layout_width="50dp"
|
||||
android:layout_height="match_parent"
|
||||
android:text="Switch"
|
||||
android:visibility="gone"
|
||||
tool:visibility="visible" />
|
||||
|
||||
|
|
|
|||
|
|
@ -629,9 +629,9 @@
|
|||
<string name="phone">Teléfono</string>
|
||||
<string name="km">Kilómetros</string>
|
||||
<string name="hours">Horas</string>
|
||||
<string name="km_init">Km de inicio</string>
|
||||
<string name="km_init">km de inicio</string>
|
||||
<string name="comercial">Comercial</string>
|
||||
<string name="km_end">Km de fin</string>
|
||||
<string name="km_end">km de fin</string>
|
||||
<string name="hour_start">Hora de inicio</string>
|
||||
<string name="hour_end">Hora de fin</string>
|
||||
<string name="selectTime">Selecciona la hora</string>
|
||||
|
|
@ -691,7 +691,7 @@
|
|||
<string name="savePackages">Para guardar pulsa el icono del tick de la parte superior. ¿Quieres guardarlos?</string>
|
||||
<string name="yes">SI</string>
|
||||
<string name="no">NO</string>
|
||||
<string name="add">Añadir...</string>
|
||||
<string name="add">Añadir…</string>
|
||||
<string name="surname">Apellidos</string>
|
||||
<string name="confirmReserv">Confirmada reserva</string>
|
||||
<string name="checkingByUser">Está siendo revisado por %1$s</string>
|
||||
|
|
@ -702,6 +702,41 @@
|
|||
<string name="itemAndPackingMandatory">Los campos item y packing son obligatorios</string>
|
||||
<string name="menuByDefault">Menú de inicio</string>
|
||||
<string name="all">Todo</string>
|
||||
<string name="allowMarkSalesPrevia">Permite marcar las líneas de previa escaneando ticket</string>
|
||||
<string name="eti">Eti</string>
|
||||
<string name="palletExpScan">Pallet:</string>
|
||||
<string name="consign">Consign</string>
|
||||
<string name="etd">ETD</string>
|
||||
<string name="scanWagoons">ESCANEAR CARROS</string>
|
||||
<string name="server">Servidor:</string>
|
||||
<string name="priority">Prioridad:</string>
|
||||
<string name="stock">Stock</string>
|
||||
<string name="password">Password</string>
|
||||
<string name="nameSurname">Nombre o apellido</string>
|
||||
<string name="description">Descripción</string>
|
||||
<string name="images">Imágenes :</string>
|
||||
<string name="addNew">Añadir nueva…</string>
|
||||
<string name="imageToUpload">Imagen a subir</string>
|
||||
<string name="imageItem">Imagen del artículo</string>
|
||||
<string name="zero">0</string>
|
||||
<string name="zeroHour">00:00</string>
|
||||
<string name="nameUser">Nombre del usuario</string>
|
||||
<string name="workerImage">Imagen trabajador</string>
|
||||
<string name="back">Atrás</string>
|
||||
<string name="divider">Separador</string>
|
||||
<string name="update">Actualizar</string>
|
||||
<string name="code">Code</string>
|
||||
<string name="notes">Notas</string>
|
||||
<string name="map">Mapa</string>
|
||||
<string name="header">cabecera</string>
|
||||
<string name="m3">m3</string>
|
||||
<string name="options">Opciones</string>
|
||||
<string name="hourMinute">%1$d:%2$d</string>
|
||||
<string name="level">Nivel:</string>
|
||||
<string name="ticketAbb">-T:</string>
|
||||
<string name="signPackaging">Firma:</string>
|
||||
<string name="observationsTxt">Observaciones:</string>
|
||||
<string name="imageToSend">Imágenes adjuntas:</string>
|
||||
|
||||
|
||||
</resources>
|
||||
|
|
|
|||
|
|
@ -690,7 +690,7 @@
|
|||
<string name="savePackages">Pour sauvegarder, appuyez sur l\'icône de coche en haut. Voulez-vous les sauvegarder ?</string>
|
||||
<string name="yes">OUI</string>
|
||||
<string name="no">NON</string>
|
||||
<string name="add">Añadir...</string>
|
||||
<string name="add">Añadir…</string>
|
||||
<string name="surname">Nom de famille</string>
|
||||
<string name="confirmReserv">Confirmada reserva</string>
|
||||
<string name="checkingByUser">Está siendo revisado por %1$s</string>
|
||||
|
|
@ -701,6 +701,41 @@
|
|||
<string name="itemAndPackingMandatory">Los campos item y packing son obligatorios</string>
|
||||
<string name="menuByDefault">Menu de démarrage</string>
|
||||
<string name="all">Tout</string>
|
||||
<string name="allowMarkSalesPrevia">Permite marcar las líneas de previa escaneando ticket</string>
|
||||
<string name="eti">Eti</string>
|
||||
<string name="palletExpScan">Pallet:</string>
|
||||
<string name="consign">Consign</string>
|
||||
<string name="etd">ETD</string>
|
||||
<string name="scanWagoons">ESCANEAR CARROS</string>
|
||||
<string name="server">Server:</string>
|
||||
<string name="priority">Prioridad:</string>
|
||||
<string name="stock">Stock</string>
|
||||
<string name="password">Password</string>
|
||||
<string name="nameSurname">Nombre o apellido</string>
|
||||
<string name="description">Descripción</string>
|
||||
<string name="images">Imágenes :</string>
|
||||
<string name="addNew">Añadir nueva…</string>
|
||||
<string name="imageToUpload">Imagen a subir</string>
|
||||
<string name="imageItem">Imagen del artículo</string>
|
||||
<string name="zero">0</string>
|
||||
<string name="zeroHour">00:00</string>
|
||||
<string name="nameUser">Nombre del usuario</string>
|
||||
<string name="workerImage">Imagen trabajador</string>
|
||||
<string name="back">Atrás</string>
|
||||
<string name="divider">Separador</string>
|
||||
<string name="update">Actualizar</string>
|
||||
<string name="code">Code</string>
|
||||
<string name="notes">Notas</string>
|
||||
<string name="map">Mapa</string>
|
||||
<string name="header">cabecera</string>
|
||||
<string name="m3">m3</string>
|
||||
<string name="options">Opciones</string>
|
||||
<string name="hourMinute">%1$d:%2$d</string>
|
||||
<string name="level">Nivel:</string>
|
||||
<string name="ticketAbb">-T:</string>
|
||||
<string name="signPackaging">Firma:</string>
|
||||
<string name="observationsTxt">Observaciones:</string>
|
||||
<string name="imageToSend">Imágenes adjuntas:</string>
|
||||
|
||||
|
||||
</resources>
|
||||
|
|
|
|||
|
|
@ -690,7 +690,7 @@
|
|||
<string name="savePackages">Para salvar, toque no ícone de marca de seleção na parte superior. Você quer salvá-los?</string>
|
||||
<string name="yes">SIM</string>
|
||||
<string name="no">NÃO</string>
|
||||
<string name="add">Añadir...</string>
|
||||
<string name="add">Añadir…</string>
|
||||
<string name="surname">Sobrenome</string>
|
||||
<string name="confirmReserv">Confirmada reserva</string>
|
||||
<string name="checkingByUser">Está siendo revisado por %1$s</string>
|
||||
|
|
@ -701,6 +701,40 @@
|
|||
<string name="itemAndPackingMandatory">Los campos item y packing son obligatorios</string>
|
||||
<string name="menuByDefault">Menu padrão</string>
|
||||
<string name="all">Tudo</string>
|
||||
|
||||
<string name="allowMarkSalesPrevia">Permite marcar las líneas de previa escaneando ticket</string>
|
||||
<string name="eti">Eti</string>
|
||||
<string name="palletExpScan">Pallet:</string>
|
||||
<string name="consign">Consign</string>
|
||||
<string name="etd">ETD</string>
|
||||
<string name="scanWagoons">ESCANEAR CARROS</string>
|
||||
<string name="server">Server:</string>
|
||||
<string name="priority">Prioridad:</string>
|
||||
<string name="stock">Stock</string>
|
||||
<string name="password">Password</string>
|
||||
<string name="nameSurname">Nombre o apellido</string>
|
||||
<string name="description">Descripción</string>
|
||||
<string name="images">Imágenes :</string>
|
||||
<string name="addNew">Añadir nueva…</string>
|
||||
<string name="imageToUpload">Imagen a subir</string>
|
||||
<string name="imageItem">Imagen del artículo</string>
|
||||
<string name="zero">0</string>
|
||||
<string name="zeroHour">00:00</string>
|
||||
<string name="nameUser">Nombre del usuario</string>
|
||||
<string name="workerImage">Imagen trabajador</string>
|
||||
<string name="back">Atrás</string>
|
||||
<string name="divider">Separador</string>
|
||||
<string name="update">Actualizar</string>
|
||||
<string name="code">Code</string>
|
||||
<string name="notes">Notas</string>
|
||||
<string name="map">Mapa</string>
|
||||
<string name="header">cabecera</string>
|
||||
<string name="m3">m3</string>
|
||||
<string name="options">Opciones</string>
|
||||
<string name="hourMinute">%1$d:%2$d</string>
|
||||
<string name="level">Nivel:</string>
|
||||
<string name="ticketAbb">-T:</string>
|
||||
<string name="signPackaging">Firma:</string>
|
||||
<string name="observationsTxt">Observaciones:</string>
|
||||
<string name="imageToSend">Imágenes adjuntas:</string>
|
||||
|
||||
</resources>
|
||||
|
|
|
|||
|
|
@ -143,7 +143,7 @@
|
|||
<string name="OutTimed">Until</string>
|
||||
<string name="Androidid">Android_id</string>
|
||||
<string name="serialNumber">Serial Number</string>
|
||||
<string name="serialNumberDescrip">You are going to change the Serial Number. Be carefull</string>
|
||||
<string name="serialNumberDescrip">You are going to change the Serial Number. Be careful</string>
|
||||
<string name="copied">Copied</string>
|
||||
<string name="typeTags">Tags type</string>
|
||||
<string name="deviceName">Device name :</string>
|
||||
|
|
@ -660,7 +660,7 @@
|
|||
<string name="permissionRequired">Location Permission Required</string>
|
||||
<string name="advicePermission">To use this application, you must grant location permissions.</string>
|
||||
<string name="manuallyPermission">Manually Enable Location Permission.</string>
|
||||
<string name="itemNecessary">Item fiels is required</string>
|
||||
<string name="itemNecessary">Item fields is required</string>
|
||||
<string name="sacador_test">Sacador Test</string>
|
||||
<string name="routeNotTickets">The route has no tickets to send</string>
|
||||
<string name="sendDriverRoute">Send the roadmap to the driver</string>
|
||||
|
|
@ -690,7 +690,7 @@
|
|||
<string name="savePackages">To save, tap the checkmark icon at the top. Do you want to save them?</string>
|
||||
<string name="yes">YES</string>
|
||||
<string name="no">NO</string>
|
||||
<string name="add">Añadir...</string>
|
||||
<string name="add">Añadir…</string>
|
||||
<string name="surname">Surname</string>
|
||||
<string name="confirmReserv">Confirmada reserva</string>
|
||||
<string name="checkingByUser">Ticket on checking by %1$s</string>
|
||||
|
|
@ -701,5 +701,40 @@
|
|||
<string name="itemAndPackingMandatory">Los campos item y packing son obligatorios</string>
|
||||
<string name="menuByDefault">Default menu</string>
|
||||
<string name="all">All</string>
|
||||
<string name="allowMarkSalesPrevia">Permite marcar las líneas de previa escaneando ticket</string>
|
||||
<string name="eti">Eti</string>
|
||||
<string name="palletExpScan">Pallet:</string>
|
||||
<string name="consign">Consign</string>
|
||||
<string name="etd">ETD</string>
|
||||
<string name="scanWagoons">ESCANEAR CARROS</string>
|
||||
<string name="server">Server:</string>
|
||||
<string name="priority">Prioridad:</string>
|
||||
<string name="stock">Stock</string>
|
||||
<string name="password">Password</string>
|
||||
<string name="nameSurname">Nombre o apellido</string>
|
||||
<string name="description">Descripción</string>
|
||||
<string name="images">Imágenes :</string>
|
||||
<string name="addNew">Añadir nueva…</string>
|
||||
<string name="imageToUpload">Imagen a subir</string>
|
||||
<string name="imageItem">Imagen del artículo</string>
|
||||
<string name="zero">0</string>
|
||||
<string name="zeroHour">00:00</string>
|
||||
<string name="nameUser">Nombre del usuario</string>
|
||||
<string name="workerImage">Imagen trabajador</string>
|
||||
<string name="back">Atrás</string>
|
||||
<string name="divider">Separador</string>
|
||||
<string name="update">Actualizar</string>
|
||||
<string name="code">Code</string>
|
||||
<string name="notes">Notas</string>
|
||||
<string name="map">Mapa</string>
|
||||
<string name="header">cabecera</string>
|
||||
<string name="m3">m3</string>
|
||||
<string name="options">Opciones</string>
|
||||
<string name="hourMinute">%1$d:%2$d</string>
|
||||
<string name="level">Nivel:</string>
|
||||
<string name="ticketAbb">-T:</string>
|
||||
<string name="signPackaging">Firma:</string>
|
||||
<string name="observationsTxt">Observaciones:</string>
|
||||
<string name="imageToSend">Imágenes adjuntas:</string>
|
||||
|
||||
</resources>
|
||||
|
|
|
|||
|
|
@ -124,8 +124,8 @@
|
|||
<style name="ScanLineTextSearch" parent="DialogTheme">
|
||||
<item name="android:background">@drawable/background_round</item>
|
||||
<item name="android:textColor">@color/verdnatura_white</item>
|
||||
<item name="android:layout_marginLeft">50dp</item>
|
||||
<item name="android:layout_marginRight">50dp</item>
|
||||
<item name="android:layout_marginStart">50dp</item>
|
||||
<item name="android:layout_marginEnd">50dp</item>
|
||||
<item name="android:layout_marginTop">65dp</item>
|
||||
<item name="android:paddingTop">5dp</item>
|
||||
<item name="android:paddingBottom">5dp</item>
|
||||
|
|
@ -133,7 +133,6 @@
|
|||
<item name="android:gravity">center_horizontal</item>
|
||||
<item name="android:textColorHint">@android:color/white</item>
|
||||
|
||||
|
||||
</style>
|
||||
|
||||
<!-- Full Screen Alert Dialog -->
|
||||
|
|
|
|||
Loading…
Reference in New Issue