From 407f6a7344a37f910e2f77564f66a5cef3b7fd17 Mon Sep 17 00:00:00 2001
From: JLo'w <Jean-Loup.Beaussart@polytech-lille.net>
Date: Fri, 6 May 2016 21:27:29 +0200
Subject: [PATCH] Les boutons plus hauts et id

---
 PremiereActivite/app/src/main/res/layout/layout_commande.xml | 36 +++++++++++++++++++++---------------
 1 file changed, 21 insertions(+), 15 deletions(-)

diff --git a/PremiereActivite/app/src/main/res/layout/layout_commande.xml b/PremiereActivite/app/src/main/res/layout/layout_commande.xml
index c5a95e7..5df7a5c 100644
--- a/PremiereActivite/app/src/main/res/layout/layout_commande.xml
+++ b/PremiereActivite/app/src/main/res/layout/layout_commande.xml
@@ -13,6 +13,7 @@
         android:orientation="vertical">
 
         <TableLayout
+            android:id="@+id/commande_table_boutons"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_gravity="center_horizontal"
@@ -27,30 +28,33 @@
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
                     android:text="@string/one"
-                    android:id="@+id/button"
+                    android:id="@+id/button1"
                     android:layout_column="0"
                     android:layout_weight="1"
-                    android:height="60dp"/>
+                    android:height="80dp"
+                    android:onClick="valideCommande"/>
 
                 <Button
                     style="?android:attr/buttonStyleSmall"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
                     android:text="@string/two"
-                    android:id="@+id/button3"
+                    android:id="@+id/button2"
                     android:layout_column="1"
                     android:layout_weight="1"
-                    android:height="60dp"/>
+                    android:height="80dp"
+                    android:onClick="valideCommande"/>
 
                 <Button
                     style="?android:attr/buttonStyleSmall"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
                     android:text="@string/three"
-                    android:id="@+id/button4"
+                    android:id="@+id/button3"
                     android:layout_column="2"
                     android:layout_weight="1"
-                    android:height="60dp"/>
+                    android:height="80dp"
+                    android:onClick="valideCommande"/>
 
             </TableRow>
 
@@ -63,31 +67,34 @@
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
                     android:text="@string/four"
-                    android:id="@+id/button2"
+                    android:id="@+id/button4"
                     android:layout_gravity="center_horizontal"
                     android:layout_column="0"
                     android:layout_weight="1"
-                    android:height="60dp"/>
+                    android:height="80dp"
+                    android:onClick="valideCommande"/>
 
                 <Button
                     style="?android:attr/buttonStyleSmall"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
                     android:text="@string/five"
-                    android:id="@+id/button6"
+                    android:id="@+id/button5"
                     android:layout_column="1"
                     android:layout_weight="1"
-                    android:height="60dp"/>
+                    android:height="80dp"
+                    android:onClick="valideCommande"/>
 
                 <Button
                     style="?android:attr/buttonStyleSmall"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
                     android:text="@string/six"
-                    android:id="@+id/button5"
+                    android:id="@+id/button6"
                     android:layout_column="2"
                     android:layout_weight="1"
-                    android:height="60dp"/>
+                    android:height="80dp"
+                    android:onClick="valideCommande"/>
             </TableRow>
 
         </TableLayout>
@@ -95,13 +102,13 @@
         <View
             android:layout_width="match_parent"
             android:layout_height="1dp"
-            android:background="@android:color/darker_gray"
-            android:layout_marginBottom="30dp"/>
+            android:background="@android:color/darker_gray" />
 
         <EditText
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:inputType="numberDecimal"
+            android:digits="0123456789,."
             android:ems="10"
             android:id="@+id/commande_prix"
             android:editable="true"
@@ -112,7 +119,6 @@
             android:hint="@string/prix"
             android:textAlignment="center"
             android:layout_gravity="center_horizontal"
-            android:layout_marginTop="20dp"
             android:height="80dp"
             android:minHeight="50dp"
             android:maxHeight="500dp"
--
libgit2 0.21.2