A fully functional Android app built entirely with Kotlin and Jetpack Compose
Split feature modules into api and impl modules
Clara Fok068d8cc93c52
diff --git a/app/build.gradle.kts b/app/build.gradle.ktsindex 09005606b..627be6727 100644--- a/app/build.gradle.kts+++ b/app/build.gradle.kts@@ -68,12 +68,12 @@ android {}dependencies {- implementation(projects.feature.interests)- implementation(projects.feature.foryou)- implementation(projects.feature.bookmarks)- implementation(projects.feature.topic)- implementation(projects.feature.search)- implementation(projects.feature.settings)+ implementation(projects.feature.interests.api)+ implementation(projects.feature.foryou.api)+ implementation(projects.feature.bookmarks.api)+ implementation(projects.feature.topic.api)+ implementation(projects.feature.search.api)+ implementation(projects.feature.settings.api)implementation(projects.core.common)implementation(projects.core.ui)diff --git a/app/src/androidTest/kotlin/com/google/samples/apps/nowinandroid/ui/NavigationTest.kt b/app/src/androidTest/kotlin/com/google/samples/apps/nowinandroid/ui/NavigationTest.ktindex 54053a1bb..8d479e3b1 100644--- a/app/src/androidTest/kotlin/com/google/samples/apps/nowinandroid/ui/NavigationTest.kt+++ b/app/src/androidTest/kotlin/com/google/samples/apps/nowinandroid/ui/NavigationTest.kt@@ -47,10 +47,10 @@ import org.junit.Beforeimport org.junit.Ruleimport org.junit.Testimport javax.inject.Inject-import com.google.samples.apps.nowinandroid.feature.bookmarks.R as BookmarksR-import com.google.samples.apps.nowinandroid.feature.foryou.R as FeatureForyouR-import com.google.samples.apps.nowinandroid.feature.search.R as FeatureSearchR-import com.google.samples.apps.nowinandroid.feature.settings.R as SettingsR+import com.google.samples.apps.nowinandroid.feature.bookmarks.api.R as BookmarksR+import com.google.samples.apps.nowinandroid.feature.foryou.api.R as FeatureForyouR+import com.google.samples.apps.nowinandroid.feature.search.api.R as FeatureSearchR+import com.google.samples.apps.nowinandroid.feature.settings.api.R as SettingsR/*** Tests all the navigation flows that are handled by the navigation library.@@ -83,8 +83,8 @@ class NavigationTest {lateinit var newsRepository: NewsRepository// The strings used for matching in these tests- private val navigateUp by composeTestRule.stringResource(FeatureForyouR.string.feature_foryou_navigate_up)- private val forYou by composeTestRule.stringResource(FeatureForyouR.string.feature_foryou_title)+ private val navigateUp by composeTestRule.stringResource(FeatureForyouR.string.feature_foryou_api_navigate_up)+ private val forYou by composeTestRule.stringResource(FeatureForyouR.string.feature_foryou_api_title)private val interests by composeTestRule.stringResource(FeatureSearchR.string.feature_search_interests)private val sampleTopic = "Headlines"private val appName by composeTestRule.stringResource(R.string.app_name)diff --git a/app/src/main/kotlin/com/google/samples/apps/nowinandroid/navigation/NiaNavHost.kt b/app/src/main/kotlin/com/google/samples/apps/nowinandroid/navigation/NiaNavHost.ktindex e079c98f4..1f8f88686 100644--- a/app/src/main/kotlin/com/google/samples/apps/nowinandroid/navigation/NiaNavHost.kt+++ b/app/src/main/kotlin/com/google/samples/apps/nowinandroid/navigation/NiaNavHost.kt@@ -19,13 +19,13 @@ package com.google.samples.apps.nowinandroid.navigationimport androidx.compose.runtime.Composableimport androidx.compose.ui.Modifierimport androidx.navigation.compose.NavHost-import com.google.samples.apps.nowinandroid.feature.bookmarks.navigation.bookmarksScreen-import com.google.samples.apps.nowinandroid.feature.foryou.navigation.ForYouBaseRoute-import com.google.samples.apps.nowinandroid.feature.foryou.navigation.forYouSection-import com.google.samples.apps.nowinandroid.feature.interests.navigation.navigateToInterests-import com.google.samples.apps.nowinandroid.feature.search.navigation.searchScreen-import com.google.samples.apps.nowinandroid.feature.topic.navigation.navigateToTopic-import com.google.samples.apps.nowinandroid.feature.topic.navigation.topicScreen+import com.google.samples.apps.nowinandroid.feature.bookmarks.api.navigation.bookmarksScreen+import com.google.samples.apps.nowinandroid.feature.foryou.api.navigation.ForYouBaseRoute+import com.google.samples.apps.nowinandroid.feature.foryou.api.navigation.forYouSection+import com.google.samples.apps.nowinandroid.feature.interests.api.navigation.navigateToInterests+import com.google.samples.apps.nowinandroid.feature.search.api.navigation.searchScreen+import com.google.samples.apps.nowinandroid.feature.topic.api.navigation.navigateToTopic+import com.google.samples.apps.nowinandroid.feature.topic.api.navigation.topicScreenimport com.google.samples.apps.nowinandroid.navigation.TopLevelDestination.INTERESTSimport com.google.samples.apps.nowinandroid.ui.NiaAppStateimport com.google.samples.apps.nowinandroid.ui.interests2pane.interestsListDetailScreendiff --git a/app/src/main/kotlin/com/google/samples/apps/nowinandroid/navigation/TopLevelDestination.kt b/app/src/main/kotlin/com/google/samples/apps/nowinandroid/navigation/TopLevelDestination.ktindex 429e626ff..d43101078 100644--- a/app/src/main/kotlin/com/google/samples/apps/nowinandroid/navigation/TopLevelDestination.kt+++ b/app/src/main/kotlin/com/google/samples/apps/nowinandroid/navigation/TopLevelDestination.kt@@ -20,14 +20,14 @@ import androidx.annotation.StringResimport androidx.compose.ui.graphics.vector.ImageVectorimport com.google.samples.apps.nowinandroid.Rimport com.google.samples.apps.nowinandroid.core.designsystem.icon.NiaIcons-import com.google.samples.apps.nowinandroid.feature.bookmarks.navigation.BookmarksRoute-import com.google.samples.apps.nowinandroid.feature.foryou.navigation.ForYouBaseRoute-import com.google.samples.apps.nowinandroid.feature.foryou.navigation.ForYouRoute-import com.google.samples.apps.nowinandroid.feature.interests.navigation.InterestsRoute+import com.google.samples.apps.nowinandroid.feature.bookmarks.api.navigation.BookmarksRoute+import com.google.samples.apps.nowinandroid.feature.foryou.api.navigation.ForYouBaseRoute+import com.google.samples.apps.nowinandroid.feature.foryou.api.navigation.ForYouRoute+import com.google.samples.apps.nowinandroid.feature.interests.api.navigation.InterestsRouteimport kotlin.reflect.KClass-import com.google.samples.apps.nowinandroid.feature.bookmarks.R as bookmarksR-import com.google.samples.apps.nowinandroid.feature.foryou.R as forYouR-import com.google.samples.apps.nowinandroid.feature.search.R as searchR+import com.google.samples.apps.nowinandroid.feature.bookmarks.api.R as bookmarksR+import com.google.samples.apps.nowinandroid.feature.foryou.api.R as forYouR+import com.google.samples.apps.nowinandroid.feature.search.api.R as searchR/*** Type for the top level destinations in the application. Contains metadata about the destination@@ -54,7 +54,7 @@ enum class TopLevelDestination(FOR_YOU(selectedIcon = NiaIcons.Upcoming,unselectedIcon = NiaIcons.UpcomingBorder,- iconTextId = forYouR.string.feature_foryou_title,+ iconTextId = forYouR.string.feature_foryou_api_title,titleTextId = R.string.app_name,route = ForYouRoute::class,baseRoute = ForYouBaseRoute::class,@@ -62,15 +62,15 @@ enum class TopLevelDestination(BOOKMARKS(selectedIcon = NiaIcons.Bookmarks,unselectedIcon = NiaIcons.BookmarksBorder,- iconTextId = bookmarksR.string.feature_bookmarks_title,- titleTextId = bookmarksR.string.feature_bookmarks_title,+ iconTextId = bookmarksR.string.feature_bookmarks_api_title,+ titleTextId = bookmarksR.string.feature_bookmarks_api_title,route = BookmarksRoute::class,),INTERESTS(selectedIcon = NiaIcons.Grid3x3,unselectedIcon = NiaIcons.Grid3x3,- iconTextId = searchR.string.feature_search_interests,- titleTextId = searchR.string.feature_search_interests,+ iconTextId = searchR.string.feature_search_api_interests,+ titleTextId = searchR.string.feature_search_api_interests,route = InterestsRoute::class,),}diff --git a/app/src/main/kotlin/com/google/samples/apps/nowinandroid/ui/NiaApp.kt b/app/src/main/kotlin/com/google/samples/apps/nowinandroid/ui/NiaApp.ktindex b237684ef..fe2d758ee 100644--- a/app/src/main/kotlin/com/google/samples/apps/nowinandroid/ui/NiaApp.kt+++ b/app/src/main/kotlin/com/google/samples/apps/nowinandroid/ui/NiaApp.kt@@ -71,11 +71,11 @@ import com.google.samples.apps.nowinandroid.core.designsystem.component.NiaTopApimport com.google.samples.apps.nowinandroid.core.designsystem.icon.NiaIconsimport com.google.samples.apps.nowinandroid.core.designsystem.theme.GradientColorsimport com.google.samples.apps.nowinandroid.core.designsystem.theme.LocalGradientColors-import com.google.samples.apps.nowinandroid.feature.settings.SettingsDialog+import com.google.samples.apps.nowinandroid.feature.settings.api.SettingsDialogimport com.google.samples.apps.nowinandroid.navigation.NiaNavHostimport com.google.samples.apps.nowinandroid.navigation.TopLevelDestinationimport kotlin.reflect.KClass-import com.google.samples.apps.nowinandroid.feature.settings.R as settingsR+import com.google.samples.apps.nowinandroid.feature.settings.api.R as settingsR@Composablefun NiaApp(diff --git a/app/src/main/kotlin/com/google/samples/apps/nowinandroid/ui/NiaAppState.kt b/app/src/main/kotlin/com/google/samples/apps/nowinandroid/ui/NiaAppState.ktindex 7c892c854..4c1d23318 100644--- a/app/src/main/kotlin/com/google/samples/apps/nowinandroid/ui/NiaAppState.kt+++ b/app/src/main/kotlin/com/google/samples/apps/nowinandroid/ui/NiaAppState.kt@@ -34,10 +34,10 @@ import com.google.samples.apps.nowinandroid.core.data.repository.UserNewsResourcimport com.google.samples.apps.nowinandroid.core.data.util.NetworkMonitorimport com.google.samples.apps.nowinandroid.core.data.util.TimeZoneMonitorimport com.google.samples.apps.nowinandroid.core.ui.TrackDisposableJank-import com.google.samples.apps.nowinandroid.feature.bookmarks.navigation.navigateToBookmarks-import com.google.samples.apps.nowinandroid.feature.foryou.navigation.navigateToForYou-import com.google.samples.apps.nowinandroid.feature.interests.navigation.navigateToInterests-import com.google.samples.apps.nowinandroid.feature.search.navigation.navigateToSearch+import com.google.samples.apps.nowinandroid.feature.bookmarks.api.navigation.navigateToBookmarks+import com.google.samples.apps.nowinandroid.feature.foryou.api.navigation.navigateToForYou+import com.google.samples.apps.nowinandroid.feature.interests.api.navigation.navigateToInterests+import com.google.samples.apps.nowinandroid.feature.search.api.navigation.navigateToSearchimport com.google.samples.apps.nowinandroid.navigation.TopLevelDestinationimport com.google.samples.apps.nowinandroid.navigation.TopLevelDestination.BOOKMARKSimport com.google.samples.apps.nowinandroid.navigation.TopLevelDestination.FOR_YOUdiff --git a/app/src/main/kotlin/com/google/samples/apps/nowinandroid/ui/interests2pane/Interests2PaneViewModel.kt b/app/src/main/kotlin/com/google/samples/apps/nowinandroid/ui/interests2pane/Interests2PaneViewModel.ktindex 3d37f3417..83978a6f4 100644--- a/app/src/main/kotlin/com/google/samples/apps/nowinandroid/ui/interests2pane/Interests2PaneViewModel.kt+++ b/app/src/main/kotlin/com/google/samples/apps/nowinandroid/ui/interests2pane/Interests2PaneViewModel.kt@@ -19,7 +19,7 @@ package com.google.samples.apps.nowinandroid.ui.interests2paneimport androidx.lifecycle.SavedStateHandleimport androidx.lifecycle.ViewModelimport androidx.navigation.toRoute-import com.google.samples.apps.nowinandroid.feature.interests.navigation.InterestsRoute+import com.google.samples.apps.nowinandroid.feature.interests.api.navigation.InterestsRouteimport dagger.hilt.android.lifecycle.HiltViewModelimport kotlinx.coroutines.flow.StateFlowimport javax.inject.Injectdiff --git a/app/src/main/kotlin/com/google/samples/apps/nowinandroid/ui/interests2pane/InterestsListDetailScreen.kt b/app/src/main/kotlin/com/google/samples/apps/nowinandroid/ui/interests2pane/InterestsListDetailScreen.ktindex c0f425c65..07e93eee1 100644--- a/app/src/main/kotlin/com/google/samples/apps/nowinandroid/ui/interests2pane/InterestsListDetailScreen.kt+++ b/app/src/main/kotlin/com/google/samples/apps/nowinandroid/ui/interests2pane/InterestsListDetailScreen.kt@@ -52,12 +52,12 @@ import androidx.hilt.navigation.compose.hiltViewModelimport androidx.lifecycle.compose.collectAsStateWithLifecycleimport androidx.navigation.NavGraphBuilderimport androidx.navigation.compose.composable-import com.google.samples.apps.nowinandroid.feature.interests.InterestsRoute-import com.google.samples.apps.nowinandroid.feature.interests.navigation.InterestsRoute-import com.google.samples.apps.nowinandroid.feature.topic.TopicDetailPlaceholder-import com.google.samples.apps.nowinandroid.feature.topic.TopicScreen-import com.google.samples.apps.nowinandroid.feature.topic.TopicViewModel-import com.google.samples.apps.nowinandroid.feature.topic.navigation.TopicRoute+import com.google.samples.apps.nowinandroid.feature.interests.api.InterestsRoute+import com.google.samples.apps.nowinandroid.feature.interests.api.navigation.InterestsRoute+import com.google.samples.apps.nowinandroid.feature.topic.api.TopicDetailPlaceholder+import com.google.samples.apps.nowinandroid.feature.topic.api.TopicScreen+import com.google.samples.apps.nowinandroid.feature.topic.api.TopicViewModel+import com.google.samples.apps.nowinandroid.feature.topic.api.navigation.TopicRouteimport kotlinx.coroutines.launchimport kotlinx.serialization.Serializableimport kotlin.math.maxdiff --git a/app/src/testDemo/kotlin/com/google/samples/apps/nowinandroid/ui/InterestsListDetailScreenTest.kt b/app/src/testDemo/kotlin/com/google/samples/apps/nowinandroid/ui/InterestsListDetailScreenTest.ktindex 1062c7e56..682f4983f 100644--- a/app/src/testDemo/kotlin/com/google/samples/apps/nowinandroid/ui/InterestsListDetailScreenTest.kt+++ b/app/src/testDemo/kotlin/com/google/samples/apps/nowinandroid/ui/InterestsListDetailScreenTest.kt@@ -45,7 +45,7 @@ import org.robolectric.annotation.Configimport javax.inject.Injectimport kotlin.properties.ReadOnlyPropertyimport kotlin.test.assertTrue-import com.google.samples.apps.nowinandroid.feature.topic.R as FeatureTopicR+import com.google.samples.apps.nowinandroid.feature.topic.api.R as FeatureTopicRprivate const val EXPANDED_WIDTH = "w1200dp-h840dp"private const val COMPACT_WIDTH = "w412dp-h915dp"diff --git a/feature/bookmarks/.gitignore b/feature/bookmarks/api/.gitignoresimilarity index 100%rename from feature/bookmarks/.gitignorerename to feature/bookmarks/api/.gitignorediff --git a/feature/bookmarks/build.gradle.kts b/feature/bookmarks/api/build.gradle.ktssimilarity index 98%rename from feature/bookmarks/build.gradle.ktsrename to feature/bookmarks/api/build.gradle.ktsindex 51a15ce7a..f12a39f7d 100644--- a/feature/bookmarks/build.gradle.kts+++ b/feature/bookmarks/api/build.gradle.kts@@ -21,7 +21,7 @@ plugins {}android {- namespace = "com.google.samples.apps.nowinandroid.feature.bookmarks"+ namespace = "com.google.samples.apps.nowinandroid.feature.bookmarks.api"}dependencies {diff --git a/feature/bookmarks/src/androidTest/kotlin/com/google/samples/apps/nowinandroid/feature/bookmarks/BookmarksScreenTest.kt b/feature/bookmarks/api/src/androidTest/kotlin/com/google/samples/apps/nowinandroid/feature/bookmarks/api/BookmarksScreenTest.ktsimilarity index 98%rename from feature/bookmarks/src/androidTest/kotlin/com/google/samples/apps/nowinandroid/feature/bookmarks/BookmarksScreenTest.ktrename to feature/bookmarks/api/src/androidTest/kotlin/com/google/samples/apps/nowinandroid/feature/bookmarks/api/BookmarksScreenTest.ktindex dd01b84c9..78f29f92a 100644--- a/feature/bookmarks/src/androidTest/kotlin/com/google/samples/apps/nowinandroid/feature/bookmarks/BookmarksScreenTest.kt+++ b/feature/bookmarks/api/src/androidTest/kotlin/com/google/samples/apps/nowinandroid/feature/bookmarks/api/BookmarksScreenTest.kt@@ -14,7 +14,7 @@* limitations under the License.*/-package com.google.samples.apps.nowinandroid.feature.bookmarks+package com.google.samples.apps.nowinandroid.feature.bookmarks.apiimport androidx.activity.ComponentActivityimport androidx.compose.runtime.CompositionLocalProvider@@ -35,7 +35,6 @@ import androidx.lifecycle.Lifecycleimport androidx.lifecycle.compose.LocalLifecycleOwnerimport androidx.lifecycle.testing.TestLifecycleOwnerimport com.google.samples.apps.nowinandroid.core.testing.data.userNewsResourcesTestData-import com.google.samples.apps.nowinandroid.core.ui.NewsFeedUiStateimport kotlinx.coroutines.test.runTestimport org.junit.Ruleimport org.junit.Testdiff --git a/feature/bookmarks/src/main/AndroidManifest.xml b/feature/bookmarks/api/src/main/AndroidManifest.xmlsimilarity index 100%rename from feature/bookmarks/src/main/AndroidManifest.xmlrename to feature/bookmarks/api/src/main/AndroidManifest.xmldiff --git a/feature/bookmarks/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/bookmarks/BookmarksScreen.kt b/feature/bookmarks/api/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/bookmarks/api/BookmarksScreen.ktsimilarity index 98%rename from feature/bookmarks/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/bookmarks/BookmarksScreen.ktrename to feature/bookmarks/api/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/bookmarks/api/BookmarksScreen.ktindex 7c229c5ea..019fb4609 100644--- a/feature/bookmarks/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/bookmarks/BookmarksScreen.kt+++ b/feature/bookmarks/api/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/bookmarks/api/BookmarksScreen.kt@@ -14,7 +14,7 @@* limitations under the License.*/-package com.google.samples.apps.nowinandroid.feature.bookmarks+package com.google.samples.apps.nowinandroid.feature.bookmarks.apiimport androidx.annotation.VisibleForTestingimport androidx.compose.foundation.Image@@ -112,8 +112,8 @@ internal fun BookmarksScreen(undoBookmarkRemoval: () -> Unit = {},clearUndoState: () -> Unit = {},) {- val bookmarkRemovedMessage = stringResource(id = R.string.feature_bookmarks_removed)- val undoText = stringResource(id = R.string.feature_bookmarks_undo)+ val bookmarkRemovedMessage = stringResource(id = R.string.feature_bookmarks_api_removed)+ val undoText = stringResource(id = R.string.feature_bookmarks_api_undo)LaunchedEffect(shouldDisplayUndoBookmark) {if (shouldDisplayUndoBookmark) {@@ -155,7 +155,7 @@ private fun LoadingState(modifier: Modifier = Modifier) {.fillMaxWidth().wrapContentSize().testTag("forYou:loading"),- contentDesc = stringResource(id = R.string.feature_bookmarks_loading),+ contentDesc = stringResource(id = R.string.feature_bookmarks_api_loading),)}@@ -228,7 +228,7 @@ private fun EmptyState(modifier: Modifier = Modifier) {val iconTint = LocalTintTheme.current.iconTintImage(modifier = Modifier.fillMaxWidth(),- painter = painterResource(id = R.drawable.feature_bookmarks_img_empty_bookmarks),+ painter = painterResource(id = R.drawable.feature_bookmarks_api_mg_empty_bookmarks),colorFilter = if (iconTint != Color.Unspecified) ColorFilter.tint(iconTint) else null,contentDescription = null,)@@ -236,7 +236,7 @@ private fun EmptyState(modifier: Modifier = Modifier) {Spacer(modifier = Modifier.height(48.dp))Text(- text = stringResource(id = R.string.feature_bookmarks_empty_error),+ text = stringResource(id = R.string.feature_bookmarks_api_empty_error),modifier = Modifier.fillMaxWidth(),textAlign = TextAlign.Center,style = MaterialTheme.typography.titleMedium,@@ -246,7 +246,7 @@ private fun EmptyState(modifier: Modifier = Modifier) {Spacer(modifier = Modifier.height(8.dp))Text(- text = stringResource(id = R.string.feature_bookmarks_empty_description),+ text = stringResource(id = R.string.feature_bookmarks_api_empty_description),modifier = Modifier.fillMaxWidth(),textAlign = TextAlign.Center,style = MaterialTheme.typography.bodyMedium,diff --git a/feature/bookmarks/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/bookmarks/BookmarksViewModel.kt b/feature/bookmarks/api/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/bookmarks/api/BookmarksViewModel.ktsimilarity index 97%rename from feature/bookmarks/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/bookmarks/BookmarksViewModel.ktrename to feature/bookmarks/api/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/bookmarks/api/BookmarksViewModel.ktindex f93602485..7b8945eb2 100644--- a/feature/bookmarks/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/bookmarks/BookmarksViewModel.kt+++ b/feature/bookmarks/api/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/bookmarks/api/BookmarksViewModel.kt@@ -14,7 +14,7 @@* limitations under the License.*/-package com.google.samples.apps.nowinandroid.feature.bookmarks+package com.google.samples.apps.nowinandroid.feature.bookmarks.apiimport androidx.compose.runtime.getValueimport androidx.compose.runtime.mutableStateOfdiff --git a/feature/bookmarks/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/bookmarks/navigation/BookmarksNavigation.kt b/feature/bookmarks/api/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/bookmarks/api/navigation/BookmarksNavigation.ktsimilarity index 88%rename from feature/bookmarks/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/bookmarks/navigation/BookmarksNavigation.ktrename to feature/bookmarks/api/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/bookmarks/api/navigation/BookmarksNavigation.ktindex ea8d525ab..23b48b17a 100644--- a/feature/bookmarks/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/bookmarks/navigation/BookmarksNavigation.kt+++ b/feature/bookmarks/api/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/bookmarks/api/navigation/BookmarksNavigation.kt@@ -14,13 +14,13 @@* limitations under the License.*/-package com.google.samples.apps.nowinandroid.feature.bookmarks.navigation+package com.google.samples.apps.nowinandroid.feature.bookmarks.api.navigationimport androidx.navigation.NavControllerimport androidx.navigation.NavGraphBuilderimport androidx.navigation.NavOptionsimport androidx.navigation.compose.composable-import com.google.samples.apps.nowinandroid.feature.bookmarks.BookmarksRoute+import com.google.samples.apps.nowinandroid.feature.bookmarks.api.BookmarksRouteimport kotlinx.serialization.Serializable@Serializable object BookmarksRoutediff --git a/feature/bookmarks/src/main/res/drawable/feature_bookmarks_img_empty_bookmarks.xml b/feature/bookmarks/api/src/main/res/drawable/feature_bookmarks_api_mg_empty_bookmarks.xmlsimilarity index 100%rename from feature/bookmarks/src/main/res/drawable/feature_bookmarks_img_empty_bookmarks.xmlrename to feature/bookmarks/api/src/main/res/drawable/feature_bookmarks_api_mg_empty_bookmarks.xmldiff --git a/feature/bookmarks/src/main/res/values/strings.xml b/feature/bookmarks/api/src/main/res/values/strings.xmlsimilarity index 59%rename from feature/bookmarks/src/main/res/values/strings.xmlrename to feature/bookmarks/api/src/main/res/values/strings.xmlindex 6e2b23043..98f4b4a8d 100644--- a/feature/bookmarks/src/main/res/values/strings.xml+++ b/feature/bookmarks/api/src/main/res/values/strings.xml@@ -15,10 +15,10 @@limitations under the License.--><resources>- <string name="feature_bookmarks_title">Saved</string>- <string name="feature_bookmarks_loading">Loading saved…</string>- <string name="feature_bookmarks_empty_error">No saved updates</string>- <string name="feature_bookmarks_empty_description">Updates you save will be stored here\nto read later</string>- <string name="feature_bookmarks_removed">Bookmark removed</string>- <string name="feature_bookmarks_undo">UNDO</string>+ <string name="feature_bookmarks_api_title">Saved</string>+ <string name="feature_bookmarks_api_loading">Loading saved…</string>+ <string name="feature_bookmarks_api_empty_error">No saved updates</string>+ <string name="feature_bookmarks_api_empty_description">Updates you save will be stored here\nto read later</string>+ <string name="feature_bookmarks_api_removed">Bookmark removed</string>+ <string name="feature_bookmarks_api_undo">UNDO</string></resources>diff --git a/feature/bookmarks/src/test/kotlin/com/google/samples/apps/nowinandroid/feature/bookmarks/BookmarksViewModelTest.kt b/feature/bookmarks/api/src/test/kotlin/com/google/samples/apps/nowinandroid/feature/bookmarks/api/BookmarksViewModelTest.ktsimilarity index 97%rename from feature/bookmarks/src/test/kotlin/com/google/samples/apps/nowinandroid/feature/bookmarks/BookmarksViewModelTest.ktrename to feature/bookmarks/api/src/test/kotlin/com/google/samples/apps/nowinandroid/feature/bookmarks/api/BookmarksViewModelTest.ktindex aa42adae2..ae3b488c7 100644--- a/feature/bookmarks/src/test/kotlin/com/google/samples/apps/nowinandroid/feature/bookmarks/BookmarksViewModelTest.kt+++ b/feature/bookmarks/api/src/test/kotlin/com/google/samples/apps/nowinandroid/feature/bookmarks/api/BookmarksViewModelTest.kt@@ -14,7 +14,7 @@* limitations under the License.*/-package com.google.samples.apps.nowinandroid.feature.bookmarks+package com.google.samples.apps.nowinandroid.feature.bookmarks.apiimport com.google.samples.apps.nowinandroid.core.data.repository.CompositeUserNewsResourceRepositoryimport com.google.samples.apps.nowinandroid.core.testing.data.newsResourcesTestData@@ -23,6 +23,7 @@ import com.google.samples.apps.nowinandroid.core.testing.repository.TestUserDataimport com.google.samples.apps.nowinandroid.core.testing.util.MainDispatcherRuleimport com.google.samples.apps.nowinandroid.core.ui.NewsFeedUiState.Loadingimport com.google.samples.apps.nowinandroid.core.ui.NewsFeedUiState.Success+import com.google.samples.apps.nowinandroid.feature.bookmarks.api.BookmarksViewModelimport kotlinx.coroutines.flow.collectimport kotlinx.coroutines.launchimport kotlinx.coroutines.test.UnconfinedTestDispatcherdiff --git a/feature/foryou/.gitignore b/feature/bookmarks/impl/.gitignoresimilarity index 100%rename from feature/foryou/.gitignorerename to feature/bookmarks/impl/.gitignorediff --git a/feature/bookmarks/impl/build.gradle.kts b/feature/bookmarks/impl/build.gradle.ktsnew file mode 100644index 000000000..f46554044--- /dev/null+++ b/feature/bookmarks/impl/build.gradle.kts@@ -0,0 +1,26 @@+/*+ * Copyright 2022 The Android Open Source Project+ *+ * Licensed under the Apache License, Version 2.0 (the "License");+ * you may not use this file except in compliance with the License.+ * You may obtain a copy of the License at+ *+ * https://www.apache.org/licenses/LICENSE-2.0+ *+ * Unless required by applicable law or agreed to in writing, software+ * distributed under the License is distributed on an "AS IS" BASIS,+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.+ * See the License for the specific language governing permissions and+ * limitations under the License.+ */++plugins {+ alias(libs.plugins.nowinandroid.android.feature)+ alias(libs.plugins.nowinandroid.android.library.compose)+}++android {+ namespace = "com.google.samples.apps.nowinandroid.feature.bookmarks.impl"+}++dependencies { }diff --git a/feature/interests/.gitignore b/feature/foryou/api/.gitignoresimilarity index 100%rename from feature/interests/.gitignorerename to feature/foryou/api/.gitignorediff --git a/feature/foryou/build.gradle.kts b/feature/foryou/api/build.gradle.ktssimilarity index 99%rename from feature/foryou/build.gradle.ktsrename to feature/foryou/api/build.gradle.ktsindex de1af7540..2ee38bfae 100644--- a/feature/foryou/build.gradle.kts+++ b/feature/foryou/api/build.gradle.kts@@ -22,7 +22,7 @@ plugins {}android {- namespace = "com.google.samples.apps.nowinandroid.feature.foryou"+ namespace = "com.google.samples.apps.nowinandroid.feature.foryou.api"testOptions.unitTests.isIncludeAndroidResources = true}diff --git a/feature/foryou/src/androidTest/kotlin/com/google/samples/apps/nowinandroid/feature/foryou/ForYouScreenTest.kt b/feature/foryou/api/src/androidTest/kotlin/com/google/samples/apps/nowinandroid/feature/foryou/api/ForYouScreenTest.ktsimilarity index 97%rename from feature/foryou/src/androidTest/kotlin/com/google/samples/apps/nowinandroid/feature/foryou/ForYouScreenTest.ktrename to feature/foryou/api/src/androidTest/kotlin/com/google/samples/apps/nowinandroid/feature/foryou/api/ForYouScreenTest.ktindex c3ec5c560..46905fd8b 100644--- a/feature/foryou/src/androidTest/kotlin/com/google/samples/apps/nowinandroid/feature/foryou/ForYouScreenTest.kt+++ b/feature/foryou/api/src/androidTest/kotlin/com/google/samples/apps/nowinandroid/feature/foryou/api/ForYouScreenTest.kt@@ -14,7 +14,7 @@* limitations under the License.*/-package com.google.samples.apps.nowinandroid.feature.foryou+package com.google.samples.apps.nowinandroid.feature.foryou.apiimport androidx.activity.ComponentActivityimport androidx.compose.foundation.layout.Box@@ -45,7 +45,7 @@ class ForYouScreenTest {private val doneButtonMatcher by lazy {hasText(- composeTestRule.activity.resources.getString(R.string.feature_foryou_done),+ composeTestRule.activity.resources.getString(R.string.feature_foryou_api_done),)}@@ -70,7 +70,7 @@ class ForYouScreenTest {composeTestRule.onNodeWithContentDescription(- composeTestRule.activity.resources.getString(R.string.feature_foryou_loading),+ composeTestRule.activity.resources.getString(R.string.feature_foryou_api_loading),).assertExists()}@@ -96,7 +96,7 @@ class ForYouScreenTest {composeTestRule.onNodeWithContentDescription(- composeTestRule.activity.resources.getString(R.string.feature_foryou_loading),+ composeTestRule.activity.resources.getString(R.string.feature_foryou_api_loading),).assertExists()}@@ -215,7 +215,7 @@ class ForYouScreenTest {composeTestRule.onNodeWithContentDescription(- composeTestRule.activity.resources.getString(R.string.feature_foryou_loading),+ composeTestRule.activity.resources.getString(R.string.feature_foryou_api_loading),).assertExists()}@@ -241,7 +241,7 @@ class ForYouScreenTest {composeTestRule.onNodeWithContentDescription(- composeTestRule.activity.resources.getString(R.string.feature_foryou_loading),+ composeTestRule.activity.resources.getString(R.string.feature_foryou_api_loading),).assertExists()}diff --git a/feature/foryou/src/main/AndroidManifest.xml b/feature/foryou/api/src/main/AndroidManifest.xmlsimilarity index 100%rename from feature/foryou/src/main/AndroidManifest.xmlrename to feature/foryou/api/src/main/AndroidManifest.xmldiff --git a/feature/foryou/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/foryou/ForYouScreen.kt b/feature/foryou/api/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/foryou/api/ForYouScreen.ktsimilarity index 99%rename from feature/foryou/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/foryou/ForYouScreen.ktrename to feature/foryou/api/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/foryou/api/ForYouScreen.ktindex 1a3325996..0b32cc6a6 100644--- a/feature/foryou/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/foryou/ForYouScreen.kt+++ b/feature/foryou/api/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/foryou/api/ForYouScreen.kt@@ -14,7 +14,7 @@* limitations under the License.*/-package com.google.samples.apps.nowinandroid.feature.foryou+package com.google.samples.apps.nowinandroid.feature.foryou.apiimport android.net.Uriimport android.os.Build.VERSION@@ -215,7 +215,7 @@ internal fun ForYouScreen(targetOffsetY = { fullHeight -> -fullHeight },) + fadeOut(),) {- val loadingContentDescription = stringResource(id = R.string.feature_foryou_loading)+ val loadingContentDescription = stringResource(id = R.string.feature_foryou_api_loading)Box(modifier = Modifier.fillMaxWidth()@@ -270,7 +270,7 @@ private fun LazyStaggeredGridScope.onboarding(item(span = StaggeredGridItemSpan.FullLine, contentType = "onboarding") {Column(modifier = interestsItemModifier) {Text(- text = stringResource(R.string.feature_foryou_onboarding_guidance_title),+ text = stringResource(R.string.feature_foryou_api_onboarding_guidance_title),textAlign = TextAlign.Center,modifier = Modifier.fillMaxWidth()@@ -278,7 +278,7 @@ private fun LazyStaggeredGridScope.onboarding(style = MaterialTheme.typography.titleMedium,)Text(- text = stringResource(R.string.feature_foryou_onboarding_guidance_subtitle),+ text = stringResource(R.string.feature_foryou_api_onboarding_guidance_subtitle),modifier = Modifier.fillMaxWidth().padding(top = 8.dp, start = 24.dp, end = 24.dp),@@ -304,7 +304,7 @@ private fun LazyStaggeredGridScope.onboarding(.fillMaxWidth(),) {Text(- text = stringResource(R.string.feature_foryou_done),+ text = stringResource(R.string.feature_foryou_api_done),)}}@@ -433,7 +433,7 @@ fun TopicIcon(modifier: Modifier = Modifier,) {DynamicAsyncImage(- placeholder = painterResource(R.drawable.feature_foryou_ic_icon_placeholder),+ placeholder = painterResource(R.drawable.feature_foryou_api_ic_icon_placeholder),imageUrl = imageUrl,// decorativecontentDescription = null,diff --git a/feature/foryou/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/foryou/ForYouViewModel.kt b/feature/foryou/api/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/foryou/api/ForYouViewModel.ktsimilarity index 98%rename from feature/foryou/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/foryou/ForYouViewModel.ktrename to feature/foryou/api/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/foryou/api/ForYouViewModel.ktindex 4b6cd39c9..6fb44a5f5 100644--- a/feature/foryou/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/foryou/ForYouViewModel.kt+++ b/feature/foryou/api/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/foryou/api/ForYouViewModel.kt@@ -14,7 +14,7 @@* limitations under the License.*/-package com.google.samples.apps.nowinandroid.feature.foryou+package com.google.samples.apps.nowinandroid.feature.foryou.apiimport androidx.lifecycle.SavedStateHandleimport androidx.lifecycle.ViewModeldiff --git a/feature/foryou/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/foryou/OnboardingUiState.kt b/feature/foryou/api/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/foryou/api/OnboardingUiState.ktsimilarity index 95%rename from feature/foryou/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/foryou/OnboardingUiState.ktrename to feature/foryou/api/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/foryou/api/OnboardingUiState.ktindex 70634b4c5..cd2197bcb 100644--- a/feature/foryou/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/foryou/OnboardingUiState.kt+++ b/feature/foryou/api/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/foryou/api/OnboardingUiState.kt@@ -14,7 +14,7 @@* limitations under the License.*/-package com.google.samples.apps.nowinandroid.feature.foryou+package com.google.samples.apps.nowinandroid.feature.foryou.apiimport com.google.samples.apps.nowinandroid.core.model.data.FollowableTopicdiff --git a/feature/foryou/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/foryou/navigation/ForYouNavigation.kt b/feature/foryou/api/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/foryou/api/navigation/ForYouNavigation.ktsimilarity index 94%rename from feature/foryou/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/foryou/navigation/ForYouNavigation.ktrename to feature/foryou/api/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/foryou/api/navigation/ForYouNavigation.ktindex b77ce72a0..a4b276983 100644--- a/feature/foryou/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/foryou/navigation/ForYouNavigation.kt+++ b/feature/foryou/api/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/foryou/api/navigation/ForYouNavigation.kt@@ -14,7 +14,7 @@* limitations under the License.*/-package com.google.samples.apps.nowinandroid.feature.foryou.navigation+package com.google.samples.apps.nowinandroid.feature.foryou.api.navigationimport androidx.navigation.NavControllerimport androidx.navigation.NavGraphBuilder@@ -23,7 +23,7 @@ import androidx.navigation.compose.composableimport androidx.navigation.compose.navigationimport androidx.navigation.navDeepLinkimport com.google.samples.apps.nowinandroid.core.notifications.DEEP_LINK_URI_PATTERN-import com.google.samples.apps.nowinandroid.feature.foryou.ForYouScreen+import com.google.samples.apps.nowinandroid.feature.foryou.api.ForYouScreenimport kotlinx.serialization.Serializable@Serializable data object ForYouRoute // route to ForYou screendiff --git a/feature/foryou/src/main/res/drawable/feature_foryou_ic_icon_placeholder.xml b/feature/foryou/api/src/main/res/drawable/feature_foryou_api_ic_icon_placeholder.xmlsimilarity index 100%rename from feature/foryou/src/main/res/drawable/feature_foryou_ic_icon_placeholder.xmlrename to feature/foryou/api/src/main/res/drawable/feature_foryou_api_ic_icon_placeholder.xmldiff --git a/feature/foryou/src/main/res/values/strings.xml b/feature/foryou/api/src/main/res/values/strings.xmlsimilarity index 57%rename from feature/foryou/src/main/res/values/strings.xmlrename to feature/foryou/api/src/main/res/values/strings.xmlindex 166749664..4694eb444 100644--- a/feature/foryou/src/main/res/values/strings.xml+++ b/feature/foryou/api/src/main/res/values/strings.xml@@ -15,11 +15,11 @@limitations under the License.--><resources>- <string name="feature_foryou_title">For you</string>- <string name="feature_foryou_done">Done</string>- <string name="feature_foryou_loading">Loading for you…</string>- <string name="feature_foryou_navigate_up">Navigate up</string>- <string name="feature_foryou_onboarding_guidance_title">What are you interested in?</string>- <string name="feature_foryou_onboarding_guidance_subtitle">Updates from topics you follow will appear here. Follow some things to get started.</string>+ <string name="feature_foryou_api_title">For you</string>+ <string name="feature_foryou_api_done">Done</string>+ <string name="feature_foryou_api_loading">Loading for you…</string>+ <string name="feature_foryou_api_navigate_up">Navigate up</string>+ <string name="feature_foryou_api_onboarding_guidance_title">What are you interested in?</string>+ <string name="feature_foryou_api_onboarding_guidance_subtitle">Updates from topics you follow will appear here. Follow some things to get started.</string></resources>diff --git a/feature/foryou/src/test/kotlin/com/google/samples/apps/nowinandroid/feature/foryou/ForYouScreenScreenshotTests.kt b/feature/foryou/api/src/test/kotlin/com/google/samples/apps/nowinandroid/feature/foryou/api/ForYouScreenScreenshotTests.ktsimilarity index 95%rename from feature/foryou/src/test/kotlin/com/google/samples/apps/nowinandroid/feature/foryou/ForYouScreenScreenshotTests.ktrename to feature/foryou/api/src/test/kotlin/com/google/samples/apps/nowinandroid/feature/foryou/api/ForYouScreenScreenshotTests.ktindex 29fc6f536..447472d1c 100644--- a/feature/foryou/src/test/kotlin/com/google/samples/apps/nowinandroid/feature/foryou/ForYouScreenScreenshotTests.kt+++ b/feature/foryou/api/src/test/kotlin/com/google/samples/apps/nowinandroid/feature/foryou/api/ForYouScreenScreenshotTests.kt@@ -14,7 +14,7 @@* limitations under the License.*/-package com.google.samples.apps.nowinandroid.feature.foryou+package com.google.samples.apps.nowinandroid.feature.foryou.apiimport androidx.activity.ComponentActivityimport androidx.compose.runtime.Composable@@ -31,9 +31,9 @@ import com.google.samples.apps.nowinandroid.core.testing.util.captureMultiDeviceimport com.google.samples.apps.nowinandroid.core.ui.NewsFeedUiStateimport com.google.samples.apps.nowinandroid.core.ui.NewsFeedUiState.Successimport com.google.samples.apps.nowinandroid.core.ui.UserNewsResourcePreviewParameterProvider-import com.google.samples.apps.nowinandroid.feature.foryou.OnboardingUiState.Loading-import com.google.samples.apps.nowinandroid.feature.foryou.OnboardingUiState.NotShown-import com.google.samples.apps.nowinandroid.feature.foryou.OnboardingUiState.Shown+import com.google.samples.apps.nowinandroid.feature.foryou.api.OnboardingUiState.Loading+import com.google.samples.apps.nowinandroid.feature.foryou.api.OnboardingUiState.NotShown+import com.google.samples.apps.nowinandroid.feature.foryou.api.OnboardingUiState.Shownimport dagger.hilt.android.testing.HiltTestApplicationimport org.hamcrest.Matchersimport org.junit.Beforediff --git a/feature/foryou/src/test/kotlin/com/google/samples/apps/nowinandroid/feature/foryou/ForYouViewModelTest.kt b/feature/foryou/api/src/test/kotlin/com/google/samples/apps/nowinandroid/feature/foryou/api/ForYouViewModelTest.ktsimilarity index 99%rename from feature/foryou/src/test/kotlin/com/google/samples/apps/nowinandroid/feature/foryou/ForYouViewModelTest.ktrename to feature/foryou/api/src/test/kotlin/com/google/samples/apps/nowinandroid/feature/foryou/api/ForYouViewModelTest.ktindex 812544c0c..b8a4ef86b 100644--- a/feature/foryou/src/test/kotlin/com/google/samples/apps/nowinandroid/feature/foryou/ForYouViewModelTest.kt+++ b/feature/foryou/api/src/test/kotlin/com/google/samples/apps/nowinandroid/feature/foryou/api/ForYouViewModelTest.kt@@ -14,7 +14,7 @@* limitations under the License.*/-package com.google.samples.apps.nowinandroid.feature.foryou+package com.google.samples.apps.nowinandroid.feature.foryou.apiimport androidx.lifecycle.SavedStateHandleimport com.google.samples.apps.nowinandroid.core.analytics.AnalyticsEventdiff --git a/feature/search/.gitignore b/feature/foryou/impl/.gitignoresimilarity index 100%rename from feature/search/.gitignorerename to feature/foryou/impl/.gitignorediff --git a/feature/foryou/impl/build.gradle.kts b/feature/foryou/impl/build.gradle.ktsnew file mode 100644index 000000000..37f49d304--- /dev/null+++ b/feature/foryou/impl/build.gradle.kts@@ -0,0 +1,26 @@+/*+ * Copyright 2022 The Android Open Source Project+ *+ * Licensed under the Apache License, Version 2.0 (the "License");+ * you may not use this file except in compliance with the License.+ * You may obtain a copy of the License at+ *+ * https://www.apache.org/licenses/LICENSE-2.0+ *+ * Unless required by applicable law or agreed to in writing, software+ * distributed under the License is distributed on an "AS IS" BASIS,+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.+ * See the License for the specific language governing permissions and+ * limitations under the License.+ */++plugins {+ alias(libs.plugins.nowinandroid.android.feature)+ alias(libs.plugins.nowinandroid.android.library.compose)+}++android {+ namespace = "com.google.samples.apps.nowinandroid.feature.foryou.impl"+}++dependencies { }\ No newline at end of filediff --git a/feature/foryou/src/test/screenshots/ForYouScreenLoading_foldable.png b/feature/foryou/src/test/screenshots/ForYouScreenLoading_foldable.pngdeleted file mode 100644index 538c9032c..000000000Binary files a/feature/foryou/src/test/screenshots/ForYouScreenLoading_foldable.png and /dev/null differdiff --git a/feature/foryou/src/test/screenshots/ForYouScreenLoading_phone.png b/feature/foryou/src/test/screenshots/ForYouScreenLoading_phone.pngdeleted file mode 100644index afd7dd708..000000000Binary files a/feature/foryou/src/test/screenshots/ForYouScreenLoading_phone.png and /dev/null differdiff --git a/feature/foryou/src/test/screenshots/ForYouScreenLoading_tablet.png b/feature/foryou/src/test/screenshots/ForYouScreenLoading_tablet.pngdeleted file mode 100644index 1c197e8f0..000000000Binary files a/feature/foryou/src/test/screenshots/ForYouScreenLoading_tablet.png and /dev/null differdiff --git a/feature/foryou/src/test/screenshots/ForYouScreenPopulatedAndLoading_phone.png b/feature/foryou/src/test/screenshots/ForYouScreenPopulatedAndLoading_phone.pngdeleted file mode 100644index a86a8232f..000000000Binary files a/feature/foryou/src/test/screenshots/ForYouScreenPopulatedAndLoading_phone.png and /dev/null differdiff --git a/feature/foryou/src/test/screenshots/ForYouScreenPopulatedAndLoading_phone_dark.png b/feature/foryou/src/test/screenshots/ForYouScreenPopulatedAndLoading_phone_dark.pngdeleted file mode 100644index d500394ef..000000000Binary files a/feature/foryou/src/test/screenshots/ForYouScreenPopulatedAndLoading_phone_dark.png and /dev/null differdiff --git a/feature/foryou/src/test/screenshots/ForYouScreenPopulatedFeed_phone.png b/feature/foryou/src/test/screenshots/ForYouScreenPopulatedFeed_phone.pngdeleted file mode 100644index 1498f9b7b..000000000Binary files a/feature/foryou/src/test/screenshots/ForYouScreenPopulatedFeed_phone.png and /dev/null differdiff --git a/feature/settings/.gitignore b/feature/interests/api/.gitignoresimilarity index 100%rename from feature/settings/.gitignorerename to feature/interests/api/.gitignorediff --git a/feature/interests/build.gradle.kts b/feature/interests/api/build.gradle.ktssimilarity index 98%rename from feature/interests/build.gradle.ktsrename to feature/interests/api/build.gradle.ktsindex 2b84b135f..a3627fac6 100644--- a/feature/interests/build.gradle.kts+++ b/feature/interests/api/build.gradle.kts@@ -20,7 +20,7 @@ plugins {alias(libs.plugins.nowinandroid.android.library.jacoco)}android {- namespace = "com.google.samples.apps.nowinandroid.feature.interests"+ namespace = "com.google.samples.apps.nowinandroid.feature.interests.api"}dependencies {diff --git a/feature/interests/src/androidTest/kotlin/com/google/samples/apps/nowinandroid/interests/InterestsScreenTest.kt b/feature/interests/api/src/androidTest/kotlin/com/google/samples/apps/nowinandroid/interests/api/InterestsScreenTest.ktsimilarity index 93%rename from feature/interests/src/androidTest/kotlin/com/google/samples/apps/nowinandroid/interests/InterestsScreenTest.ktrename to feature/interests/api/src/androidTest/kotlin/com/google/samples/apps/nowinandroid/interests/api/InterestsScreenTest.ktindex a441f5a9d..2286dadb2 100644--- a/feature/interests/src/androidTest/kotlin/com/google/samples/apps/nowinandroid/interests/InterestsScreenTest.kt+++ b/feature/interests/api/src/androidTest/kotlin/com/google/samples/apps/nowinandroid/interests/api/InterestsScreenTest.kt@@ -25,13 +25,13 @@ import androidx.compose.ui.test.onAllNodesWithContentDescriptionimport androidx.compose.ui.test.onNodeWithContentDescriptionimport androidx.compose.ui.test.onNodeWithTextimport com.google.samples.apps.nowinandroid.core.testing.data.followableTopicTestData-import com.google.samples.apps.nowinandroid.feature.interests.InterestsScreen-import com.google.samples.apps.nowinandroid.feature.interests.InterestsUiState+import com.google.samples.apps.nowinandroid.feature.interests.api.InterestsScreen+import com.google.samples.apps.nowinandroid.feature.interests.api.InterestsUiStateimport org.junit.Beforeimport org.junit.Ruleimport org.junit.Testimport com.google.samples.apps.nowinandroid.core.ui.R as CoreUiR-import com.google.samples.apps.nowinandroid.feature.interests.R as InterestsR+import com.google.samples.apps.nowinandroid.feature.interests.api.R as InterestsR/*** UI test for checking the correct behaviour of the Interests screen;@@ -51,8 +51,8 @@ class InterestsScreenTest {@Beforefun setup() {composeTestRule.activity.apply {- interestsLoading = getString(InterestsR.string.feature_interests_loading)- interestsEmptyHeader = getString(InterestsR.string.feature_interests_empty_header)+ interestsLoading = getString(InterestsR.string.feature_interests_api_loading)+ interestsEmptyHeader = getString(InterestsR.string.feature_interests_api_empty_header)interestsTopicCardFollowButton =getString(CoreUiR.string.core_ui_interests_card_follow_button_content_desc)interestsTopicCardUnfollowButton =diff --git a/feature/interests/src/main/AndroidManifest.xml b/feature/interests/api/src/main/AndroidManifest.xmlsimilarity index 100%rename from feature/interests/src/main/AndroidManifest.xmlrename to feature/interests/api/src/main/AndroidManifest.xmldiff --git a/feature/interests/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/interests/InterestsScreen.kt b/feature/interests/api/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/interests/api/InterestsScreen.ktsimilarity index 96%rename from feature/interests/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/interests/InterestsScreen.ktrename to feature/interests/api/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/interests/api/InterestsScreen.ktindex 9b18ac89b..8f50ae638 100644--- a/feature/interests/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/interests/InterestsScreen.kt+++ b/feature/interests/api/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/interests/api/InterestsScreen.kt@@ -14,7 +14,7 @@* limitations under the License.*/-package com.google.samples.apps.nowinandroid.feature.interests+package com.google.samples.apps.nowinandroid.feature.interests.apiimport androidx.compose.foundation.layout.Columnimport androidx.compose.material3.Text@@ -70,7 +70,7 @@ internal fun InterestsScreen(when (uiState) {InterestsUiState.Loading ->NiaLoadingWheel(- contentDesc = stringResource(id = R.string.feature_interests_loading),+ contentDesc = stringResource(id = R.string.feature_interests_api_loading),)is InterestsUiState.Interests ->@@ -90,7 +90,7 @@ internal fun InterestsScreen(@Composableprivate fun InterestsEmptyScreen() {- Text(text = stringResource(id = R.string.feature_interests_empty_header))+ Text(text = stringResource(id = R.string.feature_interests_api_empty_header))}@DevicePreviewsdiff --git a/feature/interests/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/interests/InterestsViewModel.kt b/feature/interests/api/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/interests/api/InterestsViewModel.ktsimilarity index 94%rename from feature/interests/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/interests/InterestsViewModel.ktrename to feature/interests/api/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/interests/api/InterestsViewModel.ktindex 67cc8884f..5c7b37c32 100644--- a/feature/interests/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/interests/InterestsViewModel.kt+++ b/feature/interests/api/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/interests/api/InterestsViewModel.kt@@ -14,7 +14,7 @@* limitations under the License.*/-package com.google.samples.apps.nowinandroid.feature.interests+package com.google.samples.apps.nowinandroid.feature.interests.apiimport androidx.lifecycle.SavedStateHandleimport androidx.lifecycle.ViewModel@@ -24,7 +24,7 @@ import com.google.samples.apps.nowinandroid.core.data.repository.UserDataRepositimport com.google.samples.apps.nowinandroid.core.domain.GetFollowableTopicsUseCaseimport com.google.samples.apps.nowinandroid.core.domain.TopicSortFieldimport com.google.samples.apps.nowinandroid.core.model.data.FollowableTopic-import com.google.samples.apps.nowinandroid.feature.interests.navigation.InterestsRoute+import com.google.samples.apps.nowinandroid.feature.interests.api.navigation.InterestsRouteimport dagger.hilt.android.lifecycle.HiltViewModelimport kotlinx.coroutines.flow.SharingStartedimport kotlinx.coroutines.flow.StateFlowdiff --git a/feature/interests/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/interests/TabContent.kt b/feature/interests/api/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/interests/api/TabContent.ktsimilarity index 98%rename from feature/interests/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/interests/TabContent.ktrename to feature/interests/api/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/interests/api/TabContent.ktindex 133c2bedd..5685ec6ab 100644--- a/feature/interests/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/interests/TabContent.kt+++ b/feature/interests/api/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/interests/api/TabContent.kt@@ -14,7 +14,7 @@* limitations under the License.*/-package com.google.samples.apps.nowinandroid.feature.interests+package com.google.samples.apps.nowinandroid.feature.interests.apiimport androidx.compose.foundation.gestures.Orientationimport androidx.compose.foundation.layout.Boxdiff --git a/feature/interests/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/interests/navigation/InterestsNavigation.kt b/feature/interests/api/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/interests/api/navigation/InterestsNavigation.ktsimilarity index 93%rename from feature/interests/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/interests/navigation/InterestsNavigation.ktrename to feature/interests/api/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/interests/api/navigation/InterestsNavigation.ktindex d83e4a9b2..f509ba6b8 100644--- a/feature/interests/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/interests/navigation/InterestsNavigation.kt+++ b/feature/interests/api/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/interests/api/navigation/InterestsNavigation.kt@@ -14,7 +14,7 @@* limitations under the License.*/-package com.google.samples.apps.nowinandroid.feature.interests.navigation+package com.google.samples.apps.nowinandroid.feature.interests.api.navigationimport androidx.navigation.NavControllerimport androidx.navigation.NavOptionsdiff --git a/feature/interests/src/main/res/values/strings.xml b/feature/interests/api/src/main/res/values/strings.xmlsimilarity index 75%rename from feature/interests/src/main/res/values/strings.xmlrename to feature/interests/api/src/main/res/values/strings.xmlindex 8d5322859..c76bd4915 100644--- a/feature/interests/src/main/res/values/strings.xml+++ b/feature/interests/api/src/main/res/values/strings.xml@@ -15,7 +15,7 @@limitations under the License.--><resources>- <string name="feature_interests_title">Interests</string>- <string name="feature_interests_loading">Loading data</string>- <string name="feature_interests_empty_header">"No available data"</string>+ <string name="feature_interests_api_title">Interests</string>+ <string name="feature_interests_api_loading">Loading data</string>+ <string name="feature_interests_api_empty_header">"No available data"</string></resources>diff --git a/feature/interests/src/test/kotlin/com/google/samples/apps/nowinandroid/interests/InterestsViewModelTest.kt b/feature/interests/api/src/test/kotlin/com/google/samples/apps/nowinandroid/interests/api/InterestsViewModelTest.ktsimilarity index 99%rename from feature/interests/src/test/kotlin/com/google/samples/apps/nowinandroid/interests/InterestsViewModelTest.ktrename to feature/interests/api/src/test/kotlin/com/google/samples/apps/nowinandroid/interests/api/InterestsViewModelTest.ktindex cdf21f325..55a1ded1a 100644--- a/feature/interests/src/test/kotlin/com/google/samples/apps/nowinandroid/interests/InterestsViewModelTest.kt+++ b/feature/interests/api/src/test/kotlin/com/google/samples/apps/nowinandroid/interests/api/InterestsViewModelTest.kt@@ -14,7 +14,7 @@* limitations under the License.*/-package com.google.samples.apps.nowinandroid.interests+package com.google.samples.apps.nowinandroid.interests.apiimport androidx.lifecycle.SavedStateHandleimport androidx.navigation.testing.invokediff --git a/feature/topic/.gitignore b/feature/interests/impl/.gitignoresimilarity index 100%rename from feature/topic/.gitignorerename to feature/interests/impl/.gitignorediff --git a/feature/interests/impl/build.gradle.kts b/feature/interests/impl/build.gradle.ktsnew file mode 100644index 000000000..a83efdc4a--- /dev/null+++ b/feature/interests/impl/build.gradle.kts@@ -0,0 +1,24 @@+/*+ * Copyright 2022 The Android Open Source Project+ *+ * Licensed under the Apache License, Version 2.0 (the "License");+ * you may not use this file except in compliance with the License.+ * You may obtain a copy of the License at+ *+ * https://www.apache.org/licenses/LICENSE-2.0+ *+ * Unless required by applicable law or agreed to in writing, software+ * distributed under the License is distributed on an "AS IS" BASIS,+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.+ * See the License for the specific language governing permissions and+ * limitations under the License.+ */++plugins {+ alias(libs.plugins.nowinandroid.android.feature)+ alias(libs.plugins.nowinandroid.android.library.compose)+ alias(libs.plugins.nowinandroid.android.library.jacoco)+}+android {+ namespace = "com.google.samples.apps.nowinandroid.feature.interests.impl"+}\ No newline at end of filediff --git a/feature/search/api/.gitignore b/feature/search/api/.gitignorenew file mode 100644index 000000000..42afabfd2--- /dev/null+++ b/feature/search/api/.gitignore@@ -0,0 +1 @@+/build\ No newline at end of filediff --git a/feature/search/build.gradle.kts b/feature/search/api/build.gradle.ktssimilarity index 99%rename from feature/search/build.gradle.ktsrename to feature/search/api/build.gradle.ktsindex 5bb659c35..741a87fff 100644--- a/feature/search/build.gradle.kts+++ b/feature/search/api/build.gradle.kts@@ -21,7 +21,7 @@ plugins {}android {- namespace = "com.google.samples.apps.nowinandroid.feature.search"+ namespace = "com.google.samples.apps.nowinandroid.feature.search.api"}dependencies {diff --git a/feature/search/src/androidTest/kotlin/com/google/samples/apps/nowinandroid/feature/search/SearchScreenTest.kt b/feature/search/api/src/androidTest/kotlin/com/google/samples/apps/nowinandroid/feature/search/api/SearchScreenTest.ktsimilarity index 99%rename from feature/search/src/androidTest/kotlin/com/google/samples/apps/nowinandroid/feature/search/SearchScreenTest.ktrename to feature/search/api/src/androidTest/kotlin/com/google/samples/apps/nowinandroid/feature/search/api/SearchScreenTest.ktindex a9e2fa98f..a86de6ab3 100644--- a/feature/search/src/androidTest/kotlin/com/google/samples/apps/nowinandroid/feature/search/SearchScreenTest.kt+++ b/feature/search/api/src/androidTest/kotlin/com/google/samples/apps/nowinandroid/feature/search/api/SearchScreenTest.kt@@ -14,7 +14,7 @@* limitations under the License.*/-package com.google.samples.apps.nowinandroid.feature.search+package com.google.samples.apps.nowinandroid.feature.search.apiimport androidx.activity.ComponentActivityimport androidx.compose.ui.test.assertCountEqualsdiff --git a/feature/search/src/main/AndroidManifest.xml b/feature/search/api/src/main/AndroidManifest.xmlsimilarity index 100%rename from feature/search/src/main/AndroidManifest.xmlrename to feature/search/api/src/main/AndroidManifest.xmldiff --git a/feature/search/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/search/RecentSearchQueriesUiState.kt b/feature/search/api/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/search/api/RecentSearchQueriesUiState.ktsimilarity index 93%rename from feature/search/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/search/RecentSearchQueriesUiState.ktrename to feature/search/api/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/search/api/RecentSearchQueriesUiState.ktindex 8aa5bb3b8..3e5d704a5 100644--- a/feature/search/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/search/RecentSearchQueriesUiState.kt+++ b/feature/search/api/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/search/api/RecentSearchQueriesUiState.kt@@ -14,7 +14,7 @@* limitations under the License.*/-package com.google.samples.apps.nowinandroid.feature.search+package com.google.samples.apps.nowinandroid.feature.search.apiimport com.google.samples.apps.nowinandroid.core.data.model.RecentSearchQuerydiff --git a/feature/search/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/search/SearchResultUiState.kt b/feature/search/api/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/search/api/SearchResultUiState.ktsimilarity index 96%rename from feature/search/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/search/SearchResultUiState.ktrename to feature/search/api/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/search/api/SearchResultUiState.ktindex aaf7dba7d..27b4003bf 100644--- a/feature/search/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/search/SearchResultUiState.kt+++ b/feature/search/api/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/search/api/SearchResultUiState.kt@@ -14,7 +14,7 @@* limitations under the License.*/-package com.google.samples.apps.nowinandroid.feature.search+package com.google.samples.apps.nowinandroid.feature.search.apiimport com.google.samples.apps.nowinandroid.core.model.data.FollowableTopicimport com.google.samples.apps.nowinandroid.core.model.data.UserNewsResourcediff --git a/feature/search/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/search/SearchScreen.kt b/feature/search/api/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/search/api/SearchScreen.ktsimilarity index 97%rename from feature/search/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/search/SearchScreen.ktrename to feature/search/api/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/search/api/SearchScreen.ktindex b617f98a9..28c7c3bfc 100644--- a/feature/search/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/search/SearchScreen.kt+++ b/feature/search/api/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/search/api/SearchScreen.kt@@ -14,7 +14,7 @@* limitations under the License.*/-package com.google.samples.apps.nowinandroid.feature.search+package com.google.samples.apps.nowinandroid.feature.search.apiimport androidx.compose.foundation.clickableimport androidx.compose.foundation.gestures.Orientation@@ -93,7 +93,7 @@ import com.google.samples.apps.nowinandroid.core.ui.NewsFeedUiState.Successimport com.google.samples.apps.nowinandroid.core.ui.R.stringimport com.google.samples.apps.nowinandroid.core.ui.TrackScreenViewEventimport com.google.samples.apps.nowinandroid.core.ui.newsFeed-import com.google.samples.apps.nowinandroid.feature.search.R as searchR+import com.google.samples.apps.nowinandroid.feature.search.api.R as searchR@Composableinternal fun SearchRoute(@@ -211,7 +211,7 @@ fun EmptySearchResultBody(horizontalAlignment = Alignment.CenterHorizontally,modifier = Modifier.padding(horizontal = 48.dp),) {- val message = stringResource(id = searchR.string.feature_search_result_not_found, searchQuery)+ val message = stringResource(id = searchR.string.feature_search_api_result_not_found, searchQuery)val start = message.indexOf(searchQuery)Text(text = AnnotatedString(@@ -229,7 +229,7 @@ fun EmptySearchResultBody(modifier = Modifier.padding(vertical = 24.dp),)val tryAnotherSearchString = buildAnnotatedString {- append(stringResource(id = searchR.string.feature_search_try_another_search))+ append(stringResource(id = searchR.string.feature_search_api_try_another_search))append(" ")withLink(LinkAnnotation.Clickable(@@ -245,12 +245,12 @@ fun EmptySearchResultBody(fontWeight = FontWeight.Bold,),) {- append(stringResource(id = searchR.string.feature_search_interests))+ append(stringResource(id = searchR.string.feature_search_api_interests))}}append(" ")- append(stringResource(id = searchR.string.feature_search_to_browse_topics))+ append(stringResource(id = searchR.string.feature_search_api_to_browse_topics))}Text(text = tryAnotherSearchString,@@ -273,7 +273,7 @@ private fun SearchNotReadyBody() {modifier = Modifier.padding(horizontal = 48.dp),) {Text(- text = stringResource(id = searchR.string.feature_search_not_ready),+ text = stringResource(id = searchR.string.feature_search_api_not_ready),style = MaterialTheme.typography.bodyLarge,textAlign = TextAlign.Center,modifier = Modifier.padding(vertical = 24.dp),@@ -314,7 +314,7 @@ private fun SearchResultBody(Text(text = buildAnnotatedString {withStyle(style = SpanStyle(fontWeight = FontWeight.Bold)) {- append(stringResource(id = searchR.string.feature_search_topics))+ append(stringResource(id = searchR.string.feature_search_api_topics))}},modifier = Modifier.padding(horizontal = 16.dp, vertical = 8.dp),@@ -350,7 +350,7 @@ private fun SearchResultBody(Text(text = buildAnnotatedString {withStyle(style = SpanStyle(fontWeight = FontWeight.Bold)) {- append(stringResource(id = searchR.string.feature_search_updates))+ append(stringResource(id = searchR.string.feature_search_api_updates))}},modifier = Modifier.padding(horizontal = 16.dp, vertical = 8.dp),@@ -402,7 +402,7 @@ private fun RecentSearchesBody(Text(text = buildAnnotatedString {withStyle(style = SpanStyle(fontWeight = FontWeight.Bold)) {- append(stringResource(id = searchR.string.feature_search_recent_searches))+ append(stringResource(id = searchR.string.feature_search_api_recent_searches))}},modifier = Modifier.padding(horizontal = 16.dp, vertical = 8.dp),@@ -417,7 +417,7 @@ private fun RecentSearchesBody(Icon(imageVector = NiaIcons.Close,contentDescription = stringResource(- id = searchR.string.feature_search_clear_recent_searches_content_desc,+ id = searchR.string.feature_search_api_clear_recent_searches_content_desc,),tint = MaterialTheme.colorScheme.onSurface,)@@ -491,7 +491,7 @@ private fun SearchTextField(Icon(imageVector = NiaIcons.Search,contentDescription = stringResource(- id = searchR.string.feature_search_title,+ id = searchR.string.feature_search_api_title,),tint = MaterialTheme.colorScheme.onSurface,)@@ -506,7 +506,7 @@ private fun SearchTextField(Icon(imageVector = NiaIcons.Close,contentDescription = stringResource(- id = searchR.string.feature_search_clear_search_text_content_desc,+ id = searchR.string.feature_search_api_clear_search_text_content_desc,),tint = MaterialTheme.colorScheme.onSurface,)diff --git a/feature/search/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/search/SearchUiStatePreviewParameterProvider.kt b/feature/search/api/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/search/api/SearchUiStatePreviewParameterProvider.ktsimilarity index 87%rename from feature/search/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/search/SearchUiStatePreviewParameterProvider.ktrename to feature/search/api/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/search/api/SearchUiStatePreviewParameterProvider.ktindex 257d8b68e..cd31ad8ad 100644--- a/feature/search/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/search/SearchUiStatePreviewParameterProvider.kt+++ b/feature/search/api/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/search/api/SearchUiStatePreviewParameterProvider.kt@@ -1,5 +1,5 @@/*- * Copyright 2023 The Android Open Source Project+ * Copyright 2022 The Android Open Source Project** Licensed under the Apache License, Version 2.0 (the "License");* you may not use this file except in compliance with the License.@@ -16,12 +16,13 @@@file:Suppress("ktlint:standard:max-line-length")-package com.google.samples.apps.nowinandroid.feature.search+package com.google.samples.apps.nowinandroid.feature.search.apiimport androidx.compose.ui.tooling.preview.PreviewParameterProviderimport com.google.samples.apps.nowinandroid.core.model.data.FollowableTopicimport com.google.samples.apps.nowinandroid.core.ui.PreviewParameterData.newsResourcesimport com.google.samples.apps.nowinandroid.core.ui.PreviewParameterData.topics+import com.google.samples.apps.nowinandroid.feature.search.api.SearchResultUiState.Success/*** This [PreviewParameterProvider](https://developer.android.com/reference/kotlin/androidx/compose/ui/tooling/preview/PreviewParameterProvider)@@ -29,7 +30,7 @@ import com.google.samples.apps.nowinandroid.core.ui.PreviewParameterData.topics*/class SearchUiStatePreviewParameterProvider : PreviewParameterProvider<SearchResultUiState> {override val values: Sequence<SearchResultUiState> = sequenceOf(- SearchResultUiState.Success(+ Success(topics = topics.mapIndexed { i, topic ->FollowableTopic(topic = topic, isFollowed = i % 2 == 0)},diff --git a/feature/search/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/search/SearchViewModel.kt b/feature/search/api/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/search/api/SearchViewModel.ktsimilarity index 99%rename from feature/search/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/search/SearchViewModel.ktrename to feature/search/api/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/search/api/SearchViewModel.ktindex 36947880e..ed1ea1171 100644--- a/feature/search/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/search/SearchViewModel.kt+++ b/feature/search/api/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/search/api/SearchViewModel.kt@@ -14,7 +14,7 @@* limitations under the License.*/-package com.google.samples.apps.nowinandroid.feature.search+package com.google.samples.apps.nowinandroid.feature.search.apiimport androidx.lifecycle.SavedStateHandleimport androidx.lifecycle.ViewModeldiff --git a/feature/search/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/search/navigation/SearchNavigation.kt b/feature/search/api/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/search/api/navigation/SearchNavigation.ktsimilarity index 86%rename from feature/search/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/search/navigation/SearchNavigation.ktrename to feature/search/api/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/search/api/navigation/SearchNavigation.ktindex 3b16e5f71..b45956b29 100644--- a/feature/search/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/search/navigation/SearchNavigation.kt+++ b/feature/search/api/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/search/api/navigation/SearchNavigation.kt@@ -14,13 +14,13 @@* limitations under the License.*/-package com.google.samples.apps.nowinandroid.feature.search.navigation+package com.google.samples.apps.nowinandroid.feature.search.api.navigationimport androidx.navigation.NavControllerimport androidx.navigation.NavGraphBuilderimport androidx.navigation.NavOptionsimport androidx.navigation.compose.composable-import com.google.samples.apps.nowinandroid.feature.search.SearchRoute+import com.google.samples.apps.nowinandroid.feature.search.api.SearchRouteimport kotlinx.serialization.Serializable@Serializable data object SearchRoute@@ -36,7 +36,7 @@ fun NavGraphBuilder.searchScreen(// TODO: Handle back stack for each top-level destination. At the moment each top-level// destination may have own search screen's back stack.composable<SearchRoute> {- SearchRoute(+ com.google.samples.apps.nowinandroid.feature.search.api.SearchRoute(onBackClick = onBackClick,onInterestsClick = onInterestsClick,onTopicClick = onTopicClick,diff --git a/feature/search/api/src/main/res/values/strings.xml b/feature/search/api/src/main/res/values/strings.xmlnew file mode 100644index 000000000..d2d218493--- /dev/null+++ b/feature/search/api/src/main/res/values/strings.xml@@ -0,0 +1,29 @@+<?xml version="1.0" encoding="utf-8"?>+<!--+ Copyright 2023 The Android Open Source Project++ Licensed under the Apache License, Version 2.0 (the "License");+ you may not use this file except in compliance with the License.+ You may obtain a copy of the License at++ http://www.apache.org/licenses/LICENSE-2.0++ Unless required by applicable law or agreed to in writing, software+ distributed under the License is distributed on an "AS IS" BASIS,+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.+ See the License for the specific language governing permissions and+ limitations under the License.+-->+<resources>+ <string name="feature_search_api_title">Search</string>+ <string name="feature_search_api_clear_search_text_content_desc">Clear search text</string>+ <string name="feature_search_api_result_not_found">Sorry, there is no content found for your search \"%1$s\"</string>+ <string name="feature_search_api_not_ready">Sorry, we are still processing the search index. Please come back later</string>+ <string name="feature_search_api_try_another_search">Try another search or explorer </string>+ <string name="feature_search_api_interests">Interests</string>+ <string name="feature_search_api_to_browse_topics"> to browse topics</string>+ <string name="feature_search_api_topics">Topics</string>+ <string name="feature_search_api_updates">Updates</string>+ <string name="feature_search_api_recent_searches">Recent searches</string>+ <string name="feature_search_api_clear_recent_searches_content_desc">Clear searches</string>+</resources>diff --git a/feature/search/src/test/kotlin/com/google/samples/apps/nowinandroid/feature/search/SearchViewModelTest.kt b/feature/search/api/src/test/kotlin/com/google/samples/apps/nowinandroid/feature/search/api/SearchViewModelTest.ktsimilarity index 93%rename from feature/search/src/test/kotlin/com/google/samples/apps/nowinandroid/feature/search/SearchViewModelTest.ktrename to feature/search/api/src/test/kotlin/com/google/samples/apps/nowinandroid/feature/search/api/SearchViewModelTest.ktindex 1b866cec2..7b719b1cc 100644--- a/feature/search/src/test/kotlin/com/google/samples/apps/nowinandroid/feature/search/SearchViewModelTest.kt+++ b/feature/search/api/src/test/kotlin/com/google/samples/apps/nowinandroid/feature/search/api/SearchViewModelTest.kt@@ -1,5 +1,5 @@/*- * Copyright 2023 The Android Open Source Project+ * Copyright 2022 The Android Open Source Project** Licensed under the Apache License, Version 2.0 (the "License");* you may not use this file except in compliance with the License.@@ -14,7 +14,7 @@* limitations under the License.*/-package com.google.samples.apps.nowinandroid.feature.search+package com.google.samples.apps.nowinandroid.feature.search.apiimport androidx.lifecycle.SavedStateHandleimport com.google.samples.apps.nowinandroid.core.analytics.NoOpAnalyticsHelper@@ -27,10 +27,10 @@ import com.google.samples.apps.nowinandroid.core.testing.repository.TestSearchCoimport com.google.samples.apps.nowinandroid.core.testing.repository.TestUserDataRepositoryimport com.google.samples.apps.nowinandroid.core.testing.repository.emptyUserDataimport com.google.samples.apps.nowinandroid.core.testing.util.MainDispatcherRule-import com.google.samples.apps.nowinandroid.feature.search.RecentSearchQueriesUiState.Success-import com.google.samples.apps.nowinandroid.feature.search.SearchResultUiState.EmptyQuery-import com.google.samples.apps.nowinandroid.feature.search.SearchResultUiState.Loading-import com.google.samples.apps.nowinandroid.feature.search.SearchResultUiState.SearchNotReady+import com.google.samples.apps.nowinandroid.feature.search.api.RecentSearchQueriesUiState.Success+import com.google.samples.apps.nowinandroid.feature.search.api.SearchResultUiState.EmptyQuery+import com.google.samples.apps.nowinandroid.feature.search.api.SearchResultUiState.Loading+import com.google.samples.apps.nowinandroid.feature.search.api.SearchResultUiState.SearchNotReadyimport kotlinx.coroutines.flow.collectimport kotlinx.coroutines.flow.firstimport kotlinx.coroutines.launchdiff --git a/feature/search/impl/.gitignore b/feature/search/impl/.gitignorenew file mode 100644index 000000000..42afabfd2--- /dev/null+++ b/feature/search/impl/.gitignore@@ -0,0 +1 @@+/build\ No newline at end of filediff --git a/feature/search/impl/build.gradle.kts b/feature/search/impl/build.gradle.ktsnew file mode 100644index 000000000..abb0feacd--- /dev/null+++ b/feature/search/impl/build.gradle.kts@@ -0,0 +1,25 @@+/*+ * Copyright 2023 The Android Open Source Project+ *+ * Licensed under the Apache License, Version 2.0 (the "License");+ * you may not use this file except in compliance with the License.+ * You may obtain a copy of the License at+ *+ * https://www.apache.org/licenses/LICENSE-2.0+ *+ * Unless required by applicable law or agreed to in writing, software+ * distributed under the License is distributed on an "AS IS" BASIS,+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.+ * See the License for the specific language governing permissions and+ * limitations under the License.+ */++plugins {+ alias(libs.plugins.nowinandroid.android.feature)+ alias(libs.plugins.nowinandroid.android.library.compose)+ alias(libs.plugins.nowinandroid.android.library.jacoco)+}++android {+ namespace = "com.google.samples.apps.nowinandroid.feature.search.impl"+}\ No newline at end of filediff --git a/feature/search/src/main/res/values/strings.xml b/feature/search/src/main/res/values/strings.xmldeleted file mode 100644index e11576747..000000000--- a/feature/search/src/main/res/values/strings.xml+++ /dev/null@@ -1,29 +0,0 @@-<?xml version="1.0" encoding="utf-8"?>-<!--- Copyright 2023 The Android Open Source Project-- Licensed under the Apache License, Version 2.0 (the "License");- you may not use this file except in compliance with the License.- You may obtain a copy of the License at-- http://www.apache.org/licenses/LICENSE-2.0-- Unless required by applicable law or agreed to in writing, software- distributed under the License is distributed on an "AS IS" BASIS,- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.- See the License for the specific language governing permissions and- limitations under the License.--->-<resources>- <string name="feature_search_title">Search</string>- <string name="feature_search_clear_search_text_content_desc">Clear search text</string>- <string name="feature_search_result_not_found">Sorry, there is no content found for your search \"%1$s\"</string>- <string name="feature_search_not_ready">Sorry, we are still processing the search index. Please come back later</string>- <string name="feature_search_try_another_search">Try another search or explorer </string>- <string name="feature_search_interests">Interests</string>- <string name="feature_search_to_browse_topics"> to browse topics</string>- <string name="feature_search_topics">Topics</string>- <string name="feature_search_updates">Updates</string>- <string name="feature_search_recent_searches">Recent searches</string>- <string name="feature_search_clear_recent_searches_content_desc">Clear searches</string>-</resources>diff --git a/feature/settings/api/.gitignore b/feature/settings/api/.gitignorenew file mode 100644index 000000000..42afabfd2--- /dev/null+++ b/feature/settings/api/.gitignore@@ -0,0 +1 @@+/build\ No newline at end of filediff --git a/feature/settings/build.gradle.kts b/feature/settings/api/build.gradle.ktssimilarity index 98%rename from feature/settings/build.gradle.ktsrename to feature/settings/api/build.gradle.ktsindex 15d65204d..d29e024b2 100644--- a/feature/settings/build.gradle.kts+++ b/feature/settings/api/build.gradle.kts@@ -21,7 +21,7 @@ plugins {}android {- namespace = "com.google.samples.apps.nowinandroid.feature.settings"+ namespace = "com.google.samples.apps.nowinandroid.feature.settings.api"}dependencies {diff --git a/feature/settings/src/androidTest/kotlin/com/google/samples/apps/nowinandroid/feature/settings/SettingsDialogTest.kt b/feature/settings/api/src/androidTest/kotlin/com/google/samples/apps/nowinandroid/feature/settings/api/SettingsDialogTest.ktsimilarity index 96%rename from feature/settings/src/androidTest/kotlin/com/google/samples/apps/nowinandroid/feature/settings/SettingsDialogTest.ktrename to feature/settings/api/src/androidTest/kotlin/com/google/samples/apps/nowinandroid/feature/settings/api/SettingsDialogTest.ktindex 790b5964d..c92894ee0 100644--- a/feature/settings/src/androidTest/kotlin/com/google/samples/apps/nowinandroid/feature/settings/SettingsDialogTest.kt+++ b/feature/settings/api/src/androidTest/kotlin/com/google/samples/apps/nowinandroid/feature/settings/api/SettingsDialogTest.kt@@ -14,7 +14,7 @@* limitations under the License.*/-package com.google.samples.apps.nowinandroid.feature.settings+package com.google.samples.apps.nowinandroid.feature.settings.apiimport androidx.activity.ComponentActivityimport androidx.compose.ui.test.assertIsSelected@@ -23,8 +23,8 @@ import androidx.compose.ui.test.onNodeWithTextimport com.google.samples.apps.nowinandroid.core.model.data.DarkThemeConfig.DARKimport com.google.samples.apps.nowinandroid.core.model.data.ThemeBrand.ANDROIDimport com.google.samples.apps.nowinandroid.core.model.data.ThemeBrand.DEFAULT-import com.google.samples.apps.nowinandroid.feature.settings.SettingsUiState.Loading-import com.google.samples.apps.nowinandroid.feature.settings.SettingsUiState.Success+import com.google.samples.apps.nowinandroid.feature.settings.api.SettingsUiState.Loading+import com.google.samples.apps.nowinandroid.feature.settings.api.SettingsUiState.Successimport org.junit.Ruleimport org.junit.Testdiff --git a/feature/settings/api/src/main/AndroidManifest.xml b/feature/settings/api/src/main/AndroidManifest.xmlnew file mode 100644index 000000000..00b4c35bd--- /dev/null+++ b/feature/settings/api/src/main/AndroidManifest.xml@@ -0,0 +1,27 @@+<?xml version="1.0" encoding="utf-8"?>+<!--+ ~ Copyright 2022 The Android Open Source Project+ ~+ ~ Licensed under the Apache License, Version 2.0 (the "License");+ ~ you may not use this file except in compliance with the License.+ ~ You may obtain a copy of the License at+ ~+ ~ https://www.apache.org/licenses/LICENSE-2.0+ ~+ ~ Unless required by applicable law or agreed to in writing, software+ ~ distributed under the License is distributed on an "AS IS" BASIS,+ ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.+ ~ See the License for the specific language governing permissions and+ ~ limitations under the License.+ -->+<manifest xmlns:android="http://schemas.android.com/apk/res/android">+ <application>+ <activity+ android:name="com.google.android.gms.oss.licenses.OssLicensesMenuActivity"+ android:theme="@style/Theme.AppCompat" />++ <activity+ android:name="com.google.android.gms.oss.licenses.OssLicensesActivity"+ android:theme="@style/Theme.AppCompat" />+ </application>+</manifest>diff --git a/feature/settings/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/settings/SettingsDialog.kt b/feature/settings/api/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/settings/api/SettingsDialog.ktsimilarity index 97%rename from feature/settings/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/settings/SettingsDialog.ktrename to feature/settings/api/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/settings/api/SettingsDialog.ktindex ad7f30f43..0d544598e 100644--- a/feature/settings/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/settings/SettingsDialog.kt+++ b/feature/settings/api/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/settings/api/SettingsDialog.kt@@ -16,7 +16,7 @@@file:Suppress("ktlint:standard:max-line-length")-package com.google.samples.apps.nowinandroid.feature.settings+package com.google.samples.apps.nowinandroid.feature.settings.apiimport android.content.Intentimport androidx.compose.animation.AnimatedVisibility@@ -66,9 +66,9 @@ import com.google.samples.apps.nowinandroid.core.model.data.ThemeBrandimport com.google.samples.apps.nowinandroid.core.model.data.ThemeBrand.ANDROIDimport com.google.samples.apps.nowinandroid.core.model.data.ThemeBrand.DEFAULTimport com.google.samples.apps.nowinandroid.core.ui.TrackScreenViewEvent-import com.google.samples.apps.nowinandroid.feature.settings.R.string-import com.google.samples.apps.nowinandroid.feature.settings.SettingsUiState.Loading-import com.google.samples.apps.nowinandroid.feature.settings.SettingsUiState.Success+import com.google.samples.apps.nowinandroid.feature.settings.api.R.string+import com.google.samples.apps.nowinandroid.feature.settings.api.SettingsUiState.Loading+import com.google.samples.apps.nowinandroid.feature.settings.api.SettingsUiState.Success@Composablefun SettingsDialog(diff --git a/feature/settings/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/settings/SettingsViewModel.kt b/feature/settings/api/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/settings/api/SettingsViewModel.ktsimilarity index 92%rename from feature/settings/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/settings/SettingsViewModel.ktrename to feature/settings/api/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/settings/api/SettingsViewModel.ktindex 123c84d1c..f34c72f0c 100644--- a/feature/settings/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/settings/SettingsViewModel.kt+++ b/feature/settings/api/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/settings/api/SettingsViewModel.kt@@ -14,15 +14,15 @@* limitations under the License.*/-package com.google.samples.apps.nowinandroid.feature.settings+package com.google.samples.apps.nowinandroid.feature.settings.apiimport androidx.lifecycle.ViewModelimport androidx.lifecycle.viewModelScopeimport com.google.samples.apps.nowinandroid.core.data.repository.UserDataRepositoryimport com.google.samples.apps.nowinandroid.core.model.data.DarkThemeConfigimport com.google.samples.apps.nowinandroid.core.model.data.ThemeBrand-import com.google.samples.apps.nowinandroid.feature.settings.SettingsUiState.Loading-import com.google.samples.apps.nowinandroid.feature.settings.SettingsUiState.Success+import com.google.samples.apps.nowinandroid.feature.settings.api.SettingsUiState.Loading+import com.google.samples.apps.nowinandroid.feature.settings.api.SettingsUiState.Successimport dagger.hilt.android.lifecycle.HiltViewModelimport kotlinx.coroutines.flow.SharingStarted.Companion.WhileSubscribedimport kotlinx.coroutines.flow.StateFlowdiff --git a/feature/settings/src/main/res/values/strings.xml b/feature/settings/api/src/main/res/values/strings.xmlsimilarity index 100%rename from feature/settings/src/main/res/values/strings.xmlrename to feature/settings/api/src/main/res/values/strings.xmldiff --git a/feature/settings/src/test/kotlin/com/google/samples/apps/nowinandroid/feature/settings/SettingsViewModelTest.kt b/feature/settings/api/src/test/kotlin/com/google/samples/apps/nowinandroid/feature/settings/api/SettingsViewModelTest.ktsimilarity index 90%rename from feature/settings/src/test/kotlin/com/google/samples/apps/nowinandroid/feature/settings/SettingsViewModelTest.ktrename to feature/settings/api/src/test/kotlin/com/google/samples/apps/nowinandroid/feature/settings/api/SettingsViewModelTest.ktindex f977612a1..31b73df5b 100644--- a/feature/settings/src/test/kotlin/com/google/samples/apps/nowinandroid/feature/settings/SettingsViewModelTest.kt+++ b/feature/settings/api/src/test/kotlin/com/google/samples/apps/nowinandroid/feature/settings/api/SettingsViewModelTest.kt@@ -14,14 +14,14 @@* limitations under the License.*/-package com.google.samples.apps.nowinandroid.feature.settings+package com.google.samples.apps.nowinandroid.feature.settings.apiimport com.google.samples.apps.nowinandroid.core.model.data.DarkThemeConfig.DARKimport com.google.samples.apps.nowinandroid.core.model.data.ThemeBrand.ANDROIDimport com.google.samples.apps.nowinandroid.core.testing.repository.TestUserDataRepositoryimport com.google.samples.apps.nowinandroid.core.testing.util.MainDispatcherRule-import com.google.samples.apps.nowinandroid.feature.settings.SettingsUiState.Loading-import com.google.samples.apps.nowinandroid.feature.settings.SettingsUiState.Success+import com.google.samples.apps.nowinandroid.feature.settings.api.SettingsUiState.Loading+import com.google.samples.apps.nowinandroid.feature.settings.api.SettingsUiState.Successimport kotlinx.coroutines.flow.collectimport kotlinx.coroutines.launchimport kotlinx.coroutines.test.UnconfinedTestDispatcherdiff --git a/feature/settings/src/main/AndroidManifest.xml b/feature/settings/src/main/AndroidManifest.xmldeleted file mode 100644index 1fd9557d1..000000000--- a/feature/settings/src/main/AndroidManifest.xml+++ /dev/null@@ -1,27 +0,0 @@-<?xml version="1.0" encoding="utf-8"?>-<!--- Copyright 2022 The Android Open Source Project-- Licensed under the Apache License, Version 2.0 (the "License");- you may not use this file except in compliance with the License.- You may obtain a copy of the License at-- http://www.apache.org/licenses/LICENSE-2.0-- Unless required by applicable law or agreed to in writing, software- distributed under the License is distributed on an "AS IS" BASIS,- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.- See the License for the specific language governing permissions and- limitations under the License.--->-<manifest xmlns:android="http://schemas.android.com/apk/res/android">- <application>- <activity- android:name="com.google.android.gms.oss.licenses.OssLicensesMenuActivity"- android:theme="@style/Theme.AppCompat" />-- <activity- android:name="com.google.android.gms.oss.licenses.OssLicensesActivity"- android:theme="@style/Theme.AppCompat" />- </application>-</manifest>diff --git a/feature/topic/api/.gitignore b/feature/topic/api/.gitignorenew file mode 100644index 000000000..42afabfd2--- /dev/null+++ b/feature/topic/api/.gitignore@@ -0,0 +1 @@+/build\ No newline at end of filediff --git a/feature/topic/build.gradle.kts b/feature/topic/api/build.gradle.ktssimilarity index 99%rename from feature/topic/build.gradle.ktsrename to feature/topic/api/build.gradle.ktsindex bd8b59ec8..00678fa35 100644--- a/feature/topic/build.gradle.kts+++ b/feature/topic/api/build.gradle.kts@@ -21,7 +21,7 @@ plugins {}android {- namespace = "com.google.samples.apps.nowinandroid.feature.topic"+ namespace = "com.google.samples.apps.nowinandroid.feature.topic.api"}dependencies {diff --git a/feature/topic/src/androidTest/kotlin/com/google/samples/apps/nowinandroid/feature/topic/TopicScreenTest.kt b/feature/topic/api/src/androidTest/kotlin/com/google/samples/apps/nowinandroid/feature/topic/api/TopicScreenTest.ktsimilarity index 97%rename from feature/topic/src/androidTest/kotlin/com/google/samples/apps/nowinandroid/feature/topic/TopicScreenTest.ktrename to feature/topic/api/src/androidTest/kotlin/com/google/samples/apps/nowinandroid/feature/topic/api/TopicScreenTest.ktindex 2b87baf9e..5c80f67c3 100644--- a/feature/topic/src/androidTest/kotlin/com/google/samples/apps/nowinandroid/feature/topic/TopicScreenTest.kt+++ b/feature/topic/api/src/androidTest/kotlin/com/google/samples/apps/nowinandroid/feature/topic/api/TopicScreenTest.kt@@ -14,7 +14,7 @@* limitations under the License.*/-package com.google.samples.apps.nowinandroid.feature.topic+package com.google.samples.apps.nowinandroid.feature.topic.apiimport androidx.activity.ComponentActivityimport androidx.compose.ui.test.hasScrollToNodeAction@@ -45,7 +45,7 @@ class TopicScreenTest {@Beforefun setup() {composeTestRule.activity.apply {- topicLoading = getString(R.string.feature_topic_loading)+ topicLoading = getString(R.string.feature_topic_api_loading)}}diff --git a/feature/topic/src/main/AndroidManifest.xml b/feature/topic/api/src/main/AndroidManifest.xmlsimilarity index 100%rename from feature/topic/src/main/AndroidManifest.xmlrename to feature/topic/api/src/main/AndroidManifest.xmldiff --git a/feature/topic/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/topic/TopicDetailPlaceholder.kt b/feature/topic/api/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/topic/api/TopicDetailPlaceholder.ktsimilarity index 95%rename from feature/topic/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/topic/TopicDetailPlaceholder.ktrename to feature/topic/api/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/topic/api/TopicDetailPlaceholder.ktindex 627fb8fb3..2519fa78a 100644--- a/feature/topic/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/topic/TopicDetailPlaceholder.kt+++ b/feature/topic/api/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/topic/api/TopicDetailPlaceholder.kt@@ -14,7 +14,7 @@* limitations under the License.*/-package com.google.samples.apps.nowinandroid.feature.topic+package com.google.samples.apps.nowinandroid.feature.topic.apiimport androidx.compose.foundation.layout.Arrangementimport androidx.compose.foundation.layout.Column@@ -50,12 +50,12 @@ fun TopicDetailPlaceholder(modifier: Modifier = Modifier) {),) {Icon(- painter = painterResource(id = R.drawable.feature_topic_ic_topic_placeholder),+ painter = painterResource(id = R.drawable.feature_topic_api_ic_topic_placeholder),contentDescription = null,tint = MaterialTheme.colorScheme.primary,)Text(- text = stringResource(id = R.string.feature_topic_select_an_interest),+ text = stringResource(id = R.string.feature_topic_api_select_an_interest),style = MaterialTheme.typography.titleLarge,)}diff --git a/feature/topic/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/topic/TopicScreen.kt b/feature/topic/api/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/topic/api/TopicScreen.ktsimilarity index 98%rename from feature/topic/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/topic/TopicScreen.ktrename to feature/topic/api/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/topic/api/TopicScreen.ktindex 8ef0d786d..4f2d490c9 100644--- a/feature/topic/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/topic/TopicScreen.kt+++ b/feature/topic/api/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/topic/api/TopicScreen.kt@@ -14,7 +14,7 @@* limitations under the License.*/-package com.google.samples.apps.nowinandroid.feature.topic+package com.google.samples.apps.nowinandroid.feature.topic.apiimport androidx.annotation.VisibleForTestingimport androidx.compose.foundation.gestures.Orientation@@ -68,7 +68,7 @@ import com.google.samples.apps.nowinandroid.core.ui.TrackScreenViewEventimport com.google.samples.apps.nowinandroid.core.ui.TrackScrollJankimport com.google.samples.apps.nowinandroid.core.ui.UserNewsResourcePreviewParameterProviderimport com.google.samples.apps.nowinandroid.core.ui.userNewsResourceCardItems-import com.google.samples.apps.nowinandroid.feature.topic.R.string+import com.google.samples.apps.nowinandroid.feature.topic.api.R.string@Composablefun TopicScreen(@@ -124,7 +124,7 @@ internal fun TopicScreen(TopicUiState.Loading -> item {NiaLoadingWheel(modifier = modifier,- contentDesc = stringResource(id = string.feature_topic_loading),+ contentDesc = stringResource(id = string.feature_topic_api_loading),)}diff --git a/feature/topic/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/topic/TopicViewModel.kt b/feature/topic/api/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/topic/api/TopicViewModel.ktsimilarity index 98%rename from feature/topic/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/topic/TopicViewModel.ktrename to feature/topic/api/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/topic/api/TopicViewModel.ktindex 8865da463..4a8b107a6 100644--- a/feature/topic/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/topic/TopicViewModel.kt+++ b/feature/topic/api/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/topic/api/TopicViewModel.kt@@ -14,7 +14,7 @@* limitations under the License.*/-package com.google.samples.apps.nowinandroid.feature.topic+package com.google.samples.apps.nowinandroid.feature.topic.apiimport androidx.lifecycle.ViewModelimport androidx.lifecycle.viewModelScopediff --git a/feature/topic/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/topic/navigation/TopicNavigation.kt b/feature/topic/api/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/topic/api/navigation/TopicNavigation.ktsimilarity index 88%rename from feature/topic/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/topic/navigation/TopicNavigation.ktrename to feature/topic/api/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/topic/api/navigation/TopicNavigation.ktindex 69059c81d..315389908 100644--- a/feature/topic/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/topic/navigation/TopicNavigation.kt+++ b/feature/topic/api/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/topic/api/navigation/TopicNavigation.kt@@ -14,7 +14,7 @@* limitations under the License.*/-package com.google.samples.apps.nowinandroid.feature.topic.navigation+package com.google.samples.apps.nowinandroid.feature.topic.api.navigationimport androidx.hilt.navigation.compose.hiltViewModelimport androidx.navigation.NavController@@ -22,8 +22,8 @@ import androidx.navigation.NavGraphBuilderimport androidx.navigation.NavOptionsBuilderimport androidx.navigation.compose.composableimport androidx.navigation.toRoute-import com.google.samples.apps.nowinandroid.feature.topic.TopicScreen-import com.google.samples.apps.nowinandroid.feature.topic.TopicViewModel+import com.google.samples.apps.nowinandroid.feature.topic.api.TopicScreen+import com.google.samples.apps.nowinandroid.feature.topic.api.TopicViewModelimport kotlinx.serialization.Serializable@Serializable data class TopicRoute(val id: String)diff --git a/feature/topic/src/main/res/drawable/feature_topic_ic_topic_placeholder.xml b/feature/topic/api/src/main/res/drawable/feature_topic_api_ic_topic_placeholder.xmlsimilarity index 75%rename from feature/topic/src/main/res/drawable/feature_topic_ic_topic_placeholder.xmlrename to feature/topic/api/src/main/res/drawable/feature_topic_api_ic_topic_placeholder.xmlindex 0518401da..49975a008 100644--- a/feature/topic/src/main/res/drawable/feature_topic_ic_topic_placeholder.xml+++ b/feature/topic/api/src/main/res/drawable/feature_topic_api_ic_topic_placeholder.xml@@ -1,19 +1,19 @@<?xml version="1.0" encoding="utf-8"?><!--- Copyright 2024 The Android Open Source Project-- Licensed under the Apache License, Version 2.0 (the "License");- you may not use this file except in compliance with the License.- You may obtain a copy of the License at-- http://www.apache.org/licenses/LICENSE-2.0-- Unless required by applicable law or agreed to in writing, software- distributed under the License is distributed on an "AS IS" BASIS,- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.- See the License for the specific language governing permissions and- limitations under the License.--->+ ~ Copyright 2024 The Android Open Source Project+ ~+ ~ Licensed under the Apache License, Version 2.0 (the "License");+ ~ you may not use this file except in compliance with the License.+ ~ You may obtain a copy of the License at+ ~+ ~ https://www.apache.org/licenses/LICENSE-2.0+ ~+ ~ Unless required by applicable law or agreed to in writing, software+ ~ distributed under the License is distributed on an "AS IS" BASIS,+ ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.+ ~ See the License for the specific language governing permissions and+ ~ limitations under the License.+ --><vector xmlns:android="http://schemas.android.com/apk/res/android"android:width="64dp"android:height="64dp"@@ -52,4 +52,4 @@android:strokeColor="#8C4190"android:strokeLineCap="round"android:strokeWidth="2" />-</vector>+</vector>\ No newline at end of filediff --git a/feature/topic/src/main/res/values/strings.xml b/feature/topic/api/src/main/res/values/strings.xmlsimilarity index 82%rename from feature/topic/src/main/res/values/strings.xmlrename to feature/topic/api/src/main/res/values/strings.xmlindex fe4a6dc29..25f8a7126 100644--- a/feature/topic/src/main/res/values/strings.xml+++ b/feature/topic/api/src/main/res/values/strings.xml@@ -15,6 +15,6 @@limitations under the License.--><resources>- <string name="feature_topic_loading">Loading topic</string>- <string name="feature_topic_select_an_interest">Select an Interest</string>+ <string name="feature_topic_api_loading">Loading topic</string>+ <string name="feature_topic_api_select_an_interest">Select an Interest</string></resources>diff --git a/feature/topic/src/test/kotlin/com/google/samples/apps/nowinandroid/feature/topic/TopicViewModelTest.kt b/feature/topic/api/src/test/kotlin/com/google/samples/apps/nowinandroid/feature/topic/api/TopicViewModelTest.ktsimilarity index 99%rename from feature/topic/src/test/kotlin/com/google/samples/apps/nowinandroid/feature/topic/TopicViewModelTest.ktrename to feature/topic/api/src/test/kotlin/com/google/samples/apps/nowinandroid/feature/topic/api/TopicViewModelTest.ktindex 58242110d..152e582d6 100644--- a/feature/topic/src/test/kotlin/com/google/samples/apps/nowinandroid/feature/topic/TopicViewModelTest.kt+++ b/feature/topic/api/src/test/kotlin/com/google/samples/apps/nowinandroid/feature/topic/api/TopicViewModelTest.kt@@ -14,7 +14,7 @@* limitations under the License.*/-package com.google.samples.apps.nowinandroid.feature.topic+package com.google.samples.apps.nowinandroid.feature.topic.apiimport com.google.samples.apps.nowinandroid.core.data.repository.CompositeUserNewsResourceRepositoryimport com.google.samples.apps.nowinandroid.core.model.data.FollowableTopicdiff --git a/feature/topic/impl/.gitignore b/feature/topic/impl/.gitignorenew file mode 100644index 000000000..42afabfd2--- /dev/null+++ b/feature/topic/impl/.gitignore@@ -0,0 +1 @@+/build\ No newline at end of filediff --git a/feature/topic/impl/build.gradle.kts b/feature/topic/impl/build.gradle.ktsnew file mode 100644index 000000000..528ec4e4a--- /dev/null+++ b/feature/topic/impl/build.gradle.kts@@ -0,0 +1,25 @@+/*+* Copyright 2022 The Android Open Source Project+*+* Licensed under the Apache License, Version 2.0 (the "License");+* you may not use this file except in compliance with the License.+* You may obtain a copy of the License at+*+* https://www.apache.org/licenses/LICENSE-2.0+*+* Unless required by applicable law or agreed to in writing, software+* distributed under the License is distributed on an "AS IS" BASIS,+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.+* See the License for the specific language governing permissions and+* limitations under the License.+*/++plugins {+ alias(libs.plugins.nowinandroid.android.feature)+ alias(libs.plugins.nowinandroid.android.library.compose)+ alias(libs.plugins.nowinandroid.android.library.jacoco)+}++android {+ namespace = "com.google.samples.apps.nowinandroid.feature.topic.impl"+}\ No newline at end of filediff --git a/gradle/libs.versions.toml b/gradle/libs.versions.tomlindex 0a6132d7d..1fa507a84 100644--- a/gradle/libs.versions.toml+++ b/gradle/libs.versions.toml@@ -7,7 +7,7 @@ androidTools = "31.13.1"androidxActivity = "1.9.3"androidxAppCompat = "1.7.0"androidxBrowser = "1.8.0"-androidxComposeBom = "2025.08.01"+androidxComposeBom = "2025.09.01"androidxComposeFoundation = "1.8.0-alpha07"androidxComposeMaterial3Adaptive = "1.1.0-rc01"androidxComposeRuntimeTracing = "1.7.6"@@ -18,6 +18,7 @@ androidxEspresso = "3.6.1"androidxHiltNavigationCompose = "1.2.0"androidxLifecycle = "2.8.7"androidxLintGradle = "1.0.0-alpha03"+androidxLifecycleViewModelNavigation3 = "2.10.0-alpha05"androidxMacroBenchmark = "1.4.1"androidxMetrics = "1.0.0-beta01"androidxNavigation = "2.8.5"diff --git a/settings.gradle.kts b/settings.gradle.ktsindex 2b8c6e45c..1d19c11c8 100644--- a/settings.gradle.kts+++ b/settings.gradle.kts@@ -65,12 +65,17 @@ include(":core:screenshot-testing")include(":core:testing")include(":core:ui")-include(":feature:foryou")-include(":feature:interests")-include(":feature:bookmarks")-include(":feature:topic")-include(":feature:search")-include(":feature:settings")+include(":feature:foryou:api")+include(":feature:foryou:impl")+include(":feature:interests:api")+include(":feature:interests:impl")+include(":feature:bookmarks:api")+include(":feature:bookmarks:impl")+include(":feature:topic:api")+include(":feature:topic:impl")+include(":feature:search:api")+include(":feature:search:impl")+include(":feature:settings:api")include(":lint")include(":sync:work")include(":sync:sync-test")