Skip to content
Merged
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 @@ -6,9 +6,7 @@ import androidx.lifecycle.ViewModelProvider
import androidx.lifecycle.viewmodel.CreationExtras
import com.google.ai.client.generativeai.GenerativeModel
import com.google.ai.client.generativeai.type.generationConfig
import com.google.ai.sample.feature.chat.ChatViewModel
import com.google.ai.sample.feature.multimodal.PhotoReasoningViewModel
import com.google.ai.sample.feature.text.SummarizeViewModel

// Model options
enum class ModelOption(val displayName: String, val modelName: String) {
Expand Down Expand Up @@ -72,16 +70,6 @@ val GenerativeViewModelFactory = object : ViewModelProvider.Factory {

return with(viewModelClass) {
when {
isAssignableFrom(SummarizeViewModel::class.java) -> {
// Initialize a GenerativeModel with the currently selected model
// for text generation
val generativeModel = GenerativeModel(
modelName = currentModelName,
apiKey = apiKey,
generationConfig = config
)
SummarizeViewModel(generativeModel)
}

isAssignableFrom(PhotoReasoningViewModel::class.java) -> {
// Initialize a GenerativeModel with the currently selected model
Expand All @@ -96,15 +84,6 @@ val GenerativeViewModelFactory = object : ViewModelProvider.Factory {
PhotoReasoningViewModel(generativeModel, apiKeyManager)
}

isAssignableFrom(ChatViewModel::class.java) -> {
// Initialize a GenerativeModel with the currently selected model for chat
val generativeModel = GenerativeModel(
modelName = currentModelName,
apiKey = apiKey,
generationConfig = config
)
ChatViewModel(generativeModel)
}

else ->
throw IllegalArgumentException("Unknown ViewModel class: ${viewModelClass.name}")
Expand Down
8 changes: 0 additions & 8 deletions app/src/main/kotlin/com/google/ai/sample/MainActivity.kt
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,7 @@ import androidx.core.content.ContextCompat
import androidx.navigation.compose.NavHost
import androidx.navigation.compose.composable
import androidx.navigation.compose.rememberNavController
import com.google.ai.sample.feature.chat.ChatRoute
import com.google.ai.sample.feature.multimodal.PhotoReasoningRoute
import com.google.ai.sample.feature.text.SummarizeRoute
import com.google.ai.sample.ui.theme.GenerativeAISample

class MainActivity : ComponentActivity() {
Expand Down Expand Up @@ -127,15 +125,9 @@ class MainActivity : ComponentActivity() {
}
)
}
composable("summarize") {
SummarizeRoute()
}
composable("photo_reasoning") {
PhotoReasoningRoute()
}
composable("chat") {
ChatRoute()
}
}

// Show API Key Dialog if needed
Expand Down
4 changes: 1 addition & 3 deletions app/src/main/kotlin/com/google/ai/sample/MenuScreen.kt
Original file line number Diff line number Diff line change
Expand Up @@ -54,9 +54,7 @@ fun MenuScreen(
onApiKeyButtonClicked: () -> Unit = { }
) {
val menuItems = listOf(
MenuItem("summarize", R.string.menu_summarize_title, R.string.menu_summarize_description),
MenuItem("photo_reasoning", R.string.menu_reason_title, R.string.menu_reason_description),
MenuItem("chat", R.string.menu_chat_title, R.string.menu_chat_description)
MenuItem("photo_reasoning", R.string.menu_reason_title, R.string.menu_reason_description)
)

// Get current model
Expand Down

This file was deleted.

Loading