From 837a87f80b3845f57eaa1c9e5235e88ee5b525a3 Mon Sep 17 00:00:00 2001
From: Jacques Foucry <jacques@foucry.net>
Date: Mon, 25 Jul 2016 22:44:32 +0200
Subject: [PATCH] =?UTF-8?q?Agrandissement=20de=20la=20taille=20de=20la=20c?=
 =?UTF-8?q?ellule=20et=20r=C3=A9ordonnancement=20des=20=C3=A9l=C3=A9ments?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../res/layout/medicament_list_content.xml    | 95 ++++++++++---------
 1 file changed, 50 insertions(+), 45 deletions(-)

diff --git a/app/src/main/res/layout/medicament_list_content.xml b/app/src/main/res/layout/medicament_list_content.xml
index 0f038f7..f5be3b6 100644
--- a/app/src/main/res/layout/medicament_list_content.xml
+++ b/app/src/main/res/layout/medicament_list_content.xml
@@ -1,63 +1,67 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="wrap_content"
-    android:layout_height="60dp"
+    android:layout_height="80dp"
     android:orientation="horizontal">
 
-    <LinearLayout android:id="@+id/thumbnail"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:padding="3dip"
-        android:layout_alignParentLeft="true"
-        android:background="@android:color/transparent"
-        android:layout_marginRight="0sp">
+    <!-- Drug's name-->
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
 
         <ImageView
             android:id="@+id/list_image"
             android:layout_width="50sp"
             android:layout_height="50sp"
             android:layout_marginLeft="5dp"
-            android:layout_marginTop="2dp"
-            android:src="@drawable/stock_ok" />
-        </LinearLayout>
-    <!-- Drug's name-->
-    <TextView
-        android:id="@+id/valeur"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_alignTop="@+id/thumbnail"
-        android:layout_toRightOf="@+id/thumbnail"
-        android:text="Nom Médicament"
-        android:textColor="#040404"
-        android:typeface="sans"
-        android:textSize="16sp"
-        android:textStyle="bold"/>
+            android:src="@drawable/stock_ok"
+            android:contentDescription="Icone de stock"
+            android:layout_centerVertical="true"
+            android:layout_alignParentStart="true" />
+
+        <TextView
+            android:id="@+id/valeur"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="Nom Médicament"
+            android:textColor="#040404"
+            android:typeface="sans"
+            android:textSize="16sp"
+            android:textStyle="bold"
+            android:layout_alignTop="@+id/list_image"
+            android:layout_toEndOf="@+id/list_image"
+            android:layout_marginLeft="5dp" />
+
+        <TextView
+            android:id="@+id/cip13"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:textColor="#343434"
+            android:textSize="14sp"
+            android:text="cip13 goes here"
+            android:layout_below="@+id/valeur"
+            android:layout_toEndOf="@+id/list_image"
+            android:layout_marginLeft="5dp" />
+
+        <TextView
+            android:id="@+id/endOfStock"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:gravity="right"
+            android:text="lundi 1 janvier 2001"
+            android:layout_marginRight="15dp"
+            android:textSize="14sp"
+            android:textColor="#212121"
+            android:textStyle="bold"
+            android:layout_alignParentBottom="true"
+            android:layout_alignParentEnd="true"
+            android:layout_marginEnd="30dp"
+            android:layout_marginBottom="5dp" />
+    </RelativeLayout>
 
     <!-- CIP 13 (should change) -->
-    <TextView
-        android:id="@+id/cip13"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:layout_below="@id/valeur"
-        android:textColor="#343434"
-        android:textSize="14sp"
-        android:layout_marginTop="1sp"
-        android:layout_toRightOf="@+id/thumbnail"
-        android:text="cip13 goes here" />
 
     <!-- dateEndOfStock -->
-    <TextView
-        android:id="@+id/endOfStock"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_alignParentRight="true"
-        android:layout_alignTop="@id/valeur"
-        android:gravity="right"
-        android:text="lundi 1 janvier 2001"
-        android:layout_marginRight="15dp"
-        android:textSize="14sp"
-        android:textColor="#212121"
-        android:textStyle="bold"/>
 
     <!-- Rightend Arrow -->
     <ImageView android:layout_width="wrap_content"
@@ -66,4 +70,5 @@
         android:layout_alignParentRight="true"
         android:layout_centerVertical="true"
         android:layout_marginRight="10sp"/>
+
 </RelativeLayout>
\ No newline at end of file