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
efae2f02
Commit
efae2f02
authored
Dec 07, 2017
by
Mygod
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Refrain from calculating hardcoded dimensions
parent
d5c1455a
Changes
5
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
5 additions
and
8 deletions
+5
-8
mobile/src/main/java/com/github/shadowsocks/acl/CustomRulesFragment.kt
...in/java/com/github/shadowsocks/acl/CustomRulesFragment.kt
+2
-2
mobile/src/main/java/com/github/shadowsocks/utils/Utils.kt
mobile/src/main/java/com/github/shadowsocks/utils/Utils.kt
+0
-2
mobile/src/main/res/layout/layout_apps.xml
mobile/src/main/res/layout/layout_apps.xml
+2
-2
mobile/src/main/res/layout/layout_apps_item.xml
mobile/src/main/res/layout/layout_apps_item.xml
+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/acl/CustomRulesFragment.kt
View file @
efae2f02
...
@@ -48,7 +48,6 @@ import com.github.shadowsocks.ToolbarFragment
...
@@ -48,7 +48,6 @@ import com.github.shadowsocks.ToolbarFragment
import
com.github.shadowsocks.bg.BaseService
import
com.github.shadowsocks.bg.BaseService
import
com.github.shadowsocks.utils.Subnet
import
com.github.shadowsocks.utils.Subnet
import
com.github.shadowsocks.utils.asIterable
import
com.github.shadowsocks.utils.asIterable
import
com.github.shadowsocks.utils.dp
import
com.github.shadowsocks.widget.UndoSnackbarManager
import
com.github.shadowsocks.widget.UndoSnackbarManager
import
java.net.IDN
import
java.net.IDN
import
java.net.URL
import
java.net.URL
...
@@ -78,7 +77,8 @@ class CustomRulesFragment : ToolbarFragment(), Toolbar.OnMenuItemClickListener {
...
@@ -78,7 +77,8 @@ class CustomRulesFragment : ToolbarFragment(), Toolbar.OnMenuItemClickListener {
init
{
init
{
view
.
setPaddingRelative
(
view
.
paddingStart
,
view
.
paddingTop
,
view
.
setPaddingRelative
(
view
.
paddingStart
,
view
.
paddingTop
,
Math
.
max
(
view
.
paddingEnd
,
20f
.
dp
().
toInt
()),
view
.
paddingBottom
)
Math
.
max
(
view
.
paddingEnd
,
resources
.
getDimensionPixelSize
(
R
.
dimen
.
fastscroll__bubble_corner
)),
view
.
paddingBottom
)
view
.
setOnClickListener
(
this
)
view
.
setOnClickListener
(
this
)
view
.
setOnLongClickListener
(
this
)
view
.
setOnLongClickListener
(
this
)
view
.
setBackgroundResource
(
R
.
drawable
.
background_selectable
)
view
.
setBackgroundResource
(
R
.
drawable
.
background_selectable
)
...
...
mobile/src/main/java/com/github/shadowsocks/utils/Utils.kt
View file @
efae2f02
...
@@ -53,8 +53,6 @@ fun thread(start: Boolean = true, isDaemon: Boolean = false, contextClassLoader:
...
@@ -53,8 +53,6 @@ fun thread(start: Boolean = true, isDaemon: Boolean = false, contextClassLoader:
val
URLConnection
.
responseLength
:
Long
val
URLConnection
.
responseLength
:
Long
get
()
=
if
(
Build
.
VERSION
.
SDK_INT
>=
24
)
contentLengthLong
else
contentLength
.
toLong
()
get
()
=
if
(
Build
.
VERSION
.
SDK_INT
>=
24
)
contentLengthLong
else
contentLength
.
toLong
()
fun
Float
.
dp
():
Float
=
TypedValue
.
applyDimension
(
TypedValue
.
COMPLEX_UNIT_DIP
,
this
,
app
.
resources
.
displayMetrics
)
/**
/**
* Based on: https://stackoverflow.com/a/15656428/2245107
* Based on: https://stackoverflow.com/a/15656428/2245107
*/
*/
...
...
mobile/src/main/res/layout/layout_apps.xml
View file @
efae2f02
...
@@ -21,7 +21,7 @@
...
@@ -21,7 +21,7 @@
android:layout_height=
"wrap_content"
android:layout_height=
"wrap_content"
android:checked=
"true"
android:checked=
"true"
android:paddingBottom=
"12dp"
android:paddingBottom=
"12dp"
android:paddingEnd=
"
20dp
"
android:paddingEnd=
"
@dimen/fastscroll__bubble_corner
"
android:paddingStart=
"60dp"
android:paddingStart=
"60dp"
android:paddingTop=
"12dp"
android:paddingTop=
"12dp"
android:text=
"@string/on"
android:text=
"@string/on"
...
@@ -34,7 +34,7 @@
...
@@ -34,7 +34,7 @@
android:layout_height=
"wrap_content"
android:layout_height=
"wrap_content"
android:checked=
"true"
android:checked=
"true"
android:paddingBottom=
"12dp"
android:paddingBottom=
"12dp"
android:paddingEnd=
"
20dp
"
android:paddingEnd=
"
@dimen/fastscroll__bubble_corner
"
android:paddingStart=
"60dp"
android:paddingStart=
"60dp"
android:paddingTop=
"12dp"
android:paddingTop=
"12dp"
android:text=
"@string/bypass_apps"
android:text=
"@string/bypass_apps"
...
...
mobile/src/main/res/layout/layout_apps_item.xml
View file @
efae2f02
...
@@ -20,7 +20,7 @@
...
@@ -20,7 +20,7 @@
android:id=
"@+id/itemcheck"
android:id=
"@+id/itemcheck"
android:layout_width=
"0dp"
android:layout_width=
"0dp"
android:layout_height=
"fill_parent"
android:layout_height=
"fill_parent"
android:layout_marginEnd=
"
20dp
"
android:layout_marginEnd=
"
@dimen/fastscroll__bubble_corner
"
android:layout_weight=
"1"
android:layout_weight=
"1"
android:clickable=
"false"
android:clickable=
"false"
android:ellipsize=
"end"
android:ellipsize=
"end"
...
...
mobile/src/main/res/values/dimen.xml
View file @
efae2f02
...
@@ -2,7 +2,6 @@
...
@@ -2,7 +2,6 @@
<resources>
<resources>
<dimen
name=
"profile_item_max_width"
>
480dp
</dimen>
<dimen
name=
"profile_item_max_width"
>
480dp
</dimen>
<dimen
name=
"qr_code_size"
>
250dp
</dimen>
<dimen
name=
"qr_code_size"
>
250dp
</dimen>
<dimen
name=
"margin_small"
>
8dp
</dimen>
<!-- TODO: Remove when this issue is fixed: https://github.com/JorgeCastilloPrz/FABProgressCircle/issues/19 -->
<!-- TODO: Remove when this issue is fixed: https://github.com/JorgeCastilloPrz/FABProgressCircle/issues/19 -->
<dimen
name=
"fab_margin_top"
>
-44dp
</dimen>
<dimen
name=
"fab_margin_top"
>
-44dp
</dimen>
</resources>
</resources>
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