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
331434dc
Commit
331434dc
authored
Nov 23, 2015
by
Max Lv
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #443 from Mygod/master
Fix #441
parents
4686c7ff
da3690d1
Changes
7
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
52 additions
and
20 deletions
+52
-20
src/main/res/layout/layout_profiles.xml
src/main/res/layout/layout_profiles.xml
+9
-4
src/main/scala/com/github/shadowsocks/ProfileManagerActivity.scala
...scala/com/github/shadowsocks/ProfileManagerActivity.scala
+4
-3
src/main/scala/com/github/shadowsocks/Shadowsocks.scala
src/main/scala/com/github/shadowsocks/Shadowsocks.scala
+4
-8
src/main/scala/com/github/shadowsocks/ShadowsocksNatService.scala
.../scala/com/github/shadowsocks/ShadowsocksNatService.scala
+2
-2
src/main/scala/com/github/shadowsocks/ShadowsocksSettings.scala
...in/scala/com/github/shadowsocks/ShadowsocksSettings.scala
+2
-2
src/main/scala/com/github/shadowsocks/ShadowsocksVpnService.scala
.../scala/com/github/shadowsocks/ShadowsocksVpnService.scala
+1
-1
src/main/scala/com/github/shadowsocks/widget/AutoPaddingBehavior.scala
...a/com/github/shadowsocks/widget/AutoPaddingBehavior.scala
+30
-0
No files found.
src/main/res/layout/layout_profiles.xml
View file @
331434dc
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout
xmlns:android=
"http://schemas.android.com/apk/res/android"
<LinearLayout
xmlns:android=
"http://schemas.android.com/apk/res/android"
xmlns:app=
"http://schemas.android.com/apk/res-auto"
android:orientation=
"vertical"
android:orientation=
"vertical"
android:layout_width=
"match_parent"
android:layout_width=
"match_parent"
android:layout_height=
"match_parent"
>
android:layout_height=
"match_parent"
>
<include
layout=
"@layout/toolbar_light_dark"
/>
<include
layout=
"@layout/toolbar_light_dark"
/>
<android.support.v7.widget.RecyclerView
android:id=
"@+id/profilesList"
<android.support.design.widget.CoordinatorLayout
android:layout_width=
"match_parent"
android:layout_width=
"match_parent"
android:layout_height=
"0dp"
android:layout_height=
"0dp"
android:layout_weight=
"1"
>
android:layout_weight=
"1"
/>
<android.support.v7.widget.RecyclerView
android:id=
"@+id/profilesList"
app:layout_behavior=
"com.github.shadowsocks.widget.AutoPaddingBehavior"
android:layout_width=
"match_parent"
android:layout_height=
"match_parent"
/>
</android.support.design.widget.CoordinatorLayout>
</LinearLayout>
</LinearLayout>
src/main/scala/com/github/shadowsocks/ProfileManagerActivity.scala
View file @
331434dc
package
com.github.shadowsocks
package
com.github.shadowsocks
import
android.content.Intent
import
android.content.Intent
import
android.os.
Bundle
import
android.os.
{
Handler
,
Bundle
}
import
android.support.design.widget.Snackbar
import
android.support.design.widget.Snackbar
import
android.support.v7.app.
{
AlertDialog
,
AppCompatActivity
}
import
android.support.v7.app.
{
AlertDialog
,
AppCompatActivity
}
import
android.support.v7.widget.RecyclerView.ViewHolder
import
android.support.v7.widget.RecyclerView.ViewHolder
...
@@ -69,7 +69,7 @@ class ProfileManagerActivity extends AppCompatActivity with OnMenuItemClickListe
...
@@ -69,7 +69,7 @@ class ProfileManagerActivity extends AppCompatActivity with OnMenuItemClickListe
builder
.
setSpan
(
new
TextAppearanceSpan
(
ProfileManagerActivity
.
this
,
android
.
R
.
style
.
TextAppearance_Small
),
builder
.
setSpan
(
new
TextAppearanceSpan
(
ProfileManagerActivity
.
this
,
android
.
R
.
style
.
TextAppearance_Small
),
start
+
1
,
builder
.
length
,
Spanned
.
SPAN_EXCLUSIVE_EXCLUSIVE
)
start
+
1
,
builder
.
length
,
Spanned
.
SPAN_EXCLUSIVE_EXCLUSIVE
)
}
}
text
.
setText
(
builder
)
handler
.
post
(()
=>
text
.
setText
(
builder
)
)
}
}
def
bind
(
item
:
Profile
)
{
def
bind
(
item
:
Profile
)
{
...
@@ -129,6 +129,7 @@ class ProfileManagerActivity extends AppCompatActivity with OnMenuItemClickListe
...
@@ -129,6 +129,7 @@ class ProfileManagerActivity extends AppCompatActivity with OnMenuItemClickListe
}
}
private
var
selectedItem
:
ProfileViewHolder
=
_
private
var
selectedItem
:
ProfileViewHolder
=
_
private
val
handler
=
new
Handler
private
lazy
val
profilesAdapter
=
new
ProfilesAdapter
private
lazy
val
profilesAdapter
=
new
ProfilesAdapter
private
var
removedSnackbar
:
Snackbar
=
_
private
var
removedSnackbar
:
Snackbar
=
_
...
@@ -152,7 +153,7 @@ class ProfileManagerActivity extends AppCompatActivity with OnMenuItemClickListe
...
@@ -152,7 +153,7 @@ class ProfileManagerActivity extends AppCompatActivity with OnMenuItemClickListe
profilesList
.
setLayoutManager
(
new
LinearLayoutManager
(
this
))
profilesList
.
setLayoutManager
(
new
LinearLayoutManager
(
this
))
profilesList
.
setItemAnimator
(
new
DefaultItemAnimator
)
profilesList
.
setItemAnimator
(
new
DefaultItemAnimator
)
profilesList
.
setAdapter
(
profilesAdapter
)
profilesList
.
setAdapter
(
profilesAdapter
)
removedSnackbar
=
Snackbar
.
make
(
findViewById
(
android
.
R
.
id
.
content
)
,
R
.
string
.
removed
,
Snackbar
.
LENGTH_LONG
)
removedSnackbar
=
Snackbar
.
make
(
profilesList
,
R
.
string
.
removed
,
Snackbar
.
LENGTH_LONG
)
.
setAction
(
R
.
string
.
undo
,
((
v
:
View
)
=>
profilesAdapter
.
undoRemoves
)
:
OnClickListener
)
.
setAction
(
R
.
string
.
undo
,
((
v
:
View
)
=>
profilesAdapter
.
undoRemoves
)
:
OnClickListener
)
removedSnackbar
.
getView
.
addOnAttachStateChangeListener
(
new
OnAttachStateChangeListener
{
removedSnackbar
.
getView
.
addOnAttachStateChangeListener
(
new
OnAttachStateChangeListener
{
def
onViewDetachedFromWindow
(
v
:
View
)
=
profilesAdapter
.
commitRemoves
def
onViewDetachedFromWindow
(
v
:
View
)
=
profilesAdapter
.
commitRemoves
...
...
src/main/scala/com/github/shadowsocks/Shadowsocks.scala
View file @
331434dc
...
@@ -293,12 +293,6 @@ class Shadowsocks
...
@@ -293,12 +293,6 @@ class Shadowsocks
}
}
}
}
def
isTextEmpty
(
s
:
String
,
msg
:
String
)
:
Boolean
=
{
if
(
s
!=
null
&&
s
.
length
>
0
)
return
false
Snackbar
.
make
(
getWindow
.
getDecorView
.
findViewById
(
android
.
R
.
id
.
content
),
msg
,
Snackbar
.
LENGTH_LONG
).
show
true
}
def
cancelStart
()
{
def
cancelStart
()
{
clearDialog
()
clearDialog
()
changeSwitch
(
checked
=
false
)
changeSwitch
(
checked
=
false
)
...
@@ -554,7 +548,9 @@ class Shadowsocks
...
@@ -554,7 +548,9 @@ class Shadowsocks
def
checkText
(
key
:
String
)
:
Boolean
=
{
def
checkText
(
key
:
String
)
:
Boolean
=
{
val
text
=
ShadowsocksApplication
.
settings
.
getString
(
key
,
""
)
val
text
=
ShadowsocksApplication
.
settings
.
getString
(
key
,
""
)
!
isTextEmpty
(
text
,
getString
(
R
.
string
.
proxy_empty
))
if
(
text
!=
null
&&
text
.
length
>
0
)
return
true
Snackbar
.
make
(
findViewById
(
android
.
R
.
id
.
content
),
getString
(
R
.
string
.
proxy_empty
),
Snackbar
.
LENGTH_LONG
).
show
false
}
}
/** Called when connect button is clicked. */
/** Called when connect button is clicked. */
...
@@ -598,7 +594,7 @@ class Shadowsocks
...
@@ -598,7 +594,7 @@ class Shadowsocks
handler
.
postDelayed
(()
=>
fabProgressCircle
.
hide
(),
1000
)
handler
.
postDelayed
(()
=>
fabProgressCircle
.
hide
(),
1000
)
fab
.
setEnabled
(
true
)
fab
.
setEnabled
(
true
)
changeSwitch
(
checked
=
false
)
changeSwitch
(
checked
=
false
)
if
(
m
!=
null
)
Snackbar
.
make
(
getWindow
.
getDecorView
.
findViewById
(
android
.
R
.
id
.
content
),
if
(
m
!=
null
)
Snackbar
.
make
(
findViewById
(
android
.
R
.
id
.
content
),
getString
(
R
.
string
.
vpn_error
).
formatLocal
(
Locale
.
ENGLISH
,
m
),
Snackbar
.
LENGTH_LONG
).
show
getString
(
R
.
string
.
vpn_error
).
formatLocal
(
Locale
.
ENGLISH
,
m
),
Snackbar
.
LENGTH_LONG
).
show
setPreferenceEnabled
(
enabled
=
true
)
setPreferenceEnabled
(
enabled
=
true
)
case
State
.
STOPPING
=>
case
State
.
STOPPING
=>
...
...
src/main/scala/com/github/shadowsocks/ShadowsocksNatService.scala
View file @
331434dc
...
@@ -40,9 +40,9 @@
...
@@ -40,9 +40,9 @@
package
com.github.shadowsocks
package
com.github.shadowsocks
import
java.io.File
import
java.io.File
import
java.lang.Process
import
java.net.
{
Inet6Address
,
InetAddress
}
import
java.net.
{
Inet6Address
,
InetAddress
}
import
java.util.Locale
import
java.util.Locale
import
java.lang.
{
Process
,
ProcessBuilder
}
import
android.app._
import
android.app._
import
android.content._
import
android.content._
...
@@ -56,8 +56,8 @@ import android.widget.Toast
...
@@ -56,8 +56,8 @@ import android.widget.Toast
import
com.github.shadowsocks.aidl.Config
import
com.github.shadowsocks.aidl.Config
import
com.github.shadowsocks.utils._
import
com.github.shadowsocks.utils._
import
scala.collection._
import
scala.collection.JavaConversions._
import
scala.collection.JavaConversions._
import
scala.collection._
import
scala.collection.mutable.ArrayBuffer
import
scala.collection.mutable.ArrayBuffer
import
scala.concurrent.ExecutionContext.Implicits.global
import
scala.concurrent.ExecutionContext.Implicits.global
import
scala.concurrent.Future
import
scala.concurrent.Future
...
...
src/main/scala/com/github/shadowsocks/ShadowsocksSettings.scala
View file @
331434dc
...
@@ -5,9 +5,9 @@ import java.util.Locale
...
@@ -5,9 +5,9 @@ import java.util.Locale
import
android.content.
{
DialogInterface
,
Intent
}
import
android.content.
{
DialogInterface
,
Intent
}
import
android.net.Uri
import
android.net.Uri
import
android.os.
{
Build
,
Bundle
}
import
android.os.
{
Build
,
Bundle
}
import
android.preference.
{
SwitchPreference
,
Preference
,
PreferenceFragment
}
import
android.preference.
{
Preference
,
PreferenceFragment
,
SwitchPreference
}
import
android.support.v7.app.AlertDialog
import
android.support.v7.app.AlertDialog
import
android.webkit.
{
WebView
Client
,
WebView
}
import
android.webkit.
{
WebView
,
WebViewClient
}
import
com.github.shadowsocks.utils.Key
import
com.github.shadowsocks.utils.Key
// TODO: Move related logic here
// TODO: Move related logic here
...
...
src/main/scala/com/github/shadowsocks/ShadowsocksVpnService.scala
View file @
331434dc
...
@@ -40,8 +40,8 @@
...
@@ -40,8 +40,8 @@
package
com.github.shadowsocks
package
com.github.shadowsocks
import
java.io.File
import
java.io.File
import
java.lang.Process
import
java.util.Locale
import
java.util.Locale
import
java.lang.
{
Process
,
ProcessBuilder
}
import
android.app._
import
android.app._
import
android.content._
import
android.content._
...
...
src/main/scala/com/github/shadowsocks/widget/AutoPaddingBehavior.scala
0 → 100644
View file @
331434dc
package
com.github.shadowsocks.widget
import
android.content.Context
import
android.support.design.widget.CoordinatorLayout
import
android.support.design.widget.CoordinatorLayout.Behavior
import
android.support.design.widget.Snackbar.SnackbarLayout
import
android.util.AttributeSet
import
android.view.View
/**
* @author Mygod
*/
class
AutoPaddingBehavior
(
context
:
Context
,
attrs
:
AttributeSet
)
extends
Behavior
[
View
]
{
override
def
layoutDependsOn
(
parent
:
CoordinatorLayout
,
child
:
View
,
dependency
:
View
)
=
dependency
.
isInstanceOf
[
SnackbarLayout
]
override
def
onDependentViewChanged
(
parent
:
CoordinatorLayout
,
child
:
View
,
dependency
:
View
)
=
dependency
match
{
case
sl
:
SnackbarLayout
=>
child
.
setPadding
(
0
,
0
,
0
,
dependency
.
getHeight
)
true
case
_
=>
super
.
onDependentViewChanged
(
parent
,
child
,
dependency
)
}
override
def
onDependentViewRemoved
(
parent
:
CoordinatorLayout
,
child
:
View
,
dependency
:
View
)
=
dependency
match
{
case
sl
:
SnackbarLayout
=>
child
.
setPadding
(
0
,
0
,
0
,
0
)
case
_
=>
super
.
onDependentViewRemoved
(
parent
,
child
,
dependency
)
}
}
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