diff --git a/app/src/main/java/com/hippo/widget/DrawerView.java b/app/src/main/java/com/hippo/widget/DrawerView.java index e9888c54d..79fe08ac4 100644 --- a/app/src/main/java/com/hippo/widget/DrawerView.java +++ b/app/src/main/java/com/hippo/widget/DrawerView.java @@ -21,12 +21,8 @@ import android.content.res.TypedArray; import android.util.AttributeSet; import android.widget.FrameLayout; -import com.hippo.yorozuya.LayoutUtils; - public class DrawerView extends FrameLayout { - private static final int DEFAULT_MAX_WIDTH = 280; - private static final int[] SIZE_ATTRS = new int[]{ android.R.attr.maxWidth }; @@ -50,7 +46,7 @@ public class DrawerView extends FrameLayout { private void init(Context context, AttributeSet attrs) { TypedArray a = context.obtainStyledAttributes(attrs, SIZE_ATTRS); - mMaxWidth = a.getDimensionPixelOffset(0, LayoutUtils.dp2pix(context, DEFAULT_MAX_WIDTH)); + mMaxWidth = a.getDimensionPixelOffset(0, 0); a.recycle(); } diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index 70004a423..8ba59c3e5 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -16,6 +16,7 @@ @@ -58,6 +57,7 @@ android:layout_height="match_parent" android:layout_gravity="end" android:fitsSystemWindows="true" - android:maxWidth="@dimen/drawer_max_width" /> + android:maxWidth="@dimen/m3_comp_navigation_drawer_container_width" + tools:ignore="PrivateResource" />