Add image append

neworld · Mar 22, 2018 · 7516424 · 7516424
1 parent 4ef4518
commit 7516424
Show file tree

Hide file tree

Showing 6 changed files with 25 additions and 7 deletions.
diff --git a/README.md b/README.md
@@ -31,7 +31,7 @@ Spannable spannable = new Spanner()
         .append("foreground\n", foreground(Color.RED))
         .append("subscript\n", subscript())
         .append("superscript\n", superscript())
-        .append(" \n", image(getResources().getDrawable(R.drawable.ic_android_16dp)))
+        .append(image(getResources().getDrawable(R.drawable.ic_android_16dp))).append("\n")
         .append("quite\n", quote())
         .append("The quick brown fox jumps over the lazy dog\n", bold(), foreground(0xFF904f1c), Spans.quote())
         .append("Custom\n", custom(new CustomSpan()))
@@ -96,6 +96,7 @@ Text manipulation:
 | Methods                           | Description                                    |
 | ---------------                   | ---------------------------                    |
 | append(text, spans...)            | appends text                                   |
+| append(image(...))                | appends image                                  |
 | replace(search, replace, spans...)| search and replace text                        |
 | span(search, spans...)            | search text and apply spans                    |
 | insert(pos, text, spans...)       | insert given text in given position            |

diff --git a/lib/src/main/java/lt/neworld/spanner/ImageSpan.kt b/lib/src/main/java/lt/neworld/spanner/ImageSpan.kt
@@ -0,0 +1,7 @@
+package lt.neworld.spanner
+
+/**
+ * @author Andrius Semionovas
+ * @since 2017-10-01
+ */
+class ImageSpan internal constructor(builder: SpanBuilder) : Span(builder)
diff --git a/lib/src/main/java/lt/neworld/spanner/Span.kt b/lib/src/main/java/lt/neworld/spanner/Span.kt
@@ -4,6 +4,6 @@ package lt.neworld.spanner
  * @author Andrius Semionovas
  * @since 2017-10-01
  */
-class Span internal constructor(private val builder: SpanBuilder) {
+open class Span internal constructor(private val builder: SpanBuilder) {
     internal fun buildSpan() = builder.build()
 }
diff --git a/lib/src/main/java/lt/neworld/spanner/Spanner.kt b/lib/src/main/java/lt/neworld/spanner/Spanner.kt
@@ -82,6 +82,16 @@ class Spanner(text: CharSequence?) : SpannableStringBuilder(text) {
         return this
     }
 
+    fun append(span: ImageSpan): Spanner {
+        val start = length
+
+        append(" ")
+
+        setSpans(start, length, span)
+
+        return this
+    }
+
     fun insert(where: Int, text: CharSequence, vararg spans: Span): Spanner {
         super.insert(where, text)
 

diff --git a/lib/src/main/java/lt/neworld/spanner/Spans.java b/lib/src/main/java/lt/neworld/spanner/Spans.java
@@ -192,8 +192,8 @@ public Object build() {
     /**
      * @see android.text.style.ImageSpan#ImageSpan(Drawable)
      */
-    public static Span image(@NonNull final Drawable drawable) {
-        return new Span(new SpanBuilder() {
+    public static lt.neworld.spanner.ImageSpan image(@NonNull final Drawable drawable) {
+        return new lt.neworld.spanner.ImageSpan(new SpanBuilder() {
             @Override
             public Object build() {
                 return new ImageSpan(drawable);
@@ -204,8 +204,8 @@ public Object build() {
     /**
      * @see android.text.style.ImageSpan#ImageSpan(Drawable, int)
      */
-    public static Span image(@NonNull final Drawable drawable, final int verticalAlignment) {
-        return new Span(new SpanBuilder() {
+    public static lt.neworld.spanner.ImageSpan image(@NonNull final Drawable drawable, final int verticalAlignment) {
+        return new lt.neworld.spanner.ImageSpan(new SpanBuilder() {
             @Override
             public Object build() {
                 return new ImageSpan(drawable, verticalAlignment);

diff --git a/sample/src/main/java/lt/neworld/spanner/sample/SampleJavaActivity.java b/sample/src/main/java/lt/neworld/spanner/sample/SampleJavaActivity.java
@@ -60,7 +60,7 @@ public void onClick(View view) {
                 .append("foreground\n", foreground(Color.RED))
                 .append("subscript\n", subscript())
                 .append("superscript\n", superscript())
-                .append(" \n", image(drawable))
+                .append(image(drawable)).append("\n")
                 .append("quite\n", quote())
                 .append("The quick brown fox jumps over the lazy dog\n", bold(), foreground(0xFF904f1c), Spans.quote())
                 .span("fox", foreground(Color.RED))