Implementata gestione degli imballi in accettazione

This commit is contained in:
2024-04-19 17:32:32 +02:00
parent 53fe1db488
commit 925cb6ae07
106 changed files with 1551 additions and 922 deletions

View File

@@ -0,0 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android" >
<solid android:color="@android:color/white" />
<corners android:radius="500dp" />
</shape>

View File

@@ -0,0 +1,10 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24"
android:viewportHeight="24"
android:tint="?attr/colorControlNormal">
<path
android:pathData="M19,0L19,3L16,3L16,5L19,5L19,8L21,8L21,5L24,5L24,3L21,3L21,0L19,0zM5.75,3C5.271,3 4.86,3.34 4.77,3.811L3.02,12.811C3.007,12.873 3,12.936 3,13L3,19C3,20.103 3.897,21 5,21L19,21C20.103,21 21,20.103 21,19L21,13C21,12.936 20.993,12.873 20.98,12.811L20.436,10L18.398,10L18.98,13L16,13C15.57,13 15.188,13.275 15.051,13.684L14.455,15.473C14.35,15.787 14.055,16 13.723,16L10.277,16C9.945,16 9.65,15.788 9.545,15.473L8.947,13.684C8.811,13.276 8.43,13 8,13L5.02,13L6.574,5L14,5L14,3L5.75,3z"
android:fillColor="@android:color/white"/>
</vector>

View File

@@ -25,7 +25,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="@drawable/badge_round_corner"
android:backgroundTint="@color/colorPrimary"
android:backgroundTint="?colorPrimary"
android:paddingLeft="6dp"
android:paddingTop="2dp"
android:paddingRight="6dp"

View File

@@ -6,25 +6,23 @@
name="selected"
type="it.integry.integrywmsnative.core.di.BindableBoolean" />
</data>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:padding="8dp">
android:paddingStart="2dp"
android:paddingEnd="4dp"
android:paddingVertical="2dp">
<androidx.appcompat.widget.AppCompatCheckBox
<CheckBox
android:id="@+id/accettazione_main_list_group_item_container_checkBox"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:clickable="false"
android:enabled="false"
tools:layout_editor_absoluteX="0dp"
tools:layout_editor_absoluteY="1dp"
android:focusable="false"
app:checked="@{selected}" />
<RelativeLayout

View File

@@ -1,63 +1,28 @@
<layout xmlns:tools="http://schemas.android.com/tools">
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:card_view="http://schemas.android.com/apk/res-auto"
<androidx.appcompat.widget.LinearLayoutCompat xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content">
android:layout_height="wrap_content"
android:paddingStart="2dp"
android:background="@color/mainGreen">
<!--<androidx.cardview.widget.CardView-->
<!--xmlns:card_view="http://schemas.android.com/apk/res-auto"-->
<!--android:id="@+id/card_view"-->
<!--android:layout_gravity="center"-->
<!--android:layout_width="match_parent"-->
<!--android:layout_height="wrap_content"-->
<!--card_view:cardUseCompatPadding="true"-->
<!--card_view:cardCornerRadius="4dp"-->
<!--card_view:cardElevation="4dp">-->
<CheckBox
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:checked="true"
android:enabled="false" />
<!--<LinearLayout-->
<!--android:layout_width="match_parent"-->
<!--android:layout_height="match_parent"-->
<!--android:orientation="vertical">-->
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/mainGreen"
android:padding="8dp">
<CheckBox
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:checked="true"
android:enabled="false" />
<TextView
android:id="@+id/accettazione_main_list_group_header"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="@android:color/white"
android:textStyle="bold"
style="@style/AppTheme.NewMaterial.Text.Medium"
tools:text="NOME GRUPPO"/>
</LinearLayout>
<TextView
android:id="@+id/accettazione_main_list_group_header"
style="@style/AppTheme.NewMaterial.Text.Medium"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="@android:color/white"
android:textStyle="bold"
tools:text="NOME GRUPPO" />
<!--<LinearLayout-->
<!--android:layout_width="match_parent"-->
<!--android:layout_height="wrap_content"-->
<!--android:orientation="vertical"-->
<!--android:id="@+id/accettazione_main_list_group_item_container">-->
<!--</LinearLayout>-->
<!--</LinearLayout>-->
<!--</androidx.cardview.widget.CardView>-->
</LinearLayout>
</androidx.appcompat.widget.LinearLayoutCompat>
</layout>

View File

@@ -25,7 +25,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="@drawable/badge_round_corner"
android:backgroundTint="@color/colorPrimary"
android:backgroundTint="?colorPrimary"
android:paddingLeft="6dp"
android:paddingTop="2dp"
android:paddingRight="6dp"

View File

@@ -81,7 +81,7 @@
<androidx.appcompat.widget.LinearLayoutCompat
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/colorPrimary"
android:background="?colorPrimary"
android:orientation="horizontal"
android:padding="16dp">

View File

@@ -34,7 +34,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@{item.codMart}"
android:textColor="@color/colorPrimary"
android:textColor="?colorPrimary"
android:textSize="14sp"
android:textStyle="bold"
tools:text="COD MART" />
@@ -76,7 +76,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="@drawable/badge_round_corner"
android:backgroundTint="@color/colorPrimary"
android:backgroundTint="?colorPrimary"
android:gravity="center"
android:paddingLeft="6dp"
android:paddingTop="2dp"

View File

@@ -67,7 +67,7 @@
android:id="@+id/profile_root_container"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/colorPrimary"
android:background="?colorPrimary"
android:orientation="horizontal"
android:padding="16dp">

View File

@@ -114,7 +114,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="@drawable/badge_round_corner"
android:backgroundTint="@color/colorPrimary"
android:backgroundTint="?colorPrimary"
android:gravity="center"
android:paddingLeft="6dp"
android:paddingTop="2dp"

View File

