Integry/WMS_Native
19
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Miglioramenti UI dark mode

Browse Source
This commit is contained in:
Giuseppe Scorrano 2025-10-01 16:36:34 +02:00
parent 172a8256b6
commit 7878748548
6 changed files with 289 additions and 317 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/res/drawable/badge_round_corner.xml
View File

@ -7,7 +7,7 @@
<padding
android:left="6dp"
android:right="6dp"
android:right="8dp"
android:top="1dp" />
<corners android:radius="12dp" />

475
app/src/main/res/layout/activity_prod_dettaglio_linea.xml
View File

@ -26,8 +26,7 @@
<androidx.coordinatorlayout.widget.CoordinatorLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="#ebebeb">
android:layout_height="match_parent">
<androidx.appcompat.widget.LinearLayoutCompat
@ -57,284 +56,298 @@
android:layout_width="match_parent"
android:layout_height="match_parent" />
<androidx.appcompat.widget.LinearLayoutCompat
<com.google.android.material.card.MaterialCardView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:background="@color/white"
android:padding="16dp">
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content">
<androidx.appcompat.widget.AppCompatTextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textAppearance="@style/TextAppearance.AppCompat.Headline"
android:text="@{view.lineaLabel}"
tools:text="L2 - Linea 2"
/>
<androidx.appcompat.widget.AppCompatImageButton
android:id="@+id/add_extra_items_toolbar"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentEnd="true"
android:layout_centerVertical="true"
android:adjustViewBounds="true"
android:background="?attr/selectableItemBackground"
android:onClick="@{()->viewModel.settings()}"
android:padding="6dp"
android:src="@drawable/ic_settings_24dp"
android:tint="@color/colorPrimaryGray" />
</RelativeLayout>
android:layout_margin="8dp">
<androidx.appcompat.widget.LinearLayoutCompat
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="horizontal">
<androidx.appcompat.widget.AppCompatImageView
android:id="@+id/image"
android:layout_width="18dp"
android:layout_height="18dp"
android:layout_gravity="center_horizontal"
android:src="@{ContextCompat.getDrawable(context, view.isStarted.get() ? R.drawable.ic_baseline_play_arrow_24 : view.isPaused.get() ? R.drawable.ic_baseline_pause_24 : R.drawable.ic_baseline_stop_24)}"
app:tint="@{ContextCompat.getColor(context, view.isStarted.get() ? R.color.green_600 : view.isPaused.get() ? R.color.orange_600 : R.color.red_600)}"
tools:tint="@color/green_600"
tools:src="@drawable/ic_baseline_play_arrow_24" />
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/peso_lordo_collo"
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/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"
tools:text="In lavorazione" />
</androidx.appcompat.widget.LinearLayoutCompat>
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:visibility="@{view.isStarted}"
android:layout_marginTop="16dp">
android:orientation="vertical"
android:padding="16dp">
<androidx.appcompat.widget.AppCompatTextView
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content">
<androidx.appcompat.widget.AppCompatTextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@{view.lineaLabel}"
android:textAppearance="@style/TextAppearance.AppCompat.Headline"
tools:text="L2 - Linea 2"
/>
<androidx.appcompat.widget.AppCompatImageButton
android:id="@+id/add_extra_items_toolbar"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentEnd="true"
android:layout_centerVertical="true"
android:adjustViewBounds="true"
android:background="?attr/selectableItemBackground"
android:onClick="@{()->viewModel.settings()}"
android:padding="6dp"
android:src="@drawable/ic_settings_24dp"
android:tint="?attr/colorControlNormal" />
</RelativeLayout>
<androidx.appcompat.widget.LinearLayoutCompat
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/risorse_impostate"
android:textAppearance="@style/AppTheme.NewMaterial.Text.Medium"
tools:text="Risorse assegnate" />
android:orientation="horizontal">
<androidx.appcompat.widget.AppCompatTextView
android:layout_width="wrap_content"
<androidx.appcompat.widget.AppCompatImageView
android:id="@+id/image"
android:layout_width="18dp"
android:layout_height="18dp"
android:layout_gravity="center_horizontal"
android:src="@{ContextCompat.getDrawable(context, view.isStarted.get() ? R.drawable.ic_baseline_play_arrow_24 : view.isPaused.get() ? R.drawable.ic_baseline_pause_24 : R.drawable.ic_baseline_stop_24)}"
app:tint="@{ContextCompat.getColor(context, view.isStarted.get() ? R.color.green_600 : view.isPaused.get() ? R.color.orange_600 : R.color.red_600)}"
tools:src="@drawable/ic_baseline_play_arrow_24"
tools:tint="@color/green_600" />
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/peso_lordo_collo"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textAppearance="@style/TextAppearance.Material3.BodyMedium"
android:textStyle="bold"
app:text="@{view.isStarted.get() ? R.string.in_progress : view.isPaused.get() ? R.string.stand_by : R.string.stopped}"
app:textColor="@{ContextCompat.getColor(context, view.isStarted.get() ? R.color.green_600 : view.isPaused.get() ? R.color.orange_600 : R.color.red_600)}"
tools:text="In lavorazione"
tools:textColor="@color/green_600" />
</androidx.appcompat.widget.LinearLayoutCompat>
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_alignParentEnd="true"
android:layout_centerVertical="true"
app:text="@{view.hrNum}"
android:textAppearance="@style/AppTheme.NewMaterial.Text.Medium"
android:textStyle="bold"
tools:text="25" />
android:layout_marginTop="16dp"
app:visibility="@{view.isStarted}">
<androidx.appcompat.widget.AppCompatTextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/risorse_impostate"
android:textAppearance="@style/TextAppearance.Material3.BodyLarge"
tools:text="Risorse assegnate" />
<androidx.appcompat.widget.AppCompatTextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentEnd="true"
android:layout_centerVertical="true"
android:textAppearance="@style/TextAppearance.Material3.BodyLarge"
android:textStyle="bold"
app:text="@{view.hrNum}"
tools:text="25" />
</RelativeLayout>
</RelativeLayout>
</androidx.appcompat.widget.LinearLayoutCompat>
</androidx.appcompat.widget.LinearLayoutCompat>
</com.google.android.material.card.MaterialCardView>
<androidx.appcompat.widget.LinearLayoutCompat
<com.google.android.material.card.MaterialCardView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/white"
android:orientation="vertical"
app:visibility="@{view.flagShowProdInfo}"
android:layout_margin="8dp"
android:layout_marginTop="16dp"
android:padding="16dp">
app:visibility="@{view.flagShowProdInfo}">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/production_in_progress"
tools:text="Lavorazione in corso"
android:textAppearance="@style/AppTheme.NewMaterial.Text.TextBoxGroupTitleDashboard" />
<com.google.android.material.divider.MaterialDivider
<androidx.appcompat.widget.LinearLayoutCompat
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="8dp"
android:layout_marginBottom="8dp" />
android:orientation="vertical"
android:padding="16dp">
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content">
<androidx.appcompat.widget.AppCompatTextView
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/article"
android:textAppearance="@style/AppTheme.NewMaterial.Text.Medium"
tools:text="Articolo" />
android:text="@string/production_in_progress"
android:textAppearance="@style/TextAppearance.Material3.TitleMedium"
tools:text="Lavorazione in corso" />
<androidx.appcompat.widget.AppCompatTextView
<com.google.android.material.divider.MaterialDivider
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="8dp"
android:layout_marginBottom="8dp" />
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content">
<androidx.appcompat.widget.AppCompatTextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/article"
android:textAppearance="@style/TextAppearance.Material3.BodyMedium"
tools:text="Articolo" />
<androidx.appcompat.widget.AppCompatTextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentEnd="true"
android:layout_centerVertical="true"
android:textAppearance="@style/TextAppearance.Material3.BodyMedium"
android:textStyle="bold"
app:text="@{view.codMart}"
tools:text="150150-09" />
</RelativeLayout>
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content">
<androidx.appcompat.widget.AppCompatTextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/batch_lot"
android:textAppearance="@style/TextAppearance.Material3.BodyMedium"
tools:text="Lotto" />
<androidx.appcompat.widget.AppCompatTextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentEnd="true"
android:layout_centerVertical="true"
android:textAppearance="@style/TextAppearance.Material3.BodyMedium"
android:textStyle="bold"
app:text="@{view.partitaMag}"
tools:text="20220530" />
</RelativeLayout>
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
>
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/label_descrizione"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/description"
android:textAppearance="@style/TextAppearance.Material3.BodyMedium"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
tools:text="Descrizione" />
<androidx.appcompat.widget.AppCompatTextView
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_alignParentEnd="true"
android:layout_centerVertical="true"
android:layout_marginStart="8dp"
android:gravity="end"
android:textAppearance="@style/TextAppearance.Material3.BodyMedium"
android:textStyle="bold"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@id/label_descrizione"
app:layout_constraintTop_toTopOf="parent"
app:text="@{view.productDescription}"
tools:text="UVA VITTORIA IN CASSE " />
</androidx.constraintlayout.widget.ConstraintLayout>
<com.google.android.material.divider.MaterialDivider
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="8dp"
android:layout_marginBottom="8dp" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentEnd="true"
android:layout_centerVertical="true"
app:text="@{view.codMart}"
android:textAppearance="@style/AppTheme.NewMaterial.Text.Medium"
android:textStyle="bold"
tools:text="150150-09" />
android:text="@string/orders_in_progress"
android:textAppearance="@style/TextAppearance.Material3.BodyMedium"
tools:text="Ordini in lavorazione" />
</RelativeLayout>
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content">
<androidx.appcompat.widget.AppCompatTextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/batch_lot"
android:textAppearance="@style/AppTheme.NewMaterial.Text.Medium"
tools:text="Lotto" />
<androidx.appcompat.widget.AppCompatTextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentEnd="true"
android:layout_centerVertical="true"
app:text="@{view.partitaMag}"
android:textAppearance="@style/AppTheme.NewMaterial.Text.Medium"
android:textStyle="bold"
tools:text="20220530" />
</RelativeLayout>
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
>
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/label_descrizione"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/description"
android:textAppearance="@style/AppTheme.NewMaterial.Text.Medium"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
tools:text="Descrizione" />
<androidx.appcompat.widget.AppCompatTextView
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_alignParentEnd="true"
android:layout_centerVertical="true"
android:gravity="end"
android:textAppearance="@style/AppTheme.NewMaterial.Text.Medium"
android:textStyle="bold"
android:layout_marginStart="8dp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@id/label_descrizione"
app:layout_constraintTop_toTopOf="parent"
app:text="@{view.productDescription}"
tools:text="UVA VITTORIA IN CASSE " />
</androidx.constraintlayout.widget.ConstraintLayout>
<com.google.android.material.divider.MaterialDivider
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="8dp"
android:layout_marginBottom="8dp" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/orders_in_progress"
tools:text="Ordini in lavorazione"
android:textAppearance="@style/AppTheme.NewMaterial.Text.Medium" />
<HorizontalScrollView
android:layout_width="wrap_content"
android:layout_height="wrap_content">
<com.google.android.material.chip.ChipGroup
android:id="@+id/orders_list"
<HorizontalScrollView
android:layout_width="wrap_content"
android:layout_height="wrap_content">
<com.google.android.material.chip.ChipGroup
android:id="@+id/orders_list"
android:layout_width="wrap_content"
android:layout_height="wrap_content">
</com.google.android.material.chip.ChipGroup>
</HorizontalScrollView>
</androidx.appcompat.widget.LinearLayoutCompat>
</com.google.android.material.chip.ChipGroup>
</HorizontalScrollView>
<androidx.appcompat.widget.LinearLayoutCompat
</androidx.appcompat.widget.LinearLayoutCompat>
</com.google.android.material.card.MaterialCardView>
<com.google.android.material.card.MaterialCardView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="16dp"
android:padding="16dp"
android:background="@color/white"
android:orientation="vertical">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/versamento_merce_fragment_title"
android:textAppearance="@style/AppTheme.NewMaterial.Text.TextBoxGroupTitleDashboard" />
android:layout_margin="8dp"
android:layout_marginTop="16dp">
<androidx.appcompat.widget.LinearLayoutCompat
android:id="@+id/scan_art_spinner"
android:layout_width="wrap_content"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:layout_marginTop="24dp"
android:orientation="horizontal"
android:visibility="visible"
app:layout_constraintTop_toBottomOf="@id/header_content"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent">
android:orientation="vertical"
android:padding="16dp">
<com.google.android.material.progressindicator.CircularProgressIndicator
android:id="@+id/progressBar"
style="?attr/circularProgressIndicatorStyle"
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:indeterminate="true"
app:trackCornerRadius="4dp"/>
android:text="@string/versamento_merce_fragment_title"
android:textAppearance="@style/TextAppearance.Material3.TitleMedium" />
<androidx.appcompat.widget.AppCompatTextView
style="@style/AppTheme.NewMaterial.Text"
<androidx.appcompat.widget.LinearLayoutCompat
android:id="@+id/scan_art_spinner"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:layout_marginStart="8dp"
android:layout_marginEnd="12dp"
android:gravity="center_horizontal"
android:text="@string/scan_lu_to_deposit"
android:textSize="16sp" />
android:layout_gravity="center_horizontal"
android:layout_marginTop="24dp"
android:orientation="horizontal"
android:visibility="visible"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/header_content">
<com.google.android.material.progressindicator.CircularProgressIndicator
android:id="@+id/progressBar"
style="?attr/circularProgressIndicatorStyle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:indeterminate="true"
app:trackCornerRadius="4dp" />
<androidx.appcompat.widget.AppCompatTextView
style="@style/AppTheme.NewMaterial.Text"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:layout_marginStart="8dp"
android:layout_marginEnd="12dp"
android:gravity="center_horizontal"
android:text="@string/scan_lu_to_deposit"
android:textSize="16sp" />
</androidx.appcompat.widget.LinearLayoutCompat>
</androidx.appcompat.widget.LinearLayoutCompat>
</androidx.appcompat.widget.LinearLayoutCompat>
</com.google.android.material.card.MaterialCardView>
</androidx.appcompat.widget.LinearLayoutCompat>

