steven/raman
1
1
Fork 0
Code Issues 30 Pull Requests 6 Actions Packages Releases Wiki Activity

우선순위 중복 시 기존 항목을 NONE으로 초기화하도록 수정 #36

Open
woo wants to merge 1 commits from feature/ISSUE-10 into develop
pull from: feature/ISSUE-10
merge into: steven:develop
Conversation 0 Commits 1 Files Changed 1 +26 -12
1 changed files with 26 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 3c9a07bf9a - Show all commits

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

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