Remove ExperimentalWearMaterialApi opt-in and suppress in code

auth/composables/build.gradle.kts

@@ -46,8 +46,6 @@ android {
         jvmTarget = JavaVersion.VERSION_17.majorVersion
         freeCompilerArgs += listOf(
             "-opt-in=com.google.android.horologist.annotations.ExperimentalHorologistApi",
-            "-opt-in=androidx.compose.foundation.ExperimentalFoundationApi",
-            "-opt-in=androidx.wear.compose.material.ExperimentalWearMaterialApi",
         )
     }
 

auth/sample/phone/src/main/java/com/google/android/horologist/auth/sample/ui/theme/HorologistTheme.kt

@@ -73,6 +73,7 @@ fun HorologistTheme(
     if (!view.isInEditMode) {
         SideEffect {
             val window = (view.context as Activity).window
+            @Suppress("DEPRECATION")
             window.statusBarColor = colorScheme.primary.toArgb()
             WindowCompat.getInsetsController(window, view).isAppearanceLightStatusBars = darkTheme
         }

composables/build.gradle.kts

@@ -45,8 +45,6 @@ android {
         jvmTarget = JavaVersion.VERSION_17.majorVersion
         freeCompilerArgs += listOf(
             "-opt-in=com.google.android.horologist.annotations.ExperimentalHorologistApi",
-            "-opt-in=androidx.compose.foundation.ExperimentalFoundationApi",
-            "-opt-in=androidx.wear.compose.material.ExperimentalWearMaterialApi",
         )
     }
 

composables/src/debug/java/com/google/android/horologist/composables/PlaceholderChipPreview.kt

@@ -14,10 +14,13 @@
  * limitations under the License.
  */
 
+@file:OptIn(ExperimentalWearMaterialApi::class)
+
 package com.google.android.horologist.composables
 
 import androidx.compose.runtime.Composable
 import androidx.wear.compose.material.ChipDefaults
+import androidx.wear.compose.material.ExperimentalWearMaterialApi
 import com.google.android.horologist.compose.tools.WearPreview
 
 @WearPreview

composables/src/debug/java/com/google/android/horologist/composables/SectionedListPreview.kt

@@ -14,6 +14,8 @@
  * limitations under the License.
  */
 
+@file:OptIn(ExperimentalWearMaterialApi::class)
+
 package com.google.android.horologist.composables
 
 import androidx.compose.foundation.layout.padding
@@ -29,6 +31,7 @@ import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.unit.dp
 import androidx.wear.compose.material.ChipDefaults
+import androidx.wear.compose.material.ExperimentalWearMaterialApi
 import androidx.wear.compose.material.Icon
 import androidx.wear.compose.material.MaterialTheme
 import androidx.wear.compose.material.Text

compose-material/build.gradle.kts

@@ -52,8 +52,6 @@ android {
         jvmTarget = JavaVersion.VERSION_17.majorVersion
         freeCompilerArgs += listOf(
             "-opt-in=com.google.android.horologist.annotations.ExperimentalHorologistApi",
-            "-opt-in=androidx.compose.foundation.ExperimentalFoundationApi",
-            "-opt-in=androidx.wear.compose.material.ExperimentalWearMaterialApi",
         )
     }
 

datalayer/phone-ui/src/main/java/com/google/android/horologist/datalayer/phone/ui/play/PlayLauncher.kt

@@ -22,6 +22,7 @@ import android.content.Intent
 import android.net.Uri
 import android.os.Bundle
 import androidx.core.content.ContextCompat
+import androidx.core.net.toUri
 
 private const val PLAY_STORE_APP_URI_PREFIX = "market://details?id="
 private const val PLAY_STORE_WEB_URL_PREFIX = "https://play.google.com/store/apps/details?id="
@@ -31,21 +32,19 @@ private const val PLAY_STORE_WEB_URL_PREFIX = "https://play.google.com/store/app
  */
 public fun Context.launchPlay(packageName: String) {
     try {
-        ContextCompat.startActivity(
-            this,
+        startActivity(
             Intent(
                 Intent.ACTION_VIEW,
-                Uri.parse(PLAY_STORE_APP_URI_PREFIX + packageName),
+                (PLAY_STORE_APP_URI_PREFIX + packageName).toUri(),
             ),
             Bundle(),
         )
     } catch (anfe: ActivityNotFoundException) {
         // Handle scenario where Google Play app is not installed
-        ContextCompat.startActivity(
-            this,
+        startActivity(
             Intent(
                 Intent.ACTION_VIEW,
-                Uri.parse(PLAY_STORE_WEB_URL_PREFIX + packageName),
+                (PLAY_STORE_WEB_URL_PREFIX + packageName).toUri(),
             ),
             Bundle(),
         )

media/audio-ui-model/src/main/java/com/google/android/horologist/audio/ui/VolumeViewModel.kt

@@ -86,12 +86,12 @@ public open class VolumeViewModel(
     }
 
     public fun increaseVolume() {
-        this.userActionEvents.tryEmit(Unit)
+        val unused = userActionEvents.tryEmit(Unit)
         volumeRepository.increaseVolume()
     }
 
     public fun decreaseVolume() {
-        this.userActionEvents.tryEmit(Unit)
+        val unused = userActionEvents.tryEmit(Unit)
         volumeRepository.decreaseVolume()
     }
 
@@ -127,7 +127,7 @@ public open class VolumeViewModel(
     }
 
     public fun setVolume(volume: Int) {
-        this.userActionEvents.tryEmit(Unit)
+        val unused = userActionEvents.tryEmit(Unit)
         if (volume != volumeRepository.volumeState.value.current) {
             volumeRepository.setVolume(volume)
         }

media/ui-model/build.gradle.kts

@@ -50,7 +50,6 @@ android {
             com.google.android.horologist.annotations.ExperimentalHorologistApi
             kotlin.RequiresOptIn
             kotlinx.coroutines.ExperimentalCoroutinesApi
-            androidx.wear.compose.material.ExperimentalWearMaterialApi
             """.trim().split("\\s+".toRegex()).map {
                 "-opt-in=$it"
             }

media/ui/build.gradle.kts

@@ -50,7 +50,6 @@ android {
             com.google.android.horologist.annotations.ExperimentalHorologistApi
             kotlin.RequiresOptIn
             kotlinx.coroutines.ExperimentalCoroutinesApi
-            androidx.wear.compose.material.ExperimentalWearMaterialApi
             """.trim().split("\\s+".toRegex()).map {
                 "-opt-in=$it"
             }

media/ui/src/debug/java/com/google/android/horologist/media/ui/screens/browse/BrowseScreenPreview.kt

@@ -14,6 +14,8 @@
  * limitations under the License.
  */
 
+@file:OptIn(ExperimentalWearMaterialApi::class)
+
 package com.google.android.horologist.media.ui.screens.browse
 
 import androidx.compose.material.icons.Icons
@@ -25,6 +27,7 @@ import androidx.compose.material.icons.filled.Podcasts
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.res.stringResource
 import androidx.wear.compose.material.ChipDefaults
+import androidx.wear.compose.material.ExperimentalWearMaterialApi
 import androidx.wear.compose.ui.tooling.preview.WearPreviewDevices
 import com.google.android.horologist.composables.PlaceholderChip
 import com.google.android.horologist.composables.Section

media/ui/src/debug/java/com/google/android/horologist/media/ui/screens/entity/EntityScreenPreview.kt

@@ -14,6 +14,8 @@
  * limitations under the License.
  */
 
+@file:OptIn(ExperimentalWearMaterialApi::class)
+
 package com.google.android.horologist.media.ui.screens.entity
 
 import androidx.compose.foundation.background
@@ -41,6 +43,7 @@ import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.unit.dp
 import androidx.wear.compose.material.ChipDefaults
+import androidx.wear.compose.material.ExperimentalWearMaterialApi
 import androidx.wear.compose.material.Icon
 import androidx.wear.compose.material.Text
 import androidx.wear.compose.ui.tooling.preview.WearPreviewDevices

media/ui/src/main/java/com/google/android/horologist/media/ui/components/MediaInfoDisplay.kt

@@ -14,10 +14,13 @@
  * limitations under the License.
  */
 
+@file:OptIn(ExperimentalWearMaterialApi::class)
+
 package com.google.android.horologist.media.ui.components
 
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
+import androidx.wear.compose.material.ExperimentalWearMaterialApi
 import com.google.android.horologist.annotations.ExperimentalHorologistApi
 import com.google.android.horologist.media.ui.components.display.LoadingMediaDisplay
 import com.google.android.horologist.media.ui.components.display.NothingPlayingDisplay

media/ui/src/main/java/com/google/android/horologist/media/ui/components/animated/AnimatedMediaInfoDisplay.kt

@@ -14,10 +14,13 @@
  * limitations under the License.
  */
 
+@file:OptIn(ExperimentalWearMaterialApi::class)
+
 package com.google.android.horologist.media.ui.components.animated
 
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
+import androidx.wear.compose.material.ExperimentalWearMaterialApi
 import com.google.android.horologist.annotations.ExperimentalHorologistApi
 import com.google.android.horologist.media.ui.components.display.LoadingMediaDisplay
 import com.google.android.horologist.media.ui.components.display.NothingPlayingDisplay

media/ui/src/main/java/com/google/android/horologist/media/ui/screens/browse/PlaylistDownloadBrowseScreen.kt

@@ -14,6 +14,8 @@
  * limitations under the License.
  */
 
+@file:OptIn(ExperimentalWearMaterialApi::class)
+
 package com.google.android.horologist.media.ui.screens.browse
 
 import androidx.compose.material.icons.Icons
@@ -27,6 +29,7 @@ import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.semantics.onClick
 import androidx.compose.ui.semantics.semantics
 import androidx.wear.compose.material.ChipDefaults
+import androidx.wear.compose.material.ExperimentalWearMaterialApi
 import com.google.android.horologist.annotations.ExperimentalHorologistApi
 import com.google.android.horologist.composables.PlaceholderChip
 import com.google.android.horologist.composables.Section

media/ui/src/main/java/com/google/android/horologist/media/ui/screens/entity/PlaylistDownloadScreen.kt

@@ -14,6 +14,8 @@
  * limitations under the License.
  */
 
+@file:OptIn(ExperimentalWearMaterialApi::class)
+
 package com.google.android.horologist.media.ui.screens.entity
 
 import android.text.format.Formatter
@@ -49,6 +51,7 @@ import androidx.compose.ui.unit.dp
 import androidx.wear.compose.material.ButtonDefaults
 import androidx.wear.compose.material.ChipDefaults
 import androidx.wear.compose.material.CircularProgressIndicator
+import androidx.wear.compose.material.ExperimentalWearMaterialApi
 import androidx.wear.compose.material.Icon
 import androidx.wear.compose.material.MaterialTheme
 import androidx.wear.compose.material.ProgressIndicatorDefaults

media/ui/src/main/java/com/google/android/horologist/media/ui/screens/entity/PlaylistStreamingScreen.kt

@@ -14,6 +14,8 @@
  * limitations under the License.
  */
 
+@file:OptIn(ExperimentalWearMaterialApi::class)
+
 package com.google.android.horologist.media.ui.screens.entity
 
 import androidx.compose.foundation.layout.Row
@@ -28,6 +30,7 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
 import androidx.wear.compose.material.ChipDefaults
+import androidx.wear.compose.material.ExperimentalWearMaterialApi
 import com.google.android.horologist.annotations.ExperimentalHorologistApi
 import com.google.android.horologist.composables.PlaceholderChip
 import com.google.android.horologist.compose.layout.rememberActivePlaceholderState

media/ui/src/main/java/com/google/android/horologist/media/ui/screens/playlists/PlaylistsScreen.kt

@@ -14,6 +14,8 @@
  * limitations under the License.
  */
 
+@file:OptIn(ExperimentalWearMaterialApi::class)
+
 package com.google.android.horologist.media.ui.screens.playlists
 
 import androidx.compose.foundation.layout.Column
@@ -23,6 +25,7 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.painter.Painter
 import androidx.compose.ui.unit.dp
 import androidx.wear.compose.material.ChipDefaults
+import androidx.wear.compose.material.ExperimentalWearMaterialApi
 import com.google.android.horologist.annotations.ExperimentalHorologistApi
 import com.google.android.horologist.composables.PlaceholderChip
 import com.google.android.horologist.composables.Section