diff --git a/app/src/main/java/com/droiddeck/launcher/hud/DroidDeckHudConfig.kt b/app/src/main/java/com/droiddeck/launcher/hud/DroidDeckHudConfig.kt index 86e9f8f398..8fc38a95f9 100644 --- a/app/src/main/java/com/droiddeck/launcher/hud/DroidDeckHudConfig.kt +++ b/app/src/main/java/com/droiddeck/launcher/hud/DroidDeckHudConfig.kt @@ -9,7 +9,7 @@ internal object DroidDeckHudConfig { "hudOutline" to "40", "hudOutlineAccent" to "1", "showFPS" to "1", "showFPSGraph" to "1", "showCPUUsage" to "1", "showCPULoad" to "1", "showGPULoad" to "1", "showVram" to "1", "showRAM" to "1", "showPower" to "1", "showTemp" to "1", "showBatteryTemp" to "1", - "showGpuTemp" to "0", "showBattery" to "0", "showLow001" to "1", "fpsDecimal" to "1", "showPerCore" to "1", + "showGpuTemp" to "0", "showBattery" to "0", "showLow1" to "1", "showLow01" to "1", "showLow001" to "1", "fpsDecimal" to "1", "showPerCore" to "1", "showSwap" to "1", "showNet" to "1", "showResolution" to "1", "showProton" to "1", "showSession" to "1", "showClock" to "1", "showEngine" to "1", "showRenderer" to "1", "showGpuModel" to "1", "tempUnit" to "c", "tempBands" to "1", "tempAuto" to "1", "tempRedCpu" to "90", "tempRedGpu" to "90", "tempRedBat" to "48", diff --git a/app/src/main/java/com/droiddeck/launcher/hud/DroidDeckHudModels.kt b/app/src/main/java/com/droiddeck/launcher/hud/DroidDeckHudModels.kt index 9f59512e55..b77d69772f 100644 --- a/app/src/main/java/com/droiddeck/launcher/hud/DroidDeckHudModels.kt +++ b/app/src/main/java/com/droiddeck/launcher/hud/DroidDeckHudModels.kt @@ -37,11 +37,11 @@ enum class DroidDeckHudSize(val token: String, val label: String) { fun from(token: String?): DroidDeckHudSize = values().firstOrNull { it.token.equals(token, ignoreCase = true) } ?: FULL - val MINIMAL_CHIPS = setOf("FPS", "FPS graph", "0.01% low", "FPS .1", "Engine", "Clock") + val MINIMAL_CHIPS = setOf("FPS", "FPS graph", "1% low", "0.1% low", "0.01% low", "FPS .1", "Engine", "Clock") val PILL_CHIPS = setOf("FPS", "FPS graph", "GPU", "CPU", "VRAM", "RAM", "Battery", "GPU model", "FPS .1", "Engine", "Clock") val STANDARD_CHIPS = setOf( "FPS", "FPS graph", "GPU", "GPU temp", "CPU", "VRAM", "RAM", "Power", "Temp", - "Battery", "GPU model", "Engine", "0.01% low", "FPS .1", "Clock", + "Battery", "GPU model", "Engine", "1% low", "0.1% low", "0.01% low", "FPS .1", "Clock", ) val MEGA_ONLY = setOf( "Per-core", "Swap", "Network", "Resolution", "Proton", "Wrapper", "DX ver", "Session", diff --git a/app/src/main/java/com/droiddeck/launcher/hud/DroidDeckHudView.kt b/app/src/main/java/com/droiddeck/launcher/hud/DroidDeckHudView.kt index e78249a1c1..b3b33d8da0 100644 --- a/app/src/main/java/com/droiddeck/launcher/hud/DroidDeckHudView.kt +++ b/app/src/main/java/com/droiddeck/launcher/hud/DroidDeckHudView.kt @@ -90,6 +90,8 @@ class DroidDeckHudView(context: Context) : View(context) { private var showPower = true private var showBatteryTemp = false private var showGraph = false + private var showLow1 = true + private var showLow01 = true private var showLow001 = true private var fpsDecimal = true private var showClockTime = true @@ -299,6 +301,8 @@ class DroidDeckHudView(context: Context) : View(context) { showPower = cfg.get("showPower", "1") == "1" showBatteryTemp = cfg.get("showBatteryTemp", "0") == "1" showGraph = cfg.get("showFPSGraph", "0") == "1" + showLow1 = cfg.get("showLow1", "1") == "1" + showLow01 = cfg.get("showLow01", "1") == "1" showLow001 = cfg.get("showLow001", "1") == "1" fpsDecimal = cfg.get("fpsDecimal", "1") == "1" showClockTime = cfg.get("showClock", "1") == "1" @@ -750,8 +754,10 @@ class DroidDeckHudView(context: Context) : View(context) { v += gap(unitPx); v += numUnit(fmt1(1000f / max(fpsNow, 1f)), "ms", rowPx, unitPx) rows.add(HudRow(Span(apiLabel(), colFps, rowPx), v)) rows.add(HudRow(Span("AVG", colLo, rowPx), numUnit(fmt1(fpsAvg), "FPS", rowPx, unitPx))) - rows.add(HudRow(Span("1%", colLo, rowPx), numUnit(lowText(lows.low1Fps), "FPS", rowPx, unitPx))) - rows.add(HudRow(Span("0.1%", colLo, rowPx), numUnit(lowText(lows.low01Fps), "FPS", rowPx, unitPx))) + if (showLow1) + rows.add(HudRow(Span("1%", colLo, rowPx), numUnit(lowText(lows.low1Fps), "FPS", rowPx, unitPx))) + if (showLow01) + rows.add(HudRow(Span("0.1%", colLo, rowPx), numUnit(lowText(lows.low01Fps), "FPS", rowPx, unitPx))) if (showLow001) rows.add(HudRow(Span("0.01%", colLo, rowPx), numUnit(lowText(lows.low001Fps), "FPS", rowPx, unitPx))) } @@ -799,7 +805,7 @@ class DroidDeckHudView(context: Context) : View(context) { val tiles = ArrayList() if (showFPS) tiles.add(Tile("FPS", colFps, listOf(Span(fpsText(fpsNow), colValue, valPx, glow = true)), - "${fmt1(fpsAvg)} avg · ${lowText(lows.low1Fps) ?: "—"} 1%", false)) + "${fmt1(fpsAvg)} avg" + (if (showLow1) " · ${lowText(lows.low1Fps) ?: "—"} 1%" else ""), false)) if (showFPS) tiles.add(Tile("FRAME", colDim, numUnit(fmt1(1000f / max(fpsNow, 1f)), "ms", valPx, unitPx), "${fmt1(graphMinMs)} – ${fmt1(graphMaxMs)}", false)) if (showGPU && hasGpuStats(s)) tiles.add(Tile("GPU", colGpu, numUnit(s.gpuPercent?.toString(), "%", valPx, unitPx), @@ -963,11 +969,14 @@ class DroidDeckHudView(context: Context) : View(context) { Span(fpsText(fpsNow), colValue, if (minGenerating) bigPx * 0.55f else bigPx), Span("fps", colDim, if (minGenerating) bigUnitPx * 0.8f else bigUnitPx)) val sub = ArrayList() - sub += Span("1% ", colDim, subPx); sub += Span(lowText(lows.low1Fps) ?: "—", colFps, subPx) - sub += Span(" · 0.1% ", colDim, subPx); sub += Span(lowText(lows.low01Fps) ?: "—", colFps, subPx) - if (showLow001) { - sub += Span(" · 0.01% ", colDim, subPx); sub += Span(lowText(lows.low001Fps) ?: "—", colFps, subPx) + fun low(label: String, value: Float) { + if (sub.isNotEmpty()) sub += Span(" · ", colDim, subPx) + sub += Span("$label ", colDim, subPx) + sub += Span(lowText(value) ?: "—", colFps, subPx) } + if (showLow1) low("1%", lows.low1Fps) + if (showLow01) low("0.1%", lows.low01Fps) + if (showLow001) low("0.01%", lows.low001Fps) val footerLabel = listOf(if (showEngine) engineLabel else "", displayServer) .filter { it.isNotBlank() }.joinToString(" · ") val hdr = if (hdrState != DroidDeckHudHdr.NONE) hdrLine(footPx) else emptyList() @@ -979,11 +988,13 @@ class DroidDeckHudView(context: Context) : View(context) { max(measure(footerLabel, footPx), runWidth(hdr)), if (showGraph) sp(120f) else 0f) val bigBase = headerBottom + sp(8f) + capHeight(big[0].sizePx) placeRun(left - inkLeft(big[0].text, big[0].sizePx), bigBase, big, glow = true) - val subBase = bigBase + sp(10f) + capHeight(subPx) - placeRun(left - inkLeft(sub[0].text, subPx), subBase, sub) - var last = subBase + var last = bigBase + if (sub.isNotEmpty()) { + last += sp(10f) + capHeight(subPx) + placeRun(left - inkLeft(sub[0].text, subPx), last, sub) + } if (showGraph) { - val top = subBase + sp(9f) + val top = last + sp(9f) graphRect = RectF(left, top, left + colW, top + sp(24f)) last = top + sp(24f) } @@ -1042,10 +1053,15 @@ class DroidDeckHudView(context: Context) : View(context) { val groups = ArrayList>() run { val l = ArrayList() - l += Span("1% ", colDim, rowPx); l += Span(lowText(lows.low1Fps) ?: "—", colFps, rowPx) - l += Span(" 0.1% ", colDim, rowPx); l += Span(lowText(lows.low01Fps) ?: "—", colFps, rowPx) - if (showLow001) { l += Span(" 0.01% ", colDim, rowPx); l += Span(lowText(lows.low001Fps) ?: "—", colFps, rowPx) } - groups += l + fun low(label: String, value: Float) { + if (l.isNotEmpty()) l += Span(" ", colDim, rowPx) + l += Span("$label ", colDim, rowPx) + l += Span(lowText(value) ?: "—", colFps, rowPx) + } + if (showLow1) low("1%", lows.low1Fps) + if (showLow01) low("0.1%", lows.low01Fps) + if (showLow001) low("0.01%", lows.low001Fps) + if (l.isNotEmpty()) groups += l } if (showGPU || showGpuTemp) { val l = arrayListOf(Span("GPU", colGpu, rowPx)) @@ -1208,8 +1224,10 @@ class DroidDeckHudView(context: Context) : View(context) { v += gap(unitPx); v += numUnit(fmt1(1000f / max(fpsNow, 1f)), "ms", rowPx, unitPx) right.add(HudRow(Span(apiLabel(), colFps, rowPx), v)) right.add(HudRow(Span("AVG", colLo, rowPx), numUnit(fmt1(fpsAvg), "FPS", rowPx, unitPx))) - right.add(HudRow(Span("1%", colLo, rowPx), numUnit(lowText(lows.low1Fps), "FPS", rowPx, unitPx))) - right.add(HudRow(Span("0.1%", colLo, rowPx), numUnit(lowText(lows.low01Fps), "FPS", rowPx, unitPx))) + if (showLow1) + right.add(HudRow(Span("1%", colLo, rowPx), numUnit(lowText(lows.low1Fps), "FPS", rowPx, unitPx))) + if (showLow01) + right.add(HudRow(Span("0.1%", colLo, rowPx), numUnit(lowText(lows.low01Fps), "FPS", rowPx, unitPx))) if (showLow001) right.add(HudRow(Span("0.01%", colLo, rowPx), numUnit(lowText(lows.low001Fps), "FPS", rowPx, unitPx))) } diff --git a/app/src/main/java/com/droiddeck/launcher/ui/DroidDeckHudSettings.kt b/app/src/main/java/com/droiddeck/launcher/ui/DroidDeckHudSettings.kt index 95768fb659..4b67d9eea4 100644 --- a/app/src/main/java/com/droiddeck/launcher/ui/DroidDeckHudSettings.kt +++ b/app/src/main/java/com/droiddeck/launcher/ui/DroidDeckHudSettings.kt @@ -153,6 +153,8 @@ private val METRICS = listOf( HudMetric("FPS", "showFPS", R.string.drawer_hud_fps), HudMetric("FPS graph", "showFPSGraph", R.string.hud_metric_graph), HudMetric("FPS .1", "fpsDecimal", R.string.hud_metric_decimal), + HudMetric("1% low", "showLow1", R.string.hud_metric_low1), + HudMetric("0.1% low", "showLow01", R.string.hud_metric_low01), HudMetric("0.01% low", "showLow001", R.string.hud_metric_low001), HudMetric("Engine", "showEngine", R.string.hud_metric_engine), HudMetric("GPU model", "showGpuModel", R.string.hud_metric_gpu_model), @@ -176,6 +178,6 @@ private val METRICS = listOf( private val HIDDEN = mapOf( DroidDeckHudSize.PILL to setOf("FPS", "FPS graph"), DroidDeckHudSize.MINIMAL to setOf("FPS"), - DroidDeckHudSize.TILES to setOf("FPS graph", "0.01% low"), + DroidDeckHudSize.TILES to setOf("FPS graph", "0.1% low", "0.01% low"), DroidDeckHudSize.STRIP to setOf("FPS"), ) diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 417dd49465..c038b1841d 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -717,6 +717,8 @@ Readings Frame time graph Frame rate with a decimal + 1% low + 0.1% low 0.01% low Graphics engine GPU name diff --git a/app/src/test/java/com/droiddeck/launcher/hud/DroidDeckHudPanelTest.kt b/app/src/test/java/com/droiddeck/launcher/hud/DroidDeckHudPanelTest.kt index 32c58a41f0..6217b6656c 100644 --- a/app/src/test/java/com/droiddeck/launcher/hud/DroidDeckHudPanelTest.kt +++ b/app/src/test/java/com/droiddeck/launcher/hud/DroidDeckHudPanelTest.kt @@ -35,6 +35,32 @@ class DroidDeckHudPanelTest { assertEquals("1", DroidDeckHudConfig.DEFAULTS["hudLocked"]) } + @Test fun lowMetricsCanBeHiddenIndependentlyInEveryLayoutThatShowsThem() { + val metrics = listOf("showLow1" to "1%", "showLow01" to "0.1%", "showLow001" to "0.01%") + for (size in DroidDeckHudSize.values().filter { it != DroidDeckHudSize.PILL }) { + for (mask in 0..7) { + val app = RuntimeEnvironment.getApplication() + val parent = FrameLayout(app) + val view = DroidDeckHudView(app) + parent.addView(view) + parent.layout(0, 0, 4000, 1080) + val settings = metrics.mapIndexed { index, (key, _) -> + key to if (mask and (1 shl index) != 0) "1" else "0" + }.toMap() + view.applyConfig(DroidDeckHudConfig.encode(DroidDeckHudConfig.DEFAULTS + + ("hudSize" to size.token) + settings)) + view.showForTest(SNAPSHOT, "DXVK", 0L) + val lines = view.linesForTest().joinToString(" ") + for ((index, metric) in metrics.withIndex()) { + val supported = size != DroidDeckHudSize.TILES || index == 0 + val expected = supported && mask and (1 shl index) != 0 + val label = Regex("(?