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

Jump to bottom

Add missing fields to Chapter and update TimeInterval #41

Merged
merged 3 commits into from
May 21, 2024
Merged

Add missing fields to Chapter and update TimeInterval #41

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6d665a5
Add missing fields to `Chapter`
MGaetan89 May 17, 2024
7353f14
Make `TimeInterval` fields nullable
MGaetan89 May 17, 2024
9bfc016
Bump data provider version to 0.10.0
MGaetan89 May 17, 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: 2 additions & 2 deletions buildSrc/src/main/kotlin/Config.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ object Config {
const val minSdk = 21

const val major = 0
const val minor = 9
const val patch = 2
const val minor = 10
const val patch = 0
const val versionName = "$major.$minor.$patch"

const val maven_group = "ch.srg.data.provider"
Expand Down
3 changes: 3 additions & 0 deletions data/src/main/java/ch/srg/dataProvider/integrationlayer/data/remote/Chapter.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
@file:UseSerializers(DateSerializer::class)

package ch.srg.dataProvider.integrationlayer.data.remote

import ch.srg.dataProvider.integrationlayer.data.ImageUrl
Expand Down Expand Up @@ -40,6 +41,8 @@ data class Chapter(
override val socialCountList: List<SocialCountEntry>? = null,
override val displayable: Boolean = false,
override val fullLengthUrn: String? = null,
val fullLengthMarkIn: Long? = null,
val fullLengthMarkOut: Long? = null,
override val eventData: String? = null,
override val subtitleList: List<Subtitle>? = null,
@SerialName("analyticsData")
Expand Down
6 changes: 5 additions & 1 deletion data/src/main/java/ch/srg/dataProvider/integrationlayer/data/remote/TimeInterval.kt
View file
Open in desktop
StaehliJ marked this conversation as resolved.
Show resolved Hide resolved
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,11 @@ import kotlinx.serialization.Serializable
* License information is available from the LICENSE file.
*/
@Serializable
data class TimeInterval(val type: Type, val markIn: Long, val markOut: Long) {
data class TimeInterval(
val type: Type?,
val markIn: Long?,
val markOut: Long?,
) {

enum class Type {
OPENING_CREDITS, CLOSING_CREDITS
Expand Down
Loading