From 8d5984fb3611bd2c5fc2ebf54ac0f8d40550afe8 Mon Sep 17 00:00:00 2001 From: KremeCN <3265494849@qq.com> Date: Mon, 24 Aug 2026 17:56:11 +0800 Subject: [PATCH] fix: remove compatible provider consumers --- .../ui/provider/ProviderSelectionScreenTest.kt | 12 ++++-------- .../flagship/abox/manager/ui/login/LoginScreen.kt | 2 -- .../abox/manager/ui/provider/ProviderAvailability.kt | 1 - .../manager/ui/provider/ProviderSelectionScreen.kt | 3 --- .../ui/provider/ProviderSelectionViewModel.kt | 5 ----- 5 files changed, 4 insertions(+), 19 deletions(-) diff --git a/android/app/src/androidTest/kotlin/com/flagship/abox/manager/ui/provider/ProviderSelectionScreenTest.kt b/android/app/src/androidTest/kotlin/com/flagship/abox/manager/ui/provider/ProviderSelectionScreenTest.kt index b5fb6f9..b10ea08 100644 --- a/android/app/src/androidTest/kotlin/com/flagship/abox/manager/ui/provider/ProviderSelectionScreenTest.kt +++ b/android/app/src/androidTest/kotlin/com/flagship/abox/manager/ui/provider/ProviderSelectionScreenTest.kt @@ -27,19 +27,15 @@ class ProviderSelectionScreenTest { ProviderProfile(ProviderProfileId("local"), ProviderType.LOCAL_EXPERIENCE, "Local"), Availability.Enabled, ) - val compatible = ProviderOption( - ProviderProfile( - ProviderProfileId("compatible"), - ProviderType.COMPATIBLE_BACKEND, - "Compatible", - ), + val abox = ProviderOption( + ProviderProfile(ProviderProfileId("abox"), ProviderType.ABOX, "ABox"), Availability.Disabled(UnavailableReason.PROTOCOL_PENDING), ) var selected: ProviderOption? = null composeRule.setContent { ABoxTheme { ProviderSelectionScreen( - state = ProviderSelectionUiState(listOf(local, compatible)), + state = ProviderSelectionUiState(listOf(local, abox)), onSelect = { selected = it }, ) } @@ -47,6 +43,6 @@ class ProviderSelectionScreenTest { composeRule.onNodeWithText("Local experience").assertIsEnabled().performClick() assertEquals(local, selected) - composeRule.onNodeWithText("Compatible backend").assertIsNotEnabled() + composeRule.onNodeWithText("ABox").assertIsNotEnabled() } } diff --git a/android/app/src/main/kotlin/com/flagship/abox/manager/ui/login/LoginScreen.kt b/android/app/src/main/kotlin/com/flagship/abox/manager/ui/login/LoginScreen.kt index 39b2055..51b6ddb 100644 --- a/android/app/src/main/kotlin/com/flagship/abox/manager/ui/login/LoginScreen.kt +++ b/android/app/src/main/kotlin/com/flagship/abox/manager/ui/login/LoginScreen.kt @@ -222,7 +222,6 @@ private fun LoginErrorMessage.stringResource(): Int = when (this) { private fun providerName(type: ProviderType): String = stringResource( when (type) { ProviderType.ABOX -> R.string.provider_abox_name - ProviderType.COMPATIBLE_BACKEND -> R.string.provider_compatible_name ProviderType.LOCAL_EXPERIENCE -> R.string.provider_local_name }, ) @@ -231,7 +230,6 @@ private fun providerName(type: ProviderType): String = stringResource( private fun providerDescription(type: ProviderType): String = stringResource( when (type) { ProviderType.ABOX -> R.string.provider_abox_description - ProviderType.COMPATIBLE_BACKEND -> R.string.provider_compatible_description ProviderType.LOCAL_EXPERIENCE -> R.string.provider_local_description }, ) diff --git a/android/app/src/main/kotlin/com/flagship/abox/manager/ui/provider/ProviderAvailability.kt b/android/app/src/main/kotlin/com/flagship/abox/manager/ui/provider/ProviderAvailability.kt index c5e59a7..c4839ca 100644 --- a/android/app/src/main/kotlin/com/flagship/abox/manager/ui/provider/ProviderAvailability.kt +++ b/android/app/src/main/kotlin/com/flagship/abox/manager/ui/provider/ProviderAvailability.kt @@ -9,7 +9,6 @@ data class ProviderAvailability( ) { fun forType(type: ProviderType): Availability = when (type) { ProviderType.ABOX -> abox - ProviderType.COMPATIBLE_BACKEND -> compatible ProviderType.LOCAL_EXPERIENCE -> local } } diff --git a/android/app/src/main/kotlin/com/flagship/abox/manager/ui/provider/ProviderSelectionScreen.kt b/android/app/src/main/kotlin/com/flagship/abox/manager/ui/provider/ProviderSelectionScreen.kt index 28528d0..1829e22 100644 --- a/android/app/src/main/kotlin/com/flagship/abox/manager/ui/provider/ProviderSelectionScreen.kt +++ b/android/app/src/main/kotlin/com/flagship/abox/manager/ui/provider/ProviderSelectionScreen.kt @@ -185,7 +185,6 @@ private fun ProviderOptionCard( private fun providerName(type: ProviderType): String = stringResource( when (type) { ProviderType.ABOX -> R.string.provider_abox_name - ProviderType.COMPATIBLE_BACKEND -> R.string.provider_compatible_name ProviderType.LOCAL_EXPERIENCE -> R.string.provider_local_name }, ) @@ -194,14 +193,12 @@ private fun providerName(type: ProviderType): String = stringResource( private fun providerDescription(type: ProviderType): String = stringResource( when (type) { ProviderType.ABOX -> R.string.provider_abox_description - ProviderType.COMPATIBLE_BACKEND -> R.string.provider_compatible_description ProviderType.LOCAL_EXPERIENCE -> R.string.provider_local_description }, ) private fun providerMark(type: ProviderType): String = when (type) { ProviderType.ABOX -> "A" - ProviderType.COMPATIBLE_BACKEND -> "C" ProviderType.LOCAL_EXPERIENCE -> "L" } diff --git a/android/app/src/main/kotlin/com/flagship/abox/manager/ui/provider/ProviderSelectionViewModel.kt b/android/app/src/main/kotlin/com/flagship/abox/manager/ui/provider/ProviderSelectionViewModel.kt index 1debcd7..8eb54f8 100644 --- a/android/app/src/main/kotlin/com/flagship/abox/manager/ui/provider/ProviderSelectionViewModel.kt +++ b/android/app/src/main/kotlin/com/flagship/abox/manager/ui/provider/ProviderSelectionViewModel.kt @@ -43,11 +43,6 @@ class ProviderSelectionViewModel @Inject constructor( companion object { private val PROFILES = listOf( ProviderProfile(ProviderProfileId("abox-default"), ProviderType.ABOX, "ABox"), - ProviderProfile( - ProviderProfileId("compatible-default"), - ProviderType.COMPATIBLE_BACKEND, - "Compatible backend", - ), ProviderProfile( ProviderProfileId("local-experience"), ProviderType.LOCAL_EXPERIENCE,