Revision | 4b181204fbd6fd49dc464439266a4ca7bb7f8f1b (tree) |
---|---|
Time | 2018-05-26 05:25:41 |
Author | HMML <hmml3939@gmai...> |
Commiter | HMML |
Tune layout for mini display.
@@ -0,0 +1,374 @@ | ||
1 | +<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" | |
2 | + xmlns:app="http://schemas.android.com/apk/res-auto" | |
3 | + xmlns:tools="http://schemas.android.com/tools" | |
4 | + android:id="@+id/widget_base" | |
5 | + android:layout_width="match_parent" | |
6 | + android:layout_height="match_parent" | |
7 | + android:background="@android:drawable/screen_background_dark_transparent" | |
8 | + android:padding="@dimen/widget_margin"> | |
9 | + | |
10 | + <LinearLayout | |
11 | + android:layout_width="match_parent" | |
12 | + android:layout_height="match_parent" | |
13 | + android:baselineAligned="false" | |
14 | + android:orientation="horizontal" | |
15 | + android:paddingBottom="4dp" | |
16 | + android:paddingTop="2dp"> | |
17 | + | |
18 | + <RelativeLayout | |
19 | + android:layout_width="match_parent" | |
20 | + android:layout_height="match_parent" | |
21 | + android:layout_weight="1"> | |
22 | + | |
23 | + <TextView | |
24 | + android:id="@+id/title_today" | |
25 | + android:layout_width="wrap_content" | |
26 | + android:layout_height="wrap_content" | |
27 | + android:layout_centerHorizontal="true" | |
28 | + android:shadowColor="#3a3" | |
29 | + android:shadowDx="2" | |
30 | + android:shadowDy="1" | |
31 | + android:shadowRadius="10" | |
32 | + android:text="@string/title_today" | |
33 | + android:textColor="#fff" | |
34 | + android:textSize="18dp" | |
35 | + android:textStyle="bold" /> | |
36 | + | |
37 | + <ImageView | |
38 | + android:id="@+id/weather_background_today" | |
39 | + android:layout_width="match_parent" | |
40 | + android:layout_height="wrap_content" | |
41 | + android:layout_above="@+id/today_info_container" | |
42 | + android:layout_below="@+id/title_today" | |
43 | + android:scaleType="fitXY" | |
44 | + app:srcCompat="@drawable/day_frame_black" /> | |
45 | + | |
46 | + <ImageView | |
47 | + android:id="@+id/weather_image_today" | |
48 | + android:layout_width="match_parent" | |
49 | + android:layout_height="wrap_content" | |
50 | + android:layout_above="@+id/today_info_container" | |
51 | + android:layout_below="@+id/title_today" | |
52 | + android:layout_margin="3dp"/> | |
53 | + | |
54 | + <LinearLayout | |
55 | + android:id="@+id/today_info_container" | |
56 | + android:layout_width="wrap_content" | |
57 | + android:layout_height="wrap_content" | |
58 | + android:layout_alignParentBottom="true" | |
59 | + android:layout_centerHorizontal="true" | |
60 | + android:layout_marginBottom="-2dp" | |
61 | + android:layout_marginTop="-4dp" | |
62 | + android:orientation="horizontal"> | |
63 | + | |
64 | + <TextView | |
65 | + android:id="@+id/txt_pop_today" | |
66 | + android:layout_width="wrap_content" | |
67 | + android:layout_height="wrap_content" | |
68 | + android:layout_alignParentBottom="true" | |
69 | + android:layout_alignParentRight="true" | |
70 | + android:layout_marginLeft="5dp" | |
71 | + android:shadowColor="@android:color/black" | |
72 | + android:shadowDx="1" | |
73 | + android:shadowDy="1" | |
74 | + android:shadowRadius="5" | |
75 | + android:text="--" | |
76 | + android:textColor="@android:color/white" | |
77 | + android:textSize="19dp" | |
78 | + android:textStyle="bold" /> | |
79 | + | |
80 | + <TextView | |
81 | + android:id="@+id/txt_pop_unit1" | |
82 | + android:layout_width="wrap_content" | |
83 | + android:layout_height="wrap_content" | |
84 | + android:layout_alignParentBottom="true" | |
85 | + android:layout_alignParentRight="true" | |
86 | + android:layout_marginRight="5dp" | |
87 | + android:layout_weight="1" | |
88 | + android:shadowColor="@android:color/black" | |
89 | + android:shadowDx="1" | |
90 | + android:shadowDy="1" | |
91 | + android:shadowRadius="5" | |
92 | + android:text="% " | |
93 | + android:textColor="@android:color/white" | |
94 | + android:textSize="12dp" | |
95 | + android:textStyle="bold" /> | |
96 | + | |
97 | + <TextView | |
98 | + android:id="@+id/txt_temp_max_today" | |
99 | + android:layout_width="wrap_content" | |
100 | + android:layout_height="wrap_content" | |
101 | + android:layout_alignParentBottom="false" | |
102 | + android:layout_weight="1" | |
103 | + android:paddingLeft="5dp" | |
104 | + android:shadowColor="@android:color/black" | |
105 | + android:shadowDx="1" | |
106 | + android:shadowDy="1" | |
107 | + android:shadowRadius="5" | |
108 | + android:text="--" | |
109 | + android:textColor="#F59A97" | |
110 | + android:textSize="19dp" | |
111 | + android:textStyle="bold" /> | |
112 | + | |
113 | + <TextView | |
114 | + android:id="@+id/txt_temp_unit1" | |
115 | + android:layout_width="wrap_content" | |
116 | + android:layout_height="wrap_content" | |
117 | + android:layout_alignParentBottom="true" | |
118 | + android:layout_weight="1" | |
119 | + android:shadowColor="@android:color/black" | |
120 | + android:shadowDx="1" | |
121 | + android:shadowDy="1" | |
122 | + android:shadowRadius="5" | |
123 | + android:text="℃" | |
124 | + android:textColor="#F59A97" | |
125 | + android:textSize="12dp" | |
126 | + android:textStyle="bold" /> | |
127 | + | |
128 | + <TextView | |
129 | + android:id="@+id/txt_temp_div1" | |
130 | + android:layout_width="wrap_content" | |
131 | + android:layout_height="wrap_content" | |
132 | + android:layout_marginLeft="1dp" | |
133 | + android:layout_marginRight="1dp" | |
134 | + android:layout_weight="1" | |
135 | + android:shadowColor="@android:color/black" | |
136 | + android:shadowDx="1" | |
137 | + android:shadowDy="1" | |
138 | + android:shadowRadius="5" | |
139 | + android:text="/" | |
140 | + android:textColor="@android:color/white" | |
141 | + android:textSize="19dp" /> | |
142 | + | |
143 | + <TextView | |
144 | + android:id="@+id/txt_temp_min_today" | |
145 | + android:layout_width="wrap_content" | |
146 | + android:layout_height="wrap_content" | |
147 | + android:layout_alignParentBottom="false" | |
148 | + android:shadowColor="@android:color/black" | |
149 | + android:shadowDx="1" | |
150 | + android:shadowDy="1" | |
151 | + android:shadowRadius="5" | |
152 | + android:text="--" | |
153 | + android:textColor="#A0C5F2" | |
154 | + android:textSize="19dp" | |
155 | + android:textStyle="bold" /> | |
156 | + | |
157 | + <TextView | |
158 | + android:id="@+id/txt_temp_unit2" | |
159 | + android:layout_width="wrap_content" | |
160 | + android:layout_height="wrap_content" | |
161 | + android:layout_alignParentBottom="true" | |
162 | + android:layout_marginRight="5dp" | |
163 | + android:layout_weight="1" | |
164 | + android:shadowColor="@android:color/black" | |
165 | + android:shadowDx="1" | |
166 | + android:shadowDy="1" | |
167 | + android:shadowRadius="5" | |
168 | + android:text="℃" | |
169 | + android:textColor="#A0C5F2" | |
170 | + android:textSize="12dp" | |
171 | + android:textStyle="bold" /> | |
172 | + | |
173 | + </LinearLayout> | |
174 | + | |
175 | + <TextView | |
176 | + android:id="@+id/weather_name_today" | |
177 | + android:layout_width="wrap_content" | |
178 | + android:layout_height="wrap_content" | |
179 | + android:layout_alignBottom="@+id/weather_image_today" | |
180 | + android:layout_centerHorizontal="true" | |
181 | + android:layout_marginBottom="6dp" | |
182 | + android:background="@drawable/weather_text_background" | |
183 | + android:paddingLeft="3dp" | |
184 | + android:paddingRight="3dp" | |
185 | + android:shadowColor="#000" | |
186 | + android:shadowDx="2" | |
187 | + android:shadowDy="2" | |
188 | + android:shadowRadius="2" | |
189 | + android:textAlignment="center" | |
190 | + android:textColor="#fff" /> | |
191 | + | |
192 | + </RelativeLayout> | |
193 | + | |
194 | + <RelativeLayout | |
195 | + android:layout_width="match_parent" | |
196 | + android:layout_height="match_parent" | |
197 | + android:layout_weight="1"> | |
198 | + | |
199 | + <TextView | |
200 | + android:id="@+id/title_tomorrow" | |
201 | + android:layout_width="wrap_content" | |
202 | + android:layout_height="wrap_content" | |
203 | + android:layout_centerHorizontal="true" | |
204 | + android:shadowColor="#3a3" | |
205 | + android:shadowDx="2" | |
206 | + android:shadowDy="1" | |
207 | + android:shadowRadius="10" | |
208 | + android:text="@string/title_tomorrow" | |
209 | + android:textColor="#fff" | |
210 | + android:textSize="18dp" | |
211 | + android:textStyle="bold" /> | |
212 | + | |
213 | + <ImageView | |
214 | + android:id="@+id/weather_background_tomorrow" | |
215 | + android:layout_width="match_parent" | |
216 | + android:layout_height="wrap_content" | |
217 | + android:layout_above="@+id/tomorrow_info_container" | |
218 | + android:layout_below="@+id/title_tomorrow" | |
219 | + android:scaleType="fitXY" | |
220 | + app:srcCompat="@drawable/day_frame_black" /> | |
221 | + | |
222 | + <ImageView | |
223 | + android:id="@+id/weather_image_tomorrow" | |
224 | + android:layout_width="match_parent" | |
225 | + android:layout_height="wrap_content" | |
226 | + android:layout_above="@+id/tomorrow_info_container" | |
227 | + android:layout_below="@+id/title_tomorrow" | |
228 | + android:layout_margin="3dp" /> | |
229 | + | |
230 | + <LinearLayout | |
231 | + android:id="@+id/tomorrow_info_container" | |
232 | + android:layout_width="wrap_content" | |
233 | + android:layout_height="wrap_content" | |
234 | + android:layout_alignParentBottom="true" | |
235 | + android:layout_centerHorizontal="true" | |
236 | + android:layout_marginBottom="-2dp" | |
237 | + android:layout_marginTop="-4dp" | |
238 | + android:orientation="horizontal"> | |
239 | + | |
240 | + <TextView | |
241 | + android:id="@+id/txt_pop_tomorrow" | |
242 | + android:layout_width="wrap_content" | |
243 | + android:layout_height="wrap_content" | |
244 | + android:layout_alignParentBottom="false" | |
245 | + android:layout_alignParentRight="false" | |
246 | + android:layout_marginLeft="5dp" | |
247 | + android:layout_weight="1" | |
248 | + android:shadowColor="@android:color/black" | |
249 | + android:shadowDx="1" | |
250 | + android:shadowDy="1" | |
251 | + android:shadowRadius="5" | |
252 | + android:text="--" | |
253 | + android:textColor="@android:color/white" | |
254 | + android:textSize="19dp" | |
255 | + android:textStyle="bold" /> | |
256 | + | |
257 | + <TextView | |
258 | + android:id="@+id/txt_pop_unit2" | |
259 | + android:layout_width="wrap_content" | |
260 | + android:layout_height="wrap_content" | |
261 | + android:layout_alignParentBottom="true" | |
262 | + android:layout_alignParentRight="true" | |
263 | + android:layout_marginRight="5dp" | |
264 | + android:layout_weight="1" | |
265 | + android:shadowColor="@android:color/black" | |
266 | + android:shadowDx="1" | |
267 | + android:shadowDy="1" | |
268 | + android:shadowRadius="5" | |
269 | + android:text="% " | |
270 | + android:textColor="@android:color/white" | |
271 | + android:textSize="12dp" | |
272 | + android:textStyle="bold" /> | |
273 | + | |
274 | + <TextView | |
275 | + android:id="@+id/txt_temp_max_tomorrow" | |
276 | + android:layout_width="wrap_content" | |
277 | + android:layout_height="wrap_content" | |
278 | + android:layout_alignParentBottom="false" | |
279 | + android:layout_weight="1" | |
280 | + android:paddingLeft="5dp" | |
281 | + android:shadowColor="@android:color/black" | |
282 | + android:shadowDx="1" | |
283 | + android:shadowDy="1" | |
284 | + android:shadowRadius="5" | |
285 | + android:text="--" | |
286 | + android:textColor="#F59A97" | |
287 | + android:textSize="19dp" | |
288 | + android:textStyle="bold" /> | |
289 | + | |
290 | + <TextView | |
291 | + android:id="@+id/txt_temp_unit3" | |
292 | + android:layout_width="wrap_content" | |
293 | + android:layout_height="wrap_content" | |
294 | + android:layout_alignParentBottom="true" | |
295 | + android:layout_weight="1" | |
296 | + android:shadowColor="@android:color/black" | |
297 | + android:shadowDx="1" | |
298 | + android:shadowDy="1" | |
299 | + android:shadowRadius="5" | |
300 | + android:text="℃" | |
301 | + android:textColor="#F59A97" | |
302 | + android:textSize="12dp" | |
303 | + android:textStyle="bold" /> | |
304 | + | |
305 | + <TextView | |
306 | + android:id="@+id/txt_temp_div2" | |
307 | + android:layout_width="wrap_content" | |
308 | + android:layout_height="wrap_content" | |
309 | + android:layout_marginLeft="1dp" | |
310 | + android:layout_marginRight="1dp" | |
311 | + android:layout_weight="1" | |
312 | + android:shadowColor="@android:color/black" | |
313 | + android:shadowDx="1" | |
314 | + android:shadowDy="1" | |
315 | + android:shadowRadius="5" | |
316 | + android:text="/" | |
317 | + android:textColor="@android:color/white" | |
318 | + android:textSize="19dp" /> | |
319 | + | |
320 | + <TextView | |
321 | + android:id="@+id/txt_temp_min_tomorrow" | |
322 | + android:layout_width="wrap_content" | |
323 | + android:layout_height="wrap_content" | |
324 | + android:layout_alignParentBottom="false" | |
325 | + android:layout_weight="1" | |
326 | + android:shadowColor="@android:color/black" | |
327 | + android:shadowDx="1" | |
328 | + android:shadowDy="1" | |
329 | + android:shadowRadius="5" | |
330 | + android:text="--" | |
331 | + android:textColor="#A0C5F2" | |
332 | + android:textSize="19dp" | |
333 | + android:textStyle="bold" /> | |
334 | + | |
335 | + <TextView | |
336 | + android:id="@+id/txt_temp_unit4" | |
337 | + android:layout_width="wrap_content" | |
338 | + android:layout_height="wrap_content" | |
339 | + android:layout_alignParentBottom="true" | |
340 | + android:layout_marginRight="5dp" | |
341 | + android:layout_weight="1" | |
342 | + android:shadowColor="@android:color/black" | |
343 | + android:shadowDx="1" | |
344 | + android:shadowDy="1" | |
345 | + android:shadowRadius="5" | |
346 | + android:text="℃" | |
347 | + android:textColor="#A0C5F2" | |
348 | + android:textSize="12dp" | |
349 | + android:textStyle="bold" /> | |
350 | + | |
351 | + </LinearLayout> | |
352 | + | |
353 | + <TextView | |
354 | + android:id="@+id/weather_name_tomorrow" | |
355 | + android:layout_width="wrap_content" | |
356 | + android:layout_height="wrap_content" | |
357 | + android:layout_alignBottom="@+id/weather_image_tomorrow" | |
358 | + android:layout_centerHorizontal="true" | |
359 | + android:layout_marginBottom="6dp" | |
360 | + android:background="@drawable/weather_text_background" | |
361 | + android:paddingLeft="3dp" | |
362 | + android:paddingRight="3dp" | |
363 | + android:shadowColor="#000" | |
364 | + android:shadowDx="2" | |
365 | + android:shadowDy="2" | |
366 | + android:shadowRadius="2" | |
367 | + android:textAlignment="center" | |
368 | + android:textColor="#fff" /> | |
369 | + | |
370 | + </RelativeLayout> | |
371 | + | |
372 | + </LinearLayout> | |
373 | + | |
374 | +</RelativeLayout> |
@@ -0,0 +1,297 @@ | ||
1 | +<?xml version="1.0" encoding="utf-8"?> | |
2 | +<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" | |
3 | + xmlns:app="http://schemas.android.com/apk/res-auto" | |
4 | + xmlns:tools="http://schemas.android.com/tools" | |
5 | + android:layout_width="match_parent" | |
6 | + android:layout_height="match_parent" | |
7 | + android:orientation="vertical"> | |
8 | + | |
9 | + | |
10 | + <TextView | |
11 | + android:id="@+id/location_headline" | |
12 | + android:layout_width="0dp" | |
13 | + android:layout_height="wrap_content" | |
14 | + android:layout_marginEnd="16dp" | |
15 | + android:layout_marginLeft="16dp" | |
16 | + android:layout_marginRight="16dp" | |
17 | + android:layout_marginStart="16dp" | |
18 | + android:layout_marginTop="16dp" | |
19 | + android:background="@color/colorPrimary" | |
20 | + android:text="@string/location" | |
21 | + android:textAppearance="@style/TextAppearance.AppCompat.Inverse" | |
22 | + app:layout_constraintLeft_toLeftOf="parent" | |
23 | + app:layout_constraintRight_toRightOf="parent" | |
24 | + app:layout_constraintTop_toTopOf="parent" | |
25 | + tools:layout_constraintLeft_creator="1" | |
26 | + tools:layout_constraintTop_creator="1" /> | |
27 | + | |
28 | + | |
29 | + <TextView | |
30 | + android:id="@+id/txt_location_name" | |
31 | + android:layout_width="wrap_content" | |
32 | + android:layout_height="0dp" | |
33 | + android:layout_marginTop="1dp" | |
34 | + android:text="@android:string/unknownName" | |
35 | + android:textAppearance="@style/TextAppearance.AppCompat.Body1" | |
36 | + app:layout_constraintLeft_toLeftOf="@+id/chk_auto_location" | |
37 | + app:layout_constraintTop_toBottomOf="@+id/chk_auto_location" | |
38 | + tools:layout_constraintLeft_creator="1" | |
39 | + tools:layout_constraintTop_creator="1" /> | |
40 | + | |
41 | + <Button | |
42 | + android:id="@+id/btn_location_change" | |
43 | + android:layout_width="wrap_content" | |
44 | + android:layout_height="wrap_content" | |
45 | + android:text="Change" | |
46 | + android:visibility="gone" | |
47 | + app:layout_constraintRight_toRightOf="@+id/location_headline" | |
48 | + app:layout_constraintTop_toBottomOf="@+id/location_headline" | |
49 | + tools:layout_constraintRight_creator="1" | |
50 | + tools:layout_constraintTop_creator="1" /> | |
51 | + | |
52 | + | |
53 | + <CheckBox | |
54 | + android:id="@+id/chk_auto_location" | |
55 | + android:layout_width="wrap_content" | |
56 | + android:layout_height="wrap_content" | |
57 | + android:checked="true" | |
58 | + android:text="@string/auto_location" | |
59 | + app:layout_constraintLeft_toLeftOf="@+id/location_headline" | |
60 | + app:layout_constraintTop_toBottomOf="@+id/location_headline" /> | |
61 | + | |
62 | + <TextView | |
63 | + android:id="@+id/unit_headline" | |
64 | + android:layout_width="0dp" | |
65 | + android:layout_height="wrap_content" | |
66 | + android:layout_marginLeft="16dp" | |
67 | + android:layout_marginRight="16dp" | |
68 | + android:background="@color/colorPrimary" | |
69 | + android:text="@string/temp_unit" | |
70 | + android:textAppearance="@style/TextAppearance.AppCompat.Inverse" | |
71 | + app:layout_constraintLeft_toLeftOf="parent" | |
72 | + app:layout_constraintRight_toRightOf="parent" | |
73 | + tools:layout_constraintLeft_creator="1" | |
74 | + app:layout_constraintHorizontal_bias="0.0" | |
75 | + android:layout_marginStart="16dp" | |
76 | + android:layout_marginEnd="16dp" | |
77 | + android:layout_marginTop="16dp" | |
78 | + app:layout_constraintTop_toBottomOf="@+id/txt_location_name" /> | |
79 | + | |
80 | + <TextView | |
81 | + android:id="@+id/theme_headline" | |
82 | + android:layout_width="0dp" | |
83 | + android:layout_height="wrap_content" | |
84 | + android:layout_marginLeft="16dp" | |
85 | + android:layout_marginRight="16dp" | |
86 | + android:background="@color/colorPrimary" | |
87 | + android:text="@string/theme" | |
88 | + android:textAppearance="@style/TextAppearance.AppCompat.Inverse" | |
89 | + app:layout_constraintLeft_toLeftOf="parent" | |
90 | + app:layout_constraintRight_toRightOf="parent" | |
91 | + tools:layout_constraintLeft_creator="1" | |
92 | + tools:layout_constraintTop_creator="1" | |
93 | + android:layout_marginTop="24dp" | |
94 | + app:layout_constraintTop_toBottomOf="@+id/temp_units" | |
95 | + app:layout_constraintHorizontal_bias="0.0" | |
96 | + android:layout_marginStart="16dp" | |
97 | + android:layout_marginEnd="16dp" /> | |
98 | + | |
99 | + <ImageView | |
100 | + android:id="@+id/theme_cur_image" | |
101 | + android:layout_width="80dp" | |
102 | + android:layout_height="80dp" | |
103 | + android:layout_marginLeft="0dp" | |
104 | + android:layout_marginTop="8dp" | |
105 | + android:layout_weight="1" | |
106 | + android:background="@android:drawable/editbox_dropdown_dark_frame" | |
107 | + android:focusable="false" | |
108 | + app:layout_constraintLeft_toLeftOf="@+id/theme_headline" | |
109 | + app:layout_constraintTop_toBottomOf="@+id/theme_headline" | |
110 | + app:srcCompat="@android:drawable/btn_dialog" /> | |
111 | + | |
112 | + <TextView | |
113 | + android:id="@+id/theme_cur_author" | |
114 | + android:layout_width="0dp" | |
115 | + android:layout_height="wrap_content" | |
116 | + android:layout_marginLeft="8dp" | |
117 | + android:layout_marginRight="8dp" | |
118 | + android:layout_marginTop="4dp" | |
119 | + android:layout_weight="1" | |
120 | + android:ems="10" | |
121 | + android:focusable="false" | |
122 | + android:inputType="textPersonName" | |
123 | + android:linksClickable="true" | |
124 | + android:text="Name" | |
125 | + app:layout_constraintLeft_toRightOf="@+id/theme_cur_image" | |
126 | + app:layout_constraintTop_toBottomOf="@+id/theme_cur_name" | |
127 | + app:layout_constraintRight_toLeftOf="@+id/btn_theme_change" | |
128 | + app:layout_constraintHorizontal_bias="0.0" /> | |
129 | + | |
130 | + <TextView | |
131 | + android:id="@+id/theme_cur_name" | |
132 | + android:layout_width="0dp" | |
133 | + android:layout_height="wrap_content" | |
134 | + android:layout_weight="1" | |
135 | + android:ems="10" | |
136 | + android:focusable="false" | |
137 | + android:inputType="textPersonName" | |
138 | + android:text="Name" | |
139 | + android:textAppearance="@style/TextAppearance.AppCompat" | |
140 | + app:layout_constraintLeft_toRightOf="@+id/theme_cur_image" | |
141 | + android:layout_marginLeft="8dp" | |
142 | + android:layout_marginTop="7dp" | |
143 | + app:layout_constraintTop_toBottomOf="@+id/theme_headline" | |
144 | + android:layout_marginRight="8dp" | |
145 | + app:layout_constraintRight_toLeftOf="@+id/btn_theme_change" | |
146 | + app:layout_constraintHorizontal_bias="0.0" /> | |
147 | + | |
148 | + <TextView | |
149 | + android:id="@+id/last_updat_headline" | |
150 | + android:layout_width="0dp" | |
151 | + android:layout_height="wrap_content" | |
152 | + android:layout_marginEnd="16dp" | |
153 | + android:layout_marginLeft="16dp" | |
154 | + android:layout_marginRight="16dp" | |
155 | + android:layout_marginStart="16dp" | |
156 | + android:layout_marginTop="16dp" | |
157 | + android:background="@color/colorPrimary" | |
158 | + android:text="@string/last_update" | |
159 | + android:textAppearance="@style/TextAppearance.AppCompat.Inverse" | |
160 | + app:layout_constraintHorizontal_bias="0.0" | |
161 | + app:layout_constraintLeft_toLeftOf="parent" | |
162 | + app:layout_constraintRight_toRightOf="parent" | |
163 | + app:layout_constraintTop_toBottomOf="@+id/theme_cur_image" | |
164 | + tools:layout_constraintLeft_creator="1" /> | |
165 | + | |
166 | + <Button | |
167 | + android:id="@+id/btn_theme_change" | |
168 | + android:layout_width="0dp" | |
169 | + android:layout_height="wrap_content" | |
170 | + android:layout_marginRight="0dp" | |
171 | + android:layout_marginTop="8dp" | |
172 | + android:lines="1" | |
173 | + android:text="@string/change" | |
174 | + app:layout_constraintRight_toRightOf="@+id/theme_headline" | |
175 | + app:layout_constraintTop_toBottomOf="@+id/theme_headline" /> | |
176 | + | |
177 | + <TextView | |
178 | + android:id="@+id/txt_last_update" | |
179 | + android:layout_width="wrap_content" | |
180 | + android:layout_height="wrap_content" | |
181 | + android:text="@android:string/unknownName" | |
182 | + android:textAppearance="@style/TextAppearance.AppCompat.Body1" | |
183 | + tools:layout_constraintLeft_creator="1" | |
184 | + tools:layout_constraintTop_creator="1" | |
185 | + app:layout_constraintLeft_toRightOf="@+id/fetch_time" | |
186 | + android:layout_marginLeft="8dp" | |
187 | + android:layout_marginTop="8dp" | |
188 | + app:layout_constraintTop_toBottomOf="@+id/forecast_time" | |
189 | + android:layout_marginStart="8dp" /> | |
190 | + | |
191 | + <Button | |
192 | + android:id="@+id/btn_conf_ok" | |
193 | + android:layout_width="0dp" | |
194 | + android:layout_height="wrap_content" | |
195 | + android:layout_marginBottom="4dp" | |
196 | + android:layout_marginEnd="16dp" | |
197 | + android:layout_marginLeft="16dp" | |
198 | + android:layout_marginRight="16dp" | |
199 | + android:layout_marginStart="16dp" | |
200 | + android:text="@android:string/ok" | |
201 | + app:layout_constraintBottom_toBottomOf="parent" | |
202 | + app:layout_constraintLeft_toLeftOf="parent" | |
203 | + app:layout_constraintRight_toRightOf="parent" | |
204 | + tools:layout_constraintLeft_creator="1" | |
205 | + tools:layout_constraintRight_creator="1" /> | |
206 | + | |
207 | + <RadioGroup | |
208 | + android:id="@+id/temp_units" | |
209 | + android:layout_width="0dp" | |
210 | + android:layout_height="wrap_content" | |
211 | + android:layout_marginRight="16dp" | |
212 | + android:orientation="horizontal" | |
213 | + app:layout_constraintRight_toRightOf="@+id/unit_headline" | |
214 | + tools:layout_constraintLeft_creator="1" | |
215 | + tools:layout_constraintRight_creator="1" | |
216 | + tools:layout_constraintTop_creator="1" | |
217 | + android:layout_marginEnd="16dp" | |
218 | + android:layout_marginTop="8dp" | |
219 | + app:layout_constraintTop_toBottomOf="@+id/unit_headline" | |
220 | + android:layout_marginStart="8dp" | |
221 | + android:layout_marginLeft="8dp" | |
222 | + app:layout_constraintLeft_toLeftOf="@+id/unit_headline"> | |
223 | + | |
224 | + <RadioButton | |
225 | + android:id="@+id/temp_unit_c" | |
226 | + android:layout_width="wrap_content" | |
227 | + android:layout_height="wrap_content" | |
228 | + android:layout_weight="1" | |
229 | + android:checked="true" | |
230 | + android:text="@string/temp_unit_c" | |
231 | + app:layout_constraintTop_toBottomOf="@+id/unit_headline" | |
232 | + tools:layout_editor_absoluteX="-15dp" /> | |
233 | + | |
234 | + <RadioButton | |
235 | + android:id="@+id/temp_unit_f" | |
236 | + android:layout_width="wrap_content" | |
237 | + android:layout_height="wrap_content" | |
238 | + android:layout_weight="1" | |
239 | + android:text="@string/temp_unit_f" | |
240 | + app:layout_constraintLeft_toRightOf="@+id/temp_unit_c" | |
241 | + tools:layout_editor_absoluteY="117dp" /> | |
242 | + </RadioGroup> | |
243 | + | |
244 | + <Button | |
245 | + android:id="@+id/btn_fetch" | |
246 | + android:layout_width="wrap_content" | |
247 | + android:layout_height="wrap_content" | |
248 | + android:layout_marginTop="8dp" | |
249 | + android:text="@string/update" | |
250 | + app:layout_constraintTop_toBottomOf="@+id/last_updat_headline" | |
251 | + app:layout_constraintRight_toRightOf="@+id/last_updat_headline" /> | |
252 | + | |
253 | + <TextView | |
254 | + android:id="@+id/forecast_time" | |
255 | + android:layout_width="wrap_content" | |
256 | + android:layout_height="wrap_content" | |
257 | + android:text="@string/forecast_time" | |
258 | + app:layout_constraintLeft_toLeftOf="@+id/last_updat_headline" | |
259 | + android:layout_marginTop="8dp" | |
260 | + app:layout_constraintTop_toBottomOf="@+id/last_updat_headline" /> | |
261 | + | |
262 | + <TextView | |
263 | + android:id="@+id/fetch_time" | |
264 | + android:layout_width="wrap_content" | |
265 | + android:layout_height="wrap_content" | |
266 | + android:layout_marginTop="8dp" | |
267 | + android:text="@string/fetch_time" | |
268 | + app:layout_constraintLeft_toLeftOf="@+id/forecast_time" | |
269 | + app:layout_constraintTop_toBottomOf="@+id/forecast_time" /> | |
270 | + | |
271 | + <TextView | |
272 | + android:id="@+id/txt_last_forecast" | |
273 | + android:layout_width="wrap_content" | |
274 | + android:layout_height="wrap_content" | |
275 | + android:layout_marginLeft="8dp" | |
276 | + android:layout_marginTop="8dp" | |
277 | + android:text="@android:string/unknownName" | |
278 | + android:textAppearance="@style/TextAppearance.AppCompat.Body1" | |
279 | + app:layout_constraintLeft_toRightOf="@+id/forecast_time" | |
280 | + app:layout_constraintTop_toBottomOf="@+id/last_updat_headline" | |
281 | + android:layout_marginStart="8dp" /> | |
282 | + | |
283 | + <TextView | |
284 | + android:id="@+id/theme_cur_desc" | |
285 | + android:layout_width="0dp" | |
286 | + android:layout_height="wrap_content" | |
287 | + android:layout_below="@+id/theme_cur_author" | |
288 | + android:layout_marginLeft="8dp" | |
289 | + android:layout_marginRight="8dp" | |
290 | + android:layout_marginTop="4dp" | |
291 | + app:layout_constraintHorizontal_bias="0.0" | |
292 | + app:layout_constraintLeft_toRightOf="@+id/theme_cur_image" | |
293 | + app:layout_constraintRight_toRightOf="parent" | |
294 | + app:layout_constraintTop_toBottomOf="@+id/theme_cur_author" /> | |
295 | + | |
296 | + | |
297 | +</android.support.constraint.ConstraintLayout> | |
\ No newline at end of file |
@@ -31,7 +31,7 @@ | ||
31 | 31 | android:shadowRadius="10" |
32 | 32 | android:text="@string/title_today" |
33 | 33 | android:textColor="#fff" |
34 | - android:textSize="16sp" | |
34 | + android:textSize="16dp" | |
35 | 35 | android:textStyle="bold" /> |
36 | 36 | |
37 | 37 | <ImageView |
@@ -57,8 +57,8 @@ | ||
57 | 57 | android:layout_height="wrap_content" |
58 | 58 | android:layout_alignParentBottom="true" |
59 | 59 | android:layout_centerHorizontal="true" |
60 | - android:layout_marginBottom="-2sp" | |
61 | - android:layout_marginTop="-4sp" | |
60 | + android:layout_marginBottom="-2dp" | |
61 | + android:layout_marginTop="-4dp" | |
62 | 62 | android:orientation="horizontal"> |
63 | 63 | |
64 | 64 | <TextView |
@@ -67,14 +67,14 @@ | ||
67 | 67 | android:layout_height="wrap_content" |
68 | 68 | android:layout_alignParentBottom="true" |
69 | 69 | android:layout_alignParentRight="true" |
70 | - android:layout_marginLeft="5sp" | |
70 | + android:layout_marginLeft="5dp" | |
71 | 71 | android:shadowColor="@android:color/black" |
72 | 72 | android:shadowDx="1" |
73 | 73 | android:shadowDy="1" |
74 | 74 | android:shadowRadius="5" |
75 | 75 | android:text="--" |
76 | 76 | android:textColor="@android:color/white" |
77 | - android:textSize="19sp" | |
77 | + android:textSize="16dp" | |
78 | 78 | android:textStyle="bold" /> |
79 | 79 | |
80 | 80 | <TextView |
@@ -83,7 +83,6 @@ | ||
83 | 83 | android:layout_height="wrap_content" |
84 | 84 | android:layout_alignParentBottom="true" |
85 | 85 | android:layout_alignParentRight="true" |
86 | - android:layout_marginRight="5sp" | |
87 | 86 | android:layout_weight="1" |
88 | 87 | android:shadowColor="@android:color/black" |
89 | 88 | android:shadowDx="1" |
@@ -91,7 +90,7 @@ | ||
91 | 90 | android:shadowRadius="5" |
92 | 91 | android:text="% " |
93 | 92 | android:textColor="@android:color/white" |
94 | - android:textSize="12sp" | |
93 | + android:textSize="11dp" | |
95 | 94 | android:textStyle="bold" /> |
96 | 95 | |
97 | 96 | <TextView |
@@ -99,7 +98,6 @@ | ||
99 | 98 | android:layout_width="wrap_content" |
100 | 99 | android:layout_height="wrap_content" |
101 | 100 | android:layout_alignParentBottom="false" |
102 | - android:layout_marginLeft="5sp" | |
103 | 101 | android:layout_weight="1" |
104 | 102 | android:shadowColor="@android:color/black" |
105 | 103 | android:shadowDx="1" |
@@ -107,7 +105,7 @@ | ||
107 | 105 | android:shadowRadius="5" |
108 | 106 | android:text="--" |
109 | 107 | android:textColor="#F59A97" |
110 | - android:textSize="19sp" | |
108 | + android:textSize="16dp" | |
111 | 109 | android:textStyle="bold" /> |
112 | 110 | |
113 | 111 | <TextView |
@@ -122,15 +120,15 @@ | ||
122 | 120 | android:shadowRadius="5" |
123 | 121 | android:text="℃" |
124 | 122 | android:textColor="#F59A97" |
125 | - android:textSize="12sp" | |
123 | + android:textSize="11dp" | |
126 | 124 | android:textStyle="bold" /> |
127 | 125 | |
128 | 126 | <TextView |
129 | 127 | android:id="@+id/txt_temp_div1" |
130 | 128 | android:layout_width="wrap_content" |
131 | 129 | android:layout_height="wrap_content" |
132 | - android:layout_marginLeft="1sp" | |
133 | - android:layout_marginRight="1sp" | |
130 | + android:layout_marginLeft="1dp" | |
131 | + android:layout_marginRight="1dp" | |
134 | 132 | android:layout_weight="1" |
135 | 133 | android:shadowColor="@android:color/black" |
136 | 134 | android:shadowDx="1" |
@@ -138,7 +136,7 @@ | ||
138 | 136 | android:shadowRadius="5" |
139 | 137 | android:text="/" |
140 | 138 | android:textColor="@android:color/white" |
141 | - android:textSize="19sp" /> | |
139 | + android:textSize="14dp" /> | |
142 | 140 | |
143 | 141 | <TextView |
144 | 142 | android:id="@+id/txt_temp_min_today" |
@@ -151,7 +149,7 @@ | ||
151 | 149 | android:shadowRadius="5" |
152 | 150 | android:text="--" |
153 | 151 | android:textColor="#A0C5F2" |
154 | - android:textSize="19sp" | |
152 | + android:textSize="16dp" | |
155 | 153 | android:textStyle="bold" /> |
156 | 154 | |
157 | 155 | <TextView |
@@ -159,7 +157,7 @@ | ||
159 | 157 | android:layout_width="wrap_content" |
160 | 158 | android:layout_height="wrap_content" |
161 | 159 | android:layout_alignParentBottom="true" |
162 | - android:layout_marginRight="5sp" | |
160 | + android:layout_marginRight="5dp" | |
163 | 161 | android:layout_weight="1" |
164 | 162 | android:shadowColor="@android:color/black" |
165 | 163 | android:shadowDx="1" |
@@ -167,7 +165,7 @@ | ||
167 | 165 | android:shadowRadius="5" |
168 | 166 | android:text="℃" |
169 | 167 | android:textColor="#A0C5F2" |
170 | - android:textSize="12sp" | |
168 | + android:textSize="11dp" | |
171 | 169 | android:textStyle="bold" /> |
172 | 170 | |
173 | 171 | </LinearLayout> |
@@ -207,7 +205,7 @@ | ||
207 | 205 | android:shadowRadius="10" |
208 | 206 | android:text="@string/title_tomorrow" |
209 | 207 | android:textColor="#fff" |
210 | - android:textSize="16sp" | |
208 | + android:textSize="16dp" | |
211 | 209 | android:textStyle="bold" /> |
212 | 210 | |
213 | 211 | <ImageView |
@@ -233,8 +231,8 @@ | ||
233 | 231 | android:layout_height="wrap_content" |
234 | 232 | android:layout_alignParentBottom="true" |
235 | 233 | android:layout_centerHorizontal="true" |
236 | - android:layout_marginBottom="-2sp" | |
237 | - android:layout_marginTop="-4sp" | |
234 | + android:layout_marginBottom="-2dp" | |
235 | + android:layout_marginTop="-4dp" | |
238 | 236 | android:orientation="horizontal"> |
239 | 237 | |
240 | 238 | <TextView |
@@ -243,7 +241,7 @@ | ||
243 | 241 | android:layout_height="wrap_content" |
244 | 242 | android:layout_alignParentBottom="false" |
245 | 243 | android:layout_alignParentRight="false" |
246 | - android:layout_marginLeft="5sp" | |
244 | + android:layout_marginLeft="5dp" | |
247 | 245 | android:layout_weight="1" |
248 | 246 | android:shadowColor="@android:color/black" |
249 | 247 | android:shadowDx="1" |
@@ -251,7 +249,7 @@ | ||
251 | 249 | android:shadowRadius="5" |
252 | 250 | android:text="--" |
253 | 251 | android:textColor="@android:color/white" |
254 | - android:textSize="19sp" | |
252 | + android:textSize="16dp" | |
255 | 253 | android:textStyle="bold" /> |
256 | 254 | |
257 | 255 | <TextView |
@@ -260,7 +258,6 @@ | ||
260 | 258 | android:layout_height="wrap_content" |
261 | 259 | android:layout_alignParentBottom="true" |
262 | 260 | android:layout_alignParentRight="true" |
263 | - android:layout_marginRight="5sp" | |
264 | 261 | android:layout_weight="1" |
265 | 262 | android:shadowColor="@android:color/black" |
266 | 263 | android:shadowDx="1" |
@@ -268,7 +265,7 @@ | ||
268 | 265 | android:shadowRadius="5" |
269 | 266 | android:text="% " |
270 | 267 | android:textColor="@android:color/white" |
271 | - android:textSize="12sp" | |
268 | + android:textSize="11dp" | |
272 | 269 | android:textStyle="bold" /> |
273 | 270 | |
274 | 271 | <TextView |
@@ -276,7 +273,6 @@ | ||
276 | 273 | android:layout_width="wrap_content" |
277 | 274 | android:layout_height="wrap_content" |
278 | 275 | android:layout_alignParentBottom="false" |
279 | - android:layout_marginLeft="5sp" | |
280 | 276 | android:layout_weight="1" |
281 | 277 | android:shadowColor="@android:color/black" |
282 | 278 | android:shadowDx="1" |
@@ -284,7 +280,7 @@ | ||
284 | 280 | android:shadowRadius="5" |
285 | 281 | android:text="--" |
286 | 282 | android:textColor="#F59A97" |
287 | - android:textSize="19sp" | |
283 | + android:textSize="16dp" | |
288 | 284 | android:textStyle="bold" /> |
289 | 285 | |
290 | 286 | <TextView |
@@ -299,15 +295,15 @@ | ||
299 | 295 | android:shadowRadius="5" |
300 | 296 | android:text="℃" |
301 | 297 | android:textColor="#F59A97" |
302 | - android:textSize="12sp" | |
298 | + android:textSize="11dp" | |
303 | 299 | android:textStyle="bold" /> |
304 | 300 | |
305 | 301 | <TextView |
306 | 302 | android:id="@+id/txt_temp_div2" |
307 | 303 | android:layout_width="wrap_content" |
308 | 304 | android:layout_height="wrap_content" |
309 | - android:layout_marginLeft="1sp" | |
310 | - android:layout_marginRight="1sp" | |
305 | + android:layout_marginLeft="1dp" | |
306 | + android:layout_marginRight="1dp" | |
311 | 307 | android:layout_weight="1" |
312 | 308 | android:shadowColor="@android:color/black" |
313 | 309 | android:shadowDx="1" |
@@ -315,7 +311,7 @@ | ||
315 | 311 | android:shadowRadius="5" |
316 | 312 | android:text="/" |
317 | 313 | android:textColor="@android:color/white" |
318 | - android:textSize="19sp" /> | |
314 | + android:textSize="14dp" /> | |
319 | 315 | |
320 | 316 | <TextView |
321 | 317 | android:id="@+id/txt_temp_min_tomorrow" |
@@ -329,7 +325,7 @@ | ||
329 | 325 | android:shadowRadius="5" |
330 | 326 | android:text="--" |
331 | 327 | android:textColor="#A0C5F2" |
332 | - android:textSize="19sp" | |
328 | + android:textSize="16dp" | |
333 | 329 | android:textStyle="bold" /> |
334 | 330 | |
335 | 331 | <TextView |
@@ -337,7 +333,7 @@ | ||
337 | 333 | android:layout_width="wrap_content" |
338 | 334 | android:layout_height="wrap_content" |
339 | 335 | android:layout_alignParentBottom="true" |
340 | - android:layout_marginRight="5sp" | |
336 | + android:layout_marginRight="5dp" | |
341 | 337 | android:layout_weight="1" |
342 | 338 | android:shadowColor="@android:color/black" |
343 | 339 | android:shadowDx="1" |
@@ -345,7 +341,7 @@ | ||
345 | 341 | android:shadowRadius="5" |
346 | 342 | android:text="℃" |
347 | 343 | android:textColor="#A0C5F2" |
348 | - android:textSize="12sp" | |
344 | + android:textSize="11dp" | |
349 | 345 | android:textStyle="bold" /> |
350 | 346 | |
351 | 347 | </LinearLayout> |
@@ -371,4 +367,4 @@ | ||
371 | 367 | |
372 | 368 | </LinearLayout> |
373 | 369 | |
374 | -</RelativeLayout> | |
\ No newline at end of file | ||
370 | +</RelativeLayout> |
@@ -7,196 +7,283 @@ | ||
7 | 7 | android:orientation="vertical"> |
8 | 8 | |
9 | 9 | |
10 | - <TextView | |
11 | - android:id="@+id/location_headline" | |
12 | - android:layout_width="0dp" | |
13 | - android:layout_height="wrap_content" | |
14 | - android:layout_marginEnd="16dp" | |
15 | - android:layout_marginLeft="16dp" | |
16 | - android:layout_marginRight="16dp" | |
17 | - android:layout_marginStart="16dp" | |
18 | - android:layout_marginTop="16dp" | |
19 | - android:background="@color/colorPrimary" | |
20 | - android:text="@string/location" | |
21 | - android:textAppearance="@style/TextAppearance.AppCompat.Inverse" | |
22 | - app:layout_constraintLeft_toLeftOf="parent" | |
23 | - app:layout_constraintRight_toRightOf="parent" | |
24 | - app:layout_constraintTop_toTopOf="parent" | |
25 | - tools:layout_constraintLeft_creator="1" | |
26 | - tools:layout_constraintTop_creator="1" /> | |
10 | + <ScrollView | |
11 | + android:layout_width="match_parent" | |
12 | + android:layout_height="match_parent" | |
13 | + android:layout_marginBottom="50dp" | |
14 | + app:layout_constraintBottom_toTopOf="@+id/btn_conf_ok" | |
15 | + app:layout_constraintTop_toTopOf="parent"> | |
27 | 16 | |
17 | + <android.support.constraint.ConstraintLayout | |
18 | + android:layout_width="match_parent" | |
19 | + android:layout_height="wrap_content"> | |
28 | 20 | |
29 | - <TextView | |
30 | - android:id="@+id/txt_location_name" | |
31 | - android:layout_width="wrap_content" | |
32 | - android:layout_height="0dp" | |
33 | - android:layout_marginTop="1dp" | |
34 | - android:text="@android:string/unknownName" | |
35 | - android:textAppearance="@style/TextAppearance.AppCompat.Body1" | |
36 | - app:layout_constraintLeft_toLeftOf="@+id/chk_auto_location" | |
37 | - app:layout_constraintTop_toBottomOf="@+id/chk_auto_location" | |
38 | - tools:layout_constraintLeft_creator="1" | |
39 | - tools:layout_constraintTop_creator="1" /> | |
21 | + <TextView | |
22 | + android:id="@+id/txt_last_forecast" | |
23 | + android:layout_width="wrap_content" | |
24 | + android:layout_height="wrap_content" | |
25 | + android:layout_marginLeft="8dp" | |
26 | + android:layout_marginTop="8dp" | |
27 | + android:text="@android:string/unknownName" | |
28 | + android:textAppearance="@style/TextAppearance.AppCompat.Body1" | |
29 | + app:layout_constraintLeft_toRightOf="@+id/forecast_time" | |
30 | + app:layout_constraintTop_toBottomOf="@+id/last_updat_headline" /> | |
40 | 31 | |
41 | - <Button | |
42 | - android:id="@+id/btn_location_change" | |
43 | - android:layout_width="wrap_content" | |
44 | - android:layout_height="wrap_content" | |
45 | - android:text="Change" | |
46 | - android:visibility="gone" | |
47 | - app:layout_constraintRight_toRightOf="@+id/location_headline" | |
48 | - app:layout_constraintTop_toBottomOf="@+id/location_headline" | |
49 | - tools:layout_constraintRight_creator="1" | |
50 | - tools:layout_constraintTop_creator="1" /> | |
32 | + <TextView | |
33 | + android:id="@+id/theme_cur_desc" | |
34 | + android:layout_width="0dp" | |
35 | + android:layout_height="wrap_content" | |
36 | + android:layout_below="@+id/theme_cur_author" | |
37 | + android:layout_marginLeft="8dp" | |
38 | + android:layout_marginRight="8dp" | |
39 | + android:layout_marginTop="4dp" | |
40 | + app:layout_constraintHorizontal_bias="0.0" | |
41 | + app:layout_constraintLeft_toRightOf="@+id/theme_cur_image" | |
42 | + app:layout_constraintRight_toRightOf="parent" | |
43 | + app:layout_constraintTop_toBottomOf="@+id/theme_cur_author" /> | |
51 | 44 | |
45 | + <Button | |
46 | + android:id="@+id/btn_theme_change" | |
47 | + android:layout_width="0dp" | |
48 | + android:layout_height="wrap_content" | |
49 | + android:layout_marginStart="8dp" | |
50 | + android:layout_marginTop="8dp" | |
51 | + android:lines="1" | |
52 | + android:text="@string/change" | |
53 | + app:layout_constraintStart_toStartOf="parent" | |
54 | + app:layout_constraintTop_toBottomOf="@+id/theme_cur_image" /> | |
52 | 55 | |
53 | - <CheckBox | |
54 | - android:id="@+id/chk_auto_location" | |
55 | - android:layout_width="wrap_content" | |
56 | - android:layout_height="wrap_content" | |
57 | - android:checked="true" | |
58 | - android:text="@string/auto_location" | |
59 | - app:layout_constraintLeft_toLeftOf="@+id/location_headline" | |
60 | - app:layout_constraintTop_toBottomOf="@+id/location_headline" /> | |
56 | + <CheckBox | |
57 | + android:id="@+id/chk_auto_location" | |
58 | + android:layout_width="wrap_content" | |
59 | + android:layout_height="wrap_content" | |
60 | + android:checked="true" | |
61 | + android:text="@string/auto_location" | |
62 | + app:layout_constraintLeft_toLeftOf="@+id/location_headline" | |
63 | + app:layout_constraintTop_toBottomOf="@+id/location_headline" /> | |
61 | 64 | |
62 | - <TextView | |
63 | - android:id="@+id/unit_headline" | |
64 | - android:layout_width="0dp" | |
65 | - android:layout_height="wrap_content" | |
66 | - android:layout_marginLeft="16dp" | |
67 | - android:layout_marginRight="16dp" | |
68 | - android:background="@color/colorPrimary" | |
69 | - android:text="@string/temp_unit" | |
70 | - android:textAppearance="@style/TextAppearance.AppCompat.Inverse" | |
71 | - app:layout_constraintLeft_toLeftOf="parent" | |
72 | - app:layout_constraintRight_toRightOf="parent" | |
73 | - tools:layout_constraintLeft_creator="1" | |
74 | - app:layout_constraintHorizontal_bias="0.0" | |
75 | - android:layout_marginStart="16dp" | |
76 | - android:layout_marginEnd="16dp" | |
77 | - android:layout_marginTop="16dp" | |
78 | - app:layout_constraintTop_toBottomOf="@+id/txt_location_name" /> | |
65 | + <TextView | |
66 | + android:id="@+id/unit_headline" | |
67 | + android:layout_width="0dp" | |
68 | + android:layout_height="wrap_content" | |
69 | + android:layout_marginLeft="16dp" | |
70 | + android:layout_marginRight="16dp" | |
71 | + android:layout_marginTop="16dp" | |
72 | + android:background="@color/colorPrimary" | |
73 | + android:text="@string/temp_unit" | |
74 | + android:textAppearance="@style/TextAppearance.AppCompat.Inverse" | |
75 | + app:layout_constraintHorizontal_bias="0.0" | |
76 | + app:layout_constraintLeft_toLeftOf="parent" | |
77 | + app:layout_constraintRight_toRightOf="parent" | |
78 | + app:layout_constraintTop_toBottomOf="@+id/txt_location_name" | |
79 | + tools:layout_constraintLeft_creator="1" /> | |
79 | 80 | |
80 | - <TextView | |
81 | - android:id="@+id/theme_headline" | |
82 | - android:layout_width="0dp" | |
83 | - android:layout_height="wrap_content" | |
84 | - android:layout_marginLeft="16dp" | |
85 | - android:layout_marginRight="16dp" | |
86 | - android:background="@color/colorPrimary" | |
87 | - android:text="@string/theme" | |
88 | - android:textAppearance="@style/TextAppearance.AppCompat.Inverse" | |
89 | - app:layout_constraintLeft_toLeftOf="parent" | |
90 | - app:layout_constraintRight_toRightOf="parent" | |
91 | - tools:layout_constraintLeft_creator="1" | |
92 | - tools:layout_constraintTop_creator="1" | |
93 | - android:layout_marginTop="24dp" | |
94 | - app:layout_constraintTop_toBottomOf="@+id/temp_units" | |
95 | - app:layout_constraintHorizontal_bias="0.0" | |
96 | - android:layout_marginStart="16dp" | |
97 | - android:layout_marginEnd="16dp" /> | |
81 | + <TextView | |
82 | + android:id="@+id/theme_cur_name" | |
83 | + android:layout_width="wrap_content" | |
84 | + android:layout_height="wrap_content" | |
85 | + android:layout_marginLeft="8dp" | |
86 | + android:layout_marginRight="8dp" | |
87 | + android:layout_marginTop="7dp" | |
88 | + android:layout_weight="1" | |
89 | + android:ems="10" | |
90 | + android:focusable="false" | |
91 | + android:inputType="textPersonName" | |
92 | + android:text="Name" | |
93 | + android:textAppearance="@style/TextAppearance.AppCompat" | |
94 | + app:layout_constraintHorizontal_bias="0.0" | |
95 | + app:layout_constraintLeft_toRightOf="@+id/theme_cur_image" | |
96 | + app:layout_constraintRight_toLeftOf="@+id/btn_theme_change" | |
97 | + app:layout_constraintTop_toBottomOf="@+id/theme_headline" /> | |
98 | 98 | |
99 | - <ImageView | |
100 | - android:id="@+id/theme_cur_image" | |
101 | - android:layout_width="80dp" | |
102 | - android:layout_height="80dp" | |
103 | - android:layout_marginLeft="0dp" | |
104 | - android:layout_marginTop="8dp" | |
105 | - android:layout_weight="1" | |
106 | - android:background="@android:drawable/editbox_dropdown_dark_frame" | |
107 | - android:focusable="false" | |
108 | - app:layout_constraintLeft_toLeftOf="@+id/theme_headline" | |
109 | - app:layout_constraintTop_toBottomOf="@+id/theme_headline" | |
110 | - app:srcCompat="@android:drawable/btn_dialog" /> | |
99 | + <TextView | |
100 | + android:id="@+id/txt_last_update" | |
101 | + android:layout_width="wrap_content" | |
102 | + android:layout_height="wrap_content" | |
103 | + android:layout_marginLeft="8dp" | |
104 | + android:layout_marginTop="8dp" | |
105 | + android:text="@android:string/unknownName" | |
106 | + android:textAppearance="@style/TextAppearance.AppCompat.Body1" | |
107 | + app:layout_constraintLeft_toRightOf="@+id/fetch_time" | |
108 | + app:layout_constraintTop_toBottomOf="@+id/forecast_time" | |
109 | + tools:layout_constraintLeft_creator="1" | |
110 | + tools:layout_constraintTop_creator="1" /> | |
111 | 111 | |
112 | - <TextView | |
113 | - android:id="@+id/theme_cur_author" | |
114 | - android:layout_width="0dp" | |
115 | - android:layout_height="wrap_content" | |
116 | - android:layout_marginLeft="8dp" | |
117 | - android:layout_marginRight="8dp" | |
118 | - android:layout_marginTop="4dp" | |
119 | - android:layout_weight="1" | |
120 | - android:ems="10" | |
121 | - android:focusable="false" | |
122 | - android:inputType="textPersonName" | |
123 | - android:linksClickable="true" | |
124 | - android:text="Name" | |
125 | - app:layout_constraintLeft_toRightOf="@+id/theme_cur_image" | |
126 | - app:layout_constraintTop_toBottomOf="@+id/theme_cur_name" | |
127 | - app:layout_constraintRight_toLeftOf="@+id/btn_theme_change" | |
128 | - app:layout_constraintHorizontal_bias="0.0" /> | |
112 | + <ImageView | |
113 | + android:id="@+id/theme_cur_image" | |
114 | + android:layout_width="80dp" | |
115 | + android:layout_height="80dp" | |
116 | + android:layout_marginTop="8dp" | |
117 | + android:layout_weight="1" | |
118 | + android:background="@android:drawable/editbox_dropdown_dark_frame" | |
119 | + android:focusable="false" | |
120 | + app:layout_constraintLeft_toLeftOf="@+id/theme_headline" | |
121 | + app:layout_constraintTop_toBottomOf="@+id/theme_headline" | |
122 | + app:srcCompat="@android:drawable/btn_dialog" /> | |
129 | 123 | |
130 | - <TextView | |
131 | - android:id="@+id/theme_cur_name" | |
132 | - android:layout_width="0dp" | |
133 | - android:layout_height="wrap_content" | |
134 | - android:layout_weight="1" | |
135 | - android:ems="10" | |
136 | - android:focusable="false" | |
137 | - android:inputType="textPersonName" | |
138 | - android:text="Name" | |
139 | - android:textAppearance="@style/TextAppearance.AppCompat" | |
140 | - app:layout_constraintLeft_toRightOf="@+id/theme_cur_image" | |
141 | - android:layout_marginLeft="8dp" | |
142 | - android:layout_marginTop="7dp" | |
143 | - app:layout_constraintTop_toBottomOf="@+id/theme_headline" | |
144 | - android:layout_marginRight="8dp" | |
145 | - app:layout_constraintRight_toLeftOf="@+id/btn_theme_change" | |
146 | - app:layout_constraintHorizontal_bias="0.0" /> | |
124 | + <Button | |
125 | + android:id="@+id/btn_fetch" | |
126 | + android:layout_width="wrap_content" | |
127 | + android:layout_height="wrap_content" | |
128 | + android:layout_marginStart="8dp" | |
129 | + android:layout_marginTop="8dp" | |
130 | + android:text="@string/update" | |
131 | + app:layout_constraintStart_toStartOf="parent" | |
132 | + app:layout_constraintTop_toBottomOf="@+id/fetch_time" /> | |
147 | 133 | |
148 | - <TextView | |
149 | - android:id="@+id/last_updat_headline" | |
150 | - android:layout_width="0dp" | |
151 | - android:layout_height="wrap_content" | |
152 | - android:layout_marginEnd="16dp" | |
153 | - android:layout_marginLeft="16dp" | |
154 | - android:layout_marginRight="16dp" | |
155 | - android:layout_marginStart="16dp" | |
156 | - android:layout_marginTop="16dp" | |
157 | - android:background="@color/colorPrimary" | |
158 | - android:text="@string/last_update" | |
159 | - android:textAppearance="@style/TextAppearance.AppCompat.Inverse" | |
160 | - app:layout_constraintHorizontal_bias="0.0" | |
161 | - app:layout_constraintLeft_toLeftOf="parent" | |
162 | - app:layout_constraintRight_toRightOf="parent" | |
163 | - app:layout_constraintTop_toBottomOf="@+id/theme_cur_image" | |
164 | - tools:layout_constraintLeft_creator="1" /> | |
134 | + <TextView | |
135 | + android:id="@+id/forecast_time" | |
136 | + android:layout_width="wrap_content" | |
137 | + android:layout_height="wrap_content" | |
138 | + android:layout_marginTop="8dp" | |
139 | + android:text="@string/forecast_time" | |
140 | + app:layout_constraintLeft_toLeftOf="@+id/last_updat_headline" | |
141 | + app:layout_constraintTop_toBottomOf="@+id/last_updat_headline" /> | |
165 | 142 | |
166 | - <Button | |
167 | - android:id="@+id/btn_theme_change" | |
168 | - android:layout_width="0dp" | |
169 | - android:layout_height="wrap_content" | |
170 | - android:layout_marginRight="0dp" | |
171 | - android:layout_marginTop="8dp" | |
172 | - android:lines="1" | |
173 | - android:text="@string/change" | |
174 | - app:layout_constraintRight_toRightOf="@+id/theme_headline" | |
175 | - app:layout_constraintTop_toBottomOf="@+id/theme_headline" /> | |
143 | + <TextView | |
144 | + android:id="@+id/fetch_time" | |
145 | + android:layout_width="wrap_content" | |
146 | + android:layout_height="wrap_content" | |
147 | + android:layout_marginTop="8dp" | |
148 | + android:text="@string/fetch_time" | |
149 | + app:layout_constraintLeft_toLeftOf="@+id/forecast_time" | |
150 | + app:layout_constraintTop_toBottomOf="@+id/forecast_time" /> | |
151 | + | |
152 | + <TextView | |
153 | + android:id="@+id/theme_cur_author" | |
154 | + android:layout_width="wrap_content" | |
155 | + android:layout_height="wrap_content" | |
156 | + android:layout_marginLeft="8dp" | |
157 | + android:layout_marginRight="8dp" | |
158 | + android:layout_marginTop="4dp" | |
159 | + android:layout_weight="1" | |
160 | + android:ems="10" | |
161 | + android:focusable="false" | |
162 | + android:inputType="textPersonName" | |
163 | + android:linksClickable="true" | |
164 | + android:text="Name" | |
165 | + app:layout_constraintHorizontal_bias="0.0" | |
166 | + app:layout_constraintLeft_toRightOf="@+id/theme_cur_image" | |
167 | + app:layout_constraintRight_toLeftOf="@+id/btn_theme_change" | |
168 | + app:layout_constraintTop_toBottomOf="@+id/theme_cur_name" /> | |
169 | + | |
170 | + <Button | |
171 | + android:id="@+id/btn_location_change" | |
172 | + android:layout_width="wrap_content" | |
173 | + android:layout_height="wrap_content" | |
174 | + android:text="Change" | |
175 | + android:visibility="gone" | |
176 | + app:layout_constraintRight_toRightOf="@+id/location_headline" | |
177 | + app:layout_constraintTop_toBottomOf="@+id/location_headline" | |
178 | + tools:layout_constraintRight_creator="1" | |
179 | + tools:layout_constraintTop_creator="1" /> | |
180 | + | |
181 | + <TextView | |
182 | + android:id="@+id/theme_headline" | |
183 | + android:layout_width="0dp" | |
184 | + android:layout_height="wrap_content" | |
185 | + android:layout_marginLeft="16dp" | |
186 | + android:layout_marginRight="16dp" | |
187 | + android:layout_marginTop="24dp" | |
188 | + android:background="@color/colorPrimary" | |
189 | + android:text="@string/theme" | |
190 | + android:textAppearance="@style/TextAppearance.AppCompat.Inverse" | |
191 | + app:layout_constraintHorizontal_bias="0.0" | |
192 | + app:layout_constraintLeft_toLeftOf="parent" | |
193 | + app:layout_constraintRight_toRightOf="parent" | |
194 | + app:layout_constraintTop_toBottomOf="@+id/temp_units" | |
195 | + tools:layout_constraintLeft_creator="1" | |
196 | + tools:layout_constraintTop_creator="1" /> | |
197 | + | |
198 | + <TextView | |
199 | + android:id="@+id/location_headline" | |
200 | + android:layout_width="0dp" | |
201 | + android:layout_height="wrap_content" | |
202 | + android:layout_marginLeft="16dp" | |
203 | + android:layout_marginRight="16dp" | |
204 | + android:layout_marginTop="16dp" | |
205 | + android:background="@color/colorPrimary" | |
206 | + android:text="@string/location" | |
207 | + android:textAppearance="@style/TextAppearance.AppCompat.Inverse" | |
208 | + app:layout_constraintLeft_toLeftOf="parent" | |
209 | + app:layout_constraintRight_toRightOf="parent" | |
210 | + app:layout_constraintTop_toTopOf="parent" | |
211 | + tools:layout_constraintLeft_creator="1" | |
212 | + tools:layout_constraintTop_creator="1" /> | |
213 | + | |
214 | + <TextView | |
215 | + android:id="@+id/txt_location_name" | |
216 | + android:layout_width="wrap_content" | |
217 | + android:layout_height="0dp" | |
218 | + android:layout_marginTop="1dp" | |
219 | + android:text="@android:string/unknownName" | |
220 | + android:textAppearance="@style/TextAppearance.AppCompat.Body1" | |
221 | + app:layout_constraintLeft_toLeftOf="@+id/chk_auto_location" | |
222 | + app:layout_constraintTop_toBottomOf="@+id/chk_auto_location" | |
223 | + tools:layout_constraintLeft_creator="1" | |
224 | + tools:layout_constraintTop_creator="1" /> | |
225 | + | |
226 | + <TextView | |
227 | + android:id="@+id/last_updat_headline" | |
228 | + android:layout_width="0dp" | |
229 | + android:layout_height="wrap_content" | |
230 | + android:layout_marginLeft="16dp" | |
231 | + android:layout_marginRight="16dp" | |
232 | + android:layout_marginTop="8dp" | |
233 | + android:background="@color/colorPrimary" | |
234 | + android:text="@string/last_update" | |
235 | + android:textAppearance="@style/TextAppearance.AppCompat.Inverse" | |
236 | + app:layout_constraintHorizontal_bias="0.0" | |
237 | + app:layout_constraintLeft_toLeftOf="parent" | |
238 | + app:layout_constraintRight_toRightOf="parent" | |
239 | + app:layout_constraintTop_toBottomOf="@+id/btn_theme_change" | |
240 | + tools:layout_constraintLeft_creator="1" /> | |
241 | + | |
242 | + <RadioGroup | |
243 | + android:id="@+id/temp_units" | |
244 | + android:layout_width="0dp" | |
245 | + android:layout_height="wrap_content" | |
246 | + android:layout_marginLeft="8dp" | |
247 | + android:layout_marginRight="16dp" | |
248 | + android:layout_marginTop="8dp" | |
249 | + android:orientation="horizontal" | |
250 | + app:layout_constraintLeft_toLeftOf="@+id/unit_headline" | |
251 | + app:layout_constraintRight_toRightOf="@+id/unit_headline" | |
252 | + app:layout_constraintTop_toBottomOf="@+id/unit_headline" | |
253 | + tools:layout_constraintLeft_creator="1" | |
254 | + tools:layout_constraintRight_creator="1" | |
255 | + tools:layout_constraintTop_creator="1"> | |
256 | + | |
257 | + <RadioButton | |
258 | + android:id="@+id/temp_unit_c" | |
259 | + android:layout_width="wrap_content" | |
260 | + android:layout_height="wrap_content" | |
261 | + android:layout_weight="1" | |
262 | + android:checked="true" | |
263 | + android:text="@string/temp_unit_c" | |
264 | + app:layout_constraintTop_toBottomOf="@+id/unit_headline" | |
265 | + tools:layout_editor_absoluteX="-15dp" /> | |
266 | + | |
267 | + <RadioButton | |
268 | + android:id="@+id/temp_unit_f" | |
269 | + android:layout_width="wrap_content" | |
270 | + android:layout_height="wrap_content" | |
271 | + android:layout_weight="1" | |
272 | + android:text="@string/temp_unit_f" | |
273 | + app:layout_constraintLeft_toRightOf="@+id/temp_unit_c" | |
274 | + tools:layout_editor_absoluteY="117dp" /> | |
275 | + </RadioGroup> | |
276 | + </android.support.constraint.ConstraintLayout> | |
277 | + </ScrollView> | |
176 | 278 | |
177 | - <TextView | |
178 | - android:id="@+id/txt_last_update" | |
179 | - android:layout_width="wrap_content" | |
180 | - android:layout_height="wrap_content" | |
181 | - android:text="@android:string/unknownName" | |
182 | - android:textAppearance="@style/TextAppearance.AppCompat.Body1" | |
183 | - tools:layout_constraintLeft_creator="1" | |
184 | - tools:layout_constraintTop_creator="1" | |
185 | - app:layout_constraintLeft_toRightOf="@+id/fetch_time" | |
186 | - android:layout_marginLeft="8dp" | |
187 | - android:layout_marginTop="8dp" | |
188 | - app:layout_constraintTop_toBottomOf="@+id/forecast_time" | |
189 | - android:layout_marginStart="8dp" /> | |
190 | 279 | |
191 | 280 | <Button |
192 | 281 | android:id="@+id/btn_conf_ok" |
193 | 282 | android:layout_width="0dp" |
194 | 283 | android:layout_height="wrap_content" |
195 | 284 | android:layout_marginBottom="4dp" |
196 | - android:layout_marginEnd="16dp" | |
197 | 285 | android:layout_marginLeft="16dp" |
198 | 286 | android:layout_marginRight="16dp" |
199 | - android:layout_marginStart="16dp" | |
200 | 287 | android:text="@android:string/ok" |
201 | 288 | app:layout_constraintBottom_toBottomOf="parent" |
202 | 289 | app:layout_constraintLeft_toLeftOf="parent" |
@@ -204,94 +291,5 @@ | ||
204 | 291 | tools:layout_constraintLeft_creator="1" |
205 | 292 | tools:layout_constraintRight_creator="1" /> |
206 | 293 | |
207 | - <RadioGroup | |
208 | - android:id="@+id/temp_units" | |
209 | - android:layout_width="0dp" | |
210 | - android:layout_height="wrap_content" | |
211 | - android:layout_marginRight="16dp" | |
212 | - android:orientation="horizontal" | |
213 | - app:layout_constraintRight_toRightOf="@+id/unit_headline" | |
214 | - tools:layout_constraintLeft_creator="1" | |
215 | - tools:layout_constraintRight_creator="1" | |
216 | - tools:layout_constraintTop_creator="1" | |
217 | - android:layout_marginEnd="16dp" | |
218 | - android:layout_marginTop="8dp" | |
219 | - app:layout_constraintTop_toBottomOf="@+id/unit_headline" | |
220 | - android:layout_marginStart="8dp" | |
221 | - android:layout_marginLeft="8dp" | |
222 | - app:layout_constraintLeft_toLeftOf="@+id/unit_headline"> | |
223 | - | |
224 | - <RadioButton | |
225 | - android:id="@+id/temp_unit_c" | |
226 | - android:layout_width="wrap_content" | |
227 | - android:layout_height="wrap_content" | |
228 | - android:layout_weight="1" | |
229 | - android:checked="true" | |
230 | - android:text="@string/temp_unit_c" | |
231 | - app:layout_constraintTop_toBottomOf="@+id/unit_headline" | |
232 | - tools:layout_editor_absoluteX="-15dp" /> | |
233 | - | |
234 | - <RadioButton | |
235 | - android:id="@+id/temp_unit_f" | |
236 | - android:layout_width="wrap_content" | |
237 | - android:layout_height="wrap_content" | |
238 | - android:layout_weight="1" | |
239 | - android:text="@string/temp_unit_f" | |
240 | - app:layout_constraintLeft_toRightOf="@+id/temp_unit_c" | |
241 | - tools:layout_editor_absoluteY="117dp" /> | |
242 | - </RadioGroup> | |
243 | - | |
244 | - <Button | |
245 | - android:id="@+id/btn_fetch" | |
246 | - android:layout_width="wrap_content" | |
247 | - android:layout_height="wrap_content" | |
248 | - android:layout_marginTop="8dp" | |
249 | - android:text="@string/update" | |
250 | - app:layout_constraintTop_toBottomOf="@+id/last_updat_headline" | |
251 | - app:layout_constraintRight_toRightOf="@+id/last_updat_headline" /> | |
252 | - | |
253 | - <TextView | |
254 | - android:id="@+id/forecast_time" | |
255 | - android:layout_width="wrap_content" | |
256 | - android:layout_height="wrap_content" | |
257 | - android:text="@string/forecast_time" | |
258 | - app:layout_constraintLeft_toLeftOf="@+id/last_updat_headline" | |
259 | - android:layout_marginTop="8dp" | |
260 | - app:layout_constraintTop_toBottomOf="@+id/last_updat_headline" /> | |
261 | - | |
262 | - <TextView | |
263 | - android:id="@+id/fetch_time" | |
264 | - android:layout_width="wrap_content" | |
265 | - android:layout_height="wrap_content" | |
266 | - android:layout_marginTop="8dp" | |
267 | - android:text="@string/fetch_time" | |
268 | - app:layout_constraintLeft_toLeftOf="@+id/forecast_time" | |
269 | - app:layout_constraintTop_toBottomOf="@+id/forecast_time" /> | |
270 | - | |
271 | - <TextView | |
272 | - android:id="@+id/txt_last_forecast" | |
273 | - android:layout_width="wrap_content" | |
274 | - android:layout_height="wrap_content" | |
275 | - android:layout_marginLeft="8dp" | |
276 | - android:layout_marginTop="8dp" | |
277 | - android:text="@android:string/unknownName" | |
278 | - android:textAppearance="@style/TextAppearance.AppCompat.Body1" | |
279 | - app:layout_constraintLeft_toRightOf="@+id/forecast_time" | |
280 | - app:layout_constraintTop_toBottomOf="@+id/last_updat_headline" | |
281 | - android:layout_marginStart="8dp" /> | |
282 | - | |
283 | - <TextView | |
284 | - android:id="@+id/theme_cur_desc" | |
285 | - android:layout_width="0dp" | |
286 | - android:layout_height="wrap_content" | |
287 | - android:layout_below="@+id/theme_cur_author" | |
288 | - android:layout_marginLeft="8dp" | |
289 | - android:layout_marginRight="8dp" | |
290 | - android:layout_marginTop="4dp" | |
291 | - app:layout_constraintHorizontal_bias="0.0" | |
292 | - app:layout_constraintLeft_toRightOf="@+id/theme_cur_image" | |
293 | - app:layout_constraintRight_toRightOf="parent" | |
294 | - app:layout_constraintTop_toBottomOf="@+id/theme_cur_author" /> | |
295 | - | |
296 | 294 | |
297 | 295 | </android.support.constraint.ConstraintLayout> |
\ No newline at end of file |