From 1e53ac5a94084a8b6a39f9c9470c928701af2613 Mon Sep 17 00:00:00 2001
From: JLo'w <Jean-Loup.Beaussart@polytech-lille.net>
Date: Mon, 2 May 2016 10:50:13 +0200
Subject: [PATCH] Jolis scrolls

---
 PremiereActivite/app/src/main/res/layout-v23/layout_commande.xml | 113 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-----------------------------------------------------
 PremiereActivite/app/src/main/res/layout/layout_carte.xml        |  36 +++++++++++++++++++++---------------
 PremiereActivite/app/src/main/res/layout/layout_connection.xml   | 116 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++------------------------------------------------------
 PremiereActivite/app/src/main/res/layout/layout_creation.xml     |  80 ++++++++++++++++++++++++++++++++++++++++++++------------------------------------
 PremiereActivite/app/src/main/res/layout/layout_rechargement.xml |  89 +++++++++++++++++++++++++++++++++++++++++++++++++----------------------------------------
 PremiereActivite/app/src/main/res/layout/layout_vidange.xml      |  26 +++++++++++++++++---------
 6 files changed, 253 insertions(+), 207 deletions(-)

diff --git a/PremiereActivite/app/src/main/res/layout-v23/layout_commande.xml b/PremiereActivite/app/src/main/res/layout-v23/layout_commande.xml
index f9348df..10ed674 100644
--- a/PremiereActivite/app/src/main/res/layout-v23/layout_commande.xml
+++ b/PremiereActivite/app/src/main/res/layout-v23/layout_commande.xml
@@ -1,63 +1,70 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
     android:orientation="vertical" android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:baselineAligned="false"
     android:weightSum="1"
-    android:nestedScrollingEnabled="true">
+    android:nestedScrollingEnabled="true"
+    android:id="@+id/scrollView2">
 
-
-    <EditText
-        android:layout_width="wrap_content"
+    <LinearLayout
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:inputType="number"
-        android:ems="10"
-        android:id="@+id/commande_quantite"
-        android:editable="true"
-        android:elegantTextHeight="true"
-        android:enabled="true"
-        android:numeric="integer"
-        android:width="300dp"
-        android:hint="@string/quant"
-        android:textAlignment="center"
-        android:layout_gravity="center_horizontal"
-        android:layout_marginTop="20dp"
-        android:height="150dp"
-        android:minHeight="50dp"
-        android:maxHeight="500dp"
-        android:minWidth="120dp" />
+        android:orientation="vertical">
 
-    <EditText
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:inputType="number"
-        android:ems="10"
-        android:id="@+id/commande_prix"
-        android:editable="true"
-        android:elegantTextHeight="true"
-        android:enabled="true"
-        android:numeric="decimal"
-        android:width="300dp"
-        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"
-        android:minWidth="120dp" />
+        <EditText
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:inputType="number"
+            android:ems="10"
+            android:id="@+id/commande_quantite"
+            android:editable="true"
+            android:elegantTextHeight="true"
+            android:enabled="true"
+            android:numeric="integer"
+            android:width="300dp"
+            android:hint="@string/quant"
+            android:textAlignment="center"
+            android:layout_gravity="center_horizontal"
+            android:layout_marginTop="20dp"
+            android:height="150dp"
+            android:minHeight="50dp"
+            android:maxHeight="500dp"
+            android:minWidth="120dp" />
 
-    <Button
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="@string/validate"
-        android:id="@+id/commande_validation"
-        android:layout_gravity="center_horizontal"
-        android:layout_marginTop="40dp"
-        android:width="180dp"
-        android:height="80dp"
-        android:onClick="valideCommande"
-        android:nestedScrollingEnabled="false"
-        android:enabled="true" />
+        <EditText
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:inputType="number"
+            android:ems="10"
+            android:id="@+id/commande_prix"
+            android:editable="true"
+            android:elegantTextHeight="true"
+            android:enabled="true"
+            android:numeric="decimal"
+            android:width="300dp"
+            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"
+            android:minWidth="120dp" />
+
+        <Button
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/validate"
+            android:id="@+id/commande_validation"
+            android:layout_gravity="center_horizontal"
+            android:layout_marginTop="40dp"
+            android:width="180dp"
+            android:height="80dp"
+            android:onClick="valideCommande"
+            android:nestedScrollingEnabled="false"
+            android:enabled="true" />
+
+    </LinearLayout>
 
