Skip to content

Commit 5038876

Browse files
silkypriyamaskaravivek
silkypriya
authored and
maskaravivek
committed
Label wraps in Achievements (commons-app#2577)
* Support long text * make text right aligned in rtl layout
1 parent 62c14ec commit 5038876

File tree

1 file changed

+78
-46
lines changed

1 file changed

+78
-46
lines changed

‎app/src/main/res/layout/activity_achievements.xml

+78-46
Original file line numberDiff line numberDiff line change
@@ -274,24 +274,35 @@
274274
android:layout_marginStart="@dimen/activity_margin_horizontal"
275275
android:layout_marginTop="@dimen/activity_margin_horizontal">
276276

277-
<ImageView
278-
android:layout_width="@dimen/overflow_icon_dimen"
279-
android:layout_height="@dimen/overflow_icon_dimen"
280-
android:layout_centerVertical="true"
281-
android:id="@+id/featured_image_icon"
282-
app:srcCompat="@drawable/featured" />
283-
284-
<TextView
277+
<LinearLayout
285278
android:layout_width="wrap_content"
286279
android:layout_height="wrap_content"
287-
style="?android:textAppearanceMedium"
288-
android:layout_toRightOf="@+id/featured_image_icon"
289-
android:layout_toEndOf="@+id/featured_image_icon"
290-
android:layout_marginTop="@dimen/activity_margin_horizontal"
291-
android:layout_marginStart="@dimen/activity_margin_horizontal"
292280
android:layout_centerVertical="true"
293-
android:layout_marginLeft="@dimen/activity_margin_horizontal"
294-
android:text="@string/statistics_featured" />
281+
android:layout_alignParentStart="true"
282+
android:layout_alignParentLeft="true"
283+
android:layout_toStartOf="@+id/image_featured"
284+
android:layout_toLeftOf="@+id/image_featured"
285+
android:orientation="horizontal"
286+
android:gravity="center_vertical">
287+
288+
<ImageView
289+
android:layout_width="@dimen/overflow_icon_dimen"
290+
android:layout_height="@dimen/overflow_icon_dimen"
291+
android:id="@+id/featured_image_icon"
292+
app:srcCompat="@drawable/featured"
293+
android:scaleType="centerCrop" />
294+
295+
<TextView
296+
android:layout_width="wrap_content"
297+
android:layout_height="wrap_content"
298+
style="?android:textAppearanceMedium"
299+
android:layout_marginStart="@dimen/activity_margin_horizontal"
300+
android:layout_marginLeft="@dimen/activity_margin_horizontal"
301+
android:layout_marginEnd="@dimen/activity_margin_horizontal"
302+
android:layout_marginRight="@dimen/activity_margin_horizontal"
303+
android:text="@string/statistics_featured" />
304+
305+
</LinearLayout>
295306

296307
<TextView
297308
android:layout_width="wrap_content"
@@ -319,25 +330,35 @@
319330
android:layout_marginTop="@dimen/activity_margin_horizontal"
320331
android:layout_marginEnd="@dimen/activity_margin_horizontal">
321332

322-
<ImageView
323-
android:layout_width="@dimen/overflow_icon_dimen"
324-
android:layout_height="@dimen/overflow_icon_dimen"
325-
app:srcCompat="@drawable/ic_thanks"
326-
android:layout_centerVertical="true"
327-
android:id="@+id/thanks_image_icon"
328-
android:scaleType="centerCrop" />
329-
330-
<TextView
333+
<LinearLayout
331334
android:layout_width="wrap_content"
332335
android:layout_height="wrap_content"
333-
style="?android:textAppearanceMedium"
334-
android:layout_marginTop="@dimen/activity_margin_horizontal"
335-
android:layout_toRightOf="@+id/thanks_image_icon"
336-
android:layout_toEndOf="@+id/thanks_image_icon"
337-
android:layout_marginStart="@dimen/activity_margin_horizontal"
338336
android:layout_centerVertical="true"
339-
android:layout_marginLeft="@dimen/activity_margin_horizontal"
340-
android:text="@string/statistics_thanks" />
337+
android:layout_alignParentStart="true"
338+
android:layout_alignParentLeft="true"
339+
android:layout_toStartOf="@+id/thanks_received"
340+
android:layout_toLeftOf="@+id/thanks_received"
341+
android:orientation="horizontal"
342+
android:gravity="center_vertical">
343+
344+
<ImageView
345+
android:layout_width="@dimen/overflow_icon_dimen"
346+
android:layout_height="@dimen/overflow_icon_dimen"
347+
android:id="@+id/thanks_image_icon"
348+
app:srcCompat="@drawable/ic_thanks"
349+
android:scaleType="centerCrop" />
350+
351+
<TextView
352+
android:layout_width="wrap_content"
353+
android:layout_height="wrap_content"
354+
style="?android:textAppearanceMedium"
355+
android:layout_marginStart="@dimen/activity_margin_horizontal"
356+
android:layout_marginLeft="@dimen/activity_margin_horizontal"
357+
android:layout_marginEnd="@dimen/activity_margin_horizontal"
358+
android:layout_marginRight="@dimen/activity_margin_horizontal"
359+
android:text="@string/statistics_thanks" />
360+
361+
</LinearLayout>
341362

342363
<TextView
343364
android:layout_width="wrap_content"
@@ -365,24 +386,35 @@
365386
android:layout_marginStart="@dimen/activity_margin_horizontal"
366387
android:layout_marginTop="@dimen/activity_margin_horizontal">
367388

368-
<ImageView
369-
android:layout_width="@dimen/overflow_icon_dimen"
370-
android:layout_height="@dimen/overflow_icon_dimen"
371-
android:id="@+id/wikidata_edits_icon"
372-
android:layout_centerVertical="true"
373-
app:srcCompat="@drawable/ic_custom_map_marker" />
374-
375-
<TextView
389+
<LinearLayout
376390
android:layout_width="wrap_content"
377391
android:layout_height="wrap_content"
378-
style="?android:textAppearanceMedium"
379-
android:layout_toRightOf="@+id/wikidata_edits_icon"
380-
android:layout_toEndOf="@+id/wikidata_edits_icon"
381-
android:layout_marginTop="@dimen/activity_margin_horizontal"
382-
android:layout_marginStart="@dimen/activity_margin_horizontal"
383-
android:layout_marginLeft="@dimen/activity_margin_horizontal"
384392
android:layout_centerVertical="true"
385-
android:text="@string/statistics_wikidata_edits" />
393+
android:layout_alignParentStart="true"
394+
android:layout_alignParentLeft="true"
395+
android:layout_toStartOf="@+id/wikidata_edits"
396+
android:layout_toLeftOf="@+id/wikidata_edits"
397+
android:orientation="horizontal"
398+
android:gravity="center_vertical">
399+
400+
<ImageView
401+
android:layout_width="@dimen/overflow_icon_dimen"
402+
android:layout_height="@dimen/overflow_icon_dimen"
403+
android:id="@+id/wikidata_edits_icon"
404+
app:srcCompat="@drawable/ic_custom_map_marker" />
405+
406+
<TextView
407+
android:layout_width="wrap_content"
408+
android:layout_height="wrap_content"
409+
style="?android:textAppearanceMedium"
410+
android:layout_marginStart="@dimen/activity_margin_horizontal"
411+
android:layout_marginLeft="@dimen/activity_margin_horizontal"
412+
android:layout_marginEnd="@dimen/activity_margin_horizontal"
413+
android:layout_marginRight="@dimen/activity_margin_horizontal"
414+
android:text="@string/statistics_wikidata_edits" />
415+
416+
</LinearLayout>
417+
386418

387419
<TextView
388420
android:layout_width="wrap_content"

0 commit comments

Comments
 (0)