From c16f5c17475f3ab2d9af8b4d88ffc713904de8ae Mon Sep 17 00:00:00 2001 From: GiuseppeS Date: Wed, 1 Oct 2025 12:50:02 +0200 Subject: [PATCH 1/7] Aggiornato style di alcune textbox --- .../layout-land-hdpi/dialog_input_lu_prod.xml | 2 +- .../dialog_input_quantity_v2.xml | 34 ++++----- ...agment_prod_rientro_merce_order_detail.xml | 70 +++++++++---------- ...ne_bolla_picking_main_list__group_item.xml | 16 ++--- .../accettazione_main_list_group_clienti.xml | 4 +- .../accettazione_main_list_group_model.xml | 2 +- ...e_ordine_inevaso_main_list__group_item.xml | 14 ++-- .../res/layout/activity_contenuto_bancale.xml | 18 ++--- app/src/main/res/layout/activity_main.xml | 2 - ...activity_picking_inventario__list_item.xml | 6 +- .../main/res/layout/activity_picking_resi.xml | 2 +- .../layout/activity_prod_dettaglio_linea.xml | 2 +- .../activity_pv_ordine_acquisto_edit.xml | 12 ++-- .../main/res/layout/activity_spedizione.xml | 2 +- app/src/main/res/layout/activity_splash.xml | 4 +- .../bottom_sheet__inventario_actions_view.xml | 10 +-- ...tom_sheet__inventario_row_actions_view.xml | 14 ++-- .../layout/bottom_sheet__item_edit_view.xml | 14 ++-- .../layout/bottom_sheet__mtb_colr_edit.xml | 14 ++-- .../bottom_sheet_fragment__lu_content.xml | 30 ++++---- ..._sheet_fragment__lu_content__list_item.xml | 10 +-- ...sk_cliente__dropdown_item_destinatario.xml | 2 +- .../dialog_basket_lu__mtb_colr_model.xml | 4 +- ...se_arts_from_mtb_aart_list__item_model.xml | 2 +- ...se_arts_from_mtb_colr_list__item_model.xml | 2 +- .../layout/dialog_info_giacenza_list_item.xml | 4 +- ...alog_info_giacenza_situazione_articolo.xml | 16 ++--- ...ituazione_articolo_available_list_item.xml | 8 +-- .../main/res/layout/dialog_input_lu_prod.xml | 2 +- .../res/layout/dialog_input_quantity_v2.xml | 34 ++++----- .../res/layout/dialog_pv_edit_articolo.xml | 16 ++--- ...atico_ul_done__not_completed_list_item.xml | 6 +- ...dropdown_simple_item_w_subtitle_bottom.xml | 2 +- ..._choose_ords_lav_from_list__item_model.xml | 8 +-- app/src/main/res/layout/fragment_main.xml | 2 +- ...n_accettazione_bolla__list_group_model.xml | 8 +-- .../fragment_main_menu_group_layout.xml | 7 +- .../layout/fragment_main_menu_item_layout.xml | 3 +- ...t_main_ordini_uscita__list_group_model.xml | 8 +-- ...prod_fabbisogno_linee_list_single_item.xml | 8 +-- ..._ordine_produzione__list_group_clienti.xml | 4 +- ...od_ordine_produzione__list_group_model.xml | 2 +- ...agment_prod_rientro_merce_order_detail.xml | 38 +++++----- ...erce_order_detail__mtb_colt_item_model.xml | 10 +-- ...tro_merce_order_list__list_group_model.xml | 8 +-- .../fragment_prod_versamento_materiale.xml | 2 +- ...nt_prod_versamento_materiale_in_buffer.xml | 12 ++-- .../main/res/layout/layout_filter_agente.xml | 2 +- .../layout_filter_agente__list_item.xml | 2 +- .../res/layout/layout_filter_automezzo.xml | 2 +- .../layout_filter_automezzo__list_item.xml | 2 +- .../main/res/layout/layout_filter_cliente.xml | 2 +- .../layout_filter_cliente__list_item.xml | 2 +- .../main/res/layout/layout_filter_cod_art.xml | 2 +- .../layout_filter_cod_art__list_item.xml | 2 +- .../res/layout/layout_filter_commessa.xml | 2 +- .../layout_filter_commessa__list_item.xml | 6 +- .../res/layout/layout_filter_deposito.xml | 2 +- .../layout_filter_deposito__list_item.xml | 6 +- .../main/res/layout/layout_filter_descr.xml | 2 +- .../layout/layout_filter_descr__list_item.xml | 2 +- .../res/layout/layout_filter_gruppo_merc.xml | 2 +- .../layout/layout_filter_numero_ordine.xml | 2 +- .../main/res/layout/layout_filter_paese.xml | 2 +- .../layout/layout_filter_paese__list_item.xml | 2 +- .../res/layout/layout_filter_posizione.xml | 2 +- .../layout_filter_posizione__list_item.xml | 4 +- .../res/layout/layout_filter_term_cons.xml | 2 +- .../layout_filter_term_cons__list_item.xml | 2 +- .../main/res/layout/layout_filter_vettore.xml | 2 +- .../layout_filter_vettore__list_item.xml | 2 +- .../main/res/layout/layout_filter_viaggio.xml | 2 +- .../layout_filter_viaggio__list_item.xml | 2 +- .../lista_contenuto_bancale_list_model.xml | 24 +++---- .../lista_giacenze_per_posizione_model.xml | 22 +++--- .../lista_picking_libero_list_model.xml | 10 +-- .../layout/lista_rettifica_giacenze_model.xml | 4 +- ...rifica_giacenze_picked_item_list_model.xml | 10 +-- .../layout/picking_resi_main_list__item.xml | 6 +- ...od_riposizionamento_da_prod__list_item.xml | 12 ++-- .../spedizione_main_list__group_item.xml | 14 ++-- app/src/main/res/values/colors.xml | 4 +- app/src/main/res/values/styles.xml | 4 -- 83 files changed, 335 insertions(+), 337 deletions(-) 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)" /> @@ -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..9883adae 100644 --- a/app/src/main/res/layout/activity_prod_dettaglio_linea.xml +++ b/app/src/main/res/layout/activity_prod_dettaglio_linea.xml @@ -114,7 +114,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" app:text="@{view.isStarted.get() ? R.string.in_progress : view.isPaused.get() ? R.string.stand_by : R.string.stopped}" - android:textAppearance="@style/AppTheme.NewMaterial.Text.Small" + android:textAppearance="@style/TextAppearance.Material3.BodyMedium" app:textColor="@{ContextCompat.getColor(context, view.isStarted.get() ? R.color.green_600 : view.isPaused.get() ? R.color.orange_600 : R.color.red_600)}" tools:textColor="@color/green_600" android:textStyle="bold" 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/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" /> @@ -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 @@ + style="@style/TextAppearance.Material3.BodyMedium" /> @@ -78,7 +78,7 @@ tools:text="Cod Jcom" android:layout_alignParentEnd="true" android:layout_below="@id/descrizione" - style="@style/AppTheme.NewMaterial.Text.Small" /> + style="@style/TextAppearance.Material3.BodyMedium" /> diff --git a/app/src/main/res/layout/fragment_main_menu_group_layout.xml b/app/src/main/res/layout/fragment_main_menu_group_layout.xml index c553e1d7..91f00078 100644 --- a/app/src/main/res/layout/fragment_main_menu_group_layout.xml +++ b/app/src/main/res/layout/fragment_main_menu_group_layout.xml @@ -17,7 +17,10 @@ diff --git a/app/src/main/res/layout/fragment_main_menu_item_layout.xml b/app/src/main/res/layout/fragment_main_menu_item_layout.xml index d6cf393a..e7fb76ee 100644 --- a/app/src/main/res/layout/fragment_main_menu_item_layout.xml +++ b/app/src/main/res/layout/fragment_main_menu_item_layout.xml @@ -32,10 +32,9 @@ android:layout_marginTop="16dp" android:text="@string/accettazione_ordine_title_fragment" android:textAllCaps="true" - android:textColor="@color/gray_700" android:gravity="center_horizontal" android:textStyle="bold" - style="@style/AppTheme.NewMaterial.Text.Small"/> + style="@style/TextAppearance.Material3.LabelMedium"/> diff --git a/app/src/main/res/layout/fragment_main_ordini_uscita__list_group_model.xml b/app/src/main/res/layout/fragment_main_ordini_uscita__list_group_model.xml index e68142ea..be1ddb89 100644 --- a/app/src/main/res/layout/fragment_main_ordini_uscita__list_group_model.xml +++ b/app/src/main/res/layout/fragment_main_ordini_uscita__list_group_model.xml @@ -47,7 +47,7 @@ android:ellipsize="end" android:maxLines="1" android:textColor="#000" - style="@style/AppTheme.NewMaterial.Text.Small" + style="@style/TextAppearance.Material3.BodyMedium" app:layout_constraintStart_toEndOf="@id/checkbox" app:layout_constraintEnd_toStartOf="@id/right_descrizione" app:layout_constraintTop_toTopOf="parent" @@ -62,7 +62,7 @@ android:maxLines="1" android:ellipsize="end" tools:text="TextView" - style="@style/AppTheme.NewMaterial.Text.Small" + style="@style/TextAppearance.Material3.BodyMedium" app:layout_constraintStart_toStartOf="@id/descrizione" app:layout_constraintEnd_toStartOf="@id/right_sub_descrizione" app:layout_constraintTop_toBottomOf="@+id/descrizione" @@ -75,7 +75,7 @@ android:layout_height="wrap_content" tools:text="Cons 07 nov 2018" android:textColor="#000" - style="@style/AppTheme.NewMaterial.Text.Small" + style="@style/TextAppearance.Material3.BodyMedium" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintTop_toTopOf="parent" app:layout_constraintBaseline_toBaselineOf="@id/descrizione" /> @@ -86,7 +86,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" tools:text="Cod Jcom" - style="@style/AppTheme.NewMaterial.Text.Small" + style="@style/TextAppearance.Material3.BodyMedium" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintTop_toBottomOf="@id/right_descrizione" app:layout_constraintBaseline_toBaselineOf="@id/sub_descrizione" /> diff --git a/app/src/main/res/layout/fragment_prod_fabbisogno_linee_list_single_item.xml b/app/src/main/res/layout/fragment_prod_fabbisogno_linee_list_single_item.xml index ca819b22..2cd31553 100644 --- a/app/src/main/res/layout/fragment_prod_fabbisogno_linee_list_single_item.xml +++ b/app/src/main/res/layout/fragment_prod_fabbisogno_linee_list_single_item.xml @@ -70,7 +70,7 @@ - + @@ -104,7 +104,7 @@ - + diff --git a/app/src/main/res/layout/fragment_prod_ordine_produzione__list_group_clienti.xml b/app/src/main/res/layout/fragment_prod_ordine_produzione__list_group_clienti.xml index 5db2422d..f432a144 100644 --- a/app/src/main/res/layout/fragment_prod_ordine_produzione__list_group_clienti.xml +++ b/app/src/main/res/layout/fragment_prod_ordine_produzione__list_group_clienti.xml @@ -12,7 +12,7 @@ android:maxLines="1" android:ellipsize="end" android:paddingEnd="6dp" - style="@style/AppTheme.NewMaterial.Text.Small" + style="@style/TextAppearance.Material3.BodyMedium" tools:text="TextView" /> \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_prod_ordine_produzione__list_group_model.xml b/app/src/main/res/layout/fragment_prod_ordine_produzione__list_group_model.xml index f406fde2..9778ce3c 100644 --- a/app/src/main/res/layout/fragment_prod_ordine_produzione__list_group_model.xml +++ b/app/src/main/res/layout/fragment_prod_ordine_produzione__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"/> @@ -271,7 +271,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" /> @@ -356,7 +356,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" /> @@ -365,7 +365,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" /> @@ -414,7 +414,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" /> @@ -423,7 +423,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" /> @@ -473,7 +473,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" /> @@ -483,7 +483,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" /> @@ -541,7 +541,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" /> @@ -550,7 +550,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" /> @@ -600,7 +600,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" /> @@ -610,7 +610,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" /> @@ -657,7 +657,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" /> @@ -667,7 +667,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" /> @@ -675,14 +675,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" /> @@ -691,7 +691,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" /> @@ -757,7 +757,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/fragment_prod_rientro_merce_order_detail__mtb_colt_item_model.xml b/app/src/main/res/layout/fragment_prod_rientro_merce_order_detail__mtb_colt_item_model.xml index c905122d..867a2945 100644 --- a/app/src/main/res/layout/fragment_prod_rientro_merce_order_detail__mtb_colt_item_model.xml +++ b/app/src/main/res/layout/fragment_prod_rientro_merce_order_detail__mtb_colt_item_model.xml @@ -44,7 +44,7 @@ android:paddingEnd="12dp"> @@ -142,7 +142,7 @@ android:layout_alignParentStart="true" android:layout_toStartOf="@id/peso_netto_collo" android:text="@{`Linea: ` + mtbColt.codJfas}" - android:textAppearance="@style/AppTheme.NewMaterial.Text.Small" + android:textAppearance="@style/TextAppearance.Material3.BodyMedium" android:visibility="@{UtilityString.isNullOrEmpty(mtbColt.codJfas) ? View.INVISIBLE : View.VISIBLE}" tools:text="Linea: L3" /> @@ -153,7 +153,7 @@ android:layout_alignParentEnd="true" android:layout_centerVertical="true" android:text="@{UtilityNumber.decimalToString(mtbColt.pesoNettoKg, 0) + `KG netto`}" - android:textAppearance="@style/AppTheme.NewMaterial.Text.Small" + android:textAppearance="@style/TextAppearance.Material3.BodyMedium" android:textColor="@android:color/black" tools:text="628KG netto" /> diff --git a/app/src/main/res/layout/fragment_prod_rientro_merce_order_list__list_group_model.xml b/app/src/main/res/layout/fragment_prod_rientro_merce_order_list__list_group_model.xml index e2de01df..a67f3a23 100644 --- a/app/src/main/res/layout/fragment_prod_rientro_merce_order_list__list_group_model.xml +++ b/app/src/main/res/layout/fragment_prod_rientro_merce_order_list__list_group_model.xml @@ -48,7 +48,7 @@ @@ -70,7 +70,7 @@ android:text="@{mtbColr.getDescrizione()}" android:textColor="@android:color/black" android:textSize="16sp" - style="@style/AppTheme.NewMaterial.Text.Small" + style="@style/TextAppearance.Material3.BodyMedium" tools:text="Descrizione lunga articolo" /> @@ -80,7 +80,7 @@ android:text="@{`Lotto: ` + mtbColr.getPartitaMag()}" android:textSize="14sp" android:visibility="@{UtilityString.isNullOrEmpty(mtbColr.getPartitaMag()) ? View.INVISIBLE : View.VISIBLE}" - style="@style/AppTheme.NewMaterial.Text.Small" + style="@style/TextAppearance.Material3.BodyMedium" tools:text="Lotto: ABCDE" /> @@ -111,7 +111,7 @@ android:textColor="@android:color/white" android:textStyle="bold" android:textAllCaps="true" - style="@style/AppTheme.NewMaterial.Text.Small" + style="@style/TextAppearance.Material3.BodyMedium" tools:text="280.45\nCONF" /> diff --git a/app/src/main/res/layout/lista_rettifica_giacenze_model.xml b/app/src/main/res/layout/lista_rettifica_giacenze_model.xml index 8aa96ad4..ab8ce7e9 100644 --- a/app/src/main/res/layout/lista_rettifica_giacenze_model.xml +++ b/app/src/main/res/layout/lista_rettifica_giacenze_model.xml @@ -74,7 +74,7 @@ android:background="@drawable/badge_round_corner" android:backgroundTint="@color/orange_600" android:textColor="@android:color/white" - style="@style/AppTheme.NewMaterial.Text.Small" + style="@style/TextAppearance.Material3.BodyMedium" tools:text="PESO KG" /> @@ -98,7 +98,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/lista_verifica_giacenze_picked_item_list_model.xml b/app/src/main/res/layout/lista_verifica_giacenze_picked_item_list_model.xml index 022b51eb..c388a94b 100644 --- a/app/src/main/res/layout/lista_verifica_giacenze_picked_item_list_model.xml +++ b/app/src/main/res/layout/lista_verifica_giacenze_picked_item_list_model.xml @@ -25,7 +25,7 @@ - + @@ -55,7 +55,7 @@ + style="@style/TextAppearance.Material3.BodyMedium"/> @@ -89,7 +89,7 @@ android:layout_marginTop="4dp" android:textSize="16sp" android:textColor="@android:color/black" - style="@style/AppTheme.NewMaterial.Text.Small" + style="@style/TextAppearance.Material3.BodyMedium" tools:text="DESCRIZIONE"/> diff --git a/app/src/main/res/layout/prod_riposizionamento_da_prod__list_item.xml b/app/src/main/res/layout/prod_riposizionamento_da_prod__list_item.xml index dd474c2f..73865e24 100644 --- a/app/src/main/res/layout/prod_riposizionamento_da_prod__list_item.xml +++ b/app/src/main/res/layout/prod_riposizionamento_da_prod__list_item.xml @@ -47,7 +47,7 @@ + style="@style/TextAppearance.Material3.BodyMedium" /> @@ -111,7 +111,7 @@ android:layout_marginTop="4dp" android:textSize="16sp" android:textColor="@android:color/black" - style="@style/AppTheme.NewMaterial.Text.Small" + style="@style/TextAppearance.Material3.BodyMedium" tools:text="DESCRIZIONE" /> @@ -139,7 +139,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:textSize="14sp" - style="@style/AppTheme.NewMaterial.Text.Small" + style="@style/TextAppearance.Material3.BodyMedium" tools:text="SUB DESCRIZIONE" /> @@ -167,7 +167,7 @@ android:layout_marginStart="8dp" android:textStyle="bold" android:layout_alignParentEnd="true" - style="@style/AppTheme.NewMaterial.Text.Small" /> + style="@style/TextAppearance.Material3.BodyMedium" /> diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index c8ff0996..3b7bb0a5 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -1,7 +1,7 @@ #4c4dcf - @color/colorPrimary + #1A73E8 #FFFFFF #E1DFFF #08006C @@ -30,7 +30,7 @@ #000000 #4C4DCF #4C4DCF - #C1C1FF + #1A73E8 #160AA2 #3231B6 #E1DFFF diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index e0c1d050..021c4dba 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -18,10 +18,6 @@ @drawable/material_text_color 12sp - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - From ba1118fdd8fac5dd02c5991b1c94b1326f771b2b Mon Sep 17 00:00:00 2001 From: GiuseppeS Date: Wed, 1 Oct 2025 17:45:26 +0200 Subject: [PATCH 4/7] Fix decodifica barcode in recupero materiale --- .../ProdRecuperoMaterialeViewModel.java | 40 ++++++++++++------- 1 file changed, 26 insertions(+), 14 deletions(-) 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); From 03c02d662593e07537bdaa1e4f92aa30fa54a2cc Mon Sep 17 00:00:00 2001 From: GiuseppeS Date: Wed, 1 Oct 2025 18:22:10 +0200 Subject: [PATCH 5/7] Migliorie dark mode --- .../dialog_input_quantity_v2.xml | 14 +------ .../res/layout/dialog_input_quantity_v2.xml | 37 +++++++------------ .../fragment_prod_recupero_materiale.xml | 5 +-- .../prod_recupero_materiale_list_item.xml | 8 ++-- .../res/values/text_input_layout_style.xml | 9 ++--- 5 files changed, 27 insertions(+), 46 deletions(-) diff --git a/app/src/main/res/layout-land-hdpi/dialog_input_quantity_v2.xml b/app/src/main/res/layout-land-hdpi/dialog_input_quantity_v2.xml index 6afa0a44..e4742f39 100644 --- a/app/src/main/res/layout-land-hdpi/dialog_input_quantity_v2.xml +++ b/app/src/main/res/layout-land-hdpi/dialog_input_quantity_v2.xml @@ -31,7 +31,6 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_gravity="center_horizontal" - android:background="@android:color/white" android:orientation="vertical" app:cardCornerRadius="12dp" app:cardElevation="0dp"> @@ -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"> @@ -113,8 +111,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_toStartOf="@id/qta_ord_panel" - android:text="@string/total_ordered" - android:textColor="@android:color/black" /> + 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" /> @@ -912,7 +903,6 @@ android:layout_height="wrap_content" android:hint="@string/LU_weight" android:inputType="number" - android:textColor="@{ContextCompat.getColor(context, view.enabledQtaCnf ? android.R.color.black : R.color.gray_400)}" android:visibility="@{view.enabledNotes ? View.VISIBLE : View.GONE }" app:binding="@{view.currentPesoLordo}" /> diff --git a/app/src/main/res/layout/dialog_input_quantity_v2.xml b/app/src/main/res/layout/dialog_input_quantity_v2.xml index c6ef1391..38955285 100644 --- a/app/src/main/res/layout/dialog_input_quantity_v2.xml +++ b/app/src/main/res/layout/dialog_input_quantity_v2.xml @@ -35,16 +35,15 @@ + android:orientation="vertical" + android:background="?attr/colorSurface"> + android:minHeight="?attr/actionBarSize"> @@ -120,12 +119,11 @@ + android:text="@string/total_ordered" /> @@ -929,7 +921,6 @@ android:layout_height="wrap_content" android:hint="@string/LU_weight" android:inputType="number" - android:textColor="@{ContextCompat.getColor(context, view.enabledQtaCnf ? android.R.color.black : R.color.gray_400)}" app:binding="@{view.currentPesoLordo}" /> @@ -974,7 +965,7 @@ android:weightSum="11">