Skip to content

Commit d638b6f

Browse files
naicfengnaicfeng
committed
fix ci
1 parent 013b10b commit d638b6f

File tree

3 files changed

+44
-3
lines changed

3 files changed

+44
-3
lines changed

‎app/src/main/java/com/github/kr328/clash/SupportActivity.kt

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,17 @@ class SupportActivity : BaseActivity() {
3333
)
3434
}
3535
}
36+
option(
37+
title = getString(R.string.clashr),
38+
summary = getString(R.string.clashr_url)
39+
) {
40+
onClick {
41+
startActivity(
42+
Intent(Intent.ACTION_VIEW)
43+
.setData(Uri.parse(getString(R.string.clashr_url)))
44+
)
45+
}
46+
}
3647
option(
3748
title = getString(R.string.clash_for_android),
3849
summary = getString(R.string.clash_for_android_url)
@@ -44,6 +55,17 @@ class SupportActivity : BaseActivity() {
4455
)
4556
}
4657
}
58+
option(
59+
title = getString(R.string.clashr_for_android),
60+
summary = getString(R.string.clashr_for_android_url)
61+
) {
62+
onClick {
63+
startActivity(
64+
Intent(Intent.ACTION_VIEW)
65+
.setData(Uri.parse(getString(R.string.clashr_for_android_url)))
66+
)
67+
}
68+
}
4769

4870
category(text = getString(R.string.contacts))
4971

@@ -71,6 +93,7 @@ class SupportActivity : BaseActivity() {
7193
}
7294
}
7395

96+
7497
if (resources.configuration.locales.get(0)
7598
.language.equals("zh", true)
7699
) {
@@ -86,6 +109,18 @@ class SupportActivity : BaseActivity() {
86109
}
87110
}
88111
}
112+
113+
option(
114+
title = getString(R.string.mod_clashr_text),
115+
summary = getString(R.string.mod_clashr_url)
116+
) {
117+
onClick {
118+
startActivity(
119+
Intent(Intent.ACTION_VIEW)
120+
.setData(Uri.parse(getString(R.string.mod_clashr_url)))
121+
)
122+
}
123+
}
89124
}
90125
}
91126
}

‎app/src/main/res/values-zh/strings.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@
125125
<string name="github_issues">Github Issues</string>
126126
<string name="format_seconds">%d 秒</string>
127127
<string name="copied">已复制</string>
128-
<string name="tips_profile"><![CDATA[仅接受 <strong>Clash 配置文件</strong> <br />其中包含了 <strong>代理, 代理组 和 规则</strong>]]></string>
128+
<string name="tips_profile"><![CDATA[仅接受 <strong>Clash/ClashR 配置文件</strong> <br />其中包含了 <strong>代理, 代理组 和 规则</strong>]]></string>
129129
<string name="application_broken_description"><![CDATA[这通常意味着您使用来自 <strong>Google Play</strong> 的副本, 但是生成该副本的应用未能正确处理 <strong>分包机制</strong><br />这意味着您获取的是 <strong>应用的一部分</strong>]]></string>
130130
<string name="learn_more_about_split_apks">了解更多关于分包机制</string>
131131
<string name="reinstall_from_google_play">重新从 Google Play 安装</string>

‎app/src/main/res/values/strings.xml

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@
117117

118118
<string name="route_system_traffic">Route System Traffic</string>
119119
<string name="routing_via_vpn_service">Routing all system traffic via VpnService</string>
120-
120+
121121
<string name="vpn_service">VPN Service</string>
122122
<string name="ipv6">IPv6</string>
123123
<string name="enable_ipv6">Enable IPv6 support (not recommend)</string>
@@ -148,9 +148,13 @@
148148

149149
<string name="sources">Sources</string>
150150
<string name="clash">Clash</string>
151+
<string name="clashr">ClashR</string>
151152
<string name="clash_for_android">Clash for Android</string>
153+
<string name="clashr_for_android">ClashR for Android</string>
154+
<string name="clashr_url" translatable="false">https://github.com/sh4d0wfiend/clash</string>
152155
<string name="clash_url" translatable="false">https://github.com/Dreamacro/clash</string>
153156
<string name="clash_for_android_url" translatable="false">https://github.com/Kr328/ClashForAndroid</string>
157+
<string name="clashr_for_android_url" translatable="false">https://github.com/naicfeng/ClashRForAndroid</string>
154158

155159
<string name="contacts">Contacts</string>
156160
<string name="email">E-Mail</string>
@@ -159,8 +163,10 @@
159163
<string name="email_url" translatable="false">kr328app@outlook.com</string>
160164
<string name="github_issues_url" translatable="false">https://github.com/Kr328/ClashForAndroid/issues</string>
161165
<string name="telegram_channel_url" translatable="false">https://t.me/clash_for_android_channel</string>
166+
<string name="mod_clashr_text">Change to ClashR</string>
167+
<string name="mod_clashr_url" translatable="false">https://cuojue.org</string>
162168

163-
<string name="tips_profile"><![CDATA[Accept Only <strong>Clash Config</strong> which contains <br /><strong>Proxies, Proxy Groups and Rules</strong>]]></string>
169+
<string name="tips_profile"><![CDATA[Accept Only <strong>Clash/ClashR Config</strong> which contains <br /><strong>Proxies, Proxy Groups and Rules</strong>]]></string>
164170

165171
<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>
166172
<string name="learn_more_about_split_apks">Learn more about Split Apks</string>

0 commit comments

Comments
 (0)