Fixed drawer icons to be themed, added settings to drawer

29 files changed, 41 insertions, 44 deletions

diff --git a/Subsonic.iml b/Subsonic.iml
index d89b96cf..cbfa6072 100644
--- a/Subsonic.iml
+++ b/Subsonic.iml
@@ -11,7 +11,7 @@
     <exclude-output />

     <content url="file://$MODULE_DIR$">

       <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />

-      <sourceFolder url="file://$MODULE_DIR$/gen" isTestSource="false" />

+      <sourceFolder url="file://$MODULE_DIR$/gen" isTestSource="false" generated="true" />

     </content>

     <orderEntry type="inheritedJdk" />

     <orderEntry type="sourceFolder" forTests="false" />

diff --git a/res/drawable-hdpi/ic_menu_home_dark.png b/res/drawable-hdpi/ic_menu_home_dark.png
deleted file mode 100644
index 8f391ffd..00000000
--- a/res/drawable-hdpi/ic_menu_home_dark.png
+++ /dev/null
diff --git a/res/drawable-hdpi/ic_menu_home_light.png b/res/drawable-hdpi/ic_menu_home_light.png
deleted file mode 100644
index 813cfa8a..00000000
--- a/res/drawable-hdpi/ic_menu_home_light.png
+++ /dev/null
diff --git a/res/drawable-hdpi/ic_menu_settings_dark.png b/res/drawable-hdpi/ic_menu_settings_dark.png
new file mode 100644
index 00000000..d6dd17ec
--- /dev/null
+++ b/res/drawable-hdpi/ic_menu_settings_dark.png
diff --git a/res/drawable-hdpi/ic_menu_settings_light.png b/res/drawable-hdpi/ic_menu_settings_light.png
new file mode 100644
index 00000000..70c29951
--- /dev/null
+++ b/res/drawable-hdpi/ic_menu_settings_light.png
diff --git a/res/drawable-mdpi/ic_menu_home_dark.png b/res/drawable-mdpi/ic_menu_home_dark.png
deleted file mode 100644
index 7be15b95..00000000
--- a/res/drawable-mdpi/ic_menu_home_dark.png
+++ /dev/null
diff --git a/res/drawable-mdpi/ic_menu_home_light.png b/res/drawable-mdpi/ic_menu_home_light.png
deleted file mode 100644
index 715ffcc3..00000000
--- a/res/drawable-mdpi/ic_menu_home_light.png
+++ /dev/null
diff --git a/res/drawable-mdpi/ic_menu_settings_dark.png b/res/drawable-mdpi/ic_menu_settings_dark.png
new file mode 100644
index 00000000..fc2bf8c3
--- /dev/null
+++ b/res/drawable-mdpi/ic_menu_settings_dark.png
diff --git a/res/drawable-mdpi/ic_menu_settings_light.png b/res/drawable-mdpi/ic_menu_settings_light.png
new file mode 100644
index 00000000..0e65c682
--- /dev/null
+++ b/res/drawable-mdpi/ic_menu_settings_light.png
diff --git a/res/drawable-xhdpi/ic_menu_home_dark.png b/res/drawable-xhdpi/ic_menu_home_dark.png
deleted file mode 100644
index 2c2b9912..00000000
--- a/res/drawable-xhdpi/ic_menu_home_dark.png
+++ /dev/null
diff --git a/res/drawable-xhdpi/ic_menu_home_light.png b/res/drawable-xhdpi/ic_menu_home_light.png
deleted file mode 100644
index 156c58c9..00000000
--- a/res/drawable-xhdpi/ic_menu_home_light.png
+++ /dev/null
diff --git a/res/drawable-xhdpi/ic_menu_settings_dark.png b/res/drawable-xhdpi/ic_menu_settings_dark.png
new file mode 100644
index 00000000..ae917587
--- /dev/null
+++ b/res/drawable-xhdpi/ic_menu_settings_dark.png
diff --git a/res/drawable-xhdpi/ic_menu_settings_light.png b/res/drawable-xhdpi/ic_menu_settings_light.png
new file mode 100644
index 00000000..29f961b2
--- /dev/null
+++ b/res/drawable-xhdpi/ic_menu_settings_light.png
diff --git a/res/drawable-xxhdpi/ic_menu_home_dark.png b/res/drawable-xxhdpi/ic_menu_home_dark.png
deleted file mode 100644
index 15f458e7..00000000
--- a/res/drawable-xxhdpi/ic_menu_home_dark.png
+++ /dev/null
diff --git a/res/drawable-xxhdpi/ic_menu_home_light.png b/res/drawable-xxhdpi/ic_menu_home_light.png
deleted file mode 100644
index 765386c4..00000000
--- a/res/drawable-xxhdpi/ic_menu_home_light.png
+++ /dev/null
diff --git a/res/drawable-xxhdpi/ic_menu_settings_dark.png b/res/drawable-xxhdpi/ic_menu_settings_dark.png
new file mode 100644
index 00000000..ded5dbb5
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_menu_settings_dark.png
diff --git a/res/drawable-xxhdpi/ic_menu_settings_light.png b/res/drawable-xxhdpi/ic_menu_settings_light.png
new file mode 100644
index 00000000..cd242306
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_menu_settings_light.png
diff --git a/res/layout/drawer_list_item.xml b/res/layout/drawer_list_item.xml
index 608affea..66dd5a70 100644
--- a/res/layout/drawer_list_item.xml
+++ b/res/layout/drawer_list_item.xml
@@ -3,8 +3,8 @@
 	android:orientation="horizontal"

 	android:layout_width="fill_parent"

 	android:layout_height="wrap_content"

