Spotless jetcaster

MagicalMeghan · MagicalMeghan · commit 6892544ea0e3 · 2026-05-01T10:18:57.000-04:00
diff --git a/Jetcaster/core/data/src/main/java/com/example/jetcaster/core/data/database/model/PodcastWithExtraInfo.kt b/Jetcaster/core/data/src/main/java/com/example/jetcaster/core/data/database/model/PodcastWithExtraInfo.kt
@@ -40,11 +40,13 @@ class PodcastWithExtraInfo {
 
     override fun equals(other: Any?): Boolean = when {
         other === this -> true
+
         other is PodcastWithExtraInfo -> {
             podcast == other.podcast &&
                 lastEpisodeDate == other.lastEpisodeDate &&
                 isFollowed == other.isFollowed
         }
+
         else -> false
     }
 
diff --git a/Jetcaster/core/designsystem/src/main/java/com/example/jetcaster/designsystem/component/PodcastImage.kt b/Jetcaster/core/designsystem/src/main/java/com/example/jetcaster/designsystem/component/PodcastImage.kt
@@ -81,6 +81,7 @@ fun PodcastImage(
                         .fillMaxSize(),
                 )
             }
+
             else -> {
                 Box(
                     modifier = modifier
diff --git a/Jetcaster/glancewidget/src/main/java/com/example/jetcaster/glancewidget/JetcasterAppWidget.kt b/Jetcaster/glancewidget/src/main/java/com/example/jetcaster/glancewidget/JetcasterAppWidget.kt
@@ -100,8 +100,10 @@ private fun calculateSizeBucket(): SizeBucket {
 
     return when {
         width < Sizes.minWidth -> SizeBucket.Invalid
+
         width <= Sizes.smallBucketCutoffWidth ->
             if (height >= Sizes.short) SizeBucket.Narrow else SizeBucket.NarrowShort
+
         else ->
             if (height >= Sizes.short) SizeBucket.Normal else SizeBucket.NormalShort
     }
@@ -114,7 +116,7 @@ class JetcasterAppWidget : GlanceAppWidget() {
     override suspend fun provideGlance(context: Context, id: GlanceId) {
         val testState = JetcasterAppWidgetViewState(
             episodeTitle =
-            "100 - Android 15 DP 1, Stable Studio Iguana, Cloud Photo Picker, and more!",
+                "100 - Android 15 DP 1, Stable Studio Iguana, Cloud Photo Picker, and more!",
             podcastTitle = "Now in Android",
             isPlaying = false,
             albumArtUri = "https://static.libsyn.com/p/assets/9/f/f/3/" +
@@ -129,6 +131,7 @@ class JetcasterAppWidget : GlanceAppWidget() {
             GlanceTheme {
                 when (sizeBucket) {
                     SizeBucket.Invalid -> WidgetUiInvalidSize()
+
                     SizeBucket.Narrow -> Widget(
                         iconSize = Sizes.medium,
                         imageUri = artUri,
@@ -224,6 +227,7 @@ fun PodcastText(title: String, subtitle: String, modifier: GlanceModifier = Glan
                 maxLines = 2,
             )
         }
+
         else -> Column(modifier) {
             Text(
                 text = title,
diff --git a/Jetcaster/mobile/src/main/java/com/example/jetcaster/ui/home/Home.kt b/Jetcaster/mobile/src/main/java/com/example/jetcaster/ui/home/Home.kt
@@ -728,12 +728,14 @@ private fun lastUpdated(updated: OffsetDateTime): String {
 
     return when {
         days > 28 -> stringResource(R.string.updated_longer)
+
         days >= 7 -> {
             val weeks = days / 7
             quantityStringResource(R.plurals.updated_weeks_ago, weeks, weeks)
         }
 
         days > 0 -> quantityStringResource(R.plurals.updated_days_ago, days, days)
+
         else -> stringResource(R.string.updated_today)
     }
 }
diff --git a/Jetcaster/mobile/src/main/java/com/example/jetcaster/ui/player/PlayerScreen.kt b/Jetcaster/mobile/src/main/java/com/example/jetcaster/ui/player/PlayerScreen.kt
@@ -388,7 +388,7 @@ private fun PlayerContentRegular(
                             ),
                             animatedVisibilityScope = animatedVisibilityScope,
                             clipInOverlayDuringTransition =
-                            OverlayClip(MaterialTheme.shapes.medium),
+                                OverlayClip(MaterialTheme.shapes.medium),
                         ),
                     )
                 }
diff --git a/Jetcaster/mobile/src/main/java/com/example/jetcaster/ui/shared/EpisodeListItem.kt b/Jetcaster/mobile/src/main/java/com/example/jetcaster/ui/shared/EpisodeListItem.kt
@@ -178,6 +178,7 @@ private fun EpisodeListItemFooter(
                         duration.toMinutes().toInt(),
                     )
                 }
+
                 // Otherwise we just use the date
                 else -> MediumDateFormatter.format(episode.published)
             },
@@ -230,9 +231,9 @@ private fun EpisodeListItemHeader(
     Row(modifier = modifier) {
         Column(
             modifier =
-            Modifier
-                .weight(1f)
-                .padding(end = 16.dp),
+                Modifier
+                    .weight(1f)
+                    .padding(end = 16.dp),
         ) {
             Text(
                 text = episode.title,
diff --git a/Jetcaster/mobile/src/main/java/com/example/jetcaster/ui/theme/Theme.kt b/Jetcaster/mobile/src/main/java/com/example/jetcaster/ui/theme/Theme.kt
@@ -474,6 +474,7 @@ fun JetcasterTheme(dynamicColor: Boolean = false, content: @Composable () -> Uni
             val context = LocalContext.current
             dynamicDarkColorScheme(context)
         }
+
         else -> darkScheme
     }
 
diff --git a/Jetcaster/tv/src/main/java/com/example/jetcaster/tv/ui/component/Catalog.kt b/Jetcaster/tv/src/main/java/com/example/jetcaster/tv/ui/component/Catalog.kt
@@ -58,7 +58,7 @@ internal fun Catalog(
         modifier = modifier,
         contentPadding = JetcasterAppDefaults.overScanMargin.catalog.intoPaddingValues(),
         verticalArrangement =
-        Arrangement.spacedBy(JetcasterAppDefaults.gap.section),
+            Arrangement.spacedBy(JetcasterAppDefaults.gap.section),
         state = state,
     ) {
         if (header != null) {
diff --git a/Jetcaster/tv/src/main/java/com/example/jetcaster/tv/ui/discover/DiscoverScreen.kt b/Jetcaster/tv/src/main/java/com/example/jetcaster/tv/ui/discover/DiscoverScreen.kt
@@ -22,7 +22,6 @@ import androidx.compose.foundation.lazy.LazyListState
 import androidx.compose.foundation.lazy.rememberLazyListState
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
-import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.remember
 import androidx.compose.ui.ExperimentalComposeUiApi
@@ -31,6 +30,7 @@ import androidx.compose.ui.focus.FocusRequester
 import androidx.compose.ui.focus.focusProperties
 import androidx.compose.ui.focus.focusRequester
 import androidx.hilt.lifecycle.viewmodel.compose.hiltViewModel
+import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import androidx.tv.material3.Tab
 import androidx.tv.material3.TabRow
 import androidx.tv.material3.Text
diff --git a/Jetcaster/tv/src/main/java/com/example/jetcaster/tv/ui/episode/EpisodeScreen.kt b/Jetcaster/tv/src/main/java/com/example/jetcaster/tv/ui/episode/EpisodeScreen.kt
@@ -24,12 +24,12 @@ import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
 import androidx.compose.runtime.Composable
-import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import androidx.compose.runtime.getValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.text.style.TextOverflow
 import androidx.hilt.lifecycle.viewmodel.compose.hiltViewModel
+import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import androidx.tv.material3.MaterialTheme
 import androidx.tv.material3.Text
 import com.example.jetcaster.core.player.model.PlayerEpisode
@@ -56,7 +56,9 @@ fun EpisodeScreen(
     val screenModifier = modifier.fillMaxSize()
     when (val s = uiState) {
         EpisodeScreenUiState.Loading -> Loading(modifier = screenModifier)
+
         EpisodeScreenUiState.Error -> ErrorState(backToHome = backToHome, modifier = screenModifier)
+
         is EpisodeScreenUiState.Ready -> EpisodeDetailsWithBackground(
             playerEpisode = s.playerEpisode,
             playEpisode = {
diff --git a/Jetcaster/tv/src/main/java/com/example/jetcaster/tv/ui/library/LibraryScreen.kt b/Jetcaster/tv/src/main/java/com/example/jetcaster/tv/ui/library/LibraryScreen.kt
@@ -21,7 +21,6 @@ import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.padding
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
-import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.remember
 import androidx.compose.ui.Alignment
@@ -32,6 +31,7 @@ import androidx.compose.ui.focus.focusRequester
 import androidx.compose.ui.focus.focusRestorer
 import androidx.compose.ui.res.stringResource
 import androidx.hilt.lifecycle.viewmodel.compose.hiltViewModel
+import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import androidx.tv.material3.Button
 import androidx.tv.material3.MaterialTheme
 import androidx.tv.material3.Text
@@ -55,6 +55,7 @@ fun LibraryScreen(
     val uiState by libraryScreenViewModel.uiState.collectAsStateWithLifecycle()
     when (val s = uiState) {
         LibraryScreenUiState.Loading -> Loading(modifier = modifier)
+
         LibraryScreenUiState.NoSubscribedPodcast -> {
             NavigateToDiscover(onNavigationRequested = navigateToDiscover, modifier = modifier)
         }
diff --git a/Jetcaster/tv/src/main/java/com/example/jetcaster/tv/ui/player/PlayerScreen.kt b/Jetcaster/tv/src/main/java/com/example/jetcaster/tv/ui/player/PlayerScreen.kt
@@ -106,6 +106,7 @@ fun PlayerScreen(
 
     when (val s = uiState) {
         PlayerScreenUiState.Loading -> Loading(modifier)
+
         PlayerScreenUiState.NoEpisodeInQueue -> {
             NoEpisodeInQueue(backToHome = backToHome, modifier = modifier)
         }
diff --git a/Jetcaster/tv/src/main/java/com/example/jetcaster/tv/ui/podcast/PodcastDetailsScreen.kt b/Jetcaster/tv/src/main/java/com/example/jetcaster/tv/ui/podcast/PodcastDetailsScreen.kt
@@ -31,7 +31,6 @@ import androidx.compose.foundation.lazy.items
 import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
-import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
@@ -51,6 +50,7 @@ import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.unit.Dp
 import androidx.compose.ui.unit.dp
 import androidx.hilt.lifecycle.viewmodel.compose.hiltViewModel
+import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import androidx.tv.material3.ButtonDefaults
 import androidx.tv.material3.MaterialTheme
 import androidx.tv.material3.Text
@@ -81,7 +81,9 @@ fun PodcastDetailsScreen(
     val uiState by podcastDetailsScreenViewModel.uiStateFlow.collectAsStateWithLifecycle()
     when (val s = uiState) {
         PodcastScreenUiState.Loading -> Loading(modifier = modifier)
+
         PodcastScreenUiState.Error -> ErrorState(backToHome = backToHomeScreen, modifier = modifier)
+
         is PodcastScreenUiState.Ready -> PodcastDetailsWithBackground(
             podcastInfo = s.podcastInfo,
             episodeList = s.episodeList,
@@ -146,7 +148,7 @@ private fun PodcastDetails(
     TwoColumn(
         modifier = modifier,
         horizontalArrangement =
-        Arrangement.spacedBy(JetcasterAppDefaults.gap.twoColumn),
+            Arrangement.spacedBy(JetcasterAppDefaults.gap.twoColumn),
         first = {
             PodcastInfo(
                 podcastInfo = podcastInfo,
diff --git a/Jetcaster/tv/src/main/java/com/example/jetcaster/tv/ui/search/SearchScreen.kt b/Jetcaster/tv/src/main/java/com/example/jetcaster/tv/ui/search/SearchScreen.kt
@@ -34,7 +34,6 @@ import androidx.compose.foundation.text.BasicTextField
 import androidx.compose.foundation.text.KeyboardOptions
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
-import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.remember
 import androidx.compose.ui.Alignment
@@ -49,6 +48,7 @@ import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.input.ImeAction
 import androidx.compose.ui.unit.dp
 import androidx.hilt.lifecycle.viewmodel.compose.hiltViewModel
+import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import androidx.tv.material3.ExperimentalTvMaterial3Api
 import androidx.tv.material3.FilterChip
 import androidx.tv.material3.Icon
@@ -73,6 +73,7 @@ fun SearchScreen(
 
     when (val s = uiState) {
         SearchScreenUiState.Loading -> Loading(modifier = modifier)
+
         is SearchScreenUiState.Ready -> Ready(
             keyword = s.keyword,
             categorySelectionList = s.categorySelectionList,
@@ -257,7 +258,7 @@ private fun SearchResult(
     LazyVerticalGrid(
         columns = GridCells.Fixed(4),
         horizontalArrangement =
-        Arrangement.spacedBy(JetcasterAppDefaults.gap.podcastRow),
+            Arrangement.spacedBy(JetcasterAppDefaults.gap.podcastRow),
         verticalArrangement = Arrangement.spacedBy(JetcasterAppDefaults.gap.podcastRow),
         modifier = modifier,
     ) {
diff --git a/Jetcaster/wear/src/main/java/com/example/jetcaster/ui/components/MediaContent.kt b/Jetcaster/wear/src/main/java/com/example/jetcaster/ui/components/MediaContent.kt
@@ -66,6 +66,7 @@ fun MediaContent(
                 duration.toMinutes().toInt(),
             )
         }
+
         // Otherwise we just use the date
         else -> MediumDateFormatter.format(episode.published)
     }
diff --git a/Jetcaster/wear/src/main/java/com/example/jetcaster/ui/components/SettingsButtons.kt b/Jetcaster/wear/src/main/java/com/example/jetcaster/ui/components/SettingsButtons.kt
@@ -85,13 +85,15 @@ fun PlaybackSpeedButton(
         onClick = onPlaybackSpeedChange,
         enabled = enabled,
         imageVector =
-        when (currentPlayerSpeed) {
-            1f -> ImageVector.vectorResource(R.drawable.speed_1x)
-            1.5f -> ImageVector.vectorResource(R.drawable.speed_15x)
-            else -> {
-                ImageVector.vectorResource(R.drawable.speed_2x)
-            }
-        },
+            when (currentPlayerSpeed) {
+                1f -> ImageVector.vectorResource(R.drawable.speed_1x)
+
+                1.5f -> ImageVector.vectorResource(R.drawable.speed_15x)
+
+                else -> {
+                    ImageVector.vectorResource(R.drawable.speed_2x)
+                }
+            },
         contentDescription = stringResource(R.string.change_playback_speed_content_description),
     )
 }
diff --git a/Jetcaster/wear/src/main/java/com/example/jetcaster/ui/episode/EpisodeScreen.kt b/Jetcaster/wear/src/main/java/com/example/jetcaster/ui/episode/EpisodeScreen.kt
@@ -274,6 +274,7 @@ private fun TransformingLazyColumnScope.episodeInfoContent(episode: PlayerEpisod
                         duration.toMinutes().toInt(),
                     )
                 }
+
                 // Otherwise we just use the date
                 else -> MediumDateFormatter.format(published)
             },
diff --git a/Jetcaster/wear/src/main/java/com/example/jetcaster/ui/library/LibraryScreen.kt b/Jetcaster/wear/src/main/java/com/example/jetcaster/ui/library/LibraryScreen.kt
@@ -24,7 +24,6 @@ import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.shape.CircleShape
 import androidx.compose.runtime.Composable
-import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import androidx.compose.runtime.getValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
@@ -38,6 +37,7 @@ import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.tooling.preview.PreviewParameter
 import androidx.compose.ui.unit.dp
 import androidx.hilt.lifecycle.viewmodel.compose.hiltViewModel
+import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import androidx.wear.compose.foundation.lazy.TransformingLazyColumn
 import androidx.wear.compose.foundation.lazy.TransformingLazyColumnState
 import androidx.wear.compose.foundation.lazy.items
diff --git a/Jetcaster/wear/src/main/java/com/example/jetcaster/ui/player/PlayerScreen.kt b/Jetcaster/wear/src/main/java/com/example/jetcaster/ui/player/PlayerScreen.kt
@@ -111,6 +111,7 @@ private fun PlayerScreen(
 
     when (val state = uiState) {
         PlayerScreenUiState.Loading -> LoadingMediaDisplay(modifier)
+
         PlayerScreenUiState.Empty -> {
             PlayerScreen(
                 mediaDisplay = {
diff --git a/Jetcaster/wear/src/main/java/com/example/jetcaster/ui/podcast/PodcastDetailsScreen.kt b/Jetcaster/wear/src/main/java/com/example/jetcaster/ui/podcast/PodcastDetailsScreen.kt
@@ -116,6 +116,7 @@ fun PodcastDetailsScreen(
                     title = { stringResource(R.string.podcasts_no_episode_podcasts) },
                 )
             }
+
             PodcastDetailsScreenState.Loading -> {
                 PodcastDetailScreenLoaded(
                     emptyList(),
diff --git a/Jetcaster/wear/src/main/java/com/example/jetcaster/ui/podcasts/PodcastsScreen.kt b/Jetcaster/wear/src/main/java/com/example/jetcaster/ui/podcasts/PodcastsScreen.kt
@@ -116,8 +116,10 @@ fun PodcastsScreen(
                 contentPadding = contentPadding,
                 placeholderState = placeholderState,
             )
+
             PodcastsScreenState.Empty ->
                 PodcastScreenEmpty(onDismiss)
+
             PodcastsScreenState.Loading ->
                 PodcastScreenLoaded(
                     podcastList = emptyList(),
diff --git a/Jetcaster/wear/src/main/java/com/example/jetcaster/ui/queue/QueueScreen.kt b/Jetcaster/wear/src/main/java/com/example/jetcaster/ui/queue/QueueScreen.kt
@@ -114,6 +114,7 @@ fun QueueScreen(
                 contentPadding = contentPadding,
                 placeholderState = placeholderState,
             )
+
             QueueScreenState.Loading -> QueueScreenLoaded(
                 episodeList = emptyList(),
                 onPlayButtonClick = { },
@@ -124,6 +125,7 @@ fun QueueScreen(
                 contentPadding = contentPadding,
                 placeholderState = placeholderState,
             )
+
             QueueScreenState.Empty -> QueueScreenEmpty(onDismiss)
         }
     }
@@ -234,7 +236,7 @@ fun ButtonsContent(
                 Icon(
                     painter = painterResource(id = R.drawable.delete),
                     contentDescription =
-                    stringResource(id = R.string.button_delete_queue_content_description),
+                        stringResource(id = R.string.button_delete_queue_content_description),
                 )
             }
         }

Original file line number	Diff line number	Diff line change
`@@ -40,11 +40,13 @@ class PodcastWithExtraInfo {`
`40`	`40`
`41`	`41`	`override fun equals(other: Any?): Boolean = when {`
`42`	`42`	`other === this -> true`
	`43`	`+`
`43`	`44`	`other is PodcastWithExtraInfo -> {`
`44`	`45`	`podcast == other.podcast &&`
`45`	`46`	`lastEpisodeDate == other.lastEpisodeDate &&`
`46`	`47`	`isFollowed == other.isFollowed`
`47`	`48`	`}`
	`49`	`+`
`48`	`50`	`else -> false`
`49`	`51`	`}`
`50`	`52`
Original file line number	Diff line number	Diff line change
`@@ -81,6 +81,7 @@ fun PodcastImage(`
`81`	`81`	`.fillMaxSize(),`
`82`	`82`	`)`
`83`	`83`	`}`
	`84`	`+`
`84`	`85`	`else -> {`
`85`	`86`	`Box(`
`86`	`87`	`modifier = modifier`
Original file line number	Diff line number	Diff line change
`@@ -728,12 +728,14 @@ private fun lastUpdated(updated: OffsetDateTime): String {`
`728`	`728`
`729`	`729`	`return when {`
`730`	`730`	`days > 28 -> stringResource(R.string.updated_longer)`
	`731`	`+`
`731`	`732`	`days >= 7 -> {`
`732`	`733`	`val weeks = days / 7`
`733`	`734`	`quantityStringResource(R.plurals.updated_weeks_ago, weeks, weeks)`
`734`	`735`	`}`
`735`	`736`
`736`	`737`	`days > 0 -> quantityStringResource(R.plurals.updated_days_ago, days, days)`
	`738`	`+`
`737`	`739`	`else -> stringResource(R.string.updated_today)`
`738`	`740`	`}`
`739`	`741`	`}`
Original file line number	Diff line number	Diff line change
`@@ -388,7 +388,7 @@ private fun PlayerContentRegular(`
`388`	`388`	`),`
`389`	`389`	`animatedVisibilityScope = animatedVisibilityScope,`
`390`	`390`	`clipInOverlayDuringTransition =`
`391`		`- OverlayClip(MaterialTheme.shapes.medium),`
	`391`	`+ OverlayClip(MaterialTheme.shapes.medium),`
`392`	`392`	`),`
`393`	`393`	`)`
`394`	`394`	`}`
Original file line number	Diff line number	Diff line change
`@@ -474,6 +474,7 @@ fun JetcasterTheme(dynamicColor: Boolean = false, content: @Composable () -> Uni`
`474`	`474`	`val context = LocalContext.current`
`475`	`475`	`dynamicDarkColorScheme(context)`
`476`	`476`	`}`
	`477`	`+`
`477`	`478`	`else -> darkScheme`
`478`	`479`	`}`
`479`	`480`