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

Refactoring datasource di Room.

Browse Source 
Refactoring dialog vari.
This commit is contained in:
Giuseppe Scorrano
2022-10-24 18:44:43 +02:00
parent 8216c19338
commit 92d1331630
45 changed files with 814 additions and 1125 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/res/layout/dialog_ask_action_edit_delete.xml
View File

@@ -7,7 +7,7 @@
<data>
<variable
name="viewmodel"
type="it.integry.integrywmsnative.view.dialogs.DialogAskAction" />
type="it.integry.integrywmsnative.view.dialogs.DialogAskActionView" />
</data>
<androidx.cardview.widget.CardView
@@ -16,7 +16,7 @@
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:orientation="vertical"
app:cardCornerRadius="12dp"
app:cardCornerRadius="16dp"
app:cardElevation="0dp">

2
app/src/main/res/layout/dialog_base.xml
View File

@@ -29,7 +29,7 @@
<androidx.appcompat.widget.AppCompatImageView
android:id="@id/title_icon"
android:id="@+id/title_icon"
style="@style/MaterialAlertDialog.Material3.Title.Icon.CenterStacked"
android:layout_width="36dp"
android:layout_height="36dp"

2
app/src/main/res/layout/dialog_scan_art.xml
View File

@@ -8,7 +8,7 @@
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:orientation="vertical"
app:cardCornerRadius="12dp"
app:cardCornerRadius="16dp"
app:cardElevation="0dp">
<androidx.appcompat.widget.LinearLayoutCompat

142
app/src/main/res/layout/dialog_scan_codice_griglia.xml
View File

@@ -3,116 +3,88 @@
<layout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto">
<data>
<variable
name="view"
type="it.integry.integrywmsnative.gest.pv_ordini_acquisto.dialogs.DialogScanLisAView" />
</data>
<androidx.cardview.widget.CardView
android:id="@+id/base_root"
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
app:cardCornerRadius="12dp"
app:cardCornerRadius="16dp"
app:cardElevation="0dp">
<LinearLayout
<androidx.appcompat.widget.LinearLayoutCompat
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical">
<RelativeLayout
android:id="@+id/title_container"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/light_blue_300"
android:gravity="center_horizontal">
<androidx.appcompat.widget.AppCompatImageView
android:id="@+id/title_icon"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/ic_error_white_24dp"
android:layout_margin="24dp"/>
</RelativeLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:padding="24dp">
<TextView
android:id="@+id/title_text"
<androidx.appcompat.widget.LinearLayoutCompat
android:layout_width="match_parent"
android:layout_height="wrap_content"
style="@style/TextViewMaterial.Dialog.HeadlineText"
android:text="@string/title_open_grid_pv"
android:gravity="center_horizontal"/>
android:orientation="vertical"
android:paddingStart="24dp"
android:paddingTop="24dp"
android:paddingEnd="24dp"
android:paddingBottom="12dp">
<LinearLayout
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/title_text"
style="@style/TextViewMaterial.Dialog.HeadlineText"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:layout_marginTop="16dp">
android:gravity="center_horizontal"
android:text="@string/title_open_grid_pv" />
<LinearLayout
android:layout_width="match_parent"
<androidx.appcompat.widget.LinearLayoutCompat
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:layout_marginTop="24dp"
android:orientation="horizontal">
<ProgressBar
android:id="@+id/progressBar"
style="?android:attr/progressBarStyle"
android:layout_width="wrap_content"
android:layout_height="wrap_content" />
<androidx.appcompat.widget.AppCompatTextView
style="@style/AppTheme.NewMaterial.Text"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:weightSum="10">
android:layout_gravity="center_vertical"
android:layout_marginStart="8dp"
android:layout_marginEnd="12dp"
android:gravity="center_horizontal"
android:text="@string/scan_grid"
android:textSize="16sp" />
</androidx.appcompat.widget.LinearLayoutCompat>
<ProgressBar
android:id="@+id/progressBar"
style="?android:attr/progressBarStyle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"/>
<com.google.android.material.button.MaterialButton
android:id="@+id/button_no"
style="@style/Button.DangerOutline"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:layout_marginTop="16dp"
android:text="@string/abort"
android:onClick="@{() -> view.dismiss()}"
app:layout_constraintTop_toTopOf="parent"
app:strokeColor="@color/red_400" />
<androidx.appcompat.widget.AppCompatTextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textSize="16sp"
android:layout_marginStart="8dp"
android:layout_marginEnd="12dp"
android:layout_gravity="center_vertical"
android:gravity="center_horizontal"
style="@style/TextViewMaterial"
android:text="@string/scan_grid"/>
</LinearLayout>
</androidx.appcompat.widget.LinearLayoutCompat>
</androidx.appcompat.widget.LinearLayoutCompat>
<LinearLayout
android:id="@+id/dialog_scan_or_create_lu__creation_layout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical">
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="wrap_content">
<androidx.constraintlayout.widget.Guideline
android:id="@+id/ok_left_buttons_guideline"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:orientation="vertical"
app:layout_constraintGuide_percent="0.15"/>
<androidx.constraintlayout.widget.Guideline
android:id="@+id/ok_right_buttons_guideline"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:orientation="vertical"
app:layout_constraintGuide_percent="0.85"/>
</androidx.constraintlayout.widget.ConstraintLayout>
</LinearLayout>
</LinearLayout>
</LinearLayout>
</LinearLayout>
</androidx.cardview.widget.CardView>

