diff --git a/ai/sample/core/src/main/java/com/google/android/horologist/ai/core/AiGrpcClientLookup.kt b/ai/sample/core/src/main/java/com/google/android/horologist/ai/core/AiGrpcClientLookup.kt index 2cf3998be0..0be1435209 100644 --- a/ai/sample/core/src/main/java/com/google/android/horologist/ai/core/AiGrpcClientLookup.kt +++ b/ai/sample/core/src/main/java/com/google/android/horologist/ai/core/AiGrpcClientLookup.kt @@ -23,6 +23,8 @@ import io.grpc.binder.BinderChannelBuilder import io.grpc.binder.UntrustedSecurityPolicies object AiGrpcClientLookup { + // PackageManager.GET_SIGNATURES is deprecated in API 28+ in favor of GET_SIGNING_CERTIFICATES + @Suppress("DEPRECATION") @android.annotation.SuppressLint("PackageManagerGetSignatures") fun lookupInferenceService( context: Context, diff --git a/ai/sample/core/src/main/java/com/google/android/horologist/ai/core/BindableAiGrpcService.kt b/ai/sample/core/src/main/java/com/google/android/horologist/ai/core/BindableAiGrpcService.kt index 2062d03871..9f55d56fda 100644 --- a/ai/sample/core/src/main/java/com/google/android/horologist/ai/core/BindableAiGrpcService.kt +++ b/ai/sample/core/src/main/java/com/google/android/horologist/ai/core/BindableAiGrpcService.kt @@ -35,6 +35,8 @@ abstract class BindableAiGrpcService : LifecycleService() { private lateinit var server: Server private val binderReceiver = IBinderReceiver() + // PackageManager.GET_SIGNATURES is deprecated in API 28+ in favor of GET_SIGNING_CERTIFICATES + @Suppress("DEPRECATION") @get:android.annotation.SuppressLint("PackageManagerGetSignatures") open val securityPolicy: SecurityPolicy by lazy { val mySignature = packageManager.getPackageInfo( diff --git a/ai/sample/wear-gemini-lib/src/main/java/com/google/android/horologist/ai/sample/wear/gemini/service/GeminiSDKInferenceServiceImpl.kt b/ai/sample/wear-gemini-lib/src/main/java/com/google/android/horologist/ai/sample/wear/gemini/service/GeminiSDKInferenceServiceImpl.kt index 47002ac911..2fafd4e889 100644 --- a/ai/sample/wear-gemini-lib/src/main/java/com/google/android/horologist/ai/sample/wear/gemini/service/GeminiSDKInferenceServiceImpl.kt +++ b/ai/sample/wear-gemini-lib/src/main/java/com/google/android/horologist/ai/sample/wear/gemini/service/GeminiSDKInferenceServiceImpl.kt @@ -91,6 +91,8 @@ class GeminiSDKInferenceServiceImpl( } } + // generateImages is deprecated in the underlying Gemini Java SDK + @Suppress("DEPRECATION") private fun geminiGenerateImages(request: PromptRequest, modelId: String): Flow = flow { val responses = client.models.generateImages( diff --git a/auth/ui/src/main/java/com/google/android/horologist/auth/ui/common/screens/streamline/StreamlineSignInDefaultScreen.kt b/auth/ui/src/main/java/com/google/android/horologist/auth/ui/common/screens/streamline/StreamlineSignInDefaultScreen.kt index 2785d016fd..8bca713edb 100644 --- a/auth/ui/src/main/java/com/google/android/horologist/auth/ui/common/screens/streamline/StreamlineSignInDefaultScreen.kt +++ b/auth/ui/src/main/java/com/google/android/horologist/auth/ui/common/screens/streamline/StreamlineSignInDefaultScreen.kt @@ -14,6 +14,9 @@ * limitations under the License. */ +// Uses legacy Wear Material 2 auth composable dialogs (SignedInConfirmationDialog, SelectAccountScreen) +@file:Suppress("DEPRECATION") + package com.google.android.horologist.auth.ui.common.screens.streamline import androidx.compose.runtime.Composable diff --git a/build.gradle.kts b/build.gradle.kts index 2aa848061b..e10fc0d589 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -159,8 +159,6 @@ subprojects { // Allow use of @OptIn "-opt-in=kotlin.RequiresOptIn", "-opt-in=com.google.android.horologist.annotations.ExperimentalHorologistApi", - // Enable default methods in interfaces - "-Xjvm-default=all" ) ) } diff --git a/composables/src/main/java/com/google/android/horologist/composables/SectionedList.kt b/composables/src/main/java/com/google/android/horologist/composables/SectionedList.kt index b8e7bc3f60..180dc00daf 100644 --- a/composables/src/main/java/com/google/android/horologist/composables/SectionedList.kt +++ b/composables/src/main/java/com/google/android/horologist/composables/SectionedList.kt @@ -206,7 +206,6 @@ public class SectionedListScope { internal val sections: MutableList> = mutableListOf() - @SectionScopeMarker public fun section( state: Section.State, content: SectionScope.() -> Unit, @@ -232,7 +231,6 @@ public class SectionedListScope { /** * Add a section in [loaded][Section.State.Loaded] state. */ - @SectionScopeMarker public fun section( list: List, content: SectionScope.() -> Unit, @@ -244,7 +242,6 @@ public class SectionedListScope { /** * Add a section in [loaded][Section.State.Loaded] state with a single item. */ - @SectionScopeMarker public fun section( content: SectionScope.() -> Unit, ): Unit = section( @@ -287,7 +284,6 @@ public class SectionScope { internal var footerVisibleStates: Section.VisibleStates = LOADED_STATE_ONLY private set - @SectionScopeMarker public fun header( visibleStates: Section.VisibleStates = ALL_STATES, content: @Composable SectionContentScope.() -> Unit, @@ -296,7 +292,6 @@ public class SectionScope { headerContent = content } - @SectionScopeMarker public fun loading( count: Int = DEFAULT_LOADING_CONTENT_COUNT, content: @Composable SectionContentScope.() -> Unit, @@ -306,22 +301,18 @@ public class SectionScope { loadingContent = content } - @SectionScopeMarker public fun loaded(content: @Composable SectionContentScope.(T) -> Unit) { loadedContent = content } - @SectionScopeMarker public fun failed(content: @Composable SectionContentScope.() -> Unit) { failedContent = content } - @SectionScopeMarker public fun empty(content: @Composable SectionContentScope.() -> Unit) { emptyContent = content } - @SectionScopeMarker public fun footer( visibleStates: Section.VisibleStates = LOADED_STATE_ONLY, content: @Composable SectionContentScope.() -> Unit, diff --git a/images/base/src/main/java/com/google/android/horologist/images/base/paintable/DrawableResPaintable.kt b/images/base/src/main/java/com/google/android/horologist/images/base/paintable/DrawableResPaintable.kt index 26f3a4870c..7c6b61a64c 100644 --- a/images/base/src/main/java/com/google/android/horologist/images/base/paintable/DrawableResPaintable.kt +++ b/images/base/src/main/java/com/google/android/horologist/images/base/paintable/DrawableResPaintable.kt @@ -24,7 +24,7 @@ import androidx.compose.ui.res.painterResource /** A drawable resource ID that can be represented as a [Painter]. */ @JvmInline public value class DrawableResPaintable( - @DrawableRes private val id: Int, + @param:DrawableRes private val id: Int, ) : PaintableIcon { @Composable diff --git a/media/data/api/current.api b/media/data/api/current.api index 1275435287..864dbc1bf2 100644 --- a/media/data/api/current.api +++ b/media/data/api/current.api @@ -217,17 +217,6 @@ package com.google.android.horologist.media.database { method public abstract com.google.android.horologist.media.database.dao.PlaylistMediaDao playlistMediaDao(); } - @javax.annotation.processing.Generated({"androidx.room.RoomProcessor"}) public final class MediaDatabase_Impl extends com.google.android.horologist.media.database.MediaDatabase { - ctor public MediaDatabase_Impl(); - method public void clearAllTables(); - method protected androidx.room.InvalidationTracker createInvalidationTracker(); - method protected androidx.room.RoomOpenDelegate createOpenDelegate(); - method public com.google.android.horologist.media.database.dao.MediaDao mediaDao(); - method public com.google.android.horologist.media.database.dao.MediaDownloadDao mediaDownloadDao(); - method public com.google.android.horologist.media.database.dao.PlaylistDao playlistDao(); - method public com.google.android.horologist.media.database.dao.PlaylistMediaDao playlistMediaDao(); - } - } package com.google.android.horologist.media.database.dao { @@ -237,17 +226,6 @@ package com.google.android.horologist.media.database.dao { method @androidx.room.Insert(onConflict=androidx.room.OnConflictStrategy.Companion.REPLACE) public suspend Object? upsert(java.util.List mediaList, kotlin.coroutines.Continuation); } - @javax.annotation.processing.Generated({"androidx.room.RoomProcessor"}) public final class MediaDao_Impl implements com.google.android.horologist.media.database.dao.MediaDao { - ctor public MediaDao_Impl(androidx.room.RoomDatabase __db); - method public suspend Object? delete(java.util.List mediaIds, kotlin.coroutines.Continuation); - method public suspend Object? upsert(java.util.List mediaList, kotlin.coroutines.Continuation); - field public static final com.google.android.horologist.media.database.dao.MediaDao_Impl.Companion Companion; - } - - public static final class MediaDao_Impl.Companion { - method public java.util.List> getRequiredConverters(); - } - @androidx.room.Dao @com.google.android.horologist.annotations.ExperimentalHorologistApi public interface MediaDownloadDao { method @androidx.room.Query("\n DELETE FROM MediaDownloadEntity\n WHERE mediaId = :mediaId\n ") public suspend Object? delete(String mediaId, kotlin.coroutines.Continuation); method @androidx.room.Query("\n DELETE FROM MediaDownloadEntity\n WHERE mediaId in (:mediaIds)\n ") public suspend Object? delete(java.util.List mediaIds, kotlin.coroutines.Continuation); @@ -286,23 +264,6 @@ package com.google.android.horologist.media.database.dao { property public com.google.android.horologist.media.database.model.MediaDownloadEntityStatus status; } - @javax.annotation.processing.Generated({"androidx.room.RoomProcessor"}) public final class MediaDownloadDao_Impl implements com.google.android.horologist.media.database.dao.MediaDownloadDao { - ctor public MediaDownloadDao_Impl(androidx.room.RoomDatabase __db); - method public suspend Object? delete(String mediaId, kotlin.coroutines.Continuation); - method public suspend Object? delete(java.util.List mediaIds, kotlin.coroutines.Continuation); - method public suspend Object? getAllByStatus(com.google.android.horologist.media.database.model.MediaDownloadEntityStatus status, kotlin.coroutines.Continuation>); - method public kotlinx.coroutines.flow.Flow> getList(java.util.List mediaIds); - method public suspend Object? insert(com.google.android.horologist.media.database.model.MediaDownloadEntity mediaDownloadEntity, kotlin.coroutines.Continuation); - method public suspend Object? updateProgress(String mediaId, float progress, long size, kotlin.coroutines.Continuation); - method public suspend Object? updateStatus(String mediaId, com.google.android.horologist.media.database.model.MediaDownloadEntityStatus status, kotlin.coroutines.Continuation); - method public suspend Object? updateStatusAndProgress(com.google.android.horologist.media.database.dao.MediaDownloadDao.StatusAndProgress statusAndProgress, kotlin.coroutines.Continuation); - field public static final com.google.android.horologist.media.database.dao.MediaDownloadDao_Impl.Companion Companion; - } - - public static final class MediaDownloadDao_Impl.Companion { - method public java.util.List> getRequiredConverters(); - } - @androidx.room.Dao @com.google.android.horologist.annotations.ExperimentalHorologistApi public interface PlaylistDao { method @androidx.room.Query("\n DELETE FROM PlaylistEntity\n WHERE playlistId in (:playlistIds)\n ") public void delete(java.util.List playlistIds); method @androidx.room.Query("\n SELECT * FROM PlaylistEntity\n WHERE EXISTS (\n SELECT 1 FROM PlaylistMediaEntity\n WHERE PlaylistMediaEntity.playlistId = PlaylistEntity.playlistId\n AND EXISTS (\n SELECT 1 FROM MediaDownloadEntity\n WHERE MediaDownloadEntity.mediaId = PlaylistMediaEntity.mediaId\n )\n )\n ") @androidx.room.Transaction public kotlinx.coroutines.flow.Flow> getAllDownloaded(); @@ -312,37 +273,11 @@ package com.google.android.horologist.media.database.dao { method @androidx.room.Insert(onConflict=androidx.room.OnConflictStrategy.Companion.REPLACE) public suspend Object? upsert(com.google.android.horologist.media.database.model.PlaylistEntity playlistEntity, java.util.List mediaEntityList, java.util.List playlistMediaEntityList, kotlin.coroutines.Continuation); } - @javax.annotation.processing.Generated({"androidx.room.RoomProcessor"}) public final class PlaylistDao_Impl implements com.google.android.horologist.media.database.dao.PlaylistDao { - ctor public PlaylistDao_Impl(androidx.room.RoomDatabase __db); - method public void delete(java.util.List playlistIds); - method public kotlinx.coroutines.flow.Flow> getAllDownloaded(); - method public kotlinx.coroutines.flow.Flow> getAllPopulated(); - method public suspend Object? getPopulated(String playlistId, kotlin.coroutines.Continuation); - method public kotlinx.coroutines.flow.Flow getPopulatedStream(String playlistId); - method public suspend Object? upsert(com.google.android.horologist.media.database.model.PlaylistEntity playlistEntity, java.util.List mediaEntityList, java.util.List playlistMediaEntityList, kotlin.coroutines.Continuation); - field public static final com.google.android.horologist.media.database.dao.PlaylistDao_Impl.Companion Companion; - } - - public static final class PlaylistDao_Impl.Companion { - method public java.util.List> getRequiredConverters(); - } - @androidx.room.Dao @com.google.android.horologist.annotations.ExperimentalHorologistApi public interface PlaylistMediaDao { method @androidx.room.Query("\n DELETE FROM PlaylistMediaEntity\n WHERE mediaId in (:mediaIds)\n ") public void deleteByMediaId(java.util.List mediaIds); method @androidx.room.Query("\n DELETE FROM PlaylistMediaEntity\n WHERE playlistId in (:playlistIds)\n ") public void deleteByPlaylistId(java.util.List playlistIds); } - @javax.annotation.processing.Generated({"androidx.room.RoomProcessor"}) public final class PlaylistMediaDao_Impl implements com.google.android.horologist.media.database.dao.PlaylistMediaDao { - ctor public PlaylistMediaDao_Impl(androidx.room.RoomDatabase __db); - method public void deleteByMediaId(java.util.List mediaIds); - method public void deleteByPlaylistId(java.util.List playlistIds); - field public static final com.google.android.horologist.media.database.dao.PlaylistMediaDao_Impl.Companion Companion; - } - - public static final class PlaylistMediaDao_Impl.Companion { - method public java.util.List> getRequiredConverters(); - } - } package com.google.android.horologist.media.database.mapper { diff --git a/media/ui-material3/api/current.api b/media/ui-material3/api/current.api index 070a00e9cf..8014b6faa7 100644 --- a/media/ui-material3/api/current.api +++ b/media/ui-material3/api/current.api @@ -202,11 +202,11 @@ package com.google.android.horologist.media.ui.material3.components.controls { } public final class PauseButtonKt { - method @KotlinOnly @androidx.compose.runtime.Composable public static void PauseButton(kotlin.jvm.functions.Function0 onClick, optional androidx.wear.compose.material3.ColorScheme colorScheme, optional androidx.compose.ui.Modifier modifier, optional boolean enabled, optional String contentDescription, optional androidx.compose.ui.unit.Dp iconSize, optional androidx.wear.compose.material3.IconButtonColors colors); + method @KotlinOnly @androidx.compose.runtime.Composable public static void PauseButton(kotlin.jvm.functions.Function0 onClick, optional androidx.compose.ui.Modifier modifier, optional androidx.wear.compose.material3.ColorScheme colorScheme, optional boolean enabled, optional String contentDescription, optional androidx.compose.ui.unit.Dp iconSize, optional androidx.wear.compose.material3.IconButtonColors colors); } public final class PlayButtonKt { - method @KotlinOnly @androidx.compose.runtime.Composable public static void PlayButton(kotlin.jvm.functions.Function0 onClick, optional androidx.wear.compose.material3.ColorScheme colorScheme, optional androidx.compose.ui.Modifier modifier, optional boolean enabled, optional String contentDescription, optional androidx.compose.ui.unit.Dp iconSize, optional androidx.wear.compose.material3.IconButtonColors colors); + method @KotlinOnly @androidx.compose.runtime.Composable public static void PlayButton(kotlin.jvm.functions.Function0 onClick, optional androidx.compose.ui.Modifier modifier, optional androidx.wear.compose.material3.ColorScheme colorScheme, optional boolean enabled, optional String contentDescription, optional androidx.compose.ui.unit.Dp iconSize, optional androidx.wear.compose.material3.IconButtonColors colors); } public final class SeekBackButtonKt { diff --git a/media/ui-material3/src/main/java/com/google/android/horologist/media/ui/material3/components/animated/RotatingWavyProgressIndicator.kt b/media/ui-material3/src/main/java/com/google/android/horologist/media/ui/material3/components/animated/RotatingWavyProgressIndicator.kt index 9fde3a852c..97615d2a77 100644 --- a/media/ui-material3/src/main/java/com/google/android/horologist/media/ui/material3/components/animated/RotatingWavyProgressIndicator.kt +++ b/media/ui-material3/src/main/java/com/google/android/horologist/media/ui/material3/components/animated/RotatingWavyProgressIndicator.kt @@ -76,8 +76,8 @@ internal fun RotatingWavyProgressIndicator( shapeMorphProgress: State, rotationProgress: State, strokeWidth: Dp, - colorScheme: ColorScheme = MaterialTheme.colorScheme, modifier: Modifier = Modifier, + colorScheme: ColorScheme = MaterialTheme.colorScheme, ) { val coercedProgress by remember { derivedStateOf { progress.value.coerceIn(0f, 1f) } diff --git a/media/ui-material3/src/main/java/com/google/android/horologist/media/ui/material3/components/controls/PauseButton.kt b/media/ui-material3/src/main/java/com/google/android/horologist/media/ui/material3/components/controls/PauseButton.kt index 4102430390..f197dccb96 100644 --- a/media/ui-material3/src/main/java/com/google/android/horologist/media/ui/material3/components/controls/PauseButton.kt +++ b/media/ui-material3/src/main/java/com/google/android/horologist/media/ui/material3/components/controls/PauseButton.kt @@ -34,8 +34,8 @@ import com.google.android.horologist.media.ui.model.R @Composable public fun PauseButton( onClick: () -> Unit, - colorScheme: ColorScheme = MaterialTheme.colorScheme, modifier: Modifier = Modifier, + colorScheme: ColorScheme = MaterialTheme.colorScheme, enabled: Boolean = true, contentDescription: String = stringResource(id = R.string.horologist_pause_button_content_description), iconSize: Dp = IconButtonDefaults.LargeIconSize, diff --git a/media/ui-material3/src/main/java/com/google/android/horologist/media/ui/material3/components/controls/PlayButton.kt b/media/ui-material3/src/main/java/com/google/android/horologist/media/ui/material3/components/controls/PlayButton.kt index bc197ac0c2..d3130c1a8c 100644 --- a/media/ui-material3/src/main/java/com/google/android/horologist/media/ui/material3/components/controls/PlayButton.kt +++ b/media/ui-material3/src/main/java/com/google/android/horologist/media/ui/material3/components/controls/PlayButton.kt @@ -34,8 +34,8 @@ import com.google.android.horologist.media.ui.model.R @Composable public fun PlayButton( onClick: () -> Unit, - colorScheme: ColorScheme = MaterialTheme.colorScheme, modifier: Modifier = Modifier, + colorScheme: ColorScheme = MaterialTheme.colorScheme, enabled: Boolean = true, contentDescription: String = stringResource(id = R.string.horologist_play_button_content_description), iconSize: Dp = IconButtonDefaults.LargeIconSize, diff --git a/media/ui-material3/src/main/java/com/google/android/horologist/media/ui/material3/composables/MarqueeText.kt b/media/ui-material3/src/main/java/com/google/android/horologist/media/ui/material3/composables/MarqueeText.kt index 5f277a9c6a..ec622506b5 100644 --- a/media/ui-material3/src/main/java/com/google/android/horologist/media/ui/material3/composables/MarqueeText.kt +++ b/media/ui-material3/src/main/java/com/google/android/horologist/media/ui/material3/composables/MarqueeText.kt @@ -23,6 +23,7 @@ import androidx.compose.foundation.layout.padding import androidx.compose.foundation.text.InlineTextContent import androidx.compose.runtime.Composable import androidx.compose.runtime.getValue +import androidx.compose.runtime.mutableIntStateOf import androidx.compose.runtime.mutableStateOf import androidx.compose.runtime.remember import androidx.compose.runtime.setValue @@ -176,7 +177,7 @@ private class MarqueeController( var edgeGradientWidth: Dp by mutableStateOf(edgeGradientWidth) var startGap: Dp by mutableStateOf(startGap) private var needsScrolling by mutableStateOf(false) - private var contentWidth: Int by mutableStateOf(-1) + private var contentWidth: Int by mutableIntStateOf(-1) val outsideMarqueeModifier: Modifier = Modifier .layout { measurable, constraints -> diff --git a/media/ui-material3/src/main/java/com/google/android/horologist/media/ui/material3/composables/SectionedList.kt b/media/ui-material3/src/main/java/com/google/android/horologist/media/ui/material3/composables/SectionedList.kt index f6a8b3d364..223bae68e0 100644 --- a/media/ui-material3/src/main/java/com/google/android/horologist/media/ui/material3/composables/SectionedList.kt +++ b/media/ui-material3/src/main/java/com/google/android/horologist/media/ui/material3/composables/SectionedList.kt @@ -203,7 +203,6 @@ public class SectionedListScope { internal val sections: MutableList> = mutableListOf() - @SectionScopeMarker public fun section( state: Section.State, content: SectionScope.() -> Unit, @@ -229,7 +228,6 @@ public class SectionedListScope { /** * Add a section in [loaded][Section.State.Loaded] state. */ - @SectionScopeMarker public fun section( list: List, content: SectionScope.() -> Unit, @@ -241,7 +239,6 @@ public class SectionedListScope { /** * Add a section in [loaded][Section.State.Loaded] state with a single item. */ - @SectionScopeMarker public fun section( content: SectionScope.() -> Unit, ): Unit = section( @@ -284,7 +281,6 @@ public class SectionScope { internal var footerVisibleStates: Section.VisibleStates = Section.LOADED_STATE_ONLY private set - @SectionScopeMarker public fun header( visibleStates: Section.VisibleStates = Section.ALL_STATES, content: @Composable SectionContentScope.() -> Unit, @@ -293,7 +289,6 @@ public class SectionScope { headerContent = content } - @SectionScopeMarker public fun loading( count: Int = Section.DEFAULT_LOADING_CONTENT_COUNT, content: @Composable SectionContentScope.() -> Unit, @@ -303,22 +298,18 @@ public class SectionScope { loadingContent = content } - @SectionScopeMarker public fun loaded(content: @Composable SectionContentScope.(T) -> Unit) { loadedContent = content } - @SectionScopeMarker public fun failed(content: @Composable SectionContentScope.() -> Unit) { failedContent = content } - @SectionScopeMarker public fun empty(content: @Composable SectionContentScope.() -> Unit) { emptyContent = content } - @SectionScopeMarker public fun footer( visibleStates: Section.VisibleStates = Section.LOADED_STATE_ONLY, content: @Composable SectionContentScope.() -> Unit, diff --git a/media/ui/src/main/java/com/google/android/horologist/media/ui/components/animated/AnimatedMediaButton.kt b/media/ui/src/main/java/com/google/android/horologist/media/ui/components/animated/AnimatedMediaButton.kt index 201c67f77a..80dc332115 100644 --- a/media/ui/src/main/java/com/google/android/horologist/media/ui/components/animated/AnimatedMediaButton.kt +++ b/media/ui/src/main/java/com/google/android/horologist/media/ui/components/animated/AnimatedMediaButton.kt @@ -72,7 +72,7 @@ public fun AnimatedMediaButton( enabled = enabled, colors = colors, ) { - this.mediaButtonContent( + this.MediaButtonContent( compositionResult = compositionResult, contentDescription = contentDescription, iconSize = iconSize, @@ -97,7 +97,7 @@ public fun AnimatedMediaButton( radius = 35.dp, ), ) { - this.mediaButtonContent( + this.MediaButtonContent( compositionResult = compositionResult, contentDescription = contentDescription, iconSize = iconSize, @@ -110,7 +110,7 @@ public fun AnimatedMediaButton( } @Composable -private fun BoxScope.mediaButtonContent( +private fun BoxScope.MediaButtonContent( compositionResult: LottieCompositionResult, contentDescription: String, iconSize: Dp = 32.dp, diff --git a/network-awareness/db/api/current.api b/network-awareness/db/api/current.api index 91287b0a43..1bc40f42f7 100644 --- a/network-awareness/db/api/current.api +++ b/network-awareness/db/api/current.api @@ -39,18 +39,6 @@ package com.google.android.horologist.networks.db { method @androidx.room.Query("UPDATE DataUsage SET bytesTotal = bytesTotal + :bytes WHERE day = :day AND networkType = :networkType") public suspend Object? updateBytes(int day, long bytes, String networkType, kotlin.coroutines.Continuation); } - @javax.annotation.processing.Generated({"androidx.room.RoomProcessor"}) public final class NetworkUsageDao_Impl implements com.google.android.horologist.networks.db.NetworkUsageDao { - ctor public NetworkUsageDao_Impl(androidx.room.RoomDatabase __db); - method public kotlinx.coroutines.flow.Flow> getRecords(int day); - method public suspend Object? insert(com.google.android.horologist.networks.db.DataUsage media, kotlin.coroutines.Continuation); - method public suspend Object? updateBytes(int day, long bytes, String networkType, kotlin.coroutines.Continuation); - field public static final com.google.android.horologist.networks.db.NetworkUsageDao_Impl.Companion Companion; - } - - public static final class NetworkUsageDao_Impl.Companion { - method public java.util.List> getRequiredConverters(); - } - @androidx.room.Database(entities={DataUsage::class}, version=1, exportSchema=false) @androidx.room.TypeConverters(NetworkUsageDatabase.Converters::class) public abstract class NetworkUsageDatabase extends androidx.room.RoomDatabase { ctor public NetworkUsageDatabase(); method public abstract com.google.android.horologist.networks.db.NetworkUsageDao networkUsageDao(); @@ -67,13 +55,5 @@ package com.google.android.horologist.networks.db { method @androidx.room.TypeConverter public java.time.Instant? fromTimestamp(Long? value); } - @javax.annotation.processing.Generated({"androidx.room.RoomProcessor"}) public final class NetworkUsageDatabase_Impl extends com.google.android.horologist.networks.db.NetworkUsageDatabase { - ctor public NetworkUsageDatabase_Impl(); - method public void clearAllTables(); - method protected androidx.room.InvalidationTracker createInvalidationTracker(); - method protected androidx.room.RoomOpenDelegate createOpenDelegate(); - method public com.google.android.horologist.networks.db.NetworkUsageDao networkUsageDao(); - } - } diff --git a/network-awareness/okhttp/api/current.api b/network-awareness/okhttp/api/current.api index 4ae3b2ea5a..e20bb9a4d4 100644 --- a/network-awareness/okhttp/api/current.api +++ b/network-awareness/okhttp/api/current.api @@ -45,6 +45,7 @@ package com.google.android.horologist.networks.okhttp.impl { @com.google.android.horologist.annotations.ExperimentalHorologistApi public final class FailedCall implements okhttp3.Call { ctor public FailedCall(okhttp3.Call.Factory callFactory, okhttp3.Request request, String message); + method public void addEventListener(okhttp3.EventListener eventListener); method public void cancel(); method public okhttp3.Call clone(); method public void enqueue(okhttp3.Callback responseCallback);