Skip to content

Commit 9ceee36

Browse files
authored
Merge pull request #41 from pulkit4tech/improve_profile_pic_layout
#35 : Improved Profile Pic Layout
2 parents ad6c10c + 9f8f6ce commit 9ceee36

File tree

3 files changed

+31
-12
lines changed

3 files changed

+31
-12
lines changed

app/src/main/java/com/pulkit4tech/privy/MainActivity.java

Lines changed: 22 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
import android.content.Intent;
55
import android.content.SharedPreferences;
66
import android.content.pm.PackageManager;
7+
import android.graphics.Bitmap;
78
import android.support.annotation.NonNull;
89
import android.support.design.widget.CoordinatorLayout;
910
import android.support.design.widget.FloatingActionButton;
@@ -13,6 +14,8 @@
1314
import android.support.v4.app.Fragment;
1415
import android.os.Bundle;
1516
import android.support.v4.app.FragmentTransaction;
17+
import android.support.v4.graphics.drawable.RoundedBitmapDrawable;
18+
import android.support.v4.graphics.drawable.RoundedBitmapDrawableFactory;
1619
import android.support.v4.view.GravityCompat;
1720
import android.support.v4.widget.DrawerLayout;
1821
import android.support.v7.app.ActionBarDrawerToggle;
@@ -27,6 +30,7 @@
2730

2831
import com.bumptech.glide.Glide;
2932
import com.bumptech.glide.load.engine.DiskCacheStrategy;
33+
import com.bumptech.glide.request.target.BitmapImageViewTarget;
3034
import com.google.android.gms.auth.api.Auth;
3135
import com.google.android.gms.auth.api.signin.GoogleSignInAccount;
3236
import com.google.android.gms.auth.api.signin.GoogleSignInOptions;
@@ -119,17 +123,28 @@ private void setUpNavigationHeader() {
119123
}
120124

121125
private void setUpNavigationHeaderValue() {
122-
userName.setText(mSharedPreferences.getString(NAME, getString(R.string.sign_in)));
126+
userName.setText(mSharedPreferences.getString(NAME, ""));
123127
emailId.setText(mSharedPreferences.getString(EMAIL, ""));
128+
loadProfilePic();
129+
130+
changeSignInSignOutOption();
131+
}
132+
133+
private void loadProfilePic() {
124134
Glide.with(mContext).load(mSharedPreferences.getString(PROFILE_PIC_URL, ""))
125-
.override(150, 150)
135+
.asBitmap()
126136
.fitCenter()
127-
.crossFade()
128137
.diskCacheStrategy(DiskCacheStrategy.ALL)
129-
.error(R.mipmap.ic_launcher)
130-
.into(profileImg);
131-
132-
changeSignInSignOutOption();
138+
.error(R.drawable.default_avatar)
139+
.into(new BitmapImageViewTarget(profileImg) {
140+
@Override
141+
protected void setResource(Bitmap resource) {
142+
RoundedBitmapDrawable circularBitmapDrawable =
143+
RoundedBitmapDrawableFactory.create(mContext.getResources(), resource);
144+
circularBitmapDrawable.setCircular(true);
145+
profileImg.setImageDrawable(circularBitmapDrawable);
146+
}
147+
});
133148
}
134149

135150
private void changeSignInSignOutOption() {

app/src/main/res/layout/nav_header_main.xml

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,17 +14,19 @@
1414

1515
<ImageView
1616
android:id="@+id/profile_pic"
17-
android:layout_width="wrap_content"
18-
android:layout_height="wrap_content"
17+
android:layout_width="@dimen/profile_pic_width"
18+
android:layout_height="@dimen/profile_pic_height"
19+
android:layout_gravity="start"
20+
android:scaleType="fitStart"
1921
android:paddingTop="@dimen/nav_header_vertical_spacing"
2022

21-
app:srcCompat="@android:drawable/sym_def_app_icon" />
23+
app:srcCompat="@drawable/default_avatar" />
2224

2325
<TextView
2426
android:layout_width="match_parent"
2527
android:layout_height="wrap_content"
26-
android:paddingTop="@dimen/nav_header_vertical_spacing"
27-
android:text="@string/sign_in"
28+
android:gravity="start"
29+
android:text=""
2830
android:id="@+id/user_name"
2931
android:textAppearance="@style/TextAppearance.AppCompat.Body2" />
3032

app/src/main/res/values/dimens.xml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,6 @@
99
<dimen name="design_fab_image_size" tools:override="true">36dp</dimen>
1010
<dimen name="fab_margin_bottom">30sp</dimen>
1111
<dimen name="fab_margin_start">10sp</dimen>
12+
<dimen name="profile_pic_width">80sp</dimen>
13+
<dimen name="profile_pic_height">80sp</dimen>
1214
</resources>

0 commit comments

Comments
 (0)