From 175f75c3a2f56fdf3269a7719b8dc10f0379fab3 Mon Sep 17 00:00:00 2001
From: tarsin <yuanqingxiang233@163.com>
Date: Mon, 27 Mar 2023 16:19:22 +0800
Subject: [PATCH] Obey new m3 drawer design token

---
 app/src/main/java/com/hippo/widget/DrawerView.java | 6 +-----
 app/src/main/res/layout/activity_main.xml          | 6 +++---
 2 files changed, 4 insertions(+), 8 deletions(-)

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 @@
 
 <androidx.drawerlayout.widget.DrawerLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/draw_view"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
@@ -47,8 +48,6 @@
         android:layout_width="wrap_content"
         android:layout_height="match_parent"
         android:layout_gravity="start"
-        android:maxWidth="@dimen/drawer_max_width"
-        app:fitsSystemWindowsInsets="start|end"
         app:headerLayout="@layout/nav_header_main"
         app:menu="@menu/nav_drawer_main" />
 
@@ -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" />
 
 </androidx.drawerlayout.widget.DrawerLayout>