Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
b61f0f2
agent: Add image generation appfunction
Jul 8, 2026
81197ad
fix: address gemini-code-assist bot code review feedback
Jul 8, 2026
eccfb9b
agent & ChatApp: Integrate cross-app AppFunctions and media attachments
Jul 9, 2026
286f0e8
Resolve merge conflicts with upstream 1.0.0-alpha10 and fix duplicate…
Jul 9, 2026
0fdf2ae
fix: Merge agent-image-gen into appfunctions-media-attachments and po…
Jul 10, 2026
4bb9b27
fix: add sportless formatting
Jul 10, 2026
c236907
fix: address gemini-code-assist bot code review feedback
Jul 10, 2026
7c2f3d7
style: apply spotless formatting and rename service files without spo…
Jul 14, 2026
0ce6468
refactor: break down generateImage into private helpers, improve null…
Jul 14, 2026
b642858
style: apply spotless formatting and rename service files to match cl…
Jul 15, 2026
d678128
refactor: Improve kotlin-readbility and break down generateImage into…
Jul 15, 2026
9be5eef
test: refactor AgentOrchestratorTest expression functions to block bo…
Jul 15, 2026
16ca008
Merge branch 'main' into agent-image-gen
keyboardsurfer Jul 20, 2026
a30cfd0
Merge branch 'main' into appfunctions-media-attachments
keyboardsurfer Jul 20, 2026
7bac6d4
docs: add KDoc documentation to WallpaperRepository
Jul 20, 2026
0d61c7c
fix: copy new wallpaper file before deleting old files in WallpaperRe…
Jul 20, 2026
42134fb
Merge main into agent-image-gen
Jul 20, 2026
cd99d5d
fix: deduplicate function declarations in Gemini tool payload
Jul 20, 2026
e1e273b
style: apply spotless
Jul 20, 2026
68740c4
Merge public-fork/agent-image-gen into agent-image-gen
Jul 20, 2026
a74d184
Merge branch 'agent-image-gen' into appfunctions-media-attachments
Jul 21, 2026
0fa0f26
fix: include voiceNoteUri in KNOWN_FILE_REFERENCE_PARAM_NAMES and upd…
Jul 21, 2026
d2850b4
style: apply spotless formatting to InputBar.kt
Jul 21, 2026
384b8e0
Merge main into appfunctions-media-attachments
Jul 21, 2026
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 11 additions & 3 deletions ChatApp/app/src/main/kotlin/com/example/chatapp/InputBar.kt
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ import androidx.compose.material.icons.automirrored.filled.Send
import androidx.compose.material.icons.filled.Add
import androidx.compose.material3.FilledIconButton
import androidx.compose.material3.Icon
import androidx.compose.material3.IconButton
import androidx.compose.material3.IconButtonDefaults
import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.Surface
import androidx.compose.material3.Text
Expand Down Expand Up @@ -77,7 +77,8 @@ internal fun InputBar(

Surface(
modifier = modifier,
tonalElevation = 3.dp,
color = Color.Transparent,
tonalElevation = 0.dp,
) {
Column {
if (selectedImages.isNotEmpty()) {
Expand Down Expand Up @@ -107,18 +108,25 @@ internal fun InputBar(
verticalAlignment = Alignment.CenterVertically,
horizontalArrangement = Arrangement.spacedBy(4.dp),
) {
IconButton(
FilledIconButton(
onClick = {
photoPickerLauncher.launch(
PickVisualMediaRequest(ActivityResultContracts.PickVisualMedia.ImageOnly),
)
},
modifier = Modifier.size(56.dp),
colors =
IconButtonDefaults.filledIconButtonColors(
containerColor = MaterialTheme.colorScheme.surfaceVariant,
contentColor = MaterialTheme.colorScheme.onSurfaceVariant,
),
) {
Icon(
imageVector = Icons.Default.Add,
contentDescription = "Add Image",
)
}
Spacer(modifier = Modifier.width(4.dp))
TextField(
value = value,
onValueChange = onInputChanged,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,9 @@
*/
package com.example.chatapp.uicomponents

import androidx.compose.foundation.background
import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.PaddingValues
import androidx.compose.foundation.layout.consumeWindowInsets
Expand Down Expand Up @@ -57,6 +59,7 @@ import androidx.compose.runtime.setValue
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.draw.clip
import androidx.compose.ui.graphics.Color
import androidx.compose.ui.input.nestedscroll.nestedScroll
import androidx.compose.ui.layout.ContentScale
import androidx.compose.ui.res.stringResource
Expand Down Expand Up @@ -90,99 +93,123 @@ fun ChatScreen(
val uiState by viewModel.uiState.collectAsStateWithLifecycle()
var message by rememberSaveable { mutableStateOf("") }

Scaffold(
modifier =
Modifier
.fillMaxSize()
.nestedScroll(scrollBehavior.nestedScrollConnection),
topBar = {
TopAppBar(
colors =
topAppBarColors(
containerColor = MaterialTheme.colorScheme.primaryContainer,
titleContentColor = MaterialTheme.colorScheme.onPrimaryContainer,
),
title = {
Text(text = viewModel.recipient.name)
},
navigationIcon = {
IconButton(onClick = onBackClick) {
Icon(
imageVector = Icons.AutoMirrored.Filled.ArrowBack,
contentDescription = "Back",
)
}
},
actions = {
IconButton(onClick = onCallClick) {
Icon(
imageVector = Icons.Default.Call,
contentDescription = "Call",
)
}
},
Box(modifier = Modifier.fillMaxSize()) {
uiState.wallpaperPath?.let { path ->
AsyncImage(
model = path,
contentDescription = "Chat Wallpaper",
contentScale = ContentScale.Crop,
modifier = Modifier.fillMaxSize(),
)
},
bottomBar = {
InputBar(
value = message,
placeholder = stringResource(R.string.input_placeholder),
onInputChanged = {
message = it
},
onSendClick = { uris ->
viewModel.sendMessage(message, uris)
message = ""
},
sendEnabled = uiState.botMessageState !is BotMessageState.Generating,
Box(
modifier =
Modifier
.navigationBarsPadding()
.imePadding(),
.fillMaxSize()
.background(Color.Black.copy(alpha = 0.45f)),
)
},
) { innerPadding ->
Column(
}

Scaffold(
modifier =
Modifier
.fillMaxSize()
.padding(innerPadding)
.consumeWindowInsets(innerPadding),
) {
MessageList(
.nestedScroll(scrollBehavior.nestedScrollConnection),
containerColor =
if (uiState.wallpaperPath != null) {
Color.Transparent
} else {
MaterialTheme.colorScheme.surfaceVariant
},
topBar = {
TopAppBar(
colors =
topAppBarColors(
containerColor = MaterialTheme.colorScheme.primaryContainer,
titleContentColor = MaterialTheme.colorScheme.onPrimaryContainer,
),
title = {
Text(text = viewModel.recipient.name)
},
navigationIcon = {
IconButton(onClick = onBackClick) {
Icon(
imageVector = Icons.AutoMirrored.Filled.ArrowBack,
contentDescription = "Back",
)
}
},
actions = {
IconButton(onClick = onCallClick) {
Icon(
imageVector = Icons.Default.Call,
contentDescription = "Call",
)
}
},
)
},
bottomBar = {
InputBar(
value = message,
placeholder = stringResource(R.string.input_placeholder),
onInputChanged = {
message = it
},
onSendClick = { uris ->
viewModel.sendMessage(message, uris)
message = ""
},
sendEnabled = uiState.botMessageState !is BotMessageState.Generating,
modifier =
Modifier
.navigationBarsPadding()
.imePadding(),
)
},
) { innerPadding ->
Box(
modifier =
Modifier
.fillMaxWidth()
.padding(horizontal = 16.dp)
.weight(1f),
messages = uiState.messages,
contentPadding = PaddingValues(bottom = 8.dp),
)

when (val state = uiState.botMessageState) {
is BotMessageState.Generating -> {
CircularProgressIndicator(
.fillMaxSize()
.padding(innerPadding)
.consumeWindowInsets(innerPadding),
) {
Column(modifier = Modifier.fillMaxSize()) {
MessageList(
modifier =
Modifier
.padding(vertical = 8.dp)
.align(Alignment.CenterHorizontally),
.fillMaxWidth()
.padding(horizontal = 16.dp)
.weight(1f),
messages = uiState.messages,
contentPadding = PaddingValues(bottom = 8.dp),
)
}

is BotMessageState.Error -> {
AlertDialog(
onDismissRequest = { viewModel.dismissError() },
title = { Text(text = stringResource(R.string.error)) },
text = { Text(text = state.errorMessage) },
confirmButton = {
Button(onClick = { viewModel.dismissError() }) {
Text(text = stringResource(R.string.dismiss_button))
}
},
)
}
when (val state = uiState.botMessageState) {
is BotMessageState.Generating -> {
CircularProgressIndicator(
modifier =
Modifier
.padding(vertical = 8.dp)
.align(Alignment.CenterHorizontally),
)
}

else -> { // No additional UI for waiting state
is BotMessageState.Error -> {
AlertDialog(
onDismissRequest = { viewModel.dismissError() },
title = { Text(text = stringResource(R.string.error)) },
text = { Text(text = state.errorMessage) },
confirmButton = {
Button(onClick = { viewModel.dismissError() }) {
Text(text = stringResource(R.string.dismiss_button))
}
},
)
}

else -> {}
}
}
}
}
Expand Down
12 changes: 12 additions & 0 deletions ChatApp/gradle/gradle-daemon-jvm.properties
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
#This file is generated by updateDaemonJvm
toolchainUrl.FREE_BSD.AARCH64=https\://api.foojay.io/disco/v3.0/ids/ec7520a1e057cd116f9544c42142a16b/redirect
toolchainUrl.FREE_BSD.X86_64=https\://api.foojay.io/disco/v3.0/ids/4c4f879899012ff0a8b2e2117df03b0e/redirect
toolchainUrl.LINUX.AARCH64=https\://api.foojay.io/disco/v3.0/ids/ec7520a1e057cd116f9544c42142a16b/redirect
toolchainUrl.LINUX.X86_64=https\://api.foojay.io/disco/v3.0/ids/4c4f879899012ff0a8b2e2117df03b0e/redirect
toolchainUrl.MAC_OS.AARCH64=https\://api.foojay.io/disco/v3.0/ids/73bcfb608d1fde9fb62e462f834a3299/redirect
toolchainUrl.MAC_OS.X86_64=https\://api.foojay.io/disco/v3.0/ids/846ee0d876d26a26f37aa1ce8de73224/redirect
toolchainUrl.UNIX.AARCH64=https\://api.foojay.io/disco/v3.0/ids/ec7520a1e057cd116f9544c42142a16b/redirect
toolchainUrl.UNIX.X86_64=https\://api.foojay.io/disco/v3.0/ids/4c4f879899012ff0a8b2e2117df03b0e/redirect
toolchainUrl.WINDOWS.AARCH64=https\://api.foojay.io/disco/v3.0/ids/9482ddec596298c84656d31d16652665/redirect
toolchainUrl.WINDOWS.X86_64=https\://api.foojay.io/disco/v3.0/ids/39701d92e1756bb2f141eb67cd4c660e/redirect
toolchainVersion=21
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ import com.example.chatapp.data.CallManager
import com.example.chatapp.data.DisplayMessage
import com.example.chatapp.data.MessageRepository
import com.example.chatapp.data.RecipientsRepository
import com.example.chatapp.data.WallpaperRepository
import dagger.assisted.Assisted
import dagger.assisted.AssistedFactory
import dagger.assisted.AssistedInject
Expand Down Expand Up @@ -64,6 +65,8 @@ data class ChatbotUiState(
val messages: List<DisplayMessage> = listOf(),
/** The current state of the bot's response generation. */
val botMessageState: BotMessageState = BotMessageState.WaitingForMessage,
/** Optional path to a custom wallpaper image for this chat. */
val wallpaperPath: String? = null,
)

@HiltViewModel(assistedFactory = ChatViewModel.Factory::class)
Expand All @@ -74,6 +77,7 @@ class ChatViewModel
private val messageRepository: MessageRepository,
private val callManager: CallManager,
private val recipientsRepository: RecipientsRepository,
private val wallpaperRepository: WallpaperRepository,
) : ViewModel() {
@AssistedFactory
interface Factory {
Expand Down Expand Up @@ -102,6 +106,11 @@ class ChatViewModel
_uiState.update { it.copy(messages = msgs) }
}
}
viewModelScope.launch {
wallpaperRepository.getWallpaper(recipientId).collect { path ->
_uiState.update { it.copy(wallpaperPath = path) }
}
}
}

fun startCall() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ import androidx.appfunctions.AppFunctionStringValueConstraint
import com.example.chatapp.data.CallManager
import com.example.chatapp.data.MessageRepository
import com.example.chatapp.data.RecipientsRepository
import com.example.chatapp.data.WallpaperRepository
import dagger.hilt.android.AndroidEntryPoint
import kotlinx.coroutines.CancellationException
import javax.inject.Inject
Expand All @@ -49,6 +50,8 @@ abstract class BaseChatAppFunctionService : AppFunctionService() {

@Inject lateinit var callManager: CallManager

@Inject lateinit var wallpaperRepository: WallpaperRepository

/**
* Search for message recipients or chat groups by name or email.
* Required workflow: Call this before "send" or "makeCall" to obtain a valid endpointValue (unique ID).
Expand Down Expand Up @@ -172,4 +175,31 @@ abstract class BaseChatAppFunctionService : AppFunctionService() {
PendingIntent.FLAG_ONE_SHOT or PendingIntent.FLAG_IMMUTABLE,
)
}

/**
* Updates the wallpaper image for a specific chat conversation.
*
* @param chatId The unique identifier for the recipient or chat group.
* @param wallpaperUri The URI of the image file to set as the chat wallpaper.
*/
@AppFunction(isDescribedByKDoc = true)
suspend fun updateChatWallpaper(
chatId: String,
wallpaperUri: Uri,
): Boolean {
val resolvedId =
recipientsRepository.getRecipientById(chatId)?.id
?: recipientsRepository.getGroupById(chatId)?.id
?: recipientsRepository.searchAny(chatId, maxCount = 1).firstOrNull()?.endpointValue
?: chatId
val inputStream =
try {
contentResolver.openInputStream(wallpaperUri)
} catch (e: Exception) {
throw AppFunctionInvalidArgumentException("Cannot open wallpaper stream: ${e.message}")
} ?: throw AppFunctionInvalidArgumentException("Cannot open wallpaper stream")
return inputStream.use { stream ->
wallpaperRepository.setWallpaper(resolvedId, stream)
}
}
}
Loading
Loading