-</LinearLayout>
\ No newline at end of file
+</ScrollView>
\ No newline at end of file
diff --git a/PremiereActivite/app/src/main/res/layout/layout_carte.xml b/PremiereActivite/app/src/main/res/layout/layout_carte.xml
index 6843fa6..243d3f9 100644
--- a/PremiereActivite/app/src/main/res/layout/layout_carte.xml
+++ b/PremiereActivite/app/src/main/res/layout/layout_carte.xml
@@ -1,20 +1,26 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:orientation="vertical">
+    android:orientation="vertical"
+    android:id="@+id/scrollView1">
 
-    <TextView
-        android:layout_width="wrap_content"
+    <LinearLayout
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:text="@string/passCarte"
-        android:id="@+id/textView_carte"
-        android:layout_gravity="center_horizontal"
-        android:enabled="true"
-        android:textAlignment="center"
-        android:textSize="50sp"
-        android:layout_marginTop="40dp"
-        android:inputType="none" />
-</LinearLayout>
\ No newline at end of file
+        android:orientation="vertical">
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/passCarte"
+            android:id="@+id/textView_carte"
+            android:layout_gravity="center_horizontal"
+            android:enabled="true"
+            android:textAlignment="center"
+            android:textSize="50sp"
+            android:layout_marginTop="40dp"
+            android:inputType="none" />
+
+    </LinearLayout>
+</ScrollView>
\ No newline at end of file
diff --git a/PremiereActivite/app/src/main/res/layout/layout_connection.xml b/PremiereActivite/app/src/main/res/layout/layout_connection.xml
index 43ffc04..296ffe0 100644
--- a/PremiereActivite/app/src/main/res/layout/layout_connection.xml
+++ b/PremiereActivite/app/src/main/res/layout/layout_connection.xml
@@ -1,58 +1,66 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="vertical" android:layout_width="match_parent"
-    android:layout_height="match_parent">
 
-    <EditText
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:id="@+id/connection_username"
-        android:layout_gravity="center_horizontal"
-        android:editable="true"
-        android:enabled="true"
-        android:focusable="true"
-        android:focusableInTouchMode="true"
-        android:inputType="text"
-        android:minHeight="80dp"
-        android:minWidth="250dp"
-        android:width="250dp"
-        android:hint="@string/user"
-        android:height="80dp"
-        android:textAlignment="center" />
+    <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:id="@+id/scrollView3">
 
-    <EditText
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:id="@+id/connection_password"
-        android:layout_gravity="center_horizontal"
-        android:hint="@string/password"
-        android:inputType="textPassword"
-        android:editable="true"
-        android:enabled="true"
-        android:focusable="true"
-        android:focusableInTouchMode="true"
-        android:height="80dp"
-        android:minHeight="80dp"
-        android:minWidth="250dp"
-        android:password="true"
-        android:width="250dp"
-        android:layout_marginTop="40dp"
-        android:textAlignment="center" />
+        <LinearLayout
+            android:orientation="vertical"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
 
