From 0353c1cebb623f843edeb1c41fb2ae024e68267e Mon Sep 17 00:00:00 2001
From: seven332 <seven332@163.com>
Date: Mon, 7 Jan 2019 11:49:07 +0800
Subject: [PATCH] Update DrawerLayout

---
 app/build.gradle                               |  2 +-
 .../hippo/ehviewer/widget/EhDrawerView.java    | 16 +++++++++-------
 .../ehviewer/widget/EhNavigationView.java      | 18 ++++++++++--------
 .../hippo/ehviewer/widget/EhStageLayout.java   | 16 +++++++++-------
 4 files changed, 29 insertions(+), 23 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 024e3b49b..f8ed613d0 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -78,7 +78,7 @@ dependencies {
     implementation 'com.github.seven332:animator:0.1.0'
     implementation 'com.github.seven332:beerbelly:0.1.4'
     implementation 'com.github.seven332:conaco:0.1.5-eh'
-    implementation 'com.github.seven332:drawerlayout:0.2.1'
+    implementation 'com.github.seven332:drawerlayout:ea2bb388f0'
     implementation 'com.github.seven332:easyrecyclerview:0.1.1'
     implementation 'com.github.seven332:glgallery:0.1.2'
     implementation 'com.github.seven332:glview:0.1.0'
diff --git a/app/src/main/java/com/hippo/ehviewer/widget/EhDrawerView.java b/app/src/main/java/com/hippo/ehviewer/widget/EhDrawerView.java
index 966b548c1..73907f078 100644
--- a/app/src/main/java/com/hippo/ehviewer/widget/EhDrawerView.java
+++ b/app/src/main/java/com/hippo/ehviewer/widget/EhDrawerView.java
@@ -24,7 +24,8 @@ import com.hippo.widget.DrawerView;
 
 public class EhDrawerView extends DrawerView implements DrawerLayoutChild {
 
-    private int mFitPaddingTop;
+    private int mWindowPaddingTop;
+    private int mWindowPaddingBottom;
 
     public EhDrawerView(Context context) {
         super(context);
@@ -39,17 +40,18 @@ public class EhDrawerView extends DrawerView implements DrawerLayoutChild {
     }
 
     @Override
-    public void setFitPadding(int top, int bottom) {
-        mFitPaddingTop = top;
+    public void onGetWindowPadding(int top, int bottom) {
+        mWindowPaddingTop = top;
+        mWindowPaddingBottom = bottom;
     }
 
     @Override
-    public int getLayoutPaddingTop() {
-        return mFitPaddingTop;
+    public int getAdditionalTopMargin() {
+        return mWindowPaddingTop;
     }
 
     @Override
-    public int getLayoutPaddingBottom() {
-        return 0;
+    public int getAdditionalBottomMargin() {
+        return mWindowPaddingBottom;
     }
 }
diff --git a/app/src/main/java/com/hippo/ehviewer/widget/EhNavigationView.java b/app/src/main/java/com/hippo/ehviewer/widget/EhNavigationView.java
index bfe66cde6..b6e122ac1 100644
--- a/app/src/main/java/com/hippo/ehviewer/widget/EhNavigationView.java
+++ b/app/src/main/java/com/hippo/ehviewer/widget/EhNavigationView.java
@@ -30,7 +30,8 @@ public class EhNavigationView extends LinearLayout implements DrawerLayoutChild
     private static final int SCRIM_COLOR = 0x44000000;
     private static final boolean DRAW_SCRIM = Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP;
     private Paint mPaint;
-    private int mFitPaddingTop;
+    private int mWindowPaddingTop;
+    private int mWindowPaddingBottom;
 
     public EhNavigationView(Context context) {
         super(context);
@@ -57,27 +58,28 @@ public class EhNavigationView extends LinearLayout implements DrawerLayoutChild
     public void draw(@NonNull Canvas canvas) {
         super.draw(canvas);
 
-        if (DRAW_SCRIM && mFitPaddingTop > 0) {
+        if (DRAW_SCRIM && mWindowPaddingTop > 0) {
             if (null == mPaint) {
                 mPaint = new Paint();
                 mPaint.setColor(SCRIM_COLOR);
             }
-            canvas.drawRect(0, 0, getWidth(), mFitPaddingTop, mPaint);
+            canvas.drawRect(0, 0, getWidth(), mWindowPaddingTop, mPaint);
         }
     }
 
     @Override
-    public void setFitPadding(int top, int bottom) {
-        mFitPaddingTop = top;
+    public void onGetWindowPadding(int top, int bottom) {
+        mWindowPaddingTop = top;
+        mWindowPaddingBottom = bottom;
     }
 
     @Override
-    public int getLayoutPaddingTop() {
+    public int getAdditionalTopMargin() {
         return 0;
     }
 
     @Override
-    public int getLayoutPaddingBottom() {
-        return 0;
+    public int getAdditionalBottomMargin() {
+        return mWindowPaddingBottom;
     }
 }
diff --git a/app/src/main/java/com/hippo/ehviewer/widget/EhStageLayout.java b/app/src/main/java/com/hippo/ehviewer/widget/EhStageLayout.java
index 518e84bef..e49bbe9b4 100644
--- a/app/src/main/java/com/hippo/ehviewer/widget/EhStageLayout.java
+++ b/app/src/main/java/com/hippo/ehviewer/widget/EhStageLayout.java
@@ -24,7 +24,8 @@ import com.hippo.scene.StageLayout;
 
 public class EhStageLayout extends StageLayout implements DrawerLayoutChild {
 
-    private int mFitPaddingTop;
+    private int mWindowPaddingTop;
+    private int mWindowPaddingBottom;
 
     public EhStageLayout(Context context) {
         super(context);
@@ -39,17 +40,18 @@ public class EhStageLayout extends StageLayout implements DrawerLayoutChild {
     }
 
     @Override
-    public void setFitPadding(int top, int bottom) {
-        mFitPaddingTop = top;
+    public void onGetWindowPadding(int top, int bottom) {
+        mWindowPaddingTop = top;
+        mWindowPaddingBottom = bottom;
     }
 
     @Override
-    public int getLayoutPaddingTop() {
-        return mFitPaddingTop;
+    public int getAdditionalTopMargin() {
+        return mWindowPaddingTop;
     }
 
     @Override
-    public int getLayoutPaddingBottom() {
-        return 0;
+    public int getAdditionalBottomMargin() {
+        return mWindowPaddingBottom;
     }
 }