Appfunctions media attachments

ChatApp/app/src/androidTest/kotlin/com/example/chatapp/appfunctions/AppFunctionInstrumentationTest.kt

@@ -24,7 +24,6 @@ import androidx.appfunctions.ExecuteAppFunctionRequest
 import androidx.appfunctions.ExecuteAppFunctionResponse
 import androidx.test.core.app.ApplicationProvider
 import androidx.test.ext.junit.runners.AndroidJUnit4
-import com.example.chatapp.appfunctions.ChatAppFunctionService
 import com.example.chatapp.data.MessageRepository
 import com.example.chatapp.data.RecipientsRepository
 import com.google.common.truth.Truth.assertThat

ChatApp/app/src/main/kotlin/com/example/chatapp/InputBar.kt

@@ -38,6 +38,7 @@ 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
@@ -77,7 +78,8 @@ internal fun InputBar(
 
     Surface(
         modifier = modifier,
-        tonalElevation = 3.dp,
+        color = Color.Transparent,
+        tonalElevation = 0.dp,
     ) {
         Column {
             if (selectedImages.isNotEmpty()) {
@@ -107,18 +109,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,

ChatApp/app/src/main/kotlin/com/example/chatapp/uicomponents/ChatScreen.kt

@@ -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
@@ -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
@@ -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 -> {}
+                    }
                 }
             }
         }

ChatApp/gradle/gradle-daemon-jvm.properties

@@ -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

ChatApp/shared/build.gradle.kts

@@ -48,5 +48,4 @@ dependencies {
     // App functions
     implementation(libs.androidx.appfunctions)
     ksp(libs.androidx.appfunctions.compiler)
-
 }

ChatApp/shared/src/main/kotlin/com/example/chatapp/BaseChatApplication.kt

@@ -16,4 +16,5 @@
 package com.example.chatapp
 
 import android.app.Application
+
 abstract class BaseChatApplication : Application()

ChatApp/shared/src/main/kotlin/com/example/chatapp/ChatViewModel.kt

@@ -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
@@ -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)
@@ -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 {
@@ -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() {