fix: bug when the name of subcategory is empty (#263)

openedx · Mar 25, 2024 · f49283d · f49283d
1 parent cc295d9
commit f49283d
Show file tree

Hide file tree

Showing 5 changed files with 53 additions and 11 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
@@ -260,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/discussion/src/main/java/org/openedx/discussion/data/repository/DiscussionRepository.kt b/discussion/src/main/java/org/openedx/discussion/data/repository/DiscussionRepository.kt
@@ -2,22 +2,31 @@ package org.openedx.discussion.data.repository
 
 import org.openedx.core.data.model.BlocksCompletionBody
 import org.openedx.core.data.storage.CorePreferences
+import org.openedx.core.system.ResourceManager
+import org.openedx.discussion.R
 import org.openedx.discussion.data.api.DiscussionApi
-import org.openedx.discussion.data.model.request.*
+import org.openedx.discussion.data.model.request.CommentBody
+import org.openedx.discussion.data.model.request.FollowBody
+import org.openedx.discussion.data.model.request.ReadBody
+import org.openedx.discussion.data.model.request.ReportBody
+import org.openedx.discussion.data.model.request.ThreadBody
+import org.openedx.discussion.data.model.request.VoteBody
 import org.openedx.discussion.domain.model.CommentsData
 import org.openedx.discussion.domain.model.ThreadsData
 import org.openedx.discussion.domain.model.Topic
 
 class DiscussionRepository(
     private val api: DiscussionApi,
-    private val preferencesManager: CorePreferences
-    ) {
+    private val preferencesManager: CorePreferences,
+    private val resourceManager: ResourceManager
+) {
 
     private val topics = mutableListOf<Topic>()
     private var currentCourseId = ""
 
     suspend fun getCourseTopics(courseId: String): List<Topic> {
         val topicsData = api.getCourseTopics(courseId).mapToDomain()
+        val defaultTopicName = resourceManager.getString(R.string.discussion_unnamed_subcategory)
         currentCourseId = courseId
         topics.clear()
         topics.addAll(topicsData.nonCoursewareTopics)
@@ -27,6 +36,11 @@ class DiscussionRepository(
                 topics.addAll(it.children)
             }
         }
+        topics.forEachIndexed { index, topic ->
+            if (topic.name.isBlank()) {
+                topics[index] = topic.copy(name = defaultTopicName)
+            }
+        }
         return topics.toList()
     }
 

diff --git a/discussion/src/main/java/org/openedx/discussion/domain/model/TopicsData.kt b/discussion/src/main/java/org/openedx/discussion/domain/model/TopicsData.kt
@@ -1,5 +1,6 @@
 package org.openedx.discussion.domain.model
 
+
 data class TopicsData(
     val coursewareTopics: List<Topic>,
     val nonCoursewareTopics: List<Topic>

diff --git a/discussion/src/main/java/org/openedx/discussion/presentation/ui/DiscussionUI.kt b/discussion/src/main/java/org/openedx/discussion/presentation/ui/DiscussionUI.kt
@@ -8,9 +8,24 @@ import androidx.compose.foundation.Image
 import androidx.compose.foundation.background
 import androidx.compose.foundation.border
 import androidx.compose.foundation.clickable
-import androidx.compose.foundation.layout.*
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.layout.width
 import androidx.compose.foundation.shape.CircleShape
-import androidx.compose.material.*
+import androidx.compose.material.Card
+import androidx.compose.material.Divider
+import androidx.compose.material.Icon
+import androidx.compose.material.MaterialTheme
+import androidx.compose.material.Surface
+import androidx.compose.material.Text
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.filled.ChevronRight
 import androidx.compose.material.icons.outlined.HelpOutline
@@ -94,7 +109,10 @@ fun ThreadMainItem(
                     .error(org.openedx.core.R.drawable.core_ic_default_profile_picture)
                     .placeholder(org.openedx.core.R.drawable.core_ic_default_profile_picture)
                     .build(),
-                contentDescription = stringResource(id = org.openedx.core.R.string.core_accessibility_user_profile_image, thread.author),
+                contentDescription = stringResource(
+                    id = org.openedx.core.R.string.core_accessibility_user_profile_image,
+                    thread.author
+                ),
                 modifier = Modifier
                     .size(48.dp)
                     .clip(MaterialTheme.appShapes.material.medium)
@@ -245,7 +263,10 @@ fun CommentItem(
                         .error(org.openedx.core.R.drawable.core_ic_default_profile_picture)
                         .placeholder(org.openedx.core.R.drawable.core_ic_default_profile_picture)
                         .build(),
-                    contentDescription = stringResource(id = org.openedx.core.R.string.core_accessibility_user_profile_image, comment.author),
+                    contentDescription = stringResource(
+                        id = org.openedx.core.R.string.core_accessibility_user_profile_image,
+                        comment.author
+                    ),
                     modifier = Modifier
                         .size(32.dp)
                         .clip(CircleShape)
@@ -395,7 +416,10 @@ fun CommentMainItem(
                         .error(org.openedx.core.R.drawable.core_ic_default_profile_picture)
                         .placeholder(org.openedx.core.R.drawable.core_ic_default_profile_picture)
                         .build(),
-                    contentDescription = stringResource(id = org.openedx.core.R.string.core_accessibility_user_profile_image, comment.author),
+                    contentDescription = stringResource(
+                        id = org.openedx.core.R.string.core_accessibility_user_profile_image,
+                        comment.author
+                    ),
                     modifier = Modifier
                         .size(32.dp)
                         .clip(CircleShape)
@@ -504,7 +528,8 @@ fun ThreadItem(
                 text = textType,
                 painter = icon,
                 color = MaterialTheme.appColors.textPrimaryVariant,
-                textStyle = MaterialTheme.appTypography.labelSmall)
+                textStyle = MaterialTheme.appTypography.labelSmall
+            )
             if (thread.unreadCommentCount > 0 && !thread.read) {
                 Row(
                     modifier = Modifier,
@@ -562,7 +587,8 @@ fun ThreadItem(
             ),
             painter = painterResource(id = R.drawable.discussion_ic_responses),
             color = MaterialTheme.appColors.textAccent,
-            textStyle = MaterialTheme.appTypography.labelLarge)
+            textStyle = MaterialTheme.appTypography.labelLarge
+        )
     }
 
 }

diff --git a/discussion/src/main/res/values/strings.xml b/discussion/src/main/res/values/strings.xml
@@ -34,6 +34,7 @@
     <string name="discussion_anonymous">anonymous</string>
     <string name="discussion_no_yet">No discussions yet</string>
     <string name="discussion_click_button_create_discussion">Click the button below to create your first discussion.</string>
+    <string name="discussion_unnamed_subcategory">Unnamed subcategory</string>
 
 
     <plurals name="discussion_votes">