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
15 changes: 9 additions & 6 deletions app/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,21 +1,21 @@
plugins {
alias(libs.plugins.android.application)
alias(libs.plugins.kotlin.android)
alias(libs.plugins.kotlin.compose)
alias(libs.plugins.google.services)
alias(libs.plugins.google.ksp)
alias(libs.plugins.google.hilt)
alias(libs.plugins.kotlin.serialization)
alias(libs.plugins.firebase.perf)
}

android {
namespace = "com.google.firebase.example.friendlymeals"
compileSdk = 36
compileSdk = 37

defaultConfig {
applicationId = "com.google.firebase.example.friendlymeals"
minSdk = 26
targetSdk = 36
targetSdk = 37
versionCode = 1
versionName = "1.0"

Expand All @@ -35,9 +35,6 @@ android {
sourceCompatibility = JavaVersion.VERSION_11
targetCompatibility = JavaVersion.VERSION_11
}
kotlinOptions {
jvmTarget = "11"
}
buildFeatures {
compose = true
}
Expand All @@ -57,16 +54,22 @@ dependencies {
implementation(libs.androidx.core.splashscreen)
implementation(libs.androidx.constraintlayout.compose)
implementation(libs.androidx.exifinterface)
implementation(libs.androidx.camera.core)
implementation(libs.androidx.camera.camera2)
implementation(libs.androidx.camera.lifecycle)
implementation(libs.androidx.camera.view)
implementation(libs.kotlinx.serialization.json)
implementation(libs.hilt.android)
ksp(libs.hilt.android.compiler)

implementation(platform(libs.firebase.bom))
implementation(libs.firebase.ai)
implementation(libs.firebase.ai.ondevice)
implementation(libs.firebase.config)
implementation(libs.firebase.auth)
implementation(libs.firebase.storage)
implementation(libs.firebase.firestore)
implementation(libs.firebase.perf)

//Library to handle Markdown in Compose
implementation(libs.richtext.commonmark)
Expand Down
1 change: 1 addition & 0 deletions app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools">
<uses-permission android:name="android.permission.CAMERA" />
<uses-permission android:name="android.permission.RECORD_AUDIO" />
<uses-feature android:name="android.hardware.camera" android:required="false" />
<application
android:allowBackup="true"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,10 @@ import androidx.navigation.navigation
import androidx.hilt.lifecycle.viewmodel.compose.hiltViewModel
import com.google.firebase.example.friendlymeals.ui.generate.GenerateRoute
import com.google.firebase.example.friendlymeals.ui.generate.GenerateScreen
import com.google.firebase.example.friendlymeals.ui.groceryList.GroceryListRoute
import com.google.firebase.example.friendlymeals.ui.groceryList.GroceryListScreen
import com.google.firebase.example.friendlymeals.ui.live.LiveAssistantRoute
import com.google.firebase.example.friendlymeals.ui.live.LiveAssistantScreen
import com.google.firebase.example.friendlymeals.ui.recipe.RecipeRoute
import com.google.firebase.example.friendlymeals.ui.recipe.RecipeScreen
import com.google.firebase.example.friendlymeals.ui.recipeList.RecipeListGraph
Expand Down Expand Up @@ -121,9 +125,26 @@ class MainActivity : ComponentActivity() {
}
composable<RecipeRoute> {
RecipeScreen(
navigateBack = { navController.popBackStack() }
navigateBack = { navController.popBackStack() },
navigateToLiveAssistant = { recipeId ->
navController.navigate(LiveAssistantRoute(recipeId)) {
launchSingleTop = true
}
}
)
}
composable<LiveAssistantRoute> {
LiveAssistantScreen(
navigateBack = { navController.popBackStack() },
showError = {
val message = this@MainActivity.getString(R.string.camera_error_message)
scope.launch { snackbarHostState.showSnackbar(message) }
}
)
}
composable<GroceryListRoute> {
GroceryListScreen()
}
}
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import androidx.lifecycle.ViewModel
import androidx.lifecycle.viewModelScope
import kotlinx.coroutines.CoroutineExceptionHandler
import kotlinx.coroutines.CoroutineScope
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.launch

open class MainViewModel : ViewModel() {
Expand All @@ -15,4 +16,12 @@ open class MainViewModel : ViewModel() {
},
block = block
)

fun launchCatchingIO(block: suspend CoroutineScope.() -> Unit) =
viewModelScope.launch(
Dispatchers.IO + CoroutineExceptionHandler { _, throwable ->
Log.e("MainViewModel", throwable.message ?: "Unknown error")
},
block = block
)
}
Loading