From 54c67f83ab7fe253ccf74533850bbc544dfb0604 Mon Sep 17 00:00:00 2001
From: Kr328 <39107975+Kr328@users.noreply.github.com>
Date: Wed, 19 Feb 2020 02:56:14 +0800
Subject: [PATCH] add zh-cn

---
 .../java/com/github/kr328/clash/ApkBrokenActivity.kt   |  4 +++-
 .../main/java/com/github/kr328/clash/BaseActivity.kt   | 10 +++++++++-
 .../com/github/kr328/clash/CreateProfileActivity.kt    |  3 +++
 .../java/com/github/kr328/clash/LogViewerActivity.kt   |  3 +++
 .../main/java/com/github/kr328/clash/LogsActivity.kt   |  3 +++
 .../main/java/com/github/kr328/clash/MainActivity.kt   |  2 ++
 .../java/com/github/kr328/clash/ProfileEditActivity.kt |  2 ++
 .../java/com/github/kr328/clash/ProfilesActivity.kt    |  3 +++
 .../java/com/github/kr328/clash/ProxiesActivity.kt     |  3 +++
 .../java/com/github/kr328/clash/SettingsActivity.kt    |  4 +++-
 .../com/github/kr328/clash/SettingsBehaviorActivity.kt |  7 +++----
 .../github/kr328/clash/SettingsInterfaceActivity.kt    |  3 +++
 .../com/github/kr328/clash/SettingsNetworkActivity.kt  |  9 +++------
 .../github/kr328/clash/settings/InterfaceFragment.kt   |  2 --
 14 files changed, 43 insertions(+), 15 deletions(-)

