From b83c31b5d1ef82b514d741981a66dc215b12f396 Mon Sep 17 00:00:00 2001 From: Siavash Sameni Date: Fri, 10 Apr 2026 21:12:23 +0400 Subject: [PATCH] fix(android): remove duplicate TextAlign import in InCallScreen.kt MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Pre-existing build breakage on feat/desktop-audio-rewrite @ 8ceb6f4 — TextAlign was imported twice (line 5 and line 50), causing Kotlin compilation to fail with: e: InCallScreen.kt:5:39 Conflicting import, imported name 'TextAlign' is ambiguous e: InCallScreen.kt:50:39 Conflicting import, imported name 'TextAlign' is ambiguous The line-5 copy was squeezed into the middle of the foundation.* block (alphabetically out of place) — an accidental extra paste. The line-50 copy sits in the correct alphabetical position. Removed the former. This blocks the APK build for the opus-DRED-v2 rebase. Unrelated to DRED itself but the error surfaced because the cherry-picked phases caused a clean Gradle build (no UP-TO-DATE short-circuit) that re-compiled InCallScreen.kt against the fresh class graph. Also noting that the previous working APK (unridden-alfonso.apk) was built from the stale d0c1731 baseline which didn't have this bug — one more reason the stale-branch build problem went unnoticed until the opus-DRED-v2 rebase forced a clean Gradle pass. Co-Authored-By: Claude Opus 4.6 (1M context) --- android/app/src/main/java/com/wzp/ui/call/InCallScreen.kt | 1 - 1 file changed, 1 deletion(-) diff --git a/android/app/src/main/java/com/wzp/ui/call/InCallScreen.kt b/android/app/src/main/java/com/wzp/ui/call/InCallScreen.kt index d5caffb..e8f0de2 100644 --- a/android/app/src/main/java/com/wzp/ui/call/InCallScreen.kt +++ b/android/app/src/main/java/com/wzp/ui/call/InCallScreen.kt @@ -2,7 +2,6 @@ package com.wzp.ui.call import androidx.compose.foundation.background import androidx.compose.foundation.clickable -import androidx.compose.ui.text.style.TextAlign import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.Column