From 50eef54ab68503a0f603328c3443cd0c20d6366b Mon Sep 17 00:00:00 2001
From: Kr328 <39107975+Kr328@users.noreply.github.com>
Date: Mon, 13 Apr 2020 16:28:13 +0800
Subject: [PATCH] update support activity

---
 .../com/github/kr328/clash/SupportActivity.kt    | 16 ++++++++++++----
 app/src/main/res/values-zh/strings.xml           |  4 +++-
 app/src/main/res/values/strings.xml              |  6 ++++--
 .../kr328/clash/design/common/CommonUiBuilder.kt |  2 +-
 4 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/app/src/main/java/com/github/kr328/clash/SupportActivity.kt b/app/src/main/java/com/github/kr328/clash/SupportActivity.kt
index 817f4cf..ecb9a1e 100644
--- a/app/src/main/java/com/github/kr328/clash/SupportActivity.kt
+++ b/app/src/main/java/com/github/kr328/clash/SupportActivity.kt
@@ -3,6 +3,7 @@ package com.github.kr328.clash
 import android.content.Intent
 import android.net.Uri
 import android.os.Bundle
+import android.text.Html
 import kotlinx.android.synthetic.main.activity_support.*
 
 class SupportActivity : BaseActivity() {
@@ -13,6 +14,11 @@ class SupportActivity : BaseActivity() {
         setSupportActionBar(toolbar)
 
         commonUi.build {
+            tips {
+                icon = getDrawable(R.drawable.ic_info)
+                title = Html.fromHtml(getString(R.string.tips_support), Html.FROM_HTML_MODE_LEGACY)
+            }
+
             category(text = getString(R.string.sources))
 
             option(
@@ -38,7 +44,7 @@ class SupportActivity : BaseActivity() {
                 }
             }
 
-            category(text = getString(R.string.contacts))
+            category(text = getString(R.string.feedback))
 
             option(
                 title = getString(R.string.github_issues),
@@ -52,9 +58,11 @@ class SupportActivity : BaseActivity() {
                 }
             }
 
-            if (resources.configuration.locales.get(0)
-                    .language.equals("zh", true)
-            ) {
+            val firstLanguage = resources.configuration.locales.get(0).language
+
+            if (firstLanguage.equals("zh", true)) {
+                category(getString(R.string.donate))
+
                 option(
                     title = getString(R.string.telegram_channel),
                     summary = getString(R.string.telegram_channel_url)
diff --git a/app/src/main/res/values-zh/strings.xml b/app/src/main/res/values-zh/strings.xml
index bcb0b19..81f38b3 100644
--- a/app/src/main/res/values-zh/strings.xml
+++ b/app/src/main/res/values-zh/strings.xml
@@ -117,7 +117,7 @@
     <string name="reverse">反转</string>
     <string name="clash">Clash</string>
     <string name="clash_for_android">Clash for Android</string>
-    <string name="contacts">联系我们</string>
+    <string name="feedback">反馈</string>
     <string name="email">E-Mail</string>
     <string name="sources">源代码</string>
     <string name="telegram_channel">Telegram 频道</string>
@@ -134,4 +134,6 @@
     <string name="more_than_15_minutes">大于15分钟</string>
     <string name="loading">载入中</string>
     <string name="clone_profile">复制配置</string>
+    <string name="tips_support"><![CDATA[Clash for Android 是一个<strong>免费开源</strong>的项目, <strong>不提供</strong>任何代理服务<br />请务必<strong>不要</strong>反馈非应用自身引起的问题]]></string>
+    <string name="donate">捐赠</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 041f5f9..c9e4378 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -154,15 +154,17 @@
     <string name="clash_url" translatable="false">https://github.com/Dreamacro/clash</string>
     <string name="clash_for_android_url" translatable="false">https://github.com/Kr328/ClashForAndroid</string>
 
-    <string name="contacts">Contacts</string>
+    <string name="feedback">Feedback</string>
     <string name="email">E-Mail</string>
+    <string name="donate">Donate</string>
     <string name="github_issues">Github Issues</string>
     <string name="telegram_channel">Telegram Channel</string>
     <string name="email_url" translatable="false">kr328app@outlook.com</string>
     <string name="github_issues_url" translatable="false">https://github.com/Kr328/ClashForAndroid/issues</string>
     <string name="telegram_channel_url" translatable="false">https://t.me/clash_for_android_channel</string>
-
+    
     <string name="tips_profile"><![CDATA[Accept Only <strong>Clash Config</strong> which contains <br /><strong>Proxies, Proxy Groups and Rules</strong>]]></string>
+    <string name="tips_support"><![CDATA[Clash for Android is <strong>free</strong> and <strong>open source</strong> <br /> It does <strong>NOT</strong> provide any proxy services]]></string>
 
     <string name="application_broken_description"><![CDATA[This is usually because you used a copy from <strong>Google Play</strong>, but the app that generated the copy did not handle <strong>Split Apks</strong> correctly <br />This means you get <strong>part of the app</strong>, not all of it]]></string>
     <string name="learn_more_about_split_apks">Learn more about Split Apks</string>
diff --git a/design/src/main/java/com/github/kr328/clash/design/common/CommonUiBuilder.kt b/design/src/main/java/com/github/kr328/clash/design/common/CommonUiBuilder.kt
index 7d1341d..b55e2e8 100644
--- a/design/src/main/java/com/github/kr328/clash/design/common/CommonUiBuilder.kt
+++ b/design/src/main/java/com/github/kr328/clash/design/common/CommonUiBuilder.kt
@@ -73,7 +73,7 @@ class CommonUiBuilder(val screen: CommonUiScreen) {
     fun tips(
         title: String = "",
         icon: Drawable? = null,
-        setup: Tips.() -> Unit
+        setup: Tips.() -> Unit = {}
     ) {
         val tips = Tips(screen)