diff options
3 files changed, 8 insertions, 23 deletions
diff --git a/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/NewsReaderListFragment.java b/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/NewsReaderListFragment.java index 0d6112de..b949fc40 100644 --- a/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/NewsReaderListFragment.java +++ b/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/NewsReaderListFragment.java @@ -206,19 +206,6 @@ public class NewsReaderListFragment extends Fragment implements OnCreateContextM * @param inflater inflater provided to fragment */ private void bindNavigationMenu(View parent, LayoutInflater inflater) { - // Bind settings menu at bottom of drawer - NavigationView navigationView = parent.findViewById(R.id.navigationMenu); - navigationView.setNavigationItemSelectedListener(item -> { - switch(item.getItemId()) { - case R.id.drawer_settings: - Intent intent = new Intent(getContext(), SettingsActivity.class); - getActivity().startActivityForResult(intent, NewsReaderListActivity.RESULT_SETTINGS); - return true; - default: - return false; - } - }); - // Create NavigationView to show as footer of ListView View footerView = inflater.inflate(R.layout.fragment_newsreader_list_footer, null, false); ExpandableListView list = parent.findViewById(R.id.expandableListView); @@ -235,6 +222,10 @@ public class NewsReaderListFragment extends Fragment implements OnCreateContextM getActivity().startActivityForResult(loginIntent, RESULT_LOGIN); } return true; + case R.id.drawer_settings: + Intent intent = new Intent(getContext(), SettingsActivity.class); + getActivity().startActivityForResult(intent, NewsReaderListActivity.RESULT_SETTINGS); + return true; default: return false; } diff --git a/News-Android-App/src/main/res/layout/fragment_newsreader_list.xml b/News-Android-App/src/main/res/layout/fragment_newsreader_list.xml index aa83adee..07318fe6 100644 --- a/News-Android-App/src/main/res/layout/fragment_newsreader_list.xml +++ b/News-Android-App/src/main/res/layout/fragment_newsreader_list.xml @@ -63,17 +63,7 @@ android:id="@+id/expandableListView" android:layout_width="match_parent" android:layout_height="match_parent" - android:layout_above="@id/navigationMenu" android:layout_below="@+id/header_view" android:divider="@null" /> - <com.google.android.material.navigation.NavigationView - android:id="@+id/navigationMenu" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_alignParentBottom="true" - android:background="@drawable/navigationview_bg" - app:menu="@menu/drawer_menu" /> - - </RelativeLayout> diff --git a/News-Android-App/src/main/res/menu/list_footer_menu.xml b/News-Android-App/src/main/res/menu/list_footer_menu.xml index 5c6dd455..90878419 100644 --- a/News-Android-App/src/main/res/menu/list_footer_menu.xml +++ b/News-Android-App/src/main/res/menu/list_footer_menu.xml @@ -6,4 +6,8 @@ android:icon="@drawable/ic_add_black_24dp" android:title="@string/action_add_new_feed"/> + <item + android:id="@+id/drawer_settings" + android:icon="@drawable/ic_settings_black_24dp" + android:title="@string/action_settings" /> </menu>
\ No newline at end of file |