From 358c809d075844e1ca98cda01ad0c6f36fdf606f Mon Sep 17 00:00:00 2001
From: fkloft <felix.kloft+github@gmail.com>
Date: Sun, 22 Sep 2013 21:27:38 +0200
Subject: [PATCH] Tweak navigation drawer

- make list thinner
- highlight current pane
- show icons in menu
---
 mobile/res/layout/activity_main.xml           |  3 +-
 mobile/res/layout/list_item_selectable.xml    | 11 ++++++++
 .../iitc_mobile/IITC_NavigationHelper.java    | 28 ++++++++++++++++++-
 3 files changed, 39 insertions(+), 3 deletions(-)
 create mode 100644 mobile/res/layout/list_item_selectable.xml

diff --git a/mobile/res/layout/activity_main.xml b/mobile/res/layout/activity_main.xml
index 9adcdcae..532a4f7d 100644
--- a/mobile/res/layout/activity_main.xml
+++ b/mobile/res/layout/activity_main.xml
@@ -18,11 +18,10 @@
 		android:src="@drawable/iitc"/>
 
 	<!-- The navigation drawer -->
-	<!-- TODO: change color/width? -->
 
 	<ListView
 		android:id="@+id/left_drawer"
-		android:layout_width="240dp"
+		android:layout_width="180dp"
 		android:layout_height="match_parent"
 		android:layout_gravity="start"
 		android:background="#111"
diff --git a/mobile/res/layout/list_item_selectable.xml b/mobile/res/layout/list_item_selectable.xml
new file mode 100644
index 00000000..a82df550
--- /dev/null
+++ b/mobile/res/layout/list_item_selectable.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<TextView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:background="?android:attr/activatedBackgroundIndicator"
+    android:drawablePadding="?android:attr/listPreferredItemPaddingLeft"
+    android:gravity="center_vertical"
+    android:minHeight="?android:attr/listPreferredItemHeightSmall"
+    android:paddingLeft="?android:attr/listPreferredItemPaddingLeft"
+    android:paddingRight="?android:attr/listPreferredItemPaddingRight"
+    android:textAppearance="?android:attr/textAppearanceListItemSmall"/>
diff --git a/mobile/src/com/cradle/iitc_mobile/IITC_NavigationHelper.java b/mobile/src/com/cradle/iitc_mobile/IITC_NavigationHelper.java
index 2bb950cf..28b19977 100644
--- a/mobile/src/com/cradle/iitc_mobile/IITC_NavigationHelper.java
+++ b/mobile/src/com/cradle/iitc_mobile/IITC_NavigationHelper.java
@@ -50,7 +50,7 @@ public class IITC_NavigationHelper extends ActionBarDrawerToggle implements OnNa
 
     private class NavigationAdapter extends ArrayAdapter<Pane> {
         public NavigationAdapter() {
-            super(mIitc, android.R.layout.simple_list_item_1);
+            super(mIitc, R.layout.list_item_selectable);
 
             add(Pane.MAP);
             add(Pane.INFO);
@@ -71,6 +71,27 @@ public class IITC_NavigationHelper extends ActionBarDrawerToggle implements OnNa
                 view.setText("Map");
             else
                 view.setText(getPaneTitle(item));
+
+            int icon = 0;
+            switch (item)
+            {
+                case MAP:
+                    icon = R.drawable.location_map;
+                    break;
+                case INFO:
+                    icon = R.drawable.action_about;
+                    break;
+                case FULL:
+                case COMPACT:
+                case PUBLIC:
+                case FACTION:
+                    icon = R.drawable.social_group;
+                    break;
+            }
+
+            if (icon != 0)
+                view.setCompoundDrawablesWithIntrinsicBounds(icon, 0, 0, 0);
+
             return view;
         }
     }
@@ -111,6 +132,7 @@ public class IITC_NavigationHelper extends ActionBarDrawerToggle implements OnNa
         mNavigationAdapter = new NavigationAdapter();
         mDrawerList.setAdapter(mNavigationAdapter);
         mDrawerList.setOnItemClickListener(this);
+        mDrawerList.setItemChecked(0, true);
         mDrawerLayout.setDrawerListener(this);
 
         onPrefChanged(); // also calls updateActionBar()
@@ -119,6 +141,10 @@ public class IITC_NavigationHelper extends ActionBarDrawerToggle implements OnNa
     private void updateActionBar() {
         boolean showHighlighter = true;
 
+        int position = mNavigationAdapter.getPosition(mPane);
+        if (position >= 0 && position < mNavigationAdapter.getCount())
+            mDrawerList.setItemChecked(position, true);
+
         if (mDesktopMode) {
             mActionBar.setDisplayHomeAsUpEnabled(false); // Hide "up" indicator
             mActionBar.setHomeButtonEnabled(false); // Make icon unclickable