From 01ca7fac4d471615244c1e66e3dbc3735c9195d6 Mon Sep 17 00:00:00 2001 From: Magdalena Trivina <78723086+magdalena-trivina@users.noreply.github.com> Date: Tue, 12 Nov 2024 15:40:54 +0700 Subject: [PATCH 1/7] fix: tapping text input outside placeholder don't bring the text input to focus --- .../java/com/example/compose/jetchat/conversation/UserInput.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jetchat/app/src/main/java/com/example/compose/jetchat/conversation/UserInput.kt b/Jetchat/app/src/main/java/com/example/compose/jetchat/conversation/UserInput.kt index 94988a239b..cb28308976 100644 --- a/Jetchat/app/src/main/java/com/example/compose/jetchat/conversation/UserInput.kt +++ b/Jetchat/app/src/main/java/com/example/compose/jetchat/conversation/UserInput.kt @@ -440,7 +440,7 @@ private fun UserInputText( keyboardType, focusState, onMessageSent, - Modifier.semantics { + Modifier.fillMaxWidth().semantics { contentDescription = a11ylabel keyboardShownProperty = keyboardShown } From 0f3a11da311183d0e6cc247865a74a9d3b22ebc5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Mlynari=C4=8D?= Date: Fri, 8 Nov 2024 17:16:28 +0100 Subject: [PATCH 2/7] Remove HomeState - it served only as a wrapper for parameters without any additional logic - it was unstable and creating new instance each composition, therefore no skipping # Conflicts: # Jetcaster/mobile/src/main/java/com/example/jetcaster/ui/home/Home.kt --- .../com/example/jetcaster/ui/home/Home.kt | 126 ++++++++---------- 1 file changed, 56 insertions(+), 70 deletions(-) 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 index a7658d71dd..b2d99d1f64 100644 --- 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 @@ -132,29 +132,6 @@ import kotlinx.collections.immutable.PersistentList import kotlinx.collections.immutable.toPersistentList import kotlinx.coroutines.launch -data class HomeState( - val windowSizeClass: WindowSizeClass, - val isLoading: Boolean, - val featuredPodcasts: PersistentList, - val selectedHomeCategory: HomeCategory, - val homeCategories: List, - val filterableCategoriesModel: FilterableCategoriesModel, - val podcastCategoryFilterResult: PodcastCategoryFilterResult, - val library: LibraryInfo, - val modifier: Modifier = Modifier, - val onPodcastUnfollowed: (PodcastInfo) -> Unit, - val onHomeCategorySelected: (HomeCategory) -> Unit, - val onCategorySelected: (CategoryInfo) -> Unit, - val navigateToPodcastDetails: (PodcastInfo) -> Unit, - val navigateToPlayer: (EpisodeInfo) -> Unit, - val onTogglePodcastFollowed: (PodcastInfo) -> Unit, - val onLibraryPodcastSelected: (PodcastInfo?) -> Unit, - val onQueueEpisode: (PlayerEpisode) -> Unit, -) - -private val HomeState.showHomeCategoryTabs: Boolean - get() = featuredPodcasts.isNotEmpty() && homeCategories.isNotEmpty() - @OptIn(ExperimentalMaterial3AdaptiveApi::class) private fun ThreePaneScaffoldNavigator.isMainPaneHidden(): Boolean { return scaffoldValue[SupportingPaneScaffoldRole.Main] == PaneAdaptedValue.Hidden @@ -293,34 +270,30 @@ private fun HomeScreenReady( navigator.navigateBack() } - val homeState = HomeState( - windowSizeClass = windowSizeClass, - isLoading = uiState.isLoading, - featuredPodcasts = uiState.featuredPodcasts, - homeCategories = uiState.homeCategories, - selectedHomeCategory = uiState.selectedHomeCategory, - filterableCategoriesModel = uiState.filterableCategoriesModel, - podcastCategoryFilterResult = uiState.podcastCategoryFilterResult, - library = uiState.library, - onHomeCategorySelected = viewModel::onHomeCategorySelected, - onCategorySelected = viewModel::onCategorySelected, - onPodcastUnfollowed = viewModel::onPodcastUnfollowed, - navigateToPodcastDetails = { - navigator.navigateTo(SupportingPaneScaffoldRole.Supporting, it.uri) - }, - navigateToPlayer = navigateToPlayer, - onTogglePodcastFollowed = viewModel::onTogglePodcastFollowed, - onLibraryPodcastSelected = viewModel::onLibraryPodcastSelected, - onQueueEpisode = viewModel::onQueueEpisode - ) - Surface { SupportingPaneScaffold( value = navigator.scaffoldValue, directive = navigator.scaffoldDirective, mainPane = { HomeScreen( - homeState = homeState, + windowSizeClass = windowSizeClass, + isLoading = uiState.isLoading, + featuredPodcasts = uiState.featuredPodcasts, + homeCategories = uiState.homeCategories, + selectedHomeCategory = uiState.selectedHomeCategory, + filterableCategoriesModel = uiState.filterableCategoriesModel, + podcastCategoryFilterResult = uiState.podcastCategoryFilterResult, + library = uiState.library, + onHomeCategorySelected = viewModel::onHomeCategorySelected, + onCategorySelected = viewModel::onCategorySelected, + onPodcastUnfollowed = viewModel::onPodcastUnfollowed, + navigateToPodcastDetails = { + navigator.navigateTo(SupportingPaneScaffoldRole.Supporting, it.uri) + }, + navigateToPlayer = navigateToPlayer, + onTogglePodcastFollowed = viewModel::onTogglePodcastFollowed, + onLibraryPodcastSelected = viewModel::onLibraryPodcastSelected, + onQueueEpisode = viewModel::onQueueEpisode, modifier = Modifier.fillMaxSize() ) }, @@ -420,13 +393,28 @@ private fun HomeScreenBackground( @Composable private fun HomeScreen( - homeState: HomeState, + windowSizeClass: WindowSizeClass, + isLoading: Boolean, + featuredPodcasts: PersistentList, + selectedHomeCategory: HomeCategory, + homeCategories: List, + filterableCategoriesModel: FilterableCategoriesModel, + podcastCategoryFilterResult: PodcastCategoryFilterResult, + library: LibraryInfo, + onPodcastUnfollowed: (PodcastInfo) -> Unit, + onHomeCategorySelected: (HomeCategory) -> Unit, + onCategorySelected: (CategoryInfo) -> Unit, + navigateToPodcastDetails: (PodcastInfo) -> Unit, + navigateToPlayer: (EpisodeInfo) -> Unit, + onTogglePodcastFollowed: (PodcastInfo) -> Unit, + onLibraryPodcastSelected: (PodcastInfo?) -> Unit, + onQueueEpisode: (PlayerEpisode) -> Unit, modifier: Modifier = Modifier ) { // Effect that changes the home category selection when there are no subscribed podcasts - LaunchedEffect(key1 = homeState.featuredPodcasts) { - if (homeState.featuredPodcasts.isEmpty()) { - homeState.onHomeCategorySelected(HomeCategory.Discover) + LaunchedEffect(key1 = featuredPodcasts) { + if (featuredPodcasts.isEmpty()) { + onHomeCategorySelected(HomeCategory.Discover) } } @@ -439,10 +427,10 @@ private fun HomeScreen( topBar = { Column { HomeAppBar( - isExpanded = homeState.windowSizeClass.isCompact, + isExpanded = windowSizeClass.isCompact, modifier = Modifier.fillMaxWidth(), ) - if (homeState.isLoading) { + if (isLoading) { LinearProgressIndicator( Modifier .fillMaxWidth() @@ -458,27 +446,28 @@ private fun HomeScreen( ) { contentPadding -> // Main Content val snackBarText = stringResource(id = R.string.episode_added_to_your_queue) + val showHomeCategoryTabs = featuredPodcasts.isNotEmpty() && homeCategories.isNotEmpty() HomeContent( - showHomeCategoryTabs = homeState.showHomeCategoryTabs, - featuredPodcasts = homeState.featuredPodcasts, - selectedHomeCategory = homeState.selectedHomeCategory, - homeCategories = homeState.homeCategories, - filterableCategoriesModel = homeState.filterableCategoriesModel, - podcastCategoryFilterResult = homeState.podcastCategoryFilterResult, - library = homeState.library, + showHomeCategoryTabs = showHomeCategoryTabs, + featuredPodcasts = featuredPodcasts, + selectedHomeCategory = selectedHomeCategory, + homeCategories = homeCategories, + filterableCategoriesModel = filterableCategoriesModel, + podcastCategoryFilterResult = podcastCategoryFilterResult, + library = library, modifier = Modifier.padding(contentPadding), - onPodcastUnfollowed = homeState.onPodcastUnfollowed, - onHomeCategorySelected = homeState.onHomeCategorySelected, - onCategorySelected = homeState.onCategorySelected, - navigateToPodcastDetails = homeState.navigateToPodcastDetails, - navigateToPlayer = homeState.navigateToPlayer, - onTogglePodcastFollowed = homeState.onTogglePodcastFollowed, - onLibraryPodcastSelected = homeState.onLibraryPodcastSelected, + onPodcastUnfollowed = onPodcastUnfollowed, + onHomeCategorySelected = onHomeCategorySelected, + onCategorySelected = onCategorySelected, + navigateToPodcastDetails = navigateToPodcastDetails, + navigateToPlayer = navigateToPlayer, + onTogglePodcastFollowed = onTogglePodcastFollowed, + onLibraryPodcastSelected = onLibraryPodcastSelected, onQueueEpisode = { coroutineScope.launch { snackbarHostState.showSnackbar(snackBarText) } - homeState.onQueueEpisode(it) + onQueueEpisode(it) } ) } @@ -812,7 +801,7 @@ private val CompactWindowSizeClass = WindowSizeClass.compute(360f, 780f) @Composable private fun PreviewHome() { JetcasterTheme { - val homeState = HomeState( + HomeScreen( windowSizeClass = CompactWindowSizeClass, isLoading = true, featuredPodcasts = PreviewPodcasts.toPersistentList(), @@ -836,9 +825,6 @@ private fun PreviewHome() { onLibraryPodcastSelected = {}, onQueueEpisode = {} ) - HomeScreen( - homeState = homeState, - ) } } From ec5e931543f665263fb7551ea706d4aea5822d7f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Mlynari=C4=8D?= Date: Fri, 8 Nov 2024 17:30:19 +0100 Subject: [PATCH 3/7] Simplify lambdas into action Reduces amount of passing and potentially making mistake --- .../com/example/jetcaster/ui/home/Home.kt | 79 ++++++------------- .../jetcaster/ui/home/HomeViewModel.kt | 33 ++++++-- 2 files changed, 51 insertions(+), 61 deletions(-) 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 index b2d99d1f64..a3230edfe9 100644 --- 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 @@ -106,13 +106,11 @@ import com.example.jetcaster.R import com.example.jetcaster.core.domain.testing.PreviewCategories import com.example.jetcaster.core.domain.testing.PreviewPodcastEpisodes import com.example.jetcaster.core.domain.testing.PreviewPodcasts -import com.example.jetcaster.core.model.CategoryInfo import com.example.jetcaster.core.model.EpisodeInfo import com.example.jetcaster.core.model.FilterableCategoriesModel import com.example.jetcaster.core.model.LibraryInfo import com.example.jetcaster.core.model.PodcastCategoryFilterResult import com.example.jetcaster.core.model.PodcastInfo -import com.example.jetcaster.core.player.model.PlayerEpisode import com.example.jetcaster.designsystem.component.PodcastImage import com.example.jetcaster.ui.home.discover.discoverItems import com.example.jetcaster.ui.home.library.libraryItems @@ -284,16 +282,11 @@ private fun HomeScreenReady( filterableCategoriesModel = uiState.filterableCategoriesModel, podcastCategoryFilterResult = uiState.podcastCategoryFilterResult, library = uiState.library, - onHomeCategorySelected = viewModel::onHomeCategorySelected, - onCategorySelected = viewModel::onCategorySelected, - onPodcastUnfollowed = viewModel::onPodcastUnfollowed, + onHomeAction = viewModel::onHomeAction, navigateToPodcastDetails = { navigator.navigateTo(SupportingPaneScaffoldRole.Supporting, it.uri) }, navigateToPlayer = navigateToPlayer, - onTogglePodcastFollowed = viewModel::onTogglePodcastFollowed, - onLibraryPodcastSelected = viewModel::onLibraryPodcastSelected, - onQueueEpisode = viewModel::onQueueEpisode, modifier = Modifier.fillMaxSize() ) }, @@ -401,20 +394,15 @@ private fun HomeScreen( filterableCategoriesModel: FilterableCategoriesModel, podcastCategoryFilterResult: PodcastCategoryFilterResult, library: LibraryInfo, - onPodcastUnfollowed: (PodcastInfo) -> Unit, - onHomeCategorySelected: (HomeCategory) -> Unit, - onCategorySelected: (CategoryInfo) -> Unit, + onHomeAction: (HomeAction) -> Unit, navigateToPodcastDetails: (PodcastInfo) -> Unit, navigateToPlayer: (EpisodeInfo) -> Unit, - onTogglePodcastFollowed: (PodcastInfo) -> Unit, - onLibraryPodcastSelected: (PodcastInfo?) -> Unit, - onQueueEpisode: (PlayerEpisode) -> Unit, modifier: Modifier = Modifier ) { // Effect that changes the home category selection when there are no subscribed podcasts LaunchedEffect(key1 = featuredPodcasts) { if (featuredPodcasts.isEmpty()) { - onHomeCategorySelected(HomeCategory.Discover) + onHomeAction(HomeAction.HomeCategorySelected(HomeCategory.Discover)) } } @@ -456,19 +444,16 @@ private fun HomeScreen( podcastCategoryFilterResult = podcastCategoryFilterResult, library = library, modifier = Modifier.padding(contentPadding), - onPodcastUnfollowed = onPodcastUnfollowed, - onHomeCategorySelected = onHomeCategorySelected, - onCategorySelected = onCategorySelected, + onHomeAction = { action -> + if (action is HomeAction.QueueEpisode) { + coroutineScope.launch { + snackbarHostState.showSnackbar(snackBarText) + } + } + onHomeAction(action) + }, navigateToPodcastDetails = navigateToPodcastDetails, navigateToPlayer = navigateToPlayer, - onTogglePodcastFollowed = onTogglePodcastFollowed, - onLibraryPodcastSelected = onLibraryPodcastSelected, - onQueueEpisode = { - coroutineScope.launch { - snackbarHostState.showSnackbar(snackBarText) - } - onQueueEpisode(it) - } ) } } @@ -484,21 +469,16 @@ private fun HomeContent( podcastCategoryFilterResult: PodcastCategoryFilterResult, library: LibraryInfo, modifier: Modifier = Modifier, - onPodcastUnfollowed: (PodcastInfo) -> Unit, - onHomeCategorySelected: (HomeCategory) -> Unit, - onCategorySelected: (CategoryInfo) -> Unit, + onHomeAction: (HomeAction) -> Unit, navigateToPodcastDetails: (PodcastInfo) -> Unit, navigateToPlayer: (EpisodeInfo) -> Unit, - onTogglePodcastFollowed: (PodcastInfo) -> Unit, - onLibraryPodcastSelected: (PodcastInfo?) -> Unit, - onQueueEpisode: (PlayerEpisode) -> Unit, ) { val pagerState = rememberPagerState { featuredPodcasts.size } LaunchedEffect(pagerState, featuredPodcasts) { snapshotFlow { pagerState.currentPage } .collect { val podcast = featuredPodcasts.getOrNull(it) - onLibraryPodcastSelected(podcast) + onHomeAction(HomeAction.LibraryPodcastSelected(podcast)) } } @@ -512,13 +492,9 @@ private fun HomeContent( podcastCategoryFilterResult = podcastCategoryFilterResult, library = library, modifier = modifier, - onPodcastUnfollowed = onPodcastUnfollowed, - onHomeCategorySelected = onHomeCategorySelected, - onCategorySelected = onCategorySelected, + onHomeAction = onHomeAction, navigateToPodcastDetails = navigateToPodcastDetails, navigateToPlayer = navigateToPlayer, - onTogglePodcastFollowed = onTogglePodcastFollowed, - onQueueEpisode = onQueueEpisode, ) } @@ -533,13 +509,9 @@ private fun HomeContentGrid( podcastCategoryFilterResult: PodcastCategoryFilterResult, library: LibraryInfo, modifier: Modifier = Modifier, - onHomeCategorySelected: (HomeCategory) -> Unit, - onPodcastUnfollowed: (PodcastInfo) -> Unit, - onCategorySelected: (CategoryInfo) -> Unit, + onHomeAction: (HomeAction) -> Unit, navigateToPodcastDetails: (PodcastInfo) -> Unit, navigateToPlayer: (EpisodeInfo) -> Unit, - onTogglePodcastFollowed: (PodcastInfo) -> Unit, - onQueueEpisode: (PlayerEpisode) -> Unit, ) { LazyVerticalGrid( columns = GridCells.Adaptive(362.dp), @@ -550,7 +522,7 @@ private fun HomeContentGrid( FollowedPodcastItem( pagerState = pagerState, items = featuredPodcasts, - onPodcastUnfollowed = onPodcastUnfollowed, + onPodcastUnfollowed = { onHomeAction(HomeAction.PodcastUnfollowed(it)) }, navigateToPodcastDetails = navigateToPodcastDetails, modifier = Modifier .fillMaxWidth() @@ -565,7 +537,7 @@ private fun HomeContentGrid( categories = homeCategories, selectedCategory = selectedHomeCategory, showHorizontalLine = false, - onCategorySelected = onHomeCategorySelected, + onCategorySelected = { onHomeAction(HomeAction.HomeCategorySelected(it)) }, modifier = Modifier.width(240.dp) ) } @@ -577,7 +549,7 @@ private fun HomeContentGrid( libraryItems( library = library, navigateToPlayer = navigateToPlayer, - onQueueEpisode = onQueueEpisode + onQueueEpisode = { onHomeAction(HomeAction.QueueEpisode(it)) } ) } @@ -587,9 +559,11 @@ private fun HomeContentGrid( podcastCategoryFilterResult = podcastCategoryFilterResult, navigateToPodcastDetails = navigateToPodcastDetails, navigateToPlayer = navigateToPlayer, - onCategorySelected = onCategorySelected, - onTogglePodcastFollowed = onTogglePodcastFollowed, - onQueueEpisode = onQueueEpisode + onCategorySelected = { onHomeAction(HomeAction.CategorySelected(it)) }, + onTogglePodcastFollowed = { + onHomeAction(HomeAction.TogglePodcastFollowed(it)) + }, + onQueueEpisode = { onHomeAction(HomeAction.QueueEpisode(it)) }, ) } } @@ -816,14 +790,9 @@ private fun PreviewHome() { episodes = PreviewPodcastEpisodes ), library = LibraryInfo(), - onCategorySelected = {}, - onPodcastUnfollowed = {}, + onHomeAction = {}, navigateToPodcastDetails = {}, navigateToPlayer = {}, - onHomeCategorySelected = {}, - onTogglePodcastFollowed = {}, - onLibraryPodcastSelected = {}, - onQueueEpisode = {} ) } } diff --git a/Jetcaster/mobile/src/main/java/com/example/jetcaster/ui/home/HomeViewModel.kt b/Jetcaster/mobile/src/main/java/com/example/jetcaster/ui/home/HomeViewModel.kt index 7976a8b6d8..f84b68cd32 100644 --- a/Jetcaster/mobile/src/main/java/com/example/jetcaster/ui/home/HomeViewModel.kt +++ b/Jetcaster/mobile/src/main/java/com/example/jetcaster/ui/home/HomeViewModel.kt @@ -154,31 +154,42 @@ class HomeViewModel @Inject constructor( } } - fun onCategorySelected(category: CategoryInfo) { + fun onHomeAction(action: HomeAction) { + when (action) { + is HomeAction.CategorySelected -> onCategorySelected(action.category) + is HomeAction.HomeCategorySelected -> onHomeCategorySelected(action.category) + is HomeAction.LibraryPodcastSelected -> onLibraryPodcastSelected(action.podcast) + is HomeAction.PodcastUnfollowed -> onPodcastUnfollowed(action.podcast) + is HomeAction.QueueEpisode -> onQueueEpisode(action.episode) + is HomeAction.TogglePodcastFollowed -> onTogglePodcastFollowed(action.podcast) + } + } + + private fun onCategorySelected(category: CategoryInfo) { _selectedCategory.value = category } - fun onHomeCategorySelected(category: HomeCategory) { + private fun onHomeCategorySelected(category: HomeCategory) { selectedHomeCategory.value = category } - fun onPodcastUnfollowed(podcast: PodcastInfo) { + private fun onPodcastUnfollowed(podcast: PodcastInfo) { viewModelScope.launch { podcastStore.unfollowPodcast(podcast.uri) } } - fun onTogglePodcastFollowed(podcast: PodcastInfo) { + private fun onTogglePodcastFollowed(podcast: PodcastInfo) { viewModelScope.launch { podcastStore.togglePodcastFollowed(podcast.uri) } } - fun onLibraryPodcastSelected(podcast: PodcastInfo?) { + private fun onLibraryPodcastSelected(podcast: PodcastInfo?) { selectedLibraryPodcast.value = podcast } - fun onQueueEpisode(episode: PlayerEpisode) { + private fun onQueueEpisode(episode: PlayerEpisode) { episodePlayer.addToQueue(episode) } } @@ -192,6 +203,16 @@ enum class HomeCategory { Library, Discover } +@Immutable +sealed interface HomeAction { + data class CategorySelected(val category: CategoryInfo) : HomeAction + data class HomeCategorySelected(val category: HomeCategory) : HomeAction + data class PodcastUnfollowed(val podcast: PodcastInfo) : HomeAction + data class TogglePodcastFollowed(val podcast: PodcastInfo) : HomeAction + data class LibraryPodcastSelected(val podcast: PodcastInfo?) : HomeAction + data class QueueEpisode(val episode: PlayerEpisode) : HomeAction +} + @Immutable data class HomeScreenUiState( val isLoading: Boolean = true, From 3a72a55212d3f40e6d111308ceb5f744f4204696 Mon Sep 17 00:00:00 2001 From: Emmanuel Ferdman Date: Mon, 18 Nov 2024 05:33:37 -0800 Subject: [PATCH 4/7] [Jetcaster]: Update references in README Signed-off-by: Emmanuel Ferdman --- Jetcaster/README.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Jetcaster/README.md b/Jetcaster/README.md index 52783dfe64..43b85084da 100644 --- a/Jetcaster/README.md +++ b/Jetcaster/README.md @@ -83,7 +83,7 @@ if you want to see an advanced Media sample built on Compose that uses Exoplayer refer to the [Media Toolkit sample][mediatoolkitsample]. The [official media app guidance for Wear OS][wearmediaguidance] -advices to download content on the watch before listening to preserve power, this feature will be added to this sample in future iterations. You can +recommends downloading content onto the watch before listening to preserve power, this feature will be added to this sample in future iterations. You can refer to the [Media Toolkit sample][mediatoolkitsample] to learn how to implement the media download feature. ### Architecture @@ -94,7 +94,7 @@ own [ViewModel][viewmodel] which exposes a `StateFlow` for the UI t ### Podcast data -The podcast data in this sample is dynamically fetched from a number of podcast RSS feeds, which are listed in [`Feeds.kt`](mobile/src/main/java/com/example/jetcaster/data/Feeds.kt). +The podcast data in this sample is dynamically fetched from a number of podcast RSS feeds, which are listed in [`Feeds.kt`](core/data/src/main/java/com/example/jetcaster/core/data/network/Feeds.kt). The [`PodcastRepository`][podcastrepo] class is responsible for handling the data fetching of all podcast information: @@ -103,11 +103,11 @@ The [`PodcastRepository`][podcastrepo] class is responsible for handling the dat ### Follow podcasts - The sample allows users to 'follow' podcasts, which is implemented within the data layer in the [`PodcastFollowedEntry`](mobile/src/main/java/com/example/jetcaster/data/PodcastFollowedEntry.kt) entity class, and as functions in [PodcastStore][podcaststore]: `followPodcast()`, `unfollowPodcast()`. + The sample allows users to 'follow' podcasts, which is implemented within the data layer in the [`PodcastFollowedEntry`](core/data/src/main/java/com/example/jetcaster/core/data/database/model/PodcastFollowedEntry.kt) entity class, and as functions in [PodcastStore][podcaststore]: `followPodcast()`, `unfollowPodcast()`. ### Date + time - The sample uses the JDK 8 [date and time APIs](https://developer.android.com/reference/java/time/package-summary) through the [desugaring support][jdk8desugar] available in Android Gradle Plugin 4.0+. Relevant Room [`TypeConverters`](https://developer.android.com/reference/kotlin/androidx/room/TypeConverters) are implemented in [`DateTimeTypeConverters.kt`](mobile/src/main/java/com/example/jetcaster/data/room/DateTimeTypeConverters.kt). + The sample uses the JDK 8 [date and time APIs](https://developer.android.com/reference/java/time/package-summary) through the [desugaring support][jdk8desugar] available in Android Gradle Plugin 4.0+. Relevant Room [`TypeConverters`](https://developer.android.com/reference/kotlin/androidx/room/TypeConverters) are implemented in [`DateTimeTypeConverters.kt`](core/data/src/main/java/com/example/jetcaster/core/data/database/DateTimeTypeConverters.kt). ## License From 6f9a59476edba6b8643ad5d2c16eeb454b9688d0 Mon Sep 17 00:00:00 2001 From: Alex Vanyo Date: Wed, 4 Dec 2024 14:16:45 -0800 Subject: [PATCH 5/7] Remove accompanist/flowlayout Change-Id: Icb0bd49afc6c2fdec96a6dcdc54818447158baf8 --- JetLagged/app/build.gradle.kts | 2 -- JetLagged/gradle/libs.versions.toml | 1 - JetNews/gradle/libs.versions.toml | 1 - Jetcaster/gradle/libs.versions.toml | 1 - Jetchat/gradle/libs.versions.toml | 1 - Jetsnack/gradle/libs.versions.toml | 1 - Reply/gradle/libs.versions.toml | 1 - scripts/libs.versions.toml | 1 - 8 files changed, 9 deletions(-) diff --git a/JetLagged/app/build.gradle.kts b/JetLagged/app/build.gradle.kts index 2c04303b04..9406732898 100644 --- a/JetLagged/app/build.gradle.kts +++ b/JetLagged/app/build.gradle.kts @@ -122,8 +122,6 @@ dependencies { implementation(libs.androidx.compose.ui.tooling.preview) debugImplementation(libs.androidx.compose.ui.tooling) - implementation(libs.accompanist.flowlayout) - implementation(libs.coil.kt.compose) androidTestImplementation(libs.junit) diff --git a/JetLagged/gradle/libs.versions.toml b/JetLagged/gradle/libs.versions.toml index 5128f3562b..f6f63f0b0d 100644 --- a/JetLagged/gradle/libs.versions.toml +++ b/JetLagged/gradle/libs.versions.toml @@ -61,7 +61,6 @@ version-catalog-update = "0.8.5" [libraries] accompanist-adaptive = { module = "com.google.accompanist:accompanist-adaptive", version.ref = "accompanist" } -accompanist-flowlayout = { module = "com.google.accompanist:accompanist-flowlayout", version.ref = "accompanist" } accompanist-pager = { module = "com.google.accompanist:accompanist-pager", version.ref = "accompanist" } accompanist-permissions = { module = "com.google.accompanist:accompanist-permissions", version.ref = "accompanist" } accompanist-swiperefresh = { module = "com.google.accompanist:accompanist-swiperefresh", version.ref = "accompanist" } diff --git a/JetNews/gradle/libs.versions.toml b/JetNews/gradle/libs.versions.toml index 5128f3562b..f6f63f0b0d 100644 --- a/JetNews/gradle/libs.versions.toml +++ b/JetNews/gradle/libs.versions.toml @@ -61,7 +61,6 @@ version-catalog-update = "0.8.5" [libraries] accompanist-adaptive = { module = "com.google.accompanist:accompanist-adaptive", version.ref = "accompanist" } -accompanist-flowlayout = { module = "com.google.accompanist:accompanist-flowlayout", version.ref = "accompanist" } accompanist-pager = { module = "com.google.accompanist:accompanist-pager", version.ref = "accompanist" } accompanist-permissions = { module = "com.google.accompanist:accompanist-permissions", version.ref = "accompanist" } accompanist-swiperefresh = { module = "com.google.accompanist:accompanist-swiperefresh", version.ref = "accompanist" } diff --git a/Jetcaster/gradle/libs.versions.toml b/Jetcaster/gradle/libs.versions.toml index 5128f3562b..f6f63f0b0d 100644 --- a/Jetcaster/gradle/libs.versions.toml +++ b/Jetcaster/gradle/libs.versions.toml @@ -61,7 +61,6 @@ version-catalog-update = "0.8.5" [libraries] accompanist-adaptive = { module = "com.google.accompanist:accompanist-adaptive", version.ref = "accompanist" } -accompanist-flowlayout = { module = "com.google.accompanist:accompanist-flowlayout", version.ref = "accompanist" } accompanist-pager = { module = "com.google.accompanist:accompanist-pager", version.ref = "accompanist" } accompanist-permissions = { module = "com.google.accompanist:accompanist-permissions", version.ref = "accompanist" } accompanist-swiperefresh = { module = "com.google.accompanist:accompanist-swiperefresh", version.ref = "accompanist" } diff --git a/Jetchat/gradle/libs.versions.toml b/Jetchat/gradle/libs.versions.toml index 5128f3562b..f6f63f0b0d 100644 --- a/Jetchat/gradle/libs.versions.toml +++ b/Jetchat/gradle/libs.versions.toml @@ -61,7 +61,6 @@ version-catalog-update = "0.8.5" [libraries] accompanist-adaptive = { module = "com.google.accompanist:accompanist-adaptive", version.ref = "accompanist" } -accompanist-flowlayout = { module = "com.google.accompanist:accompanist-flowlayout", version.ref = "accompanist" } accompanist-pager = { module = "com.google.accompanist:accompanist-pager", version.ref = "accompanist" } accompanist-permissions = { module = "com.google.accompanist:accompanist-permissions", version.ref = "accompanist" } accompanist-swiperefresh = { module = "com.google.accompanist:accompanist-swiperefresh", version.ref = "accompanist" } diff --git a/Jetsnack/gradle/libs.versions.toml b/Jetsnack/gradle/libs.versions.toml index 5128f3562b..f6f63f0b0d 100644 --- a/Jetsnack/gradle/libs.versions.toml +++ b/Jetsnack/gradle/libs.versions.toml @@ -61,7 +61,6 @@ version-catalog-update = "0.8.5" [libraries] accompanist-adaptive = { module = "com.google.accompanist:accompanist-adaptive", version.ref = "accompanist" } -accompanist-flowlayout = { module = "com.google.accompanist:accompanist-flowlayout", version.ref = "accompanist" } accompanist-pager = { module = "com.google.accompanist:accompanist-pager", version.ref = "accompanist" } accompanist-permissions = { module = "com.google.accompanist:accompanist-permissions", version.ref = "accompanist" } accompanist-swiperefresh = { module = "com.google.accompanist:accompanist-swiperefresh", version.ref = "accompanist" } diff --git a/Reply/gradle/libs.versions.toml b/Reply/gradle/libs.versions.toml index 5128f3562b..f6f63f0b0d 100644 --- a/Reply/gradle/libs.versions.toml +++ b/Reply/gradle/libs.versions.toml @@ -61,7 +61,6 @@ version-catalog-update = "0.8.5" [libraries] accompanist-adaptive = { module = "com.google.accompanist:accompanist-adaptive", version.ref = "accompanist" } -accompanist-flowlayout = { module = "com.google.accompanist:accompanist-flowlayout", version.ref = "accompanist" } accompanist-pager = { module = "com.google.accompanist:accompanist-pager", version.ref = "accompanist" } accompanist-permissions = { module = "com.google.accompanist:accompanist-permissions", version.ref = "accompanist" } accompanist-swiperefresh = { module = "com.google.accompanist:accompanist-swiperefresh", version.ref = "accompanist" } diff --git a/scripts/libs.versions.toml b/scripts/libs.versions.toml index 5128f3562b..f6f63f0b0d 100644 --- a/scripts/libs.versions.toml +++ b/scripts/libs.versions.toml @@ -61,7 +61,6 @@ version-catalog-update = "0.8.5" [libraries] accompanist-adaptive = { module = "com.google.accompanist:accompanist-adaptive", version.ref = "accompanist" } -accompanist-flowlayout = { module = "com.google.accompanist:accompanist-flowlayout", version.ref = "accompanist" } accompanist-pager = { module = "com.google.accompanist:accompanist-pager", version.ref = "accompanist" } accompanist-permissions = { module = "com.google.accompanist:accompanist-permissions", version.ref = "accompanist" } accompanist-swiperefresh = { module = "com.google.accompanist:accompanist-swiperefresh", version.ref = "accompanist" } From 38b245e500cbda572cc9876097259f1a2593c746 Mon Sep 17 00:00:00 2001 From: Alex Vanyo Date: Wed, 4 Dec 2024 14:21:57 -0800 Subject: [PATCH 6/7] Remove accompanist/systemuicontroller Change-Id: I699e54b7320b635cdaf21ac938a53d12ab3a47cd --- JetLagged/gradle/libs.versions.toml | 1 - JetNews/app/build.gradle.kts | 1 - JetNews/gradle/libs.versions.toml | 1 - Jetcaster/gradle/libs.versions.toml | 1 - Jetchat/gradle/libs.versions.toml | 1 - Jetsnack/gradle/libs.versions.toml | 1 - Reply/gradle/libs.versions.toml | 1 - scripts/libs.versions.toml | 1 - 8 files changed, 8 deletions(-) diff --git a/JetLagged/gradle/libs.versions.toml b/JetLagged/gradle/libs.versions.toml index 5128f3562b..6f84ac83cd 100644 --- a/JetLagged/gradle/libs.versions.toml +++ b/JetLagged/gradle/libs.versions.toml @@ -65,7 +65,6 @@ accompanist-flowlayout = { module = "com.google.accompanist:accompanist-flowlayo accompanist-pager = { module = "com.google.accompanist:accompanist-pager", version.ref = "accompanist" } accompanist-permissions = { module = "com.google.accompanist:accompanist-permissions", version.ref = "accompanist" } accompanist-swiperefresh = { module = "com.google.accompanist:accompanist-swiperefresh", version.ref = "accompanist" } -accompanist-systemuicontroller = { module = "com.google.accompanist:accompanist-systemuicontroller", version.ref = "accompanist" } androidx-activity-compose = { module = "androidx.activity:activity-compose", version.ref = "androidx-activity-compose" } androidx-activity-ktx = { module = "androidx.activity:activity-ktx", version.ref = "androidx-activity-compose" } androidx-appcompat = { module = "androidx.appcompat:appcompat", version.ref = "androidx-appcompat" } diff --git a/JetNews/app/build.gradle.kts b/JetNews/app/build.gradle.kts index b827bd22b4..725b9f48c7 100644 --- a/JetNews/app/build.gradle.kts +++ b/JetNews/app/build.gradle.kts @@ -100,7 +100,6 @@ dependencies { debugImplementation(libs.androidx.compose.ui.tooling) implementation(libs.accompanist.swiperefresh) - implementation(libs.accompanist.systemuicontroller) implementation(libs.androidx.appcompat) implementation(libs.androidx.activity.ktx) diff --git a/JetNews/gradle/libs.versions.toml b/JetNews/gradle/libs.versions.toml index 5128f3562b..6f84ac83cd 100644 --- a/JetNews/gradle/libs.versions.toml +++ b/JetNews/gradle/libs.versions.toml @@ -65,7 +65,6 @@ accompanist-flowlayout = { module = "com.google.accompanist:accompanist-flowlayo accompanist-pager = { module = "com.google.accompanist:accompanist-pager", version.ref = "accompanist" } accompanist-permissions = { module = "com.google.accompanist:accompanist-permissions", version.ref = "accompanist" } accompanist-swiperefresh = { module = "com.google.accompanist:accompanist-swiperefresh", version.ref = "accompanist" } -accompanist-systemuicontroller = { module = "com.google.accompanist:accompanist-systemuicontroller", version.ref = "accompanist" } androidx-activity-compose = { module = "androidx.activity:activity-compose", version.ref = "androidx-activity-compose" } androidx-activity-ktx = { module = "androidx.activity:activity-ktx", version.ref = "androidx-activity-compose" } androidx-appcompat = { module = "androidx.appcompat:appcompat", version.ref = "androidx-appcompat" } diff --git a/Jetcaster/gradle/libs.versions.toml b/Jetcaster/gradle/libs.versions.toml index 5128f3562b..6f84ac83cd 100644 --- a/Jetcaster/gradle/libs.versions.toml +++ b/Jetcaster/gradle/libs.versions.toml @@ -65,7 +65,6 @@ accompanist-flowlayout = { module = "com.google.accompanist:accompanist-flowlayo accompanist-pager = { module = "com.google.accompanist:accompanist-pager", version.ref = "accompanist" } accompanist-permissions = { module = "com.google.accompanist:accompanist-permissions", version.ref = "accompanist" } accompanist-swiperefresh = { module = "com.google.accompanist:accompanist-swiperefresh", version.ref = "accompanist" } -accompanist-systemuicontroller = { module = "com.google.accompanist:accompanist-systemuicontroller", version.ref = "accompanist" } androidx-activity-compose = { module = "androidx.activity:activity-compose", version.ref = "androidx-activity-compose" } androidx-activity-ktx = { module = "androidx.activity:activity-ktx", version.ref = "androidx-activity-compose" } androidx-appcompat = { module = "androidx.appcompat:appcompat", version.ref = "androidx-appcompat" } diff --git a/Jetchat/gradle/libs.versions.toml b/Jetchat/gradle/libs.versions.toml index 5128f3562b..6f84ac83cd 100644 --- a/Jetchat/gradle/libs.versions.toml +++ b/Jetchat/gradle/libs.versions.toml @@ -65,7 +65,6 @@ accompanist-flowlayout = { module = "com.google.accompanist:accompanist-flowlayo accompanist-pager = { module = "com.google.accompanist:accompanist-pager", version.ref = "accompanist" } accompanist-permissions = { module = "com.google.accompanist:accompanist-permissions", version.ref = "accompanist" } accompanist-swiperefresh = { module = "com.google.accompanist:accompanist-swiperefresh", version.ref = "accompanist" } -accompanist-systemuicontroller = { module = "com.google.accompanist:accompanist-systemuicontroller", version.ref = "accompanist" } androidx-activity-compose = { module = "androidx.activity:activity-compose", version.ref = "androidx-activity-compose" } androidx-activity-ktx = { module = "androidx.activity:activity-ktx", version.ref = "androidx-activity-compose" } androidx-appcompat = { module = "androidx.appcompat:appcompat", version.ref = "androidx-appcompat" } diff --git a/Jetsnack/gradle/libs.versions.toml b/Jetsnack/gradle/libs.versions.toml index 5128f3562b..6f84ac83cd 100644 --- a/Jetsnack/gradle/libs.versions.toml +++ b/Jetsnack/gradle/libs.versions.toml @@ -65,7 +65,6 @@ accompanist-flowlayout = { module = "com.google.accompanist:accompanist-flowlayo accompanist-pager = { module = "com.google.accompanist:accompanist-pager", version.ref = "accompanist" } accompanist-permissions = { module = "com.google.accompanist:accompanist-permissions", version.ref = "accompanist" } accompanist-swiperefresh = { module = "com.google.accompanist:accompanist-swiperefresh", version.ref = "accompanist" } -accompanist-systemuicontroller = { module = "com.google.accompanist:accompanist-systemuicontroller", version.ref = "accompanist" } androidx-activity-compose = { module = "androidx.activity:activity-compose", version.ref = "androidx-activity-compose" } androidx-activity-ktx = { module = "androidx.activity:activity-ktx", version.ref = "androidx-activity-compose" } androidx-appcompat = { module = "androidx.appcompat:appcompat", version.ref = "androidx-appcompat" } diff --git a/Reply/gradle/libs.versions.toml b/Reply/gradle/libs.versions.toml index 5128f3562b..6f84ac83cd 100644 --- a/Reply/gradle/libs.versions.toml +++ b/Reply/gradle/libs.versions.toml @@ -65,7 +65,6 @@ accompanist-flowlayout = { module = "com.google.accompanist:accompanist-flowlayo accompanist-pager = { module = "com.google.accompanist:accompanist-pager", version.ref = "accompanist" } accompanist-permissions = { module = "com.google.accompanist:accompanist-permissions", version.ref = "accompanist" } accompanist-swiperefresh = { module = "com.google.accompanist:accompanist-swiperefresh", version.ref = "accompanist" } -accompanist-systemuicontroller = { module = "com.google.accompanist:accompanist-systemuicontroller", version.ref = "accompanist" } androidx-activity-compose = { module = "androidx.activity:activity-compose", version.ref = "androidx-activity-compose" } androidx-activity-ktx = { module = "androidx.activity:activity-ktx", version.ref = "androidx-activity-compose" } androidx-appcompat = { module = "androidx.appcompat:appcompat", version.ref = "androidx-appcompat" } diff --git a/scripts/libs.versions.toml b/scripts/libs.versions.toml index 5128f3562b..6f84ac83cd 100644 --- a/scripts/libs.versions.toml +++ b/scripts/libs.versions.toml @@ -65,7 +65,6 @@ accompanist-flowlayout = { module = "com.google.accompanist:accompanist-flowlayo accompanist-pager = { module = "com.google.accompanist:accompanist-pager", version.ref = "accompanist" } accompanist-permissions = { module = "com.google.accompanist:accompanist-permissions", version.ref = "accompanist" } accompanist-swiperefresh = { module = "com.google.accompanist:accompanist-swiperefresh", version.ref = "accompanist" } -accompanist-systemuicontroller = { module = "com.google.accompanist:accompanist-systemuicontroller", version.ref = "accompanist" } androidx-activity-compose = { module = "androidx.activity:activity-compose", version.ref = "androidx-activity-compose" } androidx-activity-ktx = { module = "androidx.activity:activity-ktx", version.ref = "androidx-activity-compose" } androidx-appcompat = { module = "androidx.appcompat:appcompat", version.ref = "androidx-appcompat" } From c84381ba0c5820a88298dbd7041153c37bdcb851 Mon Sep 17 00:00:00 2001 From: Alex Vanyo Date: Wed, 4 Dec 2024 14:26:07 -0800 Subject: [PATCH 7/7] Remove accompanist/pager Change-Id: Ia88bd4c993cd1b226011ed7419b20029b5265d8d --- JetLagged/gradle/libs.versions.toml | 1 - JetNews/gradle/libs.versions.toml | 1 - Jetcaster/gradle/libs.versions.toml | 1 - Jetchat/gradle/libs.versions.toml | 1 - Jetsnack/gradle/libs.versions.toml | 1 - Reply/gradle/libs.versions.toml | 1 - scripts/libs.versions.toml | 1 - 7 files changed, 7 deletions(-) diff --git a/JetLagged/gradle/libs.versions.toml b/JetLagged/gradle/libs.versions.toml index 5128f3562b..d43014923c 100644 --- a/JetLagged/gradle/libs.versions.toml +++ b/JetLagged/gradle/libs.versions.toml @@ -62,7 +62,6 @@ version-catalog-update = "0.8.5" [libraries] accompanist-adaptive = { module = "com.google.accompanist:accompanist-adaptive", version.ref = "accompanist" } accompanist-flowlayout = { module = "com.google.accompanist:accompanist-flowlayout", version.ref = "accompanist" } -accompanist-pager = { module = "com.google.accompanist:accompanist-pager", version.ref = "accompanist" } accompanist-permissions = { module = "com.google.accompanist:accompanist-permissions", version.ref = "accompanist" } accompanist-swiperefresh = { module = "com.google.accompanist:accompanist-swiperefresh", version.ref = "accompanist" } accompanist-systemuicontroller = { module = "com.google.accompanist:accompanist-systemuicontroller", version.ref = "accompanist" } diff --git a/JetNews/gradle/libs.versions.toml b/JetNews/gradle/libs.versions.toml index 5128f3562b..d43014923c 100644 --- a/JetNews/gradle/libs.versions.toml +++ b/JetNews/gradle/libs.versions.toml @@ -62,7 +62,6 @@ version-catalog-update = "0.8.5" [libraries] accompanist-adaptive = { module = "com.google.accompanist:accompanist-adaptive", version.ref = "accompanist" } accompanist-flowlayout = { module = "com.google.accompanist:accompanist-flowlayout", version.ref = "accompanist" } -accompanist-pager = { module = "com.google.accompanist:accompanist-pager", version.ref = "accompanist" } accompanist-permissions = { module = "com.google.accompanist:accompanist-permissions", version.ref = "accompanist" } accompanist-swiperefresh = { module = "com.google.accompanist:accompanist-swiperefresh", version.ref = "accompanist" } accompanist-systemuicontroller = { module = "com.google.accompanist:accompanist-systemuicontroller", version.ref = "accompanist" } diff --git a/Jetcaster/gradle/libs.versions.toml b/Jetcaster/gradle/libs.versions.toml index 5128f3562b..d43014923c 100644 --- a/Jetcaster/gradle/libs.versions.toml +++ b/Jetcaster/gradle/libs.versions.toml @@ -62,7 +62,6 @@ version-catalog-update = "0.8.5" [libraries] accompanist-adaptive = { module = "com.google.accompanist:accompanist-adaptive", version.ref = "accompanist" } accompanist-flowlayout = { module = "com.google.accompanist:accompanist-flowlayout", version.ref = "accompanist" } -accompanist-pager = { module = "com.google.accompanist:accompanist-pager", version.ref = "accompanist" } accompanist-permissions = { module = "com.google.accompanist:accompanist-permissions", version.ref = "accompanist" } accompanist-swiperefresh = { module = "com.google.accompanist:accompanist-swiperefresh", version.ref = "accompanist" } accompanist-systemuicontroller = { module = "com.google.accompanist:accompanist-systemuicontroller", version.ref = "accompanist" } diff --git a/Jetchat/gradle/libs.versions.toml b/Jetchat/gradle/libs.versions.toml index 5128f3562b..d43014923c 100644 --- a/Jetchat/gradle/libs.versions.toml +++ b/Jetchat/gradle/libs.versions.toml @@ -62,7 +62,6 @@ version-catalog-update = "0.8.5" [libraries] accompanist-adaptive = { module = "com.google.accompanist:accompanist-adaptive", version.ref = "accompanist" } accompanist-flowlayout = { module = "com.google.accompanist:accompanist-flowlayout", version.ref = "accompanist" } -accompanist-pager = { module = "com.google.accompanist:accompanist-pager", version.ref = "accompanist" } accompanist-permissions = { module = "com.google.accompanist:accompanist-permissions", version.ref = "accompanist" } accompanist-swiperefresh = { module = "com.google.accompanist:accompanist-swiperefresh", version.ref = "accompanist" } accompanist-systemuicontroller = { module = "com.google.accompanist:accompanist-systemuicontroller", version.ref = "accompanist" } diff --git a/Jetsnack/gradle/libs.versions.toml b/Jetsnack/gradle/libs.versions.toml index 5128f3562b..d43014923c 100644 --- a/Jetsnack/gradle/libs.versions.toml +++ b/Jetsnack/gradle/libs.versions.toml @@ -62,7 +62,6 @@ version-catalog-update = "0.8.5" [libraries] accompanist-adaptive = { module = "com.google.accompanist:accompanist-adaptive", version.ref = "accompanist" } accompanist-flowlayout = { module = "com.google.accompanist:accompanist-flowlayout", version.ref = "accompanist" } -accompanist-pager = { module = "com.google.accompanist:accompanist-pager", version.ref = "accompanist" } accompanist-permissions = { module = "com.google.accompanist:accompanist-permissions", version.ref = "accompanist" } accompanist-swiperefresh = { module = "com.google.accompanist:accompanist-swiperefresh", version.ref = "accompanist" } accompanist-systemuicontroller = { module = "com.google.accompanist:accompanist-systemuicontroller", version.ref = "accompanist" } diff --git a/Reply/gradle/libs.versions.toml b/Reply/gradle/libs.versions.toml index 5128f3562b..d43014923c 100644 --- a/Reply/gradle/libs.versions.toml +++ b/Reply/gradle/libs.versions.toml @@ -62,7 +62,6 @@ version-catalog-update = "0.8.5" [libraries] accompanist-adaptive = { module = "com.google.accompanist:accompanist-adaptive", version.ref = "accompanist" } accompanist-flowlayout = { module = "com.google.accompanist:accompanist-flowlayout", version.ref = "accompanist" } -accompanist-pager = { module = "com.google.accompanist:accompanist-pager", version.ref = "accompanist" } accompanist-permissions = { module = "com.google.accompanist:accompanist-permissions", version.ref = "accompanist" } accompanist-swiperefresh = { module = "com.google.accompanist:accompanist-swiperefresh", version.ref = "accompanist" } accompanist-systemuicontroller = { module = "com.google.accompanist:accompanist-systemuicontroller", version.ref = "accompanist" } diff --git a/scripts/libs.versions.toml b/scripts/libs.versions.toml index 5128f3562b..d43014923c 100644 --- a/scripts/libs.versions.toml +++ b/scripts/libs.versions.toml @@ -62,7 +62,6 @@ version-catalog-update = "0.8.5" [libraries] accompanist-adaptive = { module = "com.google.accompanist:accompanist-adaptive", version.ref = "accompanist" } accompanist-flowlayout = { module = "com.google.accompanist:accompanist-flowlayout", version.ref = "accompanist" } -accompanist-pager = { module = "com.google.accompanist:accompanist-pager", version.ref = "accompanist" } accompanist-permissions = { module = "com.google.accompanist:accompanist-permissions", version.ref = "accompanist" } accompanist-swiperefresh = { module = "com.google.accompanist:accompanist-swiperefresh", version.ref = "accompanist" } accompanist-systemuicontroller = { module = "com.google.accompanist:accompanist-systemuicontroller", version.ref = "accompanist" }