Minor cleanup

This commit is contained in:
Syer10
2022-05-07 11:40:00 -04:00
parent bcf51dc9bc
commit 5a42c6b80d
2 changed files with 3 additions and 3 deletions

View File

@@ -7,7 +7,6 @@
package ca.gosyer.jui.data.base package ca.gosyer.jui.data.base
import ca.gosyer.jui.core.lang.throwIfCancellation import ca.gosyer.jui.core.lang.throwIfCancellation
import ca.gosyer.jui.data.build.BuildKonfig
import ca.gosyer.jui.data.server.Http import ca.gosyer.jui.data.server.Http
import ca.gosyer.jui.data.server.ServerPreferences import ca.gosyer.jui.data.server.ServerPreferences
import io.ktor.client.plugins.websocket.ws import io.ktor.client.plugins.websocket.ws
@@ -33,7 +32,7 @@ abstract class WebsocketService(
protected val client: Http protected val client: Http
) { ) {
protected val json = Json { protected val json = Json {
ignoreUnknownKeys = !BuildKonfig.DEBUG ignoreUnknownKeys = true
} }
protected abstract val _status: MutableStateFlow<Status> protected abstract val _status: MutableStateFlow<Status>

View File

@@ -57,6 +57,7 @@ import androidx.compose.ui.text.font.FontWeight
import androidx.compose.ui.text.style.TextOverflow import androidx.compose.ui.text.style.TextOverflow
import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.dp
import androidx.compose.ui.util.fastForEach import androidx.compose.ui.util.fastForEach
import androidx.compose.ui.util.fastForEachIndexed
import ca.gosyer.jui.data.models.sourcefilters.SortFilter import ca.gosyer.jui.data.models.sourcefilters.SortFilter
import ca.gosyer.jui.i18n.MR import ca.gosyer.jui.i18n.MR
import ca.gosyer.jui.ui.base.prefs.ExpandablePreference import ca.gosyer.jui.ui.base.prefs.ExpandablePreference
@@ -269,7 +270,7 @@ fun SortView(sort: SourceFiltersView.Sort, startExpanded: Boolean, onExpandChang
} }
) { ) {
Column(Modifier.fillMaxWidth()) { Column(Modifier.fillMaxWidth()) {
sort.filter.values.forEachIndexed { index, name -> sort.filter.values.fastForEachIndexed { index, name ->
SortRow( SortRow(
name = name, name = name,
selected = state?.index == index, selected = state?.index == index,