Commit 407f6a7344a37f910e2f77564f66a5cef3b7fd17
1 parent
86ba2e51
Les boutons plus hauts et id
Showing
1 changed file
with
21 additions
and
15 deletions
Show diff stats
PremiereActivite/app/src/main/res/layout/layout_commande.xml
... | ... | @@ -13,6 +13,7 @@ |
13 | 13 | android:orientation="vertical"> |
14 | 14 | |
15 | 15 | <TableLayout |
16 | + android:id="@+id/commande_table_boutons" | |
16 | 17 | android:layout_width="match_parent" |
17 | 18 | android:layout_height="wrap_content" |
18 | 19 | android:layout_gravity="center_horizontal" |
... | ... | @@ -27,30 +28,33 @@ |
27 | 28 | android:layout_width="0dp" |
28 | 29 | android:layout_height="wrap_content" |
29 | 30 | android:text="@string/one" |
30 | - android:id="@+id/button" | |
31 | + android:id="@+id/button1" | |
31 | 32 | android:layout_column="0" |
32 | 33 | android:layout_weight="1" |
33 | - android:height="60dp"/> | |
34 | + android:height="80dp" | |
35 | + android:onClick="valideCommande"/> | |
34 | 36 | |
35 | 37 | <Button |
36 | 38 | style="?android:attr/buttonStyleSmall" |
37 | 39 | android:layout_width="0dp" |
38 | 40 | android:layout_height="wrap_content" |
39 | 41 | android:text="@string/two" |
40 | - android:id="@+id/button3" | |
42 | + android:id="@+id/button2" | |
41 | 43 | android:layout_column="1" |
42 | 44 | android:layout_weight="1" |
43 | - android:height="60dp"/> | |
45 | + android:height="80dp" | |
46 | + android:onClick="valideCommande"/> | |
44 | 47 | |
45 | 48 | <Button |
46 | 49 | style="?android:attr/buttonStyleSmall" |
47 | 50 | android:layout_width="0dp" |
48 | 51 | android:layout_height="wrap_content" |
49 | 52 | android:text="@string/three" |
50 | - android:id="@+id/button4" | |
53 | + android:id="@+id/button3" | |
51 | 54 | android:layout_column="2" |
52 | 55 | android:layout_weight="1" |
53 | - android:height="60dp"/> | |
56 | + android:height="80dp" | |
57 | + android:onClick="valideCommande"/> | |
54 | 58 | |
55 | 59 | </TableRow> |
56 | 60 | |
... | ... | @@ -63,31 +67,34 @@ |
63 | 67 | android:layout_width="0dp" |
64 | 68 | android:layout_height="wrap_content" |
65 | 69 | android:text="@string/four" |
66 | - android:id="@+id/button2" | |
70 | + android:id="@+id/button4" | |
67 | 71 | android:layout_gravity="center_horizontal" |
68 | 72 | android:layout_column="0" |
69 | 73 | android:layout_weight="1" |
70 | - android:height="60dp"/> | |
74 | + android:height="80dp" | |
75 | + android:onClick="valideCommande"/> | |
71 | 76 | |
72 | 77 | <Button |
73 | 78 | style="?android:attr/buttonStyleSmall" |
74 | 79 | android:layout_width="0dp" |
75 | 80 | android:layout_height="wrap_content" |
76 | 81 | android:text="@string/five" |
77 | - android:id="@+id/button6" | |
82 | + android:id="@+id/button5" | |
78 | 83 | android:layout_column="1" |
79 | 84 | android:layout_weight="1" |
80 | - android:height="60dp"/> | |
85 | + android:height="80dp" | |
86 | + android:onClick="valideCommande"/> | |
81 | 87 | |
82 | 88 | <Button |
83 | 89 | style="?android:attr/buttonStyleSmall" |
84 | 90 | android:layout_width="0dp" |
85 | 91 | android:layout_height="wrap_content" |
86 | 92 | android:text="@string/six" |
87 | - android:id="@+id/button5" | |
93 | + android:id="@+id/button6" | |
88 | 94 | android:layout_column="2" |
89 | 95 | android:layout_weight="1" |
90 | - android:height="60dp"/> | |
96 | + android:height="80dp" | |
97 | + android:onClick="valideCommande"/> | |
91 | 98 | </TableRow> |
92 | 99 | |
93 | 100 | </TableLayout> |
... | ... | @@ -95,13 +102,13 @@ |
95 | 102 | <View |
96 | 103 | android:layout_width="match_parent" |
97 | 104 | android:layout_height="1dp" |
98 | - android:background="@android:color/darker_gray" | |
99 | - android:layout_marginBottom="30dp"/> | |
105 | + android:background="@android:color/darker_gray" /> | |
100 | 106 | |
101 | 107 | <EditText |
102 | 108 | android:layout_width="wrap_content" |
103 | 109 | android:layout_height="wrap_content" |
104 | 110 | android:inputType="numberDecimal" |
111 | + android:digits="0123456789,." | |
105 | 112 | android:ems="10" |
106 | 113 | android:id="@+id/commande_prix" |
107 | 114 | android:editable="true" |
... | ... | @@ -112,7 +119,6 @@ |
112 | 119 | android:hint="@string/prix" |
113 | 120 | android:textAlignment="center" |
114 | 121 | android:layout_gravity="center_horizontal" |
115 | - android:layout_marginTop="20dp" | |
116 | 122 | android:height="80dp" |
117 | 123 | android:minHeight="50dp" |
118 | 124 | android:maxHeight="500dp" | ... | ... |