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
3f88b463
Commit
3f88b463
authored
Jan 27, 2018
by
Mygod
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Retire tablet layout
Google doesn't care for tablets either.
parent
34da03d6
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
3 additions
and
30 deletions
+3
-30
mobile/src/main/java/com/github/shadowsocks/MainActivity.kt
mobile/src/main/java/com/github/shadowsocks/MainActivity.kt
+2
-28
mobile/src/main/java/com/github/shadowsocks/ToolbarFragment.kt
...e/src/main/java/com/github/shadowsocks/ToolbarFragment.kt
+1
-1
mobile/src/main/res/values/dimen.xml
mobile/src/main/res/values/dimen.xml
+0
-1
No files found.
mobile/src/main/java/com/github/shadowsocks/MainActivity.kt
View file @
3f88b463
...
...
@@ -56,11 +56,8 @@ import com.github.shadowsocks.utils.Key
import
com.github.shadowsocks.utils.responseLength
import
com.github.shadowsocks.utils.thread
import
com.github.shadowsocks.widget.ServiceButton
import
com.mikepenz.crossfader.Crossfader
import
com.mikepenz.crossfader.view.CrossFadeSlidingPaneLayout
import
com.mikepenz.materialdrawer.Drawer
import
com.mikepenz.materialdrawer.DrawerBuilder
import
com.mikepenz.materialdrawer.interfaces.ICrossfader
import
com.mikepenz.materialdrawer.model.PrimaryDrawerItem
import
com.mikepenz.materialdrawer.model.interfaces.IDrawerItem
import
java.net.HttpURLConnection
...
...
@@ -86,7 +83,6 @@ class MainActivity : AppCompatActivity(), ShadowsocksConnection.Interface, Drawe
// UI
private
lateinit
var
fab
:
ServiceButton
internal
var
crossfader
:
Crossfader
<
CrossFadeSlidingPaneLayout
>?
=
null
internal
lateinit
var
drawer
:
Drawer
private
var
previousSelectedDrawer
:
Long
=
0
// it's actually lateinit
...
...
@@ -212,7 +208,7 @@ class MainActivity : AppCompatActivity(), ShadowsocksConnection.Interface, Drawe
override
fun
onCreate
(
savedInstanceState
:
Bundle
?)
{
super
.
onCreate
(
savedInstanceState
)
setContentView
(
R
.
layout
.
layout_main
)
val
drawerBuild
er
=
DrawerBuilder
()
draw
er
=
DrawerBuilder
()
.
withActivity
(
this
)
.
withTranslucentStatusBar
(
true
)
.
withHeader
(
R
.
layout
.
layout_header
)
...
...
@@ -249,28 +245,7 @@ class MainActivity : AppCompatActivity(), ShadowsocksConnection.Interface, Drawe
.
withOnDrawerItemClickListener
(
this
)
.
withActionBarDrawerToggle
(
true
)
.
withSavedInstance
(
savedInstanceState
)
val
miniDrawerWidth
=
resources
.
getDimension
(
R
.
dimen
.
material_mini_drawer_item
)
if
(
resources
.
displayMetrics
.
widthPixels
>=
resources
.
getDimension
(
R
.
dimen
.
profile_item_max_width
)
+
miniDrawerWidth
)
{
drawer
=
drawerBuilder
.
withGenerateMiniDrawer
(
true
).
buildView
()
val
crossfader
=
Crossfader
<
CrossFadeSlidingPaneLayout
>()
this
.
crossfader
=
crossfader
crossfader
.
withContent
(
findViewById
(
android
.
R
.
id
.
content
))
.
withFirst
(
drawer
.
slider
,
resources
.
getDimensionPixelSize
(
R
.
dimen
.
material_drawer_width
))
.
withSecond
(
drawer
.
miniDrawer
.
build
(
this
),
miniDrawerWidth
.
toInt
())
.
withSavedInstance
(
savedInstanceState
)
.
build
()
if
(
resources
.
configuration
.
layoutDirection
==
View
.
LAYOUT_DIRECTION_RTL
)
crossfader
.
crossFadeSlidingPaneLayout
.
setShadowDrawableRight
(
AppCompatResources
.
getDrawable
(
this
,
R
.
drawable
.
material_drawer_shadow_right
))
else
crossfader
.
crossFadeSlidingPaneLayout
.
setShadowDrawableLeft
(
AppCompatResources
.
getDrawable
(
this
,
R
.
drawable
.
material_drawer_shadow_left
))
drawer
.
miniDrawer
.
withCrossFader
(
object
:
ICrossfader
{
// a wrapper is needed
override
fun
isCrossfaded
():
Boolean
=
crossfader
.
isCrossFaded
override
fun
crossfade
()
=
crossfader
.
crossFade
()
})
}
else
drawer
=
drawerBuilder
.
build
()
.
build
()
if
(
savedInstanceState
==
null
)
displayFragment
(
ProfilesFragment
())
previousSelectedDrawer
=
drawer
.
currentSelection
...
...
@@ -394,7 +369,6 @@ class MainActivity : AppCompatActivity(), ShadowsocksConnection.Interface, Drawe
override
fun
onSaveInstanceState
(
outState
:
Bundle
?)
{
super
.
onSaveInstanceState
(
outState
)
drawer
.
saveInstanceState
(
outState
)
crossfader
?.
saveInstanceState
(
outState
)
}
override
fun
onDestroy
()
{
...
...
mobile/src/main/java/com/github/shadowsocks/ToolbarFragment.kt
View file @
3f88b463
...
...
@@ -35,7 +35,7 @@ open class ToolbarFragment : Fragment() {
super
.
onViewCreated
(
view
,
savedInstanceState
)
toolbar
=
view
.
findViewById
(
R
.
id
.
toolbar
)
val
activity
=
activity
as
MainActivity
if
(
activity
.
crossfader
==
null
)
activity
.
drawer
.
setToolbar
(
activity
,
toolbar
,
true
)
activity
.
drawer
.
setToolbar
(
activity
,
toolbar
,
true
)
}
open
fun
onTrafficUpdated
(
profileId
:
Int
,
txRate
:
Long
,
rxRate
:
Long
,
txTotal
:
Long
,
rxTotal
:
Long
)
{
}
...
...
mobile/src/main/res/values/dimen.xml
View file @
3f88b463
<?xml version="1.0" encoding="utf-8"?>
<resources>
<dimen
name=
"profile_item_max_width"
>
480dp
</dimen>
<dimen
name=
"qr_code_size"
>
250dp
</dimen>
<dimen
name=
"profile_padding"
>
8dp
</dimen>
<dimen
name=
"bottom_sheet_padding"
>
8dp
</dimen>
...
...
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