aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorScott Jackson <daneren2005@gmail.com>2014-11-18 13:05:45 -0800
committerScott Jackson <daneren2005@gmail.com>2014-11-18 13:05:45 -0800
commit77a9ae1cc28ac0c326feeb271ffa606a10ea0a83 (patch)
tree8e0a0e66b5f90bf8f25dd5c06dee4862548ddd69
parent082ae55593a85fb6085d213305fecf8eb93baca2 (diff)
downloaddsub-77a9ae1cc28ac0c326feeb271ffa606a10ea0a83.tar.gz
dsub-77a9ae1cc28ac0c326feeb271ffa606a10ea0a83.tar.bz2
dsub-77a9ae1cc28ac0c326feeb271ffa606a10ea0a83.zip
Change to cooler toggle animation
-rw-r--r--res/drawable-hdpi/ic_drawer.pngbin113 -> 0 bytes
-rw-r--r--res/drawable-mdpi/ic_drawer.pngbin104 -> 0 bytes
-rw-r--r--res/drawable-xhdpi/ic_drawer.pngbin120 -> 0 bytes
-rw-r--r--res/drawable-xxhdpi/ic_drawer.pngbin202 -> 0 bytes
-rw-r--r--res/values/themes.xml7
-rw-r--r--src/github/daneren2005/dsub/activity/SubsonicActivity.java4
6 files changed, 9 insertions, 2 deletions
diff --git a/res/drawable-hdpi/ic_drawer.png b/res/drawable-hdpi/ic_drawer.png
deleted file mode 100644
index eb90af58..00000000
--- a/res/drawable-hdpi/ic_drawer.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_drawer.png b/res/drawable-mdpi/ic_drawer.png
deleted file mode 100644
index 1681d12c..00000000
--- a/res/drawable-mdpi/ic_drawer.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_drawer.png b/res/drawable-xhdpi/ic_drawer.png
deleted file mode 100644
index daba1451..00000000
--- a/res/drawable-xhdpi/ic_drawer.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_drawer.png b/res/drawable-xxhdpi/ic_drawer.png
deleted file mode 100644
index 9c4685d6..00000000
--- a/res/drawable-xxhdpi/ic_drawer.png
+++ /dev/null
Binary files differ
diff --git a/res/values/themes.xml b/res/values/themes.xml
index 129c0612..5dfddb9e 100644
--- a/res/values/themes.xml
+++ b/res/values/themes.xml
@@ -31,6 +31,7 @@
<item name="drawerItemsIcons">@array/drawerItemIconsLight</item>
<item name="android:textViewStyle">@style/DSub.TextViewStyle</item>
<item name="android:buttonStyle">@style/DSub.ButtonStyle.Light</item>
+ <item name="drawerArrowStyle">@style/DSub.DrawerArrow</item>
</style>
<style name="Theme.DSub.Dark" parent="@style/Theme.AppCompat">
<item name="actionBarStyle">@style/Widget.DSub.ActionBarStyle.Dark</item>
@@ -64,6 +65,7 @@
<item name="drawerItemsIcons">@array/drawerItemIconsDark</item>
<item name="android:textViewStyle">@style/DSub.TextViewStyle</item>
<item name="android:buttonStyle">@style/DSub.ButtonStyle.Dark</item>
+ <item name="drawerArrowStyle">@style/DSub.DrawerArrow</item>
</style>
<style name="Theme.DSub.Black" parent="Theme.DSub.Dark">
<item name="android:windowBackground">@android:color/black</item>
@@ -100,6 +102,7 @@
<item name="drawerItemsIcons">@array/drawerItemIconsDark</item>
<item name="android:textViewStyle">@style/DSub.TextViewStyle</item>
<item name="android:buttonStyle">@style/DSub.ButtonStyle.Dark</item>
+ <item name="drawerArrowStyle">@style/DSub.DrawerArrow</item>
</style>
<style name="Widget.DSub.ActionBarStyle.Light" parent="Widget.AppCompat.Light.ActionBar.Solid">
@@ -134,4 +137,8 @@
</style>
<style name="DSub.ButtonStyle.Light" parent="android:Widget.Holo.Light.Button">
</style>
+
+ <style name="DSub.DrawerArrow" parent="Widget.AppCompat.DrawerArrowToggle">
+ <item name="spinBars">true</item>
+ </style>
</resources>
diff --git a/src/github/daneren2005/dsub/activity/SubsonicActivity.java b/src/github/daneren2005/dsub/activity/SubsonicActivity.java
index c3f8e4a7..7da8d432 100644
--- a/src/github/daneren2005/dsub/activity/SubsonicActivity.java
+++ b/src/github/daneren2005/dsub/activity/SubsonicActivity.java
@@ -28,7 +28,7 @@ import android.media.AudioManager;
import android.os.Build;
import android.os.Bundle;
import android.os.Environment;
-import android.support.v4.app.ActionBarDrawerToggle;
+import android.support.v7.app.ActionBarDrawerToggle;
import android.support.v4.app.Fragment;
import android.support.v4.app.FragmentManager;
import android.support.v4.app.FragmentTransaction;
@@ -201,7 +201,7 @@ public class SubsonicActivity extends ActionBarActivity implements OnItemSelecte
});
drawer = (DrawerLayout) findViewById(R.id.drawer_layout);
- drawerToggle = new ActionBarDrawerToggle(this, drawer, R.drawable.ic_drawer, R.string.common_appname, R.string.common_appname) {
+ drawerToggle = new ActionBarDrawerToggle(this, drawer, R.string.common_appname, R.string.common_appname) {
@Override
public void onDrawerClosed(View view) {
setTitle(currentFragment.getTitle());