@@ -5,7 +5,7 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/colorPrimary"
android:background="?colorPrimary"
tools:context=".SplashActivity">
<androidx.appcompat.widget.AppCompatImageView

View File

@@ -55,7 +55,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@{mtbColr.codMart}"
android:textColor="@color/colorPrimary"
android:textColor="?colorPrimary"
android:textSize="14sp"
android:textStyle="bold"
tools:text="COD MART" />
@@ -119,7 +119,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="@drawable/badge_round_corner"
android:backgroundTint="@color/colorPrimary"
android:backgroundTint="?colorPrimary"
android:gravity="center"
android:paddingLeft="6dp"
android:paddingTop="2dp"

View File

@@ -97,7 +97,7 @@
app:layout_constraintEnd_toStartOf="@id/center_buttons_guideline"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/input_commessa"
app:strokeColor="@color/colorPrimary" />
app:strokeColor="?colorPrimary" />
<com.google.android.material.button.MaterialButton

View File

@@ -79,7 +79,7 @@
app:layout_constraintEnd_toStartOf="@id/center_buttons_guideline"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/input_destinatario"
app:strokeColor="@color/colorPrimary" />
app:strokeColor="?colorPrimary" />
<com.google.android.material.button.MaterialButton

View File

@@ -162,7 +162,7 @@
android:layout_height="wrap_content"
style="@style/Button.PrimaryOutline"
app:icon="@drawable/ic_clear_24dp"
app:strokeColor="@color/colorPrimary"
app:strokeColor="?colorPrimary"
android:layout_marginEnd="8dp"
android:text="@string/abort"/>

View File

@@ -40,7 +40,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
style="@style/Button.PrimaryOutline"
app:strokeColor="@color/colorPrimary"
app:strokeColor="?colorPrimary"
android:layout_marginEnd="8dp"
android:text="@string/abort"/>

View File

@@ -81,7 +81,7 @@
app:layout_constraintEnd_toStartOf="@id/center_buttons_guideline"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:strokeColor="@color/colorPrimary" />
app:strokeColor="?colorPrimary" />
<com.google.android.material.button.MaterialButton

View File

@@ -3,6 +3,7 @@
<layout xmlns:app="http://schemas.android.com/apk/res-auto">
<data>
<variable
name="view"
type="it.integry.integrywmsnative.view.dialogs.ask_should_versamento_automatico_ul.DialogAskShouldVersamentoAutomaticoULView" />
@@ -13,101 +14,41 @@
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:orientation="vertical"
app:cardCornerRadius="12dp"
app:cardCornerRadius="16dp"
app:cardElevation="0dp">
<androidx.appcompat.widget.LinearLayoutCompat
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical">
android:orientation="vertical"
android:paddingHorizontal="16dp"
android:paddingVertical="16dp">
<RelativeLayout
<androidx.appcompat.widget.AppCompatImageView
style="@style/MaterialAlertDialog.Material3.Title.Icon.CenterStacked"
android:layout_width="36dp"
android:layout_height="36dp"
android:src="@drawable/ic_error_white_24dp"
app:tint="?colorPrimary" />
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/title_text"
style="@style/MaterialAlertDialog.Material3.Title.Text.CenterStacked"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/light_blue_300"
android:gravity="center_horizontal">
android:layout_marginBottom="16dp"
android:gravity="center_horizontal"
android:text="@string/versamento_automatico" />
<androidx.appcompat.widget.AppCompatImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_margin="24dp"
android:src="@drawable/ic_error_white_24dp" />
</RelativeLayout>
<androidx.appcompat.widget.LinearLayoutCompat
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/description_text"
style="@style/TextAppearance.Material3.BodyMedium"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:paddingLeft="24dp"
android:paddingTop="24dp"
android:paddingRight="24dp">
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/title_text"
style="@style/TextViewMaterial.Dialog.HeadlineText"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center_horizontal"
android:text="@string/versamento_automatico" />
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/description_text"
style="@style/TextViewMaterial"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="16dp"
android:layout_marginBottom="16dp"
android:gravity="left"
android:text="@string/ask_should_versamento_automatico" />
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="8dp">
<androidx.constraintlayout.widget.Guideline
android:id="@+id/center_buttons_guideline"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="vertical"
app:layout_constraintGuide_percent="0.5" />
<com.google.android.material.button.MaterialButton
android:id="@+id/button_abort"
style="@style/Button.PrimaryOutline"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginLeft="8dp"
android:layout_marginRight="8dp"
android:text="@string/no"
app:layout_constraintEnd_toStartOf="@id/center_buttons_guideline"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:strokeColor="@color/colorPrimary"
android:onClick="@{() -> view.abort()}" />
<com.google.android.material.button.MaterialButton
android:id="@+id/button_confirm"
style="@style/Button.PrimaryFull"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginLeft="8dp"
android:layout_marginRight="8dp"
android:text="@string/yes"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="@id/center_buttons_guideline"
app:layout_constraintTop_toTopOf="parent"
android:onClick="@{() -> view.confirm()}"/>
</androidx.constraintlayout.widget.ConstraintLayout>
</androidx.appcompat.widget.LinearLayoutCompat>
android:gravity="center_horizontal"
android:text="@string/ask_should_versamento_automatico" />
</androidx.appcompat.widget.LinearLayoutCompat>

View File

@@ -35,7 +35,7 @@
android:layout_alignParentStart="true"
android:layout_toStartOf="@id/already_inventariato"
android:text="@{item.codMart}"
android:textColor="@color/colorPrimary"
android:textColor="?colorPrimary"
android:textSize="14sp"
android:textStyle="bold"
android:layout_marginTop="8dp"

View File

