Completata finestra di info sulle righe in picking uscita

This commit is contained in:
2021-03-03 10:26:20 +01:00
parent 0133a9232f
commit 1020a31b89
66 changed files with 1153 additions and 393 deletions

View File

@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="512dp"
android:height="512dp"
android:width="128dp"
android:height="128dp"
android:viewportWidth="512"
android:viewportHeight="512">

View File

@@ -1,6 +1,6 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="512dp"
android:height="512dp"
android:width="128dp"
android:height="128dp"
android:viewportWidth="512"
android:viewportHeight="512">
<path

View File

@@ -1,6 +1,6 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="512dp"
android:height="512dp"
android:width="128dp"
android:height="128dp"
android:viewportWidth="512"
android:viewportHeight="512">
<path

View File

@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="250dp"
android:height="105dp"
android:width="200dp"
android:height="84dp"
android:viewportWidth="250"
android:viewportHeight="105">

View File

@@ -8,7 +8,7 @@
android:background="@color/full_white">
<LinearLayout
android:id="@+id/content_view"
android:id="@+id/content_view_child"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
@@ -113,8 +113,8 @@
android:id="@+id/deactivated_over_bg"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_alignTop="@id/content_view"
android:layout_alignBottom="@id/content_view"
android:layout_alignTop="@id/content_view_child"
android:layout_alignBottom="@id/content_view_child"
android:background="@android:color/black"
android:alpha="0.15" />

View File

@@ -73,21 +73,21 @@
android:layout_width="match_parent"
android:layout_height="wrap_content">
<com.google.android.material.textfield.TextInputLayout
android:id="@+id/input_linea_prod"
style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.Dense.ExposedDropdownMenu"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:hint="@string/production_line">
<!-- <com.google.android.material.textfield.TextInputLayout-->
<!-- android:id="@+id/input_linea_prod"-->
<!-- style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.Dense.ExposedDropdownMenu"-->
<!-- android:layout_width="match_parent"-->
<!-- android:layout_height="wrap_content"-->
<!-- android:hint="@string/production_line">-->
<androidx.appcompat.widget.AppCompatAutoCompleteTextView
android:id="@+id/dropdown_linea_prod"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:singleLine="true"
android:ellipsize="end"/>
<!-- <androidx.appcompat.widget.AppCompatAutoCompleteTextView-->
<!-- android:id="@+id/dropdown_linea_prod"-->
<!-- android:layout_width="match_parent"-->
<!-- android:layout_height="wrap_content"-->
<!-- android:singleLine="true"-->
<!-- android:ellipsize="end"/>-->
</com.google.android.material.textfield.TextInputLayout>
<!-- </com.google.android.material.textfield.TextInputLayout>-->
<androidx.appcompat.widget.LinearLayoutCompat

View File

@@ -1,8 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout
xmlns:android="http://schemas.android.com/apk/res/android"
<RelativeLayout 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"
@@ -13,41 +12,43 @@
android:layout_width="match_parent"
android:layout_height="wrap_content">
<androidx.constraintlayout.widget.Guideline
android:id="@+id/guideline"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="vertical"
app:layout_constraintGuide_percent="0.40" />
<androidx.constraintlayout.widget.Guideline
android:id="@+id/guideline"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="vertical"
app:layout_constraintGuide_percent="0.40" />
<TextView
android:id="@+id/dialog_content_hashmap_key"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginEnd="0dp"
android:layout_marginStart="0dp"
tools:text="TextView"
android:textColor="@android:color/black"
android:textSize="16sp"
app:layout_constraintEnd_toStartOf="@+id/guideline"
app:layout_constraintStart_toStartOf="parent" />
<TextView
android:id="@+id/dialog_content_hashmap_key"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="0dp"
android:layout_marginEnd="0dp"
android:textColor="@android:color/black"
android:textSize="16sp"
app:layout_constraintEnd_toStartOf="@+id/guideline"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
tools:text="TextView" />
<TextView
android:id="@+id/dialog_content_hashmap_value"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginEnd="0dp"
android:layout_marginStart="0dp"
tools:text="TextView"
android:textSize="16sp"
app:layout_constraintStart_toStartOf="@+id/guideline"
app:layout_constraintEnd_toEndOf="parent" />
<TextView
android:id="@+id/dialog_content_hashmap_value"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="0dp"
android:layout_marginEnd="0dp"
android:textSize="16sp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="@+id/guideline"
app:layout_constraintTop_toTopOf="parent"
tools:text="TextView" />
</androidx.constraintlayout.widget.ConstraintLayout>
</RelativeLayout>
<!--<LinearLayout-->
<!--<LinearLayout-->
<!--xmlns:android="http://schemas.android.com/apk/res/android"-->
<!--android:layout_width="match_parent"-->
<!--android:layout_height="wrap_content"-->
@@ -56,18 +57,18 @@
<!--android:weightSum="1">-->
<!--<android.support.v7.widget.AppCompatTextView-->
<!--android:id="@+id/dialog_content_hashmap_key"-->
<!--android:layout_width="wrap_content"-->
<!--android:layout_height="wrap_content"-->
<!--android:text="Key"-->
<!--android:textColor="@android:color/black"-->
<!--android:layout_weight="0.4"/>-->
<!--android:id="@+id/dialog_content_hashmap_key"-->
<!--android:layout_width="wrap_content"-->
<!--android:layout_height="wrap_content"-->
<!--android:text="Key"-->
<!--android:textColor="@android:color/black"-->
<!--android:layout_weight="0.4"/>-->
<!--<android.support.v7.widget.AppCompatTextView-->
<!--android:id="@+id/dialog_content_hashmap_value"-->
<!--android:layout_width="wrap_content"-->
<!--android:layout_height="wrap_content"-->
<!--android:text="Value"-->
<!--android:layout_weight="0.6"/>-->
<!--android:id="@+id/dialog_content_hashmap_value"-->
<!--android:layout_width="wrap_content"-->
<!--android:layout_height="wrap_content"-->
<!--android:text="Value"-->
<!--android:layout_weight="0.6"/>-->
<!--</LinearLayout>-->
<!--</LinearLayout>-->

