From f7f76a9b371399fbb8546ab091ca6726ebf219a5 Mon Sep 17 00:00:00 2001
From: Robin <robin.cavalieri@polytech-lille.net>
Date: Wed, 3 May 2017 17:55:35 +0200
Subject: [PATCH] adaptation tablette

---
 app/src/main/AndroidManifest.xml          | 10 +++++++++-
 app/src/main/res/layout/activity_main.xml | 20 +++++++++-----------
 app/src/main/res/layout/motdepasse.xml    |  2 +-
 3 files changed, 19 insertions(+), 13 deletions(-)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 168cb43..4f074bd 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -5,6 +5,9 @@
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"></uses-permission>
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"></uses-permission>
 
+    <uses-sdk android:minSdkVersion="19"
+              android:targetSdkVersion="19"></uses-sdk>
+
     <application
         android:allowBackup="true"
         android:icon="@mipmap/ic_launcher"
@@ -15,6 +18,7 @@
         <activity
             android:name=".MainActivity"
             android:label="@string/app_name"
+            android:screenOrientation="landscape"
             >
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
@@ -27,12 +31,16 @@
         <activity
             android:name=".activity_age1"
             android:label="@string/app_name"
+            android:screenOrientation="landscape"
             />
         <activity
             android:name=".activity_age2"
             android:label="@string/app_name"
+            android:screenOrientation="landscape"
             />
-        <activity android:name=".activity_age3" />
+        <activity android:name=".activity_age3"
+            android:label="SSR Marc Sautelet"
+            android:screenOrientation="landscape"/>
         <activity
             android:name=".educ3"
             android:label="@string/app_name"
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index d907e95..aa9cc64 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -24,7 +24,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:id="@+id/age2"
-        android:backgroundTint="@color/colorPrimary"
+        android:background="@color/colorPrimary"
         android:layout_marginBottom="76dp"
         android:layout_above="@+id/savoir_plus"
         android:textColor="@android:color/background_light"
@@ -34,14 +34,14 @@
         android:layout_alignRight="@+id/age1"
         android:layout_alignEnd="@+id/age1"
         android:layout_alignLeft="@+id/age1"
-        android:layout_alignStart="@+id/age1" />
+        android:layout_alignStart="@+id/age1"/>
 
     <Button
         android:text="14 - 18 ans"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:id="@+id/age3"
-        android:backgroundTint="@color/colorPrimary"
+        android:background="@color/colorPrimary"
         android:layout_above="@+id/savoir_plus"
         android:layout_marginBottom="12dp"
         android:textColor="@android:color/background_light"
@@ -58,7 +58,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:id="@+id/age1"
-        android:backgroundTint="@color/colorPrimary"
+        android:background="@color/colorPrimary"
         android:layout_marginBottom="15dp"
         android:layout_above="@+id/age2"
         android:textColor="@android:color/background_light"
@@ -75,8 +75,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:id="@+id/savoir_plus"
-        android:backgroundTint="@color/colorPrimary"
-        android:layout_marginBottom="26dp"
+        android:background="@color/colorPrimary"
         android:textColor="@android:color/background_light"
         android:textSize="@dimen/txtmenu"
         tools:ignore="UnusedAttribute"
@@ -89,7 +88,7 @@
 
     <Button
         android:text="Hôpital de jour"
-        android:backgroundTint="@color/colorPrimary"
+        android:background="@color/colorPrimary"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:textColor="@android:color/background_light"
@@ -108,17 +107,16 @@
         android:id="@+id/imageView6"
         tools:ignore="RtlHardcoded"
         android:contentDescription="@string/ok"
-        android:layout_alignParentTop="true"
+        android:layout_above="@+id/telechargement"
         android:layout_alignParentLeft="true"
         android:layout_alignParentStart="true"
-        android:layout_marginBottom="32dp"
-        android:layout_alignBottom="@+id/telechargement" />
+        android:layout_marginBottom="12dp" />
 
     <Button
         android:id="@+id/telechargement"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:backgroundTint="@color/colorPrimary"
+        android:background="@color/colorPrimary"
         android:onClick="demande_mdp"
         android:text="Administrateur"
         android:textColor="@android:color/background_light"
diff --git a/app/src/main/res/layout/motdepasse.xml b/app/src/main/res/layout/motdepasse.xml
index c9d27b4..7442687 100644
--- a/app/src/main/res/layout/motdepasse.xml
+++ b/app/src/main/res/layout/motdepasse.xml
@@ -29,5 +29,5 @@
         android:layout_alignParentStart="true"
         android:layout_marginBottom="244dp"
         tools:ignore="HardcodedText"
-        android:backgroundTint="@color/colorPrimary"/>
+        android:background="@color/colorPrimary"/>
 </RelativeLayout>
\ No newline at end of file
--
libgit2 0.21.2