diff --git a/.gitignore b/.gitignore index 29149da5..bb20401c 100644 --- a/.gitignore +++ b/.gitignore @@ -149,5 +149,6 @@ crashlytics.properties crashlytics-build.properties ### AndroidStudio Patch ### !/gradle/wrapper/gradle-wrapper.jar -/.idea/copilot.data.migration.agent.xml -/.idea/copilot.data.migration.edit.xml + +copilot.*.xml +/.idea/dataSources.xml \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle index f532c2f4..a80010ef 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -11,8 +11,8 @@ apply plugin: 'com.google.gms.google-services' android { - def appVersionCode = 533 - def appVersionName = '1.47.20' + def appVersionCode = 534 + def appVersionName = '1.47.21' signingConfigs { release { diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/prod_recupero_materiale/ProdRecuperoMaterialeViewModel.java b/app/src/main/java/it/integry/integrywmsnative/gest/prod_recupero_materiale/ProdRecuperoMaterialeViewModel.java index 3cef2131..e2f56069 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/prod_recupero_materiale/ProdRecuperoMaterialeViewModel.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/prod_recupero_materiale/ProdRecuperoMaterialeViewModel.java @@ -18,6 +18,7 @@ import it.integry.integrywmsnative.core.expansion.RunnableArgss; import it.integry.integrywmsnative.core.interfaces.viewmodel_listeners.ILoadingListener; import it.integry.integrywmsnative.core.model.MtbAart; import it.integry.integrywmsnative.core.model.MtbColt; +import it.integry.integrywmsnative.core.rest.consumers.BarcodeRESTConsumer; import it.integry.integrywmsnative.core.rest.consumers.ColliMagazzinoRESTConsumer; import it.integry.integrywmsnative.core.rest.consumers.MaterialiRESTConsumer; import it.integry.integrywmsnative.core.rest.consumers.PrinterRESTConsumer; @@ -30,6 +31,7 @@ import it.integry.integrywmsnative.gest.spedizione.model.PickedQuantityDTO; public class ProdRecuperoMaterialeViewModel { + private final BarcodeRESTConsumer mBarcodeRESTConsumer; private final ProdRecuperoMaterialeRESTConsumer mProdRecuperoMaterialeRESTConsumer; private final ColliMagazzinoRESTConsumer mColliMagazzinoRESTConsumer; private final PrinterRESTConsumer mPrinterRESTConsumer; @@ -44,11 +46,13 @@ public class ProdRecuperoMaterialeViewModel { @Inject - public ProdRecuperoMaterialeViewModel(ProdRecuperoMaterialeRESTConsumer prodRecuperoMaterialeRESTConsumer, + public ProdRecuperoMaterialeViewModel(BarcodeRESTConsumer barcodeRESTConsumer, + ProdRecuperoMaterialeRESTConsumer prodRecuperoMaterialeRESTConsumer, ColliMagazzinoRESTConsumer colliMagazzinoRESTConsumer, PrinterRESTConsumer printerRESTConsumer, MaterialiRESTConsumer materialiRESTConsumer, ExecutorService executorService) { + this.mBarcodeRESTConsumer = barcodeRESTConsumer; this.mProdRecuperoMaterialeRESTConsumer = prodRecuperoMaterialeRESTConsumer; this.mColliMagazzinoRESTConsumer = colliMagazzinoRESTConsumer; this.mPrinterRESTConsumer = printerRESTConsumer; @@ -78,29 +82,37 @@ public class ProdRecuperoMaterialeViewModel { public void processBarcodeDTO(BarcodeScanDTO data) { if (UtilityBarcode.isEtichettaAnonima(data) || UtilityBarcode.isEtichetta128(data)) { - this.executeEtichettaLU(data.getStringValue()); + this.executeEtichettaLU(data); } } - private void executeEtichettaLU(String sscc) { + private void executeEtichettaLU(BarcodeScanDTO barcodeScanDTO) { this.sendOnLoadingStarted(); + this.mBarcodeRESTConsumer.decodeEan128(barcodeScanDTO, ean128Model -> { - this.mColliMagazzinoRESTConsumer.getBySSCC(sscc, true, false, mtbColt -> { - this.sendOnLoadingEnded(); + if(ean128Model == null || ean128Model.Sscc == null) { + this.sendError(new NoLUFoundException()); + this.sendOnLoadingEnded(); + return; + } + + this.mColliMagazzinoRESTConsumer.getBySSCC(ean128Model.Sscc, true, false, mtbColt -> { + this.sendOnLoadingEnded(); + + if (mtbColt != null) { + HistoryVersamentoProdULDTO historyVersamentoProdULRestDTO = this.getHistoryElementFromMtbColt(mtbColt); + if (historyVersamentoProdULRestDTO != null) { + this.dispatchItem(historyVersamentoProdULRestDTO, mtbColt); + } else { + this.sendError(new NoLUFoundException()); + } - if (mtbColt != null) { - HistoryVersamentoProdULDTO historyVersamentoProdULRestDTO = this.getHistoryElementFromMtbColt(mtbColt); - if (historyVersamentoProdULRestDTO != null) { - this.dispatchItem(historyVersamentoProdULRestDTO, mtbColt); } else { this.sendError(new NoLUFoundException()); } - } else { - this.sendError(new NoLUFoundException()); - } - + }, this::sendError); }, this::sendError); } @@ -181,7 +193,7 @@ public class ProdRecuperoMaterialeViewModel { .setNumColloRif(item.getNumColloRif()) .setOrdini(ordiniRequest); - if(mtbColt != null) { + if (mtbColt != null) { request.setMtbColtCarico(mtbColt); } else { request.setMtbColtCarico(sourceMtbColt); diff --git a/app/src/main/res/drawable/badge_round_corner.xml b/app/src/main/res/drawable/badge_round_corner.xml index e7af763b..1b3c0ba6 100644 --- a/app/src/main/res/drawable/badge_round_corner.xml +++ b/app/src/main/res/drawable/badge_round_corner.xml @@ -7,7 +7,7 @@ diff --git a/app/src/main/res/layout-land-hdpi/dialog_input_lu_prod.xml b/app/src/main/res/layout-land-hdpi/dialog_input_lu_prod.xml index 05a513ca..cb768358 100644 --- a/app/src/main/res/layout-land-hdpi/dialog_input_lu_prod.xml +++ b/app/src/main/res/layout-land-hdpi/dialog_input_lu_prod.xml @@ -101,7 +101,7 @@ tools:text="COD MART (Partita mag)" /> @@ -50,8 +49,7 @@ android:minHeight="?attr/actionBarSize" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toTopOf="parent" - app:titleTextColor="@android:color/white"> + app:layout_constraintTop_toTopOf="parent"> @@ -92,7 +90,7 @@ tools:text="DIACOD" /> + android:text="@string/total_ordered" /> @@ -149,7 +144,6 @@ android:layout_alignParentEnd="true" android:layout_marginStart="4dp" android:text="(" - android:textColor="@android:color/black" android:textStyle="bold" /> @@ -342,7 +333,7 @@ diff --git a/app/src/main/res/layout-large/fragment_prod_rientro_merce_order_detail.xml b/app/src/main/res/layout-large/fragment_prod_rientro_merce_order_detail.xml index 34084d5d..f064faae 100644 --- a/app/src/main/res/layout-large/fragment_prod_rientro_merce_order_detail.xml +++ b/app/src/main/res/layout-large/fragment_prod_rientro_merce_order_detail.xml @@ -130,7 +130,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@{UtilityDate.formatDate(view.currentOrder.dataOrd, UtilityDate.COMMONS_DATE_FORMATS.DMY_HUMAN)}" - android:textAppearance="@style/AppTheme.NewMaterial.Text.Small" + android:textAppearance="@style/TextAppearance.Material3.BodyMedium" tools:text="28 maggio 2021" /> @@ -276,7 +276,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@{UtilityDate.formatDate(view.currentOrder.getDataConsCommessaD(), UtilityDate.COMMONS_DATE_FORMATS.DMY_HUMAN)}" - android:textAppearance="@style/AppTheme.NewMaterial.Text.Small" + android:textAppearance="@style/TextAppearance.Material3.BodyMedium" android:textColor="@android:color/black" tools:text="01 Gen 2022" /> @@ -361,7 +361,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@{UtilityNumber.decimalToString(view.currentOrder.numPedane, 0)}" - android:textAppearance="@style/AppTheme.NewMaterial.Text.Small" + android:textAppearance="@style/TextAppearance.Material3.BodyMedium" android:textColor="@android:color/black" tools:text="0" /> @@ -370,7 +370,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:text=" UL" - android:textAppearance="@style/AppTheme.NewMaterial.Text.Small" + android:textAppearance="@style/TextAppearance.Material3.BodyMedium" android:textColor="@android:color/black" /> @@ -419,7 +419,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@{UtilityNumber.decimalToString(view.currentOrder.numCnf, 0)}" - android:textAppearance="@style/AppTheme.NewMaterial.Text.Small" + android:textAppearance="@style/TextAppearance.Material3.BodyMedium" android:textColor="@android:color/black" tools:text="0" /> @@ -428,7 +428,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:text=" COL" - android:textAppearance="@style/AppTheme.NewMaterial.Text.Small" + android:textAppearance="@style/TextAppearance.Material3.BodyMedium" android:textColor="@android:color/black" /> @@ -478,7 +478,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@{UtilityNumber.decimalToString(view.currentOrder.qtaProd, 0)}" - android:textAppearance="@style/AppTheme.NewMaterial.Text.Small" + android:textAppearance="@style/TextAppearance.Material3.BodyMedium" android:textColor="@android:color/black" tools:text="0" /> @@ -488,7 +488,7 @@ android:layout_height="wrap_content" android:layout_marginStart="4dp" android:text="@{view.currentOrder.untOrd}" - android:textAppearance="@style/AppTheme.NewMaterial.Text.Small" + android:textAppearance="@style/TextAppearance.Material3.BodyMedium" android:textColor="@android:color/black" tools:text="KG" /> @@ -546,7 +546,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@{UtilityNumber.decimalToString(view.sumLUNumber, 0)}" - android:textAppearance="@style/AppTheme.NewMaterial.Text.Small" + android:textAppearance="@style/TextAppearance.Material3.BodyMedium" android:textColor="@android:color/black" tools:text="0" /> @@ -555,7 +555,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:text=" UL" - android:textAppearance="@style/AppTheme.NewMaterial.Text.Small" + android:textAppearance="@style/TextAppearance.Material3.BodyMedium" android:textColor="@android:color/black" /> @@ -605,7 +605,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@{UtilityNumber.decimalToString(view.sumColliNumber, 0)}" - android:textAppearance="@style/AppTheme.NewMaterial.Text.Small" + android:textAppearance="@style/TextAppearance.Material3.BodyMedium" android:textColor="@android:color/black" tools:text="0" /> @@ -615,7 +615,7 @@ android:layout_height="wrap_content" android:layout_marginStart="4dp" android:text="COL" - android:textAppearance="@style/AppTheme.NewMaterial.Text.Small" + android:textAppearance="@style/TextAppearance.Material3.BodyMedium" android:textColor="@android:color/black" /> @@ -662,7 +662,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@{UtilityNumber.decimalToString(view.sumNetKG, 0)}" - android:textAppearance="@style/AppTheme.NewMaterial.Text.Small" + android:textAppearance="@style/TextAppearance.Material3.BodyMedium" android:textColor="@android:color/black" tools:text="0" /> @@ -672,7 +672,7 @@ android:layout_height="wrap_content" android:layout_marginStart="4dp" android:text="KG" - android:textAppearance="@style/AppTheme.NewMaterial.Text.Small" + android:textAppearance="@style/TextAppearance.Material3.BodyMedium" android:textColor="@android:color/black" /> @@ -680,14 +680,14 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:text=" (" - android:textAppearance="@style/AppTheme.NewMaterial.Text.Small" + android:textAppearance="@style/TextAppearance.Material3.BodyMedium" android:textColor="@android:color/black" /> @@ -696,7 +696,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:text=" KG)" - android:textAppearance="@style/AppTheme.NewMaterial.Text.Small" + android:textAppearance="@style/TextAppearance.Material3.BodyMedium" android:textColor="@android:color/black" /> @@ -768,7 +768,7 @@ android:ellipsize="end" android:maxLines="1" android:text="@{view.currentOrder.ragSocAnag + ` (` + view.currentOrder.codAnag + `)`}" - android:textAppearance="@style/AppTheme.NewMaterial.Text.Small" + android:textAppearance="@style/TextAppearance.Material3.BodyMedium" android:textColor="@android:color/black" android:visibility="@{view.currentOrder.ragSocAnag != null ? View.VISIBLE : View.GONE}" tools:text="FRUDIS S.R.L. (F0312)" /> @@ -813,7 +813,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@{UtilityNumber.decimalToString(view.sumLUNumber, 0)}" - android:textAppearance="@style/AppTheme.NewMaterial.Text.Small" + android:textAppearance="@style/TextAppearance.Material3.BodyMedium" android:textColor="@android:color/black" tools:text="0" /> @@ -822,7 +822,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:text=" UL" - android:textAppearance="@style/AppTheme.NewMaterial.Text.Small" + android:textAppearance="@style/TextAppearance.Material3.BodyMedium" android:textColor="@android:color/black" /> @@ -830,14 +830,14 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:text=" (" - android:textAppearance="@style/AppTheme.NewMaterial.Text.Small" + android:textAppearance="@style/TextAppearance.Material3.BodyMedium" android:textColor="@android:color/black" /> @@ -846,7 +846,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:text=" COL)" - android:textAppearance="@style/AppTheme.NewMaterial.Text.Small" + android:textAppearance="@style/TextAppearance.Material3.BodyMedium" android:textColor="@android:color/black" /> @@ -906,7 +906,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@{view.currentOrder.descCommessa != null ? view.currentOrder.descCommessa : `-`}" - android:textAppearance="@style/AppTheme.NewMaterial.Text.Small" + android:textAppearance="@style/TextAppearance.Material3.BodyMedium" android:textColor="@android:color/black" tools:text="GRUNDHOFER GBMH" /> @@ -949,7 +949,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@{UtilityNumber.decimalToString(view.sumNetKG, 0)}" - android:textAppearance="@style/AppTheme.NewMaterial.Text.Small" + android:textAppearance="@style/TextAppearance.Material3.BodyMedium" android:textColor="@android:color/black" tools:text="0" /> @@ -958,7 +958,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:text=" KG" - android:textAppearance="@style/AppTheme.NewMaterial.Text.Small" + android:textAppearance="@style/TextAppearance.Material3.BodyMedium" android:textColor="@android:color/black" /> @@ -1024,7 +1024,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@{UtilityDate.formatDate(view.currentOrder.dataInizD, UtilityDate.COMMONS_DATE_FORMATS.DM_TIME_SLASH)}" - android:textAppearance="@style/AppTheme.NewMaterial.Text.Small" + android:textAppearance="@style/TextAppearance.Material3.BodyMedium" android:textColor="@android:color/black" tools:text="11:00:00" /> @@ -1032,14 +1032,14 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:text=" - " - android:textAppearance="@style/AppTheme.NewMaterial.Text.Small" + android:textAppearance="@style/TextAppearance.Material3.BodyMedium" android:textColor="@android:color/black" /> @@ -1048,7 +1048,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="IN CORSO" - android:textAppearance="@style/AppTheme.NewMaterial.Text.Small" + android:textAppearance="@style/TextAppearance.Material3.BodyMedium" android:textColor="@android:color/black" android:visibility="@{view.currentOrder.dataFineD == null ? View.VISIBLE : View.GONE}" tools:text="IN CORSO" @@ -1061,7 +1061,7 @@ android:layout_height="wrap_content" android:text="Non avviato" android:textAllCaps="true" - android:textAppearance="@style/AppTheme.NewMaterial.Text.Small" + android:textAppearance="@style/TextAppearance.Material3.BodyMedium" android:textColor="@android:color/black" android:visibility="@{view.currentOrder.dataInizD == null ? View.VISIBLE : View.GONE}" tools:visibility="gone" /> @@ -1105,7 +1105,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@{UtilityNumber.decimalToString(view.sumGrossKG, 0)}" - android:textAppearance="@style/AppTheme.NewMaterial.Text.Small" + android:textAppearance="@style/TextAppearance.Material3.BodyMedium" android:textColor="@android:color/black" tools:text="0" /> @@ -1114,7 +1114,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:text=" KG" - android:textAppearance="@style/AppTheme.NewMaterial.Text.Small" + android:textAppearance="@style/TextAppearance.Material3.BodyMedium" android:textColor="@android:color/black" /> @@ -1176,7 +1176,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="Lista bancali" - android:textAppearance="@style/AppTheme.NewMaterial.Text.Small" + android:textAppearance="@style/TextAppearance.Material3.BodyMedium" android:textColor="@android:color/black" android:textStyle="bold" /> diff --git a/app/src/main/res/layout/accettazione_bolla_picking_main_list__group_item.xml b/app/src/main/res/layout/accettazione_bolla_picking_main_list__group_item.xml index 590b41e2..68d0cba9 100644 --- a/app/src/main/res/layout/accettazione_bolla_picking_main_list__group_item.xml +++ b/app/src/main/res/layout/accettazione_bolla_picking_main_list__group_item.xml @@ -21,7 +21,7 @@ + style="@style/TextAppearance.Material3.BodyMedium" /> + style="@style/TextAppearance.Material3.BodyMedium" /> \ No newline at end of file diff --git a/app/src/main/res/layout/accettazione_main_list_group_model.xml b/app/src/main/res/layout/accettazione_main_list_group_model.xml index b4f75028..86fa7298 100644 --- a/app/src/main/res/layout/accettazione_main_list_group_model.xml +++ b/app/src/main/res/layout/accettazione_main_list_group_model.xml @@ -36,7 +36,7 @@ android:layout_height="wrap_content" tools:text="Ord. Prod. 39 del 27 ott 2017" android:textColor="#000" - style="@style/AppTheme.NewMaterial.Text.Small"/> + style="@style/TextAppearance.Material3.BodyMedium"/> @@ -22,7 +21,6 @@ android:layout_height="match_parent" android:layout_gravity="start" android:fitsSystemWindows="true" - android:background="@android:color/white" app:headerLayout="@layout/nav_header_main" /> - + @@ -88,7 +88,7 @@ diff --git a/app/src/main/res/layout/activity_prod_dettaglio_linea.xml b/app/src/main/res/layout/activity_prod_dettaglio_linea.xml index 7deee321..739d66db 100644 --- a/app/src/main/res/layout/activity_prod_dettaglio_linea.xml +++ b/app/src/main/res/layout/activity_prod_dettaglio_linea.xml @@ -26,8 +26,7 @@ + android:layout_height="match_parent"> - - - - - - - - - - - + android:layout_margin="8dp"> - - - - - - - + android:orientation="vertical" + android:padding="16dp"> - + + + + + + + + + + + android:orientation="horizontal"> - + + + + + + android:layout_marginTop="16dp" + app:visibility="@{view.isStarted}"> + + + + - + - + + - - + app:visibility="@{view.flagShowProdInfo}"> - - - - + android:orientation="vertical" + android:padding="16dp"> - - + android:text="@string/production_in_progress" + android:textAppearance="@style/TextAppearance.Material3.TitleMedium" + tools:text="Lavorazione in corso" /> - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + android:text="@string/orders_in_progress" + android:textAppearance="@style/TextAppearance.Material3.BodyMedium" + tools:text="Ordini in lavorazione" /> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - - - + + - + + + + - - - + android:layout_margin="8dp" + android:layout_marginTop="16dp"> + android:orientation="vertical" + android:padding="16dp"> - + android:text="@string/versamento_merce_fragment_title" + android:textAppearance="@style/TextAppearance.Material3.TitleMedium" /> - + android:layout_gravity="center_horizontal" + android:layout_marginTop="24dp" + android:orientation="horizontal" + android:visibility="visible" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@id/header_content"> + + + + + + - - + diff --git a/app/src/main/res/layout/activity_pv_ordine_acquisto_edit.xml b/app/src/main/res/layout/activity_pv_ordine_acquisto_edit.xml index 30319a6b..364bbe39 100644 --- a/app/src/main/res/layout/activity_pv_ordine_acquisto_edit.xml +++ b/app/src/main/res/layout/activity_pv_ordine_acquisto_edit.xml @@ -80,7 +80,7 @@ android:orientation="horizontal"> diff --git a/app/src/main/res/layout/activity_splash.xml b/app/src/main/res/layout/activity_splash.xml index 638dcf06..6eab359b 100644 --- a/app/src/main/res/layout/activity_splash.xml +++ b/app/src/main/res/layout/activity_splash.xml @@ -79,7 +79,7 @@ android:textColor="@android:color/white" android:alpha="0.7" android:layout_marginTop="12dp" - style="@style/AppTheme.NewMaterial.Text.Small"/> + style="@style/TextAppearance.Material3.BodyMedium"/> + style="@style/TextAppearance.Material3.BodyMedium"/> \ No newline at end of file diff --git a/app/src/main/res/layout/app_bar_main.xml b/app/src/main/res/layout/app_bar_main.xml index da3cfa4c..1352bbac 100644 --- a/app/src/main/res/layout/app_bar_main.xml +++ b/app/src/main/res/layout/app_bar_main.xml @@ -13,17 +13,11 @@ android:layout_width="match_parent" android:layout_height="wrap_content"> - - - - - + android:gravity="center_horizontal"> @@ -59,7 +53,7 @@ android:visibility="gone" android:layout_centerVertical="true" android:gravity="start" - style="@style/AppTheme.NewMaterial.Text.ToolbarTitle"/> + style="@style/TextAppearance.Material3.TitleLarge"/> + android:layout_alignParentEnd="true"/> + android:src="@drawable/ic_search_black_24dp"/> + android:src="@drawable/ic_round_check_24"/> - - diff --git a/app/src/main/res/layout/bottom_sheet__inventario_actions_view.xml b/app/src/main/res/layout/bottom_sheet__inventario_actions_view.xml index 4bfa501c..17c29d95 100644 --- a/app/src/main/res/layout/bottom_sheet__inventario_actions_view.xml +++ b/app/src/main/res/layout/bottom_sheet__inventario_actions_view.xml @@ -83,13 +83,13 @@ android:visibility="@{UtilityString.isNullOrEmpty(viewModel.currentItem.zona) ? View.GONE : View.VISIBLE}"> diff --git a/app/src/main/res/layout/bottom_sheet__inventario_row_actions_view.xml b/app/src/main/res/layout/bottom_sheet__inventario_row_actions_view.xml index 0b7ed174..a3c1ac8e 100644 --- a/app/src/main/res/layout/bottom_sheet__inventario_row_actions_view.xml +++ b/app/src/main/res/layout/bottom_sheet__inventario_row_actions_view.xml @@ -48,7 +48,7 @@ diff --git a/app/src/main/res/layout/bottom_sheet__item_edit_view.xml b/app/src/main/res/layout/bottom_sheet__item_edit_view.xml index c77bfb53..d231d37f 100644 --- a/app/src/main/res/layout/bottom_sheet__item_edit_view.xml +++ b/app/src/main/res/layout/bottom_sheet__item_edit_view.xml @@ -58,7 +58,7 @@ diff --git a/app/src/main/res/layout/bottom_sheet__mtb_colr_edit.xml b/app/src/main/res/layout/bottom_sheet__mtb_colr_edit.xml index da29f62c..b68e03ca 100644 --- a/app/src/main/res/layout/bottom_sheet__mtb_colr_edit.xml +++ b/app/src/main/res/layout/bottom_sheet__mtb_colr_edit.xml @@ -55,7 +55,7 @@ diff --git a/app/src/main/res/layout/bottom_sheet_fragment__lu_content.xml b/app/src/main/res/layout/bottom_sheet_fragment__lu_content.xml index 77dcc4cb..343bca25 100644 --- a/app/src/main/res/layout/bottom_sheet_fragment__lu_content.xml +++ b/app/src/main/res/layout/bottom_sheet_fragment__lu_content.xml @@ -478,7 +478,7 @@ app:layout_constraintGuide_percent="0.40" /> @@ -116,21 +119,20 @@ android:layout_height="wrap_content" android:layout_marginEnd="8dp" android:text="@string/orders_in_progress" - android:textColor="@android:color/black" - android:textSize="14sp" /> + style="@style/TextAppearance.Material3.BodyMedium"/> + + android:layout_marginTop="16dp" + android:paddingHorizontal="16dp" + android:paddingVertical="16dp" + android:gravity="center_vertical"> - + android:src="@drawable/ic_baseline_person_add_24" + app:tint="?attr/colorOnSurface" + android:layout_marginEnd="16dp"/> - @@ -163,18 +169,21 @@ android:focusable="true" android:onClick="@{()->view.onPlayClicked()}" android:orientation="horizontal" - android:padding="16dp"> + android:paddingHorizontal="16dp" + android:paddingVertical="16dp" + android:gravity="center_vertical"> + android:src="@drawable/ic_baseline_play_arrow_24" + app:tint="?attr/colorOnSurface" + android:layout_marginEnd="16dp" /> @@ -187,18 +196,21 @@ android:focusable="true" android:onClick="@{()->view.onStopClicked()}" android:orientation="horizontal" - android:padding="16dp"> + android:paddingHorizontal="16dp" + android:paddingVertical="16dp" + android:gravity="center_vertical"> + android:src="@drawable/ic_baseline_stop_24" + app:tint="?attr/colorOnSurface" + android:layout_marginEnd="16dp" /> @@ -211,18 +223,21 @@ android:focusable="true" android:onClick="@{()->view.onRecoverClicked()}" android:orientation="horizontal" - android:padding="16dp"> + android:paddingHorizontal="16dp" + android:paddingVertical="16dp" + android:gravity="center_vertical"> + android:src="@drawable/ic_black_download" + app:tint="?attr/colorOnSurface" + android:layout_marginEnd="16dp" /> diff --git a/app/src/main/res/layout/dialog_ask_cliente__dropdown_item_destinatario.xml b/app/src/main/res/layout/dialog_ask_cliente__dropdown_item_destinatario.xml index ac5fabc5..2c8859d0 100644 --- a/app/src/main/res/layout/dialog_ask_cliente__dropdown_item_destinatario.xml +++ b/app/src/main/res/layout/dialog_ask_cliente__dropdown_item_destinatario.xml @@ -22,7 +22,7 @@ @@ -100,7 +100,7 @@ android:text="@{`Lotto: ` + mtbColr.getPartitaMag()}" android:textSize="14sp" android:visibility="@{UtilityString.isNullOrEmpty(mtbColr.getPartitaMag()) ? View.GONE : View.VISIBLE}" - style="@style/AppTheme.NewMaterial.Text.Small" + style="@style/TextAppearance.Material3.BodyMedium" tools:text="Lotto: ABCDE" /> diff --git a/app/src/main/res/layout/dialog_choose_arts_from_mtb_aart_list__item_model.xml b/app/src/main/res/layout/dialog_choose_arts_from_mtb_aart_list__item_model.xml index df2d8991..a3149341 100644 --- a/app/src/main/res/layout/dialog_choose_arts_from_mtb_aart_list__item_model.xml +++ b/app/src/main/res/layout/dialog_choose_arts_from_mtb_aart_list__item_model.xml @@ -60,7 +60,7 @@ + android:orientation="vertical" + android:background="?attr/colorSurface"> + android:minHeight="?attr/actionBarSize"> @@ -103,7 +102,7 @@ tools:text="DIACOD" /> + android:text="@string/total_ordered" /> @@ -353,7 +345,7 @@ @@ -974,7 +965,7 @@ android:weightSum="11">