Merge pull request #395 from android/dt/add-feedback-link

Add feedback link
pull/405/head
Don Turner 2 years ago committed by GitHub
commit 912df018e6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

@ -82,7 +82,7 @@ class SettingsDialogTest {
} }
@Test @Test
fun whenStateIsSuccess_allLegalLinksAreDisplayed() { fun whenStateIsSuccess_allLinksAreDisplayed() {
composeTestRule.setContent { composeTestRule.setContent {
SettingsDialog( SettingsDialog(
settingsUiState = Success( settingsUiState = Success(
@ -100,5 +100,6 @@ class SettingsDialogTest {
composeTestRule.onNodeWithText(getString(R.string.privacy_policy)).assertExists() composeTestRule.onNodeWithText(getString(R.string.privacy_policy)).assertExists()
composeTestRule.onNodeWithText(getString(R.string.licenses)).assertExists() composeTestRule.onNodeWithText(getString(R.string.licenses)).assertExists()
composeTestRule.onNodeWithText(getString(R.string.brand_guidelines)).assertExists() composeTestRule.onNodeWithText(getString(R.string.brand_guidelines)).assertExists()
composeTestRule.onNodeWithText(getString(R.string.feedback)).assertExists()
} }
} }

@ -110,7 +110,7 @@ fun SettingsDialog(
} }
} }
Divider(Modifier.padding(top = 8.dp)) Divider(Modifier.padding(top = 8.dp))
LegalPanel() LinksPanel()
} }
}, },
confirmButton = { confirmButton = {
@ -201,7 +201,7 @@ fun SettingsDialogThemeChooserRow(
} }
@Composable @Composable
private fun LegalPanel() { private fun LinksPanel() {
Row( Row(
modifier = Modifier.padding(top = 16.dp) modifier = Modifier.padding(top = 16.dp)
) { ) {
@ -226,6 +226,11 @@ private fun LegalPanel() {
text = stringResource(string.brand_guidelines), text = stringResource(string.brand_guidelines),
url = BRAND_GUIDELINES_URL 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 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 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 BRAND_GUIDELINES_URL = "https://developer.android.com/distribute/marketing-tools/brand-guidelines"
private const val FEEDBACK_URL = "https://goo.gle/nia-app-feedback"

@ -21,6 +21,7 @@
<string name="privacy_policy">Privacy policy</string> <string name="privacy_policy">Privacy policy</string>
<string name="licenses">Licenses</string> <string name="licenses">Licenses</string>
<string name="brand_guidelines">Brand Guidelines</string> <string name="brand_guidelines">Brand Guidelines</string>
<string name="feedback">Feedback</string>
<string name="theme">Theme</string> <string name="theme">Theme</string>
<string name="brand_default">Default</string> <string name="brand_default">Default</string>
<string name="brand_android">Android</string> <string name="brand_android">Android</string>

Loading…
Cancel
Save