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
b069b3e0
Commit
b069b3e0
authored
Dec 28, 2016
by
Mygod
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Don't setToolbar in minidrawer mode
parent
0732dd59
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
4 deletions
+2
-4
src/main/scala/com/github/shadowsocks/MainActivity.scala
src/main/scala/com/github/shadowsocks/MainActivity.scala
+1
-1
src/main/scala/com/github/shadowsocks/ToolbarFragment.scala
src/main/scala/com/github/shadowsocks/ToolbarFragment.scala
+1
-3
No files found.
src/main/scala/com/github/shadowsocks/MainActivity.scala
View file @
b069b3e0
...
@@ -70,7 +70,7 @@ class MainActivity extends Activity with ServiceBoundContext with Drawer.OnDrawe
...
@@ -70,7 +70,7 @@ class MainActivity extends Activity with ServiceBoundContext with Drawer.OnDrawe
private
val
handler
=
new
Handler
()
private
val
handler
=
new
Handler
()
private
var
fab
:
FloatingActionButton
=
_
private
var
fab
:
FloatingActionButton
=
_
private
var
fabProgressCircle
:
FABProgressCircle
=
_
private
var
fabProgressCircle
:
FABProgressCircle
=
_
private
var
crossfader
:
Crossfader
[
CrossFadeSlidingPaneLayout
]
=
_
var
crossfader
:
Crossfader
[
CrossFadeSlidingPaneLayout
]
=
_
var
drawer
:
Drawer
=
_
var
drawer
:
Drawer
=
_
private
var
testCount
:
Int
=
_
private
var
testCount
:
Int
=
_
...
...
src/main/scala/com/github/shadowsocks/ToolbarFragment.scala
View file @
b069b3e0
...
@@ -32,9 +32,7 @@ class ToolbarFragment extends Fragment {
...
@@ -32,9 +32,7 @@ class ToolbarFragment extends Fragment {
super
.
onViewCreated
(
view
,
savedInstanceState
)
super
.
onViewCreated
(
view
,
savedInstanceState
)
toolbar
=
view
.
findViewById
(
R
.
id
.
toolbar
).
asInstanceOf
[
Toolbar
]
toolbar
=
view
.
findViewById
(
R
.
id
.
toolbar
).
asInstanceOf
[
Toolbar
]
val
activity
=
getActivity
.
asInstanceOf
[
MainActivity
]
val
activity
=
getActivity
.
asInstanceOf
[
MainActivity
]
try
activity
.
drawer
.
setToolbar
(
activity
,
toolbar
,
true
)
catch
{
if
(
activity
.
crossfader
==
null
)
activity
.
drawer
.
setToolbar
(
activity
,
toolbar
,
true
)
case
_:
Exception
=>
// ignore for now
}
}
}
def
onTrafficUpdated
(
txRate
:
Long
,
rxRate
:
Long
,
txTotal
:
Long
,
rxTotal
:
Long
)
:
Unit
=
()
def
onTrafficUpdated
(
txRate
:
Long
,
rxRate
:
Long
,
txTotal
:
Long
,
rxTotal
:
Long
)
:
Unit
=
()
...
...
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