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 45c0290ee..35c8fd290 100644 --- a/app/src/main/java/com/hippo/ehviewer/ui/MainActivity.java +++ b/app/src/main/java/com/hippo/ehviewer/ui/MainActivity.java @@ -30,7 +30,6 @@ import android.support.annotation.Nullable; 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.support.v7.app.AlertDialog; import android.text.TextUtils; import android.util.Log; @@ -76,7 +75,7 @@ import com.hippo.unifile.UniFile; import com.hippo.util.BitmapUtils; import com.hippo.util.PermissionRequester; import com.hippo.widget.LoadImageView; -import com.hippo.widget.slidingdrawerlayout.SlidingDrawerLayout; +import com.hippo.widget.drawerlayout.DrawerLayout; import com.hippo.yorozuya.IOUtils; import com.hippo.yorozuya.ResourcesUtils; import com.hippo.yorozuya.ViewUtils; @@ -111,7 +110,7 @@ public final class MainActivity extends StageActivity Whole life cycle ---------------*/ @Nullable - private SlidingDrawerLayout mDrawerLayout; + private DrawerLayout mDrawerLayout; @Nullable private NavigationView mNavView; @Nullable @@ -359,7 +358,7 @@ public final class MainActivity extends StageActivity protected void onCreate2(@Nullable Bundle savedInstanceState) { setContentView(R.layout.activity_main); - mDrawerLayout = (SlidingDrawerLayout) ViewUtils.$$(this, R.id.draw_view); + 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); @@ -458,9 +457,9 @@ public final class MainActivity extends StageActivity baseScene.getLayoutInflater2(), mRightDrawer, savedInstanceState); if (drawerView != null) { mRightDrawer.addView(drawerView); - mDrawerLayout.setDrawerLockMode(SlidingDrawerLayout.LOCK_MODE_UNLOCKED, Gravity.RIGHT); + mDrawerLayout.setDrawerLockMode(DrawerLayout.LOCK_MODE_UNLOCKED, Gravity.RIGHT); } else { - mDrawerLayout.setDrawerLockMode(SlidingDrawerLayout.LOCK_MODE_LOCKED_CLOSED, Gravity.RIGHT); + mDrawerLayout.setDrawerLockMode(DrawerLayout.LOCK_MODE_LOCKED_CLOSED, Gravity.RIGHT); } } } 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 f9083f2aa..d30f531e7 100644 --- a/app/src/main/java/com/hippo/ehviewer/widget/EhDrawerView.java +++ b/app/src/main/java/com/hippo/ehviewer/widget/EhDrawerView.java @@ -20,9 +20,9 @@ import android.content.Context; import android.util.AttributeSet; import com.hippo.widget.DrawerView; -import com.hippo.widget.slidingdrawerlayout.SlidingDrawerLayoutChild; +import com.hippo.widget.drawerlayout.DrawerLayoutChild; -public class EhDrawerView extends DrawerView implements SlidingDrawerLayoutChild { +public class EhDrawerView extends DrawerView implements DrawerLayoutChild { private int mFitPaddingTop; 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 7528e9d8b..2ba38eeb5 100644 --- a/app/src/main/java/com/hippo/ehviewer/widget/EhStageLayout.java +++ b/app/src/main/java/com/hippo/ehviewer/widget/EhStageLayout.java @@ -20,9 +20,9 @@ import android.content.Context; import android.util.AttributeSet; import com.hippo.scene.StageLayout; -import com.hippo.widget.slidingdrawerlayout.SlidingDrawerLayoutChild; +import com.hippo.widget.drawerlayout.DrawerLayoutChild; -public class EhStageLayout extends StageLayout implements SlidingDrawerLayoutChild { +public class EhStageLayout extends StageLayout implements DrawerLayoutChild { private int mFitPaddingTop; diff --git a/app/src/main/java/com/hippo/widget/slidingdrawerlayout/SlidingDrawerLayout.java b/app/src/main/java/com/hippo/widget/drawerlayout/DrawerLayout.java similarity index 97% rename from app/src/main/java/com/hippo/widget/slidingdrawerlayout/SlidingDrawerLayout.java rename to app/src/main/java/com/hippo/widget/drawerlayout/DrawerLayout.java index 8d571b242..48935f3ea 100644 --- a/app/src/main/java/com/hippo/widget/slidingdrawerlayout/SlidingDrawerLayout.java +++ b/app/src/main/java/com/hippo/widget/drawerlayout/DrawerLayout.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.hippo.widget.slidingdrawerlayout; +package com.hippo.widget.drawerlayout; import android.animation.Animator; import android.animation.ValueAnimator; @@ -52,7 +52,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; @SuppressLint("RtlHardcoded") -public class SlidingDrawerLayout extends ViewGroup implements ValueAnimator.AnimatorUpdateListener, +public class DrawerLayout extends ViewGroup implements ValueAnimator.AnimatorUpdateListener, Animator.AnimatorListener { @IntDef({STATE_CLOSED, STATE_SLIDING, STATE_OPEN}) @@ -101,11 +101,11 @@ public class SlidingDrawerLayout extends ViewGroup implements ValueAnimator.Anim private static final int MIN_DRAWER_MARGIN = 56; - private static final SlidingDrawerLayoutInsetsHelper INSETS_HELPER; + private static final DrawerLayoutInsetsHelper INSETS_HELPER; static { if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) { - INSETS_HELPER = new SlidingDrawerLayoutInsetsHelperL(); + INSETS_HELPER = new DrawerLayoutInsetsHelperL(); } else { INSETS_HELPER = null; } @@ -190,12 +190,12 @@ public class SlidingDrawerLayout extends ViewGroup implements ValueAnimator.Anim void onDrawerStateChanged(View drawerView, int newState); } - public SlidingDrawerLayout(Context context, AttributeSet attrs) { + public DrawerLayout(Context context, AttributeSet attrs) { super(context, attrs); init(context); } - public SlidingDrawerLayout(Context context, AttributeSet attrs, + public DrawerLayout(Context context, AttributeSet attrs, int defStyleAttr) { super(context, attrs, defStyleAttr); init(context); @@ -508,8 +508,8 @@ public class SlidingDrawerLayout extends ViewGroup implements ValueAnimator.Anim final LayoutParams lp = (LayoutParams) child.getLayoutParams(); int paddingTop = 0; int paddingBottom = mFitPaddingBottom; - if (child instanceof SlidingDrawerLayoutChild) { - SlidingDrawerLayoutChild dlc = (SlidingDrawerLayoutChild) child; + if (child instanceof DrawerLayoutChild) { + DrawerLayoutChild dlc = (DrawerLayoutChild) child; paddingTop = dlc.getLayoutPaddingTop(); paddingBottom = dlc.getLayoutPaddingBottom() + mFitPaddingBottom; } @@ -557,8 +557,8 @@ public class SlidingDrawerLayout extends ViewGroup implements ValueAnimator.Anim final LayoutParams lp = (LayoutParams) child.getLayoutParams(); int paddingTop = 0; int paddingBottom = mFitPaddingBottom; - if (child instanceof SlidingDrawerLayoutChild) { - SlidingDrawerLayoutChild dlc = (SlidingDrawerLayoutChild) child; + if (child instanceof DrawerLayoutChild) { + DrawerLayoutChild dlc = (DrawerLayoutChild) child; paddingTop = dlc.getLayoutPaddingTop(); paddingBottom = dlc.getLayoutPaddingBottom() + mFitPaddingBottom; } @@ -780,8 +780,8 @@ public class SlidingDrawerLayout extends ViewGroup implements ValueAnimator.Anim int xInt = (int) x; int yInt = (int) y; - if (activitedDrawer instanceof SlidingDrawerLayoutChild) { - SlidingDrawerLayoutChild dlc = (SlidingDrawerLayoutChild) activitedDrawer; + if (activitedDrawer instanceof DrawerLayoutChild) { + DrawerLayoutChild dlc = (DrawerLayoutChild) activitedDrawer; int paddingTop = dlc.getLayoutPaddingTop(); int paddingBottom = dlc.getLayoutPaddingBottom(); if (yInt < paddingTop || yInt >= getHeight() - paddingBottom) { @@ -1041,8 +1041,8 @@ public class SlidingDrawerLayout extends ViewGroup implements ValueAnimator.Anim for (int i = 0, n = getChildCount(); i < n; i++) { View view = getChildAt(i); - if (view instanceof SlidingDrawerLayoutChild) { - ((SlidingDrawerLayoutChild) view).setFitPadding(mFitPaddingTop, mFitPaddingBottom); + if (view instanceof DrawerLayoutChild) { + ((DrawerLayoutChild) view).setFitPadding(mFitPaddingTop, mFitPaddingBottom); } } @@ -1220,7 +1220,7 @@ public class SlidingDrawerLayout extends ViewGroup implements ValueAnimator.Anim View activatedDrawer = null; if (mLeftDrawer != null && mLeftDrawer.getRight() > 0) { activatedDrawer = mLeftDrawer; - } else if (mRightDrawer != null && mRightDrawer.getLeft() < SlidingDrawerLayout.this.getWidth()) { + } else if (mRightDrawer != null && mRightDrawer.getLeft() < DrawerLayout.this.getWidth()) { activatedDrawer = mRightDrawer; } if (activatedDrawer == null) { @@ -1229,8 +1229,8 @@ public class SlidingDrawerLayout extends ViewGroup implements ValueAnimator.Anim int paddingTop = 0; int paddingBottom = 0; - if (activatedDrawer instanceof SlidingDrawerLayoutChild) { - SlidingDrawerLayoutChild dlc = (SlidingDrawerLayoutChild) activatedDrawer; + if (activatedDrawer instanceof DrawerLayoutChild) { + DrawerLayoutChild dlc = (DrawerLayoutChild) activatedDrawer; paddingTop = dlc.getLayoutPaddingTop(); paddingBottom = dlc.getLayoutPaddingBottom(); } diff --git a/app/src/main/java/com/hippo/widget/slidingdrawerlayout/SlidingDrawerLayoutChild.java b/app/src/main/java/com/hippo/widget/drawerlayout/DrawerLayoutChild.java similarity index 88% rename from app/src/main/java/com/hippo/widget/slidingdrawerlayout/SlidingDrawerLayoutChild.java rename to app/src/main/java/com/hippo/widget/drawerlayout/DrawerLayoutChild.java index 91c81f91a..8904346f0 100644 --- a/app/src/main/java/com/hippo/widget/slidingdrawerlayout/SlidingDrawerLayoutChild.java +++ b/app/src/main/java/com/hippo/widget/drawerlayout/DrawerLayoutChild.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package com.hippo.widget.slidingdrawerlayout; +package com.hippo.widget.drawerlayout; -public interface SlidingDrawerLayoutChild { +public interface DrawerLayoutChild { void setFitPadding(int top, int bottom); diff --git a/app/src/main/java/com/hippo/widget/slidingdrawerlayout/SlidingDrawerLayoutInsetsHelper.java b/app/src/main/java/com/hippo/widget/drawerlayout/DrawerLayoutInsetsHelper.java similarity index 87% rename from app/src/main/java/com/hippo/widget/slidingdrawerlayout/SlidingDrawerLayoutInsetsHelper.java rename to app/src/main/java/com/hippo/widget/drawerlayout/DrawerLayoutInsetsHelper.java index ac9eb09f5..a14f20fed 100644 --- a/app/src/main/java/com/hippo/widget/slidingdrawerlayout/SlidingDrawerLayoutInsetsHelper.java +++ b/app/src/main/java/com/hippo/widget/drawerlayout/DrawerLayoutInsetsHelper.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package com.hippo.widget.slidingdrawerlayout; +package com.hippo.widget.drawerlayout; import android.view.View; -public interface SlidingDrawerLayoutInsetsHelper { +public interface DrawerLayoutInsetsHelper { void setupForWindowInsets(View view); } diff --git a/app/src/main/java/com/hippo/widget/slidingdrawerlayout/SlidingDrawerLayoutInsetsHelperL.java b/app/src/main/java/com/hippo/widget/drawerlayout/DrawerLayoutInsetsHelperL.java similarity index 88% rename from app/src/main/java/com/hippo/widget/slidingdrawerlayout/SlidingDrawerLayoutInsetsHelperL.java rename to app/src/main/java/com/hippo/widget/drawerlayout/DrawerLayoutInsetsHelperL.java index 29c81d815..c1780c3df 100644 --- a/app/src/main/java/com/hippo/widget/slidingdrawerlayout/SlidingDrawerLayoutInsetsHelperL.java +++ b/app/src/main/java/com/hippo/widget/drawerlayout/DrawerLayoutInsetsHelperL.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package com.hippo.widget.slidingdrawerlayout; +package com.hippo.widget.drawerlayout; import android.support.v4.view.ViewCompat; import android.view.View; -public class SlidingDrawerLayoutInsetsHelperL implements SlidingDrawerLayoutInsetsHelper { +public class DrawerLayoutInsetsHelperL implements DrawerLayoutInsetsHelper { @Override public void setupForWindowInsets(View view) { diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index e71fda439..0b9a56868 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -20,7 +20,7 @@ android:layout_width="match_parent" android:layout_height="match_parent"> - - +