Move "Settings" and "About" from options menu to main menu footer.

app/src/main/java/be/digitalia/fosdem/activities/MainActivity.java

@@ -225,6 +225,10 @@ public class MainActivity extends ActionBarActivity implements ListView.OnItemCl
 		LayoutInflater inflater = LayoutInflater.from(this);
 		View menuHeaderView = inflater.inflate(R.layout.header_main_menu, null);
 		menuListView.addHeaderView(menuHeaderView, null, false);
+		View menuFooterView = inflater.inflate(R.layout.footer_main_menu, null);
+		menuFooterView.findViewById(R.id.settings).setOnClickListener(menuFooterClickListener);
+		menuFooterView.findViewById(R.id.about).setOnClickListener(menuFooterClickListener);
+		menuListView.addFooterView(menuFooterView, null, false);
 
 		LocalBroadcastManager.getInstance(this).registerReceiver(scheduleRefreshedReceiver, new IntentFilter(DatabaseManager.ACTION_SCHEDULE_REFRESHED));
 
@@ -393,13 +397,6 @@ public class MainActivity extends ActionBarActivity implements ListView.OnItemCl
 			case R.id.refresh:
 				startDownloadSchedule();
 				return true;
-			case R.id.settings:
-				startActivity(new Intent(this, SettingsActivity.class));
-				overridePendingTransition(R.anim.slide_in_right, R.anim.partial_zoom_out);
-				return true;
-			case R.id.about:
-				new AboutDialogFragment().show(getSupportFragmentManager(), "about");
-				return true;
 		}
 		return false;
 	}
@@ -434,6 +431,23 @@ public class MainActivity extends ActionBarActivity implements ListView.OnItemCl
 
 	// MAIN MENU
 
+	private final View.OnClickListener menuFooterClickListener = new View.OnClickListener() {
+
+		@Override
+		public void onClick(View view) {
+			switch (view.getId()) {
+				case R.id.settings:
+					startActivity(new Intent(MainActivity.this, SettingsActivity.class));
+					overridePendingTransition(R.anim.slide_in_right, R.anim.partial_zoom_out);
+					break;
+				case R.id.about:
+					new AboutDialogFragment().show(getSupportFragmentManager(), "about");
+					break;
+			}
+			drawerLayout.closeDrawer(mainMenu);
+		}
+	};
+
 	private class MainMenuAdapter extends BaseAdapter {
 
 		private Section[] sections = Section.values();

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

@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+              android:layout_width="match_parent"
+              android:layout_height="wrap_content"
+              android:orientation="vertical">
+
+    <View
+        style="@style/SeparatorLine"
+        android:layout_marginBottom="8dp"
+        android:layout_marginTop="8dp"/>
+
+    <TextView
+        android:id="@+id/settings"
+        style="@style/MainMenuItem"
+        android:background="?selectableItemBackground"
+        android:text="@string/settings"/>
+
+    <TextView
+        android:id="@+id/about"
+        style="@style/MainMenuItem"
+        android:background="?selectableItemBackground"
+        android:text="@string/about"/>
+
+</LinearLayout>

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

@@ -1,10 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <TextView
     android:id="@+id/section_text"
-    style="@style/TextAppearance.AppCompat.Body2"
+    style="@style/MainMenuItem"
-    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:android="http://schemas.android.com/apk/res/android"/>
-    android:layout_width="match_parent"
-    android:layout_height="@dimen/main_menu_item_height"
-    android:drawablePadding="@dimen/main_menu_drawable_padding"
-    android:gravity="left|center_vertical"
-    android:paddingLeft="@dimen/main_menu_padding"/>

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

@@ -15,15 +15,5 @@
         android:menuCategory="secondary"
         android:title="@string/update_events_db"
         app:showAsAction="ifRoom"/>
-    <item
-        android:id="@+id/settings"
-        android:menuCategory="secondary"
-        android:title="@string/settings"
-        app:showAsAction="never"/>
-    <item
-        android:id="@+id/about"
-        android:menuCategory="secondary"
-        android:title="@string/about"
-        app:showAsAction="never"/>
 
 </menu>

app/src/main/res/values/styles.xml

@@ -60,6 +60,14 @@
 
     <!-- Styles -->
 
+    <style name="MainMenuItem" parent="TextAppearance.AppCompat.Body2">
+        <item name="android:layout_width">match_parent</item>
+        <item name="android:layout_height">@dimen/main_menu_item_height</item>
+        <item name="android:gravity">left|center_vertical</item>
+        <item name="android:paddingLeft">@dimen/main_menu_padding</item>
+        <item name="android:drawablePadding">@dimen/main_menu_drawable_padding</item>
+    </style>
+
     <style name="SlidingTabs">
         <item name="theme">@style/ThemeOverlay.AppCompat.Dark</item>
         <item name="android:background">?attr/colorPrimary</item>