Creepso/NuvioStreaming
1
0
Fork 0
mirror of https://github.com/tapframe/NuvioStreaming.git synced 2026-07-29 23:59:32 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix: adjust order handling in HomeCatalogSettingsRepository

Browse source
This commit is contained in:
tapframe 2026-04-07 20:55:05 +05:30
parent c1025565c2
commit c7fcfbd095
1 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
composeApp/src/commonMain/kotlin/com/nuvio/app/features/home/HomeCatalogSettingsRepository.kt
View file

@ -238,11 +238,13 @@ object HomeCatalogSettingsRepository {
val catalogEntries = definitions.map { UnifiedEntry(it.key, false) }
val collectionEntries = collectionDefinitions.map { UnifiedEntry(it.key, true) }
val allEntries = catalogEntries + collectionEntries
val knownKeys = allEntries.mapTo(linkedSetOf(), UnifiedEntry::key)
var nextOrder = (current.values.maxOfOrNull(StoredHomeCatalogPreference::order) ?: -1) + 1
val orderedEntries = allEntries.mapIndexed { defaultIndex, entry ->
Triple(
entry,
current[entry.key]?.order ?: (definitions.size + defaultIndex),
current[entry.key]?.order ?: (nextOrder + defaultIndex),
defaultIndex,
)
}.sortedWith(
@ -252,9 +254,11 @@ object HomeCatalogSettingsRepository {
),
).map { it.first }
val normalized = mutableMapOf<String, StoredHomeCatalogPreference>()
val normalized = current
.filterKeys { it !in knownKeys }
.toMutableMap()
var enabledHeroSourceCount = 0
orderedEntries.forEachIndexed { index, entry ->
orderedEntries.forEach { entry ->
val stored = current[entry.key]
val heroSourceEnabled = if (entry.isCollection) {
false
@ -270,7 +274,7 @@ object HomeCatalogSettingsRepository {
customTitle = stored?.customTitle.orEmpty(),
enabled = stored?.enabled ?: true,
heroSourceEnabled = heroSourceEnabled,
order = index,
order = stored?.order ?: nextOrder++,
)
}
preferences = normalized