Merge pull request 2dust#432 from yuhan6665/drawer-ui

fix highlight issue in drawer ui
cooingandwooing · Jul 18, 2020 · 9721879 · 9721879
2 parents 623c180 + 92d2cb3
commit 9721879
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 10 deletions.
diff --git a/V2rayNG/app/src/main/kotlin/com/v2ray/ang/ui/BaseDrawerActivity.kt b/V2rayNG/app/src/main/kotlin/com/v2ray/ang/ui/BaseDrawerActivity.kt
@@ -55,7 +55,6 @@ abstract class BaseDrawerActivity : BaseActivity() {
                         this@BaseDrawerActivity, R.anim.fade_in, R.anim.fade_out).toBundle()
                 var activityClass: Class<*>? = null
                 when (mItemToOpenWhenDrawerCloses) {
-                    R.id.server_profile -> activityClass = MainActivity::class.java
                     R.id.sub_setting -> activityClass = SubSettingActivity::class.java
                     R.id.settings -> activityClass = SettingsActivity::class.java
                     R.id.logcat -> {
@@ -195,9 +194,7 @@ abstract class BaseDrawerActivity : BaseActivity() {
             true
         }
 
-        if (MainActivity::class.java.isAssignableFrom(javaClass)) {
-            navigationView.setCheckedItem(R.id.server_profile)
-        } else if (SubSettingActivity::class.java.isAssignableFrom(javaClass)) {
+        if (SubSettingActivity::class.java.isAssignableFrom(javaClass)) {
             navigationView.setCheckedItem(R.id.sub_setting)
         } else if (SettingsActivity::class.java.isAssignableFrom(javaClass)) {
             navigationView.setCheckedItem(R.id.settings)

diff --git a/V2rayNG/app/src/main/res/menu/menu_drawer.xml b/V2rayNG/app/src/main/res/menu/menu_drawer.xml
@@ -4,12 +4,7 @@
     tools:showIn="navigation_view">
 
     <group
-        android:id="@+id/group_main"
-        android:checkableBehavior="single">
-        <item
-            android:id="@+id/server_profile"
-            android:icon="@drawable/ic_description_white_24dp"
-            android:title="@string/title_server" />
+        android:id="@+id/group_main">
         <item
             android:id="@+id/sub_setting"
             android:icon="@drawable/ic_subscriptions_white_24dp"