From c35699280ef8d7c8d96f3a37feaf6066a1ab9416 Mon Sep 17 00:00:00 2001 From: madroid Date: Wed, 24 Aug 2022 23:29:56 +0800 Subject: [PATCH] Move 'feature-' module to feature subfolder --- app/build.gradle.kts | 10 +++++----- {feature-author => feature/author}/.gitignore | 0 {feature-author => feature/author}/build.gradle.kts | 0 .../nowinandroid/feature/author/AuthorScreenTest.kt | 0 .../author}/src/main/AndroidManifest.xml | 0 .../apps/nowinandroid/feature/author/AuthorScreen.kt | 0 .../nowinandroid/feature/author/AuthorViewModel.kt | 0 .../feature/author/navigation/AuthorNavigation.kt | 0 .../author}/src/main/res/values/strings.xml | 0 .../nowinandroid/feature/author/AuthorViewModelTest.kt | 0 {feature-bookmarks => feature/bookmarks}/.gitignore | 0 .../bookmarks}/build.gradle.kts | 0 .../feature/bookmarks/BookmarksScreenTest.kt | 0 .../bookmarks}/src/main/AndroidManifest.xml | 0 .../nowinandroid/feature/bookmarks/BookmarksScreen.kt | 0 .../feature/bookmarks/BookmarksViewModel.kt | 0 .../bookmarks/navigation/BookmarksNavigation.kt | 0 .../bookmarks}/src/main/res/values/strings.xml | 0 .../feature/bookmarks/BookmarksViewModelTest.kt | 0 {feature-foryou => feature/foryou}/.gitignore | 0 {feature-foryou => feature/foryou}/build.gradle.kts | 0 .../nowinandroid/feature/foryou/ForYouScreenTest.kt | 0 .../foryou}/src/main/AndroidManifest.xml | 0 .../nowinandroid/feature/foryou/AuthorsCarousel.kt | 0 .../feature/foryou/FollowedInterestsUiState.kt | 0 .../feature/foryou/ForYouInterestsSelectionUiState.kt | 0 .../apps/nowinandroid/feature/foryou/ForYouScreen.kt | 0 .../nowinandroid/feature/foryou/ForYouViewModel.kt | 0 .../feature/foryou/navigation/ForYouNavigation.kt | 0 .../src/main/res/drawable/ic_icon_placeholder.xml | 0 .../foryou}/src/main/res/values/strings.xml | 0 .../nowinandroid/feature/foryou/ForYouViewModelTest.kt | 0 {feature-interests => feature/interests}/.gitignore | 0 .../interests}/build.gradle.kts | 0 .../apps/nowinandroid/interests/InterestsScreenTest.kt | 0 .../interests}/src/main/AndroidManifest.xml | 0 .../nowinandroid/feature/interests/InterestsItem.kt | 0 .../nowinandroid/feature/interests/InterestsScreen.kt | 0 .../feature/interests/InterestsViewModel.kt | 0 .../apps/nowinandroid/feature/interests/TabContent.kt | 0 .../interests/navigation/InterestsNavigation.kt | 0 .../interests}/src/main/res/values/strings.xml | 0 .../nowinandroid/interests/InterestsViewModelTest.kt | 0 {feature-topic => feature/topic}/.gitignore | 0 {feature-topic => feature/topic}/build.gradle.kts | 0 .../apps/nowinandroid/feature/topic/TopicScreenTest.kt | 0 .../topic}/src/main/AndroidManifest.xml | 0 .../apps/nowinandroid/feature/topic/TopicScreen.kt | 0 .../apps/nowinandroid/feature/topic/TopicViewModel.kt | 0 .../feature/topic/navigation/TopicNavigation.kt | 0 .../topic}/src/main/res/values/strings.xml | 0 .../nowinandroid/feature/topic/TopicViewModelTest.kt | 0 settings.gradle.kts | 10 +++++----- 53 files changed, 10 insertions(+), 10 deletions(-) rename {feature-author => feature/author}/.gitignore (100%) rename {feature-author => feature/author}/build.gradle.kts (100%) rename {feature-author => feature/author}/src/androidTest/java/com/google/samples/apps/nowinandroid/feature/author/AuthorScreenTest.kt (100%) rename {feature-author => feature/author}/src/main/AndroidManifest.xml (100%) rename {feature-author => feature/author}/src/main/java/com/google/samples/apps/nowinandroid/feature/author/AuthorScreen.kt (100%) rename {feature-author => feature/author}/src/main/java/com/google/samples/apps/nowinandroid/feature/author/AuthorViewModel.kt (100%) rename {feature-author => feature/author}/src/main/java/com/google/samples/apps/nowinandroid/feature/author/navigation/AuthorNavigation.kt (100%) rename {feature-author => feature/author}/src/main/res/values/strings.xml (100%) rename {feature-author => feature/author}/src/test/java/com/google/samples/apps/nowinandroid/feature/author/AuthorViewModelTest.kt (100%) rename {feature-bookmarks => feature/bookmarks}/.gitignore (100%) rename {feature-bookmarks => feature/bookmarks}/build.gradle.kts (100%) rename {feature-bookmarks => feature/bookmarks}/src/androidTest/java/com/google/samples/apps/nowinandroid/feature/bookmarks/BookmarksScreenTest.kt (100%) rename {feature-bookmarks => feature/bookmarks}/src/main/AndroidManifest.xml (100%) rename {feature-bookmarks => feature/bookmarks}/src/main/java/com/google/samples/apps/nowinandroid/feature/bookmarks/BookmarksScreen.kt (100%) rename {feature-bookmarks => feature/bookmarks}/src/main/java/com/google/samples/apps/nowinandroid/feature/bookmarks/BookmarksViewModel.kt (100%) rename {feature-bookmarks => feature/bookmarks}/src/main/java/com/google/samples/apps/nowinandroid/feature/bookmarks/navigation/BookmarksNavigation.kt (100%) rename {feature-bookmarks => feature/bookmarks}/src/main/res/values/strings.xml (100%) rename {feature-bookmarks => feature/bookmarks}/src/test/java/com/google/samples/apps/nowinandroid/feature/bookmarks/BookmarksViewModelTest.kt (100%) rename {feature-foryou => feature/foryou}/.gitignore (100%) rename {feature-foryou => feature/foryou}/build.gradle.kts (100%) rename {feature-foryou => feature/foryou}/src/androidTest/java/com/google/samples/apps/nowinandroid/feature/foryou/ForYouScreenTest.kt (100%) rename {feature-foryou => feature/foryou}/src/main/AndroidManifest.xml (100%) rename {feature-foryou => feature/foryou}/src/main/java/com/google/samples/apps/nowinandroid/feature/foryou/AuthorsCarousel.kt (100%) rename {feature-foryou => feature/foryou}/src/main/java/com/google/samples/apps/nowinandroid/feature/foryou/FollowedInterestsUiState.kt (100%) rename {feature-foryou => feature/foryou}/src/main/java/com/google/samples/apps/nowinandroid/feature/foryou/ForYouInterestsSelectionUiState.kt (100%) rename {feature-foryou => feature/foryou}/src/main/java/com/google/samples/apps/nowinandroid/feature/foryou/ForYouScreen.kt (100%) rename {feature-foryou => feature/foryou}/src/main/java/com/google/samples/apps/nowinandroid/feature/foryou/ForYouViewModel.kt (100%) rename {feature-foryou => feature/foryou}/src/main/java/com/google/samples/apps/nowinandroid/feature/foryou/navigation/ForYouNavigation.kt (100%) rename {feature-foryou => feature/foryou}/src/main/res/drawable/ic_icon_placeholder.xml (100%) rename {feature-foryou => feature/foryou}/src/main/res/values/strings.xml (100%) rename {feature-foryou => feature/foryou}/src/test/java/com/google/samples/apps/nowinandroid/feature/foryou/ForYouViewModelTest.kt (100%) rename {feature-interests => feature/interests}/.gitignore (100%) rename {feature-interests => feature/interests}/build.gradle.kts (100%) rename {feature-interests => feature/interests}/src/androidTest/java/com/google/samples/apps/nowinandroid/interests/InterestsScreenTest.kt (100%) rename {feature-interests => feature/interests}/src/main/AndroidManifest.xml (100%) rename {feature-interests => feature/interests}/src/main/java/com/google/samples/apps/nowinandroid/feature/interests/InterestsItem.kt (100%) rename {feature-interests => feature/interests}/src/main/java/com/google/samples/apps/nowinandroid/feature/interests/InterestsScreen.kt (100%) rename {feature-interests => feature/interests}/src/main/java/com/google/samples/apps/nowinandroid/feature/interests/InterestsViewModel.kt (100%) rename {feature-interests => feature/interests}/src/main/java/com/google/samples/apps/nowinandroid/feature/interests/TabContent.kt (100%) rename {feature-interests => feature/interests}/src/main/java/com/google/samples/apps/nowinandroid/feature/interests/navigation/InterestsNavigation.kt (100%) rename {feature-interests => feature/interests}/src/main/res/values/strings.xml (100%) rename {feature-interests => feature/interests}/src/test/java/com/google/samples/apps/nowinandroid/interests/InterestsViewModelTest.kt (100%) rename {feature-topic => feature/topic}/.gitignore (100%) rename {feature-topic => feature/topic}/build.gradle.kts (100%) rename {feature-topic => feature/topic}/src/androidTest/java/com/google/samples/apps/nowinandroid/feature/topic/TopicScreenTest.kt (100%) rename {feature-topic => feature/topic}/src/main/AndroidManifest.xml (100%) rename {feature-topic => feature/topic}/src/main/java/com/google/samples/apps/nowinandroid/feature/topic/TopicScreen.kt (100%) rename {feature-topic => feature/topic}/src/main/java/com/google/samples/apps/nowinandroid/feature/topic/TopicViewModel.kt (100%) rename {feature-topic => feature/topic}/src/main/java/com/google/samples/apps/nowinandroid/feature/topic/navigation/TopicNavigation.kt (100%) rename {feature-topic => feature/topic}/src/main/res/values/strings.xml (100%) rename {feature-topic => feature/topic}/src/test/java/com/google/samples/apps/nowinandroid/feature/topic/TopicViewModelTest.kt (100%) diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 393353e78..3a3afce25 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -93,11 +93,11 @@ android { } dependencies { - implementation(project(":feature-author")) - implementation(project(":feature-interests")) - implementation(project(":feature-foryou")) - implementation(project(":feature-bookmarks")) - implementation(project(":feature-topic")) + implementation(project(":feature:author")) + implementation(project(":feature:interests")) + implementation(project(":feature:foryou")) + implementation(project(":feature:bookmarks")) + implementation(project(":feature:topic")) implementation(project(":core:ui")) implementation(project(":core:designsystem")) diff --git a/feature-author/.gitignore b/feature/author/.gitignore similarity index 100% rename from feature-author/.gitignore rename to feature/author/.gitignore diff --git a/feature-author/build.gradle.kts b/feature/author/build.gradle.kts similarity index 100% rename from feature-author/build.gradle.kts rename to feature/author/build.gradle.kts diff --git a/feature-author/src/androidTest/java/com/google/samples/apps/nowinandroid/feature/author/AuthorScreenTest.kt b/feature/author/src/androidTest/java/com/google/samples/apps/nowinandroid/feature/author/AuthorScreenTest.kt similarity index 100% rename from feature-author/src/androidTest/java/com/google/samples/apps/nowinandroid/feature/author/AuthorScreenTest.kt rename to feature/author/src/androidTest/java/com/google/samples/apps/nowinandroid/feature/author/AuthorScreenTest.kt diff --git a/feature-author/src/main/AndroidManifest.xml b/feature/author/src/main/AndroidManifest.xml similarity index 100% rename from feature-author/src/main/AndroidManifest.xml rename to feature/author/src/main/AndroidManifest.xml diff --git a/feature-author/src/main/java/com/google/samples/apps/nowinandroid/feature/author/AuthorScreen.kt b/feature/author/src/main/java/com/google/samples/apps/nowinandroid/feature/author/AuthorScreen.kt similarity index 100% rename from feature-author/src/main/java/com/google/samples/apps/nowinandroid/feature/author/AuthorScreen.kt rename to feature/author/src/main/java/com/google/samples/apps/nowinandroid/feature/author/AuthorScreen.kt diff --git a/feature-author/src/main/java/com/google/samples/apps/nowinandroid/feature/author/AuthorViewModel.kt b/feature/author/src/main/java/com/google/samples/apps/nowinandroid/feature/author/AuthorViewModel.kt similarity index 100% rename from feature-author/src/main/java/com/google/samples/apps/nowinandroid/feature/author/AuthorViewModel.kt rename to feature/author/src/main/java/com/google/samples/apps/nowinandroid/feature/author/AuthorViewModel.kt diff --git a/feature-author/src/main/java/com/google/samples/apps/nowinandroid/feature/author/navigation/AuthorNavigation.kt b/feature/author/src/main/java/com/google/samples/apps/nowinandroid/feature/author/navigation/AuthorNavigation.kt similarity index 100% rename from feature-author/src/main/java/com/google/samples/apps/nowinandroid/feature/author/navigation/AuthorNavigation.kt rename to feature/author/src/main/java/com/google/samples/apps/nowinandroid/feature/author/navigation/AuthorNavigation.kt diff --git a/feature-author/src/main/res/values/strings.xml b/feature/author/src/main/res/values/strings.xml similarity index 100% rename from feature-author/src/main/res/values/strings.xml rename to feature/author/src/main/res/values/strings.xml diff --git a/feature-author/src/test/java/com/google/samples/apps/nowinandroid/feature/author/AuthorViewModelTest.kt b/feature/author/src/test/java/com/google/samples/apps/nowinandroid/feature/author/AuthorViewModelTest.kt similarity index 100% rename from feature-author/src/test/java/com/google/samples/apps/nowinandroid/feature/author/AuthorViewModelTest.kt rename to feature/author/src/test/java/com/google/samples/apps/nowinandroid/feature/author/AuthorViewModelTest.kt diff --git a/feature-bookmarks/.gitignore b/feature/bookmarks/.gitignore similarity index 100% rename from feature-bookmarks/.gitignore rename to feature/bookmarks/.gitignore diff --git a/feature-bookmarks/build.gradle.kts b/feature/bookmarks/build.gradle.kts similarity index 100% rename from feature-bookmarks/build.gradle.kts rename to feature/bookmarks/build.gradle.kts diff --git a/feature-bookmarks/src/androidTest/java/com/google/samples/apps/nowinandroid/feature/bookmarks/BookmarksScreenTest.kt b/feature/bookmarks/src/androidTest/java/com/google/samples/apps/nowinandroid/feature/bookmarks/BookmarksScreenTest.kt similarity index 100% rename from feature-bookmarks/src/androidTest/java/com/google/samples/apps/nowinandroid/feature/bookmarks/BookmarksScreenTest.kt rename to feature/bookmarks/src/androidTest/java/com/google/samples/apps/nowinandroid/feature/bookmarks/BookmarksScreenTest.kt diff --git a/feature-bookmarks/src/main/AndroidManifest.xml b/feature/bookmarks/src/main/AndroidManifest.xml similarity index 100% rename from feature-bookmarks/src/main/AndroidManifest.xml rename to feature/bookmarks/src/main/AndroidManifest.xml diff --git a/feature-bookmarks/src/main/java/com/google/samples/apps/nowinandroid/feature/bookmarks/BookmarksScreen.kt b/feature/bookmarks/src/main/java/com/google/samples/apps/nowinandroid/feature/bookmarks/BookmarksScreen.kt similarity index 100% rename from feature-bookmarks/src/main/java/com/google/samples/apps/nowinandroid/feature/bookmarks/BookmarksScreen.kt rename to feature/bookmarks/src/main/java/com/google/samples/apps/nowinandroid/feature/bookmarks/BookmarksScreen.kt diff --git a/feature-bookmarks/src/main/java/com/google/samples/apps/nowinandroid/feature/bookmarks/BookmarksViewModel.kt b/feature/bookmarks/src/main/java/com/google/samples/apps/nowinandroid/feature/bookmarks/BookmarksViewModel.kt similarity index 100% rename from feature-bookmarks/src/main/java/com/google/samples/apps/nowinandroid/feature/bookmarks/BookmarksViewModel.kt rename to feature/bookmarks/src/main/java/com/google/samples/apps/nowinandroid/feature/bookmarks/BookmarksViewModel.kt diff --git a/feature-bookmarks/src/main/java/com/google/samples/apps/nowinandroid/feature/bookmarks/navigation/BookmarksNavigation.kt b/feature/bookmarks/src/main/java/com/google/samples/apps/nowinandroid/feature/bookmarks/navigation/BookmarksNavigation.kt similarity index 100% rename from feature-bookmarks/src/main/java/com/google/samples/apps/nowinandroid/feature/bookmarks/navigation/BookmarksNavigation.kt rename to feature/bookmarks/src/main/java/com/google/samples/apps/nowinandroid/feature/bookmarks/navigation/BookmarksNavigation.kt diff --git a/feature-bookmarks/src/main/res/values/strings.xml b/feature/bookmarks/src/main/res/values/strings.xml similarity index 100% rename from feature-bookmarks/src/main/res/values/strings.xml rename to feature/bookmarks/src/main/res/values/strings.xml diff --git a/feature-bookmarks/src/test/java/com/google/samples/apps/nowinandroid/feature/bookmarks/BookmarksViewModelTest.kt b/feature/bookmarks/src/test/java/com/google/samples/apps/nowinandroid/feature/bookmarks/BookmarksViewModelTest.kt similarity index 100% rename from feature-bookmarks/src/test/java/com/google/samples/apps/nowinandroid/feature/bookmarks/BookmarksViewModelTest.kt rename to feature/bookmarks/src/test/java/com/google/samples/apps/nowinandroid/feature/bookmarks/BookmarksViewModelTest.kt diff --git a/feature-foryou/.gitignore b/feature/foryou/.gitignore similarity index 100% rename from feature-foryou/.gitignore rename to feature/foryou/.gitignore diff --git a/feature-foryou/build.gradle.kts b/feature/foryou/build.gradle.kts similarity index 100% rename from feature-foryou/build.gradle.kts rename to feature/foryou/build.gradle.kts diff --git a/feature-foryou/src/androidTest/java/com/google/samples/apps/nowinandroid/feature/foryou/ForYouScreenTest.kt b/feature/foryou/src/androidTest/java/com/google/samples/apps/nowinandroid/feature/foryou/ForYouScreenTest.kt similarity index 100% rename from feature-foryou/src/androidTest/java/com/google/samples/apps/nowinandroid/feature/foryou/ForYouScreenTest.kt rename to feature/foryou/src/androidTest/java/com/google/samples/apps/nowinandroid/feature/foryou/ForYouScreenTest.kt diff --git a/feature-foryou/src/main/AndroidManifest.xml b/feature/foryou/src/main/AndroidManifest.xml similarity index 100% rename from feature-foryou/src/main/AndroidManifest.xml rename to feature/foryou/src/main/AndroidManifest.xml diff --git a/feature-foryou/src/main/java/com/google/samples/apps/nowinandroid/feature/foryou/AuthorsCarousel.kt b/feature/foryou/src/main/java/com/google/samples/apps/nowinandroid/feature/foryou/AuthorsCarousel.kt similarity index 100% rename from feature-foryou/src/main/java/com/google/samples/apps/nowinandroid/feature/foryou/AuthorsCarousel.kt rename to feature/foryou/src/main/java/com/google/samples/apps/nowinandroid/feature/foryou/AuthorsCarousel.kt diff --git a/feature-foryou/src/main/java/com/google/samples/apps/nowinandroid/feature/foryou/FollowedInterestsUiState.kt b/feature/foryou/src/main/java/com/google/samples/apps/nowinandroid/feature/foryou/FollowedInterestsUiState.kt similarity index 100% rename from feature-foryou/src/main/java/com/google/samples/apps/nowinandroid/feature/foryou/FollowedInterestsUiState.kt rename to feature/foryou/src/main/java/com/google/samples/apps/nowinandroid/feature/foryou/FollowedInterestsUiState.kt diff --git a/feature-foryou/src/main/java/com/google/samples/apps/nowinandroid/feature/foryou/ForYouInterestsSelectionUiState.kt b/feature/foryou/src/main/java/com/google/samples/apps/nowinandroid/feature/foryou/ForYouInterestsSelectionUiState.kt similarity index 100% rename from feature-foryou/src/main/java/com/google/samples/apps/nowinandroid/feature/foryou/ForYouInterestsSelectionUiState.kt rename to feature/foryou/src/main/java/com/google/samples/apps/nowinandroid/feature/foryou/ForYouInterestsSelectionUiState.kt diff --git a/feature-foryou/src/main/java/com/google/samples/apps/nowinandroid/feature/foryou/ForYouScreen.kt b/feature/foryou/src/main/java/com/google/samples/apps/nowinandroid/feature/foryou/ForYouScreen.kt similarity index 100% rename from feature-foryou/src/main/java/com/google/samples/apps/nowinandroid/feature/foryou/ForYouScreen.kt rename to feature/foryou/src/main/java/com/google/samples/apps/nowinandroid/feature/foryou/ForYouScreen.kt diff --git a/feature-foryou/src/main/java/com/google/samples/apps/nowinandroid/feature/foryou/ForYouViewModel.kt b/feature/foryou/src/main/java/com/google/samples/apps/nowinandroid/feature/foryou/ForYouViewModel.kt similarity index 100% rename from feature-foryou/src/main/java/com/google/samples/apps/nowinandroid/feature/foryou/ForYouViewModel.kt rename to feature/foryou/src/main/java/com/google/samples/apps/nowinandroid/feature/foryou/ForYouViewModel.kt diff --git a/feature-foryou/src/main/java/com/google/samples/apps/nowinandroid/feature/foryou/navigation/ForYouNavigation.kt b/feature/foryou/src/main/java/com/google/samples/apps/nowinandroid/feature/foryou/navigation/ForYouNavigation.kt similarity index 100% rename from feature-foryou/src/main/java/com/google/samples/apps/nowinandroid/feature/foryou/navigation/ForYouNavigation.kt rename to feature/foryou/src/main/java/com/google/samples/apps/nowinandroid/feature/foryou/navigation/ForYouNavigation.kt diff --git a/feature-foryou/src/main/res/drawable/ic_icon_placeholder.xml b/feature/foryou/src/main/res/drawable/ic_icon_placeholder.xml similarity index 100% rename from feature-foryou/src/main/res/drawable/ic_icon_placeholder.xml rename to feature/foryou/src/main/res/drawable/ic_icon_placeholder.xml diff --git a/feature-foryou/src/main/res/values/strings.xml b/feature/foryou/src/main/res/values/strings.xml similarity index 100% rename from feature-foryou/src/main/res/values/strings.xml rename to feature/foryou/src/main/res/values/strings.xml diff --git a/feature-foryou/src/test/java/com/google/samples/apps/nowinandroid/feature/foryou/ForYouViewModelTest.kt b/feature/foryou/src/test/java/com/google/samples/apps/nowinandroid/feature/foryou/ForYouViewModelTest.kt similarity index 100% rename from feature-foryou/src/test/java/com/google/samples/apps/nowinandroid/feature/foryou/ForYouViewModelTest.kt rename to feature/foryou/src/test/java/com/google/samples/apps/nowinandroid/feature/foryou/ForYouViewModelTest.kt diff --git a/feature-interests/.gitignore b/feature/interests/.gitignore similarity index 100% rename from feature-interests/.gitignore rename to feature/interests/.gitignore diff --git a/feature-interests/build.gradle.kts b/feature/interests/build.gradle.kts similarity index 100% rename from feature-interests/build.gradle.kts rename to feature/interests/build.gradle.kts diff --git a/feature-interests/src/androidTest/java/com/google/samples/apps/nowinandroid/interests/InterestsScreenTest.kt b/feature/interests/src/androidTest/java/com/google/samples/apps/nowinandroid/interests/InterestsScreenTest.kt similarity index 100% rename from feature-interests/src/androidTest/java/com/google/samples/apps/nowinandroid/interests/InterestsScreenTest.kt rename to feature/interests/src/androidTest/java/com/google/samples/apps/nowinandroid/interests/InterestsScreenTest.kt diff --git a/feature-interests/src/main/AndroidManifest.xml b/feature/interests/src/main/AndroidManifest.xml similarity index 100% rename from feature-interests/src/main/AndroidManifest.xml rename to feature/interests/src/main/AndroidManifest.xml diff --git a/feature-interests/src/main/java/com/google/samples/apps/nowinandroid/feature/interests/InterestsItem.kt b/feature/interests/src/main/java/com/google/samples/apps/nowinandroid/feature/interests/InterestsItem.kt similarity index 100% rename from feature-interests/src/main/java/com/google/samples/apps/nowinandroid/feature/interests/InterestsItem.kt rename to feature/interests/src/main/java/com/google/samples/apps/nowinandroid/feature/interests/InterestsItem.kt diff --git a/feature-interests/src/main/java/com/google/samples/apps/nowinandroid/feature/interests/InterestsScreen.kt b/feature/interests/src/main/java/com/google/samples/apps/nowinandroid/feature/interests/InterestsScreen.kt similarity index 100% rename from feature-interests/src/main/java/com/google/samples/apps/nowinandroid/feature/interests/InterestsScreen.kt rename to feature/interests/src/main/java/com/google/samples/apps/nowinandroid/feature/interests/InterestsScreen.kt diff --git a/feature-interests/src/main/java/com/google/samples/apps/nowinandroid/feature/interests/InterestsViewModel.kt b/feature/interests/src/main/java/com/google/samples/apps/nowinandroid/feature/interests/InterestsViewModel.kt similarity index 100% rename from feature-interests/src/main/java/com/google/samples/apps/nowinandroid/feature/interests/InterestsViewModel.kt rename to feature/interests/src/main/java/com/google/samples/apps/nowinandroid/feature/interests/InterestsViewModel.kt diff --git a/feature-interests/src/main/java/com/google/samples/apps/nowinandroid/feature/interests/TabContent.kt b/feature/interests/src/main/java/com/google/samples/apps/nowinandroid/feature/interests/TabContent.kt similarity index 100% rename from feature-interests/src/main/java/com/google/samples/apps/nowinandroid/feature/interests/TabContent.kt rename to feature/interests/src/main/java/com/google/samples/apps/nowinandroid/feature/interests/TabContent.kt diff --git a/feature-interests/src/main/java/com/google/samples/apps/nowinandroid/feature/interests/navigation/InterestsNavigation.kt b/feature/interests/src/main/java/com/google/samples/apps/nowinandroid/feature/interests/navigation/InterestsNavigation.kt similarity index 100% rename from feature-interests/src/main/java/com/google/samples/apps/nowinandroid/feature/interests/navigation/InterestsNavigation.kt rename to feature/interests/src/main/java/com/google/samples/apps/nowinandroid/feature/interests/navigation/InterestsNavigation.kt diff --git a/feature-interests/src/main/res/values/strings.xml b/feature/interests/src/main/res/values/strings.xml similarity index 100% rename from feature-interests/src/main/res/values/strings.xml rename to feature/interests/src/main/res/values/strings.xml diff --git a/feature-interests/src/test/java/com/google/samples/apps/nowinandroid/interests/InterestsViewModelTest.kt b/feature/interests/src/test/java/com/google/samples/apps/nowinandroid/interests/InterestsViewModelTest.kt similarity index 100% rename from feature-interests/src/test/java/com/google/samples/apps/nowinandroid/interests/InterestsViewModelTest.kt rename to feature/interests/src/test/java/com/google/samples/apps/nowinandroid/interests/InterestsViewModelTest.kt diff --git a/feature-topic/.gitignore b/feature/topic/.gitignore similarity index 100% rename from feature-topic/.gitignore rename to feature/topic/.gitignore diff --git a/feature-topic/build.gradle.kts b/feature/topic/build.gradle.kts similarity index 100% rename from feature-topic/build.gradle.kts rename to feature/topic/build.gradle.kts diff --git a/feature-topic/src/androidTest/java/com/google/samples/apps/nowinandroid/feature/topic/TopicScreenTest.kt b/feature/topic/src/androidTest/java/com/google/samples/apps/nowinandroid/feature/topic/TopicScreenTest.kt similarity index 100% rename from feature-topic/src/androidTest/java/com/google/samples/apps/nowinandroid/feature/topic/TopicScreenTest.kt rename to feature/topic/src/androidTest/java/com/google/samples/apps/nowinandroid/feature/topic/TopicScreenTest.kt diff --git a/feature-topic/src/main/AndroidManifest.xml b/feature/topic/src/main/AndroidManifest.xml similarity index 100% rename from feature-topic/src/main/AndroidManifest.xml rename to feature/topic/src/main/AndroidManifest.xml diff --git a/feature-topic/src/main/java/com/google/samples/apps/nowinandroid/feature/topic/TopicScreen.kt b/feature/topic/src/main/java/com/google/samples/apps/nowinandroid/feature/topic/TopicScreen.kt similarity index 100% rename from feature-topic/src/main/java/com/google/samples/apps/nowinandroid/feature/topic/TopicScreen.kt rename to feature/topic/src/main/java/com/google/samples/apps/nowinandroid/feature/topic/TopicScreen.kt diff --git a/feature-topic/src/main/java/com/google/samples/apps/nowinandroid/feature/topic/TopicViewModel.kt b/feature/topic/src/main/java/com/google/samples/apps/nowinandroid/feature/topic/TopicViewModel.kt similarity index 100% rename from feature-topic/src/main/java/com/google/samples/apps/nowinandroid/feature/topic/TopicViewModel.kt rename to feature/topic/src/main/java/com/google/samples/apps/nowinandroid/feature/topic/TopicViewModel.kt diff --git a/feature-topic/src/main/java/com/google/samples/apps/nowinandroid/feature/topic/navigation/TopicNavigation.kt b/feature/topic/src/main/java/com/google/samples/apps/nowinandroid/feature/topic/navigation/TopicNavigation.kt similarity index 100% rename from feature-topic/src/main/java/com/google/samples/apps/nowinandroid/feature/topic/navigation/TopicNavigation.kt rename to feature/topic/src/main/java/com/google/samples/apps/nowinandroid/feature/topic/navigation/TopicNavigation.kt diff --git a/feature-topic/src/main/res/values/strings.xml b/feature/topic/src/main/res/values/strings.xml similarity index 100% rename from feature-topic/src/main/res/values/strings.xml rename to feature/topic/src/main/res/values/strings.xml diff --git a/feature-topic/src/test/java/com/google/samples/apps/nowinandroid/feature/topic/TopicViewModelTest.kt b/feature/topic/src/test/java/com/google/samples/apps/nowinandroid/feature/topic/TopicViewModelTest.kt similarity index 100% rename from feature-topic/src/test/java/com/google/samples/apps/nowinandroid/feature/topic/TopicViewModelTest.kt rename to feature/topic/src/test/java/com/google/samples/apps/nowinandroid/feature/topic/TopicViewModelTest.kt diff --git a/settings.gradle.kts b/settings.gradle.kts index 30eccde47..69a374739 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -55,10 +55,10 @@ include(":core:navigation") include(":core:network") include(":core:ui") include(":core:testing") -include(":feature-author") -include(":feature-foryou") -include(":feature-interests") -include(":feature-bookmarks") -include(":feature-topic") +include(":feature:author") +include(":feature:foryou") +include(":feature:interests") +include(":feature:bookmarks") +include(":feature:topic") include(":lint") include(":sync")