-	android:paddingTop="2dip"

-	android:paddingBottom="3dip">

+	android:paddingTop="5dip"

+	android:paddingBottom="6dip">

 

 	<ImageView

 		android:id="@+id/drawer_icon"

@@ -13,7 +13,8 @@
 		android:layout_gravity="left|center_vertical"

 		android:paddingTop="1dip"

 		android:paddingBottom="1dip"

-		android:paddingRight="6dip"/>

+		android:paddingRight="8dip"

+		android:paddingLeft="10dip"/>

 

 	<TextView

 		android:id="@+id/drawer_name"

diff --git a/res/menu/abstract_top_menu.xml b/res/menu/abstract_top_menu.xml
index 7d91bebd..46419d0f 100644
--- a/res/menu/abstract_top_menu.xml
+++ b/res/menu/abstract_top_menu.xml
@@ -14,10 +14,6 @@
 		compat:showAsAction="always|withText"/>

 

 	<item

-		android:id="@+id/menu_settings"

-		android:title="@string/menu.settings"/>

-

-	<item

 		android:id="@+id/menu_exit"

 		android:title="@string/menu.exit"/>

 </menu>

diff --git a/res/menu/drawer_menu.xml b/res/menu/drawer_menu.xml
index 2b557738..c2969938 100644
--- a/res/menu/drawer_menu.xml
+++ b/res/menu/drawer_menu.xml
@@ -3,10 +3,6 @@
 	  xmlns:compat="http://schemas.android.com/apk/res-auto">

 

 	<item

-		android:id="@+id/menu_settings"

-		android:title="@string/menu.settings"/>

-

-	<item

 		android:id="@+id/menu_exit"

 		android:title="@string/menu.exit"/>

 </menu>

diff --git a/res/menu/main.xml b/res/menu/main.xml
index 22809c47..5e504242 100644
--- a/res/menu/main.xml
+++ b/res/menu/main.xml
@@ -26,10 +26,6 @@
 		android:title="@string/changelog_full_title"/>
 
 	<item
-		android:id="@+id/menu_settings"
-		android:title="@string/menu.settings"/>
-
-	<item
 		android:id="@+id/menu_exit"
 		android:title="@string/menu.exit"/>
 </menu>
diff --git a/res/menu/search.xml b/res/menu/search.xml
index fdadd748..cab9c4f6 100644
--- a/res/menu/search.xml
+++ b/res/menu/search.xml
@@ -8,10 +8,6 @@
 		compat:showAsAction="ifRoom|withText"/>
 
 	<item 
-		android:id="@+id/menu_settings"
-		android:title="@string/menu.settings"/>
-
-	<item 
 		android:id="@+id/menu_exit"
 		android:title="@string/menu.exit"/>
 
diff --git a/res/menu/select_artist.xml b/res/menu/select_artist.xml
index 5e10dc80..d1e1f4e3 100644
--- a/res/menu/select_artist.xml
+++ b/res/menu/select_artist.xml
@@ -20,10 +20,6 @@
 		compat:showAsAction="ifRoom|withText"/>
 
 	<item
-		android:id="@+id/menu_settings"
-		android:title="@string/menu.settings"/>
-
-	<item
 		android:id="@+id/menu_exit"
 		android:title="@string/menu.exit"/>
 </menu>
diff --git a/res/menu/select_podcasts.xml b/res/menu/select_podcasts.xml
index d97ebe6c..212feb04 100644
--- a/res/menu/select_podcasts.xml
+++ b/res/menu/select_podcasts.xml
@@ -22,10 +22,6 @@
 		android:title="@string/menu.check_podcasts"/>
 
 	<item
-		android:id="@+id/menu_settings"
-		android:title="@string/menu.settings"/>
-
-	<item
 		android:id="@+id/menu_exit"
 		android:title="@string/menu.exit"/>
 </menu>