View File

@@ -0,0 +1,88 @@
<?xml version="1.0" encoding="utf-8"?>
<layout 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">
<androidx.cardview.widget.CardView
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:cardCornerRadius="12dp"
app:cardElevation="0dp">
<ScrollView
android:layout_width="match_parent"
android:layout_height="match_parent">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:padding="16dp">
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/title_text"
style="@style/TextViewMaterial.DialogTitle"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="8dp"
android:gravity="center_horizontal"
android:text="@string/info" />
<androidx.appcompat.widget.LinearLayoutCompat
android:id="@+id/loading_view"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical">
<!-- <androidx.appcompat.widget.AppCompatTextView-->
<!-- style="@style/TextViewMaterial.DialogTitle"-->
<!-- android:layout_width="match_parent"-->
<!-- android:layout_height="wrap_content"-->
<!-- android:gravity="center_horizontal"-->
<!-- android:text="@string/loading" />-->
<ProgressBar
android:id="@+id/progressBar"
style="@style/Widget.AppCompat.ProgressBar.Horizontal"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:indeterminate="true" />
</androidx.appcompat.widget.LinearLayoutCompat>
<androidx.appcompat.widget.LinearLayoutCompat
android:id="@+id/content_view"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:gravity="center_horizontal">
<androidx.appcompat.widget.AppCompatTextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
style="@style/AppTheme.NewMaterial.Text.Medium"
android:text="Linee di impegno"
android:layout_marginBottom="8dp"/>
<androidx.appcompat.widget.LinearLayoutCompat
android:id="@+id/content_view_child"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical">
</androidx.appcompat.widget.LinearLayoutCompat>
</androidx.appcompat.widget.LinearLayoutCompat>
</LinearLayout>
</ScrollView>
</androidx.cardview.widget.CardView>
</layout>

View File

@@ -32,7 +32,7 @@
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"
@@ -49,7 +49,6 @@
style="@android:style/TextAppearance.Small"
android:layout_marginTop="4dp"
android:layout_marginEnd="4dp"
android:layout_toStartOf="@id/compilato_da"
android:layout_below="@id/badge1"
android:singleLine="true"
android:ellipsize="end"

View File

@@ -1,30 +1,33 @@
<?xml version="1.0" encoding="utf-8"?>
<layout xmlns:tools="http://schemas.android.com/tools"
xmlns:app="http://schemas.android.com/apk/res-auto">
<layout xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools">
<data>
<import type="android.view.View" />
<import type="it.integry.integrywmsnative.core.utility.UtilityString" />
<import type="it.integry.integrywmsnative.core.utility.UtilityNumber" />
<variable
name="articolo"
type="it.integry.integrywmsnative.core.data_store.db.entity.ArticoloOrdine" />
</data>
<androidx.constraintlayout.widget.ConstraintLayout
xmlns:android="http://schemas.android.com/apk/res/android"
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:padding="8dp">
<LinearLayout
android:id="@+id/linearLayout"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:orientation="vertical"
app:layout_constraintEnd_toStartOf="@+id/qta_box"
app:layout_constraintStart_toStartOf="parent">
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent">
<androidx.appcompat.widget.AppCompatTextView
@@ -65,9 +68,9 @@
android:layout_height="wrap_content"
android:paddingStart="12dp"
android:paddingEnd="12dp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toBottomOf="parent">
app:layout_constraintTop_toTopOf="parent">
<androidx.appcompat.widget.AppCompatTextView
android:layout_width="wrap_content"
@@ -79,8 +82,8 @@
android:paddingRight="6dp"
android:paddingBottom="2dp"
android:text="@{UtilityNumber.decimalToString(articolo.qtaOrd) + `\n` + articolo.untMis}"
android:textSize="16sp"
android:textColor="@android:color/white"
android:textSize="16sp"
android:textStyle="bold"
tools:text="280.45\nCONF" />

