diff --git a/app/src/main/java/it/integry/integrywmsnative/gest/lista_bancali/ListaBancaliActivity.java b/app/src/main/java/it/integry/integrywmsnative/gest/lista_bancali/ListaBancaliActivity.java index d2c786a5..b7387024 100644 --- a/app/src/main/java/it/integry/integrywmsnative/gest/lista_bancali/ListaBancaliActivity.java +++ b/app/src/main/java/it/integry/integrywmsnative/gest/lista_bancali/ListaBancaliActivity.java @@ -4,21 +4,15 @@ import android.content.Context; import android.content.Intent; import android.os.Bundle; import android.view.LayoutInflater; -import android.view.View; import android.widget.LinearLayout; -import androidx.core.content.ContextCompat; import androidx.databinding.DataBindingUtil; -import androidx.databinding.ObservableArrayList; import androidx.recyclerview.widget.LinearLayoutManager; -import com.ravikoradiya.liveadapter.LiveAdapter; - import java.util.List; import javax.inject.Inject; -import it.integry.integrywmsnative.BR; import it.integry.integrywmsnative.MainApplication; import it.integry.integrywmsnative.R; import it.integry.integrywmsnative.core.data_cache.DataCache; @@ -31,8 +25,6 @@ import it.integry.integrywmsnative.databinding.ListaBancaliListItemBinding; import it.integry.integrywmsnative.databinding.ListaBancaliListModelBinding; import it.integry.integrywmsnative.gest.contenuto_bancale.ContenutoBancaleActivity; import it.integry.integrywmsnative.gest.lista_bancali.ui.ListaColliMainListAdapter; -import it.integry.integrywmsnative.ui.SimpleDividerItemDecoration; -import kotlin.Unit; public class ListaBancaliActivity extends BaseActivity implements ListaBancaliViewModel.Listener { diff --git a/app/src/main/res/layout/activity_contenuto_bancale.xml b/app/src/main/res/layout/activity_contenuto_bancale.xml index ef6cd788..fe23a7d2 100644 --- a/app/src/main/res/layout/activity_contenuto_bancale.xml +++ b/app/src/main/res/layout/activity_contenuto_bancale.xml @@ -7,9 +7,13 @@ + + + + - + app:cardCornerRadius="16dp" + app:cardElevation="0dp"> + android:orientation="vertical" + android:padding="16dp"> - + android:orientation="horizontal"> - + + + + + + android:orientation="horizontal"> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + android:paddingEnd="2dp" + tools:listitem="@layout/lista_contenuto_bancale_list_model"> @@ -221,12 +221,12 @@ + app:srcCompat="@drawable/ic_menu_24dp" /> \ No newline at end of file diff --git a/app/src/main/res/layout/activity_lista_bancali.xml b/app/src/main/res/layout/activity_lista_bancali.xml index 8d7a59b1..15c94873 100644 --- a/app/src/main/res/layout/activity_lista_bancali.xml +++ b/app/src/main/res/layout/activity_lista_bancali.xml @@ -1,7 +1,8 @@ + xmlns:app="http://schemas.android.com/apk/res-auto" + xmlns:tools="http://schemas.android.com/tools"> @@ -9,8 +10,7 @@ + android:orientation="vertical"> + app:layout_behavior="@string/appbar_scrolling_view_behavior" + tools:listitem="@layout/lista_bancali_list_model" /> diff --git a/app/src/main/res/layout/lista_bancali_list_model.xml b/app/src/main/res/layout/lista_bancali_list_model.xml index f2ec0345..f0a0297f 100644 --- a/app/src/main/res/layout/lista_bancali_list_model.xml +++ b/app/src/main/res/layout/lista_bancali_list_model.xml @@ -18,7 +18,6 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_margin="12dp" - android:backgroundTint="?colorPrimaryContainer" android:foreground="?attr/selectableItemBackground" android:clickable="true" android:focusable="true" @@ -52,6 +51,7 @@ android:textColor="?colorOnPrimaryContainer" android:clickable="false" android:focusable="false" + app:layout_constraintTop_toTopOf="parent" app:layout_constraintEnd_toEndOf="parent" app:text="@{UtilityDate.formatDate(mtbColt.dataColloD, UtilityDate.COMMONS_DATE_FORMATS.DMY_HUMAN)}" tools:text="20 Gen 2025" /> diff --git a/app/src/main/res/layout/lista_contenuto_bancale_list_model.xml b/app/src/main/res/layout/lista_contenuto_bancale_list_model.xml index 4e408a42..a01b116d 100644 --- a/app/src/main/res/layout/lista_contenuto_bancale_list_model.xml +++ b/app/src/main/res/layout/lista_contenuto_bancale_list_model.xml @@ -63,7 +63,6 @@ android:paddingStart="0dp" android:paddingEnd="8dp" android:text="@{mtbColr.getDescrizione()}" - android:textColor="@android:color/black" android:textSize="16sp" app:layout_constraintEnd_toStartOf="@+id/qta_guideline" app:layout_constraintStart_toStartOf="parent"