\ No newline at end of file
diff --git a/res/values/arrays.xml b/res/values/arrays.xml
index adc60c9e..269c75ae 100644
--- a/res/values/arrays.xml
+++ b/res/values/arrays.xml
@@ -7,6 +7,7 @@
 		<item>@string/button_bar.podcasts</item>
 		<item>@string/button_bar.bookmarks</item>
 		<item>@string/button_bar.chat</item>
+		<item>@string/menu.settings</item>
 	</string-array>
 
 	<string-array name="drawerItemsDescriptions">
@@ -16,15 +17,27 @@
 		<item>Podcast</item>
 		<item>Bookmark</item>
 		<item>Chat</item>
+		<item>Settings</item>
 	</string-array>
 
-	<array name="drawerItemIcons">
-		<item>@drawable/ic_menu_home_dark</item>
+	<array name="drawerItemIconsLight">
+		<item>@drawable/main_offline_light</item>
+		<item>@drawable/ic_menu_library_light</item>
+		<item>@drawable/ic_menu_playlist_light</item>
+		<item>@drawable/ic_menu_podcast_light</item>
+		<item>@drawable/ic_menu_bookmark_light</item>
+		<item>@drawable/ic_menu_chat_light</item>
+		<item>@drawable/ic_menu_settings_light</item>
+	</array>
+
+	<array name="drawerItemIconsDark">
+		<item>@drawable/main_offline_dark</item>
 		<item>@drawable/ic_menu_library_dark</item>
 		<item>@drawable/ic_menu_playlist_dark</item>
 		<item>@drawable/ic_menu_podcast_dark</item>
 		<item>@drawable/ic_menu_bookmark_dark</item>
 		<item>@drawable/ic_menu_chat_dark</item>
+		<item>@drawable/ic_menu_settings_dark</item>
 	</array>
 
     <string-array name="themeValues">
diff --git a/res/values/attrs.xml b/res/values/attrs.xml
index e54db415..f38f749a 100644
--- a/res/values/attrs.xml
+++ b/res/values/attrs.xml
@@ -7,7 +7,6 @@
     <attr name="media_button_repeat_off" format="reference"/>
     <attr name="media_button_start" format="reference"/>
     <attr name="media_button_stop" format="reference"/>
-	<attr name="chat" format="reference"/> 
 	<attr name="chat_send" format="reference"/>
 	<attr name="download_none" format="reference"/>
 	<attr name="shuffle" format="reference"/>
@@ -16,4 +15,5 @@
 	<attr name="remove" format="reference"/>
 	<attr name="save" format="reference"/>
 	<attr name="volume" format="reference"/>
+	<attr name="drawerItemsIcons" format="reference"/>
 </resources>
diff --git a/res/values/themes.xml b/res/values/themes.xml
index 4f00b7ec..7e48cfb9 100644
--- a/res/values/themes.xml
+++ b/res/values/themes.xml
@@ -10,7 +10,6 @@
 		<item name="media_button_repeat_off">@drawable/media_repeat_off_light</item>
 		<item name="media_button_start">@drawable/media_start_light</item>
 		<item name="media_button_stop">@drawable/media_stop_light</item>
-		<item name="chat">@drawable/ic_menu_chat_light</item> 
 		<item name="chat_send">@drawable/ic_menu_chat_send_light</item>
 		<item name="download_none">@drawable/download_none_light</item>
 		<item name="shuffle">@drawable/ic_menu_shuffle_light</item>
@@ -19,6 +18,7 @@
 		<item name="remove">@drawable/ic_menu_remove_light</item>
 		<item name="save">@drawable/ic_menu_save_light</item>
 		<item name="volume">@drawable/ic_action_volume_light</item>
+		<item name="drawerItemsIcons">@array/drawerItemIconsLight</item>
 		<item name="android:textViewStyle">@style/DSub.TextViewStyle</item>
 		<item name="android:buttonStyle">@style/DSub.ButtonStyle</item>
 	</style>
@@ -33,7 +33,6 @@
 		<item name="media_button_repeat_off">@drawable/media_repeat_off</item>
 		<item name="media_button_start">@drawable/media_start_dark</item>
 		<item name="media_button_stop">@drawable/media_stop_dark</item>
-		<item name="chat">@drawable/ic_menu_chat_dark</item> 
 		<item name="chat_send">@drawable/ic_menu_chat_send_dark</item>
 		<item name="download_none">@drawable/download_none_dark</item>
 		<item name="shuffle">@drawable/ic_menu_shuffle_dark</item>
@@ -42,6 +41,7 @@
 		<item name="remove">@drawable/ic_menu_remove_dark</item>
 		<item name="save">@drawable/ic_menu_save_dark</item>
 		<item name="volume">@drawable/ic_action_volume_dark</item>
