From 2c7116bb7f53eae20cbc6dfceb52833ec9735cc1 Mon Sep 17 00:00:00 2001 From: Chris Arriola Date: Fri, 26 Apr 2024 10:09:34 -0700 Subject: [PATCH 1/2] [Jetcaster]: Rename 'app' module to 'mobile' --- Jetcaster/README.md | 34 +++++++++--------- Jetcaster/{app => mobile}/build.gradle.kts | 0 Jetcaster/{app => mobile}/proguard-rules.pro | 0 .../src/main/AndroidManifest.xml | 0 .../example/jetcaster/JetcasterApplication.kt | 0 .../com/example/jetcaster/ui/JetcasterApp.kt | 0 .../example/jetcaster/ui/JetcasterAppState.kt | 0 .../com/example/jetcaster/ui/MainActivity.kt | 0 .../com/example/jetcaster/ui/home/Home.kt | 0 .../jetcaster/ui/home/HomeViewModel.kt | 0 .../example/jetcaster/ui/home/PreviewData.kt | 0 .../ui/home/category/PodcastCategory.kt | 0 .../jetcaster/ui/home/discover/Discover.kt | 0 .../jetcaster/ui/home/library/Library.kt | 0 .../jetcaster/ui/player/PlayerScreen.kt | 0 .../jetcaster/ui/player/PlayerViewModel.kt | 0 .../ui/podcast/PodcastDetailsScreen.kt | 0 .../ui/podcast/PodcastDetailsViewModel.kt | 0 .../jetcaster/ui/shared/EpisodeListItem.kt | 0 .../example/jetcaster/ui/shared/Loading.kt | 0 .../com/example/jetcaster/ui/theme/Color.kt | 0 .../com/example/jetcaster/ui/theme/Theme.kt | 0 .../com/example/jetcaster/util/Buttons.kt | 0 .../java/com/example/jetcaster/util/Colors.kt | 0 .../example/jetcaster/util/GradientScrim.kt | 0 .../jetcaster/util/LazyVerticalGrid.kt | 0 .../example/jetcaster/util/PluralResources.kt | 0 .../com/example/jetcaster/util/ViewModel.kt | 0 .../example/jetcaster/util/WindowInfoUtil.kt | 0 .../example/jetcaster/util/WindowSizeClass.kt | 0 .../main/res/drawable-nodpi/ic_text_logo.xml | 0 .../drawable-v26/ic_launcher_foreground.xml | 0 .../res/drawable/ic_launcher_background.xml | 0 .../res/drawable/ic_launcher_foreground.xml | 0 .../res/drawable/ic_launcher_monochrome.xml | 0 .../src/main/res/drawable/ic_logo.xml | 0 .../res/mipmap-anydpi-v26/ic_launcher.xml | 0 .../mipmap-anydpi-v26/ic_launcher_round.xml | 0 .../src/main/res/mipmap-hdpi/ic_launcher.png | Bin .../res/mipmap-hdpi/ic_launcher_round.png | Bin .../src/main/res/mipmap-mdpi/ic_launcher.png | Bin .../res/mipmap-mdpi/ic_launcher_round.png | Bin .../src/main/res/mipmap-xhdpi/ic_launcher.png | Bin .../res/mipmap-xhdpi/ic_launcher_round.png | Bin .../main/res/mipmap-xxhdpi/ic_launcher.png | Bin .../res/mipmap-xxhdpi/ic_launcher_round.png | Bin .../main/res/mipmap-xxxhdpi/ic_launcher.png | Bin .../res/mipmap-xxxhdpi/ic_launcher_round.png | Bin .../src/main/res/values/colors.xml | 0 .../src/main/res/values/strings.xml | 0 .../src/main/res/values/themes.xml | 0 Jetcaster/settings.gradle.kts | 2 +- 52 files changed, 18 insertions(+), 18 deletions(-) rename Jetcaster/{app => mobile}/build.gradle.kts (100%) rename Jetcaster/{app => mobile}/proguard-rules.pro (100%) rename Jetcaster/{app => mobile}/src/main/AndroidManifest.xml (100%) rename Jetcaster/{app => mobile}/src/main/java/com/example/jetcaster/JetcasterApplication.kt (100%) rename Jetcaster/{app => mobile}/src/main/java/com/example/jetcaster/ui/JetcasterApp.kt (100%) rename Jetcaster/{app => mobile}/src/main/java/com/example/jetcaster/ui/JetcasterAppState.kt (100%) rename Jetcaster/{app => mobile}/src/main/java/com/example/jetcaster/ui/MainActivity.kt (100%) rename Jetcaster/{app => mobile}/src/main/java/com/example/jetcaster/ui/home/Home.kt (100%) rename Jetcaster/{app => mobile}/src/main/java/com/example/jetcaster/ui/home/HomeViewModel.kt (100%) rename Jetcaster/{app => mobile}/src/main/java/com/example/jetcaster/ui/home/PreviewData.kt (100%) rename Jetcaster/{app => mobile}/src/main/java/com/example/jetcaster/ui/home/category/PodcastCategory.kt (100%) rename Jetcaster/{app => mobile}/src/main/java/com/example/jetcaster/ui/home/discover/Discover.kt (100%) rename Jetcaster/{app => mobile}/src/main/java/com/example/jetcaster/ui/home/library/Library.kt (100%) rename Jetcaster/{app => mobile}/src/main/java/com/example/jetcaster/ui/player/PlayerScreen.kt (100%) rename Jetcaster/{app => mobile}/src/main/java/com/example/jetcaster/ui/player/PlayerViewModel.kt (100%) rename Jetcaster/{app => mobile}/src/main/java/com/example/jetcaster/ui/podcast/PodcastDetailsScreen.kt (100%) rename Jetcaster/{app => mobile}/src/main/java/com/example/jetcaster/ui/podcast/PodcastDetailsViewModel.kt (100%) rename Jetcaster/{app => mobile}/src/main/java/com/example/jetcaster/ui/shared/EpisodeListItem.kt (100%) rename Jetcaster/{app => mobile}/src/main/java/com/example/jetcaster/ui/shared/Loading.kt (100%) rename Jetcaster/{app => mobile}/src/main/java/com/example/jetcaster/ui/theme/Color.kt (100%) rename Jetcaster/{app => mobile}/src/main/java/com/example/jetcaster/ui/theme/Theme.kt (100%) rename Jetcaster/{app => mobile}/src/main/java/com/example/jetcaster/util/Buttons.kt (100%) rename Jetcaster/{app => mobile}/src/main/java/com/example/jetcaster/util/Colors.kt (100%) rename Jetcaster/{app => mobile}/src/main/java/com/example/jetcaster/util/GradientScrim.kt (100%) rename Jetcaster/{app => mobile}/src/main/java/com/example/jetcaster/util/LazyVerticalGrid.kt (100%) rename Jetcaster/{app => mobile}/src/main/java/com/example/jetcaster/util/PluralResources.kt (100%) rename Jetcaster/{app => mobile}/src/main/java/com/example/jetcaster/util/ViewModel.kt (100%) rename Jetcaster/{app => mobile}/src/main/java/com/example/jetcaster/util/WindowInfoUtil.kt (100%) rename Jetcaster/{app => mobile}/src/main/java/com/example/jetcaster/util/WindowSizeClass.kt (100%) rename Jetcaster/{app => mobile}/src/main/res/drawable-nodpi/ic_text_logo.xml (100%) rename Jetcaster/{app => mobile}/src/main/res/drawable-v26/ic_launcher_foreground.xml (100%) rename Jetcaster/{app => mobile}/src/main/res/drawable/ic_launcher_background.xml (100%) rename Jetcaster/{app => mobile}/src/main/res/drawable/ic_launcher_foreground.xml (100%) rename Jetcaster/{app => mobile}/src/main/res/drawable/ic_launcher_monochrome.xml (100%) rename Jetcaster/{app => mobile}/src/main/res/drawable/ic_logo.xml (100%) rename Jetcaster/{app => mobile}/src/main/res/mipmap-anydpi-v26/ic_launcher.xml (100%) rename Jetcaster/{app => mobile}/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml (100%) rename Jetcaster/{app => mobile}/src/main/res/mipmap-hdpi/ic_launcher.png (100%) rename Jetcaster/{app => mobile}/src/main/res/mipmap-hdpi/ic_launcher_round.png (100%) rename Jetcaster/{app => mobile}/src/main/res/mipmap-mdpi/ic_launcher.png (100%) rename Jetcaster/{app => mobile}/src/main/res/mipmap-mdpi/ic_launcher_round.png (100%) rename Jetcaster/{app => mobile}/src/main/res/mipmap-xhdpi/ic_launcher.png (100%) rename Jetcaster/{app => mobile}/src/main/res/mipmap-xhdpi/ic_launcher_round.png (100%) rename Jetcaster/{app => mobile}/src/main/res/mipmap-xxhdpi/ic_launcher.png (100%) rename Jetcaster/{app => mobile}/src/main/res/mipmap-xxhdpi/ic_launcher_round.png (100%) rename Jetcaster/{app => mobile}/src/main/res/mipmap-xxxhdpi/ic_launcher.png (100%) rename Jetcaster/{app => mobile}/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png (100%) rename Jetcaster/{app => mobile}/src/main/res/values/colors.xml (100%) rename Jetcaster/{app => mobile}/src/main/res/values/strings.xml (100%) rename Jetcaster/{app => mobile}/src/main/res/values/themes.xml (100%) diff --git a/Jetcaster/README.md b/Jetcaster/README.md index ee0073e81f..93b519c19c 100644 --- a/Jetcaster/README.md +++ b/Jetcaster/README.md @@ -42,7 +42,7 @@ Some other notable things which are implemented: ### Architecture The app is built in a Redux-style, where each UI 'screen' has its own [ViewModel][viewmodel], which exposes a single [StateFlow][stateflow] containing the entire view state. Each [ViewModel][viewmodel] is responsible for subscribing to any data streams required for the view, as well as exposing functions which allow the UI to send events. -Using the example of the home screen in the [`com.example.jetcaster.ui.home`](app/src/main/java/com/example/jetcaster/ui/home) package: +Using the example of the home screen in the [`com.example.jetcaster.ui.home`](mobile/src/main/java/com/example/jetcaster/ui/home) package: - The ViewModel is implemented as [`HomeViewModel`][homevm], which exposes a `StateFlow` for the UI to observe. - [`HomeViewState`][homevm] contains the complete view state for the home screen as an [`@Immutable`](https://developer.android.com/reference/kotlin/androidx/compose/runtime/Immutable) `data class`. @@ -55,9 +55,9 @@ val viewState by viewModel.state.collectAsStateWithLifecycle() This pattern is used across the different screens: -- __Home:__ [`com.example.jetcaster.ui.home`](app/src/main/java/com/example/jetcaster/ui/home) -- __Discover:__ [`com.example.jetcaster.ui.home.discover`](app/src/main/java/com/example/jetcaster/ui/home/discover) -- __Podcast Category:__ [`com.example.jetcaster.ui.category`](app/src/main/java/com/example/jetcaster/ui/home/category) +- __Home:__ [`com.example.jetcaster.ui.home`](mobile/src/main/java/com/example/jetcaster/ui/home) +- __Discover:__ [`com.example.jetcaster.ui.home.discover`](mobile/src/main/java/com/example/jetcaster/ui/home/discover) +- __Podcast Category:__ [`com.example.jetcaster.ui.category`](mobile/src/main/java/com/example/jetcaster/ui/home/category) ## Wear @@ -93,7 +93,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`](app/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`](mobile/src/main/java/com/example/jetcaster/data/Feeds.kt). The [`PodcastRepository`][podcastrepo] class is responsible for handling the data fetching of all podcast information: @@ -102,11 +102,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`](app/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`](mobile/src/main/java/com/example/jetcaster/data/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`](app/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`](mobile/src/main/java/com/example/jetcaster/data/room/DateTimeTypeConverters.kt). ## License @@ -126,15 +126,15 @@ See the License for the specific language governing permissions and limitations under the License. ``` - [feeds]: app/src/main/java/com/example/jetcaster/data/Feeds.kt - [fetcher]: app/src/main/java/com/example/jetcaster/data/PodcastFetcher.kt - [podcastrepo]: app/src/main/java/com/example/jetcaster/data/PodcastsRepository.kt - [podcaststore]: app/src/main/java/com/example/jetcaster/data/PodcastStore.kt - [epstore]: app/src/main/java/com/example/jetcaster/data/EpisodeStore.kt - [catstore]: app/src/main/java/com/example/jetcaster/data/CategoryStore.kt - [db]: app/src/main/java/com/example/jetcaster/data/room/JetcasterDatabase.kt - [homevm]: app/src/main/java/com/example/jetcaster/ui/home/HomeViewModel.kt - [homeui]: app/src/main/java/com/example/jetcaster/ui/home/Home.kt + [feeds]: mobile/src/main/java/com/example/jetcaster/data/Feeds.kt + [fetcher]: mobile/src/main/java/com/example/jetcaster/data/PodcastFetcher.kt + [podcastrepo]: mobile/src/main/java/com/example/jetcaster/data/PodcastsRepository.kt + [podcaststore]: mobile/src/main/java/com/example/jetcaster/data/PodcastStore.kt + [epstore]: mobile/src/main/java/com/example/jetcaster/data/EpisodeStore.kt + [catstore]: mobile/src/main/java/com/example/jetcaster/data/CategoryStore.kt + [db]: mobile/src/main/java/com/example/jetcaster/data/room/JetcasterDatabase.kt + [homevm]: mobile/src/main/java/com/example/jetcaster/ui/home/HomeViewModel.kt + [homeui]: mobile/src/main/java/com/example/jetcaster/ui/home/Home.kt [compose]: https://developer.android.com/jetpack/compose [palette]: https://developer.android.com/reference/kotlin/androidx/palette/graphics/package-summary [room]: https://developer.android.com/topic/libraries/architecture/room @@ -150,4 +150,4 @@ limitations under the License. [wearmediaguidance]: https://developer.android.com/media/implement/surfaces/wear-os#play-downloaded-content [horologist]: https://google.github.io/horologist/ [entityscreen]: https://github.com/google/horologist/blob/main/media/ui/src/main/java/com/google/android/horologist/media/ui/screens/entity/EntityScreen.kt - [mediappsbestpractices]: https://developer.android.com/design/ui/wear/guides/foundations/media-apps \ No newline at end of file + [mediappsbestpractices]: https://developer.android.com/design/ui/wear/guides/foundations/media-apps diff --git a/Jetcaster/app/build.gradle.kts b/Jetcaster/mobile/build.gradle.kts similarity index 100% rename from Jetcaster/app/build.gradle.kts rename to Jetcaster/mobile/build.gradle.kts diff --git a/Jetcaster/app/proguard-rules.pro b/Jetcaster/mobile/proguard-rules.pro similarity index 100% rename from Jetcaster/app/proguard-rules.pro rename to Jetcaster/mobile/proguard-rules.pro diff --git a/Jetcaster/app/src/main/AndroidManifest.xml b/Jetcaster/mobile/src/main/AndroidManifest.xml similarity index 100% rename from Jetcaster/app/src/main/AndroidManifest.xml rename to Jetcaster/mobile/src/main/AndroidManifest.xml diff --git a/Jetcaster/app/src/main/java/com/example/jetcaster/JetcasterApplication.kt b/Jetcaster/mobile/src/main/java/com/example/jetcaster/JetcasterApplication.kt similarity index 100% rename from Jetcaster/app/src/main/java/com/example/jetcaster/JetcasterApplication.kt rename to Jetcaster/mobile/src/main/java/com/example/jetcaster/JetcasterApplication.kt diff --git a/Jetcaster/app/src/main/java/com/example/jetcaster/ui/JetcasterApp.kt b/Jetcaster/mobile/src/main/java/com/example/jetcaster/ui/JetcasterApp.kt similarity index 100% rename from Jetcaster/app/src/main/java/com/example/jetcaster/ui/JetcasterApp.kt rename to Jetcaster/mobile/src/main/java/com/example/jetcaster/ui/JetcasterApp.kt diff --git a/Jetcaster/app/src/main/java/com/example/jetcaster/ui/JetcasterAppState.kt b/Jetcaster/mobile/src/main/java/com/example/jetcaster/ui/JetcasterAppState.kt similarity index 100% rename from Jetcaster/app/src/main/java/com/example/jetcaster/ui/JetcasterAppState.kt rename to Jetcaster/mobile/src/main/java/com/example/jetcaster/ui/JetcasterAppState.kt diff --git a/Jetcaster/app/src/main/java/com/example/jetcaster/ui/MainActivity.kt b/Jetcaster/mobile/src/main/java/com/example/jetcaster/ui/MainActivity.kt similarity index 100% rename from Jetcaster/app/src/main/java/com/example/jetcaster/ui/MainActivity.kt rename to Jetcaster/mobile/src/main/java/com/example/jetcaster/ui/MainActivity.kt diff --git a/Jetcaster/app/src/main/java/com/example/jetcaster/ui/home/Home.kt b/Jetcaster/mobile/src/main/java/com/example/jetcaster/ui/home/Home.kt similarity index 100% rename from Jetcaster/app/src/main/java/com/example/jetcaster/ui/home/Home.kt rename to Jetcaster/mobile/src/main/java/com/example/jetcaster/ui/home/Home.kt diff --git a/Jetcaster/app/src/main/java/com/example/jetcaster/ui/home/HomeViewModel.kt b/Jetcaster/mobile/src/main/java/com/example/jetcaster/ui/home/HomeViewModel.kt similarity index 100% rename from Jetcaster/app/src/main/java/com/example/jetcaster/ui/home/HomeViewModel.kt rename to Jetcaster/mobile/src/main/java/com/example/jetcaster/ui/home/HomeViewModel.kt diff --git a/Jetcaster/app/src/main/java/com/example/jetcaster/ui/home/PreviewData.kt b/Jetcaster/mobile/src/main/java/com/example/jetcaster/ui/home/PreviewData.kt similarity index 100% rename from Jetcaster/app/src/main/java/com/example/jetcaster/ui/home/PreviewData.kt rename to Jetcaster/mobile/src/main/java/com/example/jetcaster/ui/home/PreviewData.kt diff --git a/Jetcaster/app/src/main/java/com/example/jetcaster/ui/home/category/PodcastCategory.kt b/Jetcaster/mobile/src/main/java/com/example/jetcaster/ui/home/category/PodcastCategory.kt similarity index 100% rename from Jetcaster/app/src/main/java/com/example/jetcaster/ui/home/category/PodcastCategory.kt rename to Jetcaster/mobile/src/main/java/com/example/jetcaster/ui/home/category/PodcastCategory.kt diff --git a/Jetcaster/app/src/main/java/com/example/jetcaster/ui/home/discover/Discover.kt b/Jetcaster/mobile/src/main/java/com/example/jetcaster/ui/home/discover/Discover.kt similarity index 100% rename from Jetcaster/app/src/main/java/com/example/jetcaster/ui/home/discover/Discover.kt rename to Jetcaster/mobile/src/main/java/com/example/jetcaster/ui/home/discover/Discover.kt diff --git a/Jetcaster/app/src/main/java/com/example/jetcaster/ui/home/library/Library.kt b/Jetcaster/mobile/src/main/java/com/example/jetcaster/ui/home/library/Library.kt similarity index 100% rename from Jetcaster/app/src/main/java/com/example/jetcaster/ui/home/library/Library.kt rename to Jetcaster/mobile/src/main/java/com/example/jetcaster/ui/home/library/Library.kt diff --git a/Jetcaster/app/src/main/java/com/example/jetcaster/ui/player/PlayerScreen.kt b/Jetcaster/mobile/src/main/java/com/example/jetcaster/ui/player/PlayerScreen.kt similarity index 100% rename from Jetcaster/app/src/main/java/com/example/jetcaster/ui/player/PlayerScreen.kt rename to Jetcaster/mobile/src/main/java/com/example/jetcaster/ui/player/PlayerScreen.kt diff --git a/Jetcaster/app/src/main/java/com/example/jetcaster/ui/player/PlayerViewModel.kt b/Jetcaster/mobile/src/main/java/com/example/jetcaster/ui/player/PlayerViewModel.kt similarity index 100% rename from Jetcaster/app/src/main/java/com/example/jetcaster/ui/player/PlayerViewModel.kt rename to Jetcaster/mobile/src/main/java/com/example/jetcaster/ui/player/PlayerViewModel.kt diff --git a/Jetcaster/app/src/main/java/com/example/jetcaster/ui/podcast/PodcastDetailsScreen.kt b/Jetcaster/mobile/src/main/java/com/example/jetcaster/ui/podcast/PodcastDetailsScreen.kt similarity index 100% rename from Jetcaster/app/src/main/java/com/example/jetcaster/ui/podcast/PodcastDetailsScreen.kt rename to Jetcaster/mobile/src/main/java/com/example/jetcaster/ui/podcast/PodcastDetailsScreen.kt diff --git a/Jetcaster/app/src/main/java/com/example/jetcaster/ui/podcast/PodcastDetailsViewModel.kt b/Jetcaster/mobile/src/main/java/com/example/jetcaster/ui/podcast/PodcastDetailsViewModel.kt similarity index 100% rename from Jetcaster/app/src/main/java/com/example/jetcaster/ui/podcast/PodcastDetailsViewModel.kt rename to Jetcaster/mobile/src/main/java/com/example/jetcaster/ui/podcast/PodcastDetailsViewModel.kt diff --git a/Jetcaster/app/src/main/java/com/example/jetcaster/ui/shared/EpisodeListItem.kt b/Jetcaster/mobile/src/main/java/com/example/jetcaster/ui/shared/EpisodeListItem.kt similarity index 100% rename from Jetcaster/app/src/main/java/com/example/jetcaster/ui/shared/EpisodeListItem.kt rename to Jetcaster/mobile/src/main/java/com/example/jetcaster/ui/shared/EpisodeListItem.kt diff --git a/Jetcaster/app/src/main/java/com/example/jetcaster/ui/shared/Loading.kt b/Jetcaster/mobile/src/main/java/com/example/jetcaster/ui/shared/Loading.kt similarity index 100% rename from Jetcaster/app/src/main/java/com/example/jetcaster/ui/shared/Loading.kt rename to Jetcaster/mobile/src/main/java/com/example/jetcaster/ui/shared/Loading.kt diff --git a/Jetcaster/app/src/main/java/com/example/jetcaster/ui/theme/Color.kt b/Jetcaster/mobile/src/main/java/com/example/jetcaster/ui/theme/Color.kt similarity index 100% rename from Jetcaster/app/src/main/java/com/example/jetcaster/ui/theme/Color.kt rename to Jetcaster/mobile/src/main/java/com/example/jetcaster/ui/theme/Color.kt diff --git a/Jetcaster/app/src/main/java/com/example/jetcaster/ui/theme/Theme.kt b/Jetcaster/mobile/src/main/java/com/example/jetcaster/ui/theme/Theme.kt similarity index 100% rename from Jetcaster/app/src/main/java/com/example/jetcaster/ui/theme/Theme.kt rename to Jetcaster/mobile/src/main/java/com/example/jetcaster/ui/theme/Theme.kt diff --git a/Jetcaster/app/src/main/java/com/example/jetcaster/util/Buttons.kt b/Jetcaster/mobile/src/main/java/com/example/jetcaster/util/Buttons.kt similarity index 100% rename from Jetcaster/app/src/main/java/com/example/jetcaster/util/Buttons.kt rename to Jetcaster/mobile/src/main/java/com/example/jetcaster/util/Buttons.kt diff --git a/Jetcaster/app/src/main/java/com/example/jetcaster/util/Colors.kt b/Jetcaster/mobile/src/main/java/com/example/jetcaster/util/Colors.kt similarity index 100% rename from Jetcaster/app/src/main/java/com/example/jetcaster/util/Colors.kt rename to Jetcaster/mobile/src/main/java/com/example/jetcaster/util/Colors.kt diff --git a/Jetcaster/app/src/main/java/com/example/jetcaster/util/GradientScrim.kt b/Jetcaster/mobile/src/main/java/com/example/jetcaster/util/GradientScrim.kt similarity index 100% rename from Jetcaster/app/src/main/java/com/example/jetcaster/util/GradientScrim.kt rename to Jetcaster/mobile/src/main/java/com/example/jetcaster/util/GradientScrim.kt diff --git a/Jetcaster/app/src/main/java/com/example/jetcaster/util/LazyVerticalGrid.kt b/Jetcaster/mobile/src/main/java/com/example/jetcaster/util/LazyVerticalGrid.kt similarity index 100% rename from Jetcaster/app/src/main/java/com/example/jetcaster/util/LazyVerticalGrid.kt rename to Jetcaster/mobile/src/main/java/com/example/jetcaster/util/LazyVerticalGrid.kt diff --git a/Jetcaster/app/src/main/java/com/example/jetcaster/util/PluralResources.kt b/Jetcaster/mobile/src/main/java/com/example/jetcaster/util/PluralResources.kt similarity index 100% rename from Jetcaster/app/src/main/java/com/example/jetcaster/util/PluralResources.kt rename to Jetcaster/mobile/src/main/java/com/example/jetcaster/util/PluralResources.kt diff --git a/Jetcaster/app/src/main/java/com/example/jetcaster/util/ViewModel.kt b/Jetcaster/mobile/src/main/java/com/example/jetcaster/util/ViewModel.kt similarity index 100% rename from Jetcaster/app/src/main/java/com/example/jetcaster/util/ViewModel.kt rename to Jetcaster/mobile/src/main/java/com/example/jetcaster/util/ViewModel.kt diff --git a/Jetcaster/app/src/main/java/com/example/jetcaster/util/WindowInfoUtil.kt b/Jetcaster/mobile/src/main/java/com/example/jetcaster/util/WindowInfoUtil.kt similarity index 100% rename from Jetcaster/app/src/main/java/com/example/jetcaster/util/WindowInfoUtil.kt rename to Jetcaster/mobile/src/main/java/com/example/jetcaster/util/WindowInfoUtil.kt diff --git a/Jetcaster/app/src/main/java/com/example/jetcaster/util/WindowSizeClass.kt b/Jetcaster/mobile/src/main/java/com/example/jetcaster/util/WindowSizeClass.kt similarity index 100% rename from Jetcaster/app/src/main/java/com/example/jetcaster/util/WindowSizeClass.kt rename to Jetcaster/mobile/src/main/java/com/example/jetcaster/util/WindowSizeClass.kt diff --git a/Jetcaster/app/src/main/res/drawable-nodpi/ic_text_logo.xml b/Jetcaster/mobile/src/main/res/drawable-nodpi/ic_text_logo.xml similarity index 100% rename from Jetcaster/app/src/main/res/drawable-nodpi/ic_text_logo.xml rename to Jetcaster/mobile/src/main/res/drawable-nodpi/ic_text_logo.xml diff --git a/Jetcaster/app/src/main/res/drawable-v26/ic_launcher_foreground.xml b/Jetcaster/mobile/src/main/res/drawable-v26/ic_launcher_foreground.xml similarity index 100% rename from Jetcaster/app/src/main/res/drawable-v26/ic_launcher_foreground.xml rename to Jetcaster/mobile/src/main/res/drawable-v26/ic_launcher_foreground.xml diff --git a/Jetcaster/app/src/main/res/drawable/ic_launcher_background.xml b/Jetcaster/mobile/src/main/res/drawable/ic_launcher_background.xml similarity index 100% rename from Jetcaster/app/src/main/res/drawable/ic_launcher_background.xml rename to Jetcaster/mobile/src/main/res/drawable/ic_launcher_background.xml diff --git a/Jetcaster/app/src/main/res/drawable/ic_launcher_foreground.xml b/Jetcaster/mobile/src/main/res/drawable/ic_launcher_foreground.xml similarity index 100% rename from Jetcaster/app/src/main/res/drawable/ic_launcher_foreground.xml rename to Jetcaster/mobile/src/main/res/drawable/ic_launcher_foreground.xml diff --git a/Jetcaster/app/src/main/res/drawable/ic_launcher_monochrome.xml b/Jetcaster/mobile/src/main/res/drawable/ic_launcher_monochrome.xml similarity index 100% rename from Jetcaster/app/src/main/res/drawable/ic_launcher_monochrome.xml rename to Jetcaster/mobile/src/main/res/drawable/ic_launcher_monochrome.xml diff --git a/Jetcaster/app/src/main/res/drawable/ic_logo.xml b/Jetcaster/mobile/src/main/res/drawable/ic_logo.xml similarity index 100% rename from Jetcaster/app/src/main/res/drawable/ic_logo.xml rename to Jetcaster/mobile/src/main/res/drawable/ic_logo.xml diff --git a/Jetcaster/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/Jetcaster/mobile/src/main/res/mipmap-anydpi-v26/ic_launcher.xml similarity index 100% rename from Jetcaster/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml rename to Jetcaster/mobile/src/main/res/mipmap-anydpi-v26/ic_launcher.xml diff --git a/Jetcaster/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/Jetcaster/mobile/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml similarity index 100% rename from Jetcaster/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml rename to Jetcaster/mobile/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml diff --git a/Jetcaster/app/src/main/res/mipmap-hdpi/ic_launcher.png b/Jetcaster/mobile/src/main/res/mipmap-hdpi/ic_launcher.png similarity index 100% rename from Jetcaster/app/src/main/res/mipmap-hdpi/ic_launcher.png rename to Jetcaster/mobile/src/main/res/mipmap-hdpi/ic_launcher.png diff --git a/Jetcaster/app/src/main/res/mipmap-hdpi/ic_launcher_round.png b/Jetcaster/mobile/src/main/res/mipmap-hdpi/ic_launcher_round.png similarity index 100% rename from Jetcaster/app/src/main/res/mipmap-hdpi/ic_launcher_round.png rename to Jetcaster/mobile/src/main/res/mipmap-hdpi/ic_launcher_round.png diff --git a/Jetcaster/app/src/main/res/mipmap-mdpi/ic_launcher.png b/Jetcaster/mobile/src/main/res/mipmap-mdpi/ic_launcher.png similarity index 100% rename from Jetcaster/app/src/main/res/mipmap-mdpi/ic_launcher.png rename to Jetcaster/mobile/src/main/res/mipmap-mdpi/ic_launcher.png diff --git a/Jetcaster/app/src/main/res/mipmap-mdpi/ic_launcher_round.png b/Jetcaster/mobile/src/main/res/mipmap-mdpi/ic_launcher_round.png similarity index 100% rename from Jetcaster/app/src/main/res/mipmap-mdpi/ic_launcher_round.png rename to Jetcaster/mobile/src/main/res/mipmap-mdpi/ic_launcher_round.png diff --git a/Jetcaster/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/Jetcaster/mobile/src/main/res/mipmap-xhdpi/ic_launcher.png similarity index 100% rename from Jetcaster/app/src/main/res/mipmap-xhdpi/ic_launcher.png rename to Jetcaster/mobile/src/main/res/mipmap-xhdpi/ic_launcher.png diff --git a/Jetcaster/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png b/Jetcaster/mobile/src/main/res/mipmap-xhdpi/ic_launcher_round.png similarity index 100% rename from Jetcaster/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png rename to Jetcaster/mobile/src/main/res/mipmap-xhdpi/ic_launcher_round.png diff --git a/Jetcaster/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/Jetcaster/mobile/src/main/res/mipmap-xxhdpi/ic_launcher.png similarity index 100% rename from Jetcaster/app/src/main/res/mipmap-xxhdpi/ic_launcher.png rename to Jetcaster/mobile/src/main/res/mipmap-xxhdpi/ic_launcher.png diff --git a/Jetcaster/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png b/Jetcaster/mobile/src/main/res/mipmap-xxhdpi/ic_launcher_round.png similarity index 100% rename from Jetcaster/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png rename to Jetcaster/mobile/src/main/res/mipmap-xxhdpi/ic_launcher_round.png diff --git a/Jetcaster/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/Jetcaster/mobile/src/main/res/mipmap-xxxhdpi/ic_launcher.png similarity index 100% rename from Jetcaster/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png rename to Jetcaster/mobile/src/main/res/mipmap-xxxhdpi/ic_launcher.png diff --git a/Jetcaster/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png b/Jetcaster/mobile/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png similarity index 100% rename from Jetcaster/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png rename to Jetcaster/mobile/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png diff --git a/Jetcaster/app/src/main/res/values/colors.xml b/Jetcaster/mobile/src/main/res/values/colors.xml similarity index 100% rename from Jetcaster/app/src/main/res/values/colors.xml rename to Jetcaster/mobile/src/main/res/values/colors.xml diff --git a/Jetcaster/app/src/main/res/values/strings.xml b/Jetcaster/mobile/src/main/res/values/strings.xml similarity index 100% rename from Jetcaster/app/src/main/res/values/strings.xml rename to Jetcaster/mobile/src/main/res/values/strings.xml diff --git a/Jetcaster/app/src/main/res/values/themes.xml b/Jetcaster/mobile/src/main/res/values/themes.xml similarity index 100% rename from Jetcaster/app/src/main/res/values/themes.xml rename to Jetcaster/mobile/src/main/res/values/themes.xml diff --git a/Jetcaster/settings.gradle.kts b/Jetcaster/settings.gradle.kts index a0016bc0dd..776f47b229 100644 --- a/Jetcaster/settings.gradle.kts +++ b/Jetcaster/settings.gradle.kts @@ -35,5 +35,5 @@ dependencyResolutionManagement { } } rootProject.name = "Jetcaster" -include(":app", ":core", ":core:model", ":designsystem", ":tv-app", ":wear") +include(":mobile", ":core", ":core:model", ":designsystem", ":tv-app", ":wear") enableFeaturePreview("TYPESAFE_PROJECT_ACCESSORS") From 07bdddcacf98c7a7cb8820d84e1a57aea6385aec Mon Sep 17 00:00:00 2001 From: Chris Arriola Date: Fri, 26 Apr 2024 10:14:57 -0700 Subject: [PATCH 2/2] Updating GH workflow. --- .github/workflows/Jetcaster.yaml | 1 + .github/workflows/build-sample.yml | 7 +++++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.github/workflows/Jetcaster.yaml b/.github/workflows/Jetcaster.yaml index a7fa5627f1..6e8d9859eb 100644 --- a/.github/workflows/Jetcaster.yaml +++ b/.github/workflows/Jetcaster.yaml @@ -19,3 +19,4 @@ jobs: with: name: Jetcaster path: Jetcaster + module: mobile diff --git a/.github/workflows/build-sample.yml b/.github/workflows/build-sample.yml index b1e03607b6..a8ac969dd6 100644 --- a/.github/workflows/build-sample.yml +++ b/.github/workflows/build-sample.yml @@ -9,6 +9,9 @@ on: path: required: true type: string + module: + default: "app" + type: string concurrency: group: ${{ inputs.name }}-build-${{ github.ref }} @@ -66,11 +69,11 @@ jobs: uses: actions/upload-artifact@v4 with: name: build-outputs - path: ${{ inputs.path }}/app/build/outputs + path: ${{ inputs.path }}/${{ inputs.module }}/build/outputs - name: Upload build reports if: always() uses: actions/upload-artifact@v4 with: name: build-reports - path: ${{ inputs.path }}/app/build/reports + path: ${{ inputs.path }}/${{ inputs.module }}/build/reports