From 9f8f6ce4c9d2dd9a9a86db86e1339e5368bc23ba Mon Sep 17 00:00:00 2001
From: Pulkit Bhatia <pulkit4tech@gmail.com>
Date: Fri, 13 Jan 2017 20:06:15 +0530
Subject: [PATCH] #35 : Improved Profile Pic Layout

---
 .../com/pulkit4tech/privy/MainActivity.java   | 29 ++++++++++++++-----
 app/src/main/res/layout/nav_header_main.xml   | 12 ++++----
 app/src/main/res/values/dimens.xml            |  2 ++
 3 files changed, 31 insertions(+), 12 deletions(-)

diff --git a/app/src/main/java/com/pulkit4tech/privy/MainActivity.java b/app/src/main/java/com/pulkit4tech/privy/MainActivity.java
index a917d1e..f51797a 100644
--- a/app/src/main/java/com/pulkit4tech/privy/MainActivity.java
+++ b/app/src/main/java/com/pulkit4tech/privy/MainActivity.java
@@ -4,6 +4,7 @@
 import android.content.Intent;
 import android.content.SharedPreferences;
 import android.content.pm.PackageManager;
+import android.graphics.Bitmap;
 import android.support.annotation.NonNull;
 import android.support.design.widget.CoordinatorLayout;
 import android.support.design.widget.FloatingActionButton;
@@ -13,6 +14,8 @@
 import android.support.v4.app.Fragment;
 import android.os.Bundle;
 import android.support.v4.app.FragmentTransaction;
+import android.support.v4.graphics.drawable.RoundedBitmapDrawable;
+import android.support.v4.graphics.drawable.RoundedBitmapDrawableFactory;
 import android.support.v4.view.GravityCompat;
 import android.support.v4.widget.DrawerLayout;
 import android.support.v7.app.ActionBarDrawerToggle;
@@ -27,6 +30,7 @@
 
 import com.bumptech.glide.Glide;
 import com.bumptech.glide.load.engine.DiskCacheStrategy;
+import com.bumptech.glide.request.target.BitmapImageViewTarget;
 import com.google.android.gms.auth.api.Auth;
 import com.google.android.gms.auth.api.signin.GoogleSignInAccount;
 import com.google.android.gms.auth.api.signin.GoogleSignInOptions;
@@ -119,17 +123,28 @@ private void setUpNavigationHeader() {
     }
 
     private void setUpNavigationHeaderValue() {
-        userName.setText(mSharedPreferences.getString(NAME, getString(R.string.sign_in)));
+        userName.setText(mSharedPreferences.getString(NAME, ""));
         emailId.setText(mSharedPreferences.getString(EMAIL, ""));
+        loadProfilePic();
+
+        changeSignInSignOutOption();
+    }
+
+    private void loadProfilePic() {
         Glide.with(mContext).load(mSharedPreferences.getString(PROFILE_PIC_URL, ""))
-                .override(150, 150)
+                .asBitmap()
                 .fitCenter()
-                .crossFade()
                 .diskCacheStrategy(DiskCacheStrategy.ALL)
-                .error(R.mipmap.ic_launcher)
-                .into(profileImg);
-
-        changeSignInSignOutOption();
+                .error(R.drawable.default_avatar)
+                .into(new BitmapImageViewTarget(profileImg) {
+                    @Override
+                    protected void setResource(Bitmap resource) {
+                        RoundedBitmapDrawable circularBitmapDrawable =
+                                RoundedBitmapDrawableFactory.create(mContext.getResources(), resource);
+                        circularBitmapDrawable.setCircular(true);
+                        profileImg.setImageDrawable(circularBitmapDrawable);
+                    }
+                });
     }
 
     private void changeSignInSignOutOption() {
diff --git a/app/src/main/res/layout/nav_header_main.xml b/app/src/main/res/layout/nav_header_main.xml
index 653f5f4..badcfff 100644
--- a/app/src/main/res/layout/nav_header_main.xml
+++ b/app/src/main/res/layout/nav_header_main.xml
@@ -14,17 +14,19 @@
 
     <ImageView
         android:id="@+id/profile_pic"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
+        android:layout_width="@dimen/profile_pic_width"
+        android:layout_height="@dimen/profile_pic_height"
+        android:layout_gravity="start"
+        android:scaleType="fitStart"
         android:paddingTop="@dimen/nav_header_vertical_spacing"
 
-        app:srcCompat="@android:drawable/sym_def_app_icon" />
+        app:srcCompat="@drawable/default_avatar" />
 
     <TextView
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:paddingTop="@dimen/nav_header_vertical_spacing"
-        android:text="@string/sign_in"
+        android:gravity="start"
+        android:text=""
         android:id="@+id/user_name"
         android:textAppearance="@style/TextAppearance.AppCompat.Body2" />
 
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index f8f67f0..9b3dd29 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -9,4 +9,6 @@
     <dimen name="design_fab_image_size" tools:override="true">36dp</dimen>
     <dimen name="fab_margin_bottom">30sp</dimen>
     <dimen name="fab_margin_start">10sp</dimen>
+    <dimen name="profile_pic_width">80sp</dimen>
+    <dimen name="profile_pic_height">80sp</dimen>
 </resources>