Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update ktor & add default value to slider setting #32

Merged
merged 1 commit into from
Sep 21, 2024
Merged

Update ktor & add default value to slider setting #32

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions app/src/main/java/dev/brahmkshatriya/echo/playback/ByteChannelDataSource.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@ import androidx.media3.datasource.DataSpec
import dev.brahmkshatriya.echo.common.models.Streamable
import io.ktor.utils.io.ByteReadChannel
import io.ktor.utils.io.cancel
import io.ktor.utils.io.discard
import io.ktor.utils.io.readAvailable
import kotlinx.coroutines.runBlocking
import java.io.IOException

Expand Down
1 change: 1 addition & 0 deletions app/src/main/java/dev/brahmkshatriya/echo/ui/settings/ExtensionFragment.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -191,6 +191,7 @@ class ExtensionFragment : BaseSettingsFragment() {
it.title = this.title
it.key = this.key
it.summary = this.summary
it.setDefaultValue(this.defaultValue)

it.isIconSpaceReserved = false
preferenceGroup.addPreference(it)
Expand Down
2 changes: 1 addition & 1 deletion common/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ kotlin {

dependencies {
api("org.jetbrains.kotlinx:kotlinx-serialization-json:1.7.1")
api("io.ktor:ktor-utils:2.3.0")
api("io.ktor:ktor-utils:3.0.0-beta-2")
}

publishing {
Expand Down
1 change: 1 addition & 0 deletions common/src/main/java/dev/brahmkshatriya/echo/common/settings/SettingSlider.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ data class SettingSlider (
override val title: String,
override val key: String,
val summary: String? = null,
val defaultValue: Int? = null,
val from: Int,
val to: Int,
val steps: Int? = null
Expand Down
Loading