From 9cc56631cd064941ea0acc365ffd312df831fc19 Mon Sep 17 00:00:00 2001 From: Kurt Himebauch <136133082+xXJSONDeruloXx@users.noreply.github.com> Date: Fri, 30 Oct 2026 15:29:41 -0400 Subject: [PATCH] feat: test and local builds show a faint PR, commit and title watermark (#1863) --- .github/workflows/build.yml | 2 + app/build.gradle | 6 + .../main/java/com/droiddeck/launcher/App.kt | 1 + .../droiddeck/launcher/ui/BuildWatermark.kt | 113 ++++++++++++++++++ .../launcher/ui/BuildWatermarkTest.kt | 35 ++++++ 5 files changed, 157 insertions(+) create mode 100644 app/src/main/java/com/droiddeck/launcher/ui/BuildWatermark.kt create mode 100644 app/src/test/java/com/droiddeck/launcher/ui/BuildWatermarkTest.kt diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index fc5fe53c22..bf6630fd52 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -433,6 +433,7 @@ jobs: id: build-label env: PR_NUMBER: ${{ github.event.pull_request.number }} + PR_TITLE: ${{ github.event.pull_request.title }} PR_HEAD_SHA: ${{ github.event.pull_request.head.sha }} BUILD_REF: ${{ github.ref_name }} BUILD_SHA: ${{ github.sha }} @@ -451,6 +452,7 @@ jobs: echo "label=$label" >> "$GITHUB_OUTPUT" echo "DROIDDECK_SOURCE_COMMIT=${PR_HEAD_SHA:-$BUILD_SHA}" >> "$GITHUB_ENV" echo "DROIDDECK_PR_NUMBER=${PR_NUMBER:-0}" >> "$GITHUB_ENV" + echo "DROIDDECK_PR_TITLE=${PR_TITLE//$'\n'/ }" >> "$GITHUB_ENV" echo "Build: \`$label\`" >> "$GITHUB_STEP_SUMMARY" - name: Rust toolchain for the store engines (aarch64-linux-android) diff --git a/app/build.gradle b/app/build.gradle index 7334c8db4e..fd1e9a77b6 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -78,6 +78,10 @@ def escapedBuildLabel = buildLabel.replace('\\', '\\\\').replace('"', '\\"') def sourceCommit = providers.environmentVariable('DROIDDECK_SOURCE_COMMIT').getOrNull() ?: providers.environmentVariable('GITHUB_SHA').getOrNull() ?: gitValue(['rev-parse', 'HEAD']) ?: '' def prNumber = (providers.environmentVariable('DROIDDECK_PR_NUMBER').getOrNull() ?: '0').with { it.isInteger() ? it : '0' } +def prTitle = providers.environmentVariable('DROIDDECK_PR_TITLE').getOrNull() ?: '' +def buildBranch = providers.environmentVariable('GITHUB_HEAD_REF').getOrNull()?.trim() + ?: gitValue(['branch', '--show-current']) ?: '' +def escapeJava = { String value -> value.replace('\\', '\\\\').replace('"', '\\"').replace('\n', ' ').replace('\r', ' ') } def ciBuild = providers.environmentVariable('GITHUB_ACTIONS').getOrNull() == 'true' def releaseSigner = rootProject.file('keystore/release-signer.sha256').text.trim() def commitTime = (gitValue(['show', '-s', '--format=%ct', '--end-of-options', sourceCommit]) ?: '0').with { it.isLong() ? it : '0' } @@ -135,6 +139,8 @@ android { buildConfigField "String", "BUILD_LABEL", "\"${escapedBuildLabel}\"" buildConfigField "String", "SOURCE_COMMIT", "\"${sourceCommit}\"" buildConfigField "int", "PR_NUMBER", "${prNumber}" + buildConfigField "String", "PR_TITLE", "\"${escapeJava(prTitle)}\"" + buildConfigField "String", "BUILD_BRANCH", "\"${escapeJava(buildBranch)}\"" buildConfigField "boolean", "CI_BUILD", "${ciBuild}" buildConfigField "String", "RELEASE_SIGNER", "\"${releaseSigner}\"" buildConfigField "long", "COMMIT_TIME", "${commitTime}L * 1000L" diff --git a/app/src/main/java/com/droiddeck/launcher/App.kt b/app/src/main/java/com/droiddeck/launcher/App.kt index ca648e3f11..7e1be40a3e 100644 --- a/app/src/main/java/com/droiddeck/launcher/App.kt +++ b/app/src/main/java/com/droiddeck/launcher/App.kt @@ -17,6 +17,7 @@ class App : Application() { override fun onCreate() { super.onCreate() com.droiddeck.launcher.ui.Themes.loadGradient(this) + com.droiddeck.launcher.ui.BuildWatermark.install(this) // Helper processes must not initialize the main USB provider or guest graphics context. val process = if (android.os.Build.VERSION.SDK_INT >= 28) Application.getProcessName() else (getSystemService(ACTIVITY_SERVICE) as android.app.ActivityManager) diff --git a/app/src/main/java/com/droiddeck/launcher/ui/BuildWatermark.kt b/app/src/main/java/com/droiddeck/launcher/ui/BuildWatermark.kt new file mode 100644 index 0000000000..f2a9e8f65b --- /dev/null +++ b/app/src/main/java/com/droiddeck/launcher/ui/BuildWatermark.kt @@ -0,0 +1,113 @@ +package com.droiddeck.launcher.ui + +import android.app.Activity +import android.app.Application +import android.content.Context +import android.graphics.Canvas +import android.graphics.Paint +import android.graphics.Typeface +import android.os.Bundle +import android.text.TextPaint +import android.text.TextUtils +import android.util.TypedValue +import android.view.Gravity +import android.view.View +import android.view.ViewGroup +import android.widget.FrameLayout +import com.droiddeck.launcher.BuildConfig +import com.droiddeck.launcher.QuestXrActivity + +/** A faint bottom-right tag on every screen of a test or local build; stable and preview builds draw none. */ +object BuildWatermark { + private const val TITLE_LIMIT = 80 + + fun lines( + pr: Int = BuildConfig.PR_NUMBER, + ci: Boolean = BuildConfig.CI_BUILD, + commit: String = BuildConfig.SOURCE_COMMIT, + title: String = BuildConfig.PR_TITLE, + branch: String = BuildConfig.BUILD_BRANCH, + ): List? { + if (ci && pr <= 0) return null + val hash = commit.take(7).ifEmpty { "unknown" } + val head = if (pr > 0) "PR-$pr | $hash" else "LOCAL | $hash" + val detail = (if (pr > 0) title else branch).trim() + return if (detail.isEmpty()) listOf(head) else listOf(head, truncate(detail)) + } + + private fun truncate(text: String) = + if (text.length <= TITLE_LIMIT) text else text.take(TITLE_LIMIT - 1).trimEnd() + "…" + + fun install(app: Application) { + val lines = lines() ?: return + app.registerActivityLifecycleCallbacks(object : Application.ActivityLifecycleCallbacks { + override fun onActivityCreated(activity: Activity, savedInstanceState: Bundle?) { + if (activity is QuestXrActivity) return + val decor = activity.window.decorView as? ViewGroup ?: return + if (decor.findViewWithTag(TAG) != null) return + val margin = (8 * activity.resources.displayMetrics.density).toInt() + decor.addView( + MarkView(activity, lines).apply { tag = TAG }, + FrameLayout.LayoutParams( + ViewGroup.LayoutParams.WRAP_CONTENT, + ViewGroup.LayoutParams.WRAP_CONTENT, + Gravity.BOTTOM or Gravity.END, + ).apply { setMargins(margin, margin, margin, margin) }, + ) + } + + override fun onActivityStarted(activity: Activity) = Unit + override fun onActivityResumed(activity: Activity) = Unit + override fun onActivityPaused(activity: Activity) = Unit + override fun onActivityStopped(activity: Activity) = Unit + override fun onActivitySaveInstanceState(activity: Activity, outState: Bundle) = Unit + override fun onActivityDestroyed(activity: Activity) = Unit + }) + } + + private const val TAG = "build-watermark" + + private class MarkView(context: Context, private val lines: List) : View(context) { + private var shown = lines + private val paint = TextPaint(Paint.ANTI_ALIAS_FLAG).apply { + color = 0xE6FFFFFF.toInt() + typeface = Typeface.MONOSPACE + textSize = TypedValue.applyDimension( + TypedValue.COMPLEX_UNIT_SP, 9f, context.resources.displayMetrics, + ) + setShadowLayer(1.5f * context.resources.displayMetrics.density, 0f, 0f, 0xFF000000.toInt()) + textAlign = Paint.Align.RIGHT + } + private val backdrop = Paint(Paint.ANTI_ALIAS_FLAG).apply { color = 0x66303030 } + private val lineHeight get() = paint.fontSpacing + + init { + isClickable = false + isFocusable = false + importantForAccessibility = IMPORTANT_FOR_ACCESSIBILITY_NO + setLayerType(LAYER_TYPE_SOFTWARE, null) + } + + override fun onMeasure(widthSpec: Int, heightSpec: Int) { + val pad = paddingForShadow() * 2 + val limit = if (MeasureSpec.getMode(widthSpec) == MeasureSpec.UNSPECIFIED) Float.MAX_VALUE + else (MeasureSpec.getSize(widthSpec) - pad).coerceAtLeast(0).toFloat() + shown = lines.map { TextUtils.ellipsize(it, paint, limit, TextUtils.TruncateAt.END).toString() } + val width = shown.maxOf { paint.measureText(it) }.toInt() + pad + setMeasuredDimension(width, (lineHeight * shown.size).toInt() + pad) + } + + override fun onDraw(canvas: Canvas) { + val pad = paddingForShadow() + val radius = 3f * resources.displayMetrics.density + canvas.drawRoundRect(0f, 0f, width.toFloat(), height.toFloat(), radius, radius, backdrop) + shown.forEachIndexed { i, line -> + canvas.drawText(line, width - pad.toFloat(), pad - paint.ascent() + lineHeight * i, paint) + } + } + + override fun onTouchEvent(event: android.view.MotionEvent) = false + + private fun paddingForShadow() = (3 * resources.displayMetrics.density).toInt() + } +} diff --git a/app/src/test/java/com/droiddeck/launcher/ui/BuildWatermarkTest.kt b/app/src/test/java/com/droiddeck/launcher/ui/BuildWatermarkTest.kt new file mode 100644 index 0000000000..35f2c8cf09 --- /dev/null +++ b/app/src/test/java/com/droiddeck/launcher/ui/BuildWatermarkTest.kt @@ -0,0 +1,35 @@ +package com.droiddeck.launcher.ui + +import org.junit.Assert.assertEquals +import org.junit.Assert.assertNull +import org.junit.Test + +class BuildWatermarkTest { + @Test + fun stableAndPreviewBuildsHaveNoWatermark() { + assertNull(BuildWatermark.lines(pr = 0, ci = true, commit = "abcdef0123", title = "", branch = "")) + } + + @Test + fun prBuildShowsNumberHashAndTitle() { + assertEquals( + listOf("PR-1234 | abcdef0", "Fix: foo the bar"), + BuildWatermark.lines(pr = 1234, ci = true, commit = "abcdef0123", title = "Fix: foo the bar", branch = "x"), + ) + } + + @Test + fun longTitlesTruncateAtEightyCharacters() { + val lines = BuildWatermark.lines(pr = 7, ci = true, commit = "abcdef0", title = "a".repeat(120), branch = "")!! + assertEquals(80, lines[1].length) + assertEquals('…', lines[1].last()) + } + + @Test + fun localBuildShowsBranch() { + assertEquals( + listOf("LOCAL | abcdef0", "feat/thing"), + BuildWatermark.lines(pr = 0, ci = false, commit = "abcdef0123", title = "", branch = "feat/thing"), + ) + } +}