From b1d823d2455f65f55252108bc54b333fa9fc907a Mon Sep 17 00:00:00 2001
From: Christophe Beyls <software@digitalia.be>
Date: Thu, 2 Apr 2015 02:29:59 +0200
Subject: [PATCH] Misc. small cleanups

---
 .../digitalia/fosdem/activities/MainActivity.java   | 13 +++++++------
 app/src/main/res/layout/main.xml                    |  3 ++-
 app/src/main/res/values/styles.xml                  |  2 +-
 3 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/app/src/main/java/be/digitalia/fosdem/activities/MainActivity.java b/app/src/main/java/be/digitalia/fosdem/activities/MainActivity.java
index 18e841a..abc935a 100644
--- a/app/src/main/java/be/digitalia/fosdem/activities/MainActivity.java
+++ b/app/src/main/java/be/digitalia/fosdem/activities/MainActivity.java
@@ -82,8 +82,7 @@ public class MainActivity extends ActionBarActivity implements ListView.OnItemCl
 		private final int iconResId;
 		private final boolean keep;
 
-		private Section(Class<? extends Fragment> fragmentClass, @StringRes int titleResId,
-						@DrawableRes int iconResId, boolean keep) {
+		private Section(Class<? extends Fragment> fragmentClass, int titleResId, int iconResId, boolean keep) {
 			this.fragmentClassName = fragmentClass.getName();
 			this.titleResId = titleResId;
 			this.iconResId = iconResId;
@@ -94,10 +93,12 @@ public class MainActivity extends ActionBarActivity implements ListView.OnItemCl
 			return fragmentClassName;
 		}
 
+		@StringRes
 		public int getTitleResId() {
 			return titleResId;
 		}
 
+		@DrawableRes
 		public int getIconResId() {
 			return iconResId;
 		}
@@ -453,10 +454,10 @@ public class MainActivity extends ActionBarActivity implements ListView.OnItemCl
 
 	private class MainMenuAdapter extends BaseAdapter {
 
-		private Section[] sections = Section.values();
-		private LayoutInflater inflater;
-		private int currentSectionForegroundColor;
-		private int currentSectionBackgroundColor;
+		private final Section[] sections = Section.values();
+		private final LayoutInflater inflater;
+		private final int currentSectionForegroundColor;
+		private final int currentSectionBackgroundColor;
 
 		public MainMenuAdapter(LayoutInflater inflater) {
 			this.inflater = inflater;
diff --git a/app/src/main/res/layout/main.xml b/app/src/main/res/layout/main.xml
index e6f0a73..7320509 100644
--- a/app/src/main/res/layout/main.xml
+++ b/app/src/main/res/layout/main.xml
@@ -18,7 +18,8 @@
         <android.support.v4.widget.DrawerLayout
             android:id="@+id/drawer_layout"
             android:layout_width="match_parent"
-            android:layout_height="match_parent">
+            android:layout_height="0dp"
+            android:layout_weight="1">
 
             <!-- Main content view -->
 
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 9e35d78..4e1884e 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -20,7 +20,7 @@
         <item name="android:scrollViewStyle">@style/ScrollView.Fosdem</item>
     </style>
 
-    <style name="AppTheme.NoActionBar" tools:ignore="newApi">
+    <style name="AppTheme.NoActionBar">
         <item name="windowActionBar">false</item>
         <item name="android:windowNoTitle">true</item>
         <!-- Allows the action mode icons to be shown on top of the Toolbar -->