프리셋 저장 버튼/로드 버튼 크기 조정

app/src/main/java/com/laseroptek/raman/data/source/preference/Preference.kt

@@ -88,7 +88,4 @@ interface Preference {
     suspend fun getPowerSupplySerialListFromPreference(): Flow<List<String>>
     /////
 
-    suspend fun saveInfoChartLineStates(states: Map<String, Boolean>)
-    suspend fun getInfoChartLineStates(): Flow<Map<String, Boolean>>
-
-}
+}

app/src/main/java/com/laseroptek/raman/repository/PreferenceRepository.kt

@@ -68,9 +68,6 @@ class PreferenceRepository(private val context: Context) : Preference {
         val PRODUCT_SERIAL = stringPreferencesKey("PRODUCT_SERIAL")
         val LASER_HAND_SERIAL = stringPreferencesKey("LASER_HAND_SERIAL")
         val POWER_SUPPLY_SERIAL = stringPreferencesKey("POWER_SUPPLY_SERIAL")
-
-        // InfoScreen Chart Checkboxes
-        val INFO_CHART_LINE_STATES = stringPreferencesKey("INFO_CHART_LINE_STATES")
     }
 
     override suspend fun clearAllPreferences() {
@@ -562,31 +559,4 @@ class PreferenceRepository(private val context: Context) : Preference {
             emit(listOf("B", "U", "O", "C", "L", "D"))
         }
     }
-
-    override suspend fun saveInfoChartLineStates(states: Map<String, Boolean>) {
-        try {
-            val stateJson = gson.toJson(states)
-            context.datastore.edit { preferences ->
-                preferences[INFO_CHART_LINE_STATES] = stateJson
-            }
-        } catch (e: Exception) {
-            Timber.e(e, "Failed to serialize INFO_CHART_LINE_STATES to JSON.")
-        }
-    }
-
-    override suspend fun getInfoChartLineStates(): Flow<Map<String, Boolean>> {
-        return context.datastore.data.map { preferences ->
-            preferences[INFO_CHART_LINE_STATES]
-        }.distinctUntilChanged().map { jsonString ->
-            if (!jsonString.isNullOrBlank()) {
-                val type = object : TypeToken<Map<String, Boolean>>() {}.type
-                gson.fromJson<Map<String, Boolean>>(jsonString, type) ?: emptyMap()
-            } else {
-                emptyMap()
-            }
-        }.catch { e ->
-            Timber.e(e, "Failed to get or parse INFO_CHART_LINE_STATES. Emitting default.")
-            emit(emptyMap())
-        }
-    }
-}
+}

app/src/main/java/com/laseroptek/raman/ui/screens/home/preset/PresetIconButton.kt

@@ -108,15 +108,15 @@ fun PresetIconButton(
         Image(
             painter = painterResource(id =
                 if (type == PresetButtonType.SAVE) {
-                    R.drawable.ic_preset_save
+                    R.drawable.ic_preset_save2
                 } else {
                     R.drawable.ic_preset_load
                 }
             ),
             contentDescription = "",
             modifier = Modifier
-                .size(20.px.dp),
-            contentScale = ContentScale.Crop
+                .size(30.px.dp),
+            contentScale = ContentScale.Fit
         )
     }
 }

app/src/main/java/com/laseroptek/raman/ui/screens/home/preset/PresetLoadPopup.kt

@@ -552,12 +552,12 @@ fun PresetLoadPopup(
                     horizontalArrangement = Arrangement.Center,
                     verticalAlignment = Alignment.CenterVertically
                 ) {
-                    Spacer(Modifier.weight(1f))
-
                     if (isEditMode) {
                         ////////////////////////////////////////////////////
                         // Edit Mode
 
+                        Spacer(modifier = Modifier.width(10.px.dp))
+
                         // Preset Delete (Delete confirm popup)
                         Box(
                             modifier = Modifier
@@ -578,7 +578,7 @@ fun PresetLoadPopup(
                             )
                         }
 
-                        Spacer(Modifier.width(10.px.dp))
+                        Spacer(Modifier.weight(1f))
 
                         // Preset Cancel (Reload selected item from mainViewModel)
                         Box(
@@ -729,7 +729,11 @@ fun PresetLoadPopup(
                                 contentScale = ContentScale.Crop
                             )
                         }
+
+                        Spacer(modifier = Modifier.width(10.px.dp))
                     } else {
+                        Spacer(Modifier.weight(1f))
+
                         ////////////////////////////////////////////////////
                         // Select Mode - hide Keyboard
                         focusManager.clearFocus(force = true) // Hide the keyboard
@@ -790,6 +794,8 @@ fun PresetLoadPopup(
                                 contentScale = ContentScale.Crop
                             )
                         }
+
+                        Spacer(modifier = Modifier.width(10.px.dp))
                     }
                 }
 

