Skip to content

Commit 7a422e5

Browse files
PeratXPeratX
committed
Improved service listening & updated about page
1 parent f8b82fd commit 7a422e5

File tree

10 files changed

+34
-38
lines changed

10 files changed

+34
-38
lines changed

app/src/main/assets/cutedns_logo.png renamed to app/src/main/assets/about_html/cutedns_logo.png

File renamed without changes.

app/src/main/assets/ic_launcher.png renamed to app/src/main/assets/about_html/ic_launcher.png

File renamed without changes.

app/src/main/assets/index.html renamed to app/src/main/assets/about_html/index.html

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -12,19 +12,17 @@
1212

1313
<script type="text/javascript">
1414
function changeVersionInfo(version, time, gitCommit) {
15-
document.getElementById("version").innerHTML = "版本: " + version;
16-
document.getElementById("build_time").innerHTML = "构建时间：" + time;
17-
document.getElementById("git_commit").innerHTML = "Git commit：" + gitCommit;
15+
document.getElementById("version").innerHTML = "Version: " + version;
16+
document.getElementById("build_time").innerHTML = "Build time: " + time;
17+
document.getElementById("git_commit").innerHTML = "Git commit: " + gitCommit;
1818
}
1919
</script>
2020

2121
<body>
22-
<img width="100" height="100" src="itxtech_logo.png"/>
23-
<br>
22+
<img width="100" height="100" src="itxtech_logo.png"/><br>
2423
<div style="font-size:25px">iTX Technologies</div>
2524
<br>
26-
<img width="92" height="70" src="ic_launcher.png">
27-
<br>
25+
<img width="92" height="70" src="ic_launcher.png"><br>
2826
<div style="font-size: 25px;">Daedalus</div>
2927
<div id="version" style="font-size: 10px;">null</div>
3028
<div id="build_time" style="font-size: 10px;">null</div>
@@ -33,8 +31,9 @@
3331
<img width="185" height="55" src="cutedns_logo.png">
3432
<div style="font-size: 25px;">CuteDNS!</div>
3533
<br>
36-
<div style="font-size: 10px; color: gray;">
37-
Users must comply with local laws and regulations。<br>
34+
<br>
35+
<div style="font-size: 12px; color: gray;">
36+
Users must comply with local laws and regulations.<br>
3837
Welcome to CuteDNS! QQ Group: 625385297.<br>
3938
Open the menu to explore more features.
4039
</div>

app/src/main/assets/index_zh.html renamed to app/src/main/assets/about_html/index_zh.html

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,19 +12,17 @@
1212

1313
<script type="text/javascript">
1414
function changeVersionInfo(version, time, gitCommit) {
15-
document.getElementById("version").innerHTML = "版本: " + version;
15+
document.getElementById("version").innerHTML = "版本：" + version;
1616
document.getElementById("build_time").innerHTML = "构建时间：" + time;
1717
document.getElementById("git_commit").innerHTML = "Git commit：" + gitCommit;
1818
}
1919
</script>
2020

2121
<body>
22-
<img width="100" height="100" src="itxtech_logo.png"/>
23-
<br>
22+
<img width="100" height="100" src="itxtech_logo.png"/><br>
2423
<div style="font-size:25px">iTX Technologies</div>
2524
<br>
26-
<img width="92" height="70" src="ic_launcher.png">
27-
<br>
25+
<img width="92" height="70" src="ic_launcher.png"><br>
2826
<div style="font-size: 25px;">Daedalus</div>
2927
<div id="version" style="font-size: 10px;">null</div>
3028
<div id="build_time" style="font-size: 10px;">null</div>
@@ -33,7 +31,8 @@
3331
<img width="185" height="55" src="cutedns_logo.png">
3432
<div style="font-size: 25px;">CuteDNS!</div>
3533
<br>
36-
<div style="font-size: 10px; color: gray;">
34+
<br>
35+
<div style="font-size: 12px; color: gray;">
3736
使用者必须遵守当地法律法规。<br>
3837
欢迎加入 CuteDNS! QQ群：625385297 。<br>
3938
打开菜单探索更多功能。

app/src/main/assets/itxtech_logo.png renamed to app/src/main/assets/about_html/itxtech_logo.png

File renamed without changes.

‎app/src/main/java/org/itxtech/daedalus/AboutActivity.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,9 +47,9 @@ public boolean onLongClick(View view) {
4747
});
4848

4949
if (Locale.getDefault().getLanguage().equals("zh")) {
50-
view.loadUrl("file:///android_asset/index_zh.html");
50+
view.loadUrl("file:///android_asset/about_html/index_zh.html");
5151
} else {
52-
view.loadUrl("file:///android_asset/index.html");
52+
view.loadUrl("file:///android_asset/about_html/index.html");
5353
}
5454

