From de439ff07bc0d76feeefd1e9519655973066aaf7 Mon Sep 17 00:00:00 2001
From: jacques <jacques+commit@foucry.net>
Date: Sun, 26 Apr 2020 22:35:49 +0200
Subject: [PATCH] Change some layout according helpers; Change save icon for
 material design ones

---
 .../main/res/drawable/ic_save_black_24dp.xml  |  9 +++++
 .../res/layout/activity_medicament_detail.xml |  2 +-
 app/src/main/res/layout/info_cell.xml         | 15 ++++---
 app/src/main/res/layout/value_input.xml       | 39 ++++++++++---------
 4 files changed, 40 insertions(+), 25 deletions(-)
 create mode 100644 app/src/main/res/drawable/ic_save_black_24dp.xml

diff --git a/app/src/main/res/drawable/ic_save_black_24dp.xml b/app/src/main/res/drawable/ic_save_black_24dp.xml
new file mode 100644
index 0000000..a561d63
--- /dev/null
+++ b/app/src/main/res/drawable/ic_save_black_24dp.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M17,3L5,3c-1.11,0 -2,0.9 -2,2v14c0,1.1 0.89,2 2,2h14c1.1,0 2,-0.9 2,-2L21,7l-4,-4zM12,19c-1.66,0 -3,-1.34 -3,-3s1.34,-3 3,-3 3,1.34 3,3 -1.34,3 -3,3zM15,9L5,9L5,5h10v4z"/>
+</vector>
diff --git a/app/src/main/res/layout/activity_medicament_detail.xml b/app/src/main/res/layout/activity_medicament_detail.xml
index 2f1e212..dd74bf5 100644
--- a/app/src/main/res/layout/activity_medicament_detail.xml
+++ b/app/src/main/res/layout/activity_medicament_detail.xml
@@ -45,7 +45,7 @@
         android:layout_height="60dp"
         android:layout_gravity="center_vertical|start"
         android:layout_margin="@dimen/fab_margin"
-        android:src="@android:drawable/ic_menu_save"
+        android:src="@drawable/ic_save_black_24dp"
         app:layout_anchor="@+id/medicament_detail_container"
         app:layout_anchorGravity="top|end" />
 
diff --git a/app/src/main/res/layout/info_cell.xml b/app/src/main/res/layout/info_cell.xml
index 27bf6d1..39b3356 100644
--- a/app/src/main/res/layout/info_cell.xml
+++ b/app/src/main/res/layout/info_cell.xml
@@ -3,27 +3,30 @@
     android:orientation="vertical" android:layout_width="match_parent"
     android:layout_height="50dp"
     android:background="@drawable/list_selector">
+
     <TextView
         android:id="@+id/valeur"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:paddingStart="10sp"
+        android:paddingEnd="10sp"
+        android:paddingTop="5dp"
         android:text="Valeur"
-        android:textSize="16dp"
         android:textColor="#040404"
-        android:textStyle="bold"
-        android:paddingLeft="10dp"
-        android:paddingTop="5dp"/>
+        android:textSize="16sp"
+        android:textStyle="bold" />
     <TextView
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:text="Label"
         android:layout_below="@+id/valeur"
-        android:layout_alignParentLeft="true"
+        android:layout_alignParentStart="true"
         android:textStyle="italic"
         android:textColor="#0c4758"
         android:background="@android:color/transparent"
         android:id="@+id/label"
-        android:paddingLeft="10sp"
+        android:paddingStart="10sp"
+        android:paddingEnd="10sp"
         android:paddingTop="5dp"/>
 
 </RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/value_input.xml b/app/src/main/res/layout/value_input.xml
index 956fd07..e8bf8b1 100644
--- a/app/src/main/res/layout/value_input.xml
+++ b/app/src/main/res/layout/value_input.xml
@@ -3,34 +3,37 @@
     android:layout_width="match_parent" android:layout_height="match_parent">
 
     <TextView
+        android:id="@+id/libelle"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:textAppearance="?android:attr/textAppearanceMedium"
-        android:text="Medium Text"
-        android:id="@+id/libelle"
-        android:background="@drawable/list_selector"
-        android:textStyle="bold"
-        android:textColor="#040404"
-        android:paddingLeft="5dp"
-        android:layout_alignParentLeft="true"
+        android:layout_alignBottom="@+id/valeur"
+        android:layout_alignParentStart="true"
         android:layout_alignParentTop="true"
+        android:layout_toStartOf="@id/valeur"
+        android:background="@drawable/list_selector"
         android:gravity="center_vertical"
-        android:layout_toLeftOf="@+id/valeur"
-        android:layout_alignBottom="@+id/valeur" />
+        android:paddingStart="5dp"
+        android:paddingEnd="25dp"
+        android:text="Medium Text"
+        android:textAppearance="?android:attr/textAppearanceMedium"
+        android:textColor="#040404"
+        android:textStyle="bold" />
 
     <EditText
+        android:id="@+id/valeur"
         android:layout_width="wrap_content"
         android:layout_height="50dp"
-        android:inputType="numberDecimal"
-        android:ems="10"
-        android:id="@+id/valeur"
-        android:paddingRight="25dp"
         android:layout_alignParentTop="true"
-        android:layout_alignParentRight="true"
-        android:textAlignment="gravity"
+        android:layout_alignParentEnd="true"
+        android:autofillHints=""
         android:background="@drawable/list_selector"
+        android:ems="10"
+        android:gravity="end|fill_vertical"
+        android:inputType="numberDecimal"
+        android:labelFor="@id/valeur"
+        android:paddingEnd="25dp"
+        android:paddingStart="5dp"
         android:text="0"
-        android:gravity="right|fill_vertical"
-        android:numeric="decimal" />
+        android:textAlignment="gravity" />
 
 </RelativeLayout>
\ No newline at end of file