Skip to content

Commit cd286c2

Browse files
committed
Moved Images via Nearby Places to top, fixes commons-app#2524
1 parent 52724b8 commit cd286c2

File tree

1 file changed

+30
-30
lines changed

1 file changed

+30
-30
lines changed

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

+30-30
Original file line numberDiff line numberDiff line change
@@ -277,35 +277,35 @@
277277
<ImageView
278278
android:layout_width="@dimen/overflow_icon_dimen"
279279
android:layout_height="@dimen/overflow_icon_dimen"
280+
android:id="@+id/wikidata_edits_icon"
280281
android:layout_centerVertical="true"
281-
android:id="@+id/featured_image_icon"
282-
app:srcCompat="@drawable/featured" />
282+
app:srcCompat="@drawable/ic_custom_map_marker" />
283283

284284
<TextView
285285
android:layout_width="wrap_content"
286286
android:layout_height="wrap_content"
287287
style="?android:textAppearanceMedium"
288-
android:layout_toRightOf="@+id/featured_image_icon"
289-
android:layout_toEndOf="@+id/featured_image_icon"
288+
android:layout_toRightOf="@+id/wikidata_edits_icon"
289+
android:layout_toEndOf="@+id/wikidata_edits_icon"
290290
android:layout_marginTop="@dimen/activity_margin_horizontal"
291291
android:layout_marginStart="@dimen/activity_margin_horizontal"
292-
android:layout_centerVertical="true"
293292
android:layout_marginLeft="@dimen/activity_margin_horizontal"
294-
android:text="@string/statistics_featured" />
293+
android:layout_centerVertical="true"
294+
android:text="@string/statistics_wikidata_edits" />
295295

296296
<TextView
297297
android:layout_width="wrap_content"
298298
android:layout_height="wrap_content"
299299
style="?android:textAppearanceMedium"
300300
android:layout_alignParentRight="true"
301301
android:layout_alignParentEnd="true"
302+
android:layout_marginLeft="@dimen/activity_margin_horizontal"
303+
android:layout_marginEnd="24dp"
302304
android:layout_marginTop="@dimen/activity_margin_horizontal"
303305
android:layout_marginStart="@dimen/activity_margin_horizontal"
304306
android:layout_centerVertical="true"
305307
tools:text="2"
306-
android:id="@+id/image_featured"
307-
android:layout_marginLeft="@dimen/activity_margin_horizontal"
308-
android:layout_marginEnd="24dp"
308+
android:id="@+id/wikidata_edits"
309309
android:layout_marginRight="24dp" />
310310

311311
</RelativeLayout>
@@ -315,29 +315,28 @@
315315
android:layout_height="wrap_content"
316316
android:layout_marginLeft="@dimen/activity_margin_horizontal"
317317
android:layout_marginRight="@dimen/activity_margin_horizontal"
318+
android:layout_marginEnd="@dimen/activity_margin_horizontal"
318319
android:layout_marginStart="@dimen/activity_margin_horizontal"
319-
android:layout_marginTop="@dimen/activity_margin_horizontal"
320-
android:layout_marginEnd="@dimen/activity_margin_horizontal">
320+
android:layout_marginTop="@dimen/activity_margin_horizontal">
321321

322322
<ImageView
323323
android:layout_width="@dimen/overflow_icon_dimen"
324324
android:layout_height="@dimen/overflow_icon_dimen"
325-
app:srcCompat="@drawable/ic_thanks"
326325
android:layout_centerVertical="true"
327-
android:id="@+id/thanks_image_icon"
328-
android:scaleType="centerCrop" />
326+
android:id="@+id/featured_image_icon"
327+
app:srcCompat="@drawable/featured" />
329328

330329
<TextView
331330
android:layout_width="wrap_content"
332331
android:layout_height="wrap_content"
333332
style="?android:textAppearanceMedium"
333+
android:layout_toRightOf="@+id/featured_image_icon"
334+
android:layout_toEndOf="@+id/featured_image_icon"
334335
android:layout_marginTop="@dimen/activity_margin_horizontal"
335-
android:layout_toRightOf="@+id/thanks_image_icon"
336-
android:layout_toEndOf="@+id/thanks_image_icon"
337336
android:layout_marginStart="@dimen/activity_margin_horizontal"
338337
android:layout_centerVertical="true"
339338
android:layout_marginLeft="@dimen/activity_margin_horizontal"
340-
android:text="@string/statistics_thanks" />
339+
android:text="@string/statistics_featured" />
341340

