From c17a1f90ad1adabb4b4b8ee4095c002564b9366c Mon Sep 17 00:00:00 2001
From: Vanshika Arora <34261945+vanshikaarora@users.noreply.github.com>
Date: Fri, 22 Mar 2019 00:52:58 +0530
Subject: [PATCH] Fix #2677: Adjusted position of level number in achievements
 activity (#2695)

---
 .../achievements/AchievementsActivity.java    |  4 +-
 .../main/res/layout/activity_achievements.xml | 44 +++++++++++--------
 2 files changed, 29 insertions(+), 19 deletions(-)

diff --git a/app/src/main/java/fr/free/nrw/commons/achievements/AchievementsActivity.java b/app/src/main/java/fr/free/nrw/commons/achievements/AchievementsActivity.java
index 0d6e384b6..a1944436b 100644
--- a/app/src/main/java/fr/free/nrw/commons/achievements/AchievementsActivity.java
+++ b/app/src/main/java/fr/free/nrw/commons/achievements/AchievementsActivity.java
@@ -7,6 +7,8 @@ import android.content.Intent;
 import android.graphics.Bitmap;
 import android.net.Uri;
 import android.os.Bundle;
+
+import androidx.constraintlayout.widget.ConstraintLayout;
 import androidx.core.content.FileProvider;
 import androidx.appcompat.app.AlertDialog;
 import androidx.appcompat.widget.Toolbar;
@@ -127,7 +129,7 @@ public class AchievementsActivity extends NavigationBaseActivity {
         int width = displayMetrics.widthPixels;
 
         // Used for the setting the size of imageView at runtime
-        RelativeLayout.LayoutParams params = (RelativeLayout.LayoutParams)
+        ConstraintLayout.LayoutParams params = (ConstraintLayout.LayoutParams)
                 imageView.getLayoutParams();
         params.height = (int) (height * BADGE_IMAGE_HEIGHT_RATIO);
         params.width = (int) (width * BADGE_IMAGE_WIDTH_RATIO);
diff --git a/app/src/main/res/layout/activity_achievements.xml b/app/src/main/res/layout/activity_achievements.xml
index 5fc676ef1..ea6b80c26 100644
--- a/app/src/main/res/layout/activity_achievements.xml
+++ b/app/src/main/res/layout/activity_achievements.xml
@@ -28,7 +28,6 @@
                 android:orientation="vertical">
 
 
-
                 <RelativeLayout
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
@@ -59,32 +58,41 @@
                         android:tint="?attr/icon"
                         android:layout_marginVertical="@dimen/activity_margin_vertical" />
 
-                    <ImageView
-                        android:id="@+id/achievement_badge_image"
+                    <androidx.constraintlayout.widget.ConstraintLayout
+                        android:id="@+id/badge_layout"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_below="@id/achievement_info"
-                        android:layout_alignParentLeft="true"
-                        android:layout_alignParentRight="true"
-                        android:layout_marginVertical="@dimen/activity_margin_vertical" />
+                        android:layout_centerHorizontal="true">
 
-                    <TextView
-                        android:id="@+id/achievement_badge_text"
-                        android:textColor="@color/achievement_badge_text"
-                        android:textSize="90dp"
-                        android:textAlignment="center"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_marginTop="50dp"
-                        android:layout_alignTop="@+id/achievement_badge_image"
-                        android:layout_alignParentLeft="true"
-                        android:layout_alignParentRight="true" />
+                        <ImageView
+                            android:id="@+id/achievement_badge_image"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            app:layout_constraintLeft_toLeftOf="parent"
+                            app:layout_constraintRight_toRightOf="parent"
+                            app:layout_constraintTop_toTopOf="parent"
+                            app:srcCompat="@drawable/badge" />
+
+                        <TextView
+                            android:id="@+id/achievement_badge_text"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:textAlignment="center"
+                            android:textColor="@color/achievement_badge_text"
+                            android:textSize="75sp"
+                            app:layout_constraintBottom_toBottomOf="@+id/achievement_badge_image"
+                            app:layout_constraintEnd_toEndOf="@+id/achievement_badge_image"
+                            app:layout_constraintStart_toStartOf="@+id/achievement_badge_image"
+                            app:layout_constraintTop_toTopOf="@+id/achievement_badge_image"
+                            app:layout_constraintVertical_bias="0.58" />
+                    </androidx.constraintlayout.widget.ConstraintLayout>
 
                     <RelativeLayout
                         android:id="@+id/layout_image_uploaded"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        android:layout_below="@+id/achievement_badge_image"
+                        android:layout_below="@+id/badge_layout"
                         android:layout_marginEnd="@dimen/activity_margin_horizontal"
                         android:layout_marginLeft="@dimen/activity_margin_horizontal"
                         android:layout_marginRight="@dimen/activity_margin_horizontal"