diff --git a/shared/src/androidMain/kotlin/com/kgurgul/cpuinfo/data/provider/CpuDataNativeProvider.android.kt b/shared/src/androidMain/kotlin/com/kgurgul/cpuinfo/data/provider/CpuDataNativeProvider.android.kt index 5b730775..00189f2b 100644 --- a/shared/src/androidMain/kotlin/com/kgurgul/cpuinfo/data/provider/CpuDataNativeProvider.android.kt +++ b/shared/src/androidMain/kotlin/com/kgurgul/cpuinfo/data/provider/CpuDataNativeProvider.android.kt @@ -41,10 +41,11 @@ actual class CpuDataNativeProvider actual constructor() : ICpuDataNativeProvider actual external override fun getNumberOfCores(): Int - override fun getExtraItems(): List = listOf( - ItemValue.NameValueResource( - name = Res.string.cpu_has_neon, - value = if (hasArmNeon()) Res.string.yes else Res.string.no, - ), - ) + override fun getExtraItems(): List = + listOf( + ItemValue.NameValueResource( + name = Res.string.cpu_has_neon, + value = if (hasArmNeon()) Res.string.yes else Res.string.no, + ) + ) } diff --git a/shared/src/commonMain/kotlin/com/kgurgul/cpuinfo/domain/model/CpuData.kt b/shared/src/commonMain/kotlin/com/kgurgul/cpuinfo/domain/model/CpuData.kt index 2a54349b..198bd392 100644 --- a/shared/src/commonMain/kotlin/com/kgurgul/cpuinfo/domain/model/CpuData.kt +++ b/shared/src/commonMain/kotlin/com/kgurgul/cpuinfo/domain/model/CpuData.kt @@ -18,10 +18,7 @@ package com.kgurgul.cpuinfo.domain.model import androidx.compose.runtime.Stable @Stable -data class CpuData( - val cpuItems: List, - val frequencies: List, -) { +data class CpuData(val cpuItems: List, val frequencies: List) { data class Frequency(val min: Long, val max: Long, val current: Long) } diff --git a/shared/src/commonMain/kotlin/com/kgurgul/cpuinfo/domain/observable/CpuDataObservable.kt b/shared/src/commonMain/kotlin/com/kgurgul/cpuinfo/domain/observable/CpuDataObservable.kt index 33df6e02..b50b17ab 100644 --- a/shared/src/commonMain/kotlin/com/kgurgul/cpuinfo/domain/observable/CpuDataObservable.kt +++ b/shared/src/commonMain/kotlin/com/kgurgul/cpuinfo/domain/observable/CpuDataObservable.kt @@ -97,12 +97,7 @@ class CpuDataObservable( add(ItemValue.NameResource(Res.string.cpu_l4, l4Caches)) } } - emit( - CpuData( - cpuItems = cpuItems, - frequencies = frequencies, - ) - ) + emit(CpuData(cpuItems = cpuItems, frequencies = frequencies)) delay(REFRESH_DELAY) } } diff --git a/shared/src/commonMain/kotlin/com/kgurgul/cpuinfo/features/information/cpu/CpuInfoScreen.kt b/shared/src/commonMain/kotlin/com/kgurgul/cpuinfo/features/information/cpu/CpuInfoScreen.kt index 2a05e1a2..63da055d 100644 --- a/shared/src/commonMain/kotlin/com/kgurgul/cpuinfo/features/information/cpu/CpuInfoScreen.kt +++ b/shared/src/commonMain/kotlin/com/kgurgul/cpuinfo/features/information/cpu/CpuInfoScreen.kt @@ -70,21 +70,18 @@ fun CpuInfoScreen(uiState: CpuInfoViewModel.UiState) { modifier = Modifier.fillMaxSize().testTag(CpuInfoScreenTestTags.LAZY_COLUMN), ) { uiState.cpuData?.let { cpuData -> - itemsIndexed( - cpuData.cpuItems, - key = { _, item -> item.getKey() }, - ) { index, itemValue -> + itemsIndexed(cpuData.cpuItems, key = { _, item -> item.getKey() }) { + index, + itemValue -> InformationRow( title = itemValue.getName(), value = itemValue.getValue(), - isLastItem = index == cpuData.cpuItems.lastIndex - && cpuData.frequencies.isEmpty(), + isLastItem = + index == cpuData.cpuItems.lastIndex && cpuData.frequencies.isEmpty(), ) } cpuData.frequencies.forEachIndexed { i, frequency -> - item(key = "__frequency_$i") { - FrequencyItem(index = i, frequency = frequency) - } + item(key = "__frequency_$i") { FrequencyItem(index = i, frequency = frequency) } } } } @@ -138,11 +135,15 @@ fun CpuInfoScreenPreview() { CpuInfoViewModel.UiState( cpuData = CpuData( - cpuItems = listOf( - ItemValue.NameResource(Res.string.cpu_soc_name, "processorName"), - ItemValue.Text("ABI", "abi"), - ItemValue.Text("Cores", "1"), - ), + cpuItems = + listOf( + ItemValue.NameResource( + Res.string.cpu_soc_name, + "processorName", + ), + ItemValue.Text("ABI", "abi"), + ItemValue.Text("Cores", "1"), + ), frequencies = listOf(CpuData.Frequency(min = 1, max = 2, current = 3)), ) ) diff --git a/shared/src/commonTest/kotlin/com/kgurgul/cpuinfo/data/TestData.kt b/shared/src/commonTest/kotlin/com/kgurgul/cpuinfo/data/TestData.kt index 9ab7a7a1..5cb9f8be 100644 --- a/shared/src/commonTest/kotlin/com/kgurgul/cpuinfo/data/TestData.kt +++ b/shared/src/commonTest/kotlin/com/kgurgul/cpuinfo/data/TestData.kt @@ -109,11 +109,12 @@ object TestData { val cpuData = CpuData( - cpuItems = listOf( - ItemValue.NameResource(Res.string.cpu_soc_name, "CPU_NAME"), - ItemValue.NameResource(Res.string.cpu_abi, "x64"), - ItemValue.NameResource(Res.string.cpu_cores, "1"), - ), + cpuItems = + listOf( + ItemValue.NameResource(Res.string.cpu_soc_name, "CPU_NAME"), + ItemValue.NameResource(Res.string.cpu_abi, "x64"), + ItemValue.NameResource(Res.string.cpu_cores, "1"), + ), frequencies = emptyList(), ) diff --git a/shared/src/desktopTest/kotlin/com/kgurgul/cpuinfo/screen/CpuInfoScreenTest.kt b/shared/src/desktopTest/kotlin/com/kgurgul/cpuinfo/screen/CpuInfoScreenTest.kt index 8375f718..1eaa089a 100644 --- a/shared/src/desktopTest/kotlin/com/kgurgul/cpuinfo/screen/CpuInfoScreenTest.kt +++ b/shared/src/desktopTest/kotlin/com/kgurgul/cpuinfo/screen/CpuInfoScreenTest.kt @@ -31,7 +31,8 @@ class CpuInfoScreenTest { @Test fun hasItems() = runComposeUiTest { setContent { CpuInfoScreen(uiState = CpuInfoViewModel.UiState(cpuData = TestData.cpuData)) } - listOf("CPU_NAME", "x64", "1") - .forEach { text -> onNodeWithText(text).performScrollTo().assertIsDisplayed() } + listOf("CPU_NAME", "x64", "1").forEach { text -> + onNodeWithText(text).performScrollTo().assertIsDisplayed() + } } } diff --git a/wearOsApp/src/main/kotlin/com/kgurgul/cpuinfo/wear/features/information/cpu/WearCpuInfoScreen.kt b/wearOsApp/src/main/kotlin/com/kgurgul/cpuinfo/wear/features/information/cpu/WearCpuInfoScreen.kt index bc9e97cc..53c5eaa4 100644 --- a/wearOsApp/src/main/kotlin/com/kgurgul/cpuinfo/wear/features/information/cpu/WearCpuInfoScreen.kt +++ b/wearOsApp/src/main/kotlin/com/kgurgul/cpuinfo/wear/features/information/cpu/WearCpuInfoScreen.kt @@ -75,10 +75,7 @@ fun WearCpuInfoScreen(uiState: CpuInfoViewModel.UiState) { cpuData.frequencies.forEachIndexed { i, frequency -> item(key = "__frequency_$i") { FrequencyItem(index = i, frequency = frequency) } } - items( - cpuData.cpuItems, - key = { it.getKey() }, - ) { itemValue -> + items(cpuData.cpuItems, key = { it.getKey() }) { itemValue -> WearCpuChip( label = itemValue.getName(), secondaryLabel = itemValue.getValue().replace("\n", ", "),