@@ -191,7 +191,7 @@
<!-- app:layout_constraintEnd_toStartOf="@id/right_buttons_guideline"-->
<!-- app:layout_constraintStart_toStartOf="@id/left_buttons_guideline"-->
<!-- app:layout_constraintTop_toTopOf="parent"-->
<!-- app:strokeColor="@color/colorPrimary" />-->
<!-- app:strokeColor="?colorPrimary" />-->
<!-- <com.google.android.material.button.MaterialButton-->
@@ -236,7 +236,7 @@
<!-- app:layout_constraintEnd_toStartOf="@id/center_guideline2"-->
<!-- app:layout_constraintStart_toStartOf="parent"-->
<!-- app:layout_constraintTop_toTopOf="parent"-->
<!-- app:strokeColor="@color/colorPrimary" />-->
<!-- app:strokeColor="?colorPrimary" />-->
<!-- <com.google.android.material.button.MaterialButton-->

View File

@@ -41,7 +41,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@{mtbColr.codMart}"
android:textColor="@color/colorPrimary"
android:textColor="?colorPrimary"
android:textSize="14sp"
android:textStyle="bold"
style="@style/AppTheme.NewMaterial.Text"
@@ -121,7 +121,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="@drawable/badge_round_corner"
android:backgroundTint="@color/colorPrimary"
android:backgroundTint="?colorPrimary"
android:gravity="center"
android:paddingLeft="6dp"
android:paddingTop="2dp"

View File

@@ -39,7 +39,7 @@
android:layout_height="wrap_content"
android:layout_marginHorizontal="12dp"
android:background="@drawable/badge_round_corner"
android:backgroundTint="@color/colorPrimary"
android:backgroundTint="?colorPrimary"
android:layout_gravity="center"
android:paddingLeft="6dp"
android:paddingTop="2dp"

View File

@@ -116,7 +116,7 @@
app:layout_constraintEnd_toStartOf="@id/center_buttons_guideline"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:strokeColor="@color/colorPrimary" />
app:strokeColor="?colorPrimary" />
<com.google.android.material.button.MaterialButton

View File

@@ -35,7 +35,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@{item.codMart}"
android:textColor="@color/colorPrimary"
android:textColor="?colorPrimary"
android:textSize="14sp"
android:textStyle="bold"
tools:text="COD MART" />

View File

@@ -53,7 +53,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@{item.codMart}"
android:textColor="@color/colorPrimary"
android:textColor="?colorPrimary"
android:textSize="14sp"
android:textStyle="bold"
tools:text="COD MART" />
@@ -112,7 +112,7 @@
android:layout_marginStart="12dp"
android:gravity="center_horizontal"
android:background="@drawable/badge_round_corner"
android:backgroundTint="@color/colorPrimary"
android:backgroundTint="?colorPrimary"
android:visibility="@{item.qta != null ? View.VISIBLE : View.GONE}">
<androidx.appcompat.widget.AppCompatTextView

View File

@@ -58,7 +58,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@{item.mtbColr.mtbAart.getCodMart()}"
android:textColor="@color/colorPrimary"
android:textColor="?colorPrimary"
android:textSize="14sp"
android:textStyle="bold"
tools:text="COD MART" />
@@ -116,7 +116,7 @@
android:layout_marginStart="8dp"
android:padding="6dp"
android:background="@drawable/badge_round_corner"
android:backgroundTint="@color/colorPrimary"
android:backgroundTint="?colorPrimary"
android:gravity="center_horizontal"
android:orientation="vertical"
android:visibility="@{item.mtbColr.qtaCol != null ? View.VISIBLE : View.GONE}">
@@ -125,7 +125,7 @@
<androidx.appcompat.widget.AppCompatTextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:backgroundTint="@color/colorPrimary"
android:backgroundTint="?colorPrimary"
android:gravity="center"
android:text="@{UtilityNumber.decimalToString(item.mtbColr.qtaCol, 2)}"
android:textAllCaps="true"

View File

@@ -43,7 +43,7 @@
android:layout_height="wrap_content"
android:text="@{UtilityString.isNull(mtbPartitaMag.partitaMag, &quot;Nessun lotto&quot;)}"
style="@style/AppTheme.NewMaterial.Text.Medium"
android:textColor="@color/colorPrimary"
android:textColor="?colorPrimary"
android:textStyle="bold"
tools:text="PARTITA MAG" />

View File

@@ -53,7 +53,7 @@
android:layout_marginTop="8dp"
app:layout_constraintTop_toBottomOf="@id/title_text"
app:layout_constraintBottom_toTopOf="@id/level_number_layout"
android:visibility="@{viewModel.tipiCollo.empty ? View.GONE : View.VISIBLE}"
android:visibility="@{viewModel.tipiCollo == null || viewModel.tipiCollo.empty ? View.GONE : View.VISIBLE}"
android:hint="@string/lu_type">
<androidx.appcompat.widget.AppCompatAutoCompleteTextView

View File

@@ -147,7 +147,7 @@
android:layout_centerVertical="true"
android:layout_marginStart="8dp"
android:background="@drawable/badge_round_corner"
android:backgroundTint="@color/colorPrimary"
android:backgroundTint="?colorPrimary"
android:gravity="center_horizontal"
android:orientation="vertical"
android:padding="6dp"
@@ -158,7 +158,7 @@
style="@style/TextAppearance.AppCompat.Small"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:backgroundTint="@color/colorPrimary"
android:backgroundTint="?colorPrimary"
android:gravity="center"
android:text="@{UtilityNumber.decimalToString(item.numCnf, 0)}"
android:textAllCaps="true"
@@ -186,7 +186,7 @@
style="@style/TextAppearance.AppCompat.Small"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:backgroundTint="@color/colorPrimary"
android:backgroundTint="?colorPrimary"
android:gravity="center"
android:text="@{UtilityNumber.decimalToString(item.qtaCol, item.mtbAart.firstUntMis.cifreDec.intValue())}"
android:textAllCaps="true"

View File

@@ -200,7 +200,7 @@
android:layout_centerVertical="true"
android:layout_marginStart="8dp"
android:background="@drawable/badge_round_corner"
android:backgroundTint="@color/colorPrimary"
android:backgroundTint="?colorPrimary"
android:gravity="center_horizontal"
android:orientation="vertical"
android:padding="6dp"
@@ -211,7 +211,7 @@
style="@style/TextAppearance.AppCompat.Small"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:backgroundTint="@color/colorPrimary"
android:backgroundTint="?colorPrimary"
android:gravity="center"
android:text="@{UtilityNumber.decimalToString(item.numCnf, 0)}"
android:textAllCaps="true"
@@ -239,7 +239,7 @@
style="@style/TextAppearance.AppCompat.Small"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:backgroundTint="@color/colorPrimary"
android:backgroundTint="?colorPrimary"
android:gravity="center"
android:text="@{UtilityNumber.decimalToString(item.qtaCol, item.mtbAart.firstUntMis.cifreDec.intValue())}"
android:textAllCaps="true"

View File

@@ -66,7 +66,7 @@
android:layout_centerVertical="true"
android:layout_marginStart="8dp"
android:background="@drawable/badge_round_corner"
android:backgroundTint="@color/colorPrimary"
android:backgroundTint="?colorPrimary"
android:gravity="center_horizontal"
android:orientation="vertical"
android:padding="6dp"
@@ -77,7 +77,7 @@
style="@style/TextAppearance.AppCompat.Small"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:backgroundTint="@color/colorPrimary"
android:backgroundTint="?colorPrimary"
android:gravity="center"
android:text="@{UtilityNumber.decimalToString(item.numCnf, 0)}"
android:textAllCaps="true"
@@ -106,7 +106,7 @@
style="@style/TextAppearance.AppCompat.Small"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:backgroundTint="@color/colorPrimary"
android:backgroundTint="?colorPrimary"
android:gravity="center"
android:text="@{UtilityNumber.decimalToString(item.qtaOrd, item.mtbAart.firstUntMis.cifreDec.intValue())}"
android:textAllCaps="true"

View File

@@ -98,7 +98,7 @@
app:layout_constraintEnd_toStartOf="@id/guide_half_vertical"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/guide_buttons_top"
app:strokeColor="@color/colorPrimary" />
app:strokeColor="?colorPrimary" />
<com.google.android.material.button.MaterialButton

View File

@@ -82,7 +82,7 @@
android:layout_height="wrap_content"
android:ellipsize="end"
android:text="@{viewmodel.mtbAart.codMart}"
android:textColor="@color/colorPrimary"
android:textColor="?colorPrimary"
tools:text="COD MART (Partita mag)" />
<androidx.appcompat.widget.AppCompatTextView

View File

@@ -74,7 +74,7 @@
android:layout_toStartOf="@id/unt_mis"
android:ellipsize="end"
android:text="@{viewmodel.mtbAart.codMart}"
android:textColor="@color/colorPrimary"
android:textColor="?colorPrimary"
tools:text="COD MART (Partita mag)" />
<androidx.appcompat.widget.AppCompatTextView
@@ -85,7 +85,7 @@
android:layout_alignParentEnd="true"
android:ellipsize="end"
android:text="@{viewmodel.mtbAart.untMis}"
android:textColor="@color/colorPrimary"
android:textColor="?colorPrimary"
android:visibility="@{viewmodel.mtbAart.untMis != null ? View.VISIBLE : View.GONE}"
tools:text="UM" />
@@ -612,7 +612,7 @@
android:layout_marginStart="2dp"
android:layout_weight="0.5"
android:background="@drawable/badge_round_corner"
android:backgroundTint="@color/colorPrimary"
android:backgroundTint="?colorPrimary"
android:orientation="vertical"
android:padding="8dp"
android:visibility="@{viewmodel.totalNumCnfAvailable != null || viewmodel.totalQtaAvailable != null ? View.VISIBLE : View.GONE}">
@@ -983,7 +983,7 @@
android:layout_weight="1"
android:onClick="@{() -> view.saveAndCloseLU()}"
android:text="@string/action_close_ul"
app:strokeColor="@color/colorPrimary"
app:strokeColor="?colorPrimary"
app:visibility="@{view.enabledLUCloseButton}" />

View File

@@ -63,7 +63,7 @@
android:layout_toStartOf="@id/unt_mis"
android:ellipsize="end"
android:text="@{view.articolo.codMart}"
android:textColor="@color/colorPrimary"
android:textColor="?colorPrimary"
tools:text="020100514" />
<androidx.appcompat.widget.AppCompatTextView
@@ -74,7 +74,7 @@
android:layout_alignParentEnd="true"
android:ellipsize="end"
android:text="@{view.articolo.untMis}"
android:textColor="@color/colorPrimary"
android:textColor="?colorPrimary"
tools:text="KG" />
</RelativeLayout>
@@ -516,7 +516,7 @@
android:layout_marginStart="2dp"
android:layout_weight="1"
android:background="@drawable/badge_round_corner"
android:backgroundTint="@color/colorPrimary"
android:backgroundTint="?colorPrimary"
android:orientation="vertical"
android:padding="8dp">

View File

@@ -76,7 +76,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@{row.codMart}"
android:textColor="@color/colorPrimary"
android:textColor="?colorPrimary"
android:textSize="14sp"
android:textStyle="bold"
tools:text="COD MART" />
@@ -117,7 +117,7 @@
android:layout_centerVertical="true"
android:layout_marginStart="8dp"
android:background="@drawable/badge_round_corner"
android:backgroundTint="@color/colorPrimary"
android:backgroundTint="?colorPrimary"
android:gravity="center_horizontal"
android:orientation="vertical"
android:padding="6dp">
@@ -127,7 +127,7 @@
style="@style/TextAppearance.AppCompat.Small"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:backgroundTint="@color/colorPrimary"
android:backgroundTint="?colorPrimary"
android:gravity="center"
android:text="@{row.codAlis}"
android:textAllCaps="true"

View File

