From 2d1b24f6c7c5ad8a643bcaa1703e33cedadf3320 Mon Sep 17 00:00:00 2001
From: Robin <robin.cavalieri@polytech-lille.net>
Date: Mon, 24 Apr 2017 15:18:09 +0200
Subject: [PATCH] modifications pour adaptation des écrans

---
 app/src/main/AndroidManifest.xml          | 16 ++++++++--------
 app/src/main/res/layout/activity_main.xml | 14 +++++++-------
 app/src/main/res/values-large/dimens.xml  |  5 +++++
 app/src/main/res/values-normal/dimens.xml |  5 +++++
 app/src/main/res/values-small/dimens.xml  |  5 +++++
 app/src/main/res/values-xlarge/dimens.xml |  5 +++++
 6 files changed, 35 insertions(+), 15 deletions(-)
 create mode 100644 app/src/main/res/values-large/dimens.xml
 create mode 100644 app/src/main/res/values-normal/dimens.xml
 create mode 100644 app/src/main/res/values-small/dimens.xml
 create mode 100644 app/src/main/res/values-xlarge/dimens.xml

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 17a66ec..4380773 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -9,13 +9,13 @@
         android:allowBackup="true"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
-        android:screenOrientation="landscape"
+
         android:supportsRtl="true"
         android:theme="@style/AppTheme">
         <activity
             android:name=".MainActivity"
             android:label="@string/app_name"
-            android:screenOrientation="landscape">
+            >
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 
@@ -27,28 +27,28 @@
         <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=".educ3"
             android:label="@string/app_name"
-            android:screenOrientation="landscape" />
+             />
         <activity
             android:name=".educ2"
             android:label="@string/app_name"
-            android:screenOrientation="landscape" />
+            />
         <activity
             android:name=".educ1"
             android:label="@string/app_name"
-            android:screenOrientation="landscape" />
+            />
         <activity
             android:name=".activity_hop"
             android:label="@string/app_name"
-            android:screenOrientation="landscape" />
+            />
         <activity
             android:name=".plan_hospital"
             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 e30d160..74cae80 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -28,7 +28,7 @@
         android:layout_marginBottom="76dp"
         android:layout_above="@+id/savoir_plus"
         android:textColor="@android:color/background_light"
-        android:textSize="24sp"
+        android:textSize="@dimen/txtmenu"
         tools:ignore="HardcodedText,UnusedAttribute"
         android:onClick="send_age2"
         android:layout_alignRight="@+id/age1"
@@ -45,7 +45,7 @@
         android:layout_above="@+id/savoir_plus"
         android:layout_marginBottom="12dp"
         android:textColor="@android:color/background_light"
-        android:textSize="24sp"
+        android:textSize="@dimen/txtmenu"
         tools:ignore="HardcodedText,UnusedAttribute"
         android:onClick="send_age3"
         android:layout_alignLeft="@+id/age2"
@@ -62,7 +62,7 @@
         android:layout_marginBottom="15dp"
         android:layout_above="@+id/age2"
         android:textColor="@android:color/background_light"
-        android:textSize="24sp"
+        android:textSize="@dimen/txtmenu"
         tools:ignore="HardcodedText,UnusedAttribute"
         android:onClick="send_age1"
         android:layout_alignRight="@+id/hop_jour"
@@ -78,7 +78,7 @@
         android:backgroundTint="@color/colorPrimary"
         android:layout_marginBottom="26dp"
         android:textColor="@android:color/background_light"
-        android:textSize="24sp"
+        android:textSize="@dimen/txtmenu"
         tools:ignore="UnusedAttribute"
         android:onClick="send_savoirplus"
         android:layout_alignParentBottom="true"
@@ -94,7 +94,7 @@
         android:layout_height="wrap_content"
         android:textColor="@android:color/background_light"
         android:id="@+id/hop_jour"
-        android:textSize="24sp"
+        android:textSize="@dimen/txtmenu"
         tools:ignore="HardcodedText,UnusedAttribute"
         android:layout_marginBottom="15dp"
         android:onClick="send_hop"
@@ -108,7 +108,7 @@
         android:id="@+id/imageView6"
         tools:ignore="RtlHardcoded"
         android:contentDescription="@string/ok"
-        android:layout_marginTop="59dp"
+        android:layout_marginTop="@dimen/hauteurimage"
         android:layout_below="@+id/textView5"
         android:layout_centerHorizontal="true" />
 
@@ -117,7 +117,7 @@
         android:backgroundTint="@color/colorPrimary"
         android:layout_width="wrap_content"
         android:textColor="@android:color/background_light"
-        android:textSize="24sp"
+        android:textSize="@dimen/txtmenu"
         tools:ignore="HardcodedText,UnusedAttribute"
         android:layout_height="wrap_content"
         android:text="MàJ"
diff --git a/app/src/main/res/values-large/dimens.xml b/app/src/main/res/values-large/dimens.xml
new file mode 100644
index 0000000..8d488f2
--- /dev/null
+++ b/app/src/main/res/values-large/dimens.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <dimen name="txtmenu">24sp</dimen>
+    <dimen name="hauteurimage">57dp</dimen>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-normal/dimens.xml b/app/src/main/res/values-normal/dimens.xml
new file mode 100644
index 0000000..e1244b5
--- /dev/null
+++ b/app/src/main/res/values-normal/dimens.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <dimen name="txtmenu">20sp</dimen>
+    <dimen name="hauteurimage">0dp</dimen>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-small/dimens.xml b/app/src/main/res/values-small/dimens.xml
new file mode 100644
index 0000000..ce39e9e
--- /dev/null
+++ b/app/src/main/res/values-small/dimens.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <dimen name="txtmenu">15sp</dimen>
+    <dimen name="hauteurimage">0dp</dimen>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-xlarge/dimens.xml b/app/src/main/res/values-xlarge/dimens.xml
new file mode 100644
index 0000000..8d488f2
--- /dev/null
+++ b/app/src/main/res/values-xlarge/dimens.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <dimen name="txtmenu">24sp</dimen>
+    <dimen name="hauteurimage">57dp</dimen>
+</resources>
\ No newline at end of file
--
libgit2 0.21.2