diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index b726cd3b..2117b2e1 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -1,47 +1,32 @@ - - + - - - - - - - - - + + \ 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 deleted file mode 100644 index 9041ecda..00000000 --- a/app/src/main/res/menu/drawer_menu.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - \ 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 d093709c..0b1c39a5 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,8 +118,7 @@ public class HomeTopFragment extends Fragment { // Set the Toolbar ((AppCompatActivity)getActivity()).setSupportActionBar(toolbar); - // Activity側のDrawerLayoutを取得 - DrawerLayout drawer = getActivity().findViewById(R.id.); + DrawerLayout drawer = view.findViewById(R.id.drawer_layout); 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 fb74430d..9f6268a3 100644 --- a/feature/home/src/main/res/layout/fragment_home_top.xml +++ b/feature/home/src/main/res/layout/fragment_home_top.xml @@ -1,5 +1,6 @@ - @@ -29,7 +30,7 @@ android:layout_width="match_parent" android:layout_height="?attr/actionBarSize" app:layout_collapseMode="pin" - app:title="HOGE" /> + app:title="HOGE"/> @@ -61,4 +62,11 @@ - \ 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 fe187c0c..0cc72028 100644 --- a/feature/home/src/main/res/menu/drawer_menu.xml +++ b/feature/home/src/main/res/menu/drawer_menu.xml @@ -1,4 +1,8 @@ + \ No newline at end of file