55
app/src/main/res/layout/bottom_sheet_line_actions.xml
View File

@ -58,7 +58,7 @@
<androidx.appcompat.widget.AppCompatTextView
style="@style/AppTheme.NewMaterial.Text.Large"
style="@style/TextAppearance.Material3.TitleLarge"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@{listModel.getLabel()}"
@ -82,7 +82,8 @@
<androidx.appcompat.widget.AppCompatImageView
android:id="@+id/image"
android:layout_width="18dp"
android:layout_height="19dp"
android:layout_height="wrap_content"
android:adjustViewBounds="true"
android:layout_gravity="center_horizontal"
android:src="@{ContextCompat.getDrawable(context, listModel.isStarted() ? R.drawable.ic_baseline_play_arrow_24 : listModel.isPaused() ? R.drawable.ic_baseline_pause_24 : R.drawable.ic_baseline_stop_24)}"
app:tint="@color/white"
@ -92,10 +93,12 @@
android:id="@+id/peso_lordo_collo"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
style="@style/TextAppearance.Material3.LabelLarge"
android:text="@{listModel.isStarted() ? R.string.in_progress : listModel.isPaused() ? R.string.stand_by : R.string.stopped}"
android:textAppearance="@style/AppTheme.NewMaterial.Text.Medium"
android:textColor="@android:color/white"
android:textStyle="bold"
android:layout_marginStart="2dp"
tools:text="In lavorazione" />
</androidx.appcompat.widget.LinearLayoutCompat>
@ -116,21 +119,20 @@
android:layout_height="wrap_content"
android:layout_marginEnd="8dp"
android:text="@string/orders_in_progress"
android:textColor="@android:color/black"
android:textSize="14sp" />
style="@style/TextAppearance.Material3.BodyMedium"/>
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/lista_ords"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@{listModel.listaOrd}"
android:textColor="@android:color/black"
android:textSize="14sp"
style="@style/TextAppearance.Material3.BodyMedium"
android:textStyle="bold"
tools:text="125|255" />
</androidx.appcompat.widget.LinearLayoutCompat>
<androidx.appcompat.widget.LinearLayoutCompat
android:layout_width="match_parent"
android:layout_height="wrap_content"
@ -139,18 +141,22 @@
android:focusable="true"
android:onClick="@{()->view.onResourcesClicked()}"
android:orientation="horizontal"
android:padding="16dp">
android:layout_marginTop="16dp"
android:paddingHorizontal="16dp"
android:paddingVertical="16dp"
android:gravity="center_vertical">
<androidx.appcompat.widget.AppCompatImageView
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/ic_baseline_person_add_24" />
android:src="@drawable/ic_baseline_person_add_24"
app:tint="?attr/colorOnSurface"
android:layout_marginEnd="16dp"/>
<androidx.appcompat.widget.AppCompatTextView
<TextView
style="@style/TextAppearance.Material3.BodyLarge"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="32dp"
android:text="@string/ridistribuisci_risorse" />
</androidx.appcompat.widget.LinearLayoutCompat>
@ -163,18 +169,21 @@
android:focusable="true"
android:onClick="@{()->view.onPlayClicked()}"
android:orientation="horizontal"
android:padding="16dp">
android:paddingHorizontal="16dp"
android:paddingVertical="16dp"
android:gravity="center_vertical">
<androidx.appcompat.widget.AppCompatImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/ic_baseline_play_arrow_24" />
android:src="@drawable/ic_baseline_play_arrow_24"
app:tint="?attr/colorOnSurface"
android:layout_marginEnd="16dp" />
<androidx.appcompat.widget.AppCompatTextView
style="@style/TextAppearance.Material3.BodyLarge"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="32dp"
android:text="@string/avvia_nuova_produzione" />
</androidx.appcompat.widget.LinearLayoutCompat>
@ -187,18 +196,21 @@
android:focusable="true"
android:onClick="@{()->view.onStopClicked()}"
android:orientation="horizontal"
android:padding="16dp">
android:paddingHorizontal="16dp"
android:paddingVertical="16dp"
android:gravity="center_vertical">
<androidx.appcompat.widget.AppCompatImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/ic_baseline_stop_24" />
android:src="@drawable/ic_baseline_stop_24"
app:tint="?attr/colorOnSurface"
android:layout_marginEnd="16dp" />
<androidx.appcompat.widget.AppCompatTextView
style="@style/TextAppearance.Material3.BodyLarge"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="32dp"
android:text="@string/arresta_produzione" />
</androidx.appcompat.widget.LinearLayoutCompat>
@ -211,18 +223,21 @@
android:focusable="true"
android:onClick="@{()->view.onRecoverClicked()}"
android:orientation="horizontal"
android:padding="16dp">
android:paddingHorizontal="16dp"
android:paddingVertical="16dp"
android:gravity="center_vertical">
<androidx.appcompat.widget.AppCompatImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/ic_black_download" />
android:src="@drawable/ic_black_download"
app:tint="?attr/colorOnSurface"
android:layout_marginEnd="16dp" />
<androidx.appcompat.widget.AppCompatTextView
style="@style/TextAppearance.Material3.BodyLarge"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="32dp"
android:text="@string/prod_recupero_materiale_title_fragment" />
</androidx.appcompat.widget.LinearLayoutCompat>

