Mastodon
/
Tusky-App-Android
mirror of https://github.com/tuskyapp/Tusky
1
0
Fork 0
Code Issues Releases Wiki Activity

correctly render whitespace in posts (#2383) 

* correctly preserve whitespace in posts

* use extension function to convert from Spanned to Html

* improve comment
This commit is contained in:
Konrad Pozniak 2022-03-14 14:43:00 +01:00 committed by GitHub
parent 991d261459
commit a257d9b769
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
app/src/main/java/com/keylesspalace/tusky/json/SpannedTypeAdapter.kt
View File

@ -19,6 +19,7 @@ import android.text.Spanned
import android.text.SpannedString import android.text.SpannedString
import androidx.core.text.HtmlCompat import androidx.core.text.HtmlCompat
import androidx.core.text.parseAsHtml import androidx.core.text.parseAsHtml
import androidx.core.text.toHtml
import com.google.gson.JsonDeserializationContext import com.google.gson.JsonDeserializationContext
import com.google.gson.JsonDeserializer import com.google.gson.JsonDeserializer
import com.google.gson.JsonElement import com.google.gson.JsonElement
@ -32,12 +33,22 @@ import java.lang.reflect.Type
class SpannedTypeAdapter : JsonDeserializer<Spanned>, JsonSerializer<Spanned?> { class SpannedTypeAdapter : JsonDeserializer<Spanned>, JsonSerializer<Spanned?> {
@Throws(JsonParseException::class) @Throws(JsonParseException::class)
override fun deserialize(json: JsonElement, typeOfT: Type, context: JsonDeserializationContext): Spanned { override fun deserialize(json: JsonElement, typeOfT: Type, context: JsonDeserializationContext): Spanned {
/* Html.fromHtml returns trailing whitespace if the html ends in a </p> tag, which return json.asString
* all status contents do, so it should be trimmed. */ /* Mastodon uses 'white-space: pre-wrap;' so spaces are displayed as returned by the Api.
return json.asString?.parseAsHtml()?.trimTrailingWhitespace() ?: SpannedString("") * We can't use CSS so we replace spaces with non-breaking-spaces to emulate the behavior.
*/
?.replace("<br> ", "<br>&nbsp;")
?.replace("<br /> ", "<br />&nbsp;")
?.replace("<br/> ", "<br/>&nbsp;")
?.replace(" ", "&nbsp;&nbsp;")
?.parseAsHtml()
/* Html.fromHtml returns trailing whitespace if the html ends in a </p> tag, which
* most status contents do, so it should be trimmed. */
?.trimTrailingWhitespace()
?: SpannedString("")
} }
override fun serialize(src: Spanned?, typeOfSrc: Type, context: JsonSerializationContext): JsonElement { override fun serialize(src: Spanned?, typeOfSrc: Type, context: JsonSerializationContext): JsonElement {
return JsonPrimitive(HtmlCompat.toHtml(src!!, HtmlCompat.TO_HTML_PARAGRAPH_LINES_INDIVIDUAL)) return JsonPrimitive(src!!.toHtml(HtmlCompat.TO_HTML_PARAGRAPH_LINES_INDIVIDUAL))
} }
} }