Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -269,14 +269,16 @@ fun MessageBubble(
}
}
if (message.content.isNotEmpty()) {
val linkColor = if (message.isInbound) {
MaterialTheme.colorScheme.primary
} else {
MaterialTheme.colorScheme.inversePrimary
}
val annotatedText = remember(message.content, linkColor) {
linkifyString(message.content, linkColor = linkColor)
}
val linkColor =
if (message.isInbound) {
MaterialTheme.colorScheme.primary
} else {
MaterialTheme.colorScheme.inversePrimary
}
val annotatedText =
remember(message.content, linkColor) {
linkifyString(message.content, linkColor = linkColor)
}
Text(
modifier = Modifier.padding(16.dp),
text = annotatedText,
Expand Down
1 change: 0 additions & 1 deletion ChatApp/shared/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -48,5 +48,4 @@ dependencies {
// App functions
implementation(libs.androidx.appfunctions)
ksp(libs.androidx.appfunctions.compiler)

}
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,5 @@
package com.example.chatapp

import android.app.Application

abstract class BaseChatApplication : Application()
Original file line number Diff line number Diff line change
Expand Up @@ -19,19 +19,19 @@ import android.app.PendingIntent
import android.content.Intent
import android.net.Uri
import androidx.annotation.RequiresApi
import androidx.appfunctions.AppFunction
import androidx.appfunctions.AppFunctionAppUnknownException
import androidx.appfunctions.AppFunctionElementNotFoundException
import androidx.appfunctions.AppFunctionInvalidArgumentException
import androidx.appfunctions.AppFunctionService
import androidx.appfunctions.AppFunctionServiceEntryPoint
import androidx.appfunctions.AppFunctionStringValueConstraint
import androidx.appfunctions.AppFunction
import com.example.chatapp.data.CallManager
import com.example.chatapp.data.MessageRepository
import com.example.chatapp.data.RecipientsRepository
import dagger.hilt.android.AndroidEntryPoint
import javax.inject.Inject
import kotlinx.coroutines.CancellationException
import javax.inject.Inject

/**
* Service entry point for chat-related AppFunctions such as searching contacts, sending messages, and making calls.
Expand All @@ -44,7 +44,9 @@ import kotlinx.coroutines.CancellationException
)
abstract class BaseChatAppFunctionService : AppFunctionService() {
@Inject lateinit var messageRepository: MessageRepository

@Inject lateinit var recipientsRepository: RecipientsRepository

@Inject lateinit var callManager: CallManager

/**
Expand Down Expand Up @@ -153,9 +155,7 @@ abstract class BaseChatAppFunctionService : AppFunctionService() {
* @throws AppFunctionElementNotFoundException If no recipient exists for endpointValue. If thrown, call "searchContacts" to find the correct ID.
*/
@AppFunction(isDescribedByKDoc = true)
suspend fun makeCall(
endpointValue: String,
): PendingIntent {
suspend fun makeCall(endpointValue: String): PendingIntent {
val recipient =
recipientsRepository.getRecipientById(endpointValue)
?: throw AppFunctionElementNotFoundException(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/

package com.example.chatapp.appfunctions

import androidx.appfunctions.AppFunctionSerializable


/**
* Represents a result from a contact or group search.
*/
Expand Down Expand Up @@ -67,4 +65,4 @@ data class ChatGroup(
val name: String,
/** List of members belonging to the group. */
val recipients: List<Recipient>,
)
)
31 changes: 18 additions & 13 deletions ChatApp/shared/src/main/kotlin/com/example/chatapp/util/Linkify.kt
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,10 @@ import androidx.compose.ui.text.TextLinkStyles
import androidx.compose.ui.text.buildAnnotatedString
import androidx.compose.ui.text.style.TextDecoration

fun linkifyString(text: String, linkColor: Color? = null): AnnotatedString {
fun linkifyString(
text: String,
linkColor: Color? = null,
): AnnotatedString {
val matcher = Patterns.WEB_URL.matcher(text)
var lastIndex = 0
return buildAnnotatedString {
Expand All @@ -35,22 +38,24 @@ fun linkifyString(text: String, linkColor: Color? = null): AnnotatedString {

append(text.substring(lastIndex, start))

val uriStr = if (url.startsWith("http://", ignoreCase = true) || url.startsWith("https://", ignoreCase = true)) {
url
} else {
"https://$url"
}

val linkStyle = SpanStyle(
color = linkColor ?: Color.Unspecified,
textDecoration = TextDecoration.Underline
)
val uriStr =
if (url.startsWith("http://", ignoreCase = true) || url.startsWith("https://", ignoreCase = true)) {
url
} else {
"https://$url"
}

val linkStyle =
SpanStyle(
color = linkColor ?: Color.Unspecified,
textDecoration = TextDecoration.Underline,
)

pushLink(
LinkAnnotation.Url(
url = uriStr,
styles = TextLinkStyles(style = linkStyle)
)
styles = TextLinkStyles(style = linkStyle),
),
)
append(url)
pop()
Expand Down
1 change: 0 additions & 1 deletion ChatApp/wear/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,6 @@ dependencies {
// App functions
implementation(libs.androidx.appfunctions)
ksp(libs.androidx.appfunctions.compiler)

}

// AppFunctions ksp option
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -70,9 +70,10 @@ fun WearChatScreen(
title = { Text(text = if (message.isInbound) message.senderName ?: "Sender" else "Me") },
) {
val linkColor = MaterialTheme.colorScheme.primary
val annotatedText = remember(message.content, linkColor) {
linkifyString(text = message.content, linkColor = linkColor)
}
val annotatedText =
remember(message.content, linkColor) {
linkifyString(text = message.content, linkColor = linkColor)
}
Text(text = annotatedText)
}
}
Expand Down
6 changes: 5 additions & 1 deletion agent/app/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
plugins {
alias(libs.plugins.android.application)
alias(libs.plugins.kotlin.compose)
alias(libs.plugins.kotlin.serialization)
alias(libs.plugins.ksp)
alias(libs.plugins.hilt)
alias(libs.plugins.screenshot)
Expand Down Expand Up @@ -60,7 +61,10 @@ android {
dimension = "mode"
buildConfigField("Boolean", "IS_RETAIL", "true")

val containsRetail = gradle.startParameter.taskNames.any { it.contains("Retail", ignoreCase = true) }
val containsRetail =
gradle.startParameter.taskNames.any {
it.contains("Retail", ignoreCase = true)
}
val apiKey = project.findProperty("GEMINI_API_KEY") as? String ?: ""
if (containsRetail && apiKey.isEmpty()) {
throw GradleException(
Expand Down
10 changes: 10 additions & 0 deletions agent/app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,16 @@
android:exported="false"
tools:replace="android:label,android:theme" />

<provider
android:name="androidx.core.content.FileProvider"
android:authorities="${applicationId}.fileprovider"
android:exported="false"
android:grantUriPermissions="true">
<meta-data
android:name="android.support.FILE_PROVIDER_PATHS"
android:resource="@xml/file_paths" />
</provider>

<service
android:name="com.example.appfunctions.agent.data.BuiltInAppFunctionService"
android:permission="android.permission.BIND_APP_FUNCTION_SERVICE"
Expand Down
Loading