Add more labels to AboutScreen

yuetyam · Jun 27, 2024 · 224ebec · 224ebec
1 parent f559c07
commit 224ebec
Show file tree

Hide file tree

Showing 14 changed files with 53 additions and 1 deletion.
diff --git a/app/src/main/java/org/jyutping/jyutping/ui/about/AboutScreen.kt b/app/src/main/java/org/jyutping/jyutping/ui/about/AboutScreen.kt
@@ -15,6 +15,7 @@ import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.automirrored.outlined.HelpOutline
 import androidx.compose.material.icons.outlined.AlternateEmail
 import androidx.compose.material.icons.outlined.CenterFocusStrong
+import androidx.compose.material.icons.outlined.CheckCircle
 import androidx.compose.material.icons.outlined.Code
 import androidx.compose.material.icons.outlined.Group
 import androidx.compose.material.icons.outlined.Info
@@ -62,6 +63,17 @@ fun AboutScreen() {
                                 OpenAppLabel(icon = Icons.Outlined.CenterFocusStrong, text = stringResource(id = R.string.about_label_instagram), uri = AppMaster.instagramWebAddress)
                         }
                 }
+                item {
+                        Column(
+                                verticalArrangement = Arrangement.spacedBy(8.dp)
+                        ) {
+                                WebLinkLabel(icon = Icons.Outlined.CheckCircle, text = stringResource(id = R.string.about_label_google_forms), uri = AppMaster.GoogleFormsAddress)
+                                WebLinkLabel(icon = Icons.Outlined.CheckCircle, text = stringResource(id = R.string.about_label_tencent_survey), uri = AppMaster.TencentSurveyAddress)
+
+                                // TODO: Implement mailto
+                                // OpenAppLabel(icon = Icons.Outlined.Mail, text = stringResource(id = R.string.about_label_email), uri = AppMaster.EmailAddress)
+                        }
+                }
         }
 }
 
