From fc54e540e8453f7c1e9fe62a370692e7cc8536fa Mon Sep 17 00:00:00 2001 From: darken Date: Tue, 3 Jun 2025 14:56:07 +0200 Subject: [PATCH] Code fluff Replace `values()` with `entries` for enum iteration, as recommended by Kotlin for improved performance and consistency. Also: - Suppress unused warning in `ByteArrayAdapter` - Improve logging in `WebpageTool` by including the exception details. --- .../main/java/eu/darken/capod/common/WebpageTool.kt | 3 ++- .../capod/common/serialization/ByteArrayAdapter.kt | 1 + .../ui/settings/general/GeneralSettingsFragment.kt | 10 +++++----- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/app-common/src/main/java/eu/darken/capod/common/WebpageTool.kt b/app-common/src/main/java/eu/darken/capod/common/WebpageTool.kt index be96755d..19cf4ecb 100644 --- a/app-common/src/main/java/eu/darken/capod/common/WebpageTool.kt +++ b/app-common/src/main/java/eu/darken/capod/common/WebpageTool.kt @@ -6,6 +6,7 @@ import androidx.core.net.toUri import dagger.Reusable import dagger.hilt.android.qualifiers.ApplicationContext import eu.darken.capod.common.debug.logging.Logging.Priority.ERROR +import eu.darken.capod.common.debug.logging.asLog import eu.darken.capod.common.debug.logging.log import javax.inject.Inject @@ -21,7 +22,7 @@ class WebpageTool @Inject constructor( try { context.startActivity(intent) } catch (e: Exception) { - log(ERROR) { "Failed to launch" } + log(ERROR) { "Failed to launch: ${e.asLog()}" } } } diff --git a/app-common/src/main/java/eu/darken/capod/common/serialization/ByteArrayAdapter.kt b/app-common/src/main/java/eu/darken/capod/common/serialization/ByteArrayAdapter.kt index 68d16db1..9cf76776 100644 --- a/app-common/src/main/java/eu/darken/capod/common/serialization/ByteArrayAdapter.kt +++ b/app-common/src/main/java/eu/darken/capod/common/serialization/ByteArrayAdapter.kt @@ -5,6 +5,7 @@ import com.squareup.moshi.ToJson import kotlin.io.encoding.Base64 import kotlin.io.encoding.ExperimentalEncodingApi +@Suppress("unused") @OptIn(ExperimentalEncodingApi::class) class ByteArrayAdapter { @ToJson diff --git a/app/src/main/java/eu/darken/capod/main/ui/settings/general/GeneralSettingsFragment.kt b/app/src/main/java/eu/darken/capod/main/ui/settings/general/GeneralSettingsFragment.kt index a681db54..a3564f74 100644 --- a/app/src/main/java/eu/darken/capod/main/ui/settings/general/GeneralSettingsFragment.kt +++ b/app/src/main/java/eu/darken/capod/main/ui/settings/general/GeneralSettingsFragment.kt @@ -42,12 +42,12 @@ class GeneralSettingsFragment : PreferenceFragment3() { override fun onPreferencesCreated() { monitorModePref.apply { - entries = MonitorMode.values().map { getString(it.labelRes) }.toTypedArray() - entryValues = MonitorMode.values().map { settings.monitorMode.rawWriter(it) as String }.toTypedArray() + entries = MonitorMode.entries.map { getString(it.labelRes) }.toTypedArray() + entryValues = MonitorMode.entries.map { settings.monitorMode.rawWriter(it) as String }.toTypedArray() } scanModePref.apply { - entries = ScannerMode.values().map { getString(it.labelRes) }.toTypedArray() - entryValues = ScannerMode.values().map { settings.scannerMode.rawWriter(it) as String }.toTypedArray() + entries = ScannerMode.entries.map { getString(it.labelRes) }.toTypedArray() + entryValues = ScannerMode.entries.map { settings.scannerMode.rawWriter(it) as String }.toTypedArray() } mainDeviceIdentityKeyPref.setOnPreferenceClickListener { AirPodKeyInputDialog(requireContext()).create( @@ -97,7 +97,7 @@ class GeneralSettingsFragment : PreferenceFragment3() { mainDeviceModelPref.setOnPreferenceClickListener { val dialog = ModelSelectionDialogFactory(requireContext()).create( - PodDevice.Model.values().toList(), + PodDevice.Model.entries, generalSettings.mainDeviceModel.value ) { selected -> generalSettings.mainDeviceModel.value = selected