From 68014f69eb8844828c1fdcc2a1a263328fae3511 Mon Sep 17 00:00:00 2001
From: Madhur Gupta <30932899+madhurgupta10@users.noreply.github.com>
Date: Sat, 16 Mar 2019 04:32:52 +0530
Subject: [PATCH] Fix #2524: Move 'Images via Nearby Places' to top of
 secondary achievements list (#2579)

* Moved Images via Nearby Places to top, fixes #2524
* Resolved Merge conflicts
---
 .../main/res/layout/activity_achievements.xml | 721 +++++++++---------
 1 file changed, 361 insertions(+), 360 deletions(-)

diff --git a/app/src/main/res/layout/activity_achievements.xml b/app/src/main/res/layout/activity_achievements.xml
index 3165bfd46..c1038da8f 100644
--- a/app/src/main/res/layout/activity_achievements.xml
+++ b/app/src/main/res/layout/activity_achievements.xml
@@ -22,419 +22,420 @@
         android:layout_marginTop="?attr/actionBarSize"
         android:layout_below="@id/toolbarLayout">
 
-    <ScrollView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content">
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:orientation="vertical">
-
-
-
-            <RelativeLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_below="@+id/toolbar"
-                android:background="?attr/achievementBackground"
-                android:orientation="vertical">
-
-                <TextView
-                    style="?android:textAppearanceLarge"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginLeft="@dimen/activity_margin_horizontal"
-                    android:layout_marginStart="@dimen/activity_margin_horizontal"
-                    android:layout_marginTop="@dimen/activity_margin_horizontal"
-                    android:text="@string/level"
-                    android:id="@+id/achievement_level" />
-
-                <ImageView
-                    android:id="@+id/achievement_info"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginTop="@dimen/activity_margin_vertical"
-                    android:layout_marginRight="@dimen/activity_margin_horizontal"
-                    android:layout_marginEnd="@dimen/activity_margin_horizontal"
-                    android:layout_alignParentRight="true"
-                    android:layout_alignParentEnd="true"
-                    app:srcCompat="@drawable/ic_info_outline_black_24dp"
-                    android:tint="?attr/icon"
-                    android:layout_marginVertical="@dimen/activity_margin_vertical" />
-
-                <ImageView
-                    android:id="@+id/achievement_badge"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_below="@id/achievement_level"
-                    android:layout_centerHorizontal="true"
-                    android:layout_marginVertical="@dimen/activity_margin_vertical" />
-
-                <RelativeLayout
-                    android:id="@+id/layout_image_uploaded"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_below="@+id/achievement_badge"
-                    android:layout_marginEnd="@dimen/activity_margin_horizontal"
-                    android:layout_marginLeft="@dimen/activity_margin_horizontal"
-                    android:layout_marginRight="@dimen/activity_margin_horizontal"
-                    android:layout_marginStart="@dimen/activity_margin_horizontal">
-
-                    <TextView
-                        style="?android:textAppearanceMedium"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_marginLeft="@dimen/activity_margin_horizontal"
-                        android:layout_marginStart="@dimen/activity_margin_horizontal"
-                        android:id="@+id/images_upload_text_param"
-                        android:layout_marginTop="@dimen/achievements_activity_margin_vertical"
-                        android:text="@string/images_uploaded" />
-
-                    <ImageView
-                        android:layout_width="12dp"
-                        android:layout_height="12dp"
-                        android:id="@+id/images_upload_info"
-                        android:layout_marginTop="8dp"
-                        android:layout_marginRight="@dimen/activity_margin_horizontal"
-                        android:layout_marginEnd="@dimen/activity_margin_horizontal"
-                        android:layout_toRightOf="@+id/images_upload_text_param"
-                        android:layout_toEndOf="@+id/images_upload_text_param"
-                        app:srcCompat="@drawable/ic_info_outline_blue_24dp"
-                        android:tint="?attr/icon"
-                        android:layout_marginLeft="8dp"
-                        android:layout_marginStart="8dp"/>
-
-                    <com.dinuscxj.progressbar.CircleProgressBar
-                        android:layout_width="40dp"
-                        android:layout_height="40dp"
-                        android:layout_alignParentRight="true"
-                        android:layout_alignParentEnd="true"
-                        android:layout_marginEnd="32dp"
-                        android:layout_marginRight="32dp"
-                        android:id="@+id/images_uploaded_progressbar"
-                        android:progress="50"
-                        app:progress_text_size="9dp"
-                        app:progress_end_color="#8C8B98"
-                        app:progress_start_color="#3A3381"
-                        app:progress_stroke_width="3dp"
-                        app:progress_text_format_pattern="573/110"
-                        app:progress_text_color="@color/secondaryColor"
-                        app:style="solid_line" />
-
-                </RelativeLayout>
-
-                <RelativeLayout
-                    android:id="@+id/layout_image_reverts"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_marginTop="4dp"
-                    android:layout_below="@+id/layout_image_uploaded"
-                    android:layout_marginEnd="@dimen/activity_margin_horizontal"
-                    android:layout_marginLeft="@dimen/activity_margin_horizontal"
-                    android:layout_marginRight="@dimen/activity_margin_horizontal"
-                    android:layout_marginStart="@dimen/activity_margin_horizontal">
-
-                    <TextView
-                        style="?android:textAppearanceMedium"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_marginLeft="@dimen/activity_margin_horizontal"
-                        android:id="@+id/images_reverted_text"
-                        android:layout_marginStart="@dimen/activity_margin_horizontal"
-                        android:text="@string/image_reverts" />
-
-                    <ImageView
-                        android:layout_width="12dp"
-                        android:layout_height="12dp"
-                        android:layout_marginTop="8dp"
-                        android:layout_marginRight="@dimen/activity_margin_horizontal"
-                        android:layout_marginEnd="@dimen/activity_margin_horizontal"
-                        android:id="@+id/images_reverted_info"
-                        android:layout_toRightOf="@+id/images_reverted_text"
-                        android:layout_toEndOf="@+id/images_reverted_text"
-                        app:srcCompat="@drawable/ic_info_outline_blue_24dp"
-                        android:tint="?attr/icon"
-                        android:layout_marginLeft="8dp"
-                        android:layout_marginStart="8dp"/>
-
-                    <TextView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:text="@string/achievements_revert_limit_message"
-                        android:textSize="10sp"
-                        android:id="@+id/images_revert_limit_text"
-                        android:layout_marginLeft="@dimen/activity_margin_horizontal"
-                        android:layout_marginStart="@dimen/activity_margin_horizontal"
-                        android:layout_below="@+id/images_reverted_text"/>
-
-                    <com.dinuscxj.progressbar.CircleProgressBar
-                        android:layout_width="40dp"
-                        android:layout_height="40dp"
-                        android:layout_alignParentRight="true"
-                        android:layout_alignParentEnd="true"
-                        android:layout_marginRight="32dp"
-                        android:layout_marginEnd="32dp"
-                        android:progress="50"
-                        android:id="@+id/image_reverts_progressbar"
-                        app:progress_end_color="#8C8B98"
-                        app:progress_start_color="#3A3381"
-                        app:progress_text_size="9dp"
-                        app:progress_stroke_width="3dp"
-                        app:progress_text_format_pattern="92%%"
-                        app:progress_text_color="@color/secondaryColor"
-                        app:style="solid_line" />
-
-                </RelativeLayout>
-
-                <RelativeLayout
-                    android:id="@+id/layout_image_used_by_wiki"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_marginTop="4dp"
-                    android:layout_below="@+id/layout_image_reverts"
-                    android:layout_marginBottom="@dimen/activity_margin_vertical"
-                    android:layout_marginEnd="@dimen/activity_margin_horizontal"
-                    android:layout_marginLeft="@dimen/activity_margin_horizontal"
-                    android:layout_marginRight="@dimen/activity_margin_horizontal"
-                    android:layout_marginStart="@dimen/activity_margin_horizontal">
-
-                    <TextView
-                        style="?android:textAppearanceMedium"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:id="@+id/images_used_by_wiki_text"
-                        android:layout_marginLeft="@dimen/activity_margin_horizontal"
-                        android:layout_marginStart="@dimen/activity_margin_horizontal"
-                        android:layout_marginTop="@dimen/achievements_activity_margin_vertical"
-                        android:text="@string/images_used_by_wiki" />
-
-                    <ImageView
-                        android:layout_width="12dp"
-                        android:layout_height="12dp"
-                        android:id="@+id/images_used_by_wiki_info"
-                        android:layout_marginTop="8dp"
-                        android:layout_marginRight="@dimen/activity_margin_horizontal"
-                        android:layout_marginEnd="@dimen/activity_margin_horizontal"
-                        android:layout_toRightOf="@+id/images_used_by_wiki_text"
-                        android:layout_toEndOf="@+id/images_used_by_wiki_text"
-                        app:srcCompat="@drawable/ic_info_outline_blue_24dp"
-                        android:tint="?attr/icon"
-                        android:layout_marginLeft="8dp"
-                        android:layout_marginStart="8dp"/>
-
-                    <com.dinuscxj.progressbar.CircleProgressBar
-                        android:layout_width="40dp"
-                        android:layout_height="40dp"
-                        android:layout_alignParentRight="true"
-                        android:layout_alignParentEnd="true"
-                        android:layout_marginRight="32dp"
-                        android:layout_marginEnd="32dp"
-                        android:progress="50"
-                        app:progress_text_size="9dp"
-                        android:id="@+id/images_used_by_wiki_progress_bar"
-                        app:progress_end_color="#8C8B98"
-                        app:progress_start_color="#3A3381"
-                        app:progress_stroke_width="2.5dp"
-                        app:progress_text_color="@color/secondaryColor"
-                        app:progress_text_format_pattern="12/24"
-                        app:style="solid_line" />
-
-                </RelativeLayout>
-
-                <ProgressBar
-                    android:id="@+id/progressBar"
-                    android:layout_centerVertical="true"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content" />
-
-            </RelativeLayout>
+        <ScrollView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content">
 
             <LinearLayout
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:id="@+id/layout_statistics"
+                android:layout_height="match_parent"
                 android:orientation="vertical">
 
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:text="@string/statistics"
-                    style="?android:textAppearanceLarge"
-                    android:layout_marginLeft="@dimen/activity_margin_horizontal"
-                    android:layout_marginStart="@dimen/activity_margin_horizontal"
-                    android:layout_marginTop="@dimen/activity_margin_vertical" />
+
 
                 <RelativeLayout
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_marginLeft="@dimen/activity_margin_horizontal"
-                    android:layout_marginRight="@dimen/activity_margin_horizontal"
-                    android:layout_marginEnd="@dimen/activity_margin_horizontal"
-                    android:layout_marginStart="@dimen/activity_margin_horizontal"
-                    android:layout_marginTop="@dimen/activity_margin_horizontal">
+                    android:layout_below="@+id/toolbar"
+                    android:background="?attr/achievementBackground"
+                    android:orientation="vertical">
 
-                    <LinearLayout
+                    <TextView
+                        style="?android:textAppearanceLarge"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:layout_centerVertical="true"
-                        android:layout_alignParentStart="true"
-                        android:layout_alignParentLeft="true"
-                        android:layout_toStartOf="@+id/image_featured"
-                        android:layout_toLeftOf="@+id/image_featured"
-                        android:orientation="horizontal"
-                        android:gravity="center_vertical">
+                        android:layout_marginLeft="@dimen/activity_margin_horizontal"
+                        android:layout_marginStart="@dimen/activity_margin_horizontal"
+                        android:layout_marginTop="@dimen/activity_margin_horizontal"
+                        android:text="@string/level"
+                        android:id="@+id/achievement_level" />
+
+                    <ImageView
+                        android:id="@+id/achievement_info"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="@dimen/activity_margin_vertical"
+                        android:layout_marginRight="@dimen/activity_margin_horizontal"
+                        android:layout_marginEnd="@dimen/activity_margin_horizontal"
+                        android:layout_alignParentRight="true"
+                        android:layout_alignParentEnd="true"
+                        app:srcCompat="@drawable/ic_info_outline_black_24dp"
+                        android:tint="?attr/icon"
+                        android:layout_marginVertical="@dimen/activity_margin_vertical" />
+
+                    <ImageView
+                        android:id="@+id/achievement_badge"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_below="@id/achievement_level"
+                        android:layout_centerHorizontal="true"
+                        android:layout_marginVertical="@dimen/activity_margin_vertical" />
+
+                    <RelativeLayout
+                        android:id="@+id/layout_image_uploaded"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_below="@+id/achievement_badge"
+                        android:layout_marginEnd="@dimen/activity_margin_horizontal"
+                        android:layout_marginLeft="@dimen/activity_margin_horizontal"
+                        android:layout_marginRight="@dimen/activity_margin_horizontal"
+                        android:layout_marginStart="@dimen/activity_margin_horizontal">
+
+                        <TextView
+                            style="?android:textAppearanceMedium"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_marginLeft="@dimen/activity_margin_horizontal"
+                            android:layout_marginStart="@dimen/activity_margin_horizontal"
+                            android:id="@+id/images_upload_text_param"
+                            android:layout_marginTop="@dimen/achievements_activity_margin_vertical"
+                            android:text="@string/images_uploaded" />
 
                         <ImageView
-                            android:layout_width="@dimen/overflow_icon_dimen"
-                            android:layout_height="@dimen/overflow_icon_dimen"
-                            android:id="@+id/featured_image_icon"
-                            app:srcCompat="@drawable/featured"
-                            android:scaleType="centerCrop" />
+                            android:layout_width="12dp"
+                            android:layout_height="12dp"
+                            android:id="@+id/images_upload_info"
+                            android:layout_marginTop="8dp"
+                            android:layout_marginRight="@dimen/activity_margin_horizontal"
+                            android:layout_marginEnd="@dimen/activity_margin_horizontal"
+                            android:layout_toRightOf="@+id/images_upload_text_param"
+                            android:layout_toEndOf="@+id/images_upload_text_param"
+                            app:srcCompat="@drawable/ic_info_outline_blue_24dp"
+                            android:tint="?attr/icon"
+                            android:layout_marginLeft="8dp"
+                            android:layout_marginStart="8dp"/>
+
+                        <com.dinuscxj.progressbar.CircleProgressBar
+                            android:layout_width="40dp"
+                            android:layout_height="40dp"
+                            android:layout_alignParentRight="true"
+                            android:layout_alignParentEnd="true"
+                            android:layout_marginEnd="32dp"
+                            android:layout_marginRight="32dp"
+                            android:id="@+id/images_uploaded_progressbar"
+                            android:progress="50"
+                            app:progress_text_size="9dp"
+                            app:progress_end_color="#8C8B98"
+                            app:progress_start_color="#3A3381"
+                            app:progress_stroke_width="3dp"
+                            app:progress_text_format_pattern="573/110"
+                            app:progress_text_color="@color/secondaryColor"
+                            app:style="solid_line" />
+
+                    </RelativeLayout>
+
+                    <RelativeLayout
+                        android:id="@+id/layout_image_reverts"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="4dp"
+                        android:layout_below="@+id/layout_image_uploaded"
+                        android:layout_marginEnd="@dimen/activity_margin_horizontal"
+                        android:layout_marginLeft="@dimen/activity_margin_horizontal"
+                        android:layout_marginRight="@dimen/activity_margin_horizontal"
+                        android:layout_marginStart="@dimen/activity_margin_horizontal">
+
+                        <TextView
+                            style="?android:textAppearanceMedium"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_marginLeft="@dimen/activity_margin_horizontal"
+                            android:id="@+id/images_reverted_text"
+                            android:layout_marginStart="@dimen/activity_margin_horizontal"
+                            android:text="@string/image_reverts" />
+
+                        <ImageView
+                            android:layout_width="12dp"
+                            android:layout_height="12dp"
+                            android:layout_marginTop="8dp"
+                            android:layout_marginRight="@dimen/activity_margin_horizontal"
+                            android:layout_marginEnd="@dimen/activity_margin_horizontal"
+                            android:id="@+id/images_reverted_info"
+                            android:layout_toRightOf="@+id/images_reverted_text"
+                            android:layout_toEndOf="@+id/images_reverted_text"
+                            app:srcCompat="@drawable/ic_info_outline_blue_24dp"
+                            android:tint="?attr/icon"
+                            android:layout_marginLeft="8dp"
+                            android:layout_marginStart="8dp"/>
+
+                        <TextView
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:text="@string/achievements_revert_limit_message"
+                            android:textSize="10sp"
+                            android:id="@+id/images_revert_limit_text"
+                            android:layout_marginLeft="@dimen/activity_margin_horizontal"
+                            android:layout_marginStart="@dimen/activity_margin_horizontal"
+                            android:layout_below="@+id/images_reverted_text"/>
+
+                        <com.dinuscxj.progressbar.CircleProgressBar
+                            android:layout_width="40dp"
+                            android:layout_height="40dp"
+                            android:layout_alignParentRight="true"
+                            android:layout_alignParentEnd="true"
+                            android:layout_marginRight="32dp"
+                            android:layout_marginEnd="32dp"
+                            android:progress="50"
+                            android:id="@+id/image_reverts_progressbar"
+                            app:progress_end_color="#8C8B98"
+                            app:progress_start_color="#3A3381"
+                            app:progress_text_size="9dp"
+                            app:progress_stroke_width="3dp"
+                            app:progress_text_format_pattern="92%%"
+                            app:progress_text_color="@color/secondaryColor"
+                            app:style="solid_line" />
+
+                    </RelativeLayout>
+
+                    <RelativeLayout
+                        android:id="@+id/layout_image_used_by_wiki"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="4dp"
+                        android:layout_below="@+id/layout_image_reverts"
+                        android:layout_marginBottom="@dimen/activity_margin_vertical"
+                        android:layout_marginEnd="@dimen/activity_margin_horizontal"
+                        android:layout_marginLeft="@dimen/activity_margin_horizontal"
+                        android:layout_marginRight="@dimen/activity_margin_horizontal"
+                        android:layout_marginStart="@dimen/activity_margin_horizontal">
+
+                        <TextView
+                            style="?android:textAppearanceMedium"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:id="@+id/images_used_by_wiki_text"
+                            android:layout_marginLeft="@dimen/activity_margin_horizontal"
+                            android:layout_marginStart="@dimen/activity_margin_horizontal"
+                            android:layout_marginTop="@dimen/achievements_activity_margin_vertical"
+                            android:text="@string/images_used_by_wiki" />
+
+                        <ImageView
+                            android:layout_width="12dp"
+                            android:layout_height="12dp"
+                            android:id="@+id/images_used_by_wiki_info"
+                            android:layout_marginTop="8dp"
+                            android:layout_marginRight="@dimen/activity_margin_horizontal"
+                            android:layout_marginEnd="@dimen/activity_margin_horizontal"
+                            android:layout_toRightOf="@+id/images_used_by_wiki_text"
+                            android:layout_toEndOf="@+id/images_used_by_wiki_text"
+                            app:srcCompat="@drawable/ic_info_outline_blue_24dp"
+                            android:tint="?attr/icon"
+                            android:layout_marginLeft="8dp"
+                            android:layout_marginStart="8dp"/>
+
+                        <com.dinuscxj.progressbar.CircleProgressBar
+                            android:layout_width="40dp"
+                            android:layout_height="40dp"
+                            android:layout_alignParentRight="true"
+                            android:layout_alignParentEnd="true"
+                            android:layout_marginRight="32dp"
+                            android:layout_marginEnd="32dp"
+                            android:progress="50"
+                            app:progress_text_size="9dp"
+                            android:id="@+id/images_used_by_wiki_progress_bar"
+                            app:progress_end_color="#8C8B98"
+                            app:progress_start_color="#3A3381"
+                            app:progress_stroke_width="2.5dp"
+                            app:progress_text_color="@color/secondaryColor"
+                            app:progress_text_format_pattern="12/24"
+                            app:style="solid_line" />
+
+                    </RelativeLayout>
+
+                    <ProgressBar
+                        android:id="@+id/progressBar"
+                        android:layout_centerVertical="true"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content" />
+
+                </RelativeLayout>
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:id="@+id/layout_statistics"
+                    android:orientation="vertical">
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:text="@string/statistics"
+                        style="?android:textAppearanceLarge"
+                        android:layout_marginLeft="@dimen/activity_margin_horizontal"
+                        android:layout_marginStart="@dimen/activity_margin_horizontal"
+                        android:layout_marginTop="@dimen/activity_margin_vertical" />
+
+                    <RelativeLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_marginLeft="@dimen/activity_margin_horizontal"
+                        android:layout_marginRight="@dimen/activity_margin_horizontal"
+                        android:layout_marginEnd="@dimen/activity_margin_horizontal"
+                        android:layout_marginStart="@dimen/activity_margin_horizontal"
+                        android:layout_marginTop="@dimen/activity_margin_horizontal">
+
+                        <LinearLayout
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_centerVertical="true"
+                            android:layout_alignParentStart="true"
+                            android:layout_alignParentLeft="true"
+                            android:layout_toStartOf="@+id/wikidata_edits"
+                            android:layout_toLeftOf="@+id/wikidata_edits"
+                            android:orientation="horizontal"
+                            android:gravity="center_vertical">
+
+                            <ImageView
+                                android:layout_width="@dimen/overflow_icon_dimen"
+                                android:layout_height="@dimen/overflow_icon_dimen"
+                                android:id="@+id/wikidata_edits_icon"
+                                app:srcCompat="@drawable/ic_custom_map_marker" />
+
+                            <TextView
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                style="?android:textAppearanceMedium"
+                                android:layout_marginStart="@dimen/activity_margin_horizontal"
+                                android:layout_marginLeft="@dimen/activity_margin_horizontal"
+                                android:layout_marginEnd="@dimen/activity_margin_horizontal"
+                                android:layout_marginRight="@dimen/activity_margin_horizontal"
+                                android:text="@string/statistics_wikidata_edits"  />
+
+                        </LinearLayout>
+
 
                         <TextView
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             style="?android:textAppearanceMedium"
-                            android:layout_marginStart="@dimen/activity_margin_horizontal"
+                            android:layout_alignParentRight="true"
+                            android:layout_alignParentEnd="true"
                             android:layout_marginLeft="@dimen/activity_margin_horizontal"
-                            android:layout_marginEnd="@dimen/activity_margin_horizontal"
-                            android:layout_marginRight="@dimen/activity_margin_horizontal"
-                            android:text="@string/statistics_featured"  />
+                            android:layout_marginEnd="24dp"
+                            android:layout_marginTop="@dimen/activity_margin_horizontal"
+                            android:layout_marginStart="@dimen/activity_margin_horizontal"
+                            android:layout_centerVertical="true"
+                            tools:text="2"
+                            android:id="@+id/wikidata_edits"
+                            android:layout_marginRight="24dp" />
 
-                    </LinearLayout>
+                    </RelativeLayout>
 
-                    <TextView
-                        android:layout_width="wrap_content"
+                    <RelativeLayout
+                        android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        style="?android:textAppearanceMedium"
-                        android:layout_alignParentRight="true"
-                        android:layout_alignParentEnd="true"
-                        android:layout_marginTop="@dimen/activity_margin_horizontal"
-                        android:layout_marginStart="@dimen/activity_margin_horizontal"
-                        android:layout_centerVertical="true"
-                        tools:text="2"
-                        android:id="@+id/image_featured"
                         android:layout_marginLeft="@dimen/activity_margin_horizontal"
-                        android:layout_marginEnd="24dp"
-                        android:layout_marginRight="24dp" />
+                        android:layout_marginRight="@dimen/activity_margin_horizontal"
+                        android:layout_marginEnd="@dimen/activity_margin_horizontal"
+                        android:layout_marginStart="@dimen/activity_margin_horizontal"
+                        android:layout_marginTop="@dimen/activity_margin_horizontal">
 
-                </RelativeLayout>
+                        <LinearLayout
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_centerVertical="true"
+                            android:layout_alignParentStart="true"
+                            android:layout_alignParentLeft="true"
+                            android:layout_toStartOf="@+id/image_featured"
+                            android:layout_toLeftOf="@+id/image_featured"
+                            android:orientation="horizontal"
+                            android:gravity="center_vertical">
 
-                <RelativeLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_marginLeft="@dimen/activity_margin_horizontal"
-                    android:layout_marginRight="@dimen/activity_margin_horizontal"
-                    android:layout_marginStart="@dimen/activity_margin_horizontal"
-                    android:layout_marginTop="@dimen/activity_margin_horizontal"
-                    android:layout_marginEnd="@dimen/activity_margin_horizontal">
+                            <ImageView
+                                android:layout_width="@dimen/overflow_icon_dimen"
+                                android:layout_height="@dimen/overflow_icon_dimen"
+                                android:id="@+id/featured_image_icon"
+                                app:srcCompat="@drawable/featured"
+                                android:scaleType="centerCrop" />
 
-                    <LinearLayout
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_centerVertical="true"
-                        android:layout_alignParentStart="true"
-                        android:layout_alignParentLeft="true"
-                        android:layout_toStartOf="@+id/thanks_received"
-                        android:layout_toLeftOf="@+id/thanks_received"
-                        android:orientation="horizontal"
-                        android:gravity="center_vertical">
+                            <TextView
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                style="?android:textAppearanceMedium"
+                                android:layout_marginStart="@dimen/activity_margin_horizontal"
+                                android:layout_marginLeft="@dimen/activity_margin_horizontal"
+                                android:layout_marginEnd="@dimen/activity_margin_horizontal"
+                                android:layout_marginRight="@dimen/activity_margin_horizontal"
+                                android:text="@string/statistics_featured"  />
 
-                        <ImageView
-                            android:layout_width="@dimen/overflow_icon_dimen"
-                            android:layout_height="@dimen/overflow_icon_dimen"
-                            android:id="@+id/thanks_image_icon"
-                            app:srcCompat="@drawable/ic_thanks"
-                            android:scaleType="centerCrop" />
+                        </LinearLayout>
 
                         <TextView
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             style="?android:textAppearanceMedium"
+                            android:layout_alignParentRight="true"
+                            android:layout_alignParentEnd="true"
+                            android:layout_marginTop="@dimen/activity_margin_horizontal"
                             android:layout_marginStart="@dimen/activity_margin_horizontal"
+                            android:layout_centerVertical="true"
+                            tools:text="2"
+                            android:id="@+id/image_featured"
                             android:layout_marginLeft="@dimen/activity_margin_horizontal"
-                            android:layout_marginEnd="@dimen/activity_margin_horizontal"
-                            android:layout_marginRight="@dimen/activity_margin_horizontal"
-                            android:text="@string/statistics_thanks"  />
+                            android:layout_marginEnd="24dp"
+                            android:layout_marginRight="24dp" />
 
-                    </LinearLayout>
+                    </RelativeLayout>
 
-                    <TextView
-                        android:layout_width="wrap_content"
+                    <RelativeLayout
+                        android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        style="?android:textAppearanceMedium"
-                        android:layout_alignParentRight="true"
-                        android:layout_alignParentEnd="true"
-                        android:layout_marginTop="@dimen/activity_margin_horizontal"
-                        android:layout_marginStart="@dimen/activity_margin_horizontal"
                         android:layout_marginLeft="@dimen/activity_margin_horizontal"
-                        android:layout_centerVertical="true"
-                        tools:text="2"
-                        android:id="@+id/thanks_received"
-                        android:layout_marginEnd="24dp"
-                        android:layout_marginRight="24dp" />
+                        android:layout_marginRight="@dimen/activity_margin_horizontal"
+                        android:layout_marginStart="@dimen/activity_margin_horizontal"
+                        android:layout_marginTop="@dimen/activity_margin_horizontal"
+                        android:layout_marginEnd="@dimen/activity_margin_horizontal">
 
-                </RelativeLayout>
+                        <LinearLayout
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_centerVertical="true"
+                            android:layout_alignParentStart="true"
+                            android:layout_alignParentLeft="true"
+                            android:layout_toStartOf="@+id/thanks_received"
+                            android:layout_toLeftOf="@+id/thanks_received"
+                            android:orientation="horizontal"
+                            android:gravity="center_vertical">
 
-                <RelativeLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_marginLeft="@dimen/activity_margin_horizontal"
-                    android:layout_marginRight="@dimen/activity_margin_horizontal"
-                    android:layout_marginEnd="@dimen/activity_margin_horizontal"
-                    android:layout_marginStart="@dimen/activity_margin_horizontal"
-                    android:layout_marginTop="@dimen/activity_margin_horizontal">
+                            <ImageView
+                                android:layout_width="@dimen/overflow_icon_dimen"
+                                android:layout_height="@dimen/overflow_icon_dimen"
+                                android:id="@+id/thanks_image_icon"
+                                app:srcCompat="@drawable/ic_thanks"
+                                android:scaleType="centerCrop" />
 
-                    <LinearLayout
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_centerVertical="true"
-                        android:layout_alignParentStart="true"
-                        android:layout_alignParentLeft="true"
-                        android:layout_toStartOf="@+id/wikidata_edits"
-                        android:layout_toLeftOf="@+id/wikidata_edits"
-                        android:orientation="horizontal"
-                        android:gravity="center_vertical">
+                            <TextView
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                style="?android:textAppearanceMedium"
+                                android:layout_marginStart="@dimen/activity_margin_horizontal"
+                                android:layout_marginLeft="@dimen/activity_margin_horizontal"
+                                android:layout_marginEnd="@dimen/activity_margin_horizontal"
+                                android:layout_marginRight="@dimen/activity_margin_horizontal"
+                                android:text="@string/statistics_thanks"  />
 
-                        <ImageView
-                            android:layout_width="@dimen/overflow_icon_dimen"
-                            android:layout_height="@dimen/overflow_icon_dimen"
-                            android:id="@+id/wikidata_edits_icon"
-                            app:srcCompat="@drawable/ic_custom_map_marker" />
+                        </LinearLayout>
 
                         <TextView
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             style="?android:textAppearanceMedium"
+                            android:layout_alignParentRight="true"
+                            android:layout_alignParentEnd="true"
+                            android:layout_marginTop="@dimen/activity_margin_horizontal"
                             android:layout_marginStart="@dimen/activity_margin_horizontal"
                             android:layout_marginLeft="@dimen/activity_margin_horizontal"
-                            android:layout_marginEnd="@dimen/activity_margin_horizontal"
-                            android:layout_marginRight="@dimen/activity_margin_horizontal"
-                            android:text="@string/statistics_wikidata_edits"  />
+                            android:layout_centerVertical="true"
+                            tools:text="2"
+                            android:id="@+id/thanks_received"
+                            android:layout_marginEnd="24dp"
+                            android:layout_marginRight="24dp" />
 
-                    </LinearLayout>
+                    </RelativeLayout>
 
-
-                    <TextView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        style="?android:textAppearanceMedium"
-                        android:layout_alignParentRight="true"
-                        android:layout_alignParentEnd="true"
-                        android:layout_marginLeft="@dimen/activity_margin_horizontal"
-                        android:layout_marginEnd="24dp"
-                        android:layout_marginTop="@dimen/activity_margin_horizontal"
-                        android:layout_marginStart="@dimen/activity_margin_horizontal"
-                        android:layout_centerVertical="true"
-                        tools:text="2"
-                        android:id="@+id/wikidata_edits"
-                        android:layout_marginRight="24dp" />
-
-                </RelativeLayout>
+                </LinearLayout>
             </LinearLayout>
-        </LinearLayout>
-    </ScrollView>
+        </ScrollView>
     </LinearLayout>
 
     <android.support.design.widget.NavigationView