Skip to content

A fully functional Android app built entirely with Kotlin and Jetpack Compose

Move 'feature-' module to feature subfolder

madroidc35699280ef8
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")