From 891fe7ae326a86f92f8161b483d77f8e0e4ef36b Mon Sep 17 00:00:00 2001
From: Pulkit Bhatia <pulkit4tech@gmail.com>
Date: Fri, 13 Jan 2017 18:00:36 +0530
Subject: [PATCH] #33 : Added Profile Pic

---
 .idea/libraries/glide_3_7_0.xml               |  11 +++++++++
 app/build.gradle                              |   1 +
 .../com/pulkit4tech/privy/MainActivity.java   |  23 ++++++++++++++----
 app/src/main/res/drawable/default_avatar.png  | Bin 0 -> 4693 bytes
 app/src/main/res/drawable/default_profile.png | Bin 0 -> 6019 bytes
 app/src/main/res/layout/app_bar_main.xml      |   5 ++--
 app/src/main/res/layout/nav_header_main.xml   |   1 +
 app/src/main/res/values/dimens.xml            |  10 +++++---
 8 files changed, 40 insertions(+), 11 deletions(-)
 create mode 100644 .idea/libraries/glide_3_7_0.xml
 create mode 100644 app/src/main/res/drawable/default_avatar.png
 create mode 100644 app/src/main/res/drawable/default_profile.png

diff --git a/.idea/libraries/glide_3_7_0.xml b/.idea/libraries/glide_3_7_0.xml
new file mode 100644
index 0000000..9b3a3ea
--- /dev/null
+++ b/.idea/libraries/glide_3_7_0.xml
@@ -0,0 +1,11 @@
+<component name="libraryTable">
+  <library name="glide-3.7.0">
+    <CLASSES>
+      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.github.bumptech.glide/glide/3.7.0/9e9eeaf9948ee4d6c3ab354e8dc14368f16994a4/glide-3.7.0.jar!/" />
+    </CLASSES>
+    <JAVADOC />
+    <SOURCES>
+      <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.github.bumptech.glide/glide/3.7.0/24a0b0e63af9530bcedd06ed1983a4f2f02155a3/glide-3.7.0-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/app/build.gradle b/app/build.gradle
index 00ed590..992521d 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -36,6 +36,7 @@ dependencies {
     compile 'com.google.code.gson:gson:2.8.0'
     compile 'com.android.volley:volley:1.0.0'
     compile 'com.google.android.gms:play-services:10.0.1'
+    compile 'com.github.bumptech.glide:glide:3.7.0'
 }
 
 apply plugin: 'com.google.gms.google-services'
diff --git a/app/src/main/java/com/pulkit4tech/privy/MainActivity.java b/app/src/main/java/com/pulkit4tech/privy/MainActivity.java
index d17d437..23db48e 100644
--- a/app/src/main/java/com/pulkit4tech/privy/MainActivity.java
+++ b/app/src/main/java/com/pulkit4tech/privy/MainActivity.java
@@ -22,8 +22,11 @@
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
+import android.widget.ImageView;
 import android.widget.TextView;
 
+import com.bumptech.glide.Glide;
+import com.bumptech.glide.load.engine.DiskCacheStrategy;
 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;
@@ -58,8 +61,9 @@ public class MainActivity extends AppCompatActivity implements NavigationView.On
     private SharedPreferences mSharedPreferences;
     private String NAME = "user_name";
     private String EMAIL = "email_id";
+    private String PROFILE_PIC_URL = "profile_pic_url";
     private String LOGGED_IN = "logged_in";
-    //  private ImageView profileImg;
+    private ImageView profileImg;
     private TextView userName, emailId;
 
     @Override
