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

Prima versione stabile del refactoring della Spedizione V2

Browse Source
This commit is contained in:
Giuseppe Scorrano
2020-04-03 13:50:07 +02:00
parent f0bbc60ab6
commit bd2532755c
12 changed files with 318 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
app/src/main/res/layout/dialog_input_quantity_v2.xml
View File

@@ -380,7 +380,7 @@
style="@style/TextInputLayout.OutlinePrimary"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="@{viewmodel.mtbAart.flagTracciabilitaBoolean && viewmodel.mtbAart.ggScadPartita != null && viewmodel.mtbAart.ggScadPartita > 0 ? 1f : 2f}"
android:layout_weight="@{viewmodel.shouldAskDataScad ? 1f : 2f}"
android:paddingEnd="4dp"
tools:layout_weight="1">
@@ -400,7 +400,7 @@
style="@style/TextInputLayout.OutlinePrimary"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:visibility="@{viewmodel.mtbAart.flagTracciabilitaBoolean && viewmodel.mtbAart.ggScadPartita != null && viewmodel.mtbAart.ggScadPartita > 0 ? View.VISIBLE : View.GONE}"
android:visibility="@{viewmodel.shouldAskDataScad ? View.VISIBLE : View.GONE}"
android:layout_weight="1">
<com.google.android.material.textfield.TextInputEditText
@@ -432,6 +432,7 @@
android:layout_height="wrap_content"
android:layout_weight="@{!viewmodel.mtbAart.flagQtaCnfFissaBoolean ? 1f : 1.5f}"
android:paddingEnd="4dp"
android:enabled="@{view.enabledNumCnf}"
tools:layout_weight="1">
<com.google.android.material.textfield.TextInputEditText
@@ -452,6 +453,7 @@
android:layout_height="wrap_content"
android:layout_weight="1"
android:paddingEnd="4dp"
android:enabled="@{view.enabledQtaCnf}"
android:visibility="@{!viewmodel.mtbAart.flagQtaCnfFissaBoolean ? View.VISIBLE : View.GONE}">
<com.google.android.material.textfield.TextInputEditText
@@ -471,6 +473,7 @@
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="@{!viewmodel.mtbAart.flagQtaCnfFissaBoolean ? 1f : 1.5f}"
android:enabled="@{view.enabledQtaTot}"
tools:layout_weight="1">
<com.google.android.material.textfield.TextInputEditText

12
app/src/main/res/values/styles.xml
View File

@@ -124,14 +124,22 @@
</style>
<style name="ErrorFloatingLabel" parent="@android:style/TextAppearance">
<style name="OrangeFloatingLabel" parent="@android:style/TextAppearance">
<item name="colorAccent">@color/orange_600</item>
<item name="android:textColor">@color/orange_600</item>
<item name="android:textSize">12sp</item>
<item name="colorControlNormal">@color/orange_600</item>
<item name="colorControlActivated">@color/orange_600</item>
<item name="colorControlHighlight">@color/orange_600</item>
</style>
<style name="ErrorFloatingLabel" parent="@android:style/TextAppearance">
<item name="android:textColor">@color/red_500</item>
<item name="android:textSize">12sp</item>
<item name="colorControlNormal">@color/red_500</item>
<item name="colorControlActivated">@color/red_500</item>
<item name="colorControlHighlight">@color/red_500</item>
</style>
<style name="NormalFloatingLabel" parent="@android:style/TextAppearance">
<style name="NormalFloatingLabel" parent="@android:style/TextAppearance">
<item name="android:textColor">@color/colorPrimary</item>
<item name="android:textSize">12sp</item>
<item name="colorControlNormal">@color/colorPrimary</item>