From f8087f8bf172cbecbc58d5fbc31a44850b085229 Mon Sep 17 00:00:00 2001 From: Hossain Khan Date: Sat, 6 Dec 2025 09:36:45 -0500 Subject: [PATCH] refactor: Convert DeviceModelSelectorScreen to data object - Remove serverBaseUrl parameter from screen - Use TRMNL_API_SERVER_BASE_URL constant directly in presenter - Simplifies navigation call site to DeviceModelSelectorScreen --- .../android/ui/devicemodel/DeviceModelSelectorScreen.kt | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/app/src/main/java/ink/trmnl/android/ui/devicemodel/DeviceModelSelectorScreen.kt b/app/src/main/java/ink/trmnl/android/ui/devicemodel/DeviceModelSelectorScreen.kt index 5c198e8..a4890a6 100644 --- a/app/src/main/java/ink/trmnl/android/ui/devicemodel/DeviceModelSelectorScreen.kt +++ b/app/src/main/java/ink/trmnl/android/ui/devicemodel/DeviceModelSelectorScreen.kt @@ -63,13 +63,9 @@ import kotlinx.parcelize.Parcelize * - View all available device models with their specifications * - Select a device model * - Return the selected model to the previous screen via PopResult - * - * @property serverBaseUrl The base URL of the server to fetch models from. */ @Parcelize -data class DeviceModelSelectorScreen( - val serverBaseUrl: String = TRMNL_API_SERVER_BASE_URL, -) : Screen { +data object DeviceModelSelectorScreen : Screen { /** * Represents the UI state for the [DeviceModelSelectorScreen]. * @@ -203,7 +199,7 @@ class DeviceModelSelectorPresenter onModelsLoaded: (List) -> Unit, onError: (String) -> Unit, ) { - val loadedModels = repository.getDeviceModels(screen.serverBaseUrl) + val loadedModels = repository.getDeviceModels(TRMNL_API_SERVER_BASE_URL) if (loadedModels.isEmpty()) { onError("Failed to load device models. Please try again.") } else {