Commit efae2f02 authored by Mygod's avatar Mygod

Refrain from calculating hardcoded dimensions

parent d5c1455a
...@@ -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)
......
...@@ -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
*/ */
......
...@@ -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"
......
...@@ -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"
......
...@@ -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>
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment