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
41730631
Unverified
Commit
41730631
authored
Aug 27, 2019
by
Max Lv
Committed by
GitHub
Aug 27, 2019
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #2296 from Mygod/stats-when-connected
Show stats bar only when connected
parents
bf1961aa
64ff0f2a
Changes
6
Show whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
20 additions
and
24 deletions
+20
-24
build.gradle
build.gradle
+1
-0
core/build.gradle
core/build.gradle
+1
-1
mobile/build.gradle
mobile/build.gradle
+1
-0
mobile/src/main/java/com/github/shadowsocks/widget/StatsBar.kt
...e/src/main/java/com/github/shadowsocks/widget/StatsBar.kt
+10
-14
mobile/src/main/res/values/dimen.xml
mobile/src/main/res/values/dimen.xml
+0
-1
tv/src/main/java/com/github/shadowsocks/tv/MainPreferenceFragment.kt
.../java/com/github/shadowsocks/tv/MainPreferenceFragment.kt
+7
-8
No files found.
build.gradle
View file @
41730631
...
...
@@ -9,6 +9,7 @@ buildscript {
minSdkVersion
=
21
sdkVersion
=
29
compileSdkVersion
=
29
lifecycleVersion
=
'2.2.0-alpha03'
junitVersion
=
'4.12'
androidTestVersion
=
'1.2.0'
androidEspressoVersion
=
'3.2.0'
...
...
core/build.gradle
View file @
41730631
...
...
@@ -50,13 +50,13 @@ androidExtensions {
}
def
coroutinesVersion
=
'1.3.0'
def
lifecycleVersion
=
'2.1.0-rc01'
def
roomVersion
=
'2.1.0'
def
workVersion
=
'2.2.0'
dependencies
{
api
project
(
':plugin'
)
api
"androidx.lifecycle:lifecycle-common-java8:$lifecycleVersion"
api
"androidx.lifecycle:lifecycle-extensions:$lifecycleVersion"
api
"androidx.lifecycle:lifecycle-livedata-core-ktx:$lifecycleVersion"
api
"androidx.lifecycle:lifecycle-viewmodel-ktx:$lifecycleVersion"
api
'androidx.preference:preference:1.1.0-rc01'
api
"androidx.room:room-runtime:$roomVersion"
...
...
mobile/build.gradle
View file @
41730631
...
...
@@ -62,6 +62,7 @@ dependencies {
implementation
project
(
':core'
)
implementation
'androidx.browser:browser:1.2.0-alpha07'
implementation
'androidx.constraintlayout:constraintlayout:2.0.0-beta2'
implementation
"androidx.lifecycle:lifecycle-runtime-ktx:$lifecycleVersion"
implementation
'com.google.android.gms:play-services-vision:18.0.0'
implementation
'com.google.firebase:firebase-ads:18.1.1'
implementation
'com.takisoft.preferencex:preferencex-simplemenu:1.0.0'
...
...
mobile/src/main/java/com/github/shadowsocks/widget/StatsBar.kt
View file @
41730631
...
...
@@ -27,16 +27,15 @@ import android.view.View
import
android.widget.TextView
import
androidx.appcompat.widget.TooltipCompat
import
androidx.coordinatorlayout.widget.CoordinatorLayout
import
androidx.fragment.app.FragmentActivity
import
androidx.lifecycle.Observer
import
androidx.lifecycle.ViewModelProviders
import
androidx.lifecycle.ViewModelProvider
import
androidx.lifecycle.get
import
androidx.lifecycle.lifecycleScope
import
androidx.lifecycle.observe
import
com.github.shadowsocks.MainActivity
import
com.github.shadowsocks.R
import
com.github.shadowsocks.bg.BaseService
import
com.github.shadowsocks.net.HttpsTest
import
com.google.android.material.bottomappbar.BottomAppBar
import
kotlin.math.abs
class
StatsBar
@JvmOverloads
constructor
(
context
:
Context
,
attrs
:
AttributeSet
?
=
null
,
defStyleAttr
:
Int
=
R
.
attr
.
bottomAppBarStyle
)
:
...
...
@@ -46,16 +45,14 @@ class StatsBar @JvmOverloads constructor(context: Context, attrs: AttributeSet?
private
lateinit
var
rxText
:
TextView
private
lateinit
var
txRateText
:
TextView
private
lateinit
var
rxRateText
:
TextView
private
val
tester
=
ViewModelProvider
s
.
of
(
context
as
Fragment
Activity
).
get
<
HttpsTest
>()
private
val
tester
=
ViewModelProvider
(
context
as
Main
Activity
).
get
<
HttpsTest
>()
private
lateinit
var
behavior
:
Behavior
override
fun
getBehavior
():
Behavior
{
if
(!
this
::
behavior
.
isInitialized
)
behavior
=
object
:
Behavior
()
{
val
threshold
=
context
.
resources
.
getDimensionPixelSize
(
R
.
dimen
.
stats_bar_scroll_threshold
)
override
fun
onNestedScroll
(
coordinatorLayout
:
CoordinatorLayout
,
child
:
BottomAppBar
,
target
:
View
,
dxConsumed
:
Int
,
dyConsumed
:
Int
,
dxUnconsumed
:
Int
,
dyUnconsumed
:
Int
,
type
:
Int
,
consumed
:
IntArray
)
{
val
dy
=
dyConsumed
+
dyUnconsumed
super
.
onNestedScroll
(
coordinatorLayout
,
child
,
target
,
dxConsumed
,
if
(
abs
(
dy
)
>=
threshold
)
dy
else
0
,
super
.
onNestedScroll
(
coordinatorLayout
,
child
,
target
,
dxConsumed
,
dyConsumed
+
dyUnconsumed
,
dxUnconsumed
,
0
,
type
,
consumed
)
}
}
...
...
@@ -78,7 +75,11 @@ class StatsBar @JvmOverloads constructor(context: Context, attrs: AttributeSet?
fun
changeState
(
state
:
BaseService
.
State
)
{
val
activity
=
context
as
MainActivity
if
(
state
!=
BaseService
.
State
.
Connected
)
{
if
((
state
==
BaseService
.
State
.
Connected
).
also
{
hideOnScroll
=
it
})
{
activity
.
lifecycleScope
.
launchWhenStarted
{
performShow
()
}
tester
.
status
.
observe
(
activity
)
{
it
.
retrieve
(
this
::
setStatus
)
{
msg
->
activity
.
snackbar
(
msg
).
show
()
}
}
}
else
{
activity
.
lifecycleScope
.
launchWhenStarted
{
performHide
()
}
updateTraffic
(
0
,
0
,
0
,
0
)
tester
.
status
.
removeObservers
(
activity
)
if
(
state
!=
BaseService
.
State
.
Idle
)
tester
.
invalidate
()
...
...
@@ -87,11 +88,6 @@ class StatsBar @JvmOverloads constructor(context: Context, attrs: AttributeSet?
BaseService
.
State
.
Stopping
->
R
.
string
.
stopping
else
->
R
.
string
.
not_connected
}))
}
else
{
behavior
.
slideUp
(
this
)
tester
.
status
.
observe
(
activity
,
Observer
{
it
.
retrieve
(
this
::
setStatus
)
{
activity
.
snackbar
(
it
).
show
()
}
})
}
}
...
...
mobile/src/main/res/values/dimen.xml
View file @
41730631
...
...
@@ -4,5 +4,4 @@
<dimen
name=
"profile_padding"
>
8dp
</dimen>
<dimen
name=
"main_list_padding_bottom"
>
88dp
</dimen>
<dimen
name=
"bottom_sheet_padding"
>
8dp
</dimen>
<dimen
name=
"stats_bar_scroll_threshold"
>
4dp
</dimen>
</resources>
tv/src/main/java/com/github/shadowsocks/tv/MainPreferenceFragment.kt
View file @
41730631
...
...
@@ -32,9 +32,9 @@ import android.text.format.Formatter
import
android.util.Log
import
android.widget.Toast
import
androidx.leanback.preference.LeanbackPreferenceFragmentCompat
import
androidx.lifecycle.Observer
import
androidx.lifecycle.ViewModelProviders
import
androidx.lifecycle.ViewModelProvider
import
androidx.lifecycle.get
import
androidx.lifecycle.observe
import
androidx.preference.*
import
com.crashlytics.android.Crashlytics
import
com.github.shadowsocks.BootReceiver
...
...
@@ -113,14 +113,13 @@ class MainPreferenceFragment : LeanbackPreferenceFragmentCompat(), ShadowsocksCo
else
->
R
.
string
.
connect
})
stats
.
setTitle
(
R
.
string
.
connection_test_pending
)
stats
.
isVisible
=
state
==
BaseService
.
State
.
Connected
if
(
state
!=
BaseService
.
State
.
Connected
)
{
if
((
state
==
BaseService
.
State
.
Connected
).
also
{
stats
.
isVisible
=
it
})
tester
.
status
.
observe
(
this
)
{
it
.
retrieve
(
stats
::
setTitle
)
{
msg
->
Toast
.
makeText
(
context
,
msg
,
Toast
.
LENGTH_LONG
).
show
()
}
}
else
{
trafficUpdated
(
0
,
TrafficStats
())
tester
.
status
.
removeObservers
(
this
)
if
(
state
!=
BaseService
.
State
.
Idle
)
tester
.
invalidate
()
}
else
tester
.
status
.
observe
(
this
,
Observer
{
it
.
retrieve
(
stats
::
setTitle
)
{
Toast
.
makeText
(
context
,
it
,
Toast
.
LENGTH_LONG
).
show
()
}
})
}
if
(
msg
!=
null
)
Toast
.
makeText
(
context
,
getString
(
R
.
string
.
vpn_error
,
msg
),
Toast
.
LENGTH_SHORT
).
show
()
this
.
state
=
state
val
stopped
=
state
==
BaseService
.
State
.
Stopped
...
...
@@ -192,7 +191,7 @@ class MainPreferenceFragment : LeanbackPreferenceFragmentCompat(), ShadowsocksCo
serviceMode
.
onPreferenceChangeListener
=
onServiceModeChange
findPreference
<
Preference
>(
Key
.
about
)
!!
.
summary
=
getString
(
R
.
string
.
about_title
,
BuildConfig
.
VERSION_NAME
)
tester
=
ViewModelProvider
s
.
of
(
this
).
get
()
tester
=
ViewModelProvider
(
this
).
get
()
changeState
(
BaseService
.
State
.
Idle
)
// reset everything to init state
connection
.
connect
(
requireContext
(),
this
)
DataStore
.
publicStore
.
registerChangeListener
(
this
)
...
...
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