Commit 1e53ac5a94084a8b6a39f9c9470c928701af2613
1 parent
ecd8a267
Jolis scrolls
Showing
6 changed files
with
253 additions
and
207 deletions
Show diff stats
PremiereActivite/app/src/main/res/layout-v23/layout_commande.xml
| 1 | <?xml version="1.0" encoding="utf-8"?> | 1 | <?xml version="1.0" encoding="utf-8"?> |
| 2 | -<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" | 2 | +<ScrollView xmlns:android="http://schemas.android.com/apk/res/android" |
| 3 | android:orientation="vertical" android:layout_width="match_parent" | 3 | android:orientation="vertical" android:layout_width="match_parent" |
| 4 | android:layout_height="match_parent" | 4 | android:layout_height="match_parent" |
| 5 | android:baselineAligned="false" | 5 | android:baselineAligned="false" |
| 6 | android:weightSum="1" | 6 | android:weightSum="1" |
| 7 | - android:nestedScrollingEnabled="true"> | 7 | + android:nestedScrollingEnabled="true" |
| 8 | + android:id="@+id/scrollView2"> | ||
| 8 | 9 | ||
| 9 | - | ||
| 10 | - <EditText | ||
| 11 | - android:layout_width="wrap_content" | 10 | + <LinearLayout |
| 11 | + android:layout_width="match_parent" | ||
| 12 | android:layout_height="wrap_content" | 12 | android:layout_height="wrap_content" |
| 13 | - android:inputType="number" | ||
| 14 | - android:ems="10" | ||
| 15 | - android:id="@+id/commande_quantite" | ||
| 16 | - android:editable="true" | ||
| 17 | - android:elegantTextHeight="true" | ||
| 18 | - android:enabled="true" | ||
| 19 | - android:numeric="integer" | ||
| 20 | - android:width="300dp" | ||
| 21 | - android:hint="@string/quant" | ||
| 22 | - android:textAlignment="center" | ||
| 23 | - android:layout_gravity="center_horizontal" | ||
| 24 | - android:layout_marginTop="20dp" | ||
| 25 | - android:height="150dp" | ||
| 26 | - android:minHeight="50dp" | ||
| 27 | - android:maxHeight="500dp" | ||
| 28 | - android:minWidth="120dp" /> | 13 | + android:orientation="vertical"> |
| 29 | 14 | ||
| 30 | - <EditText | ||
| 31 | - android:layout_width="wrap_content" | ||
| 32 | - android:layout_height="wrap_content" | ||
| 33 | - android:inputType="number" | ||
| 34 | - android:ems="10" | ||
| 35 | - android:id="@+id/commande_prix" | ||
| 36 | - android:editable="true" | ||
| 37 | - android:elegantTextHeight="true" | ||
| 38 | - android:enabled="true" | ||
| 39 | - android:numeric="decimal" | ||
| 40 | - android:width="300dp" | ||
| 41 | - android:hint="@string/prix" | ||
| 42 | - android:textAlignment="center" | ||
| 43 | - android:layout_gravity="center_horizontal" | ||
| 44 | - android:layout_marginTop="20dp" | ||
| 45 | - android:height="80dp" | ||
| 46 | - android:minHeight="50dp" | ||
| 47 | - android:maxHeight="500dp" | ||
| 48 | - android:minWidth="120dp" /> | 15 | + <EditText |
| 16 | + android:layout_width="wrap_content" | ||
| 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 | + 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" /> | ||
| 49 | 34 | ||
| 50 | - <Button | ||
| 51 | - android:layout_width="wrap_content" | ||
| 52 | - android:layout_height="wrap_content" | ||
| 53 | - android:text="@string/validate" | ||
| 54 | - android:id="@+id/commande_validation" | ||
| 55 | - android:layout_gravity="center_horizontal" | ||
| 56 | - android:layout_marginTop="40dp" | ||
| 57 | - android:width="180dp" | ||
| 58 | - android:height="80dp" | ||
| 59 | - android:onClick="valideCommande" | ||
| 60 | - android:nestedScrollingEnabled="false" | ||
| 61 | - android:enabled="true" /> | 35 | + <EditText |
| 36 | + android:layout_width="wrap_content" | ||
| 37 | + android:layout_height="wrap_content" | ||
| 38 | + android:inputType="number" | ||
| 39 | + android:ems="10" | ||
| 40 | + android:id="@+id/commande_prix" | ||
| 41 | + android:editable="true" | ||
| 42 | + android:elegantTextHeight="true" | ||
| 43 | + android:enabled="true" | ||
| 44 | + android:numeric="decimal" | ||
| 45 | + android:width="300dp" | ||
| 46 | + android:hint="@string/prix" | ||
| 47 | + android:textAlignment="center" | ||
| 48 | + android:layout_gravity="center_horizontal" | ||
| 49 | + android:layout_marginTop="20dp" | ||
| 50 | + android:height="80dp" | ||
| 51 | + android:minHeight="50dp" | ||
| 52 | + android:maxHeight="500dp" | ||
| 53 | + android:minWidth="120dp" /> | ||
| 54 | + | ||
| 55 | + <Button | ||
| 56 | + android:layout_width="wrap_content" | ||
| 57 | + android:layout_height="wrap_content" | ||
| 58 | + android:text="@string/validate" | ||
| 59 | + android:id="@+id/commande_validation" | ||
| 60 | + android:layout_gravity="center_horizontal" | ||
| 61 | + android:layout_marginTop="40dp" | ||
| 62 | + android:width="180dp" | ||
| 63 | + android:height="80dp" | ||
| 64 | + android:onClick="valideCommande" | ||
| 65 | + android:nestedScrollingEnabled="false" | ||
| 66 | + android:enabled="true" /> | ||
| 67 | + | ||
| 68 | + </LinearLayout> | ||
| 62 | 69 | ||
| 63 | -</LinearLayout> | ||
| 64 | \ No newline at end of file | 70 | \ No newline at end of file |
| 71 | +</ScrollView> | ||
| 65 | \ No newline at end of file | 72 | \ No newline at end of file |
PremiereActivite/app/src/main/res/layout/layout_carte.xml
| 1 | <?xml version="1.0" encoding="utf-8"?> | 1 | <?xml version="1.0" encoding="utf-8"?> |
| 2 | -<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" | ||
| 3 | - xmlns:tools="http://schemas.android.com/tools" | ||
| 4 | - xmlns:app="http://schemas.android.com/apk/res-auto" | 2 | +<ScrollView xmlns:android="http://schemas.android.com/apk/res/android" |
| 5 | android:layout_width="match_parent" | 3 | android:layout_width="match_parent" |
| 6 | android:layout_height="match_parent" | 4 | android:layout_height="match_parent" |
| 7 | - android:orientation="vertical"> | 5 | + android:orientation="vertical" |
| 6 | + android:id="@+id/scrollView1"> | ||
| 8 | 7 | ||
| 9 | - <TextView | ||
| 10 | - android:layout_width="wrap_content" | 8 | + <LinearLayout |
| 9 | + android:layout_width="match_parent" | ||
| 11 | android:layout_height="wrap_content" | 10 | android:layout_height="wrap_content" |
| 12 | - android:text="@string/passCarte" | ||
| 13 | - android:id="@+id/textView_carte" | ||
| 14 | - android:layout_gravity="center_horizontal" | ||
| 15 | - android:enabled="true" | ||
| 16 | - android:textAlignment="center" | ||
| 17 | - android:textSize="50sp" | ||
| 18 | - android:layout_marginTop="40dp" | ||
| 19 | - android:inputType="none" /> | ||
| 20 | -</LinearLayout> | ||
| 21 | \ No newline at end of file | 11 | \ No newline at end of file |
| 12 | + android:orientation="vertical"> | ||
| 13 | + | ||
| 14 | + <TextView | ||
| 15 | + android:layout_width="wrap_content" | ||
| 16 | + android:layout_height="wrap_content" | ||
| 17 | + android:text="@string/passCarte" | ||
| 18 | + android:id="@+id/textView_carte" | ||
| 19 | + android:layout_gravity="center_horizontal" | ||
| 20 | + android:enabled="true" | ||
| 21 | + android:textAlignment="center" | ||
| 22 | + android:textSize="50sp" | ||
| 23 | + android:layout_marginTop="40dp" | ||
| 24 | + android:inputType="none" /> | ||
| 25 | + | ||
| 26 | + </LinearLayout> | ||
| 27 | +</ScrollView> | ||
| 22 | \ No newline at end of file | 28 | \ No newline at end of file |
PremiereActivite/app/src/main/res/layout/layout_connection.xml
| 1 | <?xml version="1.0" encoding="utf-8"?> | 1 | <?xml version="1.0" encoding="utf-8"?> |
| 2 | -<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" | ||
| 3 | - android:orientation="vertical" android:layout_width="match_parent" | ||
| 4 | - android:layout_height="match_parent"> | ||
| 5 | 2 | ||
| 6 | - <EditText | ||
| 7 | - android:layout_width="wrap_content" | ||
| 8 | - android:layout_height="wrap_content" | ||
| 9 | - android:id="@+id/connection_username" | ||
| 10 | - android:layout_gravity="center_horizontal" | ||
| 11 | - android:editable="true" | ||
| 12 | - android:enabled="true" | ||
| 13 | - android:focusable="true" | ||
| 14 | - android:focusableInTouchMode="true" | ||
| 15 | - android:inputType="text" | ||
| 16 | - android:minHeight="80dp" | ||
| 17 | - android:minWidth="250dp" | ||
| 18 | - android:width="250dp" | ||
| 19 | - android:hint="@string/user" | ||
| 20 | - android:height="80dp" | ||
| 21 | - android:textAlignment="center" /> | 3 | + <ScrollView xmlns:android="http://schemas.android.com/apk/res/android" |
| 4 | + android:layout_width="match_parent" | ||
| 5 | + android:layout_height="match_parent" | ||
| 6 | + android:id="@+id/scrollView3"> | ||
| 22 | 7 | ||
| 23 | - <EditText | ||
| 24 | - android:layout_width="wrap_content" | ||
| 25 | - android:layout_height="wrap_content" | ||
| 26 | - android:id="@+id/connection_password" | ||
| 27 | - android:layout_gravity="center_horizontal" | ||
| 28 | - android:hint="@string/password" | ||
| 29 | - android:inputType="textPassword" | ||
| 30 | - android:editable="true" | ||
| 31 | - android:enabled="true" | ||
| 32 | - android:focusable="true" | ||
| 33 | - android:focusableInTouchMode="true" | ||
| 34 | - android:height="80dp" | ||
| 35 | - android:minHeight="80dp" | ||
| 36 | - android:minWidth="250dp" | ||
| 37 | - android:password="true" | ||
| 38 | - android:width="250dp" | ||
| 39 | - android:layout_marginTop="40dp" | ||
| 40 | - android:textAlignment="center" /> | 8 | + <LinearLayout |
| 9 | + android:orientation="vertical" | ||
| 10 | + android:layout_width="match_parent" | ||
| 11 | + android:layout_height="wrap_content"> | ||
| 41 | 12 | ||
| 42 | - <Button | ||
| 43 | - android:layout_width="wrap_content" | ||
| 44 | - android:layout_height="wrap_content" | ||
| 45 | - android:text="@string/validate" | ||
| 46 | - android:id="@+id/connection_button" | ||
| 47 | - android:layout_gravity="center_horizontal" | ||
| 48 | - android:layout_marginTop="40dp" | ||
| 49 | - android:clickable="true" | ||
| 50 | - android:enabled="true" | ||
| 51 | - android:height="50dp" | ||
| 52 | - android:hint="@string/validate" | ||
| 53 | - android:minHeight="40dp" | ||
| 54 | - android:minWidth="150dp" | ||
| 55 | - android:onClick="valideConnection" | ||
| 56 | - android:textAlignment="center" | ||
| 57 | - android:width="150dp" /> | ||
| 58 | -</LinearLayout> | ||
| 59 | \ No newline at end of file | 13 | \ No newline at end of file |
| 14 | + <EditText | ||
| 15 | + android:layout_width="wrap_content" | ||
| 16 | + android:layout_height="wrap_content" | ||
| 17 | + android:id="@+id/connection_username" | ||
| 18 | + android:layout_gravity="center_horizontal" | ||
| 19 | + android:editable="true" | ||
| 20 | + android:enabled="true" | ||
| 21 | + android:focusable="true" | ||
| 22 | + android:focusableInTouchMode="true" | ||
| 23 | + android:inputType="text" | ||
| 24 | + android:minHeight="80dp" | ||
| 25 | + android:minWidth="250dp" | ||
| 26 | + android:width="250dp" | ||
| 27 | + android:hint="@string/user" | ||
| 28 | + android:height="80dp" | ||
| 29 | + android:textAlignment="center" /> | ||
| 30 | + | ||
| 31 | + <EditText | ||
| 32 | + android:layout_width="wrap_content" | ||
| 33 | + android:layout_height="wrap_content" | ||
| 34 | + android:id="@+id/connection_password" | ||
| 35 | + android:layout_gravity="center_horizontal" | ||
| 36 | + android:hint="@string/password" | ||
| 37 | + android:inputType="textPassword" | ||
| 38 | + android:editable="true" | ||
| 39 | + android:enabled="true" | ||
| 40 | + android:focusable="true" | ||
| 41 | + android:focusableInTouchMode="true" | ||
| 42 | + android:height="80dp" | ||
| 43 | + android:minHeight="80dp" | ||
| 44 | + android:minWidth="250dp" | ||
| 45 | + android:password="true" | ||
| 46 | + android:width="250dp" | ||
| 47 | + android:layout_marginTop="40dp" | ||
| 48 | + android:textAlignment="center" /> | ||
| 49 | + | ||
| 50 | + <Button | ||
| 51 | + android:layout_width="wrap_content" | ||
| 52 | + android:layout_height="wrap_content" | ||
| 53 | + android:text="@string/validate" | ||
| 54 | + android:id="@+id/connection_button" | ||
| 55 | + android:layout_gravity="center_horizontal" | ||
| 56 | + android:layout_marginTop="40dp" | ||
| 57 | + android:clickable="true" | ||
| 58 | + android:enabled="true" | ||
| 59 | + android:height="50dp" | ||
| 60 | + android:hint="@string/validate" | ||
| 61 | + android:minHeight="40dp" | ||
| 62 | + android:minWidth="150dp" | ||
| 63 | + android:onClick="valideConnection" | ||
| 64 | + android:textAlignment="center" | ||
| 65 | + android:width="150dp" /> | ||
| 66 | + </LinearLayout> | ||
| 67 | + </ScrollView> | ||
| 60 | \ No newline at end of file | 68 | \ No newline at end of file |
PremiereActivite/app/src/main/res/layout/layout_creation.xml
| 1 | <?xml version="1.0" encoding="utf-8"?> | 1 | <?xml version="1.0" encoding="utf-8"?> |
| 2 | -<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" | 2 | +<ScrollView xmlns:android="http://schemas.android.com/apk/res/android" |
| 3 | android:orientation="vertical" android:layout_width="match_parent" | 3 | android:orientation="vertical" android:layout_width="match_parent" |
| 4 | - android:layout_height="match_parent"> | 4 | + android:layout_height="match_parent" |
| 5 | + android:id="@+id/scrollView4"> | ||
| 5 | 6 | ||
| 6 | - <EditText | ||
| 7 | - android:layout_width="wrap_content" | 7 | + <LinearLayout |
| 8 | + android:layout_width="match_parent" | ||
| 8 | android:layout_height="wrap_content" | 9 | android:layout_height="wrap_content" |
| 9 | - android:inputType="numberDecimal" | ||
| 10 | - android:ems="10" | ||
| 11 | - android:id="@+id/creation_montant" | ||
| 12 | - android:layout_gravity="center_horizontal" | ||
| 13 | - android:editable="true" | ||
| 14 | - android:elegantTextHeight="true" | ||
| 15 | - android:enabled="true" | ||
| 16 | - android:focusable="true" | ||
| 17 | - android:focusableInTouchMode="true" | ||
| 18 | - android:minHeight="80dp" | ||
| 19 | - android:minWidth="200dp" | ||
| 20 | - android:numeric="decimal" | ||
| 21 | - android:width="250dp" | ||
| 22 | - android:layout_marginTop="80dp" | ||
| 23 | - android:hint="@string/montant" | ||
| 24 | - android:textAlignment="center" /> | 10 | + android:orientation="vertical"> |
| 25 | 11 | ||
| 26 | - <Button | ||
| 27 | - android:layout_width="wrap_content" | ||
| 28 | - android:layout_height="wrap_content" | ||
| 29 | - android:text="@string/validate" | ||
| 30 | - android:id="@+id/creation_validation" | ||
| 31 | - android:layout_gravity="center_horizontal" | ||
| 32 | - android:layout_marginTop="80dp" | ||
| 33 | - android:elegantTextHeight="true" | ||
| 34 | - android:enabled="true" | ||
| 35 | - android:height="80dp" | ||
| 36 | - android:minHeight="80dp" | ||
| 37 | - android:minWidth="150dp" | ||
| 38 | - android:textAlignment="center" | ||
| 39 | - android:width="200dp" | ||
| 40 | - android:onClick="valideCreationCompte" /> | ||
| 41 | -</LinearLayout> | ||
| 42 | \ No newline at end of file | 12 | \ No newline at end of file |
| 13 | + <EditText | ||
| 14 | + android:layout_width="wrap_content" | ||
| 15 | + android:layout_height="wrap_content" | ||
| 16 | + android:inputType="numberDecimal" | ||
| 17 | + android:ems="10" | ||
| 18 | + android:id="@+id/creation_montant" | ||
| 19 | + android:layout_gravity="center_horizontal" | ||
| 20 | + android:editable="true" | ||
| 21 | + android:elegantTextHeight="true" | ||
| 22 | + android:enabled="true" | ||
| 23 | + android:focusable="true" | ||
| 24 | + android:focusableInTouchMode="true" | ||
| 25 | + android:minHeight="80dp" | ||
| 26 | + android:minWidth="200dp" | ||
| 27 | + android:numeric="decimal" | ||
| 28 | + android:width="250dp" | ||
| 29 | + android:layout_marginTop="80dp" | ||
| 30 | + android:hint="@string/montant" | ||
| 31 | + android:textAlignment="center" /> | ||
| 32 | + | ||
| 33 | + <Button | ||
| 34 | + android:layout_width="wrap_content" | ||
| 35 | + android:layout_height="wrap_content" | ||
| 36 | + android:text="@string/validate" | ||
| 37 | + android:id="@+id/creation_validation" | ||
| 38 | + android:layout_gravity="center_horizontal" | ||
| 39 | + android:layout_marginTop="80dp" | ||
| 40 | + android:elegantTextHeight="true" | ||
| 41 | + android:enabled="true" | ||
| 42 | + android:height="80dp" | ||
| 43 | + android:minHeight="80dp" | ||
| 44 | + android:minWidth="150dp" | ||
| 45 | + android:textAlignment="center" | ||
| 46 | + android:width="200dp" | ||
| 47 | + android:onClick="valideCreationCompte" /> | ||
| 48 | + | ||
| 49 | + </LinearLayout> | ||
| 50 | +</ScrollView> | ||
| 43 | \ No newline at end of file | 51 | \ No newline at end of file |
PremiereActivite/app/src/main/res/layout/layout_rechargement.xml
| 1 | <?xml version="1.0" encoding="utf-8"?> | 1 | <?xml version="1.0" encoding="utf-8"?> |
| 2 | -<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" | 2 | +<ScrollView xmlns:android="http://schemas.android.com/apk/res/android" |
| 3 | android:orientation="vertical" android:layout_width="match_parent" | 3 | android:orientation="vertical" android:layout_width="match_parent" |
| 4 | android:layout_height="match_parent" | 4 | android:layout_height="match_parent" |
| 5 | - android:gravity="center_horizontal"> | 5 | + android:gravity="center_horizontal" |
| 6 | + android:id="@+id/scrollView5"> | ||
| 6 | 7 | ||
| 7 | - <EditText | ||
| 8 | - android:layout_width="wrap_content" | 8 | + <LinearLayout |
| 9 | + android:layout_width="match_parent" | ||
| 9 | android:layout_height="wrap_content" | 10 | android:layout_height="wrap_content" |
| 10 | - android:inputType="numberDecimal" | ||
| 11 | - android:ems="10" | ||
| 12 | - android:id="@+id/rechargement_champ_montant" | ||
| 13 | - android:layout_gravity="center_horizontal" | ||
| 14 | - android:layout_marginTop="80dp" | ||
| 15 | - android:editable="true" | ||
| 16 | - android:elegantTextHeight="true" | ||
| 17 | - android:enabled="true" | ||
| 18 | - android:height="150dp" | ||
| 19 | - android:maxHeight="500dp" | ||
| 20 | - android:maxLength="10" | ||
| 21 | - android:maxWidth="600dp" | ||
| 22 | - android:minHeight="80dp" | ||
| 23 | - android:numeric="decimal" | ||
| 24 | - android:width="300dp" | ||
| 25 | - android:hint="@string/montant" | ||
| 26 | - android:textAlignment="center" | ||
| 27 | - android:textStyle="bold" /> | 11 | + android:orientation="vertical"> |
| 28 | 12 | ||
| 29 | - <Button | ||
| 30 | - android:layout_width="wrap_content" | ||
| 31 | - android:layout_height="wrap_content" | ||
| 32 | - android:text="@string/validate" | ||
| 33 | - android:id="@+id/rechargement_bouton" | ||
| 34 | - android:layout_marginTop="80dp" | ||
| 35 | - android:layout_gravity="center_horizontal" | ||
| 36 | - android:minWidth="150dp" | ||
| 37 | - android:minHeight="50dp" | ||
| 38 | - android:textAlignment="center" | ||
| 39 | - android:width="150dp" | ||
| 40 | - android:elegantTextHeight="true" | ||
| 41 | - android:enabled="true" | ||
| 42 | - android:onClick="valideRechargement" | ||
| 43 | - android:height="80dp" | ||
| 44 | - android:maxHeight="200dp" | ||
| 45 | - android:maxWidth="150dp" /> | ||
| 46 | -</LinearLayout> | ||
| 47 | \ No newline at end of file | 13 | \ No newline at end of file |
| 14 | + <EditText | ||
| 15 | + android:layout_width="wrap_content" | ||
| 16 | + android:layout_height="wrap_content" | ||
| 17 | + android:inputType="numberDecimal" | ||
| 18 | + android:ems="10" | ||
| 19 | + android:id="@+id/rechargement_champ_montant" | ||
| 20 | + android:layout_gravity="center_horizontal" | ||
| 21 | + android:layout_marginTop="80dp" | ||
| 22 | + android:editable="true" | ||
| 23 | + android:elegantTextHeight="true" | ||
| 24 | + android:enabled="true" | ||
| 25 | + android:height="150dp" | ||
| 26 | + android:maxHeight="500dp" | ||
| 27 | + android:maxLength="10" | ||
| 28 | + android:maxWidth="600dp" | ||
| 29 | + android:minHeight="80dp" | ||
| 30 | + android:numeric="decimal" | ||
| 31 | + android:width="300dp" | ||
| 32 | + android:hint="@string/montant" | ||
| 33 | + android:textAlignment="center" | ||
| 34 | + android:textStyle="bold" /> | ||
| 35 | + | ||
| 36 | + <Button | ||
| 37 | + android:layout_width="wrap_content" | ||
| 38 | + android:layout_height="wrap_content" | ||
| 39 | + android:text="@string/validate" | ||
| 40 | + android:id="@+id/rechargement_bouton" | ||
| 41 | + android:layout_marginTop="80dp" | ||
| 42 | + android:layout_gravity="center_horizontal" | ||
| 43 | + android:minWidth="150dp" | ||
| 44 | + android:minHeight="50dp" | ||
| 45 | + android:textAlignment="center" | ||
| 46 | + android:width="150dp" | ||
| 47 | + android:elegantTextHeight="true" | ||
| 48 | + android:enabled="true" | ||
| 49 | + android:onClick="valideRechargement" | ||
| 50 | + android:height="80dp" | ||
| 51 | + android:maxHeight="200dp" | ||
| 52 | + android:maxWidth="150dp" /> | ||
| 53 | + | ||
| 54 | + </LinearLayout> | ||
| 55 | + | ||
| 56 | +</ScrollView> | ||
| 48 | \ No newline at end of file | 57 | \ No newline at end of file |
PremiereActivite/app/src/main/res/layout/layout_vidange.xml
| 1 | <?xml version="1.0" encoding="utf-8"?> | 1 | <?xml version="1.0" encoding="utf-8"?> |
| 2 | -<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" | 2 | +<ScrollView xmlns:android="http://schemas.android.com/apk/res/android" |
| 3 | android:orientation="vertical" android:layout_width="match_parent" | 3 | android:orientation="vertical" android:layout_width="match_parent" |
| 4 | - android:layout_height="match_parent"> | 4 | + android:layout_height="match_parent" |
| 5 | + android:id="@+id/scrollView6"> | ||
| 5 | 6 | ||
| 6 | - <TextView | ||
| 7 | - android:layout_width="wrap_content" | 7 | + <LinearLayout |
| 8 | + android:layout_width="match_parent" | ||
| 8 | android:layout_height="wrap_content" | 9 | android:layout_height="wrap_content" |
| 9 | - android:text="@string/vidange" | ||
| 10 | - android:id="@+id/textView" | ||
| 11 | - android:layout_gravity="center_horizontal" | ||
| 12 | - android:layout_marginTop="50dp" /> | ||
| 13 | -</LinearLayout> | ||
| 14 | \ No newline at end of file | 10 | \ No newline at end of file |
| 11 | + android:orientation="vertical"> | ||
| 12 | + | ||
| 13 | + <TextView | ||
| 14 | + android:layout_width="wrap_content" | ||
| 15 | + android:layout_height="wrap_content" | ||
| 16 | + android:text="@string/vidange" | ||
| 17 | + android:id="@+id/textView" | ||
| 18 | + android:layout_gravity="center_horizontal" | ||
| 19 | + android:layout_marginTop="50dp" /> | ||
| 20 | + | ||
| 21 | + </LinearLayout> | ||
| 22 | +</ScrollView> | ||
| 15 | \ No newline at end of file | 23 | \ No newline at end of file |