From 2a6ac7a5c6e4ed9b7e6f0fbc78514dcedd249562 Mon Sep 17 00:00:00 2001
From: tanvidadu <tanvidadu1998@gmail.com>
Date: Sat, 12 May 2018 19:22:27 +0530
Subject: [PATCH]  Layout made screen independent and menu inflated

---
 .../fr/free/nrw/commons/Achievements.java     |  28 +++
 .../main/res/layout/activity_achievements.xml | 162 +++++++++---------
 2 files changed, 112 insertions(+), 78 deletions(-)

diff --git a/app/src/main/java/fr/free/nrw/commons/Achievements.java b/app/src/main/java/fr/free/nrw/commons/Achievements.java
index d16b384a6..e210606d0 100644
--- a/app/src/main/java/fr/free/nrw/commons/Achievements.java
+++ b/app/src/main/java/fr/free/nrw/commons/Achievements.java
@@ -2,19 +2,47 @@ package fr.free.nrw.commons;
 
 import android.support.v7.app.AppCompatActivity;
 import android.os.Bundle;
+import android.util.DisplayMetrics;
 import android.view.Menu;
 import android.view.MenuInflater;
 import android.view.View;
 import android.widget.ImageView;
+import android.widget.LinearLayout;
+import android.widget.RelativeLayout;
+import android.widget.Toolbar;
+
+import fr.free.nrw.commons.theme.NavigationBaseActivity;
 
 public class Achievements extends AppCompatActivity {
 
+    private static final double badge_image_ratio_width = 0.5;
+    private static final double badge_image_ratio_height = 0.5;
+
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_achievements);
 
+        DisplayMetrics displayMetrics = new DisplayMetrics();
+        getWindowManager().getDefaultDisplay().getMetrics(displayMetrics);
+        int height = displayMetrics.heightPixels;
+        int width = displayMetrics.widthPixels;
+
+        ImageView imageView = (ImageView)findViewById(R.id.achievement_badge);
+
+        RelativeLayout.LayoutParams params = (RelativeLayout.LayoutParams)
+                imageView.getLayoutParams();
+        params.height = (int) (height*badge_image_ratio_height);
+        params.width = (int) (width*badge_image_ratio_width);
+        imageView.setImageResource(R.drawable.sydney_opera_house);
+        imageView.requestLayout();
+
+        android.support.v7.widget.Toolbar toolbar = (android.support.v7.widget.Toolbar) findViewById(R.id.toolbar);
+        toolbar.inflateMenu(R.menu.menu_about);
 
     }
 
+    
+
+
 }
diff --git a/app/src/main/res/layout/activity_achievements.xml b/app/src/main/res/layout/activity_achievements.xml
index a8a0107ad..60ab9c92f 100644
--- a/app/src/main/res/layout/activity_achievements.xml
+++ b/app/src/main/res/layout/activity_achievements.xml
@@ -5,6 +5,9 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
+    <ScrollView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content">
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
@@ -14,131 +17,133 @@
             layout="@layout/toolbar"
             android:layout_width="match_parent"
             android:layout_height="wrap_content" />
-
         <RelativeLayout
             android:layout_width="match_parent"
-            android:layout_height="0dp"
-            android:layout_weight="1.8"
-            android:orientation="vertical"
+            android:layout_height="wrap_content"
             android:layout_below="@+id/toolbar"
-            android:background="#D6DCE0">
+            android:background="#D6DCE0"
+            android:orientation="vertical">
+
             <TextView
+                style="?android:textAppearanceLarge"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                style="?android:textAppearanceLarge"
-                android:layout_marginTop="@dimen/activity_margin_horizontal"
-                android:layout_marginStart="@dimen/activity_margin_horizontal"
                 android:layout_marginLeft="@dimen/activity_margin_horizontal"
-                android:text="@string/level"/>
+                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_badge"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginVertical="@dimen/activity_margin_vertical"
-                android:id="@+id/achievement_badge"
-                android:layout_above="@+id/layout_image_uploaded"
-                android:layout_marginBottom="@dimen/activity_margin_vertical"
-                android:layout_centerHorizontal="true"/>
+                android:layout_below="@id/achievement_level"
+                android:layout_centerHorizontal="true"
+                android:layout_marginVertical="@dimen/activity_margin_vertical" />
+
             <RelativeLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
                 android:id="@+id/layout_image_uploaded"
-                android:layout_above="@+id/layout_image_reverts"
+                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"
-                    style="?android:textAppearanceMedium"
-                    android:layout_marginTop="@dimen/activity_margin_horizontal"
-                    android:layout_marginStart="@dimen/activity_margin_horizontal"
                     android:layout_marginLeft="@dimen/activity_margin_horizontal"
-                    android:text="@string/images_uploaded"/>
+                    android:layout_marginStart="@dimen/activity_margin_horizontal"
+                    android:text="@string/images_uploaded" />
+
                 <com.dinuscxj.progressbar.CircleProgressBar
