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

Merge branch 'develop' into feature/Refactoring_Spedizione

Browse Source 
# Conflicts:
#	app/src/main/java/it/integry/integrywmsnative/core/utility/UtilityExceptions.java
This commit is contained in:
Giuseppe Scorrano
2020-03-12 11:51:10 +01:00
parent b2330b6416 b78eab563d
commit 05ae932906
8 changed files with 99 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
app/src/main/res/drawable/ic_black_truck.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.1 KiB

109
app/src/main/res/layout/vendita_main_list_group_model.xml
View File

@@ -1,12 +1,14 @@
<?xml version="1.0" encoding="utf-8"?>
<layout xmlns:app="http://schemas.android.com/apk/res-auto">
<layout>
<data>
<import type="it.integry.integrywmsnative.R" />
<variable
name="checkboxValue"
type="it.integry.integrywmsnative.core.di.BindableBoolean" />
</data>
@@ -22,12 +24,12 @@
android:id="@+id/vendita_main_list_group_item_container_root"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingStart="2dp"
android:paddingEnd="8dp"
android:paddingTop="8dp"
android:paddingBottom="8dp"
android:layout_toEndOf="@id/empty_view"
android:background="@color/full_white">
android:background="@color/full_white"
android:paddingStart="2dp"
android:paddingTop="8dp"
android:paddingEnd="8dp"
android:paddingBottom="8dp">
<androidx.appcompat.widget.AppCompatCheckBox
@@ -36,53 +38,90 @@
android:layout_height="wrap_content"
android:background="@android:color/transparent" />
<RelativeLayout
<androidx.appcompat.widget.LinearLayoutCompat
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentEnd="true"
android:layout_toEndOf="@id/vendita_main_list_group_item_container_checkBox">
android:layout_toEndOf="@id/vendita_main_list_group_item_container_checkBox"
android:orientation="vertical">
<TextView
android:id="@+id/vendita_main_list_group_item_container_testata_data_cons"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="Cons 07 nov 2018"
android:layout_alignParentEnd="true"
android:textColor="#000" />
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content">
<TextView
android:id="@+id/vendita_main_list_group_item_container_testata_ord"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="Ord. Ven. 39 del 27 ott 2017"
android:ellipsize="end"
android:maxLines="1"
android:textColor="#000"
android:layout_alignParentStart="true"
android:layout_toStartOf="@id/vendita_main_list_group_item_container_testata_data_cons"/>
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/vendita_main_list_group_item_container_testata_ord"
style="@style/AppTheme.NewMaterial.Text.Small"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentStart="true"
android:layout_toStartOf="@id/vendita_main_list_group_item_container_testata_data_cons"
android:ellipsize="end"
android:maxLines="1"
android:textColor="#000"
tools:text="Ord. Ven. 39 del 27 ott 2017" />
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/vendita_main_list_group_item_container_testata_data_cons"
style="@style/AppTheme.NewMaterial.Text.Small"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentEnd="true"
android:textColor="#000"
tools:text="Cons 07 nov 2018" />
</RelativeLayout>
<TextView
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/vendita_main_list_group_item_container_detail_ord"
style="@style/AppTheme.NewMaterial.Text.Small"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:maxLines="1"
android:ellipsize="end"
android:maxLines="1"
android:paddingEnd="6dp"
android:text="TextView"
android:layout_below="@+id/vendita_main_list_group_item_container_testata_ord" />
tools:text="Destinatario - Indirizzo" />
</RelativeLayout>
<androidx.appcompat.widget.LinearLayoutCompat
android:id="@+id/vendita_main_list_group_item_container_vettore_layout"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:gravity="center_vertical">
<androidx.appcompat.widget.AppCompatImageView
android:layout_width="18dp"
android:layout_height="18dp"
android:src="@drawable/ic_black_truck"
android:adjustViewBounds="true"
android:tint="@color/gray_600"
android:layout_marginEnd="4dp"/>
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/vendita_main_list_group_item_container_vettore"
style="@style/AppTheme.NewMaterial.Text.Small"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:ellipsize="end"
android:maxLines="1"
android:paddingEnd="6dp"
tools:text="Vettore: Ragione sociale" />
</androidx.appcompat.widget.LinearLayoutCompat>
</androidx.appcompat.widget.LinearLayoutCompat>
</RelativeLayout>
<View
android:id="@+id/empty_view"
android:layout_marginTop="2dp"
android:layout_marginBottom="2dp"
android:layout_width="8dp"
android:layout_height="wrap_content"
android:layout_alignTop="@id/vendita_main_list_group_item_container_root"
android:layout_alignBottom="@id/vendita_main_list_group_item_container_root"/>
android:layout_alignBottom="@id/vendita_main_list_group_item_container_root"
android:layout_marginTop="2dp"
android:layout_marginBottom="2dp" />
</RelativeLayout>