From 7a422e53b0522df09136a13b484b5beed409c08c Mon Sep 17 00:00:00 2001 From: PeratX <1215714524@qq.com> Date: Sat, 8 Apr 2017 13:51:20 +0800 Subject: [PATCH] Improved service listening & updated about page --- .../assets/{ => about_html}/cutedns_logo.png | Bin .../assets/{ => about_html}/ic_launcher.png | Bin .../main/assets/{ => about_html}/index.html | 17 ++++++------- .../assets/{ => about_html}/index_zh.html | 11 ++++---- .../assets/{ => about_html}/itxtech_logo.png | Bin .../org/itxtech/daedalus/AboutActivity.java | 4 +-- .../org/itxtech/daedalus/MainActivity.java | 24 ++++++++---------- app/src/main/res/layout/content_main.xml | 4 +-- app/src/main/res/values-zh/strings.xml | 6 ++--- app/src/main/res/values/strings.xml | 6 ++--- 10 files changed, 34 insertions(+), 38 deletions(-) rename app/src/main/assets/{ => about_html}/cutedns_logo.png (100%) rename app/src/main/assets/{ => about_html}/ic_launcher.png (100%) rename app/src/main/assets/{ => about_html}/index.html (68%) rename app/src/main/assets/{ => about_html}/index_zh.html (81%) rename app/src/main/assets/{ => about_html}/itxtech_logo.png (100%) diff --git a/app/src/main/assets/cutedns_logo.png b/app/src/main/assets/about_html/cutedns_logo.png similarity index 100% rename from app/src/main/assets/cutedns_logo.png rename to app/src/main/assets/about_html/cutedns_logo.png diff --git a/app/src/main/assets/ic_launcher.png b/app/src/main/assets/about_html/ic_launcher.png similarity index 100% rename from app/src/main/assets/ic_launcher.png rename to app/src/main/assets/about_html/ic_launcher.png diff --git a/app/src/main/assets/index.html b/app/src/main/assets/about_html/index.html similarity index 68% rename from app/src/main/assets/index.html rename to app/src/main/assets/about_html/index.html index e9eb431..70c19d3 100644 --- a/app/src/main/assets/index.html +++ b/app/src/main/assets/about_html/index.html @@ -12,19 +12,17 @@ - -
+
iTX Technologies

- -
+
Daedalus
null
null
@@ -33,8 +31,9 @@
CuteDNS!

-
- Users must comply with local laws and regulations。
+
+
+ Users must comply with local laws and regulations.
Welcome to CuteDNS! QQ Group: 625385297.
Open the menu to explore more features.
diff --git a/app/src/main/assets/index_zh.html b/app/src/main/assets/about_html/index_zh.html similarity index 81% rename from app/src/main/assets/index_zh.html rename to app/src/main/assets/about_html/index_zh.html index 5de0767..ec8d82e 100644 --- a/app/src/main/assets/index_zh.html +++ b/app/src/main/assets/about_html/index_zh.html @@ -12,19 +12,17 @@ - -
+
iTX Technologies

- -
+
Daedalus
null
null
@@ -33,7 +31,8 @@
CuteDNS!

-
+
+
使用者必须遵守当地法律法规。
欢迎加入 CuteDNS! QQ群：625385297 。
打开菜单探索更多功能。 diff --git a/app/src/main/assets/itxtech_logo.png b/app/src/main/assets/about_html/itxtech_logo.png similarity index 100% rename from app/src/main/assets/itxtech_logo.png rename to app/src/main/assets/about_html/itxtech_logo.png diff --git a/app/src/main/java/org/itxtech/daedalus/AboutActivity.java b/app/src/main/java/org/itxtech/daedalus/AboutActivity.java index f72d8fc..0437366 100644 --- a/app/src/main/java/org/itxtech/daedalus/AboutActivity.java +++ b/app/src/main/java/org/itxtech/daedalus/AboutActivity.java @@ -47,9 +47,9 @@ public class AboutActivity extends AppCompatActivity { }); if (Locale.getDefault().getLanguage().equals("zh")) { - view.loadUrl("file:///android_asset/index_zh.html"); + view.loadUrl("file:///android_asset/about_html/index_zh.html"); } else { - view.loadUrl("file:///android_asset/index.html"); + view.loadUrl("file:///android_asset/about_html/index.html"); } view.setWebViewClient(new WebViewClient() { diff --git a/app/src/main/java/org/itxtech/daedalus/MainActivity.java b/app/src/main/java/org/itxtech/daedalus/MainActivity.java index 85ff9fa..367cca1 100644 --- a/app/src/main/java/org/itxtech/daedalus/MainActivity.java +++ b/app/src/main/java/org/itxtech/daedalus/MainActivity.java @@ -27,7 +27,6 @@ import android.widget.Button; * the Free Software Foundation, version 3. */ public class MainActivity extends AppCompatActivity { - private boolean serviceActivated = false; private SharedPreferences prefs; @Override @@ -36,7 +35,6 @@ public class MainActivity extends AppCompatActivity { initConfig(); - serviceActivated = isServiceActivated(); setContentView(R.layout.activity_main); Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar); setSupportActionBar(toolbar); @@ -51,21 +49,19 @@ public class MainActivity extends AppCompatActivity { }); final Button but = (Button) findViewById(R.id.button_activate); - if (serviceActivated) { - but.setText(R.string.deactivate); + if (isServiceActivated()) { + but.setText(R.string.button_text_deactivate); } else { - but.setText(R.string.activate); + but.setText(R.string.button_text_activate); } but.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - serviceActivated = isServiceActivated(); - if (serviceActivated) { + if (isServiceActivated()) { + but.setText(R.string.button_text_activate); deactivateService(); - but.setText(R.string.activate); } else { activateService(); - but.setText(R.string.deactivate); } } }); @@ -76,11 +72,10 @@ public class MainActivity extends AppCompatActivity { super.onRestart(); final Button but = (Button) findViewById(R.id.button_activate); - serviceActivated = isServiceActivated(); - if (serviceActivated) { - but.setText(R.string.deactivate); + if (isServiceActivated()) { + but.setText(R.string.button_text_deactivate); } else { - but.setText(R.string.activate); + but.setText(R.string.button_text_activate); NotificationManager notificationManager = (NotificationManager) this.getSystemService(Context.NOTIFICATION_SERVICE); notificationManager.cancelAll(); } @@ -126,6 +121,9 @@ public class MainActivity extends AppCompatActivity { DaedalusVpnService.secondaryServer = DnsServers.getDnsServerAddress(prefs.getString("secondary_server", "1")); startService(getServiceIntent().setAction(DaedalusVpnService.ACTION_ACTIVATE)); + + + ((Button) findViewById(R.id.button_activate)).setText(R.string.button_text_deactivate); } } diff --git a/app/src/main/res/layout/content_main.xml b/app/src/main/res/layout/content_main.xml index 9f580ee..e4cd884 100644 --- a/app/src/main/res/layout/content_main.xml +++ b/app/src/main/res/layout/content_main.xml @@ -34,7 +34,7 @@ android:textAppearance="@android:style/TextAppearance.Material" android:fontFamily="sans-serif" android:layout_centerHorizontal="true" android:id="@+id/textView_app_name"/>