Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2026-04-02 08:23:00 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix ScreenDensity calculation.

Browse Source
This commit is contained in:
Greyson Parrelli
2026-03-05 11:08:20 -05:00
committed by jeffrey-signal
parent c2bdc11832
commit 2356bb6da2
2 changed files with 101 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/org/thoughtcrime/securesms/util/ScreenDensity.java
View File

@@ -44,10 +44,10 @@ public final class ScreenDensity {
String bucket = UNKNOWN;
for (Map.Entry<Integer, String> entry : LEVELS.entrySet()) {
bucket = entry.getValue();
if (entry.getKey() > density) {
break;
}
bucket = entry.getValue();
}
return new ScreenDensity(bucket, density);

100
app/src/test/java/org/thoughtcrime/securesms/util/ScreenDensityTest.kt Normal file
View File

@@ -0,0 +1,100 @@
package org.thoughtcrime.securesms.util
import android.content.Context
import android.content.res.Resources
import android.util.DisplayMetrics
import io.mockk.every
import io.mockk.mockk
import org.junit.Assert.assertEquals
import org.junit.Assert.assertFalse
import org.junit.Assert.assertTrue
import org.junit.Test
class ScreenDensityTest {
@Test
fun `get returns ldpi for DENSITY_LOW`() {
val result = ScreenDensity.get(contextWithDensity(DisplayMetrics.DENSITY_LOW))
assertEquals("ldpi", result.bucket)
assertTrue(result.isKnownDensity)
}
@Test
fun `get returns mdpi for DENSITY_MEDIUM`() {
val result = ScreenDensity.get(contextWithDensity(DisplayMetrics.DENSITY_MEDIUM))
assertEquals("mdpi", result.bucket)
}
@Test
fun `get returns hdpi for DENSITY_HIGH`() {
val result = ScreenDensity.get(contextWithDensity(DisplayMetrics.DENSITY_HIGH))
assertEquals("hdpi", result.bucket)
}
@Test
fun `get returns xhdpi for DENSITY_XHIGH`() {
val result = ScreenDensity.get(contextWithDensity(DisplayMetrics.DENSITY_XHIGH))
assertEquals("xhdpi", result.bucket)
}
@Test
fun `get returns xxhdpi for DENSITY_XXHIGH`() {
val result = ScreenDensity.get(contextWithDensity(DisplayMetrics.DENSITY_XXHIGH))
assertEquals("xxhdpi", result.bucket)
}
@Test
fun `get returns xxxhdpi for DENSITY_XXXHIGH`() {
val result = ScreenDensity.get(contextWithDensity(DisplayMetrics.DENSITY_XXXHIGH))
assertEquals("xxxhdpi", result.bucket)
}
@Test
fun `get returns hdpi for density between mdpi and hdpi`() {
val result = ScreenDensity.get(contextWithDensity(200))
assertEquals("mdpi", result.bucket)
}
@Test
fun `get returns xhdpi for density between hdpi and xhdpi`() {
val result = ScreenDensity.get(contextWithDensity(280))
assertEquals("hdpi", result.bucket)
}
@Test
fun `get returns xxxhdpi for density above DENSITY_XXXHIGH`() {
val result = ScreenDensity.get(contextWithDensity(800))
assertEquals("xxxhdpi", result.bucket)
assertTrue(result.isKnownDensity)
}
@Test
fun `get returns unknown for density below DENSITY_LOW`() {
val result = ScreenDensity.get(contextWithDensity(50))
assertFalse(result.isKnownDensity)
}
@Test
fun `toString contains bucket and density`() {
val result = ScreenDensity.get(contextWithDensity(DisplayMetrics.DENSITY_XHIGH))
assertEquals("xhdpi (320)", result.toString())
}
@Test
fun `xhdpiRelativeDensityScaleFactor returns correct values`() {
assertEquals(0.25f, ScreenDensity.xhdpiRelativeDensityScaleFactor("ldpi"))
assertEquals(0.5f, ScreenDensity.xhdpiRelativeDensityScaleFactor("mdpi"))
assertEquals(0.75f, ScreenDensity.xhdpiRelativeDensityScaleFactor("hdpi"))
assertEquals(1f, ScreenDensity.xhdpiRelativeDensityScaleFactor("xhdpi"))
}
private fun contextWithDensity(densityDpi: Int): Context {
val displayMetrics = DisplayMetrics().apply { this.densityDpi = densityDpi }
val resources = mockk<Resources> {
every { this@mockk.displayMetrics } returns displayMetrics
}
return mockk {
every { this@mockk.resources } returns resources
}
}
}