@@ -73,7 +73,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@{row.codMart}"
android:textColor="@color/colorPrimary"
android:textColor="?colorPrimary"
android:textSize="14sp"
android:textStyle="bold"
tools:text="COD MART" />
@@ -114,7 +114,7 @@
android:layout_centerVertical="true"
android:layout_marginStart="8dp"
android:background="@drawable/badge_round_corner"
android:backgroundTint="@color/colorPrimary"
android:backgroundTint="?colorPrimary"
android:gravity="center_horizontal"
android:orientation="vertical"
android:padding="6dp">
@@ -124,7 +124,7 @@
style="@style/TextAppearance.AppCompat.Small"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:backgroundTint="@color/colorPrimary"
android:backgroundTint="?colorPrimary"
android:gravity="center"
android:text="@{UtilityNumber.decimalToString(row.qtaOrd)}"
android:textAllCaps="true"

View File

@@ -0,0 +1,105 @@
<?xml version="1.0" encoding="utf-8"?>
<layout xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools">
<data>
<variable name="view"
type="it.integry.integrywmsnative.view.dialogs.tracciamento_imballi.DialogTracciamentoImballiView" />
<variable
name="viewmodel"
type="it.integry.integrywmsnative.view.dialogs.tracciamento_imballi.DialogTracciamentoImballiViewModel" />
</data>
<androidx.cardview.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:orientation="vertical"
app:cardCornerRadius="16dp"
app:cardElevation="0dp">
<androidx.appcompat.widget.LinearLayoutCompat
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:paddingHorizontal="16dp"
android:paddingVertical="16dp">
<androidx.appcompat.widget.AppCompatImageView
style="@style/MaterialAlertDialog.Material3.Title.Icon.CenterStacked"
android:layout_width="36dp"
android:layout_height="36dp"
android:src="@drawable/ic_error_white_24dp"
app:tint="?colorPrimary" />
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/title_text"
style="@style/MaterialAlertDialog.Material3.Title.Text.CenterStacked"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="16dp"
android:gravity="center_horizontal"
android:text="Tracciamento imballi" />
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/description_text"
style="@style/TextAppearance.Material3.BodyMedium"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center_horizontal"
android:text="Qui è possibile aggiungere tutti gli articoli e le quantità da tracciare" />
<androidx.core.widget.NestedScrollView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:isScrollContainer="true">
<androidx.appcompat.widget.LinearLayoutCompat
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical">
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/recyclerview"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="8dp"
app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
app:layout_behavior="@string/appbar_scrolling_view_behavior"
android:nestedScrollingEnabled="false"
tools:itemCount="4"
tools:listitem="@layout/dialog_tracciamento_imballi__list_item_model" />
<Button
style="?attr/materialIconButtonFilledTonalStyle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:layout_marginTop="8dp"
android:text="Aggiungi"
app:visibility="@{view.canAddMoreItems}"
app:icon="@drawable/ic_add_material3"
app:singleClick="@{() -> viewmodel.addNew()}" />
<Button
style="?attr/materialIconButtonFilledTonalStyle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:layout_marginTop="8dp"
android:text="Salva"
app:reverse_visibility="@{view.canAddMoreItems}"
app:icon="@drawable/ic_tick"
app:singleClick="@{() -> viewmodel.saveCurrent()}" />
</androidx.appcompat.widget.LinearLayoutCompat>
</androidx.core.widget.NestedScrollView>
</androidx.appcompat.widget.LinearLayoutCompat>
</androidx.cardview.widget.CardView>
</layout>

View File

@@ -0,0 +1,169 @@
<?xml version="1.0" encoding="utf-8"?>
<layout>
<data>
<import type="it.integry.integrywmsnative.core.utility.UtilityNumber" />
<variable
name="item"
type="it.integry.integrywmsnative.view.dialogs.tracciamento_imballi.TracciamentoImballoDTO" />
</data>
<androidx.constraintlayout.widget.ConstraintLayout 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"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingHorizontal="4dp"
android:background="?attr/selectableItemBackground">
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:layout_constraintEnd_toStartOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:visibility="@{item.editable}"
tools:visibility="visible">
<!-- <androidx.constraintlayout.widget.Guideline-->
<!-- android:id="@+id/guide_art_qta_vert"-->
<!-- android:layout_width="0dp"-->
<!-- android:layout_height="0dp"-->
<!-- android:orientation="vertical"-->
<!-- app:layout_constraintGuide_percent="0.65" />-->
<com.google.android.material.textfield.TextInputLayout
android:id="@+id/input_articolo"
style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.Dense.ExposedDropdownMenu"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginEnd="4dp"
app:layout_constraintEnd_toStartOf="@id/input_qta"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent">
<com.google.android.material.textfield.MaterialAutoCompleteTextView
android:id="@+id/filled_exposed_dropdown_articolo"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:hint="@string/article"
android:inputType="textNoSuggestions"
android:imeOptions="actionNext"
android:singleLine="true" />
</com.google.android.material.textfield.TextInputLayout>
<com.google.android.material.textfield.TextInputLayout
android:id="@+id/input_qta"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginEnd="4dp"
style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.Dense"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintWidth_percent="0.35">
<com.google.android.material.textfield.TextInputEditText
android:id="@+id/text_input_qta"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:hint="@string/quantity"
android:singleLine="true"
android:inputType="number"
android:imeOptions="actionDone"
app:binding="@{item.qta}"/>
</com.google.android.material.textfield.TextInputLayout>
<!-- <androidx.appcompat.widget.AppCompatImageButton-->
<!-- android:id="@+id/confirm_button"-->
<!-- android:layout_width="20dp"-->
<!-- android:layout_height="20dp"-->
<!-- android:padding="2dp"-->
<!-- android:scaleType="centerInside"-->
<!-- android:background="@drawable/circular_background"-->
<!-- android:backgroundTint="@color/green_500"-->
<!-- android:foreground="?attr/selectableItemBackground"-->
<!-- android:src="@drawable/ic_tick"-->
<!-- app:layout_constraintBottom_toBottomOf="parent"-->
<!-- app:layout_constraintEnd_toEndOf="parent"-->
<!-- app:layout_constraintTop_toTopOf="parent"-->
<!-- app:tint="@android:color/white" />-->
</androidx.constraintlayout.widget.ConstraintLayout>
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingVertical="8dp"
tools:visibility="gone"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:reverse_visibility="@{item.editable}">
<TextView
android:id="@+id/group_title"
style="@style/TextAppearance.Material3.BodyMedium"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:ellipsize="end"
android:gravity="center_vertical"
android:singleLine="true"
android:layout_marginEnd="8dp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintEnd_toStartOf="@id/qta_box"
android:text="@{item.descrizione}"
tools:text="Cassetta verdura" />
<androidx.appcompat.widget.LinearLayoutCompat
android:id="@+id/qta_box"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentEnd="true"
android:layout_centerVertical="true"
android:background="@drawable/badge_round_corner"
android:backgroundTint="?colorPrimary"
android:gravity="center_horizontal"
android:orientation="vertical"
android:padding="6dp"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintEnd_toEndOf="parent">
<androidx.appcompat.widget.AppCompatTextView
style="@style/TextAppearance.AppCompat.Small"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:backgroundTint="?colorPrimary"
android:gravity="center"
android:text="@{UtilityNumber.decimalToString(item.qta, 0)}"
android:textAllCaps="true"
android:textColor="@android:color/white"
android:textStyle="bold"
tools:text="280" />
<!-- <androidx.appcompat.widget.AppCompatTextView-->
<!-- style="@style/TextAppearance.AppCompat.Small"-->
<!-- android:layout_width="wrap_content"-->
<!-- android:layout_height="wrap_content"-->
<!-- android:gravity="center"-->
<!-- android:text="@{row.untMisOrd}"-->
<!-- android:textAllCaps="true"-->
<!-- android:textColor="@android:color/white"-->
<!-- android:textStyle="bold"-->
<!-- tools:text="CONF" />-->
</androidx.appcompat.widget.LinearLayoutCompat>
</androidx.constraintlayout.widget.ConstraintLayout>
</androidx.constraintlayout.widget.ConstraintLayout>
</layout>

