Commit 12a643ef002ae12d0d84a939b7c834008194ca9b

Authored by JLo'w
1 parent 76de4d29

Nouvelle interface pour les commandes

PremiereActivite/app/src/main/res/layout/layout_commande.xml
... ... @@ -12,25 +12,91 @@
12 12 android:layout_height="wrap_content"
13 13 android:orientation="vertical">
14 14  
15   - <EditText
16   - android:layout_width="wrap_content"
  15 + <TableLayout
  16 + android:layout_width="match_parent"
17 17 android:layout_height="wrap_content"
18   - android:inputType="number"
19   - android:ems="10"
20   - android:id="@+id/commande_quantite"
21   - android:editable="true"
22   - android:elegantTextHeight="true"
23   - android:enabled="true"
24   - android:numeric="integer"
25   - android:width="300dp"
26   - android:hint="@string/quant"
27   - android:textAlignment="center"
28 18 android:layout_gravity="center_horizontal"
29   - android:layout_marginTop="20dp"
30   - android:height="150dp"
31   - android:minHeight="50dp"
32   - android:maxHeight="500dp"
33   - android:minWidth="120dp" />
  19 + android:layout_margin="30dp">
  20 +
  21 + <TableRow
  22 + android:layout_width="match_parent"
  23 + android:layout_height="match_parent">
  24 +
  25 + <Button
  26 + style="?android:attr/buttonStyleSmall"
  27 + android:layout_width="0dp"
  28 + android:layout_height="wrap_content"
  29 + android:text="@string/one"
  30 + android:id="@+id/button"
  31 + android:layout_column="0"
  32 + android:layout_weight="1"
  33 + android:height="60dp"/>
  34 +
  35 + <Button
  36 + style="?android:attr/buttonStyleSmall"
  37 + android:layout_width="0dp"
  38 + android:layout_height="wrap_content"
  39 + android:text="@string/two"
  40 + android:id="@+id/button3"
  41 + android:layout_column="1"
  42 + android:layout_weight="1"
  43 + android:height="60dp"/>
  44 +
  45 + <Button
  46 + style="?android:attr/buttonStyleSmall"
  47 + android:layout_width="0dp"
  48 + android:layout_height="wrap_content"
  49 + android:text="@string/three"
  50 + android:id="@+id/button4"
  51 + android:layout_column="2"
  52 + android:layout_weight="1"
  53 + android:height="60dp"/>
  54 +
  55 + </TableRow>
  56 +
  57 + <TableRow
  58 + android:layout_width="match_parent"
  59 + android:layout_height="match_parent">
  60 +
  61 + <Button
  62 + style="?android:attr/buttonStyleSmall"
  63 + android:layout_width="0dp"
  64 + android:layout_height="wrap_content"
  65 + android:text="@string/four"
  66 + android:id="@+id/button2"
  67 + android:layout_gravity="center_horizontal"
  68 + android:layout_column="0"
  69 + android:layout_weight="1"
  70 + android:height="60dp"/>
  71 +
  72 + <Button
  73 + style="?android:attr/buttonStyleSmall"
  74 + android:layout_width="0dp"
  75 + android:layout_height="wrap_content"
  76 + android:text="@string/five"
  77 + android:id="@+id/button6"
  78 + android:layout_column="1"
  79 + android:layout_weight="1"
  80 + android:height="60dp"/>
  81 +
  82 + <Button
  83 + style="?android:attr/buttonStyleSmall"
  84 + android:layout_width="0dp"
  85 + android:layout_height="wrap_content"
  86 + android:text="@string/six"
  87 + android:id="@+id/button5"
  88 + android:layout_column="2"
  89 + android:layout_weight="1"
  90 + android:height="60dp"/>
  91 + </TableRow>
  92 +
  93 + </TableLayout>
  94 +
  95 + <View
  96 + android:layout_width="match_parent"
  97 + android:layout_height="1dp"
  98 + android:background="@android:color/darker_gray"
  99 + android:layout_marginBottom="30dp"/>
34 100  
35 101 <EditText
36 102 android:layout_width="wrap_content"
... ...
PremiereActivite/app/src/main/res/values/strings.xml
... ... @@ -14,6 +14,12 @@
14 14 <string name="server">Serveur</string>
15 15 <string name="serverTest">Serveur Test</string>
16 16 <string name="serverBar">Serveur Bar</string>
  17 + <string name="one">1</string>
  18 + <string name="two">2</string>
  19 + <string name="three">3</string>
  20 + <string name="four">4</string>
  21 + <string name="five">5</string>
  22 + <string name="six">6</string>
17 23  
18 24 <array name="server_entries">
19 25 <item>Polytech Bar</item>
... ...