diff --git a/feature/settings/src/androidTest/java/com/google/samples/apps/nowinandroid/feature/settings/SettingsDialogTest.kt b/feature/settings/src/androidTest/java/com/google/samples/apps/nowinandroid/feature/settings/SettingsDialogTest.kt index 2a29becc6..07b6b272c 100644 --- a/feature/settings/src/androidTest/java/com/google/samples/apps/nowinandroid/feature/settings/SettingsDialogTest.kt +++ b/feature/settings/src/androidTest/java/com/google/samples/apps/nowinandroid/feature/settings/SettingsDialogTest.kt @@ -82,7 +82,7 @@ class SettingsDialogTest { } @Test - fun whenStateIsSuccess_allLegalLinksAreDisplayed() { + fun whenStateIsSuccess_allLinksAreDisplayed() { composeTestRule.setContent { SettingsDialog( settingsUiState = Success( @@ -100,5 +100,6 @@ 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() } } diff --git a/feature/settings/src/main/java/com/google/samples/apps/nowinandroid/feature/settings/SettingsDialog.kt b/feature/settings/src/main/java/com/google/samples/apps/nowinandroid/feature/settings/SettingsDialog.kt index 00e929fea..f10b2e138 100644 --- a/feature/settings/src/main/java/com/google/samples/apps/nowinandroid/feature/settings/SettingsDialog.kt +++ b/feature/settings/src/main/java/com/google/samples/apps/nowinandroid/feature/settings/SettingsDialog.kt @@ -110,7 +110,7 @@ fun SettingsDialog( } } Divider(Modifier.padding(top = 8.dp)) - LegalPanel() + LinksPanel() } }, confirmButton = { @@ -201,7 +201,7 @@ fun SettingsDialogThemeChooserRow( } @Composable -private fun LegalPanel() { +private fun LinksPanel() { Row( modifier = Modifier.padding(top = 16.dp) ) { @@ -226,6 +226,11 @@ private fun LegalPanel() { text = stringResource(string.brand_guidelines), url = BRAND_GUIDELINES_URL ) + Spacer(Modifier.width(16.dp)) + TextLink( + text = stringResource(string.feedback), + url = FEEDBACK_URL + ) } } } @@ -283,3 +288,4 @@ fun PreviewSettingsDialogLoading() { private const val PRIVACY_POLICY_URL = "https://policies.google.com/privacy" private const val LICENSES_URL = "https://github.com/android/nowinandroid/blob/main/app/LICENSES.md#open-source-licenses-and-copyright-notices" private const val BRAND_GUIDELINES_URL = "https://developer.android.com/distribute/marketing-tools/brand-guidelines" +private const val FEEDBACK_URL = "https://goo.gle/nia-app-feedback" diff --git a/feature/settings/src/main/res/values/strings.xml b/feature/settings/src/main/res/values/strings.xml index c7ba3ada4..b5265f650 100644 --- a/feature/settings/src/main/res/values/strings.xml +++ b/feature/settings/src/main/res/values/strings.xml @@ -21,6 +21,7 @@ Privacy policy Licenses Brand Guidelines + Feedback Theme Default Android