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

Merge branch 'develop' into feature/OrdiniAcquisto_PV

Browse Source 
# Conflicts:
#	.idea/assetWizardSettings.xml
#	.idea/misc.xml
This commit is contained in:
Valerio Castellana
2019-11-11 09:35:31 +01:00
parent ac7cd74d7e 3298c1807c
commit 1d3e485319
12 changed files with 210 additions and 133 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
app/src/main/res/layout/dialog_vendita_filtro_avanzato.xml
View File

@@ -47,6 +47,8 @@
style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.Dense.ExposedDropdownMenu"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:imeOptions="actionNext"
android:nextFocusDown="@id/input_id_viaggio"
android:hint="@string/deposit">
<androidx.appcompat.widget.AppCompatAutoCompleteTextView
@@ -55,6 +57,8 @@
android:layout_height="wrap_content"
android:singleLine="true"
android:ellipsize="end"
android:imeOptions="actionNext"
android:nextFocusDown="@id/input_id_viaggio"
app:binding="@{viewmodel.deposito}" />
</com.google.android.material.textfield.TextInputLayout>
@@ -73,6 +77,8 @@
android:layout_height="wrap_content"
android:singleLine="true"
android:ellipsize="end"
android:imeOptions="actionNext"
android:nextFocusForward="@id/filled_exposed_dropdown_num_ords"
app:binding="@{viewmodel.idViaggio}" />
</com.google.android.material.textfield.TextInputLayout>
@@ -93,6 +99,8 @@
android:inputType="number|text"
android:singleLine="true"
android:ellipsize="end"
android:imeOptions="actionNext"
android:nextFocusForward="@id/filled_exposed_dropdown_cliente"
app:binding="@{viewmodel.numOrds}"/>
</com.google.android.material.textfield.TextInputLayout>
@@ -112,6 +120,8 @@
android:inputType="textNoSuggestions"
android:singleLine="true"
android:ellipsize="end"
android:imeOptions="actionNext"
android:nextFocusForward="@id/filled_exposed_dropdown_vettore"
app:binding="@{viewmodel.cliente}"/>
</com.google.android.material.textfield.TextInputLayout>
@@ -131,6 +141,8 @@
android:inputType="textNoSuggestions"
android:singleLine="true"
android:ellipsize="end"
android:imeOptions="actionNext"
android:nextFocusForward="@id/filled_exposed_dropdown_automezzo"
app:binding="@{viewmodel.vettore}"/>
</com.google.android.material.textfield.TextInputLayout>
@@ -150,6 +162,8 @@
android:inputType="textNoSuggestions"
android:singleLine="true"
android:ellipsize="end"
android:imeOptions="actionNext"
android:nextFocusForward="@id/filled_exposed_dropdown_agente"
app:binding="@{viewmodel.automezzo}"/>
</com.google.android.material.textfield.TextInputLayout>
@@ -169,6 +183,8 @@
android:inputType="textNoSuggestions"
android:singleLine="true"
android:ellipsize="end"
android:imeOptions="actionNext"
android:nextFocusForward="@id/filled_exposed_dropdown_term_cons"
app:binding="@{viewmodel.agente}"/>
</com.google.android.material.textfield.TextInputLayout>
@@ -182,13 +198,13 @@
<com.google.android.material.textfield.TextInputEditText
android:id="@+id/filled_exposed_dropdown_data_cons"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:inputType="textNoSuggestions"
android:focusable="false"
android:singleLine="true"
app:binding="@{viewmodel.dataConsegna}"/>
android:id="@+id/filled_exposed_dropdown_data_cons"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:inputType="textNoSuggestions"
android:focusable="false"
android:singleLine="true"
app:binding="@{viewmodel.dataConsegna}"/>
</com.google.android.material.textfield.TextInputLayout>
@@ -201,12 +217,13 @@
android:hint="@string/terms_of_delivery">
<androidx.appcompat.widget.AppCompatAutoCompleteTextView
android:id="@+id/filled_exposed_dropdown_term_cons"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:inputType="textNoSuggestions"
android:singleLine="true"
android:ellipsize="end"
android:id="@+id/filled_exposed_dropdown_term_cons"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:inputType="textNoSuggestions"
android:singleLine="true"
android:ellipsize="end"
android:imeOptions="actionDone"
app:binding="@{viewmodel.terminiConsegna}"/>
</com.google.android.material.textfield.TextInputLayout>

17
app/src/main/res/layout/fragment_main.xml
View File

@@ -54,7 +54,6 @@
android:layout_height="wrap_content">
<LinearLayout
android:id="@+id/menu_container"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical">
@@ -193,6 +192,22 @@
</androidx.cardview.widget.CardView>
<LinearLayout
android:id="@+id/menu_container"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical">
</LinearLayout>
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/current_app_version_name"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:padding="8dp"
android:textAlignment="center"
tools:text="v1.0.0" />
</LinearLayout>
</androidx.core.widget.NestedScrollView>