View File

@@ -9,7 +9,7 @@
android:focusable="true">
<LinearLayout
android:id="@+id/content_view"
android:id="@+id/content_view_child"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
@@ -101,8 +101,8 @@
android:id="@+id/deactivated_over_bg"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_alignTop="@id/content_view"
android:layout_alignBottom="@id/content_view"
android:layout_alignTop="@id/content_view_child"
android:layout_alignBottom="@id/content_view_child"
android:background="@android:color/black"
android:alpha="0.15" />

View File

@@ -8,14 +8,14 @@
android:layout_height="wrap_content"
android:background="@color/full_white">
<LinearLayout
android:id="@+id/content_view"
<androidx.appcompat.widget.LinearLayoutCompat
android:id="@+id/content_view_child"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:padding="8dp">
<LinearLayout
<androidx.appcompat.widget.LinearLayoutCompat
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal">
@@ -35,7 +35,7 @@
style="@style/AppTheme.NewMaterial.Text.Small"/>
<LinearLayout
<androidx.appcompat.widget.LinearLayoutCompat
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
@@ -84,12 +84,25 @@
android:textColor="@android:color/black"
android:layout_marginStart="4dp"
android:textAllCaps="true"
android:layout_gravity="center_vertical"
style="@style/AppTheme.NewMaterial.Text.Small"
tools:text="cnf"/>
</LinearLayout>
</LinearLayout>
<androidx.appcompat.widget.AppCompatImageButton
android:id="@+id/info_row"
android:layout_width="22sp"
android:layout_height="22sp"
android:layout_marginStart="8dp"
android:adjustViewBounds="true"
android:scaleType="fitCenter"
android:background="@drawable/ic_info_78dp"
android:backgroundTint="@color/colorPrimary"
android:visibility="gone"/>
</androidx.appcompat.widget.LinearLayoutCompat>
</androidx.appcompat.widget.LinearLayoutCompat>
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/descrizione"
@@ -110,8 +123,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="vertical"
android:layout_alignParentStart="true"
android:layout_toStartOf="@+id/vendita_ordine_inevaso_main_list_group_item_badge2">
android:layout_alignParentStart="true">
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/subdescrizione1"
@@ -153,14 +165,14 @@
</LinearLayout>
</androidx.appcompat.widget.LinearLayoutCompat>
<View
android:id="@+id/deactivated_over_bg"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_alignTop="@id/content_view"
android:layout_alignBottom="@id/content_view"
android:layout_alignTop="@id/content_view_child"
android:layout_alignBottom="@id/content_view_child"
android:background="@android:color/black"
android:alpha="0.15" />

View File

@@ -1,11 +0,0 @@
<RelativeLayout
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent">
<Switch
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerHorizontal="true"
android:layout_centerVertical="true" />
</RelativeLayout>

View File

@@ -6,7 +6,7 @@
android:background="@color/full_white">
<LinearLayout
android:id="@+id/content_view"
android:id="@+id/content_view_child"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
@@ -156,8 +156,8 @@
android:id="@+id/deactivated_over_bg"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_alignTop="@id/content_view"
android:layout_alignBottom="@id/content_view"
android:layout_alignTop="@id/content_view_child"
android:layout_alignBottom="@id/content_view_child"
android:background="@android:color/black"
android:alpha="0.15" />

View File

@@ -35,6 +35,7 @@
<string name="scan_item">Scansiona il codice a barre di un <b>articolo</b></string>
<string name="please_open_lu">Prima di procedere apri una <b>nuova UL</b></string>
<string name="extra_item">Articolo extra</string>
<string name="info">Info</string>
<string name="lu_info">Info UL</string>

View File

@@ -78,6 +78,7 @@
<string name="action_close_order">Close order</string>
<string name="action_show_created_ul">Show already created LU</string>
<string name="dialog_input_peso_lu_description">Insert info about LU TYPE and NET / GROSS weight</string>
<string name="info">Info</string>
<string name="lu_info">LU\'s info</string>

View File

@@ -0,0 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<full-backup-content>
<!-- Exclude specific shared preferences that contain GCM registration Id -->
</full-backup-content>