fix ci

naicfeng · Mar 3, 2020 · d638b6f · d638b6f
1 parent 013b10b
commit d638b6f
Show file tree

Hide file tree

Showing 3 changed files with 44 additions and 3 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
@@ -33,6 +33,17 @@ class SupportActivity : BaseActivity() {
                     )
                 }
             }
+            option(
+                title = getString(R.string.clashr),
+                summary = getString(R.string.clashr_url)
+            ) {
+                onClick {
+                    startActivity(
+                        Intent(Intent.ACTION_VIEW)
+                            .setData(Uri.parse(getString(R.string.clashr_url)))
+                    )
+                }
+            }
             option(
                 title = getString(R.string.clash_for_android),
                 summary = getString(R.string.clash_for_android_url)
@@ -44,6 +55,17 @@ class SupportActivity : BaseActivity() {
                     )
                 }
             }
+            option(
+                title = getString(R.string.clashr_for_android),
+                summary = getString(R.string.clashr_for_android_url)
+            ) {
+                onClick {
+                    startActivity(
+                        Intent(Intent.ACTION_VIEW)
+                            .setData(Uri.parse(getString(R.string.clashr_for_android_url)))
+                    )
+                }
+            }
 
             category(text = getString(R.string.contacts))
 
@@ -71,6 +93,7 @@ class SupportActivity : BaseActivity() {
                 }
             }
 
+
             if (resources.configuration.locales.get(0)
                     .language.equals("zh", true)
             ) {
@@ -86,6 +109,18 @@ class SupportActivity : BaseActivity() {
                     }
                 }
             }
+
+            option(
+                title = getString(R.string.mod_clashr_text),
+                summary = getString(R.string.mod_clashr_url)
+            ) {
+                onClick {
+                    startActivity(
+                        Intent(Intent.ACTION_VIEW)
+                            .setData(Uri.parse(getString(R.string.mod_clashr_url)))
+                    )
+                }
+            }
         }
     }
 }
diff --git a/app/src/main/res/values-zh/strings.xml b/app/src/main/res/values-zh/strings.xml
@@ -125,7 +125,7 @@
     <string name="github_issues">Github Issues</string>
     <string name="format_seconds">%d 秒</string>
     <string name="copied">已复制</string>
-    <string name="tips_profile"><![CDATA[仅接受 <strong>Clash 配置文件</strong> <br />其中包含了 <strong>代理, 代理组 和 规则</strong>]]></string>
+    <string name="tips_profile"><![CDATA[仅接受 <strong>Clash/ClashR 配置文件</strong> <br />其中包含了 <strong>代理, 代理组 和 规则</strong>]]></string>
     <string name="application_broken_description"><![CDATA[这通常意味着您使用来自 <strong>Google Play</strong> 的副本, 但是生成该副本的应用未能正确处理 <strong>分包机制</strong><br />这意味着您获取的是 <strong>应用的一部分</strong>]]></string>
     <string name="learn_more_about_split_apks">了解更多关于分包机制</string>
     <string name="reinstall_from_google_play">重新从 Google Play 安装</string>

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -117,7 +117,7 @@
 
     <string name="route_system_traffic">Route System Traffic</string>
     <string name="routing_via_vpn_service">Routing all system traffic via VpnService</string>
-    
+
     <string name="vpn_service">VPN Service</string>
     <string name="ipv6">IPv6</string>
     <string name="enable_ipv6">Enable IPv6 support (not recommend)</string>
@@ -148,9 +148,13 @@
 
     <string name="sources">Sources</string>
     <string name="clash">Clash</string>
+    <string name="clashr">ClashR</string>
     <string name="clash_for_android">Clash for Android</string>
+    <string name="clashr_for_android">ClashR for Android</string>
+    <string name="clashr_url" translatable="false">https://github.com/sh4d0wfiend/clash</string>
     <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="clashr_for_android_url" translatable="false">https://github.com/naicfeng/ClashRForAndroid</string>
 
     <string name="contacts">Contacts</string>
     <string name="email">E-Mail</string>
@@ -159,8 +163,10 @@
     <string name="email_url" translatable="false">[email protected]</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="mod_clashr_text">Change to ClashR</string>
+    <string name="mod_clashr_url" translatable="false">https://cuojue.org</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_profile"><![CDATA[Accept Only <strong>Clash/ClashR Config</strong> which contains <br /><strong>Proxies, Proxy Groups and Rules</strong>]]></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>