Revert "Revert "テスト""

This reverts commit cbc1d139af.

app/src/main/res/layout/activity_main.xml

@@ -1,32 +1,47 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<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/drawer_layout"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:theme="@style/Theme.Lacerta"
     tools:context=".MainActivity">
 
-    <androidx.fragment.app.FragmentContainerView
+    <androidx.constraintlayout.widget.ConstraintLayout
-        android:id="@+id/nav_host_fragment"
+        android:layout_width="match_parent"
-        android:name="androidx.navigation.fragment.NavHostFragment"
+        android:layout_height="match_parent">
-        android:layout_width="0dp"
-        android:layout_height="0dp"
-        app:defaultNavHost="true"
-        app:layout_constraintBottom_toTopOf="@+id/bottom_nav"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        app:navGraph="@navigation/main_nav"
-        tools:layout="@layout/fragment_debug_menu_container" />
 
-    <com.google.android.material.bottomnavigation.BottomNavigationView
+        <androidx.fragment.app.FragmentContainerView
-        android:id="@+id/bottom_nav"
+            android:id="@+id/nav_host_fragment"
-        android:layout_width="0dp"
+            android:name="androidx.navigation.fragment.NavHostFragment"
-        android:layout_height="wrap_content"
+            android:layout_width="0dp"
-        app:layout_constraintBottom_toBottomOf="parent"
+            android:layout_height="0dp"
-        app:layout_constraintEnd_toEndOf="parent"
+            app:defaultNavHost="true"
-        app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintBottom_toTopOf="@+id/bottom_nav"
-        app:menu="@menu/bottom_nav_menu"/>
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            app:navGraph="@navigation/main_nav"
+            tools:layout="@layout/fragment_debug_menu_container" />
+
+        <com.google.android.material.bottomnavigation.BottomNavigationView
+            android:id="@+id/bottom_nav"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:menu="@menu/bottom_nav_menu"/>
+
+    </androidx.constraintlayout.widget.ConstraintLayout>
+
+    <com.google.android.material.navigation.NavigationView
+        android:id="@+id/nav_view"
+        android:layout_width="wrap_content"
+        android:layout_height="match_parent"
+        android:layout_gravity="start"
+        app:menu="@menu/drawer_menu" />
+
+</androidx.drawerlayout.widget.DrawerLayout>
 
-</androidx.constraintlayout.widget.ConstraintLayout>

app/src/main/res/menu/drawer_menu.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android">
+    <item
+        android:id="@+id/item_placeholder"
+        android:icon="@drawable/developer_mode_24px"
+        android:title="@string/placeholder" />
+</menu>

feature/home/src/main/java/one/nem/lacerta/feature/home/HomeTopFragment.java

@@ -118,7 +118,8 @@ public class HomeTopFragment extends Fragment {
         // Set the Toolbar
         ((AppCompatActivity)getActivity()).setSupportActionBar(toolbar);
 
-        DrawerLayout drawer = view.findViewById(R.id.drawer_layout);
+        // Activity側のDrawerLayoutを取得
+        DrawerLayout drawer = getActivity().findViewById(R.id.);
         ActionBarDrawerToggle toggle = new ActionBarDrawerToggle(
                 getActivity(), drawer, toolbar, one.nem.lacerta.shared.ui.R.string.placeholder, one.nem.lacerta.shared.ui.R.string.placeholder);
         drawer.addDrawerListener(toggle);

feature/home/src/main/res/layout/fragment_home_top.xml

@@ -1,6 +1,5 @@
-<androidx.drawerlayout.widget.DrawerLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:id="@+id/drawer_layout"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
@@ -30,7 +29,7 @@
                     android:layout_width="match_parent"
                     android:layout_height="?attr/actionBarSize"
                     app:layout_collapseMode="pin"
-                    app:title="HOGE"/>
+                    app:title="HOGE" />
 
             </com.google.android.material.appbar.CollapsingToolbarLayout>
 
@@ -62,11 +61,4 @@
 
     </androidx.coordinatorlayout.widget.CoordinatorLayout>
 
-    <com.google.android.material.navigation.NavigationView
+</FrameLayout>
-        android:id="@+id/nav_view"
-        android:layout_width="wrap_content"
-        android:layout_height="match_parent"
-        android:layout_gravity="start"
-        app:menu="@menu/drawer_menu" />
-
-</androidx.drawerlayout.widget.DrawerLayout>

feature/home/src/main/res/menu/drawer_menu.xml

@@ -1,8 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <menu xmlns:android="http://schemas.android.com/apk/res/android">
 
-    <item
-        android:id="@+id/item_placeholder"
-        android:icon="@drawable/developer_mode_24px"
-        android:title="@string/placeholder" />
 </menu>