7
app/src/main/res/layout/fragment_linee_prod.xml
View File

@ -11,8 +11,7 @@
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/full_white">
android:layout_height="match_parent">
<androidx.recyclerview.widget.RecyclerView
@ -66,14 +65,14 @@
android:layout_width="72dp"
android:layout_height="wrap_content"
android:adjustViewBounds="true"
android:src="@drawable/ic_playlist_add_check_24dp" />
android:src="@drawable/ic_playlist_add_check_24dp"
android:tint="?attr/colorControlNormal"/>
<androidx.appcompat.widget.AppCompatTextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="center_horizontal"
android:text="@string/nessuna_linea_disponibile"
android:textColor="@android:color/black"
android:textSize="18sp" />
</LinearLayout>

19
app/src/main/res/layout/fragment_linee_prod_main_list_model.xml
View File

@ -62,13 +62,11 @@
<androidx.appcompat.widget.AppCompatTextView
style="@style/AppTheme.NewMaterial.Text.Large"
style="@style/TextAppearance.Material3.TitleMedium"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@{listModel.getLabel()}"
android:textColor="@{ContextCompat.getColor(context,listModel.isStarted() ? R.color.green_600 : listModel.isPaused() ? R.color.orange_600 : R.color.red_600)}"
android:textSize="16sp"
android:textStyle="bold"
tools:text="L2 - Linea 2"
tools:textColor="@color/green_600" />
@ -81,13 +79,15 @@
android:backgroundTint="@{ContextCompat.getColor(context, listModel.isStarted() ? R.color.green_600 : listModel.isPaused() ? R.color.orange_600 : R.color.red_600)}"
android:orientation="horizontal"
android:weightSum="2"
android:paddingHorizontal="4dp"
tools:backgroundTint="@color/green_600">
<androidx.appcompat.widget.AppCompatImageView
android:id="@+id/image"
android:layout_width="18dp"
android:layout_height="19dp"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:adjustViewBounds="true"
android:src="@{ContextCompat.getDrawable(context, listModel.isStarted() ? R.drawable.ic_baseline_play_arrow_24 : listModel.isPaused() ? R.drawable.ic_baseline_pause_24 : R.drawable.ic_baseline_stop_24)}"
app:tint="@color/white"
tools:src="@drawable/ic_baseline_play_arrow_24" />
@ -97,9 +97,10 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@{listModel.isStarted() ? R.string.in_progress : listModel.isPaused() ? R.string.stand_by : R.string.stopped}"
android:textAppearance="@style/AppTheme.NewMaterial.Text.Medium"
android:textAppearance="@style/TextAppearance.Material3.LabelLarge"
android:textColor="@android:color/white"
android:textStyle="bold"
android:layout_marginHorizontal="2dp"
tools:text="In lavorazione" />
</androidx.appcompat.widget.LinearLayoutCompat>
@ -119,7 +120,6 @@
android:layout_height="wrap_content"
android:layout_marginEnd="8dp"
android:text="@string/risorse_impostate"
android:textColor="@android:color/black"
android:textSize="14sp" />
<androidx.appcompat.widget.AppCompatTextView
@ -127,7 +127,6 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@{listModel.getRisorseLabel()}"
android:textColor="@android:color/black"
android:textSize="14sp"
android:textStyle="bold"
tools:text="5/25" />
@ -146,7 +145,6 @@
android:layout_height="wrap_content"
android:layout_marginEnd="8dp"
android:text="@string/orders_in_progress"
android:textColor="@android:color/black"
android:textSize="14sp" />
<androidx.appcompat.widget.AppCompatTextView
@ -154,7 +152,6 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@{listModel.listaOrd}"
android:textColor="@android:color/black"
android:textSize="14sp"
android:textStyle="bold"
tools:text="125|255" />
@ -173,7 +170,6 @@
android:layout_height="wrap_content"
android:layout_marginEnd="8dp"
android:text="@string/inizio_produzione"
android:textColor="@android:color/black"
android:textSize="14sp" />
<androidx.appcompat.widget.AppCompatTextView
@ -181,7 +177,6 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@{UtilityDate.formatDate(listModel.datetimeStart, UtilityDate.COMMONS_DATE_FORMATS.DMY_TIME_SLASH)}"
android:textColor="@android:color/black"
android:textSize="14sp"
android:textStyle="bold"
tools:text="05/07/2022 14:00:00" />
@ -200,7 +195,6 @@
android:layout_height="wrap_content"
android:layout_marginEnd="8dp"
android:text="@string/ultima_produzione"
android:textColor="@android:color/black"
android:textSize="14sp" />
<androidx.appcompat.widget.AppCompatTextView
@ -208,7 +202,6 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@{UtilityDate.formatDate(listModel.datetimeEnd, UtilityDate.COMMONS_DATE_FORMATS.DMY_TIME_SLASH)}"
android:textColor="@android:color/black"
android:textSize="14sp"
android:textStyle="bold"
tools:text="05/07/2022 23:59:59" />

