Merge branch 'develop' into bugfix/fix-thread-answer-showing-twice

ls1intum · Nov 19, 2024 · b365451 · b365451
2 parents f1a3e92 + ea12b02
commit b365451
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 3 deletions.
diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -7,7 +7,7 @@ assignees: ''
 
 ---
 
-**Describe the bug**
+### Describe the bug
 A clear and concise description of what the bug is.
 
 **To Reproduce**
@@ -20,8 +20,8 @@ Steps to reproduce the behavior:
 **Expected behavior**
 A clear and concise description of what you expected to happen.
 
-**Screenshots**
+### Screenshots
 If applicable, add screenshots to help explain your problem.
 
-**Additional context**
+### Additional context
 Add any other context about the problem here.
diff --git a/...main/kotlin/de/tum/informatics/www1/artemis/native_app/feature/settings/SettingsScreen.kt b/...main/kotlin/de/tum/informatics/www1/artemis/native_app/feature/settings/SettingsScreen.kt
@@ -207,6 +207,7 @@ private fun SettingsScreen(
             AboutSection(
                 modifier = Modifier.fillMaxWidth(),
                 hasUserSelectedInstance = hasUserSelectedInstance,
+                serverUrl = serverUrl,
                 onOpenPrivacyPolicy = {
                     val link = URLBuilder(serverUrl).appendPathSegments("privacy").buildString()
 
@@ -334,6 +335,7 @@ private fun NotificationSection(modifier: Modifier, onOpenNotificationSettings:
 private fun AboutSection(
     modifier: Modifier,
     hasUserSelectedInstance: Boolean,
+    serverUrl: String,
     onRequestSelectServerInstance: () -> Unit,
     onOpenPrivacyPolicy: () -> Unit,
     onOpenImprint: () -> Unit,
@@ -352,6 +354,12 @@ private fun AboutSection(
         }
 
         if (hasUserSelectedInstance) {
+            PreferenceEntry(
+                modifier = Modifier.fillMaxWidth(),
+                text = stringResource(R.string.settings_server_url, serverUrl),
+                onClick = {}
+            )
+
             PreferenceEntry(
                 modifier = Modifier.fillMaxWidth(),
                 text = stringResource(id = R.string.settings_about_privacy_policy),

diff --git a/feature/settings/src/main/res/values/settings_strings.xml b/feature/settings/src/main/res/values/settings_strings.xml
@@ -12,6 +12,7 @@
 
     <string name="settings_about_section">About</string>
     <string name="settings_server_specifics_information">Imprint and privacy policy depend on the server you have currently selected.</string>
+    <string name="settings_server_url">Server URL: %1$s</string>
     <string name="settings_server_specifics_unavailable">Imprint and privacy policy are unavailable as you have not yet selected a server instance. Please select a server instance to view their privacy policy and imprint.</string>
     <string name="settings_server_specifics_unavailable_select_instance_button">Select instance</string>
     <string name="settings_about_privacy_policy">Privacy policy</string>