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

Aggiunta seconda unità di misura in Accettazione

Browse Source
This commit is contained in:
Giuseppe Scorrano
2021-03-03 16:36:14 +01:00
parent 838b3b8bb8
commit 26a887c5aa
6 changed files with 258 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files

97
app/src/main/res/layout/accettazione_ordine_inevaso_main_list__group_item.xml
View File

@@ -7,14 +7,14 @@
android:layout_height="wrap_content"
android:background="@color/full_white">
<LinearLayout
<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">
@@ -49,7 +49,8 @@
tools:text="BADGE 2" />
<LinearLayout
<androidx.appcompat.widget.LinearLayoutCompat
android:id="@+id/primary_unt_mis"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="end"
@@ -84,30 +85,86 @@
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/unt_mis"
style="@style/AppTheme.NewMaterial.Text.Small"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="4dp"
android:textAllCaps="true"
android:textColor="@android:color/black"
android:textStyle="bold"
tools:text="cnf" />
</androidx.appcompat.widget.LinearLayoutCompat>
</androidx.appcompat.widget.LinearLayoutCompat>
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content">
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/descrizione"
android:layout_alignParentStart="true"
android:layout_toStartOf="@id/secondary_unt_mis"
style="@style/AppTheme.NewMaterial.Text.Medium"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="4dp"
android:textColor="@android:color/black"
android:textSize="16sp"
tools:text="DESCRIZIONE" />
<androidx.appcompat.widget.LinearLayoutCompat
android:id="@+id/secondary_unt_mis"
android:layout_alignParentEnd="true"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="end"
android:orientation="horizontal"
android:alpha="0.8">
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/sec_qta_evasa"
style="@style/AppTheme.NewMaterial.Text.Small"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="4dp"
android:textColor="@color/green_700"
android:textStyle="bold"
tools:text="QTA" />
<androidx.appcompat.widget.AppCompatTextView
style="@style/AppTheme.NewMaterial.Text.Small"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text=" / "
android:textStyle="bold" />
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/sec_qta_tot"
style="@style/AppTheme.NewMaterial.Text.Small"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textStyle="bold"
android:textColor="@android:color/black"
tools:text="QTA" />
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/sec_unt_mis"
style="@style/AppTheme.NewMaterial.Text.ExtraSmall"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="4dp"
android:textAllCaps="true"
style="@style/AppTheme.NewMaterial.Text.Small"
tools:text="cnf"/>
android:textStyle="bold"
tools:text="cnf" />
</LinearLayout>
</androidx.appcompat.widget.LinearLayoutCompat>
</LinearLayout>
</RelativeLayout>
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/descrizione"
style="@style/AppTheme.NewMaterial.Text.Medium"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="4dp"
android:textColor="@android:color/black"
android:textSize="16sp"
tools:text="DESCRIZIONE" />
</LinearLayout>
</androidx.appcompat.widget.LinearLayoutCompat>
<View
android:id="@+id/deactivated_over_bg"
@@ -115,8 +172,8 @@
android:layout_height="wrap_content"
android:layout_alignTop="@id/content_view_child"
android:layout_alignBottom="@id/content_view_child"
android:background="@android:color/black"
android:alpha="0.15" />
android:alpha="0.15"
android:background="@android:color/black" />
</RelativeLayout>
</layout>

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

@@ -43,6 +43,8 @@
<color name="green_500">#4CAF50</color>
<color name="green_600">#43A047</color>
<color name="green_700">#388E3C</color>
<color name="green_800">#2e7d32</color>
<color name="green_900">#1b5e20</color>
<color name="gray_100">#F5F5F5</color>

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

@@ -23,6 +23,10 @@
<style name="AppTheme.NewMaterial.Text" parent = "AppTheme.NewMaterial">
<item name="android:textStyle">normal</item>
</style>
<style name="AppTheme.NewMaterial.Text.ExtraSmall" parent = "AppTheme.NewMaterial.Text">
<item name="android:textColor">@color/gray_600</item>
<item name="android:textSize">12sp</item>
</style>
<style name="AppTheme.NewMaterial.Text.Small" parent = "AppTheme.NewMaterial.Text">
<item name="android:textColor">@color/gray_600</item>
<item name="android:textSize">14sp</item>