Merge remote-tracking branch 'origin/develop' into feat/ui_changes

openedx · Mar 27, 2024 · 8b1146f · 8b1146f
2 parents f514c8b + f13bd47
commit 8b1146f
Show file tree

Hide file tree

Showing 18 changed files with 128 additions and 593 deletions.
diff --git a/app/src/main/java/org/openedx/app/di/ScreenModule.kt b/app/src/main/java/org/openedx/app/di/ScreenModule.kt
@@ -246,6 +246,7 @@ val screenModule = module {
             get(),
             get(),
             get(),
+            get(),
         )
     }
     viewModel { (courseId: String, handoutsType: String) ->
@@ -259,7 +260,7 @@ val screenModule = module {
     viewModel { CourseSearchViewModel(get(), get(), get(), get(), get()) }
     viewModel { SelectDialogViewModel(get()) }
 
-    single { DiscussionRepository(get(), get()) }
+    single { DiscussionRepository(get(), get(), get()) }
     factory { DiscussionInteractor(get()) }
     viewModel { (courseId: String) -> DiscussionTopicsViewModel(get(), get(), get(), courseId) }
     viewModel { (courseId: String, topicId: String, threadType: String) ->

diff --git a/auth/src/androidTest/java/org/openedx/auth/presentation/signup/RegistrationScreenTest.kt b/auth/src/androidTest/java/org/openedx/auth/presentation/signup/RegistrationScreenTest.kt
diff --git a/build.gradle b/build.gradle
@@ -20,8 +20,8 @@ plugins {
     id "com.google.firebase.crashlytics" version "2.9.6" apply false
 }
 
-task clean(type: Delete) {
-    delete rootProject.buildDir
+tasks.register('clean', Delete) {
+    delete rootProject.layout.buildDirectory
 }
 
 ext {

diff --git a/buildSrc/build.gradle b/buildSrc/build.gradle
@@ -1,7 +1,16 @@
+plugins {
+    id 'java-library'
+}
+
 repositories {
     mavenCentral()
 }
 
+java {
+    sourceCompatibility = JavaVersion.VERSION_17
+    targetCompatibility = JavaVersion.VERSION_17
+}
+
 dependencies {
     implementation localGroovy()
     implementation gradleApi()

diff --git a/core/src/main/java/org/openedx/core/ui/ComposeCommon.kt b/core/src/main/java/org/openedx/core/ui/ComposeCommon.kt
@@ -151,7 +151,7 @@ fun Toolbar(
     canShowBackBtn: Boolean = false,
     onBackClick: () -> Unit = {}
 ) {
-    Row(
+    Box(
         modifier = modifier
             .fillMaxWidth()
             .height(48.dp),
@@ -162,9 +162,10 @@ fun Toolbar(
 
         Text(
             modifier = Modifier
+                .fillMaxWidth()
                 .testTag("txt_toolbar_title")
-                .align(Alignment.CenterVertically)
-                .padding(end = 16.dp),
+                .align(Alignment.Center)
+                .padding(start = 48.dp, end = 48.dp),
             text = label,
             color = MaterialTheme.appColors.textPrimary,
             style = MaterialTheme.appTypography.titleMedium,

diff --git a/...se/src/androidTest/java/org/openedx/course/presentation/detail/CourseDetailsScreenTest.kt b/...se/src/androidTest/java/org/openedx/course/presentation/detail/CourseDetailsScreenTest.kt