Introduce ApiConfig to consolidate API configuration

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

Author: frett

app/src/main/kotlin/org/cru/godtools/dagger/ConfigModule.kt

@@ -4,14 +4,14 @@ import dagger.Module
 import dagger.Provides
 import dagger.hilt.InstallIn
 import dagger.hilt.components.SingletonComponent
-import javax.inject.Named
 import org.cru.godtools.BuildConfig
-import org.cru.godtools.api.ApiModule
+import org.cru.godtools.api.ApiConfig
 
 @Module
 @InstallIn(SingletonComponent::class)
 object ConfigModule {
     @get:Provides
-    @get:Named(ApiModule.MOBILE_CONTENT_API_URL)
-    val mobileContentApiBaseUrl = BuildConfig.MOBILE_CONTENT_API
+    val apiConfig = ApiConfig(
+        mobileContentApiUrl = BuildConfig.MOBILE_CONTENT_API
+    )
 }

library/api/src/main/kotlin/org/cru/godtools/api/ApiConfig.kt

@@ -0,0 +1,5 @@
+package org.cru.godtools.api
+
+data class ApiConfig(
+    val mobileContentApiUrl: String
+)

library/api/src/main/kotlin/org/cru/godtools/api/ApiModule.kt

@@ -79,19 +79,18 @@ object ApiModule {
         .build()
 
     // region mobile-content-api APIs
-    const val MOBILE_CONTENT_API_URL = "MOBILE_CONTENT_API_BASE_URL"
     private const val MOBILE_CONTENT_API = "MOBILE_CONTENT_API"
     private const val MOBILE_CONTENT_API_AUTHENTICATED = "MOBILE_CONTENT_API_AUTHENTICATED"
 
     @Provides
     @Reusable
     @Named(MOBILE_CONTENT_API)
     fun mobileContentApiRetrofit(
-        @Named(MOBILE_CONTENT_API_URL) baseUrl: String,
+        apiConfig: ApiConfig,
         jsonApiConverter: JsonApiConverter,
         okhttp: OkHttpClient,
     ): Retrofit = Retrofit.Builder()
-        .baseUrl(baseUrl)
+        .baseUrl(apiConfig.mobileContentApiUrl)
         .addConverterFactory(LocaleConverterFactory)
         .addConverterFactory(JsonApiConverterFactory(jsonApiConverter))
         .callFactory(okhttp)
@@ -165,14 +164,16 @@ object ApiModule {
     @Provides
     @Reusable
     fun actionCableScarlet(
-        @Named(MOBILE_CONTENT_API_URL) baseUrl: String,
+        apiConfig: ApiConfig,
         app: Application,
         jsonApi: JsonApiConverter,
         okhttp: OkHttpClient,
         referenceLifecycle: ReferenceLifecycle,
     ) = Scarlet.Builder()
         .forceDefaultPlatform()
-        .webSocketFactory(okhttp.newWebSocketFactory(ActionCableRequestFactory("${baseUrl}cable")))
+        .webSocketFactory(
+            okhttp.newWebSocketFactory(ActionCableRequestFactory("${apiConfig.mobileContentApiUrl}cable"))
+        )
         .addMessageAdapterFactory(
             ActionCableMessageAdapterFactory.Builder()
                 .addMessageAdapterFactory(JsonApiMessageAdapterFactory(jsonApi))