git.iko.soy/opencode-android
on master help sign in
Fix chat crash by replacing onSizeChanged contentPadding feedback loop with fixed banner heights
commit14e3ff0ed4c72903f442b0962746b24de6e1b686 authoriko <mail@iko.soy> dateWed 8 Jul 2026, 04:41 (3 months ago) parente439e28
2 files changed+20−17
compare with master
unifiedsplit
app/src/main/java/soy/iko/opencode/data/network/NetworkConfig.kt+15 app/src/main/java/soy/iko/opencode/ui/chat/ChatScreen.kt+5−17
app/src/main/java/soy/iko/opencode/data/network/NetworkConfig.kt+15
@@ -431,6 +431,21 @@ object NetworkConfig {
431431 /** Fallback height (dp) for the connection banner when no text is available (e.g. exit fade). */
432432 const val connectionBannerFallbackHeightDp = 44
433433
434+ /** Fixed height (dp) for the connection banner used for LazyColumn top content padding.
435+ * onSizeChanged was previously used to measure the banner's actual height and feed it
436+ * into the LazyColumn's contentPadding, but that created a feedback loop: the banner
437+ * appears → onSizeChanged fires → contentPadding changes → LazyColumn remeasures all
438+ * visible items during the same frame async content (DiffView, images) is settling
439+ * post-mount → draw-phase remeasure NPE. A fixed height eliminates the loop. At large
440+ * accessibility font scales the banner may slightly exceed this, but the 4dp margin
441+ * above it in topPad covers the common case. */
442+ const val connectionBannerHeightDp = 44
443+
444+ /** Fixed height (dp) for the in-conversation search bar used for LazyColumn top
445+ * content padding. Same rationale as connectionBannerHeightDp: onSizeChanged on the
446+ * search bar fed contentPadding and triggered the draw-phase remeasure crash. */
447+ const val chatSearchBarHeightDp = 56
448+
434449 // --- Motion tokens (shared across screens) ---
435450
436451 /** Duration (ms) for horizontal slide push/pop nav transitions. M3 spec recommends 200ms
app/src/main/java/soy/iko/opencode/ui/chat/ChatScreen.kt+5−17
@@ -130,7 +130,6 @@ import androidx.compose.ui.input.key.isShiftPressed
130130import androidx.compose.ui.input.key.key
131131import androidx.compose.ui.input.key.onPreviewKeyEvent
132132import androidx.compose.ui.input.key.type
133−import androidx.compose.ui.layout.onSizeChanged
134133import androidx.compose.ui.platform.LocalContext
135134import androidx.compose.ui.platform.LocalDensity
136135import androidx.compose.ui.platform.LocalHapticFeedback
@@ -1290,28 +1289,18 @@ fun ChatScreen(
12901289 // (the same hazard FileViewScreen's overlay calls out). onSizeChanged only
12911290 // fires while the banner is composed (visible), so gate the inset on
12921291 // bannerVisible and fall back to 44dp until the first measurement arrives.
1293− var bannerHeightPx by remember { mutableIntStateOf(0) }
1294− // Track the search bar height so the list's top padding can grow when search
1295− // is active — otherwise a scrolled-to match lands at index 0, hidden behind
1296− // the floating search bar (the "scroll-under-the-search-bar" bug).
1297− var searchbarHeightPx by remember { mutableIntStateOf(0) }
1298− val density = LocalDensity.current
12991292 val topPad = if (bannerVisible) {
1300− if (bannerHeightPx > 0) {
1301− with(density) { bannerHeightPx.toDp() } + 4.dp
1302− } else {
1303− 44.dp
1304− }
1293+ NetworkConfig.connectionBannerHeightDp.dp + 4.dp
13051294 } else {
13061295 16.dp
1307− } + if (searchActive && searchbarHeightPx > 0) {
1308− with(density) { searchbarHeightPx.toDp() } + 4.dp
1296+ } + if (searchActive) {
1297+ NetworkConfig.chatSearchBarHeightDp.dp + 4.dp
13091298 } else {
13101299 0.dp
13111300 }
13121301 ConnectionBanner(
13131302 state = connectionState,
1314− modifier = Modifier.align(Alignment.TopCenter).onSizeChanged { bannerHeightPx = it.height },
1303+ modifier = Modifier.align(Alignment.TopCenter),
13151304 isOnline = isOnline,
13161305 // On a hard endpoint failure, retry by forcing an SSE reconnect (which
13171306 // re-seeds from REST). refreshMessages is the right recovery path
@@ -1971,8 +1960,7 @@ fun ChatScreen(
19711960 tonalElevation = 3.dp,
19721961 modifier = Modifier
19731962 .padding(horizontal = 12.dp, vertical = 4.dp)
1974− .fillMaxWidth()
1975− .onSizeChanged { searchbarHeightPx = it.height },
1963+ .fillMaxWidth(),
19761964 ) {
19771965 // Focus the search field when the bar appears (from the overflow menu's
19781966 // "Find in conversation" or Ctrl+F), so the user can start typing