Skip to content

Commit 7bff7b8

Browse files
garvankeeleygarvankeeley
committedOct 23, 2014
Merge pull request #1091 from cascheberg/fix-RTL
@cascheberg Use table layout in metrics drawer, improves l12y
·
v1.8.81.7.13
2 parents e794a6e + 05dc4f7 commit 7bff7b8

File tree

1 file changed

+205
-239
lines changed

1 file changed

+205
-239
lines changed
 

‎android/src/main/res/layout/fragment_metrics_drawer.xml

+205-239
Original file line numberDiff line numberDiff line change
@@ -26,251 +26,218 @@
2626
android:textSize="@dimen/font_size_for_metrics_top_title"
2727
android:textStyle="bold" />
2828

29-
<TextView
30-
android:id="@+id/this_session_header"
31-
android:layout_width="wrap_content"
32-
android:layout_height="wrap_content"
33-
android:layout_alignParentLeft="true"
34-
android:layout_alignParentStart="true"
35-
android:layout_below="@+id/metrics_title"
36-
android:paddingBottom="@dimen/padding_below_for_metrics_titles"
37-
android:paddingTop="@dimen/padding_above_for_metrics_titles"
38-
android:text="@string/metrics_this_session"
39-
android:textSize="@dimen/font_size_for_metrics_titles"
40-
android:textStyle="bold" />
41-
42-
<TextView
43-
android:id="@+id/this_session_observations_title"
44-
android:layout_width="wrap_content"
45-
android:layout_height="wrap_content"
46-
android:layout_alignParentLeft="true"
47-
android:layout_alignParentStart="true"
48-
android:layout_below="@+id/this_session_header"
49-
android:paddingBottom="@dimen/padding_below_for_metrics_titles"
50-
android:text="@string/metrics_observations_title"
51-
android:textSize="@dimen/font_size_for_metrics" />
52-
53-
<TextView
54-
android:id="@+id/this_session_observations_value"
55-
android:layout_width="wrap_content"
56-
android:layout_height="wrap_content"
57-
android:layout_alignBaseline="@id/this_session_observations_title"
58-
android:layout_alignEnd="@+id/view"
59-
android:layout_alignRight="@+id/view"
60-
android:layout_toEndOf="@+id/wifis_sent_title"
61-
android:layout_toRightOf="@+id/wifis_sent_title"
62-
android:paddingBottom="@dimen/padding_below_for_metrics_titles"
63-
android:textSize="@dimen/font_size_for_metrics"
64-
tools:text="50" />
65-
66-
<TextView
67-
android:id="@+id/sent_header"
68-
android:layout_width="wrap_content"
69-
android:layout_height="wrap_content"
70-
android:layout_alignParentLeft="true"
71-
android:layout_alignParentStart="true"
72-
android:layout_below="@+id/this_session_observations_title"
73-
android:paddingBottom="@dimen/padding_below_for_metrics_titles"
74-
android:paddingTop="@dimen/padding_above_for_metrics_titles"
75-
android:text="@string/upload_observations_sent_title"
76-
android:textSize="@dimen/font_size_for_metrics_titles"
77-
android:textStyle="bold" />
78-
79-
<TextView
80-
android:id="@+id/last_upload_time_title"
81-
android:layout_width="wrap_content"
82-
android:layout_height="wrap_content"
83-
android:layout_alignParentLeft="true"
84-
android:layout_alignParentStart="true"
85-
android:layout_below="@id/sent_header"
86-
android:paddingBottom="@dimen/padding_below_for_metrics_titles"
87-
android:text="@string/metrics_observations_last_upload_time_title"
88-
android:textSize="@dimen/font_size_for_metrics" />
89-
90-
<TextView
91-
android:id="@+id/last_upload_time_value"
92-
android:layout_width="wrap_content"
93-
android:layout_height="wrap_content"
94-
android:layout_alignBaseline="@id/last_upload_time_title"
95-
android:layout_alignEnd="@+id/view"
96-
android:layout_alignRight="@+id/view"
97-
android:layout_toEndOf="@+id/wifis_sent_title"
98-
android:layout_toRightOf="@+id/wifis_sent_title"
99-
android:paddingBottom="@dimen/padding_below_for_metrics_titles"
100-
android:textSize="@dimen/font_size_for_metrics"
101-
tools:text="16.02.14 13:07" />
102-
103-
<TextView
104-
android:id="@+id/observations_sent_title"
105-
android:layout_width="wrap_content"
106-
android:layout_height="wrap_content"
107-
android:layout_alignParentLeft="true"
108-
android:layout_alignParentStart="true"
109-
android:layout_below="@id/last_upload_time_title"
110-
android:paddingBottom="@dimen/padding_below_for_metrics_titles"
111-
android:text="@string/metrics_observations_title"
112-
android:textSize="@dimen/font_size_for_metrics" />
113-
114-
<TextView
115-
android:id="@+id/observations_sent_value"
116-
android:layout_width="wrap_content"
117-
android:layout_height="wrap_content"
118-
android:layout_alignBaseline="@id/observations_sent_title"
119-
android:layout_alignEnd="@+id/view"
120-
android:layout_alignRight="@+id/view"
121-
android:layout_toEndOf="@id/wifis_sent_title"
122-
android:layout_toRightOf="@id/wifis_sent_title"
123-
android:paddingBottom="@dimen/padding_below_for_metrics_titles"
124-
android:textSize="@dimen/font_size_for_metrics"
125-
tools:text="100" />
126-
127-
<TextView
128-
android:id="@+id/cells_sent_title"
129-
android:layout_width="wrap_content"
130-
android:layout_height="wrap_content"
131-
android:layout_alignParentLeft="true"
132-
android:layout_alignParentStart="true"
133-
android:layout_below="@id/observations_sent_title"
134-
android:paddingBottom="@dimen/padding_below_for_metrics_titles"
135-
android:text="@string/metrics_observations_cell_towers_title"
136-
android:textSize="@dimen/font_size_for_metrics" />
137-
138-
<TextView
139-
android:id="@+id/cells_sent_value"
140-
android:layout_width="wrap_content"
141-
android:layout_height="wrap_content"
142-
android:layout_alignBaseline="@id/cells_sent_title"
143-
android:layout_alignEnd="@+id/view"
144-
android:layout_alignRight="@+id/view"
145-
android:layout_toEndOf="@id/wifis_sent_title"
146-
android:layout_toRightOf="@id/wifis_sent_title"
147-
android:paddingBottom="@dimen/padding_below_for_metrics_titles"
148-
android:textSize="@dimen/font_size_for_metrics"
149-
tools:text="50" />
150-
151-
<!-- Item widths are relative to this item-->
152-
<TextView
153-
android:id="@+id/wifis_sent_title"
154-
android:layout_width="wrap_content"
29+
<TableLayout
30+
android:id="@+id/metrics_table"
31+
android:layout_width="match_parent"
15532
android:layout_height="wrap_content"
15633
android:layout_alignParentLeft="true"
15734
android:layout_alignParentStart="true"
158-
android:layout_below="@id/cells_sent_title"
159-
android:paddingBottom="@dimen/padding_below_for_metrics_titles"
160-
android:paddingEnd="3dp"
161-
android:paddingRight="3dp"
162-
android:text="@string/metrics_observations_wifis_title"
163-
android:textSize="@dimen/font_size_for_metrics" />
164-
165-
<TextView
166-
android:id="@+id/wifis_sent_value"
167-
android:layout_width="wrap_content"
168-
android:layout_height="wrap_content"
169-
android:layout_alignBaseline="@id/wifis_sent_title"
170-
android:layout_alignEnd="@+id/view"
171-
android:layout_alignRight="@+id/view"
172-
android:layout_toEndOf="@id/wifis_sent_title"
173-
android:layout_toRightOf="@id/wifis_sent_title"
174-
android:paddingBottom="@dimen/padding_below_for_metrics_titles"
175-
android:textSize="@dimen/font_size_for_metrics"
176-
tools:text="500" />
177-
178-
<View
179-
android:id="@+id/view"
180-
android:layout_width="fill_parent"
181-
android:layout_height="1dp"
182-
android:layout_alignParentLeft="true"
183-
android:layout_alignParentStart="true"
184-
android:layout_alignTop="@+id/queued_header"
185-
android:layout_marginTop="3dp"
186-
android:background="@android:color/darker_gray" />
187-
188-
<TextView
189-
android:id="@+id/queued_header"
190-
android:layout_width="wrap_content"
191-
android:layout_height="wrap_content"
192-
android:layout_alignParentLeft="true"
193-
android:layout_alignParentStart="true"
194-
android:layout_below="@id/wifis_sent_title"
195-
android:layout_marginTop="4dp"
196-
android:paddingBottom="@dimen/padding_below_for_metrics_titles"
197-
android:paddingTop="@dimen/padding_above_for_metrics_titles"
198-
android:text="@string/upload_observations_in_queue_title"
199-
android:textSize="@dimen/font_size_for_metrics_titles"
200-
android:textStyle="bold" />
201-
202-
<TextView
203-
android:id="@+id/observations_queued_title"
204-
android:layout_width="wrap_content"
205-
android:layout_height="wrap_content"
206-
android:layout_alignParentLeft="true"
207-
android:layout_alignParentStart="true"
208-
android:layout_below="@+id/queued_header"
209-
android:paddingBottom="@dimen/padding_below_for_metrics_titles"
210-
android:text="@string/metrics_observations_title"
211-
android:textSize="@dimen/font_size_for_metrics" />
212-
213-
<TextView
214-
android:id="@+id/observations_queued_value"
215-
android:layout_width="wrap_content"
216-
android:layout_height="wrap_content"
217-
android:layout_alignBaseline="@id/observations_queued_title"
218-
android:layout_toEndOf="@id/wifis_sent_title"
219-
android:layout_toRightOf="@id/wifis_sent_title"
220-
android:minWidth="90dp"
221-
android:paddingBottom="@dimen/padding_below_for_metrics_titles"
222-
android:textSize="@dimen/font_size_for_metrics"
223-
tools:text="50" />
224-
225-
<TextView
226-
android:id="@+id/cells_queued_title"
227-
android:layout_width="wrap_content"
228-
android:layout_height="wrap_content"
229-
android:layout_alignParentLeft="true"
230-
android:layout_alignParentStart="true"
231-
android:layout_below="@id/observations_queued_title"
232-
android:paddingBottom="@dimen/padding_below_for_metrics_titles"
233-
android:text="@string/metrics_observations_cell_towers_title"
234-
android:textSize="@dimen/font_size_for_metrics" />
235-
236-
<TextView
237-
android:id="@+id/cells_queued_value"
238-
android:layout_width="wrap_content"
239-
android:layout_height="wrap_content"
240-
android:layout_alignBaseline="@id/cells_queued_title"
241-
android:layout_toEndOf="@id/wifis_sent_title"
242-
android:layout_toRightOf="@id/wifis_sent_title"
243-
android:minWidth="90dp"
244-
android:paddingBottom="@dimen/padding_below_for_metrics_titles"
245-
android:textSize="@dimen/font_size_for_metrics"
246-
tools:text="10" />
247-
248-
<TextView
249-
android:id="@+id/wifis_queued_title"
250-
android:layout_width="wrap_content"
251-
android:layout_height="wrap_content"
252-
android:layout_alignParentLeft="true"
253-
android:layout_alignParentStart="true"
254-
android:layout_below="@id/cells_queued_title"
255-
android:text="@string/metrics_observations_wifis_title"
256-
android:textSize="@dimen/font_size_for_metrics" />
257-
258-
<TextView
259-
android:id="@+id/wifis_queued_value"
260-
android:layout_width="wrap_content"
261-
android:layout_height="wrap_content"
262-
android:layout_alignBaseline="@id/wifis_queued_title"
263-
android:layout_toEndOf="@id/wifis_sent_title"
264-
android:layout_toRightOf="@id/wifis_sent_title"
265-
android:minWidth="90dp"
266-
android:textSize="@dimen/font_size_for_metrics"
267-
tools:text="50" />
35+
android:layout_below="@+id/metrics_title">
36+
37+
<TableRow>
38+
39+
<TextView
40+
android:id="@+id/this_session_header"
41+
android:layout_gravity="start"
42+
android:layout_span="2"
43+
android:paddingBottom="@dimen/padding_below_for_metrics_titles"
44+
android:paddingTop="@dimen/padding_above_for_metrics_titles"
45+
android:text="@string/metrics_this_session"
46+
android:textSize="@dimen/font_size_for_metrics_titles"
47+
android:textStyle="bold" />
48+
</TableRow>
49+
50+
<TableRow>
51+
52+
<TextView
53+
android:id="@+id/this_session_observations_title"
54+
android:layout_gravity="start"
55+
android:paddingBottom="@dimen/padding_below_for_metrics_titles"
56+
android:paddingEnd="3dp"
57+
android:paddingRight="3dp"
58+
android:text="@string/metrics_observations_title"
59+
android:textSize="@dimen/font_size_for_metrics" />
60+
61+
<TextView
62+
android:id="@+id/this_session_observations_value"
63+
android:layout_gravity="start"
64+
android:paddingBottom="@dimen/padding_below_for_metrics_titles"
65+
android:textSize="@dimen/font_size_for_metrics"
66+
tools:text="50" />
67+
</TableRow>
68+
69+
<TableRow>
70+
71+
<TextView
72+
android:id="@+id/sent_header"
73+
android:layout_gravity="start"
74+
android:layout_span="2"
75+
android:paddingBottom="@dimen/padding_below_for_metrics_titles"
76+
android:paddingTop="@dimen/padding_above_for_metrics_titles"
77+
android:text="@string/upload_observations_sent_title"
78+
android:textSize="@dimen/font_size_for_metrics_titles"
79+
android:textStyle="bold" />
80+
</TableRow>
81+
82+
<TableRow>
83+
84+
<TextView
85+
android:id="@+id/last_upload_time_title"
86+
android:layout_gravity="start"
87+
android:paddingBottom="@dimen/padding_below_for_metrics_titles"
88+
android:paddingEnd="3dp"
89+
android:paddingRight="3dp"
90+
android:text="@string/metrics_observations_last_upload_time_title"
91+
android:textSize="@dimen/font_size_for_metrics" />
92+
93+
<TextView
94+
android:id="@+id/last_upload_time_value"
95+
android:layout_gravity="start"
96+
android:paddingBottom="@dimen/padding_below_for_metrics_titles"
97+
android:textSize="@dimen/font_size_for_metrics"
98+
tools:text="16.02.14 13:07" />
99+
</TableRow>
100+
101+
<TableRow>
102+
103+
<TextView
104+
android:id="@+id/observations_sent_title"
105+
android:layout_gravity="start"
106+
android:paddingBottom="@dimen/padding_below_for_metrics_titles"
107+
android:paddingEnd="3dp"
108+
android:paddingRight="3dp"
109+
android:text="@string/metrics_observations_title"
110+
android:textSize="@dimen/font_size_for_metrics" />
111+
112+
<TextView
113+
android:id="@+id/observations_sent_value"
114+
android:layout_gravity="start"
115+
android:paddingBottom="@dimen/padding_below_for_metrics_titles"
116+
android:textSize="@dimen/font_size_for_metrics"
117+
tools:text="100" />
118+
</TableRow>
119+
120+
<TableRow>
121+
122+
<TextView
123+
android:id="@+id/cells_sent_title"
124+
android:layout_gravity="start"
125+
android:paddingBottom="@dimen/padding_below_for_metrics_titles"
126+
android:paddingEnd="3dp"
127+
android:paddingRight="3dp"
128+
android:text="@string/metrics_observations_cell_towers_title"
129+
android:textSize="@dimen/font_size_for_metrics" />
130+
131+
<TextView
132+
android:id="@+id/cells_sent_value"
133+
android:layout_gravity="start"
134+
android:paddingBottom="@dimen/padding_below_for_metrics_titles"
135+
android:textSize="@dimen/font_size_for_metrics"
136+
tools:text="50" />
137+
</TableRow>
138+
139+
<TableRow>
140+
141+
<TextView
142+
android:id="@+id/wifis_sent_title"
143+
android:layout_gravity="start"
144+
android:paddingBottom="@dimen/padding_below_for_metrics_titles"
145+
android:paddingEnd="3dp"
146+
android:paddingRight="3dp"
147+
android:text="@string/metrics_observations_wifis_title"
148+
android:textSize="@dimen/font_size_for_metrics" />
149+
150+
<TextView
151+
android:id="@+id/wifis_sent_value"
152+
android:layout_gravity="start"
153+
android:paddingBottom="@dimen/padding_below_for_metrics_titles"
154+
android:textSize="@dimen/font_size_for_metrics"
155+
tools:text="500" />
156+
</TableRow>
157+
158+
<TableRow
159+
android:layout_width="match_parent"
160+
android:layout_marginTop="5dp"
161+
android:background="@android:color/darker_gray">
162+
163+
<View android:layout_height="1dp" />
164+
</TableRow>
165+
166+
<TableRow>
167+
168+
<TextView
169+
android:id="@+id/queued_header"
170+
android:layout_gravity="start"
171+
android:layout_span="2"
172+
android:paddingBottom="@dimen/padding_below_for_metrics_titles"
173+
android:paddingTop="@dimen/padding_above_for_metrics_titles"
174+
android:text="@string/upload_observations_in_queue_title"
175+
android:textSize="@dimen/font_size_for_metrics_titles"
176+
android:textStyle="bold" />
177+
</TableRow>
178+
179+
<TableRow>
180+
181+
<TextView
182+
android:id="@+id/observations_queued_title"
183+
android:layout_gravity="start"
184+
android:paddingBottom="@dimen/padding_below_for_metrics_titles"
185+
android:paddingEnd="3dp"
186+
android:paddingRight="3dp"
187+
android:text="@string/metrics_observations_title"
188+
android:textSize="@dimen/font_size_for_metrics" />
189+
190+
<TextView
191+
android:id="@+id/observations_queued_value"
192+
android:layout_gravity="start"
193+
android:paddingBottom="@dimen/padding_below_for_metrics_titles"
194+
android:textSize="@dimen/font_size_for_metrics"
195+
tools:text="50" />
196+
</TableRow>
197+
198+
<TableRow>
199+
200+
<TextView
201+
android:id="@+id/cells_queued_title"
202+
android:layout_gravity="start"
203+
android:paddingBottom="@dimen/padding_below_for_metrics_titles"
204+
android:paddingEnd="3dp"
205+
android:paddingRight="3dp"
206+
android:text="@string/metrics_observations_cell_towers_title"
207+
android:textSize="@dimen/font_size_for_metrics" />
208+
209+
<TextView
210+
android:id="@+id/cells_queued_value"
211+
android:layout_gravity="start"
212+
android:paddingBottom="@dimen/padding_below_for_metrics_titles"
213+
android:textSize="@dimen/font_size_for_metrics"
214+
tools:text="10" />
215+
</TableRow>
216+
217+
<TableRow>
218+
219+
<TextView
220+
android:id="@+id/wifis_queued_title"
221+
android:layout_gravity="start"
222+
android:paddingEnd="3dp"
223+
android:paddingRight="3dp"
224+
android:text="@string/metrics_observations_wifis_title"
225+
android:textSize="@dimen/font_size_for_metrics" />
226+
227+
<TextView
228+
android:id="@+id/wifis_queued_value"
229+
android:layout_gravity="start"
230+
android:textSize="@dimen/font_size_for_metrics"
231+
tools:text="50" />
232+
</TableRow>
233+
234+
</TableLayout>
268235

269236
<ImageButton
270237
android:id="@+id/upload_observations_button"
271238
android:layout_width="40dp"
272239
android:layout_height="40dp"
273-
android:layout_alignBottom="@+id/wifis_queued_title"
240+
android:layout_alignBottom="@+id/metrics_table"
274241
android:layout_alignParentEnd="true"
275242
android:layout_alignParentRight="true"
276243
android:layout_marginBottom="-5dp"
@@ -283,7 +250,7 @@
283250
android:layout_height="wrap_content"
284251
android:layout_alignParentLeft="true"
285252
android:layout_alignParentStart="true"
286-
android:layout_below="@+id/wifis_queued_title"
253+
android:layout_below="@+id/metrics_table"
287254
android:paddingBottom="@dimen/padding_below_for_metrics_titles"
288255
android:paddingTop="20dp"
289256
android:text="@string/drawer_map_layers_title"
@@ -309,7 +276,6 @@
309276
android:maxWidth="14dp"
310277
android:src="@drawable/ic_purplering" />
311278

312-
313279
<TextView
314280
android:layout_width="wrap_content"
315281
android:layout_height="wrap_content"

0 commit comments

Comments
 (0)
Please sign in to comment.