Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
C
com.ccwangluo.accelerator
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
sheteng
com.ccwangluo.accelerator
Commits
4f412318
Commit
4f412318
authored
Dec 28, 2016
by
Max Lv
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Update localizations
parent
3ce7f7e9
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
18 additions
and
4 deletions
+18
-4
src/main/res/values-zh-rCN/strings.xml
src/main/res/values-zh-rCN/strings.xml
+4
-0
src/main/res/values-zh-rTW/strings.xml
src/main/res/values-zh-rTW/strings.xml
+5
-0
src/main/res/values/strings.xml
src/main/res/values/strings.xml
+5
-0
src/main/scala/com/github/shadowsocks/MainActivity.scala
src/main/scala/com/github/shadowsocks/MainActivity.scala
+4
-4
No files found.
src/main/res/values-zh-rCN/strings.xml
View file @
4f412318
...
@@ -134,6 +134,10 @@
...
@@ -134,6 +134,10 @@
<!-- status -->
<!-- status -->
<string
name=
"sent"
>
发送:
</string>
<string
name=
"sent"
>
发送:
</string>
<string
name=
"received"
>
接收:
</string>
<string
name=
"received"
>
接收:
</string>
<string
name=
"vpn_connected"
>
已连接, 轻触以检查连接状态
</string>
<string
name=
"nat_connected"
>
已连接
</string>
<string
name=
"not_connected"
>
未连接
</string>
<string
name=
"shutting_down"
>
关闭连接中...
</string>
<!-- kcp -->
<!-- kcp -->
<string
name=
"kcp_summary"
>
启用 KCP 协议
</string>
<string
name=
"kcp_summary"
>
启用 KCP 协议
</string>
...
...
src/main/res/values-zh-rTW/strings.xml
View file @
4f412318
...
@@ -136,6 +136,11 @@
...
@@ -136,6 +136,11 @@
<!-- status -->
<!-- status -->
<string
name=
"sent"
>
傳送:
</string>
<string
name=
"sent"
>
傳送:
</string>
<string
name=
"received"
>
接收:
</string>
<string
name=
"received"
>
接收:
</string>
<string
name=
"connecting"
>
連線中...
</string>
<string
name=
"vpn_connected"
>
已連線, 輕觸以檢查連線能力
</string>
<string
name=
"nat_connected"
>
已連線
</string>
<string
name=
"not_connected"
>
未連線
</string>
<string
name=
"shutting_down"
>
關閉連線中...
</string>
<!-- kcp -->
<!-- kcp -->
<string
name=
"kcp_summary"
>
啟用 KCP 協定
</string>
<string
name=
"kcp_summary"
>
啟用 KCP 協定
</string>
...
...
src/main/res/values/strings.xml
View file @
4f412318
...
@@ -146,6 +146,11 @@
...
@@ -146,6 +146,11 @@
<!-- status -->
<!-- status -->
<string
name=
"sent"
>
Sent:
</string>
<string
name=
"sent"
>
Sent:
</string>
<string
name=
"received"
>
Received:
</string>
<string
name=
"received"
>
Received:
</string>
<string
name=
"connecting"
>
Connecting...
</string>
<string
name=
"vpn_connected"
>
Connected, tap to check connection
</string>
<string
name=
"nat_connected"
>
Connected
</string>
<string
name=
"not_connected"
>
Not connected
</string>
<string
name=
"shutting_down"
>
Shutting down...
</string>
<!-- kcp -->
<!-- kcp -->
<string
name=
"kcp"
translatable=
"false"
>
KCP
</string>
<string
name=
"kcp"
translatable=
"false"
>
KCP
</string>
...
...
src/main/scala/com/github/shadowsocks/MainActivity.scala
View file @
4f412318
...
@@ -104,16 +104,16 @@ class MainActivity extends Activity with ServiceBoundContext with Drawer.OnDrawe
...
@@ -104,16 +104,16 @@ class MainActivity extends Activity with ServiceBoundContext with Drawer.OnDrawe
case
State
.
CONNECTING
=>
case
State
.
CONNECTING
=>
fab
.
setImageResource
(
R
.
drawable
.
ic_start_busy
)
fab
.
setImageResource
(
R
.
drawable
.
ic_start_busy
)
fabProgressCircle
.
show
()
fabProgressCircle
.
show
()
statusText
.
setText
(
"Connecting..."
)
statusText
.
setText
(
R
.
string
.
connecting
)
case
State
.
CONNECTED
=>
case
State
.
CONNECTED
=>
if
(
state
==
State
.
CONNECTING
)
fabProgressCircle
.
beginFinalAnimation
()
if
(
state
==
State
.
CONNECTING
)
fabProgressCircle
.
beginFinalAnimation
()
else
fabProgressCircle
.
postDelayed
(
hideCircle
,
1000
)
else
fabProgressCircle
.
postDelayed
(
hideCircle
,
1000
)
fab
.
setImageResource
(
R
.
drawable
.
ic_start_connected
)
fab
.
setImageResource
(
R
.
drawable
.
ic_start_connected
)
statusText
.
setText
(
if
(
app
.
isNatEnabled
)
"Connected"
else
"Connected, tap to check connection"
)
statusText
.
setText
(
if
(
app
.
isNatEnabled
)
R
.
string
.
nat_connected
else
R
.
string
.
vpn_connected
)
case
State
.
STOPPING
=>
case
State
.
STOPPING
=>
fab
.
setImageResource
(
R
.
drawable
.
ic_start_busy
)
fab
.
setImageResource
(
R
.
drawable
.
ic_start_busy
)
if
(
state
==
State
.
CONNECTED
)
fabProgressCircle
.
show
()
// ignore for stopped
if
(
state
==
State
.
CONNECTED
)
fabProgressCircle
.
show
()
// ignore for stopped
statusText
.
setText
(
"Shutting down..."
)
statusText
.
setText
(
R
.
string
.
shutting_down
)
case
_
=>
case
_
=>
fab
.
setImageResource
(
R
.
drawable
.
ic_start_idle
)
fab
.
setImageResource
(
R
.
drawable
.
ic_start_idle
)
fabProgressCircle
.
postDelayed
(
hideCircle
,
1000
)
fabProgressCircle
.
postDelayed
(
hideCircle
,
1000
)
...
@@ -124,7 +124,7 @@ class MainActivity extends Activity with ServiceBoundContext with Drawer.OnDrawe
...
@@ -124,7 +124,7 @@ class MainActivity extends Activity with ServiceBoundContext with Drawer.OnDrawe
snackbar
.
show
()
snackbar
.
show
()
Log
.
e
(
TAG
,
"Error to start VPN service: "
+
m
)
Log
.
e
(
TAG
,
"Error to start VPN service: "
+
m
)
}
}
statusText
.
setText
(
"Not connected"
)
statusText
.
setText
(
R
.
string
.
not_connected
)
}
}
state
=
s
state
=
s
if
(
state
==
State
.
CONNECTED
)
fab
.
setBackgroundTintList
(
greenTint
)
else
{
if
(
state
==
State
.
CONNECTED
)
fab
.
setBackgroundTintList
(
greenTint
)
else
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment