From f2ca9fd70b6fc1c0845a1141d8c29baba0aa3ad1 Mon Sep 17 00:00:00 2001
From: seven332 <seven332@163.com>
Date: Tue, 15 Mar 2016 17:14:43 +0800
Subject: [PATCH] Show display name

---
 .../java/com/hippo/ehviewer/ui/MainActivity.java  | 14 +++++++++++++-
 app/src/main/res/layout/nav_header_main.xml       | 15 +++++++++++++--
 2 files changed, 26 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/com/hippo/ehviewer/ui/MainActivity.java b/app/src/main/java/com/hippo/ehviewer/ui/MainActivity.java
index 612028fdd..3cc260db6 100644
--- a/app/src/main/java/com/hippo/ehviewer/ui/MainActivity.java
+++ b/app/src/main/java/com/hippo/ehviewer/ui/MainActivity.java
@@ -34,6 +34,7 @@ import android.view.Gravity;
 import android.view.MenuItem;
 import android.view.View;
 import android.widget.FrameLayout;
+import android.widget.TextView;
 import android.widget.Toast;
 
 import com.hippo.ehviewer.Crash;
@@ -94,6 +95,8 @@ public final class MainActivity extends StageActivity
     private FrameLayout mRightDrawer;
     @Nullable
     private LoadImageView mAvatar;
+    @Nullable
+    private TextView mDisplayName;
 
     private int mNavCheckedItem = 0;
 
@@ -257,6 +260,7 @@ public final class MainActivity extends StageActivity
         mRightDrawer = (FrameLayout) ViewUtils.$$(this, R.id.right_drawer);
         View headerLayout = mNavView.getHeaderView(0);
         mAvatar = (LoadImageView) ViewUtils.$$(headerLayout, R.id.avatar);
+        mDisplayName = (TextView) ViewUtils.$$(headerLayout, R.id.display_name);
 
         updateAvatar();
 
@@ -295,6 +299,8 @@ public final class MainActivity extends StageActivity
         mDrawerLayout = null;
         mNavView = null;
         mRightDrawer = null;
+        mAvatar = null;
+        mDisplayName = null;
     }
 
     @Override
@@ -345,7 +351,7 @@ public final class MainActivity extends StageActivity
     }
 
     public void updateAvatar() {
-        if (null == mAvatar) {
+        if (null == mAvatar || null == mDisplayName) {
             return;
         }
 
@@ -355,6 +361,12 @@ public final class MainActivity extends StageActivity
         } else {
             mAvatar.load(avatarUrl, avatarUrl);
         }
+
+        String displayName = Settings.getDisplayName();
+        if (TextUtils.isEmpty(displayName)) {
+            displayName = getString(R.string.default_display_name);
+        }
+        mDisplayName.setText(displayName);
     }
 
     public int getDrawerLockMode(int edgeGravity) {
diff --git a/app/src/main/res/layout/nav_header_main.xml b/app/src/main/res/layout/nav_header_main.xml
index 1b379e346..a0cbf99aa 100644
--- a/app/src/main/res/layout/nav_header_main.xml
+++ b/app/src/main/res/layout/nav_header_main.xml
@@ -32,7 +32,18 @@
         android:id="@+id/avatar"
         android:layout_width="64dp"
         android:layout_height="64dp"
-        android:layout_gravity="center_vertical"
-        android:layout_marginLeft="@dimen/keyline_margin"/>
+        android:layout_gravity="bottom"
+        android:layout_marginLeft="16dp"
+        android:layout_marginBottom="48dp"/>
+
+    <TextView
+        android:id="@+id/display_name"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="bottom"
+        android:layout_marginLeft="16dp"
+        android:layout_marginBottom="16dp"
+        android:textSize="@dimen/text_small"
+        android:textColor="@android:color/white"/>
 
 </FrameLayout>