From 6d5c23245cbb59d8df08bef93d280bbd42783037 Mon Sep 17 00:00:00 2001
From: yuhan6665 <1588741+yuhan6665@users.noreply.github.com>
Date: Fri, 11 Sep 2020 21:30:08 -0400
Subject: [PATCH] Move version to drawer
Make it easier to check version.
Technically, version should not be selectable setting
---
.../kotlin/com/v2ray/ang/ui/MainActivity.kt | 3 +++
.../com/v2ray/ang/ui/SettingsActivity.kt | 9 -------
.../app/src/main/res/layout/activity_main.xml | 18 +++++++++++++-
V2rayNG/app/src/main/res/menu/menu_drawer.xml | 20 +++++++++-------
.../src/main/res/values-zh-rCN/strings.xml | 2 --
.../src/main/res/values-zh-rTW/strings.xml | 2 --
V2rayNG/app/src/main/res/values/strings.xml | 2 --
.../app/src/main/res/xml/pref_settings.xml | 24 -------------------
8 files changed, 31 insertions(+), 49 deletions(-)
diff --git a/V2rayNG/app/src/main/kotlin/com/v2ray/ang/ui/MainActivity.kt b/V2rayNG/app/src/main/kotlin/com/v2ray/ang/ui/MainActivity.kt
index b09b2a0f..f4c1148c 100644
--- a/V2rayNG/app/src/main/kotlin/com/v2ray/ang/ui/MainActivity.kt
+++ b/V2rayNG/app/src/main/kotlin/com/v2ray/ang/ui/MainActivity.kt
@@ -27,6 +27,7 @@ import android.support.v4.view.GravityCompat
import android.support.v7.app.ActionBarDrawerToggle
import android.support.v7.widget.helper.ItemTouchHelper
import android.util.Log
+import com.v2ray.ang.BuildConfig
import com.v2ray.ang.dto.EConfigType
import com.v2ray.ang.extension.defaultDPreference
//import com.v2ray.ang.InappBuyActivity
@@ -36,6 +37,7 @@ import java.util.concurrent.TimeUnit
import com.v2ray.ang.helper.SimpleItemTouchHelperCallback
import com.v2ray.ang.util.AngConfigManager.configs
import kotlinx.coroutines.*
+import libv2ray.Libv2ray
class MainActivity : BaseActivity(), NavigationView.OnNavigationItemSelectedListener {
companion object {
@@ -113,6 +115,7 @@ class MainActivity : BaseActivity(), NavigationView.OnNavigationItemSelectedList
drawer_layout.addDrawerListener(toggle)
toggle.syncState()
nav_view.setNavigationItemSelectedListener(this)
+ version.text = "v${BuildConfig.VERSION_NAME} (${Libv2ray.checkVersionX()})"
}
fun startV2Ray() {
diff --git a/V2rayNG/app/src/main/kotlin/com/v2ray/ang/ui/SettingsActivity.kt b/V2rayNG/app/src/main/kotlin/com/v2ray/ang/ui/SettingsActivity.kt
index 0bf13dff..4fef00c8 100644
--- a/V2rayNG/app/src/main/kotlin/com/v2ray/ang/ui/SettingsActivity.kt
+++ b/V2rayNG/app/src/main/kotlin/com/v2ray/ang/ui/SettingsActivity.kt
@@ -1,13 +1,9 @@
package com.v2ray.ang.ui
-import android.content.Intent
import android.content.SharedPreferences
-import android.net.Uri
import android.os.Bundle
import android.preference.*
import com.v2ray.ang.AngApplication
-import com.v2ray.ang.BuildConfig
-//import com.v2ray.ang.InappBuyActivity
import com.v2ray.ang.R
import com.v2ray.ang.AppConfig
import com.v2ray.ang.extension.defaultDPreference
@@ -17,7 +13,6 @@ import org.jetbrains.anko.act
import org.jetbrains.anko.defaultSharedPreferences
import org.jetbrains.anko.startActivity
import org.jetbrains.anko.toast
-import libv2ray.Libv2ray
class SettingsActivity : BaseActivity() {
companion object {
@@ -42,7 +37,6 @@ class SettingsActivity : BaseActivity() {
// const val PREF_LICENSES = "pref_licenses"
// const val PREF_FEEDBACK = "pref_feedback"
// const val PREF_TG_GROUP = "pref_tg_group"
- const val PREF_VERSION = "pref_version"
// const val PREF_AUTO_RESTART = "pref_auto_restart"
const val PREF_FORWARD_IPV6 = "pref_forward_ipv6"
}
@@ -80,7 +74,6 @@ class SettingsActivity : BaseActivity() {
// val licenses: Preference by lazy { findPreference(PREF_LICENSES) }
// val feedback: Preference by lazy { findPreference(PREF_FEEDBACK) }
// val tgGroup: Preference by lazy { findPreference(PREF_TG_GROUP) }
- val version: Preference by lazy { findPreference(PREF_VERSION) }
private fun restartProxy() {
Utils.stopVService(activity)
@@ -206,8 +199,6 @@ class SettingsActivity : BaseActivity() {
// httpPort.summary = any as String
// true
// }
-
- version.summary = "${BuildConfig.VERSION_NAME} (${Libv2ray.checkVersionX()})"
}
override fun onStart() {
diff --git a/V2rayNG/app/src/main/res/layout/activity_main.xml b/V2rayNG/app/src/main/res/layout/activity_main.xml
index ce364e7a..fca2f06d 100644
--- a/V2rayNG/app/src/main/res/layout/activity_main.xml
+++ b/V2rayNG/app/src/main/res/layout/activity_main.xml
@@ -111,7 +111,23 @@
app:headerLayout="@layout/nav_header"
app:itemIconTint="@color/colorPrimary_dark"
app:itemTextColor="@color/colorPrimary"
- app:menu="@menu/menu_drawer" />
+ app:menu="@menu/menu_drawer" >
+
+
+
+
+
+
diff --git a/V2rayNG/app/src/main/res/menu/menu_drawer.xml b/V2rayNG/app/src/main/res/menu/menu_drawer.xml
index 69cc38b8..a10ac0d6 100644
--- a/V2rayNG/app/src/main/res/menu/menu_drawer.xml
+++ b/V2rayNG/app/src/main/res/menu/menu_drawer.xml
@@ -16,25 +16,27 @@
- -
-
-
-
+
+