Merge pull request #265 from naz013/feature/REM-911_Fix_default_group_in_builder

REM-911 - Fix showing reminder group in the lists

Author: naz013

app/src/main/java/com/elementary/tasks/reminder/build/BuildReminderViewModel.kt

@@ -221,8 +221,12 @@ class BuildReminderViewModel(
       Logger.i(TAG, "All permissions granted")
 
       if (!hasGroupBuilderItem(builderItems)) {
+        Logger.i(TAG, "Does not have group builder item")
         getGroupBuilderItem()?.also {
+          Logger.i(TAG, "Add group builder item")
           builderItems.add(it)
+        } ?: run {
+          Logger.i(TAG, "Group builder item not found")
         }
       }
 
@@ -666,9 +670,13 @@ class BuildReminderViewModel(
   }
 
   private suspend fun saveAndStartReminder(reminder: Reminder, isEdit: Boolean = true) {
-    Logger.i(TAG, "Start reminder saving, id = ${reminder.uuId}")
+    Logger.i(
+      TAG,
+      "Start reminder saving, id = ${reminder.uuId} and group id = ${reminder.groupUuId}"
+    )
     if (reminder.groupUuId.isEmpty()) {
       val group = reminderGroupRepository.defaultGroup()
+      Logger.i(TAG, "Reminder does not have a group, get default = $group")
       if (group != null) {
         reminder.groupColor = group.groupColor
         reminder.groupTitle = group.groupTitle

app/src/main/java/com/elementary/tasks/reminder/build/bi/BuilderModifier.kt

@@ -1,14 +1,14 @@
 package com.elementary.tasks.reminder.build.bi
 
 import android.util.Patterns
-import com.github.naz013.domain.GoogleTaskList
-import com.github.naz013.domain.Place
-import com.github.naz013.domain.Reminder
-import com.github.naz013.domain.reminder.ShopItem
 import com.elementary.tasks.core.data.ui.group.UiGroupList
 import com.elementary.tasks.core.data.ui.note.UiNoteList
 import com.elementary.tasks.core.utils.GoogleCalendarUtils
 import com.elementary.tasks.reminder.build.formatter.Formatter
+import com.github.naz013.domain.GoogleTaskList
+import com.github.naz013.domain.Place
+import com.github.naz013.domain.Reminder
+import com.github.naz013.domain.reminder.ShopItem
 import org.threeten.bp.LocalDate
 import org.threeten.bp.LocalTime
 
@@ -206,6 +206,7 @@ class GroupModifier(
   override fun putInto(reminder: Reminder) {
     reminder.groupUuId = storage.value?.id ?: initValue?.id ?: ""
     reminder.groupColor = storage.value?.color ?: initValue?.color ?: 0
+    reminder.groupTitle = storage.value?.title ?: initValue?.title ?: ""
   }
 }
 

app/src/main/java/com/elementary/tasks/reminder/preview/ReminderPreviewViewModel.kt

@@ -133,13 +133,14 @@ class ReminderPreviewViewModel(
   private fun loadReminder() {
     viewModelScope.launch(dispatcherProvider.default()) {
       val reminder = reminderRepository.getById(id) ?: return@launch
+      val reminderGroup = reminderGroupRepository.getById(reminder.groupUuId)
 
       val type = UiReminderType(reminder.type)
 
       canCopy = type.isBase(UiReminderType.Base.DATE)
       canDelete = reminder.isRemoved
 
-      val data = uiReminderPreviewDataAdapter.create(reminder).toMutableList()
+      val data = uiReminderPreviewDataAdapter.create(reminder, reminderGroup).toMutableList()
       _reminderData.postValue(data)
 
       noteRepository.getById(reminder.noteId)?.let { noteToUiReminderPreviewNote(it) }

app/src/main/java/com/elementary/tasks/reminder/preview/data/UiReminderPreviewDataAdapter.kt

@@ -1,7 +1,6 @@
 package com.elementary.tasks.reminder.preview.data
 
 import com.elementary.tasks.R
-import com.elementary.tasks.core.data.adapter.UiAdapter
 import com.elementary.tasks.core.data.adapter.UiReminderCommonAdapter
 import com.elementary.tasks.core.data.adapter.UiReminderPlaceAdapter
 import com.elementary.tasks.core.data.adapter.group.UiGroupListAdapter
@@ -13,17 +12,18 @@ import com.elementary.tasks.core.data.ui.reminder.UiEmailTarget
 import com.elementary.tasks.core.data.ui.reminder.UiReminderPlace
 import com.elementary.tasks.core.data.ui.reminder.UiReminderType
 import com.elementary.tasks.core.data.ui.reminder.UiSmsTarget
-import com.github.naz013.ui.common.theme.ColorProvider
-import com.github.naz013.ui.common.UnitsConverter
 import com.elementary.tasks.core.text.UiTextDecoration
 import com.elementary.tasks.core.text.UiTextFormat
 import com.elementary.tasks.core.text.UiTextStyle
 import com.elementary.tasks.core.utils.BuildParams
 import com.elementary.tasks.reminder.Icons
 import com.elementary.tasks.reminder.preview.AttachmentToUiReminderPreviewAttachment
+import com.github.naz013.common.TextProvider
 import com.github.naz013.domain.Reminder
+import com.github.naz013.domain.ReminderGroup
 import com.github.naz013.domain.reminder.ShopItem
-import com.github.naz013.common.TextProvider
+import com.github.naz013.ui.common.UnitsConverter
+import com.github.naz013.ui.common.theme.ColorProvider
 import java.util.Locale
 
 class UiReminderPreviewDataAdapter(
@@ -34,12 +34,15 @@ class UiReminderPreviewDataAdapter(
   private val colorProvider: ColorProvider,
   private val unitsConverter: UnitsConverter,
   private val attachmentToUiReminderPreviewAttachment: AttachmentToUiReminderPreviewAttachment
-) : UiAdapter<Reminder, List<UiReminderPreviewData>> {
+) {
 
-  override fun create(data: Reminder): List<UiReminderPreviewData> {
+  fun create(
+    data: Reminder,
+    group: ReminderGroup?
+  ): List<UiReminderPreviewData> {
     val type = UiReminderType(data.type)
     return addStatus(data) +
-      addDetails(data) +
+      addDetails(data, group) +
       addTargetInfo(data) +
       addAttachments(data) +
       addSubTasks(data, type) +
@@ -256,7 +259,8 @@ class UiReminderPreviewDataAdapter(
   }
 
   private fun addDetails(
-    data: Reminder
+    data: Reminder,
+    group: ReminderGroup?
   ): List<UiReminderPreviewData> {
     return listOfNotNull(
       UiReminderPreviewHeader(
@@ -293,13 +297,21 @@ class UiReminderPreviewDataAdapter(
           icon = UiIcon(Icons.DESCRIPTION, colorProvider.getColorOnBackground())
         )
       }
-    ) + addDueInfo(data) + addExtraInfo(data)
+    ) + addDueInfo(data) + addExtraInfo(data, group)
   }
 
-  private fun addExtraInfo(data: Reminder): List<UiReminderPreviewData> {
+  private fun addExtraInfo(
+    data: Reminder,
+    group: ReminderGroup?
+  ): List<UiReminderPreviewData> {
+    val uiGroup = if (group != null) {
+      uiGroupListAdapter.convert(group)
+    } else {
+      uiGroupListAdapter.convert(data.groupUuId, data.groupColor, data.groupTitle)
+    }
     return listOfNotNull(
       getNormalTextElement(
-        text = uiGroupListAdapter.convert(data.groupUuId, data.groupColor, data.groupTitle).title,
+        text = uiGroup.title,
         icon = Icons.GROUP
       ),
       getNormalTextElement(uiReminderCommonAdapter.getPriorityTitle(data.priority), Icons.PRIORITY),

repository/src/main/java/com/github/naz013/repository/entity/ReminderEntity.kt

@@ -280,7 +280,9 @@ internal data class ReminderEntity(
       allDay = allDay,
       description = description,
       builderScheme = builderScheme,
-      version = version
+      version = version,
+      groupTitle = groupTitle,
+      groupColor = groupColor
     )
   }
 }