5555
view.setWebViewClient(new WebViewClient() {

‎app/src/main/java/org/itxtech/daedalus/MainActivity.java‎

Lines changed: 11 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@
2727
* the Free Software Foundation, version 3.
2828
*/
2929
public class MainActivity extends AppCompatActivity {
30-
private boolean serviceActivated = false;
3130
private SharedPreferences prefs;
3231

3332
@Override
@@ -36,7 +35,6 @@ protected void onCreate(Bundle savedInstanceState) {
3635

3736
initConfig();
3837

39-
serviceActivated = isServiceActivated();
4038
setContentView(R.layout.activity_main);
4139
Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar);
4240
setSupportActionBar(toolbar);
@@ -51,21 +49,19 @@ public void onClick(View v) {
5149
});
5250

5351
final Button but = (Button) findViewById(R.id.button_activate);
54-
if (serviceActivated) {
55-
but.setText(R.string.deactivate);
52+
if (isServiceActivated()) {
53+
but.setText(R.string.button_text_deactivate);
5654
} else {
57-
but.setText(R.string.activate);
55+
but.setText(R.string.button_text_activate);
5856
}
5957
but.setOnClickListener(new View.OnClickListener() {
6058
@Override
6159
public void onClick(View v) {
62-
serviceActivated = isServiceActivated();
63-
if (serviceActivated) {
60+
if (isServiceActivated()) {
61+
but.setText(R.string.button_text_activate);
6462
deactivateService();
65-
but.setText(R.string.activate);
6663
} else {
6764
activateService();
68-
but.setText(R.string.deactivate);
6965
}
7066
}
7167
});
@@ -76,11 +72,10 @@ protected void onRestart() {
7672
super.onRestart();
7773

7874
final Button but = (Button) findViewById(R.id.button_activate);
79-
serviceActivated = isServiceActivated();
80-
if (serviceActivated) {
81-
but.setText(R.string.deactivate);
75+
if (isServiceActivated()) {
76+
but.setText(R.string.button_text_deactivate);
8277
} else {
83-
but.setText(R.string.activate);
78+
but.setText(R.string.button_text_activate);
8479
NotificationManager notificationManager = (NotificationManager) this.getSystemService(Context.NOTIFICATION_SERVICE);
8580
notificationManager.cancelAll();
8681
}
@@ -126,6 +121,9 @@ protected void onActivityResult(int request, int result, Intent data) {
126121
DaedalusVpnService.secondaryServer = DnsServers.getDnsServerAddress(prefs.getString("secondary_server", "1"));
127122

128123
startService(getServiceIntent().setAction(DaedalusVpnService.ACTION_ACTIVATE));
124+
125+
126+
((Button) findViewById(R.id.button_activate)).setText(R.string.button_text_deactivate);
129127
}
130128
}
131129

‎app/src/main/res/layout/content_main.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,15 +34,15 @@
3434
android:textAppearance="@android:style/TextAppearance.Material" android:fontFamily="sans-serif"
3535
android:layout_centerHorizontal="true" android:id="@+id/textView_app_name"/>
3636
<TextView
37-
android:text="@string/notice"
37+
android:text="@string/notice_main"
3838
android:layout_width="wrap_content"
3939
android:layout_height="wrap_content"
4040
android:id="@+id/textView_notice"
4141
app:layout_marginTopPercent="5%"
4242
android:textAppearance="@android:style/TextAppearance.Material" android:fontFamily="sans-serif"
4343
android:layout_below="@+id/textView_app_name" android:layout_centerHorizontal="true"/>
4444
<Button
45-
android:text="@string/activate"
45+
android:text="@string/button_text_activate"
4646
android:textSize="15sp"
4747
android:layout_width="wrap_content"
4848
android:layout_height="wrap_content"

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22
<resources>
33
<string name="app_name">Daedalus</string>
44
<string name="action_settings">设置</string>
5-
<string name="notice">方便易用的基于 CuteDNS 的科学上网工具。</string>
6-
<string name="activate">启用</string>
7-
<string name="deactivate">停用</string>
5+
<string name="notice_main">通过 CuteDNS! 去看看外面的世界。</string>
6+
<string name="button_text_activate">启用</string>
7+
<string name="button_text_deactivate">停用</string>
88
<string name="action_about">关于</string>
99
<string name="notification_activated">点击回到 Daedalus</string>
1010
<string name="settings_system">系统设置</string>

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
<resources>
22
<string name="app_name">Daedalus</string>
33
<string name="action_settings">Settings</string>
4-
<string name="notice">The CuteDNS implementation on Android.</string>
5-
<string name="activate">Activate</string>
6-
<string name="deactivate">Deactivate</string>
4+
<string name="notice_main">Through CuteDNS! to see the world outside.</string>
5+
<string name="button_text_activate">Activate</string>
6+
<string name="button_text_deactivate">Deactivate</string>
77
<string name="action_about">About</string>
88
<string name="notification_activated">Click to back to Daedalus</string>
99
<string name="settings_system">System settings</string>

0 commit comments

Comments
 (0)