修改 合并

Author: TKaxv-7S

app/src/main/java/tkaxv7s/xposed/sesame/ui/MainActivity.java

@@ -368,7 +368,9 @@ private void selectSettingUid() {
 
     private void goSettingActivity(int index) {
         UserEntity userEntity = userEntityArray[index];
-        Intent intent = new Intent(this, UIConfig.INSTANCE.getNewUI() ? NewSettingsActivity.class : SettingsActivity.class);
+        //TODO 解除
+        //Intent intent = new Intent(this, UIConfig.INSTANCE.getNewUI() ? NewSettingsActivity.class : SettingsActivity.class);
+        Intent intent = new Intent(this, SettingsActivity.class);
         if (userEntity != null) {
             intent.putExtra("userId", userEntity.getUserId());
             intent.putExtra("userName", userEntity.getShowName());

app/src/main/java/tkaxv7s/xposed/sesame/ui/SettingsActivity.java

@@ -158,7 +158,8 @@ public boolean onCreateOptionsMenu(Menu menu) {
         menu.add(0, 2, 2, "导入配置");
         menu.add(0, 3, 3, "删除配置");
         menu.add(0, 4, 4, "单向好友");
-        menu.add(0, 5, 5, "切换至新UI");
+        //TODO 解除
+        //menu.add(0, 5, 5, "切换至新UI");
         return super.onCreateOptionsMenu(menu);
     }
 
@@ -204,7 +205,8 @@ public boolean onOptionsItemSelected(MenuItem item) {
             case 4:
                 ListDialog.show(this, "单向好友列表", AlipayUser.getList(user -> user.getFriendStatus() != 1), SelectModelFieldFunc.newMapInstance(), false, ListDialog.ListType.SHOW);
                 break;
-            case 5:
+            //TODO 解除
+            /*case 5:
                 UIConfig.INSTANCE.setNewUI(true);
                 if (UIConfig.save()) {
                     Intent intent = new Intent(this, NewSettingsActivity.class);
@@ -215,7 +217,7 @@ public boolean onOptionsItemSelected(MenuItem item) {
                 } else {
                     Toast.makeText(this, "切换失败", Toast.LENGTH_SHORT).show();
                 }
-                break;
+                break;*/
         }
         return super.onOptionsItemSelected(item);
     }