Spotless apply

Author: kul3r4

Jetcaster/gradle/libs.versions.toml

@@ -38,7 +38,6 @@ gradle-versions = "0.52.0"
 hilt = "2.56.2"
 hiltExt = "1.2.0"
 horologist = "0.7.14-beta"
-# @pin When updating to AGP 7.4.0-alpha10 and up we can update this https://developer.android.com/studio/write/java8-support#library-desugaring-versions
 jdkDesugar = "2.1.5"
 junit = "4.13.2"
 kotlin = "2.1.20"
@@ -60,8 +59,6 @@ spotless = "7.0.3"
 # @keep
 targetSdk = "33"
 version-catalog-update = "1.0.0"
-material3Android = "1.3.1"
-media3CommonKtx = "1.7.1"
 
 [libraries]
 accompanist-adaptive = { module = "com.google.accompanist:accompanist-adaptive", version.ref = "accompanist" }
@@ -170,8 +167,7 @@ rometools-modules = { module = "com.rometools:rome-modules", version.ref = "rome
 rometools-rome = { module = "com.rometools:rome", version.ref = "rome" }
 androidx-media3-session = {module = "androidx.media3:media3-session",version.ref = "media3"}
 androidx-media3-exoplayer = {module = "androidx.media3:media3-exoplayer", version.ref = "media3"}
-androidx-material3-android = { group = "androidx.compose.material3", name = "material3-android", version.ref = "material3Android" }
-androidx-media3-common-ktx = { group = "androidx.media3", name = "media3-common-ktx", version.ref = "media3CommonKtx" }
+androidx-media3-common-ktx = { group = "androidx.media3", name = "media3-common-ktx", version.ref = "media3" }
 
 [plugins]
 android-application = { id = "com.android.application", version.ref = "androidGradlePlugin" }

Jetcaster/wear/build.gradle

@@ -20,7 +20,6 @@ plugins {
     alias(libs.plugins.ksp)
     alias(libs.plugins.hilt)
     alias(libs.plugins.compose)
-    alias(libs.plugins.kotlin.serialization)
 }
 
 android {
@@ -75,7 +74,6 @@ android {
 
 dependencies {
 
-    implementation libs.androidx.media3.common.ktx
     def composeBom = platform(libs.androidx.compose.bom)
 
     // General compose dependencies
@@ -92,7 +90,7 @@ dependencies {
     implementation libs.androidx.wear.compose.material
 
     // For using the phone Typography
-    implementation libs.androidx.material3.android
+    implementation libs.androidx.compose.material3
 
     implementation(libs.kotlinx.collections.immutable)
 
@@ -104,6 +102,7 @@ dependencies {
     implementation(libs.androidx.media3.exoplayer)
     implementation(libs.androidx.media3.ui.compose)
     implementation(libs.androidx.media3.session)
+    implementation libs.androidx.media3.common.ktx
 
     // Horologist for correct Compose layout
     implementation libs.horologist.compose.layout

Jetcaster/wear/src/main/java/com/example/jetcaster/MainActivity.kt

@@ -19,7 +19,6 @@ package com.example.jetcaster
 import android.os.Bundle
 import androidx.activity.ComponentActivity
 import androidx.activity.compose.setContent
-import androidx.core.splashscreen.SplashScreen.Companion.installSplashScreen
 import androidx.navigation.NavHostController
 import androidx.wear.compose.navigation.rememberSwipeDismissableNavController
 import dagger.hilt.android.AndroidEntryPoint

Jetcaster/wear/src/main/java/com/example/jetcaster/WearApp.kt

@@ -25,11 +25,11 @@ import androidx.compose.ui.graphics.Color
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import androidx.lifecycle.viewmodel.compose.viewModel
 import androidx.navigation.NavHostController
-import androidx.wear.compose.navigation.SwipeDismissableNavHost
-import androidx.wear.compose.navigation.composable
 import androidx.wear.compose.foundation.pager.rememberPagerState
 import androidx.wear.compose.material3.AppScaffold
 import androidx.wear.compose.material3.ScreenScaffold
+import androidx.wear.compose.navigation.SwipeDismissableNavHost
+import androidx.wear.compose.navigation.composable
 import androidx.wear.compose.navigation.rememberSwipeDismissableNavHostState
 import com.example.jetcaster.theme.WearAppTheme
 import com.example.jetcaster.ui.Episode
@@ -49,8 +49,8 @@ import com.example.jetcaster.ui.player.PlayerScreen
 import com.example.jetcaster.ui.podcast.PodcastDetailsScreen
 import com.example.jetcaster.ui.podcasts.PodcastsScreen
 import com.example.jetcaster.ui.queue.QueueScreen
-import com.google.android.horologist.audio.ui.material3.VolumeScreen
 import com.google.android.horologist.audio.ui.VolumeViewModel
+import com.google.android.horologist.audio.ui.material3.VolumeScreen
 import com.google.android.horologist.media.ui.material3.navigation.MediaNavController.navigateToPlayer
 import com.google.android.horologist.media.ui.material3.navigation.MediaNavController.navigateToVolume
 import com.google.android.horologist.media.ui.material3.navigation.NavigationScreens

Jetcaster/wear/src/main/java/com/example/jetcaster/theme/ColorScheme.kt

@@ -44,7 +44,7 @@ import com.example.jetcaster.designsystem.theme.tertiaryDark
 
 internal val wearColorPalette: ColorScheme = ColorScheme(
     primary = primaryDark,
-    primaryDim= primaryDark,
+    primaryDim = primaryDark,
     onPrimary = Color(0xFF542104),
     primaryContainer = primaryContainerDark,
     onPrimaryContainer = onPrimaryContainerDark,

Jetcaster/wear/src/main/java/com/example/jetcaster/ui/components/PlayIconShape.kt renamed to Jetcaster/wear/src/main/java/com/example/jetcaster/theme/Shape.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright 2022 The Android Open Source Project
+ * Copyright 2025 The Android Open Source Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,14 +14,12 @@
  * limitations under the License.
  */
 
-package com.example.jetcaster.ui.components
+package com.example.jetcaster.theme
 
 import androidx.compose.foundation.shape.RoundedCornerShape
-import androidx.compose.runtime.Composable
 import androidx.compose.ui.unit.dp
-import androidx.wear.compose.material3.IconButtonShapes
+import androidx.wear.compose.material3.Shapes
 
-@Composable
-fun PlayIconShape(): IconButtonShapes {
-    return IconButtonShapes(RoundedCornerShape(16.dp))
-}
+val Shapes = Shapes(
+    medium = RoundedCornerShape(16.dp),
+)

Jetcaster/wear/src/main/java/com/example/jetcaster/theme/WearAppTheme.kt

@@ -24,8 +24,7 @@ fun WearAppTheme(content: @Composable () -> Unit) {
     MaterialTheme(
         colorScheme = wearColorPalette,
         typography = Typography,
-        // For shapes, we generally recommend using the default Material Wear shapes which are
-        // optimized for round devices.
-        content = content
+        shapes = Shapes,
+        content = content,
     )
 }

Jetcaster/wear/src/main/java/com/example/jetcaster/ui/JetcasterNavController.kt

@@ -21,10 +21,7 @@ import androidx.navigation.NamedNavArgument
 import androidx.navigation.NavController
 import androidx.navigation.NavType
 import androidx.navigation.navArgument
-import com.google.android.horologist.media.ui.material3.navigation.MediaNavController.navigateToPlayer
-import com.google.android.horologist.media.ui.material3.navigation.MediaNavController.navigateToVolume
 import com.google.android.horologist.media.ui.material3.navigation.NavigationScreens
-import com.google.android.horologist.media.ui.material3.screens.playerlibrarypager.PlayerLibraryPagerScreen
 
 /**
  * NavController extensions that links to the screens of the Jetcaster app.
@@ -92,4 +89,4 @@ public object Episode : NavigationScreens("episode?episodeUri={episodeUri}") {
 
 public object UpNext : NavigationScreens("upNext") {
     public fun destination(): String = navRoute
-}
+}

Jetcaster/wear/src/main/java/com/example/jetcaster/ui/components/MediaContent.kt

@@ -24,7 +24,6 @@ import androidx.compose.foundation.shape.CircleShape
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
-import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.painter.Painter
 import androidx.compose.ui.layout.ContentScale
 import androidx.compose.ui.res.painterResource
@@ -50,9 +49,9 @@ import java.time.format.FormatStyle
 @Composable
 fun MediaContent(
     episode: PlayerEpisode,
-    episodeArtworkPlaceholder: Painter = painterResource(id = R.drawable.music),
     onItemClick: (PlayerEpisode) -> Unit,
     modifier: Modifier = Modifier,
+    episodeArtworkPlaceholder: Painter = painterResource(id = R.drawable.music),
 ) {
     val mediaTitle = episode.title
     val duration = episode.duration
@@ -76,15 +75,15 @@ fun MediaContent(
             Text(
                 mediaTitle,
                 maxLines = 1,
-                overflow = TextOverflow.Ellipsis
+                overflow = TextOverflow.Ellipsis,
             )
         },
         onClick = { onItemClick(episode) },
         secondaryLabel = {
             Text(
                 secondaryLabel,
                 maxLines = 1,
-                overflow = TextOverflow.Ellipsis
+                overflow = TextOverflow.Ellipsis,
             )
         },
         icon = {
@@ -96,13 +95,13 @@ fun MediaContent(
                 contentScale = ContentScale.Crop,
                 modifier = Modifier
                     .size(
-                        ButtonDefaults.LargeIconSize
+                        ButtonDefaults.LargeIconSize,
                     )
-                    .clip(CircleShape)
+                    .clip(CircleShape),
 
             )
         },
-        modifier = modifier.fillMaxWidth()
+        modifier = modifier.fillMaxWidth(),
     )
 }
 
@@ -111,21 +110,22 @@ fun MediaContent(
 @Composable
 fun MediaContentPreview(
     @PreviewParameter(WearPreviewEpisodes::class)
-    episode: PlayerEpisode
+    episode: PlayerEpisode,
+    modifier: Modifier = Modifier,
 ) {
-    AppScaffold {
+    AppScaffold(modifier = modifier) {
         val contentPadding = rememberResponsiveColumnPadding(
-            first = ColumnItemType.Button
+            first = ColumnItemType.Button,
         )
 
         ScreenScaffold(contentPadding = contentPadding) {
             Box(
                 modifier = Modifier
                     .fillMaxWidth()
-                    .padding(contentPadding)
+                    .padding(contentPadding),
             ) {
                 MediaContent(
-                    episode, onItemClick = { null }
+                    episode, onItemClick = { null },
                 )
             }
         }

Jetcaster/wear/src/main/java/com/example/jetcaster/ui/components/PlaceholderButton.kt

@@ -35,7 +35,6 @@ import com.google.android.horologist.audio.ui.material3.components.actions.Setti
 import com.google.android.horologist.audio.ui.material3.components.actions.VolumeButtonWithBadge
 import com.google.android.horologist.audio.ui.material3.components.toAudioOutputUi
 
-
 /**
  * Settings buttons for the Jetcaster media app.
  * Add to queue and Set Volume.
@@ -59,7 +58,7 @@ fun SettingsButtons(
                 onOutputClick = onVolumeClick,
                 audioOutputUi = AudioOutput.BluetoothHeadset(id = "id", name = "name")
                     .toAudioOutputUi(),
-                volumeUiState = volumeUiState
+                volumeUiState = volumeUiState,
             )
         }
 
@@ -68,10 +67,9 @@ fun SettingsButtons(
                 currentPlayerSpeed = playerUiState.episodePlayerState
                     .playbackSpeed.toMillis().toFloat() / 1000,
                 onPlaybackSpeedChange = onPlaybackSpeedChange,
-                enabled = enabled
+                enabled = enabled,
             )
         }
-
     }
 }