View File

@@ -110,7 +110,7 @@
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toStartOf="@id/buttons_guideline"
app:strokeColor="@color/colorPrimary"
app:strokeColor="?colorPrimary"
android:text="@string/reset"/>

View File

@@ -110,7 +110,7 @@
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toStartOf="@id/buttons_guideline"
app:strokeColor="@color/colorPrimary"
app:strokeColor="?colorPrimary"
android:text="@string/reset"/>

View File

@@ -5,7 +5,9 @@
xmlns:tools="http://schemas.android.com/tools">
<data>
<import type="android.view.View" />
<variable
name="view"
type="it.integry.integrywmsnative.view.dialogs.versamento_automatico_ul_done.DialogVersamentoAutomaticoULDoneView" />
@@ -17,66 +19,44 @@
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:orientation="vertical"
app:cardBackgroundColor="@android:color/transparent"
app:cardCornerRadius="24dp"
app:cardCornerRadius="16dp"
app:cardElevation="0dp">
<androidx.cardview.widget.CardView
android:id="@+id/base"
<androidx.appcompat.widget.LinearLayoutCompat
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:orientation="vertical"
app:cardBackgroundColor="@color/light_blue_300"
app:cardCornerRadius="24dp"
app:cardElevation="0dp">
android:paddingHorizontal="16dp"
android:paddingVertical="16dp">
<androidx.constraintlayout.widget.ConstraintLayout
<androidx.appcompat.widget.AppCompatImageView
android:id="@+id/icon"
style="@style/MaterialAlertDialog.Material3.Title.Icon.CenterStacked"
android:layout_width="36dp"
android:layout_height="36dp"
android:src="@drawable/ic_error_white_24dp"
app:tint="?colorPrimary" />
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/title_text"
style="@style/MaterialAlertDialog.Material3.Title.Text.CenterStacked"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_margin="4dp"
android:background="@drawable/dialog_card_child_bg"
android:padding="24dp">
android:layout_marginBottom="16dp"
android:gravity="center_horizontal"
android:text="@string/versamento_automatico" />
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/description_text"
style="@style/TextAppearance.Material3.BodyMedium"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center_horizontal"
android:text="@string/completed" />
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/title_text"
style="@style/TextViewMaterial.Dialog.HeadlineText"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:gravity="center_horizontal"
android:text="@string/versamento_automatico"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/description_text"
style="@style/TextViewMaterial.Dialog.SupportingText"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="16dp"
android:layout_marginBottom="16dp"
android:gravity="center_horizontal"
android:text="@string/completed"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/title_text" />
<com.google.android.material.button.MaterialButton
android:id="@+id/button_confirm"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginTop="24dp"
android:text="@string/ok"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toBottomOf="@id/description_text"
app:singleClick="@{() -> view.dismiss()}" />
</androidx.constraintlayout.widget.ConstraintLayout>
</androidx.cardview.widget.CardView>
</androidx.appcompat.widget.LinearLayoutCompat>
</androidx.cardview.widget.CardView>
</layout>

View File

@@ -50,7 +50,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@{item.codMart}"
android:textColor="@color/colorPrimary"
android:textColor="?colorPrimary"
android:textSize="14sp"
android:textStyle="bold"
app:layout_constraintStart_toStartOf="parent"
@@ -130,7 +130,7 @@
android:layout_height="wrap_content"
android:layout_marginHorizontal="16dp"
android:background="@drawable/badge_round_corner"
android:backgroundTint="@color/colorPrimary"
android:backgroundTint="?colorPrimary"
android:gravity="center"
android:paddingLeft="6dp"
android:paddingTop="2dp"

View File