+		<item name="drawerItemsIcons">@array/drawerItemIconsDark</item>
 		<item name="android:textViewStyle">@style/DSub.TextViewStyle</item>
 		<item name="android:buttonStyle">@style/DSub.ButtonStyle</item>
 	</style>
@@ -59,7 +59,6 @@
 		<item name="media_button_repeat_off">@drawable/media_repeat_off</item>
 		<item name="media_button_start">@drawable/media_start_dark</item>
 		<item name="media_button_stop">@drawable/media_stop_dark</item>
-		<item name="chat">@drawable/ic_menu_chat_dark</item>
 		<item name="chat_send">@drawable/ic_menu_chat_send_dark</item>
 		<item name="download_none">@drawable/download_none_dark</item>
 		<item name="shuffle">@drawable/ic_menu_shuffle_dark</item>
@@ -68,6 +67,7 @@
 		<item name="remove">@drawable/ic_menu_remove_dark</item>
 		<item name="save">@drawable/ic_menu_save_dark</item>
 		<item name="volume">@drawable/ic_action_volume_dark</item>
+		<item name="drawerItemsIcons">@array/drawerItemIconsDark</item>
 		<item name="android:textViewStyle">@style/DSub.TextViewStyle</item>
 		<item name="android:buttonStyle">@style/DSub.ButtonStyle</item>
 	</style>
diff --git a/src/github/daneren2005/dsub/activity/SubsonicActivity.java b/src/github/daneren2005/dsub/activity/SubsonicActivity.java
index 3c884683..0ac2aa19 100644
--- a/src/github/daneren2005/dsub/activity/SubsonicActivity.java
+++ b/src/github/daneren2005/dsub/activity/SubsonicActivity.java
@@ -158,12 +158,17 @@ public class SubsonicActivity extends ActionBarActivity implements OnItemSelecte
 		drawerList.setOnItemClickListener(new ListView.OnItemClickListener() {

 			@Override

 			public void onItemClick(AdapterView<?> parent, View view, int position, long id) {

-				startFragmentActivity(drawerItemsDescriptions[position]);

+				if("Settings".equals(drawerItemsDescriptions[position])) {

+					startActivity(new Intent(SubsonicActivity.this, SettingsActivity.class));

+					drawer.closeDrawers();

+				} else {

+					startFragmentActivity(drawerItemsDescriptions[position]);

 

-				if(lastSelectedView != view) {

-					lastSelectedView.setBackgroundResource(android.R.color.transparent);

-					view.setBackgroundResource(R.color.dividerColor);

-					lastSelectedView = view;

+					if(lastSelectedView != view) {

+						lastSelectedView.setBackgroundResource(android.R.color.transparent);

+						view.setBackgroundResource(R.color.dividerColor);

+						lastSelectedView = view;

+					}

 				}

 			}

 		});

@@ -383,10 +388,15 @@ public class SubsonicActivity extends ActionBarActivity implements OnItemSelecte
 			List<String> drawerItemsDescriptionsList = new ArrayList<String>(Arrays.asList(drawerItemsDescriptions));

 			List<Integer> drawerItemsIconsList = new ArrayList<Integer>();

 

-			TypedArray typedArray = getResources().obtainTypedArray(R.array.drawerItemIcons);

+			int[] arrayAttr = {R.attr.drawerItemsIcons};

+			TypedArray arrayType = obtainStyledAttributes(arrayAttr);

+			int arrayId = arrayType.getResourceId(0, 0);

+			TypedArray iconType = getResources().obtainTypedArray(arrayId);

 			for(int i = 0; i < drawerItemsList.size(); i++) {

-				drawerItemsIconsList.add(typedArray.getResourceId(i, 0));

+				drawerItemsIconsList.add(iconType.getResourceId(i, 0));

 			}

+			iconType.recycle();

+			arrayType.recycle();

 	

 			// Selectively remove podcast listing [3]

 			if(!podcastsEnabled) {

diff --git a/src/github/daneren2005/dsub/fragments/SubsonicFragment.java b/src/github/daneren2005/dsub/fragments/SubsonicFragment.java
index 18c9476a..5965db0b 100644
--- a/src/github/daneren2005/dsub/fragments/SubsonicFragment.java
+++ b/src/github/daneren2005/dsub/fragments/SubsonicFragment.java
@@ -144,9 +144,6 @@ public class SubsonicFragment extends Fragment {
 			case R.id.menu_exit:

 				exit();

 				return true;

-			case R.id.menu_settings:

-				startActivity(new Intent(context, SettingsActivity.class));

-				return true;

 		}

 

 		return false;