diff --git a/app/src/main/java/com/github/kr328/clash/ApkBrokenActivity.kt b/app/src/main/java/com/github/kr328/clash/ApkBrokenActivity.kt
index 6e2373b..fd7b2ae 100644
--- a/app/src/main/java/com/github/kr328/clash/ApkBrokenActivity.kt
+++ b/app/src/main/java/com/github/kr328/clash/ApkBrokenActivity.kt
@@ -1,7 +1,6 @@
 package com.github.kr328.clash
 
 class ApkBrokenActivity : BaseActivity() {
-
     override fun onBackPressed() {
         super.onBackPressed()
 
@@ -12,4 +11,7 @@ class ApkBrokenActivity : BaseActivity() {
     override fun shouldDisplayHomeAsUpEnabled(): Boolean {
         return false
     }
+
+    override val activityLabel: CharSequence
+        get() = getText(R.string.application_broken)
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/github/kr328/clash/BaseActivity.kt b/app/src/main/java/com/github/kr328/clash/BaseActivity.kt
index 92f3e88..679df30 100644
--- a/app/src/main/java/com/github/kr328/clash/BaseActivity.kt
+++ b/app/src/main/java/com/github/kr328/clash/BaseActivity.kt
@@ -161,13 +161,21 @@ abstract class BaseActivity : AppCompatActivity(), CoroutineScope by MainScope()
     override fun setSupportActionBar(toolbar: Toolbar?) {
         super.setSupportActionBar(toolbar)
 
-        supportActionBar?.setDisplayHomeAsUpEnabled(shouldDisplayHomeAsUpEnabled())
+        supportActionBar?.apply {
+            setDisplayHomeAsUpEnabled(shouldDisplayHomeAsUpEnabled())
+
+            activityLabel?.let {
+                title = it
+            }
+        }
     }
 
     open fun shouldDisplayHomeAsUpEnabled(): Boolean {
         return true
     }
 
+    abstract val activityLabel: CharSequence?
+
     override fun onSupportNavigateUp(): Boolean {
         this.onBackPressed()
 
diff --git a/app/src/main/java/com/github/kr328/clash/CreateProfileActivity.kt b/app/src/main/java/com/github/kr328/clash/CreateProfileActivity.kt
index 66e9466..89239b3 100644
--- a/app/src/main/java/com/github/kr328/clash/CreateProfileActivity.kt
+++ b/app/src/main/java/com/github/kr328/clash/CreateProfileActivity.kt
@@ -66,6 +66,9 @@ class CreateProfileActivity : BaseActivity() {
         }
     }
 
+    override val activityLabel: CharSequence
+        get() = getText(R.string.create_profile)
+
     override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
         if (requestCode == REQUEST_CODE && resultCode == Activity.RESULT_OK)
             return finish()
diff --git a/app/src/main/java/com/github/kr328/clash/LogViewerActivity.kt b/app/src/main/java/com/github/kr328/clash/LogViewerActivity.kt
index e2dcf92..2817e22 100644
--- a/app/src/main/java/com/github/kr328/clash/LogViewerActivity.kt
+++ b/app/src/main/java/com/github/kr328/clash/LogViewerActivity.kt
@@ -63,6 +63,9 @@ class LogViewerActivity : BaseActivity() {
         }
     }
 
+    override val activityLabel: CharSequence
+        get() = getText(R.string.log_viewer)
+
     override fun onStart() {
         super.onStart()
 
diff --git a/app/src/main/java/com/github/kr328/clash/LogsActivity.kt b/app/src/main/java/com/github/kr328/clash/LogsActivity.kt
index a2a83cd..ac9d0d5 100644
--- a/app/src/main/java/com/github/kr328/clash/LogsActivity.kt
+++ b/app/src/main/java/com/github/kr328/clash/LogsActivity.kt
@@ -88,6 +88,9 @@ class LogsActivity : BaseActivity() {
         refreshList()
     }
 
+    override val activityLabel: CharSequence
+        get() = getText(R.string.logs)
+
     override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
         if ( requestCode == REQUEST_CODE ) {
             if ( resultCode == Activity.RESULT_OK ) {
diff --git a/app/src/main/java/com/github/kr328/clash/MainActivity.kt b/app/src/main/java/com/github/kr328/clash/MainActivity.kt
index 13716c5..60c527a 100644
--- a/app/src/main/java/com/github/kr328/clash/MainActivity.kt
+++ b/app/src/main/java/com/github/kr328/clash/MainActivity.kt
@@ -72,6 +72,8 @@ class MainActivity : BaseActivity() {
         stopBandwidthPolling()
     }
 
+    override val activityLabel: CharSequence? = null
+
     override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
         if (requestCode == REQUEST_CODE) {
             if (resultCode == Activity.RESULT_OK)
diff --git a/app/src/main/java/com/github/kr328/clash/ProfileEditActivity.kt b/app/src/main/java/com/github/kr328/clash/ProfileEditActivity.kt
index 277fd26..96d87cc 100644
--- a/app/src/main/java/com/github/kr328/clash/ProfileEditActivity.kt
+++ b/app/src/main/java/com/github/kr328/clash/ProfileEditActivity.kt
@@ -169,6 +169,8 @@ class ProfileEditActivity : BaseActivity() {
         }
     }
 
+    override val activityLabel: CharSequence? = null
+
     override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
         if (requestCode == REQUEST_CODE) {
             if (resultCode != Activity.RESULT_OK || data == null)
diff --git a/app/src/main/java/com/github/kr328/clash/ProfilesActivity.kt b/app/src/main/java/com/github/kr328/clash/ProfilesActivity.kt
index e4c10ca..3e1c4f6 100644
--- a/app/src/main/java/com/github/kr328/clash/ProfilesActivity.kt
+++ b/app/src/main/java/com/github/kr328/clash/ProfilesActivity.kt
@@ -62,6 +62,9 @@ class ProfilesActivity : BaseActivity(), ProfileAdapter.Callback, ProfilesMenu.C
         backgroundJob = null
     }
 
+    override val activityLabel: CharSequence?
+        get() = getText(R.string.profiles)
+
     override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
         if (requestCode == EDITOR_REQUEST_CODE) {
             launch {
diff --git a/app/src/main/java/com/github/kr328/clash/ProxiesActivity.kt b/app/src/main/java/com/github/kr328/clash/ProxiesActivity.kt
index c9530c2..8025c48 100644
--- a/app/src/main/java/com/github/kr328/clash/ProxiesActivity.kt
+++ b/app/src/main/java/com/github/kr328/clash/ProxiesActivity.kt
@@ -185,6 +185,9 @@ class ProxiesActivity : BaseActivity(), ScrollBinding.Callback {
         return true
     }
 
+    override val activityLabel: CharSequence?
+        get() = getText(R.string.proxy)
+
     override suspend fun onClashStarted() {
         finish()
     }
diff --git a/app/src/main/java/com/github/kr328/clash/SettingsActivity.kt b/app/src/main/java/com/github/kr328/clash/SettingsActivity.kt
index 5144d76..89b6c3d 100644
--- a/app/src/main/java/com/github/kr328/clash/SettingsActivity.kt
+++ b/app/src/main/java/com/github/kr328/clash/SettingsActivity.kt
@@ -1,6 +1,5 @@
 package com.github.kr328.clash
 
-import android.location.SettingInjectorService
 import android.os.Bundle
 import com.github.kr328.clash.service.util.intent
 import kotlinx.android.synthetic.main.activity_settings.*
@@ -41,4 +40,7 @@ class SettingsActivity: BaseActivity() {
             }
         }
     }
+
+    override val activityLabel: CharSequence?
+        get() = getText(R.string.settings)
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/github/kr328/clash/SettingsBehaviorActivity.kt b/app/src/main/java/com/github/kr328/clash/SettingsBehaviorActivity.kt
index cec01a4..ab9a7de 100644
--- a/app/src/main/java/com/github/kr328/clash/SettingsBehaviorActivity.kt
+++ b/app/src/main/java/com/github/kr328/clash/SettingsBehaviorActivity.kt
@@ -1,11 +1,7 @@
 package com.github.kr328.clash
 
 import android.os.Bundle
-import com.github.kr328.clash.service.settings.ServiceSettings
 import com.github.kr328.clash.settings.BehaviorFragment
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.launch
-import kotlinx.coroutines.withContext
 
 class SettingsBehaviorActivity: BaseActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
@@ -18,4 +14,7 @@ class SettingsBehaviorActivity: BaseActivity() {
             .replace(R.id.fragment, BehaviorFragment())
             .commit()
     }
+
+    override val activityLabel: CharSequence?
+        get() = getText(R.string.behavior)
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/github/kr328/clash/SettingsInterfaceActivity.kt b/app/src/main/java/com/github/kr328/clash/SettingsInterfaceActivity.kt
index 2613f55..3a17ef7 100644
--- a/app/src/main/java/com/github/kr328/clash/SettingsInterfaceActivity.kt
+++ b/app/src/main/java/com/github/kr328/clash/SettingsInterfaceActivity.kt
@@ -14,4 +14,7 @@ class SettingsInterfaceActivity: BaseActivity() {
             .replace(R.id.fragment, InterfaceFragment())
             .commit()
     }
+
+    override val activityLabel: CharSequence?
+        get() = getText(R.string.interface_)
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/github/kr328/clash/SettingsNetworkActivity.kt b/app/src/main/java/com/github/kr328/clash/SettingsNetworkActivity.kt
index 767259d..164bb91 100644
--- a/app/src/main/java/com/github/kr328/clash/SettingsNetworkActivity.kt
+++ b/app/src/main/java/com/github/kr328/clash/SettingsNetworkActivity.kt
@@ -1,13 +1,7 @@
 package com.github.kr328.clash
 
 import android.os.Bundle
-import com.github.kr328.clash.preference.UiSettings
-import com.github.kr328.clash.service.settings.ServiceSettings
 import com.github.kr328.clash.settings.NetworkFragment
-import kotlinx.android.synthetic.main.activity_settings.*
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.launch
-import kotlinx.coroutines.withContext
 
 class SettingsNetworkActivity : BaseActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
@@ -20,4 +14,7 @@ class SettingsNetworkActivity : BaseActivity() {
             .replace(R.id.fragment, NetworkFragment())
             .commit()
     }
+
+    override val activityLabel: CharSequence?
+        get() = getText(R.string.network)
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/github/kr328/clash/settings/InterfaceFragment.kt b/app/src/main/java/com/github/kr328/clash/settings/InterfaceFragment.kt
index 3c002f2..a9ee4b6 100644
--- a/app/src/main/java/com/github/kr328/clash/settings/InterfaceFragment.kt
+++ b/app/src/main/java/com/github/kr328/clash/settings/InterfaceFragment.kt
@@ -1,7 +1,5 @@
 package com.github.kr328.clash.settings
 
-import androidx.appcompat.app.AppCompatActivity
-import androidx.appcompat.app.AppCompatDelegate
 import com.github.kr328.clash.R
 import com.github.kr328.clash.preference.UiSettings