@@ -67,7 +67,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@{Html.fromHtml(listModel.preDescriptionText)}"
android:textColor="@color/colorPrimary"
android:textColor="?colorPrimary"
android:textSize="14sp"
android:textStyle="bold"
tools:text="N° X del dd/mm/yyyy" />
@@ -148,7 +148,7 @@
android:textColor="@android:color/white"
android:textSize="16sp"
android:textStyle="bold"
tools:backgroundTint="@color/colorPrimary"
tools:backgroundTint="?colorPrimary"
tools:text="280.45\nCONF" />
</RelativeLayout>

View File

@@ -46,7 +46,7 @@
<androidx.appcompat.widget.LinearLayoutCompat
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/colorPrimary"
android:background="?colorPrimary"
android:orientation="horizontal"
android:padding="16dp">

View File

@@ -29,7 +29,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="@drawable/badge_round_corner"
android:backgroundTint="@color/colorPrimary"
android:backgroundTint="?colorPrimary"
android:paddingLeft="8dp"
android:paddingTop="2dp"
android:paddingRight="8dp"

View File

@@ -74,7 +74,7 @@
android:id="@+id/profile_root_container"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/colorPrimary"
android:background="?colorPrimary"
android:orientation="vertical"
android:padding="16dp">

View File

@@ -1,31 +1,30 @@
<layout>
<androidx.appcompat.widget.LinearLayoutCompat
xmlns:android="http://schemas.android.com/apk/res/android"
<androidx.appcompat.widget.LinearLayoutCompat xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/mainOrange"
android:orientation="horizontal"
android:gravity="center_vertical"
android:paddingStart="12dp"
xmlns:tools="http://schemas.android.com/tools">
android:orientation="horizontal"
android:paddingStart="12dp">
<CheckBox
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:checked="true"
android:enabled="false" />
<CheckBox
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:checked="true"
android:enabled="false"/>
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/group_title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="@android:color/white"
android:ellipsize="end"
android:singleLine="true"
style="@style/TextAppearance.Material3.TitleMedium"
tools:text="NOME GRUPPO"/>
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/group_title"
style="@style/TextAppearance.Material3.TitleMedium"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:ellipsize="end"
android:singleLine="true"
android:textColor="@android:color/white"
tools:text="NOME GRUPPO" />
</androidx.appcompat.widget.LinearLayoutCompat>

View File

@@ -52,7 +52,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@drawable/badge_round_corner"
android:backgroundTint="@color/colorPrimary"
android:backgroundTint="?colorPrimary"
android:orientation="horizontal">
<androidx.appcompat.widget.AppCompatTextView

View File

@@ -32,7 +32,7 @@
android:layout_height="wrap_content"
tools:text="BADGE 1"
android:background="@drawable/badge_round_corner"
android:backgroundTint="@color/colorPrimary"
android:backgroundTint="?colorPrimary"
android:textColor="@android:color/white"
android:paddingTop="2dp"
android:paddingBottom="2dp"

View File

@@ -58,7 +58,7 @@
<!-- <androidx.appcompat.widget.AppCompatTextView-->
<!-- android:id="@+id/right_descrizione"-->
<!-- android:background="@drawable/badge_round_corner"-->
<!-- android:backgroundTint="@color/colorPrimary"-->
<!-- android:backgroundTint="?colorPrimary"-->
<!-- android:textColor="@android:color/white"-->
<!-- android:textStyle="bold"-->
<!-- android:paddingLeft="8dp"-->

View File

@@ -48,7 +48,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="@drawable/badge_round_corner"
android:backgroundTint="@color/colorPrimary"
android:backgroundTint="?colorPrimary"
android:gravity="center"
android:paddingLeft="6dp"
android:paddingTop="2dp"

View File

@@ -85,7 +85,7 @@
app:text="@{view.descrizionePrimaryArt}"
tools:text="CAVOLO VERZA"
style="@style/AppTheme.NewMaterial.Text.Small"
android:textColor="@color/colorPrimary"
android:textColor="?colorPrimary"
android:textStyle="bold"
android:layout_marginEnd="8dp"
/>

View File

@@ -41,7 +41,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@{articolo.codMart}"
android:textColor="@color/colorPrimary"
android:textColor="?colorPrimary"
android:textSize="18sp"
android:textStyle="bold"
tools:text="COD MART" />
@@ -117,7 +117,7 @@
android:textColor="@android:color/white"
android:textSize="16sp"
android:textStyle="bold"
tools:backgroundTint="@color/colorPrimary"
tools:backgroundTint="?colorPrimary"
tools:text="280.45\nCONF" />
</RelativeLayout>

View File

@@ -31,7 +31,7 @@
android:layout_height="wrap_content"
tools:text="BADGE 1"
android:background="@drawable/badge_round_corner"
android:backgroundTint="@color/colorPrimary"
android:backgroundTint="?colorPrimary"
android:textColor="@android:color/white"
android:paddingTop="2dp"
android:paddingBottom="2dp"

View File

@@ -48,7 +48,7 @@
android:text="@{mtbColt.numCollo.toString()}"
tools:text="22222"
android:background="@drawable/badge_round_corner"
android:backgroundTint="@color/colorPrimary"
android:backgroundTint="?colorPrimary"
android:textColor="@android:color/white"
android:paddingTop="2dp"
android:paddingBottom="2dp"

View File

@@ -53,7 +53,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@{mtbColr.codMart}"
android:textColor="@color/colorPrimary"
android:textColor="?colorPrimary"
android:textSize="14sp"
android:textStyle="bold"
app:layout_constraintStart_toStartOf="parent"
@@ -133,7 +133,7 @@
android:layout_height="wrap_content"
android:layout_marginHorizontal="16dp"
android:background="@drawable/badge_round_corner"
android:backgroundTint="@color/colorPrimary"
android:backgroundTint="?colorPrimary"
android:gravity="center"
android:paddingLeft="6dp"
android:paddingTop="2dp"

