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 seek bar #30

Merged
merged 7 commits into from
Aug 20, 2024
Merged

update seek bar #30

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
3032ab8
update seek bar
m-derakhshan Aug 18, 2024
7733ec6
update seek bar
m-derakhshan Aug 18, 2024
58756df
Merge branch 'develop' of https://github.com/m-derakhshan/android-ui …
m-derakhshan Aug 19, 2024
dd628bd
remove the safe margin
m-derakhshan Aug 19, 2024
0d43937
Clean up
MattiasBuelens Aug 20, 2024
25ac2bd
Simplify
MattiasBuelens Aug 20, 2024
9afb16f
Update changelog
MattiasBuelens Aug 20, 2024
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
4 changes: 4 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,10 @@
> - 🏠 Internal
> - 💅 Polish

## Unreleased

* 🐛 Disable system gestures on the `SeekBar` component. ([#30](https://github.com/THEOplayer/android-ui/pull/30))

## v1.7.0 (2024-08-12)

* 💥 Updated to Jetpack Compose version 1.6.8 ([BOM](https://developer.android.com/jetpack/compose/bom) 2024.06.00).
Expand Down
3 changes: 2 additions & 1 deletion ui/src/main/java/com/theoplayer/android/ui/SeekBar.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package com.theoplayer.android.ui

import androidx.compose.foundation.systemGestureExclusion
import androidx.compose.material3.Slider
import androidx.compose.material3.SliderColors
import androidx.compose.material3.SliderDefaults
Expand Down Expand Up @@ -42,7 +43,7 @@ fun SeekBar(
var wasPlayingBeforeSeek by remember { mutableStateOf(false) }

Slider(
modifier = modifier,
modifier = modifier.systemGestureExclusion(),
colors = colors,
value = seekTime ?: currentTime,
valueRange = valueRange,
Expand Down