Skip to content

Commit 775f742

Browse files
authored
Promote the Preferences API to stable (#568)
1 parent 160668d commit 775f742

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

42 files changed

+23
-112
lines changed

readium/adapters/exoplayer/audio/src/main/java/org/readium/adapter/exoplayer/audio/ExoPlayerDefaults.kt

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,6 @@
66

77
package org.readium.adapter.exoplayer.audio
88

9-
import org.readium.r2.shared.ExperimentalReadiumApi
10-
119
/**
1210
* Default values for the ExoPlayer engine.
1311
*
@@ -16,7 +14,6 @@ import org.readium.r2.shared.ExperimentalReadiumApi
1614
*
1715
* @see ExoPlayerPreferences
1816
*/
19-
@ExperimentalReadiumApi
2017
public data class ExoPlayerDefaults(
2118
val pitch: Double? = null,
2219
val speed: Double? = null

readium/adapters/exoplayer/audio/src/main/java/org/readium/adapter/exoplayer/audio/ExoPlayerPreferences.kt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,13 @@
77
package org.readium.adapter.exoplayer.audio
88

99
import org.readium.r2.navigator.preferences.Configurable
10-
import org.readium.r2.shared.ExperimentalReadiumApi
1110

1211
/**
1312
* Preferences for the the ExoPlayer engine.
1413
*
1514
* @param pitch Playback pitch rate.
1615
* @param speed Playback speed rate.
1716
*/
18-
@ExperimentalReadiumApi
1917
@kotlinx.serialization.Serializable
2018
public data class ExoPlayerPreferences(
2119
val pitch: Double? = null,

readium/adapters/exoplayer/audio/src/main/java/org/readium/adapter/exoplayer/audio/ExoPlayerPreferencesEditor.kt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ import org.readium.r2.navigator.preferences.DoubleIncrement
1313
import org.readium.r2.navigator.preferences.PreferencesEditor
1414
import org.readium.r2.navigator.preferences.RangePreference
1515
import org.readium.r2.navigator.preferences.RangePreferenceDelegate
16-
import org.readium.r2.shared.ExperimentalReadiumApi
1716
import org.readium.r2.shared.InternalReadiumApi
1817
import org.readium.r2.shared.publication.Metadata
1918

@@ -24,7 +23,6 @@ import org.readium.r2.shared.publication.Metadata
2423
* existing preferences. It includes rules for adjusting preferences, such as the supported values
2524
* or ranges.
2625
*/
27-
@ExperimentalReadiumApi
2826
public class ExoPlayerPreferencesEditor(
2927
initialPreferences: ExoPlayerPreferences,
3028
@Suppress("UNUSED_PARAMETER") publicationMetadata: Metadata,

readium/adapters/exoplayer/audio/src/main/java/org/readium/adapter/exoplayer/audio/ExoPlayerPreferencesSerializer.kt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,10 @@ package org.readium.adapter.exoplayer.audio
88

99
import kotlinx.serialization.json.Json
1010
import org.readium.r2.navigator.preferences.PreferencesSerializer
11-
import org.readium.r2.shared.ExperimentalReadiumApi
1211

1312
/**
1413
* JSON serializer of [ExoPlayerPreferences].
1514
*/
16-
@ExperimentalReadiumApi
1715
public class ExoPlayerPreferencesSerializer : PreferencesSerializer<ExoPlayerPreferences> {
1816

1917
override fun serialize(preferences: ExoPlayerPreferences): String =

readium/adapters/exoplayer/audio/src/main/java/org/readium/adapter/exoplayer/audio/ExoPlayerSettings.kt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,12 @@
77
package org.readium.adapter.exoplayer.audio
88

99
import org.readium.r2.navigator.preferences.Configurable
10-
import org.readium.r2.shared.ExperimentalReadiumApi
1110

1211
/**
1312
* Settings values of the ExoPlayer engine.
1413
*
1514
* @see ExoPlayerPreferences
1615
*/
17-
@ExperimentalReadiumApi
1816
public data class ExoPlayerSettings(
1917
val pitch: Double,
2018
val speed: Double

readium/adapters/exoplayer/audio/src/main/java/org/readium/adapter/exoplayer/audio/ExoPlayerSettingsResolver.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ package org.readium.adapter.exoplayer.audio
88

99
import org.readium.r2.shared.ExperimentalReadiumApi
1010

11-
@ExperimentalReadiumApi
11+
@OptIn(ExperimentalReadiumApi::class)
1212
internal class ExoPlayerSettingsResolver(
1313
private val defaults: ExoPlayerDefaults
1414
) : ExoPlayerEngine.SettingsResolver {

readium/adapters/pdfium/navigator/src/main/java/org/readium/adapter/pdfium/navigator/PdfiumDefaults.kt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
package org.readium.adapter.pdfium.navigator
88

99
import org.readium.r2.navigator.preferences.ReadingProgression
10-
import org.readium.r2.shared.ExperimentalReadiumApi
1110

1211
/**
1312
* Default values for the PDF navigator with the PDFium adapter.
@@ -16,7 +15,6 @@ import org.readium.r2.shared.ExperimentalReadiumApi
1615
*
1716
* @see PdfiumPreferences
1817
*/
19-
@ExperimentalReadiumApi
2018
public data class PdfiumDefaults(
2119
val pageSpacing: Double? = null,
2220
val readingProgression: ReadingProgression? = null

readium/adapters/pdfium/navigator/src/main/java/org/readium/adapter/pdfium/navigator/PdfiumPreferences.kt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ import org.readium.r2.navigator.preferences.Axis
1111
import org.readium.r2.navigator.preferences.Configurable
1212
import org.readium.r2.navigator.preferences.Fit
1313
import org.readium.r2.navigator.preferences.ReadingProgression
14-
import org.readium.r2.shared.ExperimentalReadiumApi
1514

1615
/**
1716
* Preferences for the PDF navigator with the PDFium adapter.
@@ -21,7 +20,6 @@ import org.readium.r2.shared.ExperimentalReadiumApi
2120
* @param readingProgression Direction of the horizontal progression across pages.
2221
* @param scrollAxis Indicates the axis along which pages should be laid out in scroll mode.
2322
*/
24-
@ExperimentalReadiumApi
2523
@Serializable
2624
public data class PdfiumPreferences(
2725
val fit: Fit? = null,

readium/adapters/pdfium/navigator/src/main/java/org/readium/adapter/pdfium/navigator/PdfiumPreferencesEditor.kt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ package org.readium.adapter.pdfium.navigator
1010

1111
import org.readium.r2.navigator.extensions.format
1212
import org.readium.r2.navigator.preferences.*
13-
import org.readium.r2.shared.ExperimentalReadiumApi
1413
import org.readium.r2.shared.InternalReadiumApi
1514
import org.readium.r2.shared.publication.Metadata
1615

@@ -21,7 +20,6 @@ import org.readium.r2.shared.publication.Metadata
2120
* existing preferences. It includes rules for adjusting preferences, such as the supported values
2221
* or ranges.
2322
*/
24-
@ExperimentalReadiumApi
2523
public class PdfiumPreferencesEditor internal constructor(
2624
initialPreferences: PdfiumPreferences,
2725
publicationMetadata: Metadata,

readium/adapters/pdfium/navigator/src/main/java/org/readium/adapter/pdfium/navigator/PdfiumPreferencesFilters.kt

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,10 @@
77
package org.readium.adapter.pdfium.navigator
88

99
import org.readium.r2.navigator.preferences.PreferencesFilter
10-
import org.readium.r2.shared.ExperimentalReadiumApi
1110

1211
/**
1312
* Suggested filter to keep only shared [PdfiumPreferences].
1413
*/
15-
@ExperimentalReadiumApi
1614
public object PdfiumSharedPreferencesFilter : PreferencesFilter<PdfiumPreferences> {
1715

1816
override fun filter(preferences: PdfiumPreferences): PdfiumPreferences =
@@ -24,7 +22,6 @@ public object PdfiumSharedPreferencesFilter : PreferencesFilter<PdfiumPreference
2422
/**
2523
* Suggested filter to keep only publication-specific [PdfiumPreferences].
2624
*/
27-
@ExperimentalReadiumApi
2825
public object PdfiumPublicationPreferencesFilter : PreferencesFilter<PdfiumPreferences> {
2926

3027
override fun filter(preferences: PdfiumPreferences): PdfiumPreferences =

0 commit comments

Comments
 (0)