Skip to content

Commit d9e7380

Browse files
committed
update
1 parent 93f60a9 commit d9e7380

File tree

6 files changed

+16
-13
lines changed

6 files changed

+16
-13
lines changed

firebase-ai/app/src/main/AndroidManifest.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,10 @@
22
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
33
xmlns:tools="http://schemas.android.com/tools">
44

5+
<uses-permission android:name="android.permission.INTERNET" />
6+
<uses-permission android:name="android.permission.RECORD_AUDIO" />
7+
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
8+
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
59
<application
610
android:allowBackup="true"
711
android:dataExtractionRules="@xml/data_extraction_rules"
@@ -24,9 +28,5 @@
2428
</intent-filter>
2529
</activity>
2630
</application>
27-
<uses-permission android:name="android.permission.INTERNET" />
28-
<uses-permission android:name="android.permission.RECORD_AUDIO" />
29-
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
30-
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
3131

3232
</manifest>

firebase-ai/app/src/main/java/com/google/firebase/quickstart/ai/FirebaseAISamples.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -271,7 +271,7 @@ val FIREBASE_AI_SAMPLES = listOf(
271271
}
272272
),
273273
Sample(
274-
title = "Converse With AI",
274+
title = "ForecastTalk",
275275
description = "Simple app which allows you to talk to AI and" +
276276
" also get information about the weather conditions",
277277
navRoute = "stream",

firebase-ai/app/src/main/java/com/google/firebase/quickstart/ai/feature/live/BidiViewModel.kt

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ class BidiViewModel(
6565
}
6666
@OptIn(PublicPreviewAPI::class)
6767
val liveModel = FirebaseAI.getInstance(Firebase.app, sample.backend).liveModel(
68-
"gemini-live-2.5-flash-preview",
68+
"gemini-live-2.5-flash",
6969
generationConfig = liveGenerationConfig,
7070
tools = sample.tools
7171
)
@@ -77,11 +77,15 @@ class BidiViewModel(
7777
fun handler(fetchWeatherCall: FunctionCallPart) : FunctionResponsePart {
7878
val response:JsonObject
7979
fetchWeatherCall.let {
80-
val city = it.args["city"]!!.jsonPrimitive.content
81-
val state = it.args["city"]!!.jsonPrimitive.content
82-
val date = it.args["date"]!!.jsonPrimitive.content
80+
val city = it.args["city"]?.jsonPrimitive?.content
81+
val state = it.args["state"]?.jsonPrimitive?.content
82+
val date = it.args["date"]?.jsonPrimitive?.content
8383
runBlocking {
84-
response = fetchWeather(city, state, date)
84+
response = if(!city.isNullOrEmpty() and !state.isNullOrEmpty() and date.isNullOrEmpty()) {
85+
fetchWeather(city!!, state!!, date!!)
86+
} else {
87+
JsonObject(emptyMap())
88+
}
8589
}
8690
}
8791
return FunctionResponsePart("fetchWeather", response, fetchWeatherCall.id)

firebase-ai/app/src/main/java/com/google/firebase/quickstart/ai/feature/live/StreamRealtimeScreen.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ fun StreamRealtimeScreen(bidiView: BidiViewModel = viewModel<BidiViewModel>()) {
7474
)
7575
Spacer(modifier = Modifier.height(8.dp))
7676
Text(
77-
text = "Tap the end button to stop", // Example timer
77+
text = "Tap the end button to stop",
7878
fontSize = 18.sp,
7979
color = MaterialTheme.colorScheme.onSurfaceVariant
8080
)

firebase-ai/app/src/main/java/com/google/firebase/quickstart/ai/feature/text/functioncalling/WeatherRepository.kt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,5 @@ class WeatherRepository {
2424
)
2525
)
2626
}
27-
2827
}
2928
}

firebase-ai/app/src/main/java/com/google/firebase/quickstart/ai/ui/navigation/Sample.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ enum class Category(
2121
AUDIO("Audio"),
2222
DOCUMENT("Document"),
2323
FUNCTION_CALLING("Function calling"),
24-
LIVE_API("Bidi Streaming")
24+
LIVE_API("LiveAPI Streaming")
2525
}
2626

2727
@OptIn(PublicPreviewAPI::class)

0 commit comments

Comments
 (0)