fenix
/
Simple-Notes
mirror of https://github.com/SimpleMobileTools/Simple-Notes.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix formatting for checklist notes

This commit is contained in:
Ensar Sarajčić 2023-07-26 12:40:32 +02:00
parent 92f4863b8a
commit 68991ce1cd
1 changed files with 51 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
app/src/main/kotlin/com/simplemobiletools/notes/pro/adapters/OpenNoteAdapter.kt
View File

@ -1,15 +1,24 @@
package com.simplemobiletools.notes.pro.adapters
import android.content.Context
import android.text.SpannableString
import android.text.style.StrikethroughSpan
import android.view.Menu
import android.view.View
import android.view.ViewGroup
import com.google.gson.Gson
import com.google.gson.reflect.TypeToken
import com.simplemobiletools.commons.activities.BaseSimpleActivity
import com.simplemobiletools.commons.adapters.MyRecyclerViewAdapter
import com.simplemobiletools.commons.extensions.getColoredDrawableWithColor
import com.simplemobiletools.commons.helpers.MEDIUM_ALPHA_INT
import com.simplemobiletools.commons.helpers.SORT_BY_CUSTOM
import com.simplemobiletools.commons.views.MyRecyclerView
import com.simplemobiletools.notes.pro.R
import com.simplemobiletools.notes.pro.extensions.config
import com.simplemobiletools.notes.pro.models.ChecklistItem
import com.simplemobiletools.notes.pro.models.Note
import com.simplemobiletools.notes.pro.models.NoteType
import kotlinx.android.synthetic.main.open_note_item.view.open_note_item_holder
import kotlinx.android.synthetic.main.open_note_item.view.open_note_item_text
import kotlinx.android.synthetic.main.open_note_item.view.open_note_item_title
@ -58,9 +67,50 @@ class OpenNoteAdapter(
setTextColor(properPrimaryColor)
}
open_note_item_text.apply {
text = note.getNoteStoredValue(context)
text = note.getFormattedValue(context)
setTextColor(textColor)
}
}
}
private fun Note.getFormattedValue(context: Context): CharSequence? {
return when (type) {
NoteType.TYPE_TEXT -> getNoteStoredValue(context)
NoteType.TYPE_CHECKLIST -> {
val checklistItemType = object : TypeToken<List<ChecklistItem>>() {}.type
var items = Gson().fromJson<List<ChecklistItem>>(getNoteStoredValue(context), checklistItemType) ?: listOf()
items = items.filter { it.title != null }.let {
val sorting = context.config.sorting
ChecklistItem.sorting = sorting
if (ChecklistItem.sorting and SORT_BY_CUSTOM == 0) {
it.sorted().let {
if (context.config?.moveDoneChecklistItems == true) {
it.sortedBy { it.isDone }
} else {
it
}
}
} else {
it
}
}
val linePrefix = "• "
val stringifiedItems = items.joinToString(separator = System.lineSeparator()) {
"${linePrefix}${it.title}"
}
val formattedText = SpannableString(stringifiedItems)
var currentPos = 0
items.forEach { item ->
currentPos += linePrefix.length
if (item.isDone) {
formattedText.setSpan(StrikethroughSpan(), currentPos, currentPos + item.title.length, 0)
}
currentPos += item.title.length
currentPos += System.lineSeparator().length
}
formattedText
}
}
}
}