elopes / SSRMarcSautelet

Commit 2d1b24f6c7c5ad8a643bcaa1703e33cedadf3320

Authored by rcavalie
1 parent cb0a61d8

modifications pour adaptation des écrans

Showing 6 changed files with 35 additions and 15 deletions   Show diff stats
Inline Side-by-side
app/src/main/AndroidManifest.xml
  Show/Hide comments   View file @2d1b24f
... ... @@ -9,13 +9,13 @@
9 9 android:allowBackup="true"
10 10 android:icon="@mipmap/ic_launcher"
11 11 android:label="@string/app_name"
12   - android:screenOrientation="landscape"
  12 +
13 13 android:supportsRtl="true"
14 14 android:theme="@style/AppTheme">
15 15 <activity
16 16 android:name=".MainActivity"
17 17 android:label="@string/app_name"
18   - android:screenOrientation="landscape">
  18 + >
19 19 <intent-filter>
20 20 <action android:name="android.intent.action.MAIN" />
21 21  
... ... @@ -27,28 +27,28 @@
27 27 <activity
28 28 android:name=".activity_age1"
29 29 android:label="@string/app_name"
30   - android:screenOrientation="landscape" />
  30 + />
31 31 <activity
32 32 android:name=".activity_age2"
33 33 android:label="@string/app_name"
34   - android:screenOrientation="landscape" />
  34 + />
35 35 <activity android:name=".activity_age3" />
36 36 <activity
37 37 android:name=".educ3"
38 38 android:label="@string/app_name"
39   - android:screenOrientation="landscape" />
  39 + />
40 40 <activity
41 41 android:name=".educ2"
42 42 android:label="@string/app_name"
43   - android:screenOrientation="landscape" />
  43 + />
44 44 <activity
45 45 android:name=".educ1"
46 46 android:label="@string/app_name"
47   - android:screenOrientation="landscape" />
  47 + />
48 48 <activity
49 49 android:name=".activity_hop"
50 50 android:label="@string/app_name"
51   - android:screenOrientation="landscape" />
  51 + />
52 52 <activity
53 53 android:name=".plan_hospital"
54 54 android:label="@string/app_name"
... ...
app/src/main/res/layout/activity_main.xml
  Show/Hide comments   View file @2d1b24f
... ... @@ -28,7 +28,7 @@
28 28 android:layout_marginBottom="76dp"
29 29 android:layout_above="@+id/savoir_plus"
30 30 android:textColor="@android:color/background_light"
31   - android:textSize="24sp"
  31 + android:textSize="@dimen/txtmenu"
32 32 tools:ignore="HardcodedText,UnusedAttribute"
33 33 android:onClick="send_age2"
34 34 android:layout_alignRight="@+id/age1"
... ... @@ -45,7 +45,7 @@
45 45 android:layout_above="@+id/savoir_plus"
46 46 android:layout_marginBottom="12dp"
47 47 android:textColor="@android:color/background_light"
48   - android:textSize="24sp"
  48 + android:textSize="@dimen/txtmenu"
49 49 tools:ignore="HardcodedText,UnusedAttribute"
50 50 android:onClick="send_age3"
51 51 android:layout_alignLeft="@+id/age2"
... ... @@ -62,7 +62,7 @@
62 62 android:layout_marginBottom="15dp"
63 63 android:layout_above="@+id/age2"
64 64 android:textColor="@android:color/background_light"
65   - android:textSize="24sp"
  65 + android:textSize="@dimen/txtmenu"
66 66 tools:ignore="HardcodedText,UnusedAttribute"
67 67 android:onClick="send_age1"
68 68 android:layout_alignRight="@+id/hop_jour"
... ... @@ -78,7 +78,7 @@
78 78 android:backgroundTint="@color/colorPrimary"
79 79 android:layout_marginBottom="26dp"
80 80 android:textColor="@android:color/background_light"
81   - android:textSize="24sp"
  81 + android:textSize="@dimen/txtmenu"
82 82 tools:ignore="UnusedAttribute"
83 83 android:onClick="send_savoirplus"
84 84 android:layout_alignParentBottom="true"
... ... @@ -94,7 +94,7 @@
94 94 android:layout_height="wrap_content"
95 95 android:textColor="@android:color/background_light"
96 96 android:id="@+id/hop_jour"
97   - android:textSize="24sp"
  97 + android:textSize="@dimen/txtmenu"
98 98 tools:ignore="HardcodedText,UnusedAttribute"
99 99 android:layout_marginBottom="15dp"
100 100 android:onClick="send_hop"
... ... @@ -108,7 +108,7 @@
108 108 android:id="@+id/imageView6"
109 109 tools:ignore="RtlHardcoded"
110 110 android:contentDescription="@string/ok"
111   - android:layout_marginTop="59dp"
  111 + android:layout_marginTop="@dimen/hauteurimage"
112 112 android:layout_below="@+id/textView5"
113 113 android:layout_centerHorizontal="true" />
114 114  
... ... @@ -117,7 +117,7 @@
117 117 android:backgroundTint="@color/colorPrimary"
118 118 android:layout_width="wrap_content"
119 119 android:textColor="@android:color/background_light"
120   - android:textSize="24sp"
  120 + android:textSize="@dimen/txtmenu"
121 121 tools:ignore="HardcodedText,UnusedAttribute"
122 122 android:layout_height="wrap_content"
123 123 android:text="MàJ"
... ...
app/src/main/res/values-large/dimens.xml 0 → 100644
  Show/Hide comments   View file @2d1b24f
... ... @@ -0,0 +1,5 @@
  1 +<?xml version="1.0" encoding="utf-8"?>
  2 +<resources>
  3 + <dimen name="txtmenu">24sp</dimen>
  4 + <dimen name="hauteurimage">57dp</dimen>
  5 +</resources>
0 6 \ No newline at end of file
... ...
app/src/main/res/values-normal/dimens.xml 0 → 100644
  Show/Hide comments   View file @2d1b24f
... ... @@ -0,0 +1,5 @@
  1 +<?xml version="1.0" encoding="utf-8"?>
  2 +<resources>
  3 + <dimen name="txtmenu">20sp</dimen>
  4 + <dimen name="hauteurimage">0dp</dimen>
  5 +</resources>
0 6 \ No newline at end of file
... ...
app/src/main/res/values-small/dimens.xml 0 → 100644
  Show/Hide comments   View file @2d1b24f
... ... @@ -0,0 +1,5 @@
  1 +<?xml version="1.0" encoding="utf-8"?>
  2 +<resources>
  3 + <dimen name="txtmenu">15sp</dimen>
  4 + <dimen name="hauteurimage">0dp</dimen>
  5 +</resources>
0 6 \ No newline at end of file
... ...
app/src/main/res/values-xlarge/dimens.xml 0 → 100644
  Show/Hide comments   View file @2d1b24f
... ... @@ -0,0 +1,5 @@
  1 +<?xml version="1.0" encoding="utf-8"?>
  2 +<resources>
  3 + <dimen name="txtmenu">24sp</dimen>
  4 + <dimen name="hauteurimage">57dp</dimen>
  5 +</resources>
0 6 \ No newline at end of file
... ...