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
d6c45df3
Commit
d6c45df3
authored
Nov 08, 2015
by
Mygod
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix some layout issues on 4.x
parent
232846a4
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
12 additions
and
3 deletions
+12
-3
src/main/res/layout/layout_main.xml
src/main/res/layout/layout_main.xml
+1
-1
src/main/res/values-v21/dimen.xml
src/main/res/values-v21/dimen.xml
+4
-0
src/main/res/values/dimen.xml
src/main/res/values/dimen.xml
+5
-0
src/main/scala/com/github/shadowsocks/Shadowsocks.scala
src/main/scala/com/github/shadowsocks/Shadowsocks.scala
+2
-2
No files found.
src/main/res/layout/layout_main.xml
View file @
d6c45df3
...
...
@@ -15,7 +15,7 @@
android:layout_alignParentEnd=
"true"
android:layout_marginRight=
"16dp"
android:layout_marginEnd=
"16dp"
android:layout_marginBottom=
"
-28dp
"
>
android:layout_marginBottom=
"
@dimen/fab_margin_bottom
"
>
<android.support.design.widget.FloatingActionButton
android:id=
"@+id/fab"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
app:backgroundTint=
"@color/material_green_600"
...
...
src/main/res/values-v21/dimen.xml
0 → 100644
View file @
d6c45df3
<?xml version="1.0" encoding="utf-8"?>
<resources>
<dimen
name=
"fab_margin_bottom"
>
-28dp
</dimen>
</resources>
src/main/res/values/dimen.xml
0 → 100644
View file @
d6c45df3
<?xml version="1.0" encoding="utf-8"?>
<resources>
<!-- TODO: Remove when this issue is fixed: https://github.com/JorgeCastilloPrz/FABProgressCircle/issues/19 -->
<dimen
name=
"fab_margin_bottom"
>
-44dp
</dimen>
</resources>
src/main/scala/com/github/shadowsocks/Shadowsocks.scala
View file @
d6c45df3
...
...
@@ -1031,12 +1031,12 @@ class Shadowsocks
fabProgressCircle
.
show
()
setPreferenceEnabled
(
enabled
=
false
)
case
State
.
CONNECTED
=>
if
(
state
==
State
.
CONNECTING
)
fabProgressCircle
.
beginFinalAnimation
()
if
(
state
==
State
.
CONNECTING
)
fabProgressCircle
.
beginFinalAnimation
()
else
fabProgressCircle
.
hide
()
fab
.
setEnabled
(
true
)
changeSwitch
(
checked
=
true
)
setPreferenceEnabled
(
enabled
=
false
)
case
State
.
STOPPED
=>
if
(
state
==
State
.
STOPPING
||
state
==
State
.
CONNECTING
)
fabProgressCircle
.
hide
()
fabProgressCircle
.
hide
()
fab
.
setEnabled
(
true
)
changeSwitch
(
checked
=
false
)
if
(
m
!=
null
)
Snackbar
.
make
(
getWindow
.
getDecorView
.
findViewById
(
android
.
R
.
id
.
content
),
...
...
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