48
app/src/main/res/values/styles.xml
View File

@ -94,14 +94,6 @@
<style name="OrangeFloatingLabel" parent="@android:style/TextAppearance">
<item name="colorAccent">@color/orange_600</item>
<item name="android:textColor">@color/orange_600</item>
<item name="android:textSize">12sp</item>
<item name="colorControlNormal">@color/orange_600</item>
<item name="colorControlActivated">@color/orange_600</item>
<item name="colorControlHighlight">@color/orange_600</item>
</style>
<style name="ErrorFloatingLabel" parent="@android:style/TextAppearance">
<item name="android:textColor">@color/red_500</item>
<item name="android:textSize">12sp</item>
@ -117,54 +109,14 @@
<item name="colorControlHighlight">@color/colorPrimary</item>
</style>
<!--<style name="AppTheme.AppCompat.Dark.NoActionBar" parent="Theme.AppCompat.Light.DarkActionBar">-->
<!--<item name="colorPrimary">@color/colorPrimary</item>-->
<!--<item name="colorPrimaryDark">@color/colorPrimaryDark</item>-->
<!--<item name="colorAccent">@color/colorAccent</item>-->
<!--<item name="windowActionBar">false</item>-->
<!--<item name="windowNoTitle">true</item>-->
<!--</style>-->
<style name="AppTheme.AppBarOverlay" parent="ThemeOverlay.AppCompat.Dark.ActionBar" />
<style name="AppTheme.PopupOverlay" parent="ThemeOverlay.AppCompat.Dark" />
<style name="white_button">
<item name="colorButtonNormal">@android:color/white</item>
</style>
<style name="transparent_button">
<item name="colorButtonNormal">@android:color/transparent</item>
</style>
<!-- <style name="MaterialToolbar.Base" parent="">-->
<!-- <item name="popupTheme">@style/AppTheme.PopupOverlay</item>-->
<!-- <item name="theme">@style/Theme.Material3.Light</item>-->
<!-- </style>-->
<!-- <style name="MaterialToolbar" parent="MaterialToolbar.Base"/>-->
<!-- <style name="MaterialToolbar.Event" parent="MaterialToolbar">-->
<!-- <item name="titleTextAppearance">@style/AppTheme.NewMaterial.Text.ToolbarTitle</item>-->
<!-- </style>-->
<style name="CustomBottomSheetDialog" parent="@style/ThemeOverlay.Material3.BottomSheetDialog">
<item name="bottomSheetStyle">@style/Widget.Material3.BottomSheet</item>
</style>
<!-- <style name="CustomBottomSheet" parent="Widget.Material3.BottomSheet">-->
<!-- <item name="shapeAppearanceOverlay">@style/CustomShapeAppearanceBottomSheetDialog</item>-->
<!-- </style>-->
<!-- <style name="CustomShapeAppearanceBottomSheetDialog" parent="">-->
<!-- <item name="cornerFamily">rounded</item>-->
<!-- <item name="cornerSizeTopRight">16dp</item>-->
<!-- <item name="cornerSizeTopLeft">16dp</item>-->
<!-- <item name="cornerSizeBottomRight">0dp</item>-->
<!-- <item name="cornerSizeBottomLeft">0dp</item>-->
<!-- </style>-->
</resources>