app/src/main/java/com/laseroptek/raman/ui/screens/info/InfoViewModel.kt

@@ -1,14 +1,10 @@
 package com.laseroptek.raman.ui.screens.info
 
 import androidx.lifecycle.ViewModel
-import androidx.lifecycle.viewModelScope
 import dagger.hilt.android.lifecycle.HiltViewModel
-import com.laseroptek.raman.repository.PreferenceRepository
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.asStateFlow
 import kotlinx.coroutines.flow.update
-import kotlinx.coroutines.flow.collectLatest
-import kotlinx.coroutines.launch
 import timber.log.Timber
 import javax.inject.Inject
 
@@ -29,13 +25,10 @@ data class ChartUiState(
     val chamber2State: Boolean = true,
     val basePlateState: Boolean = true,
     val waterState: Boolean = true,
-) {
-    companion object
-}
+)
 
 @HiltViewModel
 class InfoViewModel @Inject constructor(
-    private val preferenceRepository: PreferenceRepository,
 ) : ViewModel() {
 
     // This is the single source of truth for the checkbox states.
@@ -46,7 +39,7 @@ class InfoViewModel @Inject constructor(
     fun toggleLine(line: ChartLine) {
         // .update is a thread-safe way to update the state.
         _chartUiState.update { currentState ->
-            val updatedState = when (line) {
+            when (line) {
                 ChartLine.INT_TEMP -> currentState.copy(intTempState = !currentState.intTempState)
                 ChartLine.EXT_TEMP -> currentState.copy(extTempState = !currentState.extTempState)
                 ChartLine.INT_HUMIDITY -> currentState.copy(intHumidityState = !currentState.intHumidityState)
@@ -57,51 +50,10 @@ class InfoViewModel @Inject constructor(
                 ChartLine.BASE_PLATE -> currentState.copy(basePlateState = !currentState.basePlateState)
                 ChartLine.WATER -> currentState.copy(waterState = !currentState.waterState)
             }
-            persistChartUiState(updatedState)
-            updatedState
         }
     }
 
     init {
         Timber.d("InfoViewModel init")
-        viewModelScope.launch {
-            preferenceRepository.getInfoChartLineStates().collectLatest { savedStates ->
-                if (savedStates.isEmpty()) return@collectLatest
-                _chartUiState.update { ChartUiState.fromPreference(savedStates) }
-            }
-        }
     }
-
-    private fun persistChartUiState(state: ChartUiState) {
-        viewModelScope.launch {
-            preferenceRepository.saveInfoChartLineStates(state.toPreferenceMap())
-        }
-    }
-}
-
-private fun ChartUiState.toPreferenceMap(): Map<String, Boolean> = mapOf(
-    ChartLine.INT_TEMP.name to intTempState,
-    ChartLine.EXT_TEMP.name to extTempState,
-    ChartLine.INT_HUMIDITY.name to intHumidityState,
-    ChartLine.EXT_HUMIDITY.name to extHumidityState,
-    ChartLine.KTP.name to ktpState,
-    ChartLine.CHAMBER1.name to chamber1State,
-    ChartLine.CHAMBER2.name to chamber2State,
-    ChartLine.BASE_PLATE.name to basePlateState,
-    ChartLine.WATER.name to waterState,
-)
-
-private fun ChartUiState.Companion.fromPreference(savedStates: Map<String, Boolean>): ChartUiState {
-    val defaults = ChartUiState()
-    return ChartUiState(
-        intTempState = savedStates[ChartLine.INT_TEMP.name] ?: defaults.intTempState,
-        extTempState = savedStates[ChartLine.EXT_TEMP.name] ?: defaults.extTempState,
-        intHumidityState = savedStates[ChartLine.INT_HUMIDITY.name] ?: defaults.intHumidityState,
-        extHumidityState = savedStates[ChartLine.EXT_HUMIDITY.name] ?: defaults.extHumidityState,
-        ktpState = savedStates[ChartLine.KTP.name] ?: defaults.ktpState,
-        chamber1State = savedStates[ChartLine.CHAMBER1.name] ?: defaults.chamber1State,
-        chamber2State = savedStates[ChartLine.CHAMBER2.name] ?: defaults.chamber2State,
-        basePlateState = savedStates[ChartLine.BASE_PLATE.name] ?: defaults.basePlateState,
-        waterState = savedStates[ChartLine.WATER.name] ?: defaults.waterState,
-    )
-}
+}