添加 SlidingDrawerLayout

res/layout/favorite.xml

@@ -14,7 +14,7 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
-<android.support.v4.widget.DrawerLayout
+<com.hippo.ehviewer.widget.SlidingDrawerLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/drawerlayout"
     android:layout_width="match_parent"
@@ -41,4 +41,4 @@
 
     <include layout="@layout/favorite_menu"/>
 
-</android.support.v4.widget.DrawerLayout>
+</com.hippo.ehviewer.widget.SlidingDrawerLayout>

res/layout/gallery_list.xml

@@ -14,7 +14,7 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
-<android.support.v4.widget.DrawerLayout
+<com.hippo.ehviewer.widget.SlidingDrawerLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/drawerlayout"
     android:layout_width="match_parent"
@@ -43,4 +43,4 @@
 
     <include layout="@layout/list_menu_right"/>
 
-</android.support.v4.widget.DrawerLayout>
+</com.hippo.ehviewer.widget.SlidingDrawerLayout>

src/com/hippo/ehviewer/ui/FavouriteActivity.java

@@ -35,7 +35,6 @@ import android.graphics.drawable.Drawable;
 import android.graphics.drawable.ShapeDrawable;
 import android.graphics.drawable.shapes.PathShape;
 import android.os.Bundle;
-import android.support.v4.widget.DrawerLayout;
 import android.view.ActionMode;
 import android.view.Gravity;
 import android.view.LayoutInflater;
@@ -80,6 +79,7 @@ import com.hippo.ehviewer.widget.LoadImageView;
 import com.hippo.ehviewer.widget.MaterialToast;
 import com.hippo.ehviewer.widget.PullViewGroup;
 import com.hippo.ehviewer.widget.RatingView;
+import com.hippo.ehviewer.widget.SlidingDrawerLayout;
 
 public class FavouriteActivity extends AbsActivity
         implements ListView.MultiChoiceModeListener,
@@ -96,7 +96,7 @@ public class FavouriteActivity extends AbsActivity
     private ActionBar mActionBar;
     private int mThemeColor;
 
-    private DrawerLayout mDrawerLayout;
+    private SlidingDrawerLayout mDrawerLayout;
     private ListView mMenu;
     private FrameLayout mContentView;
     private FitWindowView mStandard;
@@ -173,7 +173,7 @@ public class FavouriteActivity extends AbsActivity
         materialMenu.setState(MaterialMenuDrawable.IconState.ARROW);
 
         // Get View
-        mDrawerLayout = (DrawerLayout) findViewById(R.id.drawerlayout);
+        mDrawerLayout = (SlidingDrawerLayout) findViewById(R.id.drawerlayout);
         mMenu = (ListView) mDrawerLayout.findViewById(R.id.favorite_menu_list);
         mContentView = (FrameLayout) mDrawerLayout.findViewById(R.id.content);
         mStandard = (FitWindowView) mDrawerLayout.findViewById(R.id.standard);
@@ -303,7 +303,7 @@ public class FavouriteActivity extends AbsActivity
         lp.rightMargin = magicSpacing;
         mActionableToastBar.setLayoutParams(lp);
         mList.setPadding(mList.getPaddingLeft(), t, mList.getPaddingRight(), b);
-        ((DrawerLayout.LayoutParams) mMenu.getLayoutParams()).topMargin = t;
+        ((SlidingDrawerLayout.LayoutParams) mMenu.getLayoutParams()).topMargin = t;
         mMenu.setPadding(mMenu.getPaddingLeft(), mMenu.getPaddingTop(), mMenu.getPaddingRight(), b);
 
         Ui.translucent(this, mThemeColor, t - Ui.ACTION_BAR_HEIGHT);

src/com/hippo/ehviewer/ui/GalleryListActivity.java

@@ -41,7 +41,6 @@ import android.os.Build;
 import android.os.Bundle;
 import android.os.Message;
 import android.provider.MediaStore;
-import android.support.v4.widget.DrawerLayout;
 import android.text.Spannable;
 import android.text.SpannableStringBuilder;
 import android.text.style.ImageSpan;
@@ -101,6 +100,7 @@ import com.hippo.ehviewer.widget.GalleryListView.OnGetListListener;
 import com.hippo.ehviewer.widget.LoadImageView;
 import com.hippo.ehviewer.widget.MaterialToast;
 import com.hippo.ehviewer.widget.RatingView;
+import com.hippo.ehviewer.widget.SlidingDrawerLayout;
 import com.hippo.ehviewer.widget.SuggestionHelper;
 import com.hippo.ehviewer.widget.SuggestionTextView;
 import com.hippo.ehviewer.widget.TagListView;
