trmnl/trmnl-android
0
0
Fork 0
mirror of https://github.com/usetrmnl/trmnl-android.git synced 2026-04-29 13:35:26 -07:00
Code Issues Packages Projects Releases Wiki Activity

refactor: Extract Moshi adapter for device model preferences to avoid duplication

Browse Source 
- Create private properties deviceModelPreferencesType and deviceModelPreferencesAdapter at class level
- Use extracted adapter in deviceModelPreferencesFlow and saveDeviceModelForType
- Reduces code duplication and improves maintainability

Addresses PR feedback: https://github.com/usetrmnl/trmnl-android/pull/228\#discussion_r2595223707
This commit is contained in:
Hossain Khan
2025-12-06 14:19:23 -05:00
parent f5d647bea9
commit 3ff303275f
1 changed files with 13 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/java/ink/trmnl/android/data/TrmnlDeviceConfigDataStore.kt
+13 -24
View File
@@ -62,6 +62,16 @@ class TrmnlDeviceConfigDataStore
private val deviceTypeAdapter = moshi.adapter(TrmnlDeviceType::class.java)
private val deviceConfigAdapter = moshi.adapter(TrmnlDeviceConfig::class.java)
// Moshi adapter for device model preferences map
private val deviceModelPreferencesType =
com.squareup.moshi.Types.newParameterizedType(
Map::class.java,
String::class.java,
DeviceModelSelection::class.java,
)
private val deviceModelPreferencesAdapter =
moshi.adapter<Map<String, DeviceModelSelection>>(deviceModelPreferencesType)
/**
* Gets the device type as a Flow
*/
@@ -119,14 +129,7 @@ class TrmnlDeviceConfigDataStore
val json = preferences[DEVICE_MODEL_PREFERENCES_KEY]
if (json != null) {
try {
val type =
com.squareup.moshi.Types.newParameterizedType(
Map::class.java,
String::class.java,
DeviceModelSelection::class.java,
)
val adapter = moshi.adapter<Map<String, DeviceModelSelection>>(type)
adapter.fromJson(json) ?: emptyMap()
deviceModelPreferencesAdapter.fromJson(json) ?: emptyMap()
} catch (e: Exception) {
Timber.tag(TAG).e(e, "Failed to parse device model preferences")
emptyMap()
@@ -280,14 +283,7 @@ class TrmnlDeviceConfigDataStore
val currentMap =
if (currentJson != null) {
try {
val type =
com.squareup.moshi.Types.newParameterizedType(
Map::class.java,
String::class.java,
DeviceModelSelection::class.java,
)
val adapter = moshi.adapter<Map<String, DeviceModelSelection>>(type)
adapter.fromJson(currentJson)?.toMutableMap() ?: mutableMapOf()
deviceModelPreferencesAdapter.fromJson(currentJson)?.toMutableMap() ?: mutableMapOf()
} catch (e: Exception) {
Timber.tag(TAG).e(e, "Failed to parse existing device model preferences")
mutableMapOf()
@@ -300,14 +296,7 @@ class TrmnlDeviceConfigDataStore
currentMap[deviceType.name] = DeviceModelSelection(modelName, modelLabel)
// Save back to preferences
val type =
com.squareup.moshi.Types.newParameterizedType(
Map::class.java,
String::class.java,
DeviceModelSelection::class.java,
)
val adapter = moshi.adapter<Map<String, DeviceModelSelection>>(type)
preferences[DEVICE_MODEL_PREFERENCES_KEY] = adapter.toJson(currentMap)
preferences[DEVICE_MODEL_PREFERENCES_KEY] = deviceModelPreferencesAdapter.toJson(currentMap)
Timber.tag(TAG).d("Saved device model preference: ${deviceType.name} -> $modelName ($modelLabel)")
}