diff --git a/src/main/res/drawable-anydpi-v21/ic_action_settings.xml b/src/main/res/drawable-anydpi-v21/ic_action_settings.xml deleted file mode 100644 index ce997a72..00000000 --- a/src/main/res/drawable-anydpi-v21/ic_action_settings.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/src/main/res/drawable-hdpi/ic_action_settings.png b/src/main/res/drawable-hdpi/ic_action_settings.png deleted file mode 100644 index 97ded33b..00000000 Binary files a/src/main/res/drawable-hdpi/ic_action_settings.png and /dev/null differ diff --git a/src/main/res/drawable-mdpi/ic_action_settings.png b/src/main/res/drawable-mdpi/ic_action_settings.png deleted file mode 100644 index 8909c355..00000000 Binary files a/src/main/res/drawable-mdpi/ic_action_settings.png and /dev/null differ diff --git a/src/main/res/drawable-xhdpi/ic_action_settings.png b/src/main/res/drawable-xhdpi/ic_action_settings.png deleted file mode 100644 index 5caedc8e..00000000 Binary files a/src/main/res/drawable-xhdpi/ic_action_settings.png and /dev/null differ diff --git a/src/main/res/drawable-xxhdpi/ic_action_settings.png b/src/main/res/drawable-xxhdpi/ic_action_settings.png deleted file mode 100644 index eabb0a2b..00000000 Binary files a/src/main/res/drawable-xxhdpi/ic_action_settings.png and /dev/null differ diff --git a/src/main/res/drawable-xxxhdpi/ic_action_settings.png b/src/main/res/drawable-xxxhdpi/ic_action_settings.png deleted file mode 100644 index 507c5edd..00000000 Binary files a/src/main/res/drawable-xxxhdpi/ic_action_settings.png and /dev/null differ diff --git a/src/main/res/drawable/ic_copyright.xml b/src/main/res/drawable/ic_action_copyright.xml similarity index 100% rename from src/main/res/drawable/ic_copyright.xml rename to src/main/res/drawable/ic_action_copyright.xml diff --git a/src/main/res/drawable/ic_folder.xml b/src/main/res/drawable/ic_action_description.xml similarity index 58% rename from src/main/res/drawable/ic_folder.xml rename to src/main/res/drawable/ic_action_description.xml index d7c6145c..38c33351 100644 --- a/src/main/res/drawable/ic_folder.xml +++ b/src/main/res/drawable/ic_action_description.xml @@ -5,5 +5,5 @@ android:viewportHeight="24.0"> + android:pathData="M14,2L6,2c-1.1,0 -1.99,0.9 -1.99,2L4,20c0,1.1 0.89,2 1.99,2L18,22c1.1,0 2,-0.9 2,-2L20,8l-6,-6zM16,18L8,18v-2h8v2zM16,14L8,14v-2h8v2zM13,9L13,3.5L18.5,9L13,9z"/> diff --git a/src/main/res/drawable/ic_settings.xml b/src/main/res/drawable/ic_action_settings.xml similarity index 100% rename from src/main/res/drawable/ic_settings.xml rename to src/main/res/drawable/ic_action_settings.xml diff --git a/src/main/scala/com/github/shadowsocks/MainActivity.scala b/src/main/scala/com/github/shadowsocks/MainActivity.scala index 7e719987..00e2c371 100644 --- a/src/main/scala/com/github/shadowsocks/MainActivity.scala +++ b/src/main/scala/com/github/shadowsocks/MainActivity.scala @@ -215,17 +215,17 @@ class MainActivity extends Activity with ServiceBoundContext with Drawer.OnDrawe new PrimaryDrawerItem() .withIdentifier(DRAWER_PROFILES) .withName(R.string.profiles) - .withIcon(getResources.getDrawable(R.drawable.ic_folder)) + .withIcon(ContextCompat.getDrawable(this, R.drawable.ic_action_description)) ) .addStickyDrawerItems( new SecondaryDrawerItem() .withIdentifier(DRAWER_GLOBAL_SETTINGS) .withName(R.string.settings) - .withIcon(getResources.getDrawable(R.drawable.ic_settings)), + .withIcon(ContextCompat.getDrawable(this, R.drawable.ic_action_settings)), new SecondaryDrawerItem() .withIdentifier(DRAWER_ABOUT) .withName(R.string.about) - .withIcon(getResources.getDrawable(R.drawable.ic_copyright)) + .withIcon(ContextCompat.getDrawable(this, R.drawable.ic_action_copyright)) .withSelectable(false) ) .withOnDrawerItemClickListener(this)