342341
<TextView
343342
android:layout_width="wrap_content"
@@ -347,10 +346,10 @@
347346
android:layout_alignParentEnd="true"
348347
android:layout_marginTop="@dimen/activity_margin_horizontal"
349348
android:layout_marginStart="@dimen/activity_margin_horizontal"
350-
android:layout_marginLeft="@dimen/activity_margin_horizontal"
351349
android:layout_centerVertical="true"
352350
tools:text="2"
353-
android:id="@+id/thanks_received"
351+
android:id="@+id/image_featured"
352+
android:layout_marginLeft="@dimen/activity_margin_horizontal"
354353
android:layout_marginEnd="24dp"
355354
android:layout_marginRight="24dp" />
356355

@@ -361,42 +360,43 @@
361360
android:layout_height="wrap_content"
362361
android:layout_marginLeft="@dimen/activity_margin_horizontal"
363362
android:layout_marginRight="@dimen/activity_margin_horizontal"
364-
android:layout_marginEnd="@dimen/activity_margin_horizontal"
365363
android:layout_marginStart="@dimen/activity_margin_horizontal"
366-
android:layout_marginTop="@dimen/activity_margin_horizontal">
364+
android:layout_marginTop="@dimen/activity_margin_horizontal"
365+
android:layout_marginEnd="@dimen/activity_margin_horizontal">
367366

368367
<ImageView
369368
android:layout_width="@dimen/overflow_icon_dimen"
370369
android:layout_height="@dimen/overflow_icon_dimen"
371-
android:id="@+id/wikidata_edits_icon"
370+
app:srcCompat="@drawable/ic_thanks"
372371
android:layout_centerVertical="true"
373-
app:srcCompat="@drawable/ic_custom_map_marker" />
372+
android:id="@+id/thanks_image_icon"
373+
android:scaleType="centerCrop" />
374374

375375
<TextView
376376
android:layout_width="wrap_content"
377377
android:layout_height="wrap_content"
378378
style="?android:textAppearanceMedium"
379-
android:layout_toRightOf="@+id/wikidata_edits_icon"
380-
android:layout_toEndOf="@+id/wikidata_edits_icon"
381379
android:layout_marginTop="@dimen/activity_margin_horizontal"
380+
android:layout_toRightOf="@+id/thanks_image_icon"
381+
android:layout_toEndOf="@+id/thanks_image_icon"
382382
android:layout_marginStart="@dimen/activity_margin_horizontal"
383-
android:layout_marginLeft="@dimen/activity_margin_horizontal"
384383
android:layout_centerVertical="true"
385-
android:text="@string/statistics_wikidata_edits" />
384+
android:layout_marginLeft="@dimen/activity_margin_horizontal"
385+
android:text="@string/statistics_thanks" />
386386

387387
<TextView
388388
android:layout_width="wrap_content"
389389
android:layout_height="wrap_content"
390390
style="?android:textAppearanceMedium"
391391
android:layout_alignParentRight="true"
392392
android:layout_alignParentEnd="true"
393-
android:layout_marginLeft="@dimen/activity_margin_horizontal"
394-
android:layout_marginEnd="24dp"
395393
android:layout_marginTop="@dimen/activity_margin_horizontal"
396394
android:layout_marginStart="@dimen/activity_margin_horizontal"
395+
android:layout_marginLeft="@dimen/activity_margin_horizontal"
397396
android:layout_centerVertical="true"
398397
tools:text="2"
399-
android:id="@+id/wikidata_edits"
398+
android:id="@+id/thanks_received"
399+
android:layout_marginEnd="24dp"
400400
android:layout_marginRight="24dp" />
401401

402402
</RelativeLayout>

0 commit comments

Comments
 (0)