diff --git a/src/main/res/drawable/background_header.jpg b/src/main/res/drawable/background_header.jpg new file mode 100644 index 00000000..08c85a6f Binary files /dev/null and b/src/main/res/drawable/background_header.jpg differ diff --git a/src/main/res/drawable/background_header.png b/src/main/res/drawable/background_header.png deleted file mode 100644 index 2c19bc63..00000000 Binary files a/src/main/res/drawable/background_header.png and /dev/null differ diff --git a/src/main/res/drawable/ic_copyright.xml b/src/main/res/drawable/ic_copyright.xml new file mode 100644 index 00000000..fad6892c --- /dev/null +++ b/src/main/res/drawable/ic_copyright.xml @@ -0,0 +1,9 @@ + + + diff --git a/src/main/res/drawable/ic_folder.xml b/src/main/res/drawable/ic_folder.xml new file mode 100644 index 00000000..d7c6145c --- /dev/null +++ b/src/main/res/drawable/ic_folder.xml @@ -0,0 +1,9 @@ + + + diff --git a/src/main/res/drawable/ic_settings.xml b/src/main/res/drawable/ic_settings.xml new file mode 100644 index 00000000..ace746c4 --- /dev/null +++ b/src/main/res/drawable/ic_settings.xml @@ -0,0 +1,9 @@ + + + diff --git a/src/main/res/layout/layout_header.xml b/src/main/res/layout/layout_header.xml index 9c9f8631..fd548ed1 100644 --- a/src/main/res/layout/layout_header.xml +++ b/src/main/res/layout/layout_header.xml @@ -1,10 +1,21 @@ - + + + + + diff --git a/src/main/scala/com/github/shadowsocks/MainActivity.scala b/src/main/scala/com/github/shadowsocks/MainActivity.scala index a439c95e..94da47e5 100644 --- a/src/main/scala/com/github/shadowsocks/MainActivity.scala +++ b/src/main/scala/com/github/shadowsocks/MainActivity.scala @@ -215,15 +215,17 @@ class MainActivity extends Activity with ServiceBoundContext with Drawer.OnDrawe new PrimaryDrawerItem() .withIdentifier(DRAWER_PROFILES) .withName(R.string.profiles) - // TODO: withIcons + .withIcon(getResources.getDrawable(R.drawable.ic_folder)) ) .addStickyDrawerItems( new SecondaryDrawerItem() .withIdentifier(DRAWER_GLOBAL_SETTINGS) - .withName(R.string.settings), + .withName(R.string.settings) + .withIcon(getResources.getDrawable(R.drawable.ic_settings)), new SecondaryDrawerItem() .withIdentifier(DRAWER_ABOUT) .withName(R.string.about) + .withIcon(getResources.getDrawable(R.drawable.ic_copyright)) .withSelectable(false) ) .withOnDrawerItemClickListener(this)