elopes / SSRMarcSautelet

Commit f7f76a9b371399fbb8546ab091ca6726ebf219a5

Authored by rcavalie
1 parent 4a09720e

adaptation tablette

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