@@ -79,7 +91,7 @@ private fun VersionLabel() {
                 Icon(imageVector = Icons.Outlined.Info, contentDescription = null)
                 Text(text = stringResource(id = R.string.about_label_version))
                 Spacer(modifier = Modifier.weight(1.0f))
-                SelectionContainer() {
+                SelectionContainer {
                         Text(text = version)
                 }
         }

diff --git a/app/src/main/java/org/jyutping/jyutping/utilities/AppMaster.kt b/app/src/main/java/org/jyutping/jyutping/utilities/AppMaster.kt
@@ -10,4 +10,8 @@ object AppMaster {
         const val qqWebAddress: String = "https://jq.qq.com/?k=4PR17m3t"
         const val twitterWebAddress: String = "https://twitter.com/JyutpingApp"
         const val instagramWebAddress: String = "https://www.instagram.com/jyutping_app"
+
+        const val GoogleFormsAddress: String = "https://forms.gle/4N9zwpL7KwnfaeXu6"
+        const val TencentSurveyAddress: String = "https://wj.qq.com/s2/14037245/fe08"
+        const val EmailAddress: String = "[email protected]"
 }
diff --git a/app/src/main/res/values-b+yue+Hant+HK/strings.xml b/app/src/main/res/values-b+yue+Hant+HK/strings.xml
@@ -39,4 +39,7 @@
     <string name="about_label_qq">加入 QQ 交流羣</string>
     <string name="about_label_twitter">關注 X (Twitter)</string>
     <string name="about_label_instagram">關注 Instagram</string>
+    <string name="about_label_google_forms">Google Forms 反饋</string>
+    <string name="about_label_tencent_survey">騰訊問卷反饋</string>
+    <string name="about_label_email">電郵反饋</string>
 </resources>
diff --git a/app/src/main/res/values-b+yue+Hant/strings.xml b/app/src/main/res/values-b+yue+Hant/strings.xml
@@ -39,4 +39,7 @@
     <string name="about_label_qq">加入 QQ 交流羣</string>
     <string name="about_label_twitter">關注 X (Twitter)</string>
     <string name="about_label_instagram">關注 Instagram</string>
+    <string name="about_label_google_forms">Google Forms 反饋</string>
+    <string name="about_label_tencent_survey">騰訊問卷反饋</string>
+    <string name="about_label_email">電郵反饋</string>
 </resources>
diff --git a/app/src/main/res/values-b+yue/strings.xml b/app/src/main/res/values-b+yue/strings.xml
@@ -39,4 +39,7 @@
     <string name="about_label_qq">加入 QQ 交流羣</string>
     <string name="about_label_twitter">關注 X (Twitter)</string>
     <string name="about_label_instagram">關注 Instagram</string>
+    <string name="about_label_google_forms">Google Forms 反饋</string>
+    <string name="about_label_tencent_survey">騰訊問卷反饋</string>
+    <string name="about_label_email">電郵反饋</string>
 </resources>
diff --git a/app/src/main/res/values-b+zh+Hans+CN/strings.xml b/app/src/main/res/values-b+zh+Hans+CN/strings.xml
@@ -39,4 +39,7 @@
     <string name="about_label_qq">加入 QQ 交流羣</string>
     <string name="about_label_twitter">關注 X (Twitter)</string>
     <string name="about_label_instagram">關注 Instagram</string>
+    <string name="about_label_google_forms">Google Forms 反饋</string>
+    <string name="about_label_tencent_survey">騰訊問卷反饋</string>
+    <string name="about_label_email">電郵反饋</string>
 </resources>
diff --git a/app/src/main/res/values-b+zh+Hans/strings.xml b/app/src/main/res/values-b+zh+Hans/strings.xml
@@ -39,4 +39,7 @@
     <string name="about_label_qq">加入 QQ 交流羣</string>
     <string name="about_label_twitter">關注 X (Twitter)</string>
     <string name="about_label_instagram">關注 Instagram</string>
+    <string name="about_label_google_forms">Google Forms 反饋</string>
+    <string name="about_label_tencent_survey">騰訊問卷反饋</string>
+    <string name="about_label_email">電郵反饋</string>
 </resources>
diff --git a/app/src/main/res/values-b+zh+Hant+CN/strings.xml b/app/src/main/res/values-b+zh+Hant+CN/strings.xml
@@ -39,4 +39,7 @@
     <string name="about_label_qq">加入 QQ 交流羣</string>
     <string name="about_label_twitter">關注 X (Twitter)</string>
     <string name="about_label_instagram">關注 Instagram</string>
+    <string name="about_label_google_forms">Google Forms 反饋</string>
+    <string name="about_label_tencent_survey">騰訊問卷反饋</string>
+    <string name="about_label_email">電郵反饋</string>
 </resources>
diff --git a/app/src/main/res/values-b+zh+Hant+HK/strings.xml b/app/src/main/res/values-b+zh+Hant+HK/strings.xml
@@ -39,4 +39,7 @@
     <string name="about_label_qq">加入 QQ 交流羣</string>
     <string name="about_label_twitter">關注 X (Twitter)</string>
     <string name="about_label_instagram">關注 Instagram</string>
+    <string name="about_label_google_forms">Google Forms 反饋</string>
+    <string name="about_label_tencent_survey">騰訊問卷反饋</string>
+    <string name="about_label_email">電郵反饋</string>
 </resources>
diff --git a/app/src/main/res/values-b+zh+Hant+MO/strings.xml b/app/src/main/res/values-b+zh+Hant+MO/strings.xml
@@ -39,4 +39,7 @@
     <string name="about_label_qq">加入 QQ 交流羣</string>
     <string name="about_label_twitter">關注 X (Twitter)</string>
     <string name="about_label_instagram">關注 Instagram</string>
+    <string name="about_label_google_forms">Google Forms 反饋</string>
+    <string name="about_label_tencent_survey">騰訊問卷反饋</string>
+    <string name="about_label_email">電郵反饋</string>
 </resources>
diff --git a/app/src/main/res/values-b+zh+Hant+TW/strings.xml b/app/src/main/res/values-b+zh+Hant+TW/strings.xml
@@ -39,4 +39,7 @@
     <string name="about_label_qq">加入 QQ 交流羣</string>
     <string name="about_label_twitter">關注 X (Twitter)</string>
     <string name="about_label_instagram">關注 Instagram</string>
+    <string name="about_label_google_forms">Google Forms 反饋</string>
+    <string name="about_label_tencent_survey">騰訊問卷反饋</string>
+    <string name="about_label_email">電郵反饋</string>
 </resources>
diff --git a/app/src/main/res/values-b+zh+Hant/strings.xml b/app/src/main/res/values-b+zh+Hant/strings.xml
@@ -39,4 +39,7 @@
     <string name="about_label_qq">加入 QQ 交流羣</string>
     <string name="about_label_twitter">關注 X (Twitter)</string>
     <string name="about_label_instagram">關注 Instagram</string>
+    <string name="about_label_google_forms">Google Forms 反饋</string>
+    <string name="about_label_tencent_survey">騰訊問卷反饋</string>
+    <string name="about_label_email">電郵反饋</string>
 </resources>
diff --git a/app/src/main/res/values-b+zh/strings.xml b/app/src/main/res/values-b+zh/strings.xml
@@ -39,4 +39,7 @@
     <string name="about_label_qq">加入 QQ 交流羣</string>
     <string name="about_label_twitter">關注 X (Twitter)</string>
     <string name="about_label_instagram">關注 Instagram</string>
+    <string name="about_label_google_forms">Google Forms 反饋</string>
+    <string name="about_label_tencent_survey">騰訊問卷反饋</string>
+    <string name="about_label_email">電郵反饋</string>
 </resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -39,4 +39,7 @@
     <string name="about_label_qq">Join QQ Group</string>
     <string name="about_label_twitter">Follow us on X (Twitter)</string>
     <string name="about_label_instagram">Follow us on Instagram</string>
+    <string name="about_label_google_forms">Google Forms Feedback</string>
+    <string name="about_label_tencent_survey">Tencent Survey Feedback</string>
+    <string name="about_label_email">Email Feedback</string>
 </resources>