diff --git a/app/src/main/java/com/hippo/ehviewer/widget/DrawerLeftPanel.java b/app/src/main/java/com/hippo/ehviewer/widget/DrawerLeftPanel.java index 87bf67480..f8951195f 100644 --- a/app/src/main/java/com/hippo/ehviewer/widget/DrawerLeftPanel.java +++ b/app/src/main/java/com/hippo/ehviewer/widget/DrawerLeftPanel.java @@ -23,6 +23,7 @@ import android.os.Parcelable; import android.support.annotation.NonNull; import android.util.AttributeSet; import android.view.LayoutInflater; +import android.view.View; import android.view.ViewGroup; import android.widget.LinearLayout; import android.widget.TextView; @@ -42,6 +43,7 @@ public class DrawerLeftPanel extends LinearLayout { private int mMaxWidth = -1; private ViewGroup mSuperUserPanel; + private View mKKStatusBarBg; private ViewGroup mUserPanel; private SimpleDraweeView mAvatar; private TextView mUsename; @@ -75,7 +77,8 @@ public class DrawerLeftPanel extends LinearLayout { LayoutInflater.from(context).inflate(R.layout.widget_drawer_left_panel, this); mSuperUserPanel = (ViewGroup) getChildAt(0); - mUserPanel = (ViewGroup) mSuperUserPanel.getChildAt(1); + mKKStatusBarBg = mSuperUserPanel.getChildAt(1); + mUserPanel = (ViewGroup) mSuperUserPanel.getChildAt(2); mAvatar = (SimpleDraweeView) mUserPanel.getChildAt(0); mUsename = (TextView) mUserPanel.getChildAt(1); mAction = (TextView) mUserPanel.getChildAt(2); @@ -85,7 +88,7 @@ public class DrawerLeftPanel extends LinearLayout { mAvatar.getHierarchy().setPlaceholderImage(R.drawable.theme_primary); mUsename.setText("速度速度加快"); - mAction.setText("登出"); + mAction.setText("退出"); mSuperUserPanelHeight = mSuperUserPanel.getLayoutParams().height; mUserPanelOriginalPaddingTop = mUserPanel.getPaddingTop(); @@ -135,7 +138,13 @@ public class DrawerLeftPanel extends LinearLayout { if (mFitPaddingTop != fitPaddingTop) { mFitPaddingTop = fitPaddingTop; - ViewGroup.LayoutParams lp = mSuperUserPanel.getLayoutParams(); + ViewGroup.LayoutParams lp; + + lp = mKKStatusBarBg.getLayoutParams(); + lp.height = fitPaddingTop; + mKKStatusBarBg.setLayoutParams(lp); + + lp = mSuperUserPanel.getLayoutParams(); lp.height = mSuperUserPanelHeight + fitPaddingTop; mSuperUserPanel.setLayoutParams(lp); @@ -146,6 +155,8 @@ public class DrawerLeftPanel extends LinearLayout { } if (mFitPaddingBottom != fitPaddingBottom) { + mFitPaddingBottom = fitPaddingBottom; + mDrawerListView.setPadding(mDrawerListView.getPaddingLeft(), mDrawerListView.getPaddingTop(), mDrawerListView.getPaddingRight(), diff --git a/app/src/main/res/color/text_button_text_accent.xml b/app/src/main/res/color/text_button_text_accent.xml new file mode 100644 index 000000000..58dc705d2 --- /dev/null +++ b/app/src/main/res/color/text_button_text_accent.xml @@ -0,0 +1,22 @@ + + + + + + + + diff --git a/app/src/main/res/layout/widget_drawer_left_panel.xml b/app/src/main/res/layout/widget_drawer_left_panel.xml index dbc2c15af..b0657a81c 100644 --- a/app/src/main/res/layout/widget_drawer_left_panel.xml +++ b/app/src/main/res/layout/widget_drawer_left_panel.xml @@ -30,11 +30,15 @@ android:scaleType="centerCrop" android:contentDescription="@null"/> + + + android:layout_height="match_parent"> @android:color/white + #4d000000 + #20000000 diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index 19327af7c..a4597f125 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -131,4 +131,8 @@ true + +