85
app/src/main/res/layout/fragment_pv_ordini_acquisto__list_single_item.xml
View File

@@ -2,69 +2,58 @@
<layout xmlns:app="http://schemas.android.com/apk/res-auto">
<data>
<import type="it.integry.integrywmsnative.R" />
<variable
name="ordine"
type="it.integry.integrywmsnative.core.rest.model.DocumentoResoDTO" />
</data>
<LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:background="?android:attr/selectableItemBackground"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="4dp"
android:layout_marginStart="4dp"
android:layout_marginBottom="4dp"
android:paddingStart="8dp"
android:paddingEnd="8dp"
android:paddingStart="16dp"
android:paddingTop="8dp"
android:paddingBottom="8dp"
android:orientation="horizontal">
android:paddingEnd="8dp"
android:paddingBottom="8dp">
<RelativeLayout
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/order_identifier"
style="@android:style/TextAppearance.Small"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="8dp">
android:layout_marginEnd="4dp"
android:layout_toStartOf="@id/data_ord"
android:ellipsize="end"
android:singleLine="true"
android:textColor="@android:color/black"
tools:text="IDENTIFIER" />
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/data_ord"
style="@style/AppTheme.NewMaterial.Text"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentEnd="true"
android:textColor="@color/colorPrimaryGray"
android:textSize="14sp"
tools:text="13 Apr" />
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/order_identifier"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textColor="@android:color/black"
style="@android:style/TextAppearance.Small"
android:layout_marginEnd="4dp"
android:layout_toStartOf="@id/data_ord"
android:ellipsize="end"
android:singleLine="true"
android:text="aaaaaa"
tools:text="IDENTIFIER"/>
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/data_ord"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
style="@style/AppTheme.NewMaterial.Text"
android:textColor="@color/colorPrimaryGray"
android:layout_alignParentEnd="true"
android:textSize="14sp"
tools:text="13 Apr"/>
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/num_arts"
android:layout_width="match_parent"
android:layout_height="wrap_content"
style="@android:style/TextAppearance.Small"
android:layout_marginTop="4dp"
android:layout_marginEnd="4dp"
android:layout_below="@id/order_identifier"
android:singleLine="true"
android:ellipsize="end"
tools:text="0 Articoli"/>
</RelativeLayout>
</LinearLayout>
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/num_arts"
style="@android:style/TextAppearance.Small"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@id/order_identifier"
android:layout_marginTop="4dp"
android:layout_marginEnd="4dp"
android:ellipsize="end"
android:singleLine="true"
tools:text="0 Articoli" />
</RelativeLayout>
</layout>

2
app/src/main/res/values/strings.xml
View File

@@ -341,7 +341,7 @@
<string name="pv_elenco_ordiniA_title_fragment">Purchase Orders</string>
<string name="pv_elenco_ordiniA_transmitted_title_fragment">Transmitted Orders</string>
<string name="title_open_grid_pv">Select grid</string>
<string name="scan_grid">scan the barcode for the wanted <b>grid</b></string>
<string name="scan_grid">Scan the barcode for the wanted <b>grid</b></string>
<string name="ordini_a_aperti">Open orders</string>
<string name="ordini_a_aperti_progress">Checking for open orders</string>
<string name="ord_acq_num_articoli"><![CDATA[#<b>%s</b> items]]></string>