惯性聚合 高效追踪和阅读你感兴趣的博客、新闻、科技资讯
阅读原文 在惯性聚合中打开

推荐订阅源

H
Help Net Security
G
Google Developers Blog
aimingoo的专栏
aimingoo的专栏
博客园 - 聂微东
酷 壳 – CoolShell
酷 壳 – CoolShell
小众软件
小众软件
Stack Overflow Blog
Stack Overflow Blog
美团技术团队
博客园_首页
T
Tailwind CSS Blog
博客园 - 三生石上(FineUI控件)
B
Blog
D
DataBreaches.Net
腾讯CDC
C
Check Point Blog
钛媒体:引领未来商业与生活新知
钛媒体:引领未来商业与生活新知
U
Unit 42
月光博客
月光博客
V
V2EX
Vercel News
Vercel News
T
The Blog of Author Tim Ferriss
The Cloudflare Blog
博客园 - 叶小钗
Y
Y Combinator Blog

Recent Commits to openclaw:main

test: merge chat side-result checks · openclaw/openclaw@ddd2c2a test: merge cron history checks · openclaw/openclaw@f7eb746 test: merge responsive navigation shell checks · openclaw/openclaw@c2e4b47 docs(changelog): add codex oauth fixes · openclaw/openclaw@628e6cd test: merge navigation routing cases · openclaw/openclaw@5d8cecb Tests: mock channel registry bundled fallback · openclaw/openclaw@2b08233 Secrets: avoid broad web search discovery for single plugin config · openclaw/openclaw@a464f59 test: merge config view browser checks · openclaw/openclaw@20cf511 fix(status): align oauth health with runtime · openclaw/openclaw@eed7116 feat: add macOS screen snapshots for monitor preview (#67954) thanks … · openclaw/openclaw@f377db1 fix: report shared auth scopes in hello-ok (#67810) thanks @BunsDev · openclaw/openclaw@0b6c39b Auto-reply: avoid eager bundled route fallback · openclaw/openclaw@3ea1bf4 Tests: narrow session binding contract setup · openclaw/openclaw@54e4e16 fix(macOS): enable undo/redo in webchat composer text input (#34962) · openclaw/openclaw@00951dc Tests: speed up channel setup promotion · openclaw/openclaw@82b529a Docs: refresh agent instructions · openclaw/openclaw@5775fe2 fix(auth): serialize OAuth refresh across agents to fix #26322 (#67876) · openclaw/openclaw@8e79080 test: allow ollama public surface boundary test · openclaw/openclaw@7d4f1a6 Docs: add test performance guardrails · openclaw/openclaw@89706d3 Tests: restore context-engine usage proof · openclaw/openclaw@e4c4f95 Tests: slim context engine runtime coverage · openclaw/openclaw@74c198f ci: retry failed custom checkouts · openclaw/openclaw@0ee5baf test: trim duplicate provider auth onboarding cases · openclaw/openclaw@1ffc02e matrix: fix sessions_spawn --thread subagent session spawning (#67643) · openclaw/openclaw@1ce2596 test: reduce auth choice fixture churn · openclaw/openclaw@857b9cd test: mock health status config boundaries · openclaw/openclaw@9d5ab4a test: mock onboard config io boundary · openclaw/openclaw@299694d test: mock legacy state plugin boundaries · openclaw/openclaw@2713089 test: mock channel install boundaries · openclaw/openclaw@b945248 test: mock doctor preview channel boundaries · openclaw/openclaw@b1a3ad4
feat(android): wire v2 chat image attachments · openclaw/...
obviyus · 2026-05-20 · via Recent Commits to openclaw:main

@@ -4,13 +4,17 @@ import ai.openclaw.app.MainViewModel

44

import ai.openclaw.app.chat.ChatMessage

55

import ai.openclaw.app.chat.ChatMessageContent

66

import ai.openclaw.app.chat.ChatPendingToolCall

7+

import ai.openclaw.app.chat.OutgoingAttachment

78

import ai.openclaw.app.ui.design.ClawListItem

89

import ai.openclaw.app.ui.design.ClawPanel

910

import ai.openclaw.app.ui.design.ClawStatus

1011

import ai.openclaw.app.ui.design.ClawStatusPill

1112

import ai.openclaw.app.ui.design.ClawTheme

13+

import androidx.activity.compose.rememberLauncherForActivityResult

14+

import androidx.activity.result.contract.ActivityResultContracts

1215

import androidx.compose.foundation.BorderStroke

1316

import androidx.compose.foundation.background

17+

import androidx.compose.foundation.horizontalScroll

1418

import androidx.compose.foundation.layout.Arrangement

1519

import androidx.compose.foundation.layout.Box

1620

import androidx.compose.foundation.layout.Column

@@ -27,13 +31,15 @@ import androidx.compose.foundation.layout.width

2731

import androidx.compose.foundation.lazy.LazyColumn

2832

import androidx.compose.foundation.lazy.items

2933

import androidx.compose.foundation.lazy.rememberLazyListState

34+

import androidx.compose.foundation.rememberScrollState

3035

import androidx.compose.foundation.shape.CircleShape

3136

import androidx.compose.foundation.shape.RoundedCornerShape

3237

import androidx.compose.foundation.text.BasicTextField

3338

import androidx.compose.material.icons.Icons

3439

import androidx.compose.material.icons.automirrored.filled.ArrowBack

3540

import androidx.compose.material.icons.automirrored.filled.Send

3641

import androidx.compose.material.icons.filled.AttachFile

42+

import androidx.compose.material.icons.filled.Close

3743

import androidx.compose.material.icons.filled.Mic

3844

import androidx.compose.material.icons.filled.Refresh

3945

import androidx.compose.material3.HorizontalDivider

@@ -44,6 +50,7 @@ import androidx.compose.runtime.Composable

4450

import androidx.compose.runtime.LaunchedEffect

4551

import androidx.compose.runtime.collectAsState

4652

import androidx.compose.runtime.getValue

53+

import androidx.compose.runtime.mutableStateListOf

4754

import androidx.compose.runtime.mutableStateOf

4855

import androidx.compose.runtime.remember

4956

import androidx.compose.runtime.rememberCoroutineScope

@@ -53,12 +60,15 @@ import androidx.compose.ui.Alignment

5360

import androidx.compose.ui.Modifier

5461

import androidx.compose.ui.graphics.Color

5562

import androidx.compose.ui.graphics.SolidColor

63+

import androidx.compose.ui.platform.LocalContext

5664

import androidx.compose.ui.text.font.FontWeight

5765

import androidx.compose.ui.text.style.TextAlign

5866

import androidx.compose.ui.text.style.TextOverflow

5967

import androidx.compose.ui.unit.dp

6068

import androidx.compose.ui.unit.sp

69+

import kotlinx.coroutines.Dispatchers

6170

import kotlinx.coroutines.launch

71+

import kotlinx.coroutines.withContext

6272

import java.text.DateFormat

6373

import java.util.Date

6474

import java.util.Locale

@@ -81,7 +91,27 @@ fun V2ChatScreen(

8191

val sessions by viewModel.chatSessions.collectAsState()

8292

val chatDraft by viewModel.chatDraft.collectAsState()

8393

val pendingAssistantAutoSend by viewModel.pendingAssistantAutoSend.collectAsState()

94+

val context = LocalContext.current

95+

val resolver = context.contentResolver

8496

val scope = rememberCoroutineScope()

97+

val attachments = remember { mutableStateListOf<PendingImageAttachment>() }

98+

val pickImages =

99+

rememberLauncherForActivityResult(ActivityResultContracts.GetMultipleContents()) { uris ->

100+

if (uris.isNullOrEmpty()) return@rememberLauncherForActivityResult

101+

scope.launch(Dispatchers.IO) {

102+

val next =

103+

uris.take(8).mapNotNull { uri ->

104+

try {

105+

loadSizedImageAttachment(resolver, uri)

106+

} catch (_: Throwable) {

107+

null

108+

}

109+

}

110+

withContext(Dispatchers.Main) {

111+

attachments.addAll(next)

112+

}

113+

}

114+

}

8511586116

LaunchedEffect(Unit) {

87117

viewModel.loadChat(mainSessionKey)

@@ -146,18 +176,31 @@ fun V2ChatScreen(

146176

V2ChatComposer(

147177

value = input,

148178

onValueChange = { input = it },

179+

attachments = attachments,

149180

thinkingLevel = thinkingLevel,

150181

healthOk = healthOk,

151182

pendingRunCount = pendingRunCount,

152183

onThinkingLevelChange = viewModel::setChatThinkingLevel,

184+

onPickImages = { pickImages.launch("image/*") },

185+

onRemoveAttachment = { id -> attachments.removeAll { it.id == id } },

153186

onVoice = onVoice,

154187

onAbort = viewModel::abortChat,

155188

onSend = {

156189

val message = input.trim()

157-

if (message.isEmpty()) return@V2ChatComposer

190+

if (message.isEmpty() && attachments.isEmpty()) return@V2ChatComposer

191+

val outgoing =

192+

attachments.map { attachment ->

193+

OutgoingAttachment(

194+

type = "image",

195+

mimeType = attachment.mimeType,

196+

fileName = attachment.fileName,

197+

base64 = attachment.base64,

198+

)

199+

}

158200

input = ""

201+

attachments.clear()

159202

scope.launch {

160-

viewModel.sendChat(message = message, thinking = thinkingLevel, attachments = emptyList())

203+

viewModel.sendChat(message = message, thinking = thinkingLevel, attachments = outgoing)

161204

}

162205

},

163206

)

@@ -537,21 +580,28 @@ private fun V2ChatNotice(

537580

private fun V2ChatComposer(

538581

value: String,

539582

onValueChange: (String) -> Unit,

583+

attachments: List<PendingImageAttachment>,

540584

thinkingLevel: String,

541585

healthOk: Boolean,

542586

pendingRunCount: Int,

543587

onThinkingLevelChange: (String) -> Unit,

588+

onPickImages: () -> Unit,

589+

onRemoveAttachment: (String) -> Unit,

544590

onVoice: () -> Unit,

545591

onAbort: () -> Unit,

546592

onSend: () -> Unit,

547593

) {

548594

Column(modifier = Modifier.fillMaxWidth().imePadding(), verticalArrangement = Arrangement.spacedBy(4.dp)) {

595+

if (attachments.isNotEmpty()) {

596+

V2AttachmentStrip(attachments = attachments, onRemoveAttachment = onRemoveAttachment)

597+

}

598+549599

V2ChatContextMeter(thinkingLevel = thinkingLevel, onClick = { onThinkingLevelChange(nextThinkingValue(thinkingLevel)) })

550600551601

Row(modifier = Modifier.fillMaxWidth(), verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.spacedBy(6.dp)) {

552-

V2ChatInputPill(value = value, onValueChange = onValueChange, onVoice = onVoice, modifier = Modifier.weight(1f))

602+

V2ChatInputPill(value = value, onValueChange = onValueChange, onPickImages = onPickImages, onVoice = onVoice, modifier = Modifier.weight(1f))

553603

V2SendButton(

554-

enabled = healthOk && pendingRunCount == 0 && value.trim().isNotEmpty(),

604+

enabled = healthOk && pendingRunCount == 0 && (value.trim().isNotEmpty() || attachments.isNotEmpty()),

555605

onClick = onSend,

556606

)

557607

}

@@ -627,6 +677,7 @@ private fun V2ChatContextMeter(

627677

private fun V2ChatInputPill(

628678

value: String,

629679

onValueChange: (String) -> Unit,

680+

onPickImages: () -> Unit,

630681

onVoice: () -> Unit,

631682

modifier: Modifier = Modifier,

632683

) {

@@ -642,7 +693,11 @@ private fun V2ChatInputPill(

642693

verticalAlignment = Alignment.CenterVertically,

643694

horizontalArrangement = Arrangement.spacedBy(7.dp),

644695

) {

645-

Icon(imageVector = Icons.Default.AttachFile, contentDescription = "Attach file", modifier = Modifier.size(13.dp), tint = ClawTheme.colors.text)

696+

Surface(onClick = onPickImages, modifier = Modifier.size(ClawTheme.spacing.touchTarget), shape = CircleShape, color = ClawTheme.colors.surfaceRaised, contentColor = ClawTheme.colors.text) {

697+

Box(contentAlignment = Alignment.Center) {

698+

Icon(imageVector = Icons.Default.AttachFile, contentDescription = "Attach image", modifier = Modifier.size(16.dp))

699+

}

700+

}

646701

Box(modifier = Modifier.weight(1f)) {

647702

BasicTextField(

648703

value = value,

@@ -677,6 +732,44 @@ private fun V2ChatInputPill(

677732

}

678733

}

679734735+

@Composable

736+

private fun V2AttachmentStrip(

737+

attachments: List<PendingImageAttachment>,

738+

onRemoveAttachment: (String) -> Unit,

739+

) {

740+

Row(modifier = Modifier.fillMaxWidth().horizontalScroll(rememberScrollState()), horizontalArrangement = Arrangement.spacedBy(6.dp)) {

741+

attachments.forEach { attachment ->

742+

V2AttachmentChip(fileName = attachment.fileName, onRemove = { onRemoveAttachment(attachment.id) })

743+

}

744+

}

745+

}

746+747+

@Composable

748+

private fun V2AttachmentChip(

749+

fileName: String,

750+

onRemove: () -> Unit,

751+

) {

752+

Surface(

753+

shape = RoundedCornerShape(ClawTheme.radii.pill),

754+

color = ClawTheme.colors.surfaceRaised,

755+

contentColor = ClawTheme.colors.text,

756+

border = BorderStroke(1.dp, ClawTheme.colors.border),

757+

) {

758+

Row(

759+

modifier = Modifier.padding(start = 9.dp, top = 5.dp, end = 5.dp, bottom = 5.dp),

760+

verticalAlignment = Alignment.CenterVertically,

761+

horizontalArrangement = Arrangement.spacedBy(6.dp),

762+

) {

763+

Text(text = fileName, style = ClawTheme.type.caption, color = ClawTheme.colors.textMuted, maxLines = 1, overflow = TextOverflow.Ellipsis)

764+

Surface(onClick = onRemove, modifier = Modifier.size(22.dp), shape = CircleShape, color = ClawTheme.colors.canvas, contentColor = ClawTheme.colors.text) {

765+

Box(contentAlignment = Alignment.Center) {

766+

Icon(imageVector = Icons.Default.Close, contentDescription = "Remove attachment", modifier = Modifier.size(13.dp))

767+

}

768+

}

769+

}

770+

}

771+

}

772+680773

private fun currentSessionTitle(

681774

sessionKey: String,

682775

sessions: List<ai.openclaw.app.chat.ChatSessionEntry>,