From 3797d714a1f008fdfe726ee7d6d5a836159bcd47 Mon Sep 17 00:00:00 2001
From: tanvidadu <tanvidadu1998@gmail.com>
Date: Sun, 20 May 2018 21:50:15 +0530
Subject: [PATCH]  Wired to navigation drawer

---
 app/src/main/AndroidManifest.xml                  | 11 +++++------
 .../achievements/AchievementsActivity.java        | 11 ++++++++++-
 .../nrw/commons/di/ActivityBuilderModule.java     |  6 +++++-
 .../nrw/commons/theme/NavigationBaseActivity.java | 15 +++++++++++++--
 .../main/res/drawable/ic_person_black_24dp.xml    |  5 +++++
 app/src/main/res/layout/drawer_header.xml         | 13 +++++++++++++
 6 files changed, 51 insertions(+), 10 deletions(-)
 create mode 100644 app/src/main/res/drawable/ic_person_black_24dp.xml

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 79bc3ab6c..112ee6bcb 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -33,7 +33,11 @@
             android:launchMode="singleInstance"
             android:theme="@android:style/Theme.Dialog" />
         <activity android:name=".auth.LoginActivity">
+            <intent-filter>
+                <category android:name="android.intent.category.LAUNCHER" />
 
+                <action android:name="android.intent.action.MAIN" />
+            </intent-filter>
         </activity>
         <activity android:name=".WelcomeActivity" />
         <activity
@@ -90,13 +94,8 @@
 
         <activity
             android:name=".achievements.AchievementsActivity"
-            android:label="@string/Achievements">
-            <intent-filter>
-                <category android:name="android.intent.category.LAUNCHER" />
+            android:label="@string/Achievements" />
 
-                <action android:name="android.intent.action.MAIN" />
-            </intent-filter>
-        </activity>
 
         <service android:name=".upload.UploadService" />
         <service
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 f19003c3f..85f6e84bd 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
@@ -1,5 +1,6 @@
 package fr.free.nrw.commons.achievements;
 
+import android.annotation.SuppressLint;
 import android.content.Intent;
 import android.graphics.Bitmap;
 import android.net.Uri;
@@ -29,7 +30,7 @@ import dagger.Binds;
 import fr.free.nrw.commons.R;
 import fr.free.nrw.commons.theme.NavigationBaseActivity;
 
