Commit b95bee96 authored by Mygod's avatar Mygod

Use dimen instead of Utils.dpToPx

parent 99d97d1d
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<resources> <resources>
<dimen name="profile_item_max_width">480dp</dimen> <dimen name="profile_item_max_width">480dp</dimen>
<dimen name="icon_list_item_padding">16dp</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>
...@@ -309,7 +309,7 @@ class MainActivity extends Activity with ServiceBoundContext with Drawer.OnDrawe ...@@ -309,7 +309,7 @@ class MainActivity extends Activity with ServiceBoundContext with Drawer.OnDrawe
}) })
fab.setOnLongClickListener(_ => { fab.setOnLongClickListener(_ => {
Utils.positionToast(Toast.makeText(this, if (state == State.CONNECTED) R.string.stop else R.string.connect, Utils.positionToast(Toast.makeText(this, if (state == State.CONNECTED) R.string.stop else R.string.connect,
Toast.LENGTH_SHORT), fab, getWindow, 0, Utils.dpToPx(this, 8)).show() Toast.LENGTH_SHORT), fab, getWindow, 0, getResources.getDimensionPixelOffset(R.dimen.margin_small)).show()
true true
}) })
......
...@@ -55,7 +55,7 @@ final class ProfilesFragment extends ToolbarFragment with Toolbar.OnMenuItemClic ...@@ -55,7 +55,7 @@ final class ProfilesFragment extends ToolbarFragment with Toolbar.OnMenuItemClic
private val cardButtonLongClickListener: OnLongClickListener = view => { private val cardButtonLongClickListener: OnLongClickListener = view => {
Utils.positionToast(Toast.makeText(getActivity, view.getContentDescription, Toast.LENGTH_SHORT), view, Utils.positionToast(Toast.makeText(getActivity, view.getContentDescription, Toast.LENGTH_SHORT), view,
getActivity.getWindow, 0, Utils.dpToPx(getActivity, 8)).show() getActivity.getWindow, 0, getResources.getDimensionPixelOffset(R.dimen.margin_small)).show()
true true
} }
...@@ -129,7 +129,7 @@ final class ProfilesFragment extends ToolbarFragment with Toolbar.OnMenuItemClic ...@@ -129,7 +129,7 @@ final class ProfilesFragment extends ToolbarFragment with Toolbar.OnMenuItemClic
val params = val params =
new LinearLayout.LayoutParams(ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT) new LinearLayout.LayoutParams(ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT)
params.gravity = Gravity.CENTER_HORIZONTAL params.gravity = Gravity.CENTER_HORIZONTAL
params.setMargins(0, Utils.dpToPx(getActivity, 8), 0, 0) params.setMargins(0, getResources.getDimensionPixelOffset(R.dimen.margin_small), 0, 0)
adView = new NativeExpressAdView(getActivity) adView = new NativeExpressAdView(getActivity)
adView.setLayoutParams(params) adView.setLayoutParams(params)
adView.setAdUnitId("ca-app-pub-9097031975646651/5224027521") adView.setAdUnitId("ca-app-pub-9097031975646651/5224027521")
......
...@@ -27,7 +27,6 @@ import android.nfc.{NdefMessage, NdefRecord, NfcAdapter} ...@@ -27,7 +27,6 @@ import android.nfc.{NdefMessage, NdefRecord, NfcAdapter}
import android.os.Bundle import android.os.Bundle
import android.view.{LayoutInflater, View, ViewGroup} import android.view.{LayoutInflater, View, ViewGroup}
import android.widget.{ImageView, LinearLayout} import android.widget.{ImageView, LinearLayout}
import com.github.shadowsocks.utils.Utils
import net.glxn.qrgen.android.QRCode import net.glxn.qrgen.android.QRCode
object QRCodeDialog { object QRCodeDialog {
...@@ -50,8 +49,9 @@ final class QRCodeDialog extends DialogFragment { ...@@ -50,8 +49,9 @@ final class QRCodeDialog extends DialogFragment {
override def onCreateView(inflater: LayoutInflater, container: ViewGroup, savedInstanceState: Bundle): View = { override def onCreateView(inflater: LayoutInflater, container: ViewGroup, savedInstanceState: Bundle): View = {
val image = new ImageView(getActivity) val image = new ImageView(getActivity)
image.setLayoutParams(new LinearLayout.LayoutParams(-1, -1)) image.setLayoutParams(new LinearLayout.LayoutParams(-1, -1))
val size = getResources.getDimensionPixelSize(R.dimen.qr_code_size)
val qrcode = QRCode.from(url) val qrcode = QRCode.from(url)
.withSize(Utils.dpToPx(getActivity, 250), Utils.dpToPx(getActivity, 250)) .withSize(size, size)
.asInstanceOf[QRCode].bitmap() .asInstanceOf[QRCode].bitmap()
image.setImageBitmap(qrcode) image.setImageBitmap(qrcode)
image image
......
...@@ -56,8 +56,6 @@ object Utils { ...@@ -56,8 +56,6 @@ object Utils {
new String(Base64.encode(mdg.digest, 0)) new String(Base64.encode(mdg.digest, 0))
} }
def dpToPx(context: Context, dp: Int): Int = Math.round(dp * context.getResources.getDisplayMetrics.density)
/* /*
* round or floor depending on whether you are using offsets(floor) or * round or floor depending on whether you are using offsets(floor) or
* widths(round) * widths(round)
......
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