update about page
This commit is contained in:
Max Lv
@@ -0,0 +1,291 @@
|
||||
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
|
||||
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
|
||||
<head>
|
||||
<title>MarkdownPad Document</title>
|
||||
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
|
||||
<style type="text/css">
|
||||
/* GitHub stylesheet for MarkdownPad (http://markdownpad.com) */
|
||||
/* Author: Nicolas Hery - http://nicolashery.com */
|
||||
/* Version: 29d1c5bc36da364ad5aa86946d420b7bbc54a253 */
|
||||
/* Source: https://github.com/nicolahery/markdownpad-github */
|
||||
|
||||
/* RESET
|
||||
=============================================================================*/
|
||||
|
||||
html, body, div, span, applet, object, iframe, h1, h2, h3, h4, h5, h6, p, blockquote, pre, a, abbr, acronym, address, big, cite, code, del, dfn, em, img, ins, kbd, q, s, samp, small, strike, strong, sub, sup, tt, var, b, u, i, center, dl, dt, dd, ol, ul, li, fieldset, form, label, legend, table, caption, tbody, tfoot, thead, tr, th, td, article, aside, canvas, details, embed, figure, figcaption, footer, header, hgroup, menu, nav, output, ruby, section, summary, time, mark, audio, video {
|
||||
margin: 0;
|
||||
padding: 0;
|
||||
border: 0;
|
||||
}
|
||||
|
||||
/* BODY
|
||||
=============================================================================*/
|
||||
|
||||
body {
|
||||
font-family: Helvetica, arial, freesans, clean, sans-serif;
|
||||
font-size: 14px;
|
||||
line-height: 1.6;
|
||||
color: #333;
|
||||
background-color: #fff;
|
||||
padding: 20px;
|
||||
max-width: 960px;
|
||||
margin: 0 auto;
|
||||
}
|
||||
|
||||
body>*:first-child {
|
||||
margin-top: 0 !important;
|
||||
}
|
||||
|
||||
body>*:last-child {
|
||||
margin-bottom: 0 !important;
|
||||
}
|
||||
|
||||
/* BLOCKS
|
||||
=============================================================================*/
|
||||
|
||||
p, blockquote, ul, ol, dl, table, pre {
|
||||
margin: 15px 0;
|
||||
}
|
||||
|
||||
/* HEADERS
|
||||
=============================================================================*/
|
||||
|
||||
h1, h2, h3, h4, h5, h6 {
|
||||
margin: 20px 0 10px;
|
||||
padding: 0;
|
||||
font-weight: bold;
|
||||
-webkit-font-smoothing: antialiased;
|
||||
}
|
||||
|
||||
h1 tt, h1 code, h2 tt, h2 code, h3 tt, h3 code, h4 tt, h4 code, h5 tt, h5 code, h6 tt, h6 code {
|
||||
font-size: inherit;
|
||||
}
|
||||
|
||||
h1 {
|
||||
font-size: 28px;
|
||||
color: #000;
|
||||
}
|
||||
|
||||
h2 {
|
||||
font-size: 24px;
|
||||
border-bottom: 1px solid #ccc;
|
||||
color: #000;
|
||||
}
|
||||
|
||||
h3 {
|
||||
font-size: 18px;
|
||||
}
|
||||
|
||||
h4 {
|
||||
font-size: 16px;
|
||||
}
|
||||
|
||||
h5 {
|
||||
font-size: 14px;
|
||||
}
|
||||
|
||||
h6 {
|
||||
color: #777;
|
||||
font-size: 14px;
|
||||
}
|
||||
|
||||
body>h2:first-child, body>h1:first-child, body>h1:first-child+h2, body>h3:first-child, body>h4:first-child, body>h5:first-child, body>h6:first-child {
|
||||
margin-top: 0;
|
||||
padding-top: 0;
|
||||
}
|
||||
|
||||
a:first-child h1, a:first-child h2, a:first-child h3, a:first-child h4, a:first-child h5, a:first-child h6 {
|
||||
margin-top: 0;
|
||||
padding-top: 0;
|
||||
}
|
||||
|
||||
h1+p, h2+p, h3+p, h4+p, h5+p, h6+p {
|
||||
margin-top: 10px;
|
||||
}
|
||||
|
||||
/* LINKS
|
||||
=============================================================================*/
|
||||
|
||||
a {
|
||||
color: #4183C4;
|
||||
text-decoration: none;
|
||||
}
|
||||
|
||||
a:hover {
|
||||
text-decoration: underline;
|
||||
}
|
||||
|
||||
/* LISTS
|
||||
=============================================================================*/
|
||||
|
||||
ul, ol {
|
||||
padding-left: 30px;
|
||||
}
|
||||
|
||||
ul li > :first-child,
|
||||
ol li > :first-child,
|
||||
ul li ul:first-of-type,
|
||||
ol li ol:first-of-type,
|
||||
ul li ol:first-of-type,
|
||||
ol li ul:first-of-type {
|
||||
margin-top: 0px;
|
||||
}
|
||||
|
||||
ul ul, ul ol, ol ol, ol ul {
|
||||
margin-bottom: 0;
|
||||
}
|
||||
|
||||
dl {
|
||||
padding: 0;
|
||||
}
|
||||
|
||||
dl dt {
|
||||
font-size: 14px;
|
||||
font-weight: bold;
|
||||
font-style: italic;
|
||||
padding: 0;
|
||||
margin: 15px 0 5px;
|
||||
}
|
||||
|
||||
dl dt:first-child {
|
||||
padding: 0;
|
||||
}
|
||||
|
||||
dl dt>:first-child {
|
||||
margin-top: 0px;
|
||||
}
|
||||
|
||||
dl dt>:last-child {
|
||||
margin-bottom: 0px;
|
||||
}
|
||||
|
||||
dl dd {
|
||||
margin: 0 0 15px;
|
||||
padding: 0 15px;
|
||||
}
|
||||
|
||||
dl dd>:first-child {
|
||||
margin-top: 0px;
|
||||
}
|
||||
|
||||
dl dd>:last-child {
|
||||
margin-bottom: 0px;
|
||||
}
|
||||
|
||||
/* CODE
|
||||
=============================================================================*/
|
||||
|
||||
pre, code, tt {
|
||||
font-size: 12px;
|
||||
font-family: Consolas, "Liberation Mono", Courier, monospace;
|
||||
}
|
||||
|
||||
code, tt {
|
||||
margin: 0 0px;
|
||||
padding: 0px 0px;
|
||||
white-space: nowrap;
|
||||
border: 1px solid #eaeaea;
|
||||
background-color: #f8f8f8;
|
||||
border-radius: 3px;
|
||||
}
|
||||
|
||||
pre>code {
|
||||
margin: 0;
|
||||
padding: 0;
|
||||
white-space: pre;
|
||||
border: none;
|
||||
background: transparent;
|
||||
}
|
||||
|
||||
pre {
|
||||
background-color: #f8f8f8;
|
||||
border: 1px solid #ccc;
|
||||
font-size: 13px;
|
||||
line-height: 19px;
|
||||
overflow: auto;
|
||||
padding: 6px 10px;
|
||||
border-radius: 3px;
|
||||
}
|
||||
|
||||
pre code, pre tt {
|
||||
background-color: transparent;
|
||||
border: none;
|
||||
}
|
||||
|
||||
/* QUOTES
|
||||
=============================================================================*/
|
||||
|
||||
blockquote {
|
||||
border-left: 4px solid #DDD;
|
||||
padding: 0 15px;
|
||||
color: #777;
|
||||
}
|
||||
|
||||
blockquote>:first-child {
|
||||
margin-top: 0px;
|
||||
}
|
||||
|
||||
blockquote>:last-child {
|
||||
margin-bottom: 0px;
|
||||
}
|
||||
|
||||
/* HORIZONTAL RULES
|
||||
=============================================================================*/
|
||||
|
||||
hr {
|
||||
clear: both;
|
||||
margin: 15px 0;
|
||||
height: 0px;
|
||||
overflow: hidden;
|
||||
border: none;
|
||||
background: transparent;
|
||||
border-bottom: 4px solid #ddd;
|
||||
padding: 0;
|
||||
}
|
||||
|
||||
/* TABLES
|
||||
=============================================================================*/
|
||||
|
||||
table th {
|
||||
font-weight: bold;
|
||||
}
|
||||
|
||||
table th, table td {
|
||||
border: 1px solid #ccc;
|
||||
padding: 6px 13px;
|
||||
}
|
||||
|
||||
table tr {
|
||||
border-top: 1px solid #ccc;
|
||||
background-color: #fff;
|
||||
}
|
||||
|
||||
table tr:nth-child(2n) {
|
||||
background-color: #f8f8f8;
|
||||
}
|
||||
|
||||
/* IMAGES
|
||||
=============================================================================*/
|
||||
|
||||
img {
|
||||
max-width: 100%
|
||||
}
|
||||
</style>
|
||||
</head>
|
||||
<body>
|
||||
<p>A <a href="http://shadowsocks.org">Shadowsocks</a> client for Android, written in Scala.</p>
|
||||
<p>Copyright (C) 2013 Max Lv <a href="mailto:max.c.lv@gmail.com">max.c.lv@gmail.com</a></p>
|
||||
<p>This program is free software: you can redistribute it and/or modify
|
||||
it under the terms of the GNU General Public License as published by
|
||||
the Free Software Foundation, either version 3 of the License, or
|
||||
(at your option) any later version.</p>
|
||||
<p>This program is distributed in the hope that it will be useful,
|
||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
GNU General Public License for more details.</p>
|
||||
<p>You should have received a copy of the GNU General Public License
|
||||
along with this program. If not, see <a href="http://www.gnu.org/licenses/">http://www.gnu.org/licenses/</a>.</p>
|
||||
|
||||
</body>
|
||||
</html>
|
||||
<!-- This document was created with MarkdownPad, the Markdown editor for Windows (http://markdownpad.com) -->
|
||||
@@ -74,9 +74,9 @@
|
||||
<!-- menu category -->
|
||||
<string name="recovery">Reset</string>
|
||||
<string name="about">About</string>
|
||||
<string name="copy_rights">Shadowsocks is an open source socks proxy.\n\nYou can find more details
|
||||
here:\ngithub.com/shadowsocks
|
||||
</string>
|
||||
<string name="about_title">Shadowsocks %s</string>
|
||||
<string name="donate">Donate</string>
|
||||
<string name="donate_address">http://forum.xda-developers.com/donatetome.php?u=3604670</string>
|
||||
|
||||
|
||||
</resources>
|
||||
|
||||
@@ -67,7 +67,11 @@ import net.saik0.android.unifiedpreference.UnifiedPreferenceFragment
|
||||
import net.saik0.android.unifiedpreference.UnifiedSherlockPreferenceActivity
|
||||
import org.jraf.android.backport.switchwidget.Switch
|
||||
import android.content.pm.PackageManager
|
||||
import android.net.VpnService
|
||||
import android.net.{Uri, VpnService}
|
||||
import android.text.SpannableString
|
||||
import android.text.util.Linkify
|
||||
import android.text.method.LinkMovementMethod
|
||||
import android.webkit.{WebViewClient, WebView}
|
||||
|
||||
object Shadowsocks {
|
||||
val PREFS_NAME = "Shadowsocks"
|
||||
@@ -245,7 +249,7 @@ class Shadowsocks extends UnifiedSherlockPreferenceActivity with CompoundButton.
|
||||
|
||||
private def isTextEmpty(s: String, msg: String): Boolean = {
|
||||
if (s == null || s.length <= 0) {
|
||||
showAToast(msg)
|
||||
showDialog(msg)
|
||||
return true
|
||||
}
|
||||
false
|
||||
@@ -322,6 +326,7 @@ class Shadowsocks extends UnifiedSherlockPreferenceActivity with CompoundButton.
|
||||
override def onCreateOptionsMenu(menu: Menu): Boolean = {
|
||||
menu.add(0, 0, 0, R.string.recovery).setIcon(android.R.drawable.ic_menu_revert).setShowAsAction(MenuItem.SHOW_AS_ACTION_WITH_TEXT)
|
||||
menu.add(0, 1, 1, R.string.about).setIcon(android.R.drawable.ic_menu_info_details).setShowAsAction(MenuItem.SHOW_AS_ACTION_WITH_TEXT)
|
||||
menu.add(0, 2, 2, R.string.donate).setIcon(android.R.drawable.ic_menu_info_details).setShowAsAction(MenuItem.SHOW_AS_ACTION_WITH_TEXT)
|
||||
true
|
||||
}
|
||||
|
||||
@@ -344,16 +349,9 @@ class Shadowsocks extends UnifiedSherlockPreferenceActivity with CompoundButton.
|
||||
case 0 =>
|
||||
recovery()
|
||||
case 1 =>
|
||||
var versionName = ""
|
||||
try {
|
||||
versionName = getPackageManager.getPackageInfo(getPackageName, 0).versionName
|
||||
}
|
||||
catch {
|
||||
case ex: PackageManager.NameNotFoundException => {
|
||||
versionName = ""
|
||||
}
|
||||
}
|
||||
showAToast(getString(R.string.about) + " (" + versionName + ")\n\n" + getString(R.string.copy_rights))
|
||||
showAbout()
|
||||
case 2 =>
|
||||
startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse(getString(R.string.donate_address))))
|
||||
}
|
||||
super.onOptionsItemSelected(item)
|
||||
}
|
||||
@@ -548,13 +546,13 @@ class Shadowsocks extends UnifiedSherlockPreferenceActivity with CompoundButton.
|
||||
try {
|
||||
val port: Int = Integer.valueOf(portText)
|
||||
if (port <= 1024) {
|
||||
this.showAToast(getString(R.string.port_alert))
|
||||
this.showDialog(getString(R.string.port_alert))
|
||||
return false
|
||||
}
|
||||
}
|
||||
catch {
|
||||
case ex: Exception => {
|
||||
this.showAToast(getString(R.string.port_alert))
|
||||
this.showDialog(getString(R.string.port_alert))
|
||||
return false
|
||||
}
|
||||
}
|
||||
@@ -578,7 +576,36 @@ class Shadowsocks extends UnifiedSherlockPreferenceActivity with CompoundButton.
|
||||
true
|
||||
}
|
||||
|
||||
private def showAToast(msg: String) {
|
||||
private def showAbout() {
|
||||
|
||||
val web = new WebView(this)
|
||||
web.loadUrl("file:///android_asset/pages/about.html")
|
||||
web.setWebViewClient(new WebViewClient() {
|
||||
override def shouldOverrideUrlLoading(view: WebView, url: String): Boolean = {
|
||||
startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse(url)))
|
||||
true
|
||||
}
|
||||
})
|
||||
|
||||
var versionName = ""
|
||||
try {
|
||||
versionName = getPackageManager.getPackageInfo(getPackageName, 0).versionName
|
||||
} catch {
|
||||
case ex: PackageManager.NameNotFoundException => {
|
||||
versionName = ""
|
||||
}
|
||||
}
|
||||
|
||||
new AlertDialog.Builder(this).setTitle(getString(R.string.about_title).format(versionName))
|
||||
.setCancelable(false)
|
||||
.setNegativeButton(getString(R.string.ok_iknow), new DialogInterface.OnClickListener() {
|
||||
override def onClick(dialog: DialogInterface, id: Int) {
|
||||
dialog.cancel()
|
||||
}
|
||||
}).setView(web).create().show()
|
||||
}
|
||||
|
||||
private def showDialog(msg: String) {
|
||||
val builder: AlertDialog.Builder = new AlertDialog.Builder(this)
|
||||
builder.setMessage(msg).setCancelable(false).setNegativeButton(getString(R.string.ok_iknow), new DialogInterface.OnClickListener {
|
||||
def onClick(dialog: DialogInterface, id: Int) {
|
||||
|
||||
Reference in New Issue
Block a user