From 6c8fd2518e3d82e41362202592b6ccd3805ea966 Mon Sep 17 00:00:00 2001 From: GiuseppeS Date: Thu, 3 Oct 2024 16:43:10 +0200 Subject: [PATCH] Stili --- .idea/runConfigurations.xml | 13 + ...agment_prod_rientro_merce_order_detail.xml | 28 +- ...agment_prod_rientro_merce_order_detail.xml | 430 +----------------- app/src/main/res/values-it/strings.xml | 1 + app/src/main/res/values/buttons_style.xml | 1 + app/src/main/res/values/strings.xml | 1 + 6 files changed, 49 insertions(+), 425 deletions(-) create mode 100644 .idea/runConfigurations.xml diff --git a/.idea/runConfigurations.xml b/.idea/runConfigurations.xml new file mode 100644 index 00000000..931b96c3 --- /dev/null +++ b/.idea/runConfigurations.xml @@ -0,0 +1,13 @@ + + + + + + \ No newline at end of file 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 a67fc559..a4ba186a 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 @@ -142,6 +142,7 @@ tools:text="Ordine #218" /> + android:orientation="vertical" + android:visibility="@{view.isOrderColli ? View.GONE : View.VISIBLE}"> + android:textStyle="bold" + tools:text="KG" /> + android:textColor="@android:color/black" + tools:text="KG" /> @@ -1141,14 +1143,22 @@ android:padding="8dp"> + + app:singleClick="@{() -> viewModel.addUL()}" /> + + diff --git a/app/src/main/res/layout/fragment_prod_rientro_merce_order_detail.xml b/app/src/main/res/layout/fragment_prod_rientro_merce_order_detail.xml index 339b5918..e0977529 100644 --- a/app/src/main/res/layout/fragment_prod_rientro_merce_order_detail.xml +++ b/app/src/main/res/layout/fragment_prod_rientro_merce_order_detail.xml @@ -20,6 +20,10 @@ + + - - + app:singleClick="@{() -> viewModel.addUL()}" /> + + diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index c53e1467..84b76379 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -381,6 +381,7 @@ Seleziona / Crea ordine Aggiungi Aggiungi pedana + Aggiungi unità Chiudi Chiudi ed esporta ordine Chiudi ordine diff --git a/app/src/main/res/values/buttons_style.xml b/app/src/main/res/values/buttons_style.xml index c9e70ff9..f6ad59c2 100644 --- a/app/src/main/res/values/buttons_style.xml +++ b/app/src/main/res/values/buttons_style.xml @@ -9,6 +9,7 @@ @color/colorPrimary + @color/colorPrimary