View File

@@ -53,7 +53,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@{item.codMart}"
android:textColor="@color/colorPrimary"
android:textColor="?colorPrimary"
android:textSize="14sp"
android:textStyle="bold"
app:layout_constraintStart_toStartOf="parent"
@@ -117,7 +117,7 @@
android:layout_height="wrap_content"
android:layout_marginHorizontal="16dp"
android:background="@drawable/badge_round_corner"
android:backgroundTint="@color/colorPrimary"
android:backgroundTint="?colorPrimary"
android:gravity="center"
android:paddingLeft="6dp"
android:paddingTop="2dp"

View File

@@ -36,7 +36,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@{mtbColr.codMart}"
android:textColor="@color/colorPrimary"
android:textColor="?colorPrimary"
android:textSize="14sp"
android:textStyle="bold"
style="@style/AppTheme.NewMaterial.Text.Small"
@@ -101,7 +101,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="@drawable/badge_round_corner"
android:backgroundTint="@color/colorPrimary"
android:backgroundTint="?colorPrimary"
android:gravity="center"
android:paddingLeft="6dp"
android:paddingTop="2dp"

View File

@@ -39,7 +39,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@{mtbColr.codMart}"
android:textColor="@color/colorPrimary"
android:textColor="?colorPrimary"
android:textSize="14sp"
android:textStyle="bold"
style="@style/AppTheme.NewMaterial.Text"
@@ -119,7 +119,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="@drawable/badge_round_corner"
android:backgroundTint="@color/colorPrimary"
android:backgroundTint="?colorPrimary"
android:gravity="center"
android:paddingLeft="6dp"
android:paddingTop="2dp"

View File

@@ -12,7 +12,7 @@
android:layout_marginVertical="8dp"
android:paddingTop="8dp"
android:textAllCaps="true"
android:textColor="@color/colorPrimary"
android:textColor="?colorPrimary"
tools:text="Linea 1" />
</layout>

View File

@@ -189,7 +189,7 @@
android:layout_marginStart="8dp"
android:adjustViewBounds="true"
android:background="@drawable/ic_info_78dp"
android:backgroundTint="@color/colorPrimary"
android:backgroundTint="?colorPrimary"
android:clickable="true"
android:focusable="true"
android:onClick="@{() -> view.onInfoClick(item)}"

View File

@@ -3,7 +3,6 @@
<layout>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"

View File

@@ -97,7 +97,7 @@
android:adjustViewBounds="true"
android:scaleType="fitCenter"
android:background="@drawable/ic_info_78dp"
android:backgroundTint="@color/colorPrimary"
android:backgroundTint="?colorPrimary"
android:visibility="gone" />
</androidx.appcompat.widget.LinearLayoutCompat>

View File

@@ -4,6 +4,10 @@
android:id="@+id/show_created_ul"
android:icon="@drawable/ic_inventory_2_material3"
android:title="@string/action_show_created_ul" />
<item
android:id="@+id/track_packaging"
android:icon="@drawable/ic_add_to_inbox"
android:title="@string/action_track_packaging" />
<item
android:id="@+id/create_ul"
android:icon="@drawable/ic_add_material3"

View File

@@ -0,0 +1,12 @@
<?xml version="1.0" encoding="utf-8"?>
<menu xmlns:android="http://schemas.android.com/apk/res/android">
<item
android:id="@+id/edit"
android:title="@string/edit"
android:visible="true"/>
<item
android:id="@+id/delete"
android:title="@string/delete"
android:visible="true"/>
</menu>

View File

@@ -59,6 +59,7 @@
<string name="action_filter">Filtra</string>
<string name="action_orderBy">Ordina</string>
<string name="action_create_ul">Crea nuova UL</string>
<string name="action_track_packaging">Registra imballi</string>
<string name="action_insert_quantity">Inserisci quantità</string>
<string name="action_insert_weight">Inserisci peso</string>
<string name="dialog_input_peso_lu_description">Inserisci le informazioni del TIPO UL e il peso NETTO e LORDO</string>

View File

@@ -90,6 +90,7 @@
<string name="action_filter">Filter</string>
<string name="action_orderBy">Order</string>
<string name="action_create_ul">Create new LU</string>
<string name="action_track_packaging">Track packaging</string>
<string name="action_insert_quantity">Insert quantity</string>
<string name="action_insert_weight">Insert weight</string>
<string name="action_close_order">Close order</string>

View File

@@ -46,10 +46,7 @@
<item name="windowNoTitle">true</item>
</style>
<style name="AppTheme.NewMaterial">
<item name="android:fontFamily">@font/google_sans_regular</item>
</style>
<style name="AppTheme.NewMaterial.Text" parent = "AppTheme.NewMaterial">
<style name="AppTheme.NewMaterial.Text" parent = "AppTheme">
<item name="android:textStyle">normal</item>
</style>
<style name="AppTheme.NewMaterial.Text.ExtraSmall" parent = "AppTheme.NewMaterial.Text">
@@ -68,7 +65,7 @@
<item name="android:textColor">@drawable/material_text_color</item>
<item name="android:textSize">18sp</item>
</style>
<style name="AppTheme.NewMaterial.Layout.Badge" parent = "AppTheme.NewMaterial">
<style name="AppTheme.NewMaterial.Layout.Badge" parent = "AppTheme">
<item name="android:background">@drawable/gray_detail_background_round4</item>
<item name="android:paddingStart">8dp</item>
<item name="android:paddingEnd">8dp</item>

View File

@@ -27,5 +27,9 @@
<item name="colorOnSurfaceInverse">@color/md_theme_light_inverseOnSurface</item>
<item name="colorSurfaceInverse">@color/md_theme_light_inverseSurface</item>
<item name="colorPrimaryInverse">@color/md_theme_light_inversePrimary</item>
<item name="android:fontFamily">@font/google_sans_regular</item>
</style>
</resources>