From a18eb32b5924354c6c8cddf8a3597d3dc5c0e5dc Mon Sep 17 00:00:00 2001 From: Mygod Date: Mon, 26 Dec 2016 00:40:39 +0800 Subject: [PATCH] Promote global settings to main drawer --- .../com/github/shadowsocks/MainActivity.scala | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/main/scala/com/github/shadowsocks/MainActivity.scala b/src/main/scala/com/github/shadowsocks/MainActivity.scala index 1dde833f..44dbc46b 100644 --- a/src/main/scala/com/github/shadowsocks/MainActivity.scala +++ b/src/main/scala/com/github/shadowsocks/MainActivity.scala @@ -208,21 +208,21 @@ class MainActivity extends Activity with ServiceBoundContext with Drawer.OnDrawe .withIdentifier(DRAWER_PROFILES) .withName(R.string.profiles) .withIcon(ContextCompat.getDrawable(this, R.drawable.ic_action_description)) + .withIconTintingEnabled(true), + new PrimaryDrawerItem() + .withIdentifier(DRAWER_GLOBAL_SETTINGS) + .withName(R.string.settings) + .withIcon(ContextCompat.getDrawable(this, R.drawable.ic_action_settings)) .withIconTintingEnabled(true) ) .addStickyDrawerItems( - new SecondaryDrawerItem() + new PrimaryDrawerItem() .withIdentifier(DRAWER_RECOVERY) .withName(R.string.recovery) .withIcon(ContextCompat.getDrawable(this, R.drawable.ic_navigation_refresh)) .withIconTintingEnabled(true) .withSelectable(false), - new SecondaryDrawerItem() - .withIdentifier(DRAWER_GLOBAL_SETTINGS) - .withName(R.string.settings) - .withIcon(ContextCompat.getDrawable(this, R.drawable.ic_action_settings)) - .withIconTintingEnabled(true), - new SecondaryDrawerItem() + new PrimaryDrawerItem() .withIdentifier(DRAWER_ABOUT) .withName(R.string.about) .withIcon(ContextCompat.getDrawable(this, R.drawable.ic_action_copyright))