diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index 2117b2e1..b726cd3b 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -1,32 +1,47 @@ - - + - + + + + + + + + + - \ No newline at end of file diff --git a/app/src/main/res/menu/drawer_menu.xml b/app/src/main/res/menu/drawer_menu.xml new file mode 100644 index 00000000..9041ecda --- /dev/null +++ b/app/src/main/res/menu/drawer_menu.xml @@ -0,0 +1,7 @@ + + + + \ No newline at end of file diff --git a/feature/home/src/main/java/one/nem/lacerta/feature/home/HomeTopFragment.java b/feature/home/src/main/java/one/nem/lacerta/feature/home/HomeTopFragment.java index 0b1c39a5..d093709c 100644 --- a/feature/home/src/main/java/one/nem/lacerta/feature/home/HomeTopFragment.java +++ b/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); diff --git a/feature/home/src/main/res/layout/fragment_home_top.xml b/feature/home/src/main/res/layout/fragment_home_top.xml index 9f6268a3..fb74430d 100644 --- a/feature/home/src/main/res/layout/fragment_home_top.xml +++ b/feature/home/src/main/res/layout/fragment_home_top.xml @@ -1,6 +1,5 @@ - @@ -30,7 +29,7 @@ android:layout_width="match_parent" android:layout_height="?attr/actionBarSize" app:layout_collapseMode="pin" - app:title="HOGE"/> + app:title="HOGE" /> @@ -62,11 +61,4 @@ - - - \ No newline at end of file + \ No newline at end of file diff --git a/feature/home/src/main/res/menu/drawer_menu.xml b/feature/home/src/main/res/menu/drawer_menu.xml index 0cc72028..fe187c0c 100644 --- a/feature/home/src/main/res/menu/drawer_menu.xml +++ b/feature/home/src/main/res/menu/drawer_menu.xml @@ -1,8 +1,4 @@ - \ No newline at end of file