-                    android:layout_marginTop="4dp"
-                    android:progress="50"
-                    app:style="solid_line"
+                    android:layout_width="35dp"
+                    android:layout_height="35dp"
                     android:layout_alignParentRight="true"
-                    android:layout_marginHorizontal="@dimen/activity_margin_horizontal"
-                    app:progress_text_format_pattern="12/24"
-                    app:progress_stroke_width="3dp"
-                    app:progress_start_color="#3A3381"
+                    android:layout_marginRight="32dp"
+                    android:progress="50"
                     app:progress_end_color="#8C8B98"
-                    android:layout_width="50dp"
-                    android:layout_height="50dp" />
+                    app:progress_start_color="#3A3381"
+                    app:progress_stroke_width="3dp"
+                    app:progress_text_format_pattern="12/24"
+                    app:style="solid_line" />
 
 
             </RelativeLayout>
+
             <RelativeLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
                 android:id="@+id/layout_image_reverts"
-                android:layout_above="@+id/layout_image_used_by_wiki"
-                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
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    style="?android:textAppearanceMedium"
-                    android:layout_marginTop="@dimen/activity_margin_horizontal"
-                    android:layout_marginStart="@dimen/activity_margin_horizontal"
-                    android:layout_marginLeft="@dimen/activity_margin_horizontal"
-                    android:text="@string/images_uploaded"/>
-                <com.dinuscxj.progressbar.CircleProgressBar
-                    android:layout_marginTop="4dp"
-                    android:progress="50"
-                    app:style="solid_line"
-                    android:layout_alignParentRight="true"
-                    android:layout_marginHorizontal="@dimen/activity_margin_horizontal"
-                    app:progress_text_format_pattern="12/24"
-                    app:progress_stroke_width="3dp"
-                    app:progress_start_color="#3A3381"
-                    app:progress_end_color="#8C8B98"
-                    android:layout_width="50dp"
-                    android:layout_height="50dp" />
-            </RelativeLayout>
-            <RelativeLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:id="@+id/layout_image_used_by_wiki"
-                android:layout_marginBottom="@dimen/activity_margin_vertical"
-                android:layout_alignParentBottom="true"
+                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"
-                    style="?android:textAppearanceMedium"
-                    android:layout_marginTop="@dimen/activity_margin_horizontal"
-                    android:layout_marginStart="@dimen/activity_margin_horizontal"
                     android:layout_marginLeft="@dimen/activity_margin_horizontal"
-                    android:text="@string/images_uploaded"/>
+                    android:layout_marginStart="@dimen/activity_margin_horizontal"
+                    android:text="@string/images_uploaded" />
+
                 <com.dinuscxj.progressbar.CircleProgressBar
-                    android:layout_marginTop="4dp"
-                    android:progress="50"
-                    app:style="solid_line"
+                    android:layout_width="35dp"
+                    android:layout_height="35dp"
                     android:layout_alignParentRight="true"
-                    android:layout_marginHorizontal="@dimen/activity_margin_horizontal"
-                    app:progress_text_format_pattern="12/24"
-                    app:progress_stroke_width="2.5dp"
-                    app:progress_start_color="#3A3381"
+                    android:layout_marginRight="32dp"
+                    android:progress="50"
                     app:progress_end_color="#8C8B98"
-                    android:layout_width="50dp"
-                    android:layout_height="50dp" />
+                    app:progress_start_color="#3A3381"
+                    app:progress_stroke_width="3dp"
+                    app:progress_text_format_pattern="12/24"
+                    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:layout_marginLeft="@dimen/activity_margin_horizontal"
+                    android:layout_marginStart="@dimen/activity_margin_horizontal"
+                    android:text="@string/images_uploaded" />
+
+                <com.dinuscxj.progressbar.CircleProgressBar
+                    android:layout_width="35dp"
+                    android:layout_height="35dp"
+                    android:layout_alignParentRight="true"
+                    android:layout_marginRight="32dp"                    android:progress="50"
+                    app:progress_end_color="#8C8B98"
+                    app:progress_start_color="#3A3381"
+                    app:progress_stroke_width="2.5dp"
+                    app:progress_text_format_pattern="12/24"
+                    app:style="solid_line" />
             </RelativeLayout>
 
         </RelativeLayout>
         <LinearLayout
             android:layout_width="match_parent"
-            android:layout_height="0dp"
-            android:orientation="vertical"
-            android:layout_weight="1">
+            android:layout_height="wrap_content"
+            android:orientation="vertical">
 
             <TextView
                 android:layout_width="wrap_content"
@@ -220,6 +225,7 @@
         </LinearLayout>
 
     </LinearLayout>
+    </ScrollView>
     <android.support.design.widget.NavigationView
         android:id="@+id/navigation_view"
         android:layout_width="wrap_content"