Commit f7f76a9b371399fbb8546ab091ca6726ebf219a5
1 parent
4a09720e
adaptation tablette
Showing
3 changed files
with
19 additions
and
13 deletions
Show diff stats
app/src/main/AndroidManifest.xml
| @@ -5,6 +5,9 @@ | @@ -5,6 +5,9 @@ | ||
| 5 | <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"></uses-permission> | 5 | <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"></uses-permission> |
| 6 | <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"></uses-permission> | 6 | <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"></uses-permission> |
| 7 | 7 | ||
| 8 | + <uses-sdk android:minSdkVersion="19" | ||
| 9 | + android:targetSdkVersion="19"></uses-sdk> | ||
| 10 | + | ||
| 8 | <application | 11 | <application |
| 9 | android:allowBackup="true" | 12 | android:allowBackup="true" |
| 10 | android:icon="@mipmap/ic_launcher" | 13 | android:icon="@mipmap/ic_launcher" |
| @@ -15,6 +18,7 @@ | @@ -15,6 +18,7 @@ | ||
| 15 | <activity | 18 | <activity |
| 16 | android:name=".MainActivity" | 19 | android:name=".MainActivity" |
| 17 | android:label="@string/app_name" | 20 | android:label="@string/app_name" |
| 21 | + android:screenOrientation="landscape" | ||
| 18 | > | 22 | > |
| 19 | <intent-filter> | 23 | <intent-filter> |
| 20 | <action android:name="android.intent.action.MAIN" /> | 24 | <action android:name="android.intent.action.MAIN" /> |
| @@ -27,12 +31,16 @@ | @@ -27,12 +31,16 @@ | ||
| 27 | <activity | 31 | <activity |
| 28 | android:name=".activity_age1" | 32 | android:name=".activity_age1" |
| 29 | android:label="@string/app_name" | 33 | android:label="@string/app_name" |
| 34 | + android:screenOrientation="landscape" | ||
| 30 | /> | 35 | /> |
| 31 | <activity | 36 | <activity |
| 32 | android:name=".activity_age2" | 37 | android:name=".activity_age2" |
| 33 | android:label="@string/app_name" | 38 | android:label="@string/app_name" |
| 39 | + android:screenOrientation="landscape" | ||
| 34 | /> | 40 | /> |
| 35 | - <activity android:name=".activity_age3" /> | 41 | + <activity android:name=".activity_age3" |
| 42 | + android:label="SSR Marc Sautelet" | ||
| 43 | + android:screenOrientation="landscape"/> | ||
| 36 | <activity | 44 | <activity |
| 37 | android:name=".educ3" | 45 | android:name=".educ3" |
| 38 | android:label="@string/app_name" | 46 | android:label="@string/app_name" |
app/src/main/res/layout/activity_main.xml
| @@ -24,7 +24,7 @@ | @@ -24,7 +24,7 @@ | ||
| 24 | android:layout_width="wrap_content" | 24 | android:layout_width="wrap_content" |
| 25 | android:layout_height="wrap_content" | 25 | android:layout_height="wrap_content" |
| 26 | android:id="@+id/age2" | 26 | android:id="@+id/age2" |
| 27 | - android:backgroundTint="@color/colorPrimary" | 27 | + android:background="@color/colorPrimary" |
| 28 | android:layout_marginBottom="76dp" | 28 | android:layout_marginBottom="76dp" |
| 29 | android:layout_above="@+id/savoir_plus" | 29 | android:layout_above="@+id/savoir_plus" |
| 30 | android:textColor="@android:color/background_light" | 30 | android:textColor="@android:color/background_light" |
| @@ -34,14 +34,14 @@ | @@ -34,14 +34,14 @@ | ||
| 34 | android:layout_alignRight="@+id/age1" | 34 | android:layout_alignRight="@+id/age1" |
| 35 | android:layout_alignEnd="@+id/age1" | 35 | android:layout_alignEnd="@+id/age1" |
| 36 | android:layout_alignLeft="@+id/age1" | 36 | android:layout_alignLeft="@+id/age1" |
| 37 | - android:layout_alignStart="@+id/age1" /> | 37 | + android:layout_alignStart="@+id/age1"/> |
| 38 | 38 | ||
| 39 | <Button | 39 | <Button |
| 40 | android:text="14 - 18 ans" | 40 | android:text="14 - 18 ans" |
| 41 | android:layout_width="wrap_content" | 41 | android:layout_width="wrap_content" |
| 42 | android:layout_height="wrap_content" | 42 | android:layout_height="wrap_content" |
| 43 | android:id="@+id/age3" | 43 | android:id="@+id/age3" |
| 44 | - android:backgroundTint="@color/colorPrimary" | 44 | + android:background="@color/colorPrimary" |
| 45 | android:layout_above="@+id/savoir_plus" | 45 | android:layout_above="@+id/savoir_plus" |
| 46 | android:layout_marginBottom="12dp" | 46 | android:layout_marginBottom="12dp" |
| 47 | android:textColor="@android:color/background_light" | 47 | android:textColor="@android:color/background_light" |
| @@ -58,7 +58,7 @@ | @@ -58,7 +58,7 @@ | ||
| 58 | android:layout_width="wrap_content" | 58 | android:layout_width="wrap_content" |
| 59 | android:layout_height="wrap_content" | 59 | android:layout_height="wrap_content" |
| 60 | android:id="@+id/age1" | 60 | android:id="@+id/age1" |
| 61 | - android:backgroundTint="@color/colorPrimary" | 61 | + android:background="@color/colorPrimary" |
| 62 | android:layout_marginBottom="15dp" | 62 | android:layout_marginBottom="15dp" |
| 63 | android:layout_above="@+id/age2" | 63 | android:layout_above="@+id/age2" |
| 64 | android:textColor="@android:color/background_light" | 64 | android:textColor="@android:color/background_light" |
| @@ -75,8 +75,7 @@ | @@ -75,8 +75,7 @@ | ||
| 75 | android:layout_width="wrap_content" | 75 | android:layout_width="wrap_content" |
| 76 | android:layout_height="wrap_content" | 76 | android:layout_height="wrap_content" |
| 77 | android:id="@+id/savoir_plus" | 77 | android:id="@+id/savoir_plus" |
| 78 | - android:backgroundTint="@color/colorPrimary" | ||
| 79 | - android:layout_marginBottom="26dp" | 78 | + android:background="@color/colorPrimary" |
| 80 | android:textColor="@android:color/background_light" | 79 | android:textColor="@android:color/background_light" |
| 81 | android:textSize="@dimen/txtmenu" | 80 | android:textSize="@dimen/txtmenu" |
| 82 | tools:ignore="UnusedAttribute" | 81 | tools:ignore="UnusedAttribute" |
| @@ -89,7 +88,7 @@ | @@ -89,7 +88,7 @@ | ||
| 89 | 88 | ||
| 90 | <Button | 89 | <Button |
| 91 | android:text="Hôpital de jour" | 90 | android:text="Hôpital de jour" |
| 92 | - android:backgroundTint="@color/colorPrimary" | 91 | + android:background="@color/colorPrimary" |
| 93 | android:layout_width="wrap_content" | 92 | android:layout_width="wrap_content" |
| 94 | android:layout_height="wrap_content" | 93 | android:layout_height="wrap_content" |
| 95 | android:textColor="@android:color/background_light" | 94 | android:textColor="@android:color/background_light" |
| @@ -108,17 +107,16 @@ | @@ -108,17 +107,16 @@ | ||
| 108 | android:id="@+id/imageView6" | 107 | android:id="@+id/imageView6" |
| 109 | tools:ignore="RtlHardcoded" | 108 | tools:ignore="RtlHardcoded" |
| 110 | android:contentDescription="@string/ok" | 109 | android:contentDescription="@string/ok" |
| 111 | - android:layout_alignParentTop="true" | 110 | + android:layout_above="@+id/telechargement" |
| 112 | android:layout_alignParentLeft="true" | 111 | android:layout_alignParentLeft="true" |
| 113 | android:layout_alignParentStart="true" | 112 | android:layout_alignParentStart="true" |
| 114 | - android:layout_marginBottom="32dp" | ||
| 115 | - android:layout_alignBottom="@+id/telechargement" /> | 113 | + android:layout_marginBottom="12dp" /> |
| 116 | 114 | ||
| 117 | <Button | 115 | <Button |
| 118 | android:id="@+id/telechargement" | 116 | android:id="@+id/telechargement" |
| 119 | android:layout_width="wrap_content" | 117 | android:layout_width="wrap_content" |
| 120 | android:layout_height="wrap_content" | 118 | android:layout_height="wrap_content" |
| 121 | - android:backgroundTint="@color/colorPrimary" | 119 | + android:background="@color/colorPrimary" |
| 122 | android:onClick="demande_mdp" | 120 | android:onClick="demande_mdp" |
| 123 | android:text="Administrateur" | 121 | android:text="Administrateur" |
| 124 | android:textColor="@android:color/background_light" | 122 | android:textColor="@android:color/background_light" |
app/src/main/res/layout/motdepasse.xml
| @@ -29,5 +29,5 @@ | @@ -29,5 +29,5 @@ | ||
| 29 | android:layout_alignParentStart="true" | 29 | android:layout_alignParentStart="true" |
| 30 | android:layout_marginBottom="244dp" | 30 | android:layout_marginBottom="244dp" |
| 31 | tools:ignore="HardcodedText" | 31 | tools:ignore="HardcodedText" |
| 32 | - android:backgroundTint="@color/colorPrimary"/> | 32 | + android:background="@color/colorPrimary"/> |
| 33 | </RelativeLayout> | 33 | </RelativeLayout> |
| 34 | \ No newline at end of file | 34 | \ No newline at end of file |