@@ -107,7 +111,7 @@ private void setUpNavigationDrawer() {
 
     private void setUpNavigationHeader() {
         View nav_head = navigationView.getHeaderView(0);
-//      profileImg = (ImageView) nav_head.findViewById(R.id.profile_pic);
+        profileImg = (ImageView) nav_head.findViewById(R.id.profile_pic);
         userName = (TextView) nav_head.findViewById(R.id.user_name);
         emailId = (TextView) nav_head.findViewById(R.id.email_id);
 
@@ -118,6 +122,12 @@ private void setUpNavigationHeaderValue() {
         // TODO : Set Profile Image
         userName.setText(mSharedPreferences.getString(NAME, getString(R.string.sign_in)));
         emailId.setText(mSharedPreferences.getString(EMAIL, ""));
+        Glide.with(mContext).load(mSharedPreferences.getString(PROFILE_PIC_URL, ""))
+                .thumbnail(0.5f)
+                .crossFade()
+                .diskCacheStrategy(DiskCacheStrategy.ALL)
+                .error(R.mipmap.ic_launcher)
+                .into(profileImg);
 
         changeSignInSignOutOption();
     }
@@ -174,7 +184,6 @@ private void setGoogleApiClientInfo() {
         // Testing Google Sign in
         GoogleSignInOptions gso = new GoogleSignInOptions.Builder(GoogleSignInOptions.DEFAULT_SIGN_IN)
                 .requestEmail()
-                .requestProfile()
                 .build();
 
         // Build a GoogleApiClient with access to the Google Sign-In API and the
@@ -340,8 +349,12 @@ private void addLoginInfo(GoogleSignInAccount acct) {
         // TODO : add Profile Picture
         SharedPreferences.Editor editor = mSharedPreferences.edit();
         editor.putBoolean(LOGGED_IN, true);
-        editor.putString(NAME, acct.getDisplayName());
-        editor.putString(EMAIL, acct.getEmail());
+        if (acct.getDisplayName() != null)
+            editor.putString(NAME, acct.getDisplayName());
+        if (acct.getEmail() != null)
+            editor.putString(EMAIL, acct.getEmail());
+        if (acct.getPhotoUrl() != null)
+            editor.putString(PROFILE_PIC_URL, acct.getPhotoUrl().toString());
         editor.commit();
 
         snackMsg(getString(R.string.sign_in_msg));
diff --git a/app/src/main/res/drawable/default_avatar.png b/app/src/main/res/drawable/default_avatar.png
new file mode 100644
index 0000000000000000000000000000000000000000..c7d631ec0f0bde54118e1f823061dbd5c2357433
GIT binary patch
literal 4693
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
X*mA95FSmNV00000NkvXXu0mjfj3V$@

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable/default_profile.png b/app/src/main/res/drawable/default_profile.png
new file mode 100644
index 0000000000000000000000000000000000000000..ccb6b6df534c2bf7ca43382f6afe3081359a8fa7
GIT binary patch
literal 6019
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

literal 0
HcmV?d00001

diff --git a/app/src/main/res/layout/app_bar_main.xml b/app/src/main/res/layout/app_bar_main.xml
index b4ecc57..0c61455 100644
--- a/app/src/main/res/layout/app_bar_main.xml
+++ b/app/src/main/res/layout/app_bar_main.xml
@@ -28,8 +28,9 @@
         android:id="@+id/fab"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_gravity="bottom|end"
-        android:layout_margin="@dimen/fab_margin"
+        android:layout_gravity="bottom|start"
+        android:layout_marginBottom="@dimen/fab_margin_bottom"
+        android:layout_marginStart="@dimen/fab_margin_start"
         app:srcCompat="@drawable/google"
         app:backgroundTint="@android:color/white"
         />
diff --git a/app/src/main/res/layout/nav_header_main.xml b/app/src/main/res/layout/nav_header_main.xml
index c0b6ba3..653f5f4 100644
--- a/app/src/main/res/layout/nav_header_main.xml
+++ b/app/src/main/res/layout/nav_header_main.xml
@@ -17,6 +17,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:paddingTop="@dimen/nav_header_vertical_spacing"
+
         app:srcCompat="@android:drawable/sym_def_app_icon" />
 
     <TextView
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index 3cfc99c..f8f67f0 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -1,10 +1,12 @@
 <resources xmlns:tools="http://schemas.android.com/tools">
     <!-- Default screen margins, per the Android Design guidelines. -->
-    <dimen name="activity_horizontal_margin">16dp</dimen>
-    <dimen name="nav_header_height">160dp</dimen>
-    <dimen name="activity_vertical_margin">16dp</dimen>
+    <dimen name="activity_horizontal_margin">16sp</dimen>
+    <dimen name="nav_header_height">160sp</dimen>
+    <dimen name="activity_vertical_margin">16sp</dimen>
     <dimen name="nav_header_vertical_spacing">16sp</dimen>
-    <dimen name="fab_margin">16sp</dimen>
+
     <!--Floating action button-->
     <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>
 </resources>