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.ktsindex 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/.gitignoresimilarity index 100%rename from feature-author/.gitignorerename to feature/author/.gitignorediff --git a/feature-author/build.gradle.kts b/feature/author/build.gradle.ktssimilarity index 100%rename from feature-author/build.gradle.ktsrename to feature/author/build.gradle.ktsdiff --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.ktsimilarity index 100%rename from feature-author/src/androidTest/java/com/google/samples/apps/nowinandroid/feature/author/AuthorScreenTest.ktrename to feature/author/src/androidTest/java/com/google/samples/apps/nowinandroid/feature/author/AuthorScreenTest.ktdiff --git a/feature-author/src/main/AndroidManifest.xml b/feature/author/src/main/AndroidManifest.xmlsimilarity index 100%rename from feature-author/src/main/AndroidManifest.xmlrename to feature/author/src/main/AndroidManifest.xmldiff --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.ktsimilarity index 100%rename from feature-author/src/main/java/com/google/samples/apps/nowinandroid/feature/author/AuthorScreen.ktrename to feature/author/src/main/java/com/google/samples/apps/nowinandroid/feature/author/AuthorScreen.ktdiff --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.ktsimilarity index 100%rename from feature-author/src/main/java/com/google/samples/apps/nowinandroid/feature/author/AuthorViewModel.ktrename to feature/author/src/main/java/com/google/samples/apps/nowinandroid/feature/author/AuthorViewModel.ktdiff --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.ktsimilarity index 100%rename from feature-author/src/main/java/com/google/samples/apps/nowinandroid/feature/author/navigation/AuthorNavigation.ktrename to feature/author/src/main/java/com/google/samples/apps/nowinandroid/feature/author/navigation/AuthorNavigation.ktdiff --git a/feature-author/src/main/res/values/strings.xml b/feature/author/src/main/res/values/strings.xmlsimilarity index 100%rename from feature-author/src/main/res/values/strings.xmlrename to feature/author/src/main/res/values/strings.xmldiff --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.ktsimilarity index 100%rename from feature-author/src/test/java/com/google/samples/apps/nowinandroid/feature/author/AuthorViewModelTest.ktrename to feature/author/src/test/java/com/google/samples/apps/nowinandroid/feature/author/AuthorViewModelTest.ktdiff --git a/feature-bookmarks/.gitignore b/feature/bookmarks/.gitignoresimilarity index 100%rename from feature-bookmarks/.gitignorerename to feature/bookmarks/.gitignorediff --git a/feature-bookmarks/build.gradle.kts b/feature/bookmarks/build.gradle.ktssimilarity index 100%rename from feature-bookmarks/build.gradle.ktsrename to feature/bookmarks/build.gradle.ktsdiff --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.ktsimilarity index 100%rename from feature-bookmarks/src/androidTest/java/com/google/samples/apps/nowinandroid/feature/bookmarks/BookmarksScreenTest.ktrename to feature/bookmarks/src/androidTest/java/com/google/samples/apps/nowinandroid/feature/bookmarks/BookmarksScreenTest.ktdiff --git a/feature-bookmarks/src/main/AndroidManifest.xml b/feature/bookmarks/src/main/AndroidManifest.xmlsimilarity index 100%rename from feature-bookmarks/src/main/AndroidManifest.xmlrename to feature/bookmarks/src/main/AndroidManifest.xmldiff --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.ktsimilarity index 100%rename from feature-bookmarks/src/main/java/com/google/samples/apps/nowinandroid/feature/bookmarks/BookmarksScreen.ktrename to feature/bookmarks/src/main/java/com/google/samples/apps/nowinandroid/feature/bookmarks/BookmarksScreen.ktdiff --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.ktsimilarity index 100%rename from feature-bookmarks/src/main/java/com/google/samples/apps/nowinandroid/feature/bookmarks/BookmarksViewModel.ktrename to feature/bookmarks/src/main/java/com/google/samples/apps/nowinandroid/feature/bookmarks/BookmarksViewModel.ktdiff --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.ktsimilarity index 100%rename from feature-bookmarks/src/main/java/com/google/samples/apps/nowinandroid/feature/bookmarks/navigation/BookmarksNavigation.ktrename to feature/bookmarks/src/main/java/com/google/samples/apps/nowinandroid/feature/bookmarks/navigation/BookmarksNavigation.ktdiff --git a/feature-bookmarks/src/main/res/values/strings.xml b/feature/bookmarks/src/main/res/values/strings.xmlsimilarity index 100%rename from feature-bookmarks/src/main/res/values/strings.xmlrename to feature/bookmarks/src/main/res/values/strings.xmldiff --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.ktsimilarity index 100%rename from feature-bookmarks/src/test/java/com/google/samples/apps/nowinandroid/feature/bookmarks/BookmarksViewModelTest.ktrename to feature/bookmarks/src/test/java/com/google/samples/apps/nowinandroid/feature/bookmarks/BookmarksViewModelTest.ktdiff --git a/feature-foryou/.gitignore b/feature/foryou/.gitignoresimilarity index 100%rename from feature-foryou/.gitignorerename to feature/foryou/.gitignorediff --git a/feature-foryou/build.gradle.kts b/feature/foryou/build.gradle.ktssimilarity index 100%rename from feature-foryou/build.gradle.ktsrename to feature/foryou/build.gradle.ktsdiff --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.ktsimilarity index 100%rename from feature-foryou/src/androidTest/java/com/google/samples/apps/nowinandroid/feature/foryou/ForYouScreenTest.ktrename to feature/foryou/src/androidTest/java/com/google/samples/apps/nowinandroid/feature/foryou/ForYouScreenTest.ktdiff --git a/feature-foryou/src/main/AndroidManifest.xml b/feature/foryou/src/main/AndroidManifest.xmlsimilarity index 100%rename from feature-foryou/src/main/AndroidManifest.xmlrename to feature/foryou/src/main/AndroidManifest.xmldiff --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.ktsimilarity index 100%rename from feature-foryou/src/main/java/com/google/samples/apps/nowinandroid/feature/foryou/AuthorsCarousel.ktrename to feature/foryou/src/main/java/com/google/samples/apps/nowinandroid/feature/foryou/AuthorsCarousel.ktdiff --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.ktsimilarity index 100%rename from feature-foryou/src/main/java/com/google/samples/apps/nowinandroid/feature/foryou/FollowedInterestsUiState.ktrename to feature/foryou/src/main/java/com/google/samples/apps/nowinandroid/feature/foryou/FollowedInterestsUiState.ktdiff --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.ktsimilarity index 100%rename from feature-foryou/src/main/java/com/google/samples/apps/nowinandroid/feature/foryou/ForYouInterestsSelectionUiState.ktrename to feature/foryou/src/main/java/com/google/samples/apps/nowinandroid/feature/foryou/ForYouInterestsSelectionUiState.ktdiff --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.ktsimilarity index 100%rename from feature-foryou/src/main/java/com/google/samples/apps/nowinandroid/feature/foryou/ForYouScreen.ktrename to feature/foryou/src/main/java/com/google/samples/apps/nowinandroid/feature/foryou/ForYouScreen.ktdiff --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.ktsimilarity index 100%rename from feature-foryou/src/main/java/com/google/samples/apps/nowinandroid/feature/foryou/ForYouViewModel.ktrename to feature/foryou/src/main/java/com/google/samples/apps/nowinandroid/feature/foryou/ForYouViewModel.ktdiff --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.ktsimilarity index 100%rename from feature-foryou/src/main/java/com/google/samples/apps/nowinandroid/feature/foryou/navigation/ForYouNavigation.ktrename to feature/foryou/src/main/java/com/google/samples/apps/nowinandroid/feature/foryou/navigation/ForYouNavigation.ktdiff --git a/feature-foryou/src/main/res/drawable/ic_icon_placeholder.xml b/feature/foryou/src/main/res/drawable/ic_icon_placeholder.xmlsimilarity index 100%rename from feature-foryou/src/main/res/drawable/ic_icon_placeholder.xmlrename to feature/foryou/src/main/res/drawable/ic_icon_placeholder.xmldiff --git a/feature-foryou/src/main/res/values/strings.xml b/feature/foryou/src/main/res/values/strings.xmlsimilarity index 100%rename from feature-foryou/src/main/res/values/strings.xmlrename to feature/foryou/src/main/res/values/strings.xmldiff --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.ktsimilarity index 100%rename from feature-foryou/src/test/java/com/google/samples/apps/nowinandroid/feature/foryou/ForYouViewModelTest.ktrename to feature/foryou/src/test/java/com/google/samples/apps/nowinandroid/feature/foryou/ForYouViewModelTest.ktdiff --git a/feature-interests/.gitignore b/feature/interests/.gitignoresimilarity index 100%rename from feature-interests/.gitignorerename to feature/interests/.gitignorediff --git a/feature-interests/build.gradle.kts b/feature/interests/build.gradle.ktssimilarity index 100%rename from feature-interests/build.gradle.ktsrename to feature/interests/build.gradle.ktsdiff --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.ktsimilarity index 100%rename from feature-interests/src/androidTest/java/com/google/samples/apps/nowinandroid/interests/InterestsScreenTest.ktrename to feature/interests/src/androidTest/java/com/google/samples/apps/nowinandroid/interests/InterestsScreenTest.ktdiff --git a/feature-interests/src/main/AndroidManifest.xml b/feature/interests/src/main/AndroidManifest.xmlsimilarity index 100%rename from feature-interests/src/main/AndroidManifest.xmlrename to feature/interests/src/main/AndroidManifest.xmldiff --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.ktsimilarity index 100%rename from feature-interests/src/main/java/com/google/samples/apps/nowinandroid/feature/interests/InterestsItem.ktrename to feature/interests/src/main/java/com/google/samples/apps/nowinandroid/feature/interests/InterestsItem.ktdiff --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.ktsimilarity index 100%rename from feature-interests/src/main/java/com/google/samples/apps/nowinandroid/feature/interests/InterestsScreen.ktrename to feature/interests/src/main/java/com/google/samples/apps/nowinandroid/feature/interests/InterestsScreen.ktdiff --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.ktsimilarity index 100%rename from feature-interests/src/main/java/com/google/samples/apps/nowinandroid/feature/interests/InterestsViewModel.ktrename to feature/interests/src/main/java/com/google/samples/apps/nowinandroid/feature/interests/InterestsViewModel.ktdiff --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.ktsimilarity index 100%rename from feature-interests/src/main/java/com/google/samples/apps/nowinandroid/feature/interests/TabContent.ktrename to feature/interests/src/main/java/com/google/samples/apps/nowinandroid/feature/interests/TabContent.ktdiff --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.ktsimilarity index 100%rename from feature-interests/src/main/java/com/google/samples/apps/nowinandroid/feature/interests/navigation/InterestsNavigation.ktrename to feature/interests/src/main/java/com/google/samples/apps/nowinandroid/feature/interests/navigation/InterestsNavigation.ktdiff --git a/feature-interests/src/main/res/values/strings.xml b/feature/interests/src/main/res/values/strings.xmlsimilarity index 100%rename from feature-interests/src/main/res/values/strings.xmlrename to feature/interests/src/main/res/values/strings.xmldiff --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.ktsimilarity index 100%rename from feature-interests/src/test/java/com/google/samples/apps/nowinandroid/interests/InterestsViewModelTest.ktrename to feature/interests/src/test/java/com/google/samples/apps/nowinandroid/interests/InterestsViewModelTest.ktdiff --git a/feature-topic/.gitignore b/feature/topic/.gitignoresimilarity index 100%rename from feature-topic/.gitignorerename to feature/topic/.gitignorediff --git a/feature-topic/build.gradle.kts b/feature/topic/build.gradle.ktssimilarity index 100%rename from feature-topic/build.gradle.ktsrename to feature/topic/build.gradle.ktsdiff --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.ktsimilarity index 100%rename from feature-topic/src/androidTest/java/com/google/samples/apps/nowinandroid/feature/topic/TopicScreenTest.ktrename to feature/topic/src/androidTest/java/com/google/samples/apps/nowinandroid/feature/topic/TopicScreenTest.ktdiff --git a/feature-topic/src/main/AndroidManifest.xml b/feature/topic/src/main/AndroidManifest.xmlsimilarity index 100%rename from feature-topic/src/main/AndroidManifest.xmlrename to feature/topic/src/main/AndroidManifest.xmldiff --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.ktsimilarity index 100%rename from feature-topic/src/main/java/com/google/samples/apps/nowinandroid/feature/topic/TopicScreen.ktrename to feature/topic/src/main/java/com/google/samples/apps/nowinandroid/feature/topic/TopicScreen.ktdiff --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.ktsimilarity index 100%rename from feature-topic/src/main/java/com/google/samples/apps/nowinandroid/feature/topic/TopicViewModel.ktrename to feature/topic/src/main/java/com/google/samples/apps/nowinandroid/feature/topic/TopicViewModel.ktdiff --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.ktsimilarity index 100%rename from feature-topic/src/main/java/com/google/samples/apps/nowinandroid/feature/topic/navigation/TopicNavigation.ktrename to feature/topic/src/main/java/com/google/samples/apps/nowinandroid/feature/topic/navigation/TopicNavigation.ktdiff --git a/feature-topic/src/main/res/values/strings.xml b/feature/topic/src/main/res/values/strings.xmlsimilarity index 100%rename from feature-topic/src/main/res/values/strings.xmlrename to feature/topic/src/main/res/values/strings.xmldiff --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.ktsimilarity index 100%rename from feature-topic/src/test/java/com/google/samples/apps/nowinandroid/feature/topic/TopicViewModelTest.ktrename to feature/topic/src/test/java/com/google/samples/apps/nowinandroid/feature/topic/TopicViewModelTest.ktdiff --git a/settings.gradle.kts b/settings.gradle.ktsindex 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")