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.kt
index 5861cda58..3889a0c65 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
@@ -51,7 +51,7 @@ import javax.inject.Inject
import kotlin.properties.ReadOnlyProperty
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.interests.R as FeatureInterestsR
+import com.google.samples.apps.nowinandroid.feature.search.R as FeatureSearchR
import com.google.samples.apps.nowinandroid.feature.settings.R as SettingsR
/**
@@ -93,15 +93,15 @@ class NavigationTest {
ReadOnlyProperty<Any?, String> { _, _ -> activity.getString(resId) }
// The strings used for matching in these tests
- private val navigateUp by composeTestRule.stringResource(FeatureForyouR.string.navigate_up)
- private val forYou by composeTestRule.stringResource(FeatureForyouR.string.for_you)
- private val interests by composeTestRule.stringResource(FeatureInterestsR.string.interests)
+ 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 interests by composeTestRule.stringResource(FeatureSearchR.string.feature_search_interests)
private val sampleTopic = "Headlines"
private val appName by composeTestRule.stringResource(R.string.app_name)
- private val saved by composeTestRule.stringResource(BookmarksR.string.saved)
- private val settings by composeTestRule.stringResource(SettingsR.string.top_app_bar_action_icon_description)
- private val brand by composeTestRule.stringResource(SettingsR.string.brand_android)
- private val ok by composeTestRule.stringResource(SettingsR.string.dismiss_dialog_button_text)
+ private val saved by composeTestRule.stringResource(BookmarksR.string.feature_bookmarks_title)
+ private val settings by composeTestRule.stringResource(SettingsR.string.feature_settings_top_app_bar_action_icon_description)
+ private val brand by composeTestRule.stringResource(SettingsR.string.feature_settings_brand_android)
+ private val ok by composeTestRule.stringResource(SettingsR.string.feature_settings_dismiss_dialog_button_text)
@Before
fun setup() = hiltRule.inject()
diff --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.kt
index 8dbd0fcb6..aca7d54ab 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
@@ -21,7 +21,7 @@ import com.google.samples.apps.nowinandroid.R
import com.google.samples.apps.nowinandroid.core.designsystem.icon.NiaIcons
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.interests.R as interestsR
+import com.google.samples.apps.nowinandroid.feature.search.R as searchR
/**
* Type for the top level destinations in the application. Each of these destinations
@@ -37,19 +37,19 @@ enum class TopLevelDestination(
FOR_YOU(
selectedIcon = NiaIcons.Upcoming,
unselectedIcon = NiaIcons.UpcomingBorder,
- iconTextId = forYouR.string.for_you,
+ iconTextId = forYouR.string.feature_foryou_title,
titleTextId = R.string.app_name,
),
BOOKMARKS(
selectedIcon = NiaIcons.Bookmarks,
unselectedIcon = NiaIcons.BookmarksBorder,
- iconTextId = bookmarksR.string.saved,
- titleTextId = bookmarksR.string.saved,
+ iconTextId = bookmarksR.string.feature_bookmarks_title,
+ titleTextId = bookmarksR.string.feature_bookmarks_title,
),
INTERESTS(
selectedIcon = NiaIcons.Grid3x3,
unselectedIcon = NiaIcons.Grid3x3,
- iconTextId = interestsR.string.interests,
- titleTextId = interestsR.string.interests,
+ iconTextId = searchR.string.feature_search_interests,
+ titleTextId = searchR.string.feature_search_interests,
),
}
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.kt
index aa85afebd..1660581a4 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
@@ -183,11 +183,11 @@ fun NiaApp(
titleRes = destination.titleTextId,
navigationIcon = NiaIcons.Search,
navigationIconContentDescription = stringResource(
- id = settingsR.string.top_app_bar_navigation_icon_description,
+ id = settingsR.string.feature_settings_top_app_bar_navigation_icon_description,
),
actionIcon = NiaIcons.Settings,
actionIconContentDescription = stringResource(
- id = settingsR.string.top_app_bar_action_icon_description,
+ id = settingsR.string.feature_settings_top_app_bar_action_icon_description,
),
colors = TopAppBarDefaults.centerAlignedTopAppBarColors(
containerColor = Color.Transparent,
diff --git a/build-logic/convention/src/main/kotlin/AndroidLibraryConventionPlugin.kt b/build-logic/convention/src/main/kotlin/AndroidLibraryConventionPlugin.kt
index ef84cfbb4..995b922a2 100644
--- a/build-logic/convention/src/main/kotlin/AndroidLibraryConventionPlugin.kt
+++ b/build-logic/convention/src/main/kotlin/AndroidLibraryConventionPlugin.kt
@@ -41,6 +41,9 @@ class AndroidLibraryConventionPlugin : Plugin<Project> {
defaultConfig.targetSdk = 34
configureFlavors(this)
configureGradleManagedDevices(this)
+ // The resource prefix is derived from the module name,
+ // so resources inside ":core:module1" must be prefixed with "core_module1_"
+ resourcePrefix = path.split("""\W""".toRegex()).drop(1).distinct().joinToString(separator = "_").lowercase() + "_"
}
extensions.configure<LibraryAndroidComponentsExtension> {
configurePrintApksTask(this)
diff --git a/core/common/src/main/res/drawable-anydpi-v24/ic_nia_notification.xml b/core/common/src/main/res/drawable-anydpi-v24/core_common_ic_nia_notification.xml
similarity index 100%
rename from core/common/src/main/res/drawable-anydpi-v24/ic_nia_notification.xml
rename to core/common/src/main/res/drawable-anydpi-v24/core_common_ic_nia_notification.xml
diff --git a/core/common/src/main/res/drawable-hdpi/ic_nia_notification.png b/core/common/src/main/res/drawable-hdpi/core_common_ic_nia_notification.png
similarity index 100%
rename from core/common/src/main/res/drawable-hdpi/ic_nia_notification.png
rename to core/common/src/main/res/drawable-hdpi/core_common_ic_nia_notification.png
diff --git a/core/common/src/main/res/drawable-mdpi/ic_nia_notification.png b/core/common/src/main/res/drawable-mdpi/core_common_ic_nia_notification.png
similarity index 100%
rename from core/common/src/main/res/drawable-mdpi/ic_nia_notification.png
rename to core/common/src/main/res/drawable-mdpi/core_common_ic_nia_notification.png
diff --git a/core/common/src/main/res/drawable-xhdpi/ic_nia_notification.png b/core/common/src/main/res/drawable-xhdpi/core_common_ic_nia_notification.png
similarity index 100%
rename from core/common/src/main/res/drawable-xhdpi/ic_nia_notification.png
rename to core/common/src/main/res/drawable-xhdpi/core_common_ic_nia_notification.png
diff --git a/core/common/src/main/res/drawable-xxhdpi/ic_nia_notification.png b/core/common/src/main/res/drawable-xxhdpi/core_common_ic_nia_notification.png
similarity index 100%
rename from core/common/src/main/res/drawable-xxhdpi/ic_nia_notification.png
rename to core/common/src/main/res/drawable-xxhdpi/core_common_ic_nia_notification.png
diff --git a/core/designsystem/src/main/kotlin/com/google/samples/apps/nowinandroid/core/designsystem/component/DynamicAsyncImage.kt b/core/designsystem/src/main/kotlin/com/google/samples/apps/nowinandroid/core/designsystem/component/DynamicAsyncImage.kt
index cc352107b..bd22fa168 100644
--- a/core/designsystem/src/main/kotlin/com/google/samples/apps/nowinandroid/core/designsystem/component/DynamicAsyncImage.kt
+++ b/core/designsystem/src/main/kotlin/com/google/samples/apps/nowinandroid/core/designsystem/component/DynamicAsyncImage.kt
@@ -49,7 +49,7 @@ fun DynamicAsyncImage(
imageUrl: String,
contentDescription: String?,
modifier: Modifier = Modifier,
- placeholder: Painter = painterResource(R.drawable.ic_placeholder_default),
+ placeholder: Painter = painterResource(R.drawable.core_designsystem_ic_placeholder_default),
) {
val iconTint = LocalTintTheme.current.iconTint
var isLoading by remember { mutableStateOf(true) }
diff --git a/core/designsystem/src/main/res/drawable/ic_placeholder_default.xml b/core/designsystem/src/main/res/drawable/core_designsystem_ic_placeholder_default.xml
similarity index 100%
rename from core/designsystem/src/main/res/drawable/ic_placeholder_default.xml
rename to core/designsystem/src/main/res/drawable/core_designsystem_ic_placeholder_default.xml
diff --git a/core/notifications/src/main/kotlin/com/google/samples/apps/nowinandroid/core/notifications/SystemTrayNotifier.kt b/core/notifications/src/main/kotlin/com/google/samples/apps/nowinandroid/core/notifications/SystemTrayNotifier.kt
index 7e74f819c..79034524a 100644
--- a/core/notifications/src/main/kotlin/com/google/samples/apps/nowinandroid/core/notifications/SystemTrayNotifier.kt
+++ b/core/notifications/src/main/kotlin/com/google/samples/apps/nowinandroid/core/notifications/SystemTrayNotifier.kt
@@ -72,7 +72,7 @@ class SystemTrayNotifier @Inject constructor(
.map { newsResource ->
createNewsNotification {
setSmallIcon(
- com.google.samples.apps.nowinandroid.core.common.R.drawable.ic_nia_notification,
+ com.google.samples.apps.nowinandroid.core.common.R.drawable.core_common_ic_nia_notification,
)
.setContentTitle(newsResource.title)
.setContentText(newsResource.content)
@@ -83,13 +83,13 @@ class SystemTrayNotifier @Inject constructor(
}
val summaryNotification = createNewsNotification {
val title = getString(
- R.string.news_notification_group_summary,
+ R.string.core_notifications_news_notification_group_summary,
truncatedNewsResources.size,
)
setContentTitle(title)
.setContentText(title)
.setSmallIcon(
- com.google.samples.apps.nowinandroid.core.common.R.drawable.ic_nia_notification,
+ com.google.samples.apps.nowinandroid.core.common.R.drawable.core_common_ic_nia_notification,
)
// Build summary info into InboxStyle template.
.setStyle(newsNotificationStyle(truncatedNewsResources, title))
@@ -148,10 +148,10 @@ private fun Context.ensureNotificationChannelExists() {
val channel = NotificationChannel(
NEWS_NOTIFICATION_CHANNEL_ID,
- getString(R.string.news_notification_channel_name),
+ getString(R.string.core_notifications_news_notification_channel_name),
NotificationManager.IMPORTANCE_DEFAULT,
).apply {
- description = getString(R.string.news_notification_channel_description)
+ description = getString(R.string.core_notifications_news_notification_channel_description)
}
// Register the channel with the system
NotificationManagerCompat.from(this).createNotificationChannel(channel)
diff --git a/core/notifications/src/main/res/values/strings.xml b/core/notifications/src/main/res/values/strings.xml
index 5bb37b23a..88e492e77 100644
--- a/core/notifications/src/main/res/values/strings.xml
+++ b/core/notifications/src/main/res/values/strings.xml
@@ -15,7 +15,7 @@
limitations under the License.
-->
<resources>
- <string name="news_notification_channel_name">News updates</string>
- <string name="news_notification_channel_description">The latest updates on what\'s new in Android</string>
- <string name="news_notification_group_summary">%1$d news updates</string>
+ <string name="core_notifications_news_notification_channel_name">News updates</string>
+ <string name="core_notifications_news_notification_channel_description">The latest updates on what\'s new in Android</string>
+ <string name="core_notifications_news_notification_group_summary">%1$d news updates</string>
</resources>
diff --git a/core/ui/src/androidTest/kotlin/com/google/samples/apps/nowinandroid/core/ui/NewsResourceCardTest.kt b/core/ui/src/androidTest/kotlin/com/google/samples/apps/nowinandroid/core/ui/NewsResourceCardTest.kt
index a2fdbaee1..d0a124316 100644
--- a/core/ui/src/androidTest/kotlin/com/google/samples/apps/nowinandroid/core/ui/NewsResourceCardTest.kt
+++ b/core/ui/src/androidTest/kotlin/com/google/samples/apps/nowinandroid/core/ui/NewsResourceCardTest.kt
@@ -52,7 +52,7 @@ class NewsResourceCardTest {
composeTestRule
.onNodeWithText(
composeTestRule.activity.getString(
- R.string.card_meta_data_text,
+ R.string.core_ui_card_meta_data_text,
dateFormatted,
newsWithKnownResourceType.type,
),
@@ -123,7 +123,7 @@ class NewsResourceCardTest {
composeTestRule
.onNodeWithContentDescription(
composeTestRule.activity.getString(
- R.string.unread_resource_dot_content_description,
+ R.string.core_ui_unread_resource_dot_content_description,
),
)
.assertIsDisplayed()
@@ -147,7 +147,7 @@ class NewsResourceCardTest {
composeTestRule
.onNodeWithContentDescription(
composeTestRule.activity.getString(
- R.string.unread_resource_dot_content_description,
+ R.string.core_ui_unread_resource_dot_content_description,
),
)
.assertDoesNotExist()
diff --git a/core/ui/src/main/kotlin/com/google/samples/apps/nowinandroid/core/ui/NewsResourceCard.kt b/core/ui/src/main/kotlin/com/google/samples/apps/nowinandroid/core/ui/NewsResourceCard.kt
index 114e845d4..9eca6b141 100644
--- a/core/ui/src/main/kotlin/com/google/samples/apps/nowinandroid/core/ui/NewsResourceCard.kt
+++ b/core/ui/src/main/kotlin/com/google/samples/apps/nowinandroid/core/ui/NewsResourceCard.kt
@@ -91,7 +91,7 @@ fun NewsResourceCardExpanded(
onTopicClick: (String) -> Unit,
modifier: Modifier = Modifier,
) {
- val clickActionLabel = stringResource(R.string.card_tap_action)
+ val clickActionLabel = stringResource(R.string.core_ui_card_tap_action)
Card(
onClick = onClick,
shape = RoundedCornerShape(16.dp),
@@ -183,7 +183,7 @@ fun NewsResourceHeaderImage(
painter = if (isError.not() && !isLocalInspection) {
imageLoader
} else {
- painterResource(drawable.ic_placeholder_default)
+ painterResource(drawable.core_designsystem_ic_placeholder_default)
},
// TODO b/226661685: Investigate using alt text of image to populate content description
// decorative image,
@@ -213,13 +213,13 @@ fun BookmarkButton(
icon = {
Icon(
imageVector = NiaIcons.BookmarkBorder,
- contentDescription = stringResource(R.string.bookmark),
+ contentDescription = stringResource(R.string.core_ui_bookmark),
)
},
checkedIcon = {
Icon(
imageVector = NiaIcons.Bookmark,
- contentDescription = stringResource(R.string.unbookmark),
+ contentDescription = stringResource(R.string.core_ui_unbookmark),
)
},
)
@@ -230,7 +230,7 @@ fun NotificationDot(
color: Color,
modifier: Modifier = Modifier,
) {
- val description = stringResource(R.string.unread_resource_dot_content_description)
+ val description = stringResource(R.string.core_ui_unread_resource_dot_content_description)
Canvas(
modifier = modifier
.semantics { contentDescription = description },
@@ -274,7 +274,7 @@ fun NewsResourceMetaData(
val formattedDate = dateFormatted(publishDate)
Text(
if (resourceType.isNotBlank()) {
- stringResource(R.string.card_meta_data_text, formattedDate, resourceType)
+ stringResource(R.string.core_ui_card_meta_data_text, formattedDate, resourceType)
} else {
formattedDate
},
@@ -307,12 +307,12 @@ fun NewsResourceTopics(
text = {
val contentDescription = if (followableTopic.isFollowed) {
stringResource(
- R.string.topic_chip_content_description_when_followed,
+ R.string.core_ui_topic_chip_content_description_when_followed,
followableTopic.topic.name,
)
} else {
stringResource(
- R.string.topic_chip_content_description_when_not_followed,
+ R.string.core_ui_topic_chip_content_description_when_not_followed,
followableTopic.topic.name,
)
}
diff --git a/core/ui/src/main/res/values/strings.xml b/core/ui/src/main/res/values/strings.xml
index d21a5ea36..65a855fc9 100644
--- a/core/ui/src/main/res/values/strings.xml
+++ b/core/ui/src/main/res/values/strings.xml
@@ -15,15 +15,15 @@
limitations under the License.
-->
<resources>
- <string name="bookmark">Bookmark</string>
- <string name="unbookmark">Unbookmark</string>
- <string name="back">Back</string>
+ <string name="core_ui_bookmark">Bookmark</string>
+ <string name="core_ui_unbookmark">Unbookmark</string>
+ <string name="core_ui_back">Back</string>
- <string name="unread_resource_dot_content_description">Unread</string>
+ <string name="core_ui_unread_resource_dot_content_description">Unread</string>
- <string name="card_tap_action">Open Resource Link</string>
- <string name="card_meta_data_text">%1$s • %2$s</string>
+ <string name="core_ui_card_tap_action">Open Resource Link</string>
+ <string name="core_ui_card_meta_data_text">%1$s • %2$s</string>
- <string name="topic_chip_content_description_when_followed">%1$s is followed</string>
- <string name="topic_chip_content_description_when_not_followed">%1$s is not followed</string>
+ <string name="core_ui_topic_chip_content_description_when_followed">%1$s is followed</string>
+ <string name="core_ui_topic_chip_content_description_when_not_followed">%1$s is not followed</string>
</resources>
diff --git a/feature/bookmarks/src/androidTest/kotlin/com/google/samples/apps/nowinandroid/feature/bookmarks/BookmarksScreenTest.kt b/feature/bookmarks/src/androidTest/kotlin/com/google/samples/apps/nowinandroid/feature/bookmarks/BookmarksScreenTest.kt
index 6e432f2ab..3d684f9d1 100644
--- a/feature/bookmarks/src/androidTest/kotlin/com/google/samples/apps/nowinandroid/feature/bookmarks/BookmarksScreenTest.kt
+++ b/feature/bookmarks/src/androidTest/kotlin/com/google/samples/apps/nowinandroid/feature/bookmarks/BookmarksScreenTest.kt
@@ -59,7 +59,7 @@ class BookmarksScreenTest {
composeTestRule
.onNodeWithContentDescription(
- composeTestRule.activity.resources.getString(R.string.saved_loading),
+ composeTestRule.activity.resources.getString(R.string.feature_bookmarks_loading),
)
.assertExists()
}
@@ -125,7 +125,7 @@ class BookmarksScreenTest {
composeTestRule
.onAllNodesWithContentDescription(
composeTestRule.activity.getString(
- com.google.samples.apps.nowinandroid.core.ui.R.string.unbookmark,
+ com.google.samples.apps.nowinandroid.core.ui.R.string.core_ui_unbookmark,
),
).filter(
hasAnyAncestor(
@@ -156,13 +156,13 @@ class BookmarksScreenTest {
composeTestRule
.onNodeWithText(
- composeTestRule.activity.getString(R.string.bookmarks_empty_error),
+ composeTestRule.activity.getString(R.string.feature_bookmarks_empty_error),
)
.assertExists()
composeTestRule
.onNodeWithText(
- composeTestRule.activity.getString(R.string.bookmarks_empty_description),
+ composeTestRule.activity.getString(R.string.feature_bookmarks_empty_description),
)
.assertExists()
}
diff --git a/feature/bookmarks/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/bookmarks/BookmarksScreen.kt b/feature/bookmarks/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/bookmarks/BookmarksScreen.kt
index 7d51c6e84..d316b0bfd 100644
--- a/feature/bookmarks/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/bookmarks/BookmarksScreen.kt
+++ b/feature/bookmarks/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/bookmarks/BookmarksScreen.kt
@@ -113,8 +113,8 @@ internal fun BookmarksScreen(
undoBookmarkRemoval: () -> Unit = {},
clearUndoState: () -> Unit = {},
) {
- val bookmarkRemovedMessage = stringResource(id = R.string.bookmark_removed)
- val undoText = stringResource(id = R.string.undo)
+ val bookmarkRemovedMessage = stringResource(id = R.string.feature_bookmarks_removed)
+ val undoText = stringResource(id = R.string.feature_bookmarks_undo)
LaunchedEffect(shouldDisplayUndoBookmark) {
if (shouldDisplayUndoBookmark) {
@@ -163,7 +163,7 @@ private fun LoadingState(modifier: Modifier = Modifier) {
.fillMaxWidth()
.wrapContentSize()
.testTag("forYou:loading"),
- contentDesc = stringResource(id = R.string.saved_loading),
+ contentDesc = stringResource(id = R.string.feature_bookmarks_loading),
)
}
@@ -236,7 +236,7 @@ private fun EmptyState(modifier: Modifier = Modifier) {
val iconTint = LocalTintTheme.current.iconTint
Image(
modifier = Modifier.fillMaxWidth(),
- painter = painterResource(id = R.drawable.img_empty_bookmarks),
+ painter = painterResource(id = R.drawable.feature_bookmarks_img_empty_bookmarks),
colorFilter = if (iconTint != null) ColorFilter.tint(iconTint) else null,
contentDescription = null,
)
@@ -244,7 +244,7 @@ private fun EmptyState(modifier: Modifier = Modifier) {
Spacer(modifier = Modifier.height(48.dp))
Text(
- text = stringResource(id = R.string.bookmarks_empty_error),
+ text = stringResource(id = R.string.feature_bookmarks_empty_error),
modifier = Modifier.fillMaxWidth(),
textAlign = TextAlign.Center,
style = MaterialTheme.typography.titleMedium,
@@ -254,7 +254,7 @@ private fun EmptyState(modifier: Modifier = Modifier) {
Spacer(modifier = Modifier.height(8.dp))
Text(
- text = stringResource(id = R.string.bookmarks_empty_description),
+ text = stringResource(id = R.string.feature_bookmarks_empty_description),
modifier = Modifier.fillMaxWidth(),
textAlign = TextAlign.Center,
style = MaterialTheme.typography.bodyMedium,
diff --git a/feature/bookmarks/src/main/res/drawable/img_empty_bookmarks.xml b/feature/bookmarks/src/main/res/drawable/feature_bookmarks_img_empty_bookmarks.xml
similarity index 100%
rename from feature/bookmarks/src/main/res/drawable/img_empty_bookmarks.xml
rename to feature/bookmarks/src/main/res/drawable/feature_bookmarks_img_empty_bookmarks.xml
diff --git a/feature/bookmarks/src/main/res/values/strings.xml b/feature/bookmarks/src/main/res/values/strings.xml
index 875a90a0b..6e2b23043 100644
--- a/feature/bookmarks/src/main/res/values/strings.xml
+++ b/feature/bookmarks/src/main/res/values/strings.xml
@@ -15,10 +15,10 @@
limitations under the License.
-->
<resources>
- <string name="saved">Saved</string>
- <string name="saved_loading">Loading saved…</string>
- <string name="bookmarks_empty_error">No saved updates</string>
- <string name="bookmarks_empty_description">Updates you save will be stored here\nto read later</string>
- <string name="bookmark_removed">Bookmark removed</string>
- <string name="undo">UNDO</string>
+ <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>
</resources>
diff --git a/feature/foryou/src/androidTest/kotlin/com/google/samples/apps/nowinandroid/feature/foryou/ForYouScreenTest.kt b/feature/foryou/src/androidTest/kotlin/com/google/samples/apps/nowinandroid/feature/foryou/ForYouScreenTest.kt
index 7431555ba..5477493ef 100644
--- a/feature/foryou/src/androidTest/kotlin/com/google/samples/apps/nowinandroid/feature/foryou/ForYouScreenTest.kt
+++ b/feature/foryou/src/androidTest/kotlin/com/google/samples/apps/nowinandroid/feature/foryou/ForYouScreenTest.kt
@@ -45,7 +45,7 @@ class ForYouScreenTest {
private val doneButtonMatcher by lazy {
hasText(
- composeTestRule.activity.resources.getString(R.string.done),
+ composeTestRule.activity.resources.getString(R.string.feature_foryou_done),
)
}
@@ -70,7 +70,7 @@ class ForYouScreenTest {
composeTestRule
.onNodeWithContentDescription(
- composeTestRule.activity.resources.getString(R.string.for_you_loading),
+ composeTestRule.activity.resources.getString(R.string.feature_foryou_loading),
)
.assertExists()
}
@@ -96,7 +96,7 @@ class ForYouScreenTest {
composeTestRule
.onNodeWithContentDescription(
- composeTestRule.activity.resources.getString(R.string.for_you_loading),
+ composeTestRule.activity.resources.getString(R.string.feature_foryou_loading),
)
.assertExists()
}
@@ -215,7 +215,7 @@ class ForYouScreenTest {
composeTestRule
.onNodeWithContentDescription(
- composeTestRule.activity.resources.getString(R.string.for_you_loading),
+ composeTestRule.activity.resources.getString(R.string.feature_foryou_loading),
)
.assertExists()
}
@@ -241,7 +241,7 @@ class ForYouScreenTest {
composeTestRule
.onNodeWithContentDescription(
- composeTestRule.activity.resources.getString(R.string.for_you_loading),
+ composeTestRule.activity.resources.getString(R.string.feature_foryou_loading),
)
.assertExists()
}
diff --git a/feature/foryou/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/foryou/ForYouScreen.kt b/feature/foryou/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/foryou/ForYouScreen.kt
index f0899b448..30134715b 100644
--- a/feature/foryou/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/foryou/ForYouScreen.kt
+++ b/feature/foryou/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/foryou/ForYouScreen.kt
@@ -217,7 +217,7 @@ internal fun ForYouScreen(
targetOffsetY = { fullHeight -> -fullHeight },
) + fadeOut(),
) {
- val loadingContentDescription = stringResource(id = R.string.for_you_loading)
+ val loadingContentDescription = stringResource(id = R.string.feature_foryou_loading)
Box(
modifier = Modifier
.fillMaxWidth()
@@ -272,7 +272,7 @@ private fun LazyStaggeredGridScope.onboarding(
item(span = StaggeredGridItemSpan.FullLine, contentType = "onboarding") {
Column(modifier = interestsItemModifier) {
Text(
- text = stringResource(R.string.onboarding_guidance_title),
+ text = stringResource(R.string.feature_foryou_onboarding_guidance_title),
textAlign = TextAlign.Center,
modifier = Modifier
.fillMaxWidth()
@@ -280,7 +280,7 @@ private fun LazyStaggeredGridScope.onboarding(
style = MaterialTheme.typography.titleMedium,
)
Text(
- text = stringResource(R.string.onboarding_guidance_subtitle),
+ text = stringResource(R.string.feature_foryou_onboarding_guidance_subtitle),
modifier = Modifier
.fillMaxWidth()
.padding(top = 8.dp, start = 24.dp, end = 24.dp),
@@ -306,7 +306,7 @@ private fun LazyStaggeredGridScope.onboarding(
.fillMaxWidth(),
) {
Text(
- text = stringResource(R.string.done),
+ text = stringResource(R.string.feature_foryou_done),
)
}
}
@@ -435,7 +435,7 @@ fun TopicIcon(
modifier: Modifier = Modifier,
) {
DynamicAsyncImage(
- placeholder = painterResource(R.drawable.ic_icon_placeholder),
+ placeholder = painterResource(R.drawable.feature_foryou_ic_icon_placeholder),
imageUrl = imageUrl,
// decorative
contentDescription = null,
diff --git a/feature/foryou/src/main/res/drawable/ic_icon_placeholder.xml b/feature/foryou/src/main/res/drawable/feature_foryou_ic_icon_placeholder.xml
similarity index 100%
rename from feature/foryou/src/main/res/drawable/ic_icon_placeholder.xml
rename to feature/foryou/src/main/res/drawable/feature_foryou_ic_icon_placeholder.xml
diff --git a/feature/foryou/src/main/res/values/strings.xml b/feature/foryou/src/main/res/values/strings.xml
index 5a33bc9c8..166749664 100644
--- a/feature/foryou/src/main/res/values/strings.xml
+++ b/feature/foryou/src/main/res/values/strings.xml
@@ -15,11 +15,11 @@
limitations under the License.
-->
<resources>
- <string name="for_you">For you</string>
- <string name="done">Done</string>
- <string name="for_you_loading">Loading for you…</string>
- <string name="navigate_up">Navigate up</string>
- <string name="onboarding_guidance_title">What are you interested in?</string>
- <string name="onboarding_guidance_subtitle">Updates from topics you follow will appear here. Follow some things to get started.</string>
+ <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>
</resources>
diff --git a/feature/interests/src/androidTest/kotlin/com/google/samples/apps/nowinandroid/interests/InterestsScreenTest.kt b/feature/interests/src/androidTest/kotlin/com/google/samples/apps/nowinandroid/interests/InterestsScreenTest.kt
index 492e91fa3..4f9cbcc04 100644
--- a/feature/interests/src/androidTest/kotlin/com/google/samples/apps/nowinandroid/interests/InterestsScreenTest.kt
+++ b/feature/interests/src/androidTest/kotlin/com/google/samples/apps/nowinandroid/interests/InterestsScreenTest.kt
@@ -50,12 +50,12 @@ class InterestsScreenTest {
@Before
fun setup() {
composeTestRule.activity.apply {
- interestsLoading = getString(R.string.loading)
- interestsEmptyHeader = getString(R.string.empty_header)
+ interestsLoading = getString(R.string.feature_interests_loading)
+ interestsEmptyHeader = getString(R.string.feature_interests_empty_header)
interestsTopicCardFollowButton =
- getString(R.string.card_follow_button_content_desc)
+ getString(R.string.feature_interests_card_follow_button_content_desc)
interestsTopicCardUnfollowButton =
- getString(R.string.card_unfollow_button_content_desc)
+ getString(R.string.feature_interests_card_unfollow_button_content_desc)
}
}
diff --git a/feature/interests/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/interests/InterestsItem.kt b/feature/interests/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/interests/InterestsItem.kt
index a9e329e9c..b055a3a14 100644
--- a/feature/interests/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/interests/InterestsItem.kt
+++ b/feature/interests/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/interests/InterestsItem.kt
@@ -68,7 +68,7 @@ fun InterestsItem(
Icon(
imageVector = NiaIcons.Add,
contentDescription = stringResource(
- id = string.card_follow_button_content_desc,
+ id = string.feature_interests_card_follow_button_content_desc,
),
)
},
@@ -76,7 +76,7 @@ fun InterestsItem(
Icon(
imageVector = NiaIcons.Check,
contentDescription = stringResource(
- id = string.card_unfollow_button_content_desc,
+ id = string.feature_interests_card_unfollow_button_content_desc,
),
)
},
diff --git a/feature/interests/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/interests/InterestsScreen.kt b/feature/interests/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/interests/InterestsScreen.kt
index e618c1c9f..5944b8631 100644
--- a/feature/interests/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/interests/InterestsScreen.kt
+++ b/feature/interests/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/interests/InterestsScreen.kt
@@ -65,7 +65,7 @@ internal fun InterestsScreen(
InterestsUiState.Loading ->
NiaLoadingWheel(
modifier = modifier,
- contentDesc = stringResource(id = R.string.loading),
+ contentDesc = stringResource(id = R.string.feature_interests_loading),
)
is InterestsUiState.Interests ->
TopicsTabContent(
@@ -82,7 +82,7 @@ internal fun InterestsScreen(
@Composable
private fun InterestsEmptyScreen() {
- Text(text = stringResource(id = R.string.empty_header))
+ Text(text = stringResource(id = R.string.feature_interests_empty_header))
}
@DevicePreviews
diff --git a/feature/interests/src/main/res/values/strings.xml b/feature/interests/src/main/res/values/strings.xml
index 384cb1deb..2dd1c18a9 100644
--- a/feature/interests/src/main/res/values/strings.xml
+++ b/feature/interests/src/main/res/values/strings.xml
@@ -15,9 +15,9 @@
limitations under the License.
-->
<resources>
- <string name="interests">Interests</string>
- <string name="loading">Loading data</string>
- <string name="empty_header">"No available data"</string>
- <string name="card_follow_button_content_desc">Follow interest</string>
- <string name="card_unfollow_button_content_desc">Unfollow interest</string>
+ <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_card_follow_button_content_desc">Follow interest</string>
+ <string name="feature_interests_card_unfollow_button_content_desc">Unfollow interest</string>
</resources>
diff --git a/feature/search/src/androidTest/kotlin/com/google/samples/apps/nowinandroid/feature/search/SearchScreenTest.kt b/feature/search/src/androidTest/kotlin/com/google/samples/apps/nowinandroid/feature/search/SearchScreenTest.kt
index d6c07221e..8a0532e1b 100644
--- a/feature/search/src/androidTest/kotlin/com/google/samples/apps/nowinandroid/feature/search/SearchScreenTest.kt
+++ b/feature/search/src/androidTest/kotlin/com/google/samples/apps/nowinandroid/feature/search/SearchScreenTest.kt
@@ -70,17 +70,17 @@ class SearchScreenTest {
@Before
fun setup() {
composeTestRule.activity.apply {
- clearSearchContentDesc = getString(R.string.clear_search_text_content_desc)
- clearRecentSearchesContentDesc = getString(R.string.clear_recent_searches_content_desc)
+ clearSearchContentDesc = getString(R.string.feature_search_clear_search_text_content_desc)
+ clearRecentSearchesContentDesc = getString(R.string.feature_search_clear_recent_searches_content_desc)
followButtonContentDesc =
- getString(interestsR.string.card_follow_button_content_desc)
+ getString(interestsR.string.feature_interests_card_follow_button_content_desc)
unfollowButtonContentDesc =
- getString(interestsR.string.card_unfollow_button_content_desc)
- topicsString = getString(R.string.topics)
- updatesString = getString(R.string.updates)
- tryAnotherSearchString = getString(R.string.try_another_search) +
- " " + getString(R.string.interests) + " " + getString(R.string.to_browse_topics)
- searchNotReadyString = getString(R.string.search_not_ready)
+ getString(interestsR.string.feature_interests_card_unfollow_button_content_desc)
+ topicsString = getString(R.string.feature_search_topics)
+ updatesString = getString(R.string.feature_search_updates)
+ tryAnotherSearchString = getString(R.string.feature_search_try_another_search) +
+ " " + getString(R.string.feature_search_interests) + " " + getString(R.string.feature_search_to_browse_topics)
+ searchNotReadyString = getString(R.string.feature_search_not_ready)
}
}
diff --git a/feature/search/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/search/SearchScreen.kt b/feature/search/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/search/SearchScreen.kt
index 72842ec61..95e5514fe 100644
--- a/feature/search/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/search/SearchScreen.kt
+++ b/feature/search/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/search/SearchScreen.kt
@@ -217,7 +217,7 @@ fun EmptySearchResultBody(
horizontalAlignment = Alignment.CenterHorizontally,
modifier = Modifier.padding(horizontal = 48.dp),
) {
- val message = stringResource(id = searchR.string.search_result_not_found, searchQuery)
+ val message = stringResource(id = searchR.string.feature_search_result_not_found, searchQuery)
val start = message.indexOf(searchQuery)
Text(
text = AnnotatedString(
@@ -234,9 +234,9 @@ fun EmptySearchResultBody(
textAlign = TextAlign.Center,
modifier = Modifier.padding(vertical = 24.dp),
)
- val interests = stringResource(id = searchR.string.interests)
+ val interests = stringResource(id = searchR.string.feature_search_interests)
val tryAnotherSearchString = buildAnnotatedString {
- append(stringResource(id = searchR.string.try_another_search))
+ append(stringResource(id = searchR.string.feature_search_try_another_search))
append(" ")
withStyle(
style = SpanStyle(
@@ -248,7 +248,7 @@ fun EmptySearchResultBody(
append(interests)
}
append(" ")
- append(stringResource(id = searchR.string.to_browse_topics))
+ append(stringResource(id = searchR.string.feature_search_to_browse_topics))
}
ClickableText(
text = tryAnotherSearchString,
@@ -278,7 +278,7 @@ private fun SearchNotReadyBody() {
modifier = Modifier.padding(horizontal = 48.dp),
) {
Text(
- text = stringResource(id = searchR.string.search_not_ready),
+ text = stringResource(id = searchR.string.feature_search_not_ready),
style = MaterialTheme.typography.bodyLarge,
textAlign = TextAlign.Center,
modifier = Modifier.padding(vertical = 24.dp),
@@ -319,7 +319,7 @@ private fun SearchResultBody(
Text(
text = buildAnnotatedString {
withStyle(style = SpanStyle(fontWeight = FontWeight.Bold)) {
- append(stringResource(id = searchR.string.topics))
+ append(stringResource(id = searchR.string.feature_search_topics))
}
},
modifier = Modifier.padding(horizontal = 16.dp, vertical = 8.dp),
@@ -355,7 +355,7 @@ private fun SearchResultBody(
Text(
text = buildAnnotatedString {
withStyle(style = SpanStyle(fontWeight = FontWeight.Bold)) {
- append(stringResource(id = searchR.string.updates))
+ append(stringResource(id = searchR.string.feature_search_updates))
}
},
modifier = Modifier.padding(horizontal = 16.dp, vertical = 8.dp),
@@ -407,7 +407,7 @@ private fun RecentSearchesBody(
Text(
text = buildAnnotatedString {
withStyle(style = SpanStyle(fontWeight = FontWeight.Bold)) {
- append(stringResource(id = searchR.string.recent_searches))
+ append(stringResource(id = searchR.string.feature_search_recent_searches))
}
},
modifier = Modifier.padding(horizontal = 16.dp, vertical = 8.dp),
@@ -422,7 +422,7 @@ private fun RecentSearchesBody(
Icon(
imageVector = NiaIcons.Close,
contentDescription = stringResource(
- id = searchR.string.clear_recent_searches_content_desc,
+ id = searchR.string.feature_search_clear_recent_searches_content_desc,
),
tint = MaterialTheme.colorScheme.onSurface,
)
@@ -460,7 +460,7 @@ private fun SearchToolbar(
Icon(
imageVector = NiaIcons.ArrowBack,
contentDescription = stringResource(
- id = string.back,
+ id = string.core_ui_back,
),
)
}
@@ -497,7 +497,7 @@ private fun SearchTextField(
Icon(
imageVector = NiaIcons.Search,
contentDescription = stringResource(
- id = searchR.string.search,
+ id = searchR.string.feature_search_title,
),
tint = MaterialTheme.colorScheme.onSurface,
)
@@ -512,7 +512,7 @@ private fun SearchTextField(
Icon(
imageVector = NiaIcons.Close,
contentDescription = stringResource(
- id = searchR.string.clear_search_text_content_desc,
+ id = searchR.string.feature_search_clear_search_text_content_desc,
),
tint = MaterialTheme.colorScheme.onSurface,
)
diff --git a/feature/search/src/main/res/values/strings.xml b/feature/search/src/main/res/values/strings.xml
index 2a824653e..e11576747 100644
--- a/feature/search/src/main/res/values/strings.xml
+++ b/feature/search/src/main/res/values/strings.xml
@@ -15,15 +15,15 @@
limitations under the License.
-->
<resources>
- <string name="search">Search</string>
- <string name="clear_search_text_content_desc">Clear search text</string>
- <string name="search_result_not_found">Sorry, there is no content found for your search \"%1$s\"</string>
- <string name="search_not_ready">Sorry, we are still processing the search index. Please come back later.</string>
- <string name="try_another_search">Try another search or explorer </string>
- <string name="interests">Interests</string>
- <string name="to_browse_topics"> to browse topics</string>
- <string name="topics">Topics</string>
- <string name="updates">Updates</string>
- <string name="recent_searches">Recent searches</string>
- <string name="clear_recent_searches_content_desc">Clear searches</string>
+ <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/src/androidTest/kotlin/com/google/samples/apps/nowinandroid/feature/settings/SettingsDialogTest.kt b/feature/settings/src/androidTest/kotlin/com/google/samples/apps/nowinandroid/feature/settings/SettingsDialogTest.kt
index febc606b0..790b5964d 100644
--- a/feature/settings/src/androidTest/kotlin/com/google/samples/apps/nowinandroid/feature/settings/SettingsDialogTest.kt
+++ b/feature/settings/src/androidTest/kotlin/com/google/samples/apps/nowinandroid/feature/settings/SettingsDialogTest.kt
@@ -48,7 +48,7 @@ class SettingsDialogTest {
}
composeTestRule
- .onNodeWithText(getString(R.string.loading))
+ .onNodeWithText(getString(R.string.feature_settings_loading))
.assertExists()
}
@@ -71,17 +71,17 @@ class SettingsDialogTest {
}
// Check that all the possible settings are displayed.
- composeTestRule.onNodeWithText(getString(R.string.brand_default)).assertExists()
- composeTestRule.onNodeWithText(getString(R.string.brand_android)).assertExists()
+ composeTestRule.onNodeWithText(getString(R.string.feature_settings_brand_default)).assertExists()
+ composeTestRule.onNodeWithText(getString(R.string.feature_settings_brand_android)).assertExists()
composeTestRule.onNodeWithText(
- getString(R.string.dark_mode_config_system_default),
+ getString(R.string.feature_settings_dark_mode_config_system_default),
).assertExists()
- composeTestRule.onNodeWithText(getString(R.string.dark_mode_config_light)).assertExists()
- composeTestRule.onNodeWithText(getString(R.string.dark_mode_config_dark)).assertExists()
+ composeTestRule.onNodeWithText(getString(R.string.feature_settings_dark_mode_config_light)).assertExists()
+ composeTestRule.onNodeWithText(getString(R.string.feature_settings_dark_mode_config_dark)).assertExists()
// Check that the correct settings are selected.
- composeTestRule.onNodeWithText(getString(R.string.brand_android)).assertIsSelected()
- composeTestRule.onNodeWithText(getString(R.string.dark_mode_config_dark)).assertIsSelected()
+ composeTestRule.onNodeWithText(getString(R.string.feature_settings_brand_android)).assertIsSelected()
+ composeTestRule.onNodeWithText(getString(R.string.feature_settings_dark_mode_config_dark)).assertIsSelected()
}
@Test
@@ -103,12 +103,12 @@ class SettingsDialogTest {
)
}
- composeTestRule.onNodeWithText(getString(R.string.dynamic_color_preference)).assertExists()
- composeTestRule.onNodeWithText(getString(R.string.dynamic_color_yes)).assertExists()
- composeTestRule.onNodeWithText(getString(R.string.dynamic_color_no)).assertExists()
+ composeTestRule.onNodeWithText(getString(R.string.feature_settings_dynamic_color_preference)).assertExists()
+ composeTestRule.onNodeWithText(getString(R.string.feature_settings_dynamic_color_yes)).assertExists()
+ composeTestRule.onNodeWithText(getString(R.string.feature_settings_dynamic_color_no)).assertExists()
// Check that the correct default dynamic color setting is selected.
- composeTestRule.onNodeWithText(getString(R.string.dynamic_color_no)).assertIsSelected()
+ composeTestRule.onNodeWithText(getString(R.string.feature_settings_dynamic_color_no)).assertIsSelected()
}
@Test
@@ -129,10 +129,10 @@ class SettingsDialogTest {
)
}
- composeTestRule.onNodeWithText(getString(R.string.dynamic_color_preference))
+ composeTestRule.onNodeWithText(getString(R.string.feature_settings_dynamic_color_preference))
.assertDoesNotExist()
- composeTestRule.onNodeWithText(getString(R.string.dynamic_color_yes)).assertDoesNotExist()
- composeTestRule.onNodeWithText(getString(R.string.dynamic_color_no)).assertDoesNotExist()
+ composeTestRule.onNodeWithText(getString(R.string.feature_settings_dynamic_color_yes)).assertDoesNotExist()
+ composeTestRule.onNodeWithText(getString(R.string.feature_settings_dynamic_color_no)).assertDoesNotExist()
}
@Test
@@ -153,10 +153,10 @@ class SettingsDialogTest {
)
}
- composeTestRule.onNodeWithText(getString(R.string.dynamic_color_preference))
+ composeTestRule.onNodeWithText(getString(R.string.feature_settings_dynamic_color_preference))
.assertDoesNotExist()
- composeTestRule.onNodeWithText(getString(R.string.dynamic_color_yes)).assertDoesNotExist()
- composeTestRule.onNodeWithText(getString(R.string.dynamic_color_no)).assertDoesNotExist()
+ composeTestRule.onNodeWithText(getString(R.string.feature_settings_dynamic_color_yes)).assertDoesNotExist()
+ composeTestRule.onNodeWithText(getString(R.string.feature_settings_dynamic_color_no)).assertDoesNotExist()
}
@Test
@@ -177,9 +177,9 @@ class SettingsDialogTest {
)
}
- composeTestRule.onNodeWithText(getString(R.string.privacy_policy)).assertExists()
- composeTestRule.onNodeWithText(getString(R.string.licenses)).assertExists()
- composeTestRule.onNodeWithText(getString(R.string.brand_guidelines)).assertExists()
- composeTestRule.onNodeWithText(getString(R.string.feedback)).assertExists()
+ composeTestRule.onNodeWithText(getString(R.string.feature_settings_privacy_policy)).assertExists()
+ composeTestRule.onNodeWithText(getString(R.string.feature_settings_licenses)).assertExists()
+ composeTestRule.onNodeWithText(getString(R.string.feature_settings_brand_guidelines)).assertExists()
+ composeTestRule.onNodeWithText(getString(R.string.feature_settings_feedback)).assertExists()
}
}
diff --git a/feature/settings/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/settings/SettingsDialog.kt b/feature/settings/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/settings/SettingsDialog.kt
index b6ce77d1a..032515c53 100644
--- a/feature/settings/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/settings/SettingsDialog.kt
+++ b/feature/settings/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/settings/SettingsDialog.kt
@@ -110,7 +110,7 @@ fun SettingsDialog(
onDismissRequest = { onDismiss() },
title = {
Text(
- text = stringResource(string.settings_title),
+ text = stringResource(string.feature_settings_title),
style = MaterialTheme.typography.titleLarge,
)
},
@@ -120,7 +120,7 @@ fun SettingsDialog(
when (settingsUiState) {
Loading -> {
Text(
- text = stringResource(string.loading),
+ text = stringResource(string.feature_settings_loading),
modifier = Modifier.padding(vertical = 16.dp),
)
}
@@ -142,7 +142,7 @@ fun SettingsDialog(
},
confirmButton = {
Text(
- text = stringResource(string.dismiss_dialog_button_text),
+ text = stringResource(string.feature_settings_dismiss_dialog_button_text),
style = MaterialTheme.typography.labelLarge,
color = MaterialTheme.colorScheme.primary,
modifier = Modifier
@@ -162,50 +162,50 @@ private fun ColumnScope.SettingsPanel(
onChangeDynamicColorPreference: (useDynamicColor: Boolean) -> Unit,
onChangeDarkThemeConfig: (darkThemeConfig: DarkThemeConfig) -> Unit,
) {
- SettingsDialogSectionTitle(text = stringResource(string.theme))
+ SettingsDialogSectionTitle(text = stringResource(string.feature_settings_theme))
Column(Modifier.selectableGroup()) {
SettingsDialogThemeChooserRow(
- text = stringResource(string.brand_default),
+ text = stringResource(string.feature_settings_brand_default),
selected = settings.brand == DEFAULT,
onClick = { onChangeThemeBrand(DEFAULT) },
)
SettingsDialogThemeChooserRow(
- text = stringResource(string.brand_android),
+ text = stringResource(string.feature_settings_brand_android),
selected = settings.brand == ANDROID,
onClick = { onChangeThemeBrand(ANDROID) },
)
}
AnimatedVisibility(visible = settings.brand == DEFAULT && supportDynamicColor) {
Column {
- SettingsDialogSectionTitle(text = stringResource(string.dynamic_color_preference))
+ SettingsDialogSectionTitle(text = stringResource(string.feature_settings_dynamic_color_preference))
Column(Modifier.selectableGroup()) {
SettingsDialogThemeChooserRow(
- text = stringResource(string.dynamic_color_yes),
+ text = stringResource(string.feature_settings_dynamic_color_yes),
selected = settings.useDynamicColor,
onClick = { onChangeDynamicColorPreference(true) },
)
SettingsDialogThemeChooserRow(
- text = stringResource(string.dynamic_color_no),
+ text = stringResource(string.feature_settings_dynamic_color_no),
selected = !settings.useDynamicColor,
onClick = { onChangeDynamicColorPreference(false) },
)
}
}
}
- SettingsDialogSectionTitle(text = stringResource(string.dark_mode_preference))
+ SettingsDialogSectionTitle(text = stringResource(string.feature_settings_dark_mode_preference))
Column(Modifier.selectableGroup()) {
SettingsDialogThemeChooserRow(
- text = stringResource(string.dark_mode_config_system_default),
+ text = stringResource(string.feature_settings_dark_mode_config_system_default),
selected = settings.darkThemeConfig == FOLLOW_SYSTEM,
onClick = { onChangeDarkThemeConfig(FOLLOW_SYSTEM) },
)
SettingsDialogThemeChooserRow(
- text = stringResource(string.dark_mode_config_light),
+ text = stringResource(string.feature_settings_dark_mode_config_light),
selected = settings.darkThemeConfig == LIGHT,
onClick = { onChangeDarkThemeConfig(LIGHT) },
)
SettingsDialogThemeChooserRow(
- text = stringResource(string.dark_mode_config_dark),
+ text = stringResource(string.feature_settings_dark_mode_config_dark),
selected = settings.darkThemeConfig == DARK,
onClick = { onChangeDarkThemeConfig(DARK) },
)
@@ -261,7 +261,7 @@ private fun LinksPanel() {
NiaTextButton(
onClick = { uriHandler.openUri(PRIVACY_POLICY_URL) },
) {
- Text(text = stringResource(string.privacy_policy))
+ Text(text = stringResource(string.feature_settings_privacy_policy))
}
val context = LocalContext.current
NiaTextButton(
@@ -269,17 +269,17 @@ private fun LinksPanel() {
context.startActivity(Intent(context, OssLicensesMenuActivity::class.java))
},
) {
- Text(text = stringResource(string.licenses))
+ Text(text = stringResource(string.feature_settings_licenses))
}
NiaTextButton(
onClick = { uriHandler.openUri(BRAND_GUIDELINES_URL) },
) {
- Text(text = stringResource(string.brand_guidelines))
+ Text(text = stringResource(string.feature_settings_brand_guidelines))
}
NiaTextButton(
onClick = { uriHandler.openUri(FEEDBACK_URL) },
) {
- Text(text = stringResource(string.feedback))
+ Text(text = stringResource(string.feature_settings_feedback))
}
}
}
diff --git a/feature/settings/src/main/res/values/strings.xml b/feature/settings/src/main/res/values/strings.xml
index ad56f6b08..887539bd5 100644
--- a/feature/settings/src/main/res/values/strings.xml
+++ b/feature/settings/src/main/res/values/strings.xml
@@ -15,23 +15,23 @@
limitations under the License.
-->
<resources>
- <string name="top_app_bar_action_icon_description">Settings</string>
- <string name="top_app_bar_navigation_icon_description">Search</string>
- <string name="settings_title">Settings</string>
- <string name="loading">Loading…</string>
- <string name="privacy_policy">Privacy policy</string>
- <string name="licenses">Licenses</string>
- <string name="brand_guidelines">Brand Guidelines</string>
- <string name="feedback">Feedback</string>
- <string name="theme">Theme</string>
- <string name="brand_default">Default</string>
- <string name="brand_android">Android</string>
- <string name="dark_mode_preference">Dark mode preference</string>
- <string name="dark_mode_config_system_default">System default</string>
- <string name="dark_mode_config_light">Light</string>
- <string name="dark_mode_config_dark">Dark</string>
- <string name="dynamic_color_preference">Use Dynamic Color</string>
- <string name="dynamic_color_yes">Yes</string>
- <string name="dynamic_color_no">No</string>
- <string name="dismiss_dialog_button_text">OK</string>
+ <string name="feature_settings_top_app_bar_action_icon_description">Settings</string>
+ <string name="feature_settings_top_app_bar_navigation_icon_description">Search</string>
+ <string name="feature_settings_title">Settings</string>
+ <string name="feature_settings_loading">Loading…</string>
+ <string name="feature_settings_privacy_policy">Privacy policy</string>
+ <string name="feature_settings_licenses">Licenses</string>
+ <string name="feature_settings_brand_guidelines">Brand Guidelines</string>
+ <string name="feature_settings_feedback">Feedback</string>
+ <string name="feature_settings_theme">Theme</string>
+ <string name="feature_settings_brand_default">Default</string>
+ <string name="feature_settings_brand_android">Android</string>
+ <string name="feature_settings_dark_mode_preference">Dark mode preference</string>
+ <string name="feature_settings_dark_mode_config_system_default">System default</string>
+ <string name="feature_settings_dark_mode_config_light">Light</string>
+ <string name="feature_settings_dark_mode_config_dark">Dark</string>
+ <string name="feature_settings_dynamic_color_preference">Use Dynamic Color</string>
+ <string name="feature_settings_dynamic_color_yes">Yes</string>
+ <string name="feature_settings_dynamic_color_no">No</string>
+ <string name="feature_settings_dismiss_dialog_button_text">OK</string>
</resources>
diff --git a/feature/topic/src/androidTest/kotlin/com/google/samples/apps/nowinandroid/feature/topic/TopicScreenTest.kt b/feature/topic/src/androidTest/kotlin/com/google/samples/apps/nowinandroid/feature/topic/TopicScreenTest.kt
index 94f86a8e4..b64e397ea 100644
--- a/feature/topic/src/androidTest/kotlin/com/google/samples/apps/nowinandroid/feature/topic/TopicScreenTest.kt
+++ b/feature/topic/src/androidTest/kotlin/com/google/samples/apps/nowinandroid/feature/topic/TopicScreenTest.kt
@@ -45,7 +45,7 @@ class TopicScreenTest {
@Before
fun setup() {
composeTestRule.activity.apply {
- topicLoading = getString(R.string.topic_loading)
+ topicLoading = getString(R.string.feature_topic_loading)
}
}
diff --git a/feature/topic/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/topic/TopicScreen.kt b/feature/topic/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/topic/TopicScreen.kt
index 3dbbe7da8..3f3862c2a 100644
--- a/feature/topic/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/topic/TopicScreen.kt
+++ b/feature/topic/src/main/kotlin/com/google/samples/apps/nowinandroid/feature/topic/TopicScreen.kt
@@ -119,7 +119,7 @@ internal fun TopicScreen(
TopicUiState.Loading -> item {
NiaLoadingWheel(
modifier = modifier,
- contentDesc = stringResource(id = string.topic_loading),
+ contentDesc = stringResource(id = string.feature_topic_loading),
)
}
@@ -284,7 +284,7 @@ private fun TopicToolbar(
Icon(
imageVector = NiaIcons.ArrowBack,
contentDescription = stringResource(
- id = com.google.samples.apps.nowinandroid.core.ui.R.string.back,
+ id = com.google.samples.apps.nowinandroid.core.ui.R.string.core_ui_back,
),
)
}
diff --git a/feature/topic/src/main/res/values/strings.xml b/feature/topic/src/main/res/values/strings.xml
index 284f2f7b2..5fefc3f42 100644
--- a/feature/topic/src/main/res/values/strings.xml
+++ b/feature/topic/src/main/res/values/strings.xml
@@ -15,5 +15,5 @@
limitations under the License.
-->
<resources>
- <string name="topic_loading">Loading topic</string>
+ <string name="feature_topic_loading">Loading topic</string>
</resources>
diff --git a/sync/work/src/main/kotlin/com/google/samples/apps/nowinandroid/sync/initializers/SyncWorkHelpers.kt b/sync/work/src/main/kotlin/com/google/samples/apps/nowinandroid/sync/initializers/SyncWorkHelpers.kt
index 5abf2eee5..843510aaf 100644
--- a/sync/work/src/main/kotlin/com/google/samples/apps/nowinandroid/sync/initializers/SyncWorkHelpers.kt
+++ b/sync/work/src/main/kotlin/com/google/samples/apps/nowinandroid/sync/initializers/SyncWorkHelpers.kt
@@ -54,10 +54,10 @@ private fun Context.syncWorkNotification(): Notification {
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
val channel = NotificationChannel(
SYNC_NOTIFICATION_CHANNEL_ID,
- getString(R.string.sync_notification_channel_name),
+ getString(R.string.sync_work_notification_channel_name),
NotificationManager.IMPORTANCE_DEFAULT,
).apply {
- description = getString(R.string.sync_notification_channel_description)
+ description = getString(R.string.sync_work_notification_channel_description)
}
// Register the channel with the system
val notificationManager: NotificationManager? =
@@ -71,9 +71,9 @@ private fun Context.syncWorkNotification(): Notification {
SYNC_NOTIFICATION_CHANNEL_ID,
)
.setSmallIcon(
- com.google.samples.apps.nowinandroid.core.common.R.drawable.ic_nia_notification,
+ com.google.samples.apps.nowinandroid.core.common.R.drawable.core_common_ic_nia_notification,
)
- .setContentTitle(getString(R.string.sync_notification_title))
+ .setContentTitle(getString(R.string.sync_work_notification_title))
.setPriority(NotificationCompat.PRIORITY_DEFAULT)
.build()
}
diff --git a/sync/work/src/main/res/values/strings.xml b/sync/work/src/main/res/values/strings.xml
index e3fd73ff8..4d77f6a7b 100644
--- a/sync/work/src/main/res/values/strings.xml
+++ b/sync/work/src/main/res/values/strings.xml
@@ -15,8 +15,8 @@
limitations under the License.
-->
<resources>
- <string name="sync_notification_title">Now in Android</string>
- <string name="sync_notification_channel_name">Sync</string>
- <string name="sync_notification_channel_description">Background tasks for Now in Android</string>
+ <string name="sync_work_notification_title">Now in Android</string>
+ <string name="sync_work_notification_channel_name">Sync</string>
+ <string name="sync_work_notification_channel_description">Background tasks for Now in Android</string>
</resources>