Merge pull request '우선순위 중복 시 기존 항목을 NONE으로 초기화하도록 수정' (#36) from feature/ISSUE-10 into develop

Reviewed-on: #36

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

@@ -88,4 +88,7 @@ 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,6 +68,9 @@ 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() {
@@ -559,4 +562,31 @@ 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/engineer/TemperatureView.kt

@@ -5,6 +5,7 @@ import androidx.compose.foundation.background
 import androidx.compose.foundation.border
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
@@ -13,15 +14,19 @@ import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.material3.HorizontalDivider
+import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
 import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
+import androidx.compose.ui.unit.sp
 import com.laseroptek.raman.const.temperatureTypes
 import com.laseroptek.raman.data.model.serial.Temperature
+import com.laseroptek.raman.ui.theme.RobotoTypography
 import com.laseroptek.raman.utils.ext.px
 import timber.log.Timber
 
@@ -56,7 +61,33 @@ fun TemperatureView(
                 ),
         )
 
-        Spacer(modifier = Modifier.height(10.px.dp))
+        Row(
+            modifier = Modifier
+                .fillMaxWidth()
+                .padding(start = 20.px.dp, end = 20.px.dp),
+            verticalAlignment = Alignment.CenterVertically
+        ) {
+            Spacer(modifier = Modifier.weight(1.5f))
+            Text(
+                modifier = Modifier.weight(1f),
+                text = "Read",
+                style = RobotoTypography.labelMedium,
+                fontSize = 12.px.sp,
+                color = Color.Black,
+                textAlign = TextAlign.End
+            )
+            Text(
+                modifier = Modifier.weight(1f),
+                text = "Write",
+                style = RobotoTypography.labelMedium,
+                fontSize = 12.px.sp,
+                color = Color.Black,
+                textAlign = TextAlign.End
+            )
+            Spacer(modifier = Modifier.weight(1f))
+        }
+
+        Spacer(modifier = Modifier.height(2.px.dp))
 
         // Tempearture
         for (i in 0..temperatureTypes.size -1) {

app/src/main/java/com/laseroptek/raman/ui/screens/engineer/TwoCountItemView.kt

@@ -75,25 +75,6 @@ fun TwoCountItemView(
             )
         }
 
-        Column(
-            modifier = Modifier
-                .fillMaxWidth()
-                .weight(1f)
-                .height(30.px.dp),
-            verticalArrangement = Arrangement.Center,
-            horizontalAlignment = Alignment.Start
-        ) {
-            Text(
-                modifier = Modifier.fillMaxWidth(),
-                text = "Read",
-                style = RobotoTypography.bodyMedium,
-                fontWeight = FontWeight.Normal,
-                fontSize = 12.px.sp,
-                color = Color.Black,
-                textAlign = TextAlign.End
-            )
-        }
-
         Column(
             modifier = Modifier
                 .fillMaxWidth()
@@ -113,25 +94,6 @@ fun TwoCountItemView(
             )
         }
 
-        Column(
-            modifier = Modifier
-                .fillMaxWidth()
-                .weight(1f)
-                .height(30.px.dp),
-            verticalArrangement = Arrangement.Center,
-            horizontalAlignment = Alignment.Start
-        ) {
-            Text(
-                modifier = Modifier.fillMaxWidth(),
-                text = "Write",
-                style = RobotoTypography.bodyMedium,
-                fontWeight = FontWeight.Normal,
-                fontSize = 12.px.sp,
-                color = Color.Black,
-                textAlign = TextAlign.End
-            )
-        }
-
         Column(
             modifier = Modifier
                 //.noRippleClickable(onClick = onDeviceOpTimeClick)

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

@@ -646,7 +646,7 @@ fun PresetLoadPopup(
                                     Timber.d("onClick - Confirm Save")
 
                                     // Check empty names and conflict priority exist in the preset viewmodel's presetList
-                                    val listToValidate = presetViewModel.presetList.value
+                                    var listToValidate = presetViewModel.presetList.value
 
                                     // Check for any presets with an empty name
                                     val hasEmptyName =
@@ -678,18 +678,32 @@ fun PresetLoadPopup(
                                     }
 
                                     // Check for duplicate priorities (ignoring priority 0)
-                                    val priorityConflicts = listToValidate
-                                        .filter { it.priority > 0 } // Only consider prioritized items
-                                        .groupBy { it.priority }   // Group them by priority
-                                        .any { it.value.size > 1 } // Check if any group is larger than 1
+                                    val duplicatePriorityGroups = listToValidate
+                                        .filter { it.priority > 0 }
+                                        .groupBy { it.priority }
+                                        .filter { it.value.size > 1 }
 
-                                    if (priorityConflicts) {
-                                        Toast.makeText(
-                                            context,
-                                            "There are duplicate priorities. Please ensure each priority is unique.",
-                                            Toast.LENGTH_LONG
-                                        ).show()
-                                        return@noRippleClickable // Stop the process
+                                    if (duplicatePriorityGroups.isNotEmpty()) {
+                                        val resolvedList = listToValidate.map { it.copy() }.toMutableList()
+                                        val selectedPreset = resolvedList.getOrNull(selectedPresetIndex)
+
+                                        duplicatePriorityGroups.forEach { (priorityValue, presets) ->
+                                            val keeperId = presets
+                                                .firstOrNull { preset ->
+                                                    selectedPreset != null && preset.id == selectedPreset.id
+                                                }
+                                                ?.id
+                                                ?: presets.first().id
+
+                                            resolvedList.forEachIndexed { index, preset ->
+                                                if (preset.priority == priorityValue && preset.id != keeperId) {
+                                                    resolvedList[index] = preset.copy(priority = 0)
+                                                }
+                                            }
+                                        }
+
+                                        presetViewModel.setPresetList(resolvedList)
+                                        listToValidate = resolvedList
                                     }
 
                                     Timber.d("Validation successful. Saving list to MainViewModel.")

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

@@ -1,10 +1,14 @@
 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
 
@@ -25,10 +29,13 @@ 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.
@@ -39,7 +46,7 @@ class InfoViewModel @Inject constructor(
     fun toggleLine(line: ChartLine) {
         // .update is a thread-safe way to update the state.
         _chartUiState.update { currentState ->
-            when (line) {
+            val updatedState = 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)
@@ -50,10 +57,51 @@ 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,
+    )
+}