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 0fe4554f8..cb537eab0 100644 --- a/app/src/main/java/com/hippo/ehviewer/ui/MainActivity.java +++ b/app/src/main/java/com/hippo/ehviewer/ui/MainActivity.java @@ -28,11 +28,13 @@ import android.support.annotation.StringRes; import android.support.design.widget.NavigationView; import android.support.design.widget.Snackbar; import android.support.v4.widget.DrawerLayout; +import android.text.TextUtils; import android.util.Log; 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.R; @@ -49,15 +51,16 @@ import com.hippo.ehviewer.ui.scene.GalleryDetailScene; import com.hippo.ehviewer.ui.scene.GalleryInfoScene; import com.hippo.ehviewer.ui.scene.GalleryListScene; import com.hippo.ehviewer.ui.scene.GalleryPreviewsScene; -import com.hippo.ehviewer.ui.scene.SignInScene; import com.hippo.ehviewer.ui.scene.ProgressScene; import com.hippo.ehviewer.ui.scene.QuickSearchScene; +import com.hippo.ehviewer.ui.scene.SignInScene; import com.hippo.ehviewer.ui.scene.WarningScene; import com.hippo.ehviewer.ui.scene.WebViewLoginScene; import com.hippo.scene.Announcer; import com.hippo.scene.SceneFragment; import com.hippo.scene.StageActivity; import com.hippo.util.PermissionRequester; +import com.hippo.widget.LoadImageView; import com.hippo.yorozuya.ViewUtils; public final class MainActivity extends StageActivity @@ -231,6 +234,22 @@ public final class MainActivity extends StageActivity mDrawerLayout = (DrawerLayout) ViewUtils.$$(this, R.id.draw_view); mNavView = (NavigationView) ViewUtils.$$(this, R.id.nav_view); mRightDrawer = (FrameLayout) ViewUtils.$$(this, R.id.right_drawer); + View headerLayout = mNavView.getHeaderView(0); + LoadImageView avatarView = (LoadImageView) ViewUtils.$$(headerLayout, R.id.avatar); + TextView displayNameView = (TextView) ViewUtils.$$(headerLayout, R.id.display_name); + + String avatarUrl = Settings.getAvatar(); + if (TextUtils.isEmpty(avatarUrl)) { + avatarView.load(R.drawable.default_avatar); + } else { + avatarView.load(avatarUrl, avatarUrl); + } + + String displayName = Settings.getDisplayName(); + if (TextUtils.isEmpty(displayName)) { + displayName = getString(R.string.default_display_name); + } + displayNameView.setText(displayName); if (mNavView != null) { mNavView.setNavigationItemSelectedListener(this); diff --git a/app/src/main/java/com/hippo/widget/FixedAspectImageView.java b/app/src/main/java/com/hippo/widget/FixedAspectImageView.java index 0fa20ddd0..0b825a378 100644 --- a/app/src/main/java/com/hippo/widget/FixedAspectImageView.java +++ b/app/src/main/java/com/hippo/widget/FixedAspectImageView.java @@ -19,9 +19,9 @@ package com.hippo.widget; import android.content.Context; import android.content.res.TypedArray; import android.graphics.drawable.Drawable; +import android.support.v7.widget.AppCompatImageView; import android.util.AttributeSet; import android.view.View; -import android.widget.ImageView; import com.hippo.ehviewer.R; import com.hippo.yorozuya.MathUtils; @@ -29,7 +29,7 @@ import com.hippo.yorozuya.MathUtils; /** * aspect is width / height */ -public class FixedAspectImageView extends ImageView { +public class FixedAspectImageView extends AppCompatImageView { private static final String TAG = FixedAspectImageView.class.getSimpleName(); diff --git a/app/src/main/java/com/hippo/widget/LoadImageView.java b/app/src/main/java/com/hippo/widget/LoadImageView.java index 712fe9a50..8fb8ee841 100644 --- a/app/src/main/java/com/hippo/widget/LoadImageView.java +++ b/app/src/main/java/com/hippo/widget/LoadImageView.java @@ -22,6 +22,7 @@ import android.graphics.Color; import android.graphics.drawable.ColorDrawable; import android.graphics.drawable.Drawable; import android.graphics.drawable.TransitionDrawable; +import android.support.annotation.DrawableRes; import android.support.annotation.NonNull; import android.util.AttributeSet; import android.view.View; @@ -93,7 +94,9 @@ public class LoadImageView extends FixedAspectImageView implements Unikery + + + + + + + + + + + + + + + + + diff --git a/app/src/main/res/layout/nav_header_main.xml b/app/src/main/res/layout/nav_header_main.xml index 1a5138635..b456ecf06 100644 --- a/app/src/main/res/layout/nav_header_main.xml +++ b/app/src/main/res/layout/nav_header_main.xml @@ -28,4 +28,27 @@ android:scaleType="centerCrop" android:contentDescription="@null"/> + + + + + + + + diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 9c7ec464b..8c99ac470 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -50,6 +50,8 @@ Display name Display name is empty + Little Hippo + Bad Request Unauthorized Payment Required