Make fromHtml(String) an extension function of String

Author: rock3r

app/src/main/java/net/squanchy/eventdetails/widget/EventDetailsLayout.kt

@@ -68,10 +68,10 @@ class EventDetailsLayout @JvmOverloads constructor(
             builder.append("   ")
                 .append(floorLabel)
                 .setSpan(
-                        createColorSpan(whereValue, android.R.attr.textColorSecondary),
-                        builder.length - floorLabel.length,
-                        builder.length,
-                        Spanned.SPAN_EXCLUSIVE_EXCLUSIVE
+                    createColorSpan(whereValue, android.R.attr.textColorSecondary),
+                    builder.length - floorLabel.length,
+                    builder.length,
+                    Spanned.SPAN_EXCLUSIVE_EXCLUSIVE
                 )
         }
         return builder
@@ -110,7 +110,7 @@ class EventDetailsLayout @JvmOverloads constructor(
     private fun updateDescription(description: Option<String>) {
         if (description.isDefined()) {
             descriptionGroup.isVisible = true
-            descriptionValue.text = parseHtml(description.getOrThrow())
+            descriptionValue.text = description.getOrThrow().parseHtml()
         } else {
             descriptionGroup.isVisible = false
         }

app/src/main/java/net/squanchy/favorites/view/FavoritesSignedInEmptyLayout.kt

@@ -34,7 +34,7 @@ class FavoritesSignedInEmptyLayout @JvmOverloads constructor(
 
     @RequiresApi(Build.VERSION_CODES.N)
     override fun showAchievement(message: String) {
-        Snackbar.make(this, parseHtml(message), Snackbar.LENGTH_LONG).show()
+        Snackbar.make(this, message.parseHtml(), Snackbar.LENGTH_LONG).show()
     }
 
     private val favoriteButtonClickListener = View.OnClickListener {

app/src/main/java/net/squanchy/speaker/widget/SpeakerDetailsLayout.kt

@@ -11,6 +11,6 @@ class SpeakerDetailsLayout(context: Context, attrs: AttributeSet) : ConstraintLa
 
     fun updateWith(speaker: Speaker) {
         speakerDetailsHeader.updateWith(speaker)
-        speakerBio.text = parseHtml(speaker.bio)
+        speakerBio.text = speaker.bio.parseHtml()
     }
 }

app/src/main/java/net/squanchy/support/text/Html.kt

@@ -6,12 +6,12 @@ import android.text.Html
 import android.text.Spanned
 
 @TargetApi(Build.VERSION_CODES.N) // The older fromHtml() is only called pre-24
-internal fun parseHtml(rawHtml: String): Spanned {
+internal fun String.parseHtml(): Spanned {
     // TODO use Dante (see https://github.com/squanchy-dev/squanchy-android/issues/322)
     return if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
-        Html.fromHtml(rawHtml, Html.FROM_HTML_MODE_LEGACY)
+        Html.fromHtml(this, Html.FROM_HTML_MODE_LEGACY)
     } else {
         @Suppress("DEPRECATION") // This is a "compat" method call, we only use this on pre-N
-        Html.fromHtml(rawHtml)
+        Html.fromHtml(this)
     }
 }

app/src/main/java/net/squanchy/tweets/view/TweetUrlSpanFactory.kt

@@ -90,7 +90,7 @@ class TweetUrlSpanFactory(private val context: Context) {
 
         if (matcher.find()) {
             val matchResult = matcher.toMatchResult()
-            val unescapedEntity = parseHtml(matchResult.group())
+            val unescapedEntity = matchResult.group().parseHtml()
             builder.replace(matchResult.start(), matchResult.end(), unescapedEntity)
             unescapeEntities(builder)
         }

app/src/main/java/net/squanchy/venue/VenueInfoPageView.kt

@@ -73,7 +73,7 @@ class VenueInfoPageView @JvmOverloads constructor(
     private fun updateWith(venue: Venue) {
         venueName.text = venue.name
         venueAddress.text = venue.address
-        venueDescription.text = parseHtml(venue.description)
+        venueDescription.text = venue.description.parseHtml()
         loadMap(venueMap, venue.mapUrl, imageLoader)
         updateMapClickListenerWith(venue)
     }