-    <Button
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="@string/validate"
-        android:id="@+id/connection_button"
-        android:layout_gravity="center_horizontal"
-        android:layout_marginTop="40dp"
-        android:clickable="true"
-        android:enabled="true"
-        android:height="50dp"
-        android:hint="@string/validate"
-        android:minHeight="40dp"
-        android:minWidth="150dp"
-        android:onClick="valideConnection"
-        android:textAlignment="center"
-        android:width="150dp" />
-</LinearLayout>
\ No newline at end of file
+            <EditText
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:id="@+id/connection_username"
+                android:layout_gravity="center_horizontal"
+                android:editable="true"
+                android:enabled="true"
+                android:focusable="true"
+                android:focusableInTouchMode="true"
+                android:inputType="text"
+                android:minHeight="80dp"
+                android:minWidth="250dp"
+                android:width="250dp"
+                android:hint="@string/user"
+                android:height="80dp"
+                android:textAlignment="center" />
+
+            <EditText
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:id="@+id/connection_password"
+                android:layout_gravity="center_horizontal"
+                android:hint="@string/password"
+                android:inputType="textPassword"
+                android:editable="true"
+                android:enabled="true"
+                android:focusable="true"
+                android:focusableInTouchMode="true"
+                android:height="80dp"
+                android:minHeight="80dp"
+                android:minWidth="250dp"
+                android:password="true"
+                android:width="250dp"
+                android:layout_marginTop="40dp"
+                android:textAlignment="center" />
+
+            <Button
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/validate"
+                android:id="@+id/connection_button"
+                android:layout_gravity="center_horizontal"
+                android:layout_marginTop="40dp"
+                android:clickable="true"
+                android:enabled="true"
+                android:height="50dp"
+                android:hint="@string/validate"
+                android:minHeight="40dp"
+                android:minWidth="150dp"
+                android:onClick="valideConnection"
+                android:textAlignment="center"
+                android:width="150dp" />
+        </LinearLayout>
+    </ScrollView>
\ No newline at end of file
diff --git a/PremiereActivite/app/src/main/res/layout/layout_creation.xml b/PremiereActivite/app/src/main/res/layout/layout_creation.xml
index 9abccd6..3a93586 100644
--- a/PremiereActivite/app/src/main/res/layout/layout_creation.xml
+++ b/PremiereActivite/app/src/main/res/layout/layout_creation.xml
@@ -1,41 +1,49 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
     android:orientation="vertical" android:layout_width="match_parent"
-    android:layout_height="match_parent">
+    android:layout_height="match_parent"
+    android:id="@+id/scrollView4">
 
-    <EditText
-        android:layout_width="wrap_content"
+    <LinearLayout
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:inputType="numberDecimal"
-        android:ems="10"
-        android:id="@+id/creation_montant"
-        android:layout_gravity="center_horizontal"
-        android:editable="true"
-        android:elegantTextHeight="true"
-        android:enabled="true"
-        android:focusable="true"
-        android:focusableInTouchMode="true"
-        android:minHeight="80dp"
-        android:minWidth="200dp"
-        android:numeric="decimal"
-        android:width="250dp"
-        android:layout_marginTop="80dp"
-        android:hint="@string/montant"
-        android:textAlignment="center" />
+        android:orientation="vertical">
 
-    <Button
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="@string/validate"
-        android:id="@+id/creation_validation"
-        android:layout_gravity="center_horizontal"
-        android:layout_marginTop="80dp"
-        android:elegantTextHeight="true"
-        android:enabled="true"
-        android:height="80dp"
-        android:minHeight="80dp"
-        android:minWidth="150dp"
-        android:textAlignment="center"
-        android:width="200dp"
-        android:onClick="valideCreationCompte" />
-</LinearLayout>
\ No newline at end of file
+        <EditText
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:inputType="numberDecimal"
+            android:ems="10"
+            android:id="@+id/creation_montant"
+            android:layout_gravity="center_horizontal"
+            android:editable="true"
+            android:elegantTextHeight="true"
+            android:enabled="true"
+            android:focusable="true"
+            android:focusableInTouchMode="true"
+            android:minHeight="80dp"
+            android:minWidth="200dp"
+            android:numeric="decimal"
+            android:width="250dp"
+            android:layout_marginTop="80dp"
+            android:hint="@string/montant"
+            android:textAlignment="center" />
+
+        <Button
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/validate"
+            android:id="@+id/creation_validation"
+            android:layout_gravity="center_horizontal"
+            android:layout_marginTop="80dp"
+            android:elegantTextHeight="true"
+            android:enabled="true"
+            android:height="80dp"
+            android:minHeight="80dp"
+            android:minWidth="150dp"
+            android:textAlignment="center"
+            android:width="200dp"
+            android:onClick="valideCreationCompte" />
+
+    </LinearLayout>
+</ScrollView>
\ No newline at end of file
diff --git a/PremiereActivite/app/src/main/res/layout/layout_rechargement.xml b/PremiereActivite/app/src/main/res/layout/layout_rechargement.xml
index efdc41f..4d202da 100644
--- a/PremiereActivite/app/src/main/res/layout/layout_rechargement.xml
+++ b/PremiereActivite/app/src/main/res/layout/layout_rechargement.xml
@@ -1,46 +1,55 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
     android:orientation="vertical" android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:gravity="center_horizontal">
