From efae2f02d0f4444c32573ba847b339e978e6ff0e Mon Sep 17 00:00:00 2001
From: Mygod <contact-git@mygod.be>
Date: Thu, 7 Dec 2017 00:03:54 -0800
Subject: [PATCH] Refrain from calculating hardcoded dimensions

---
 .../java/com/github/shadowsocks/acl/CustomRulesFragment.kt    | 4 ++--
 mobile/src/main/java/com/github/shadowsocks/utils/Utils.kt    | 2 --
 mobile/src/main/res/layout/layout_apps.xml                    | 4 ++--
 mobile/src/main/res/layout/layout_apps_item.xml               | 2 +-
 mobile/src/main/res/values/dimen.xml                          | 1 -
 5 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/mobile/src/main/java/com/github/shadowsocks/acl/CustomRulesFragment.kt b/mobile/src/main/java/com/github/shadowsocks/acl/CustomRulesFragment.kt
index 0bd9cb48..bca28fce 100644
--- a/mobile/src/main/java/com/github/shadowsocks/acl/CustomRulesFragment.kt
+++ b/mobile/src/main/java/com/github/shadowsocks/acl/CustomRulesFragment.kt
@@ -48,7 +48,6 @@ import com.github.shadowsocks.ToolbarFragment
 import com.github.shadowsocks.bg.BaseService
 import com.github.shadowsocks.utils.Subnet
 import com.github.shadowsocks.utils.asIterable
-import com.github.shadowsocks.utils.dp
 import com.github.shadowsocks.widget.UndoSnackbarManager
 import java.net.IDN
 import java.net.URL
@@ -78,7 +77,8 @@ class CustomRulesFragment : ToolbarFragment(), Toolbar.OnMenuItemClickListener {
 
         init {
             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.setOnLongClickListener(this)
             view.setBackgroundResource(R.drawable.background_selectable)
diff --git a/mobile/src/main/java/com/github/shadowsocks/utils/Utils.kt b/mobile/src/main/java/com/github/shadowsocks/utils/Utils.kt
index 2becad25..e9bed406 100644
--- a/mobile/src/main/java/com/github/shadowsocks/utils/Utils.kt
+++ b/mobile/src/main/java/com/github/shadowsocks/utils/Utils.kt
@@ -53,8 +53,6 @@ fun thread(start: Boolean = true, isDaemon: Boolean = false, contextClassLoader:
 val URLConnection.responseLength: Long
     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
  */
diff --git a/mobile/src/main/res/layout/layout_apps.xml b/mobile/src/main/res/layout/layout_apps.xml
index 6f31ee62..8dbc5f3f 100644
--- a/mobile/src/main/res/layout/layout_apps.xml
+++ b/mobile/src/main/res/layout/layout_apps.xml
@@ -21,7 +21,7 @@
         android:layout_height="wrap_content"
         android:checked="true"
         android:paddingBottom="12dp"
-        android:paddingEnd="20dp"
+        android:paddingEnd="@dimen/fastscroll__bubble_corner"
         android:paddingStart="60dp"
         android:paddingTop="12dp"
         android:text="@string/on"
@@ -34,7 +34,7 @@
         android:layout_height="wrap_content"
         android:checked="true"
         android:paddingBottom="12dp"
-        android:paddingEnd="20dp"
+        android:paddingEnd="@dimen/fastscroll__bubble_corner"
         android:paddingStart="60dp"
         android:paddingTop="12dp"
         android:text="@string/bypass_apps"
diff --git a/mobile/src/main/res/layout/layout_apps_item.xml b/mobile/src/main/res/layout/layout_apps_item.xml
index 04fa1f7f..79f7f52f 100644
--- a/mobile/src/main/res/layout/layout_apps_item.xml
+++ b/mobile/src/main/res/layout/layout_apps_item.xml
@@ -20,7 +20,7 @@
         android:id="@+id/itemcheck"
         android:layout_width="0dp"
         android:layout_height="fill_parent"
-        android:layout_marginEnd="20dp"
+        android:layout_marginEnd="@dimen/fastscroll__bubble_corner"
         android:layout_weight="1"
         android:clickable="false"
         android:ellipsize="end"
diff --git a/mobile/src/main/res/values/dimen.xml b/mobile/src/main/res/values/dimen.xml
index 415496c2..bf8b97cd 100644
--- a/mobile/src/main/res/values/dimen.xml
+++ b/mobile/src/main/res/values/dimen.xml
@@ -2,7 +2,6 @@
 <resources>
     <dimen name="profile_item_max_width">480dp</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 -->
     <dimen name="fab_margin_top">-44dp</dimen>
 </resources>