Merge branch 'develop' into feature/communication/send-message-via-us…

…er-dialog
ls1intum · Jan 10, 2025 · 549624d · 549624d
2 parents 988f88d + 042af39
commit 549624d
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/...formatics/www1/artemis/native_app/feature/dashboard/service/impl/SurveyHintServiceImpl.kt b/...formatics/www1/artemis/native_app/feature/dashboard/service/impl/SurveyHintServiceImpl.kt
@@ -11,7 +11,7 @@ import java.time.LocalDate
 
 
 private val SURVEY_START_DATE = LocalDate.of(2024, 11, 28)
-private val SURVEY_END_DATE = LocalDate.of(2025, 1, 16)
+private val SURVEY_END_DATE = LocalDate.of(2025, 1, 31)
 
 class SurveyHintServiceImpl(
     private val context: Context,

diff --git a/...main/kotlin/de/tum/informatics/www1/artemis/native_app/feature/dashboard/ui/SurveyHint.kt b/...main/kotlin/de/tum/informatics/www1/artemis/native_app/feature/dashboard/ui/SurveyHint.kt
@@ -126,6 +126,7 @@ private fun SurveyDialog(
 ) {
 
     AlertDialog(
+        modifier = modifier,
         onDismissRequest = { onClose(false) },
         title = { Text(text = stringResource(R.string.survey_dialog_title)) },
         text = {

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -6,7 +6,7 @@ buildToolsVersion = "35.0.0"
 
 accompanist = "0.30.1"
 androidDesugarJdkLibs = "2.1.4"
-androidGradlePlugin = "8.7.1"
+androidGradlePlugin = "8.8.0"
 androidxActivity = "1.9.3"
 androidxAppCompat = "1.7.0"
 androidxComposeBom = "2024.12.01"