+    android:gravity="center_horizontal"
+    android:id="@+id/scrollView5">
 
-    <EditText
-        android:layout_width="wrap_content"
+    <LinearLayout
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:inputType="numberDecimal"
-        android:ems="10"
-        android:id="@+id/rechargement_champ_montant"
-        android:layout_gravity="center_horizontal"
-        android:layout_marginTop="80dp"
-        android:editable="true"
-        android:elegantTextHeight="true"
-        android:enabled="true"
-        android:height="150dp"
-        android:maxHeight="500dp"
-        android:maxLength="10"
-        android:maxWidth="600dp"
-        android:minHeight="80dp"
-        android:numeric="decimal"
-        android:width="300dp"
-        android:hint="@string/montant"
-        android:textAlignment="center"
-        android:textStyle="bold" />
+        android:orientation="vertical">
 
-    <Button
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="@string/validate"
-        android:id="@+id/rechargement_bouton"
-        android:layout_marginTop="80dp"
-        android:layout_gravity="center_horizontal"
-        android:minWidth="150dp"
-        android:minHeight="50dp"
-        android:textAlignment="center"
-        android:width="150dp"
-        android:elegantTextHeight="true"
-        android:enabled="true"
-        android:onClick="valideRechargement"
-        android:height="80dp"
-        android:maxHeight="200dp"
-        android:maxWidth="150dp" />
-</LinearLayout>
\ No newline at end of file
+        <EditText
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:inputType="numberDecimal"
+            android:ems="10"
+            android:id="@+id/rechargement_champ_montant"
+            android:layout_gravity="center_horizontal"
+            android:layout_marginTop="80dp"
+            android:editable="true"
+            android:elegantTextHeight="true"
+            android:enabled="true"
+            android:height="150dp"
+            android:maxHeight="500dp"
+            android:maxLength="10"
+            android:maxWidth="600dp"
+            android:minHeight="80dp"
+            android:numeric="decimal"
+            android:width="300dp"
+            android:hint="@string/montant"
+            android:textAlignment="center"
+            android:textStyle="bold" />
+
+        <Button
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/validate"
+            android:id="@+id/rechargement_bouton"
+            android:layout_marginTop="80dp"
+            android:layout_gravity="center_horizontal"
+            android:minWidth="150dp"
+            android:minHeight="50dp"
+            android:textAlignment="center"
+            android:width="150dp"
+            android:elegantTextHeight="true"
+            android:enabled="true"
+            android:onClick="valideRechargement"
+            android:height="80dp"
+            android:maxHeight="200dp"
+            android:maxWidth="150dp" />
+
+    </LinearLayout>
+
+</ScrollView>
\ No newline at end of file
diff --git a/PremiereActivite/app/src/main/res/layout/layout_vidange.xml b/PremiereActivite/app/src/main/res/layout/layout_vidange.xml
index 3eec50a..aa7ebb9 100644
--- a/PremiereActivite/app/src/main/res/layout/layout_vidange.xml
+++ b/PremiereActivite/app/src/main/res/layout/layout_vidange.xml
@@ -1,13 +1,21 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
     android:orientation="vertical" android:layout_width="match_parent"
-    android:layout_height="match_parent">
+    android:layout_height="match_parent"
+    android:id="@+id/scrollView6">
 
-    <TextView
-        android:layout_width="wrap_content"
+    <LinearLayout
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:text="@string/vidange"
-        android:id="@+id/textView"
-        android:layout_gravity="center_horizontal"
-        android:layout_marginTop="50dp" />
-</LinearLayout>
\ No newline at end of file
+        android:orientation="vertical">
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/vidange"
+            android:id="@+id/textView"
+            android:layout_gravity="center_horizontal"
+            android:layout_marginTop="50dp" />
+
+    </LinearLayout>
+</ScrollView>
\ No newline at end of file
--
libgit2 0.21.2