Sistemata gestione della commessa quando viene creato un collo di reso da cliente.

This commit is contained in:
2019-11-11 12:19:23 +01:00
parent 2123b196b8
commit 84c7c6ac95
8 changed files with 103 additions and 173 deletions

View File

@@ -9,42 +9,22 @@
android:orientation="vertical" android:layout_width="match_parent"
android:layout_height="wrap_content">
<androidx.cardview.widget.CardView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="6dp"
android:layout_marginEnd="6dp"
android:layout_marginTop="12dp"
android:layout_marginBottom="8dp"
app:cardElevation="2dp"
app:cardCornerRadius="4dp">
<RelativeLayout
android:layout_width="match_parent"
<TextView
android:id="@+id/title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingStart="8dp"
android:paddingEnd="8dp"
android:paddingTop="8dp"
android:paddingBottom="8dp"
android:background="@color/colorAccent">
style="@style/AppTheme.NewMaterial.Text.ListDivider"
android:layout_marginStart="14dp"
android:layout_marginEnd="14dp"
android:layout_marginTop="14dp"
android:textAllCaps="true"
android:ellipsize="end"
android:singleLine="true"
android:textStyle="bold"
android:textColor="@color/colorAccent"
tools:text="Title here"/>
<TextView
android:id="@+id/title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
style="@style/AppTheme.NewMaterial.Text.ListDivider"
android:textAllCaps="true"
android:layout_centerVertical="true"
android:layout_alignParentStart="true"
android:ellipsize="end"
android:singleLine="true"
android:textStyle="bold"
android:textColor="@android:color/white"
tools:text="Title here"/>
</RelativeLayout>
</androidx.cardview.widget.CardView>
</LinearLayout>

View File

@@ -8,31 +8,36 @@
type="it.integry.integrywmsnative.core.rest.model.DocumentoResoDTO" />
</data>
<LinearLayout
<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:layout_marginTop="4dp"
android:layout_marginStart="4dp"
android:layout_marginStart="12dp"
android:layout_marginBottom="4dp"
android:paddingStart="8dp"
android:paddingEnd="8dp"
android:paddingTop="8dp"
android:paddingBottom="8dp"
android:orientation="horizontal"
android:background="@drawable/bg_checked_layout"
app:backgroundTintResID="@{consegna.selected.get() ? R.color.bg_checked_layout : android.R.color.transparent}" >
<ImageView
android:id="@+id/start_icon"
android:layout_width="40dp"
android:layout_height="40dp" />
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="8dp">
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/badge1"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
tools:text="BADGE 1"
android:background="@drawable/badge1_round_corner"
android:textColor="@android:color/white"
android:paddingTop="2dp"
android:paddingBottom="2dp"
android:paddingLeft="6dp"
android:paddingRight="6dp"
android:textStyle="bold"/>
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/description_main"
@@ -42,6 +47,8 @@
style="@android:style/TextAppearance.Small"
android:layout_marginEnd="4dp"
android:layout_toStartOf="@id/date"
android:layout_toEndOf="@id/badge1"
android:layout_marginStart="4dp"
android:ellipsize="end"
android:singleLine="true"
tools:text="TITLE"/>
@@ -58,16 +65,16 @@
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/sub_description_main"
style="@android:style/TextAppearance.Small"
android:layout_width="match_parent"
android:layout_height="wrap_content"
style="@android:style/TextAppearance.Small"
android:layout_below="@id/description_main"
android:layout_marginTop="4dp"
android:layout_marginEnd="4dp"
android:layout_toStartOf="@id/compilato_da"
android:layout_below="@id/description_main"
android:singleLine="true"
android:ellipsize="end"
tools:text="SUB TITLE"/>
android:singleLine="true"
tools:text="SUB TITLE" />
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/compilato_da"
@@ -80,7 +87,6 @@
android:textSize="12sp"
tools:text="Nome Cognome"/>
</RelativeLayout>
</LinearLayout>
</RelativeLayout>
</layout>

View File

@@ -9,42 +9,21 @@
android:orientation="vertical" android:layout_width="match_parent"
android:layout_height="wrap_content">
<androidx.cardview.widget.CardView
android:layout_width="match_parent"
<TextView
android:id="@+id/title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="6dp"
android:layout_marginEnd="6dp"
android:layout_marginTop="12dp"
android:layout_marginBottom="8dp"
app:cardElevation="2dp"
app:cardCornerRadius="4dp">
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingStart="8dp"
android:paddingEnd="8dp"
android:paddingTop="8dp"
android:paddingBottom="8dp"
android:background="@color/colorAccent">
<TextView
android:id="@+id/title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
style="@style/AppTheme.NewMaterial.Text.ListDivider"
android:textAllCaps="true"
android:layout_centerVertical="true"
android:layout_alignParentStart="true"
android:ellipsize="end"
android:singleLine="true"
android:textStyle="bold"
android:textColor="@android:color/white"
tools:text="Title here"/>
</RelativeLayout>
</androidx.cardview.widget.CardView>
style="@style/AppTheme.NewMaterial.Text.ListDivider"
android:layout_marginStart="14dp"
android:layout_marginEnd="14dp"
android:layout_marginTop="14dp"
android:textAllCaps="true"
android:ellipsize="end"
android:singleLine="true"
android:textStyle="bold"
android:textColor="@color/colorAccent"
tools:text="Title here"/>
</LinearLayout>

View File

@@ -8,7 +8,7 @@
type="it.integry.integrywmsnative.core.rest.model.DocumentoResoDTO" />
</data>
<LinearLayout
<RelativeLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
@@ -20,20 +20,16 @@
android:paddingEnd="8dp"
android:paddingTop="8dp"
android:paddingBottom="8dp"
android:orientation="horizontal"
android:background="@drawable/bg_checked_layout"
app:backgroundTintResID="@{consegna.selected.get() ? R.color.bg_checked_layout : android.R.color.transparent}" >
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content">
<TextView
android:id="@+id/badge1"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="BADGE 1"
tools:text="BADGE 1"
android:background="@drawable/badge1_round_corner"
android:textColor="@android:color/white"
android:paddingTop="2dp"
@@ -61,6 +57,8 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
style="@style/AppTheme.NewMaterial.Text"
android:layout_toEndOf="@id/badge1"
android:textAlignment="textEnd"
android:textColor="@color/colorPrimaryGray"
android:layout_alignParentEnd="true"
android:textSize="14sp"
@@ -77,7 +75,6 @@
android:textSize="12sp"
tools:text="Nome Cognome"/>
</RelativeLayout>
</LinearLayout>
</RelativeLayout>
</layout>