Эх сурвалжийг харах

ShortcutUtil: use system utilities to get pixel size for dimens instead of manually calculating them

Signed-off-by: Álvaro Brey <alvaro.brey@nextcloud.com>
Álvaro Brey 2 жил өмнө
parent
commit
8f1369cba2

+ 2 - 7
app/src/main/java/com/nextcloud/utils/ShortcutUtil.kt

@@ -41,7 +41,6 @@ import com.owncloud.android.ui.activity.FileDisplayActivity
 import com.owncloud.android.utils.MimeTypeUtil
 import com.owncloud.android.utils.theme.ViewThemeUtils
 import javax.inject.Inject
-import kotlin.math.roundToInt
 
 class ShortcutUtil @Inject constructor(private val mContext: Context) {
 
@@ -104,12 +103,8 @@ class ShortcutUtil @Inject constructor(private val mContext: Context) {
     }
 
     private fun bitmapToAdaptiveBitmap(orig: Bitmap): Bitmap {
-        val screenDensity = mContext.resources.displayMetrics.density
-        val adaptiveIconSizeConst = mContext.resources.getInteger(R.integer.adaptive_icon_size)
-        val adaptiveIconPaddingConst = mContext.resources.getInteger(R.integer.adaptive_icon_padding)
-
-        val adaptiveIconSize = (adaptiveIconSizeConst * screenDensity).roundToInt()
-        val adaptiveIconOuterSides = (adaptiveIconPaddingConst * screenDensity).roundToInt()
+        val adaptiveIconSize = mContext.resources.getDimensionPixelSize(R.dimen.adaptive_icon_size)
+        val adaptiveIconOuterSides = mContext.resources.getDimensionPixelSize(R.dimen.adaptive_icon_padding)
         val drawable: Drawable = BitmapDrawable(mContext.resources, orig)
         val bitmap = Bitmap.createBitmap(adaptiveIconSize, adaptiveIconSize, Bitmap.Config.ARGB_8888)
         val canvas = Canvas(bitmap)

+ 2 - 2
app/src/main/res/values/dims.xml

@@ -149,6 +149,6 @@
     <integer name="small_margin">5</integer>
     <integer name="zero">0</integer>
     <!--Adaptive Icon size specified here:  https://developer.android.com/develop/ui/views/launch/icon_design_adaptive -->
-    <integer name="adaptive_icon_size">108</integer>
-    <integer name="adaptive_icon_padding">18</integer>
+    <dimen name="adaptive_icon_size">108dp</dimen>
+    <dimen name="adaptive_icon_padding">18dp</dimen>
 </resources>