Merge branch 'main' into jetcaster/m3-filterchip

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)

JetLagged/gradle/libs.versions.toml

@@ -61,11 +61,8 @@ 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" }
 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" }

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)

JetNews/gradle/libs.versions.toml

@@ -61,11 +61,8 @@ 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" }
 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" }

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<ScreenState>` 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
 

Jetcaster/gradle/libs.versions.toml

@@ -61,11 +61,8 @@ 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" }
 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" }