-public class AchievementsActivity extends AppCompatActivity {
+public class AchievementsActivity extends NavigationBaseActivity {
 
     private static final double BADGE_IMAGE_WIDTH_RATIO = 0.4;
     private static final double BADGE_IMAGE_HEIGHT_RATIO = 0.36;
@@ -37,7 +38,14 @@ public class AchievementsActivity extends AppCompatActivity {
     @BindView(R.id.achievement_badge) ImageView imageView;
     @BindView(R.id.toolbar) android.support.v7.widget.Toolbar toolbar;
 
+
+    /**
+     * This method helps in the creation Achievement screen
+     *
+     * @param savedInstanceState Data bundle
+     */
     @Override
+    @SuppressLint("StringFormatInvalid")
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_achievements);
@@ -56,6 +64,7 @@ public class AchievementsActivity extends AppCompatActivity {
         imageView.requestLayout();
 
         setSupportActionBar(toolbar);
+        initDrawer();
     }
 
     @Override
diff --git a/app/src/main/java/fr/free/nrw/commons/di/ActivityBuilderModule.java b/app/src/main/java/fr/free/nrw/commons/di/ActivityBuilderModule.java
index 51aa85903..20fadf624 100644
--- a/app/src/main/java/fr/free/nrw/commons/di/ActivityBuilderModule.java
+++ b/app/src/main/java/fr/free/nrw/commons/di/ActivityBuilderModule.java
@@ -4,10 +4,11 @@ import dagger.Module;
 import dagger.android.ContributesAndroidInjector;
 import fr.free.nrw.commons.AboutActivity;
 import fr.free.nrw.commons.WelcomeActivity;
+import fr.free.nrw.commons.achievements.AchievementsActivity;
 import fr.free.nrw.commons.auth.LoginActivity;
 import fr.free.nrw.commons.auth.SignupActivity;
-import fr.free.nrw.commons.contributions.ContributionsActivity;
 import fr.free.nrw.commons.category.CategoryImagesActivity;
+import fr.free.nrw.commons.contributions.ContributionsActivity;
 import fr.free.nrw.commons.nearby.NearbyActivity;
 import fr.free.nrw.commons.notification.NotificationActivity;
 import fr.free.nrw.commons.settings.SettingsActivity;
@@ -50,4 +51,7 @@ public abstract class ActivityBuilderModule {
 
     @ContributesAndroidInjector
     abstract CategoryImagesActivity bindFeaturedImagesActivity();
+
+    @ContributesAndroidInjector
+    abstract AchievementsActivity bindAchievementsActivity();
 }
diff --git a/app/src/main/java/fr/free/nrw/commons/theme/NavigationBaseActivity.java b/app/src/main/java/fr/free/nrw/commons/theme/NavigationBaseActivity.java
index 4a7322b57..d046b895e 100644
--- a/app/src/main/java/fr/free/nrw/commons/theme/NavigationBaseActivity.java
+++ b/app/src/main/java/fr/free/nrw/commons/theme/NavigationBaseActivity.java
@@ -15,6 +15,7 @@ import android.support.v7.widget.Toolbar;
 import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewGroup;
+import android.widget.ImageView;
 import android.widget.TextView;
 import android.widget.Toast;
 
@@ -24,6 +25,7 @@ import fr.free.nrw.commons.BuildConfig;
 import fr.free.nrw.commons.CommonsApplication;
 import fr.free.nrw.commons.R;
 import fr.free.nrw.commons.WelcomeActivity;
+import fr.free.nrw.commons.achievements.AchievementsActivity;
 import fr.free.nrw.commons.auth.AccountUtil;
 import fr.free.nrw.commons.auth.LoginActivity;
 import fr.free.nrw.commons.contributions.ContributionsActivity;
@@ -68,12 +70,20 @@ public abstract class NavigationBaseActivity extends BaseActivity
 
         View navHeaderView = navigationView.getHeaderView(0);
         TextView username = navHeaderView.findViewById(R.id.username);
-
         AccountManager accountManager = AccountManager.get(this);
         Account[] allAccounts = accountManager.getAccountsByType(AccountUtil.ACCOUNT_TYPE);
         if (allAccounts.length != 0) {
             username.setText(allAccounts[0].name);
         }
+        ImageView userIcon = navHeaderView.findViewById(R.id.user_icon);
+        userIcon.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                drawerLayout.closeDrawer(navigationView);
+                startActivityWithFlags(NavigationBaseActivity.this, AchievementsActivity.class, Intent.FLAG_ACTIVITY_CLEAR_TOP,
+                        Intent.FLAG_ACTIVITY_SINGLE_TOP);
+            }
+        });
     }
 
     public void initBackButton() {
@@ -181,9 +191,10 @@ public abstract class NavigationBaseActivity extends BaseActivity
 
     public static <T> void startActivityWithFlags(Context context, Class<T> cls, int... flags) {
         Intent intent = new Intent(context, cls);
-        for (int flag: flags) {
+        for (int flag : flags) {
             intent.addFlags(flag);
         }
         context.startActivity(intent);
     }
+
 }
diff --git a/app/src/main/res/drawable/ic_person_black_24dp.xml b/app/src/main/res/drawable/ic_person_black_24dp.xml
new file mode 100644
index 000000000..d7366bda0
--- /dev/null
+++ b/app/src/main/res/drawable/ic_person_black_24dp.xml
@@ -0,0 +1,5 @@
+<vector android:height="24dp" android:tint="#FFFFFF"
+    android:viewportHeight="24.0" android:viewportWidth="24.0"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#FF000000" android:pathData="M12,12c2.21,0 4,-1.79 4,-4s-1.79,-4 -4,-4 -4,1.79 -4,4 1.79,4 4,4zM12,14c-2.67,0 -8,1.34 -8,4v2h16v-2c0,-2.66 -5.33,-4 -8,-4z"/>
+</vector>
diff --git a/app/src/main/res/layout/drawer_header.xml b/app/src/main/res/layout/drawer_header.xml
index 9bd3ae3a3..53a2684a0 100644
--- a/app/src/main/res/layout/drawer_header.xml
+++ b/app/src/main/res/layout/drawer_header.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_height="match_parent"
     android:layout_width="match_parent"
@@ -27,4 +28,16 @@
         android:layout_centerHorizontal="true"
         android:paddingBottom="@dimen/small_gap"/>
 
+    <ImageView
+        android:id="@+id/user_icon"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        app:srcCompat="@drawable/ic_person_black_24dp"
+        android:textColor="@color/item_white_background"
+        android:textSize="@dimen/subheading_text_size"
+        android:layout_below="@+id/pictureOfTheDay"
+        android:layout_marginHorizontal="@dimen/activity_margin_horizontal"
+        android:layout_toRightOf="@+id/username"
+        android:paddingBottom="@dimen/small_gap"/>
+
 </RelativeLayout>
\ No newline at end of file