diff options
| author | David Göransson <david.goransson90@gmail.com> | 2023-10-17 13:36:24 +0200 |
|---|---|---|
| committer | Jonatan Rhodin <jonatan.rhodin@mullvad.net> | 2023-10-18 12:08:09 +0200 |
| commit | 5cbd9e473d4b1666abdcfa3e08b4d49a9e22d10e (patch) | |
| tree | cde088279031bb9242b8637adc903001dd3ff3b6 /android | |
| parent | 38bf0c5680b17d3423511e2c8636d48806b8c92b (diff) | |
| download | mullvadvpn-5cbd9e473d4b1666abdcfa3e08b4d49a9e22d10e.tar.xz mullvadvpn-5cbd9e473d4b1666abdcfa3e08b4d49a9e22d10e.zip | |
Move DeviceState name logic to actual Device
Diffstat (limited to 'android')
4 files changed, 11 insertions, 9 deletions
diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/DeviceListScreen.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/DeviceListScreen.kt index 42ab9faef0..4aee08fed9 100644 --- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/DeviceListScreen.kt +++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/compose/screen/DeviceListScreen.kt @@ -193,7 +193,7 @@ fun DeviceListScreen( Column { state.deviceUiItems.forEach { deviceUiState -> ListItem( - text = deviceUiState.device.name, + text = deviceUiState.device.displayName(), subText = deviceUiState.device.created.parseAsDateTime()?.let { creationDate -> diff --git a/android/app/src/test/kotlin/net/mullvad/mullvadvpn/viewmodel/WelcomeViewModelTest.kt b/android/app/src/test/kotlin/net/mullvad/mullvadvpn/viewmodel/WelcomeViewModelTest.kt index 52713c0b0d..b16eeec2f8 100644 --- a/android/app/src/test/kotlin/net/mullvad/mullvadvpn/viewmodel/WelcomeViewModelTest.kt +++ b/android/app/src/test/kotlin/net/mullvad/mullvadvpn/viewmodel/WelcomeViewModelTest.kt @@ -126,7 +126,7 @@ class WelcomeViewModelTest { // Arrange val expectedAccountNumber = "4444555566667777" val device: Device = mockk() - every { device.name } returns "" + every { device.displayName() } returns "" // Act, Assert viewModel.uiState.test { diff --git a/android/lib/model/src/main/kotlin/net/mullvad/mullvadvpn/model/Device.kt b/android/lib/model/src/main/kotlin/net/mullvad/mullvadvpn/model/Device.kt index 4918ee0832..25c729eb87 100644 --- a/android/lib/model/src/main/kotlin/net/mullvad/mullvadvpn/model/Device.kt +++ b/android/lib/model/src/main/kotlin/net/mullvad/mullvadvpn/model/Device.kt @@ -25,4 +25,12 @@ data class Device(val id: String, val name: String, val pubkey: ByteArray, val c result = 31 * result + pubkey.contentHashCode() return result } + + fun displayName(): String = name.capitalizeFirstCharOfEachWord() +} + +private fun String.capitalizeFirstCharOfEachWord(): String { + return split(" ") + .joinToString(" ") { word -> word.replaceFirstChar { firstChar -> firstChar.uppercase() } } + .trimEnd() } diff --git a/android/lib/model/src/main/kotlin/net/mullvad/mullvadvpn/model/DeviceState.kt b/android/lib/model/src/main/kotlin/net/mullvad/mullvadvpn/model/DeviceState.kt index 2af9b01362..fb34c9e645 100644 --- a/android/lib/model/src/main/kotlin/net/mullvad/mullvadvpn/model/DeviceState.kt +++ b/android/lib/model/src/main/kotlin/net/mullvad/mullvadvpn/model/DeviceState.kt @@ -19,16 +19,10 @@ sealed class DeviceState : Parcelable { } fun deviceName(): String? { - return (this as? LoggedIn)?.accountAndDevice?.device?.name?.capitalizeFirstCharOfEachWord() + return (this as? LoggedIn)?.accountAndDevice?.device?.displayName() } fun token(): String? { return (this as? LoggedIn)?.accountAndDevice?.account_token } } - -private fun String.capitalizeFirstCharOfEachWord(): String { - return split(" ") - .joinToString(" ") { word -> word.replaceFirstChar { firstChar -> firstChar.uppercase() } } - .trimEnd() -} |