@@ -132,7 +132,7 @@ import com.hippo.ehviewer.windowsanimate.WindowsAnimate;
  */
 public class GalleryListActivity extends AbsActivity implements View.OnClickListener,
         SearchView.OnQueryTextListener, SearchView.OnFocusChangeListener,
-        DrawerLayout.DrawerListener, EhClient.OnLoginListener,
+        SlidingDrawerLayout.DrawerListener, EhClient.OnLoginListener,
         GalleryListView.GalleryListViewHelper, FitWindowView.OnFitSystemWindowsListener {
 
     @SuppressWarnings("unused")
@@ -162,7 +162,7 @@ public class GalleryListActivity extends AbsActivity implements View.OnClickList
     private MaterialMenuIcon mMaterialMenu;
     private boolean mDirection;
 
-    private DrawerLayout mDrawerLayout;
+    private SlidingDrawerLayout mDrawerLayout;
     private View mLeftMenu;
     private View mRightMenu;
     private FitWindowView mStandard;
@@ -938,7 +938,7 @@ public class GalleryListActivity extends AbsActivity implements View.OnClickList
     }
 
     @Override
-    public void onDrawerStateChanged(int i) {
+    public void onDrawerStateChanged(View drawerView, int newState) {
         // Empty
     }
 
@@ -946,8 +946,8 @@ public class GalleryListActivity extends AbsActivity implements View.OnClickList
     public void onFitSystemWindows(int l, int t, int r, int b) {
         mStaggeredGridView.setPadding(mStaggeredGridView.getPaddingLeft(), t,
                 mStaggeredGridView.getPaddingRight(), b);
-        ((DrawerLayout.LayoutParams) mLeftMenu.getLayoutParams()).topMargin = t;
-        ((DrawerLayout.LayoutParams) mRightMenu.getLayoutParams()).topMargin = t;
+        ((SlidingDrawerLayout.LayoutParams) mLeftMenu.getLayoutParams()).topMargin = t;
+        ((SlidingDrawerLayout.LayoutParams) mRightMenu.getLayoutParams()).topMargin = t;
         mMenuList.setPadding(mMenuList.getPaddingLeft(), mMenuList.getPaddingTop(),
                 mMenuList.getPaddingRight(), b);
         mQuickSearchList.setPadding(mQuickSearchList.getPaddingLeft(), mQuickSearchList.getPaddingTop(),
@@ -1017,7 +1017,7 @@ public class GalleryListActivity extends AbsActivity implements View.OnClickList
             mMaterialMenu.setState(MaterialMenuDrawable.IconState.ARROW);
 
         // Get View
-        mDrawerLayout = (DrawerLayout) findViewById(R.id.drawerlayout);
+        mDrawerLayout = (SlidingDrawerLayout) findViewById(R.id.drawerlayout);
 
         mLeftMenu = mDrawerLayout.findViewById(R.id.list_menu_left);
         mRightMenu = mDrawerLayout.findViewById(R.id.list_menu_right);
@@ -1050,7 +1050,7 @@ public class GalleryListActivity extends AbsActivity implements View.OnClickList
             mActionBar.setHomeAsUpIndicator(mResources.getDrawable(R.drawable.ic_navigation_drawer));
         mDrawerLayout.setDrawerListener(this);
         if (!mShowDrawer)
-            mDrawerLayout.setDrawerLockMode(DrawerLayout.LOCK_MODE_LOCKED_CLOSED, mLeftMenu);
+            ; //mDrawerLayout.setDrawerLockMode(DrawerLayout.LOCK_MODE_LOCKED_CLOSED, mLeftMenu);
 
         // Content
         mGalleryListView.setGalleryListViewHelper(this);

src/com/hippo/ehviewer/util/ViewUtils.java

@@ -149,4 +149,23 @@ public final class ViewUtils {
         if (oldLp != null)
             v.setLayoutParams(oldLp);
     }
+
+    /**
+     * Determine if the supplied view is under the given point in the
+     * parent view's coordinate system.
+     *
+     * @param view Child view of the parent to hit test
+     * @param x X position to test in the parent's coordinate system
+     * @param y Y position to test in the parent's coordinate system
+     * @return true if the supplied view is under the given point, false otherwise
+     */
+    public static boolean isViewUnder(View view, int x, int y) {
+        if (view == null) {
+            return false;
+        }
+        return x >= view.getLeft() &&
+                x < view.getRight() &&
+                y >= view.getTop() &&
+                y < view.getBottom();
+    }
 }