Changed module name to library

LICENSE

@@ -0,0 +1,202 @@
+Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "{}"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright {yyyy} {name of copyright owner}
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+

README.md

@@ -1,7 +1,15 @@
 # Markwon
+
+[![Maven Central|markwon](https://img.shields.io/maven-central/v/ru.noties/markwon.svg?label=maven-central%7Cmarkwon)](http://search.maven.org/#search|ga|1|g%3A%22ru.noties%22%20AND%20a%3A%markwon%22)
+[![Maven Central|markwon-image-loader](https://img.shields.io/maven-central/v/ru.noties/markwon.svg?label=maven-central%7Cmarkwon-image-loader)](http://search.maven.org/#search|ga|1|g%3A%22ru.noties%22%20AND%20a%3A%markwon%22)
+
 Android library for rendering markdown as system-native Spannables. Based on [commonmark-java][commonmark-java]
 
-**WIP (*work in progress*)**
+## Installation
+```groovy
+compile 'ru.noties:markwon:1.0.0'
+compile 'ru.noties:markwon-image-loader:1.0.0' // optional
+```
 
 ---
 
@@ -17,6 +25,7 @@ Android library for rendering markdown as system-native Spannables. Based on [co
 * Ordered & non-ordered lists & nested ones
 * Inline code
 * Code blocks
+* Tables (*with limitations*)
 * Small subset of inline-html (which is rendered by this library):
 * * Emphasis (`<i>`, `<em>`, `<cite>`, `<dfn>`)
 * * Strong emphasis (`<b>`, `<strong>`)
@@ -26,26 +35,44 @@ Android library for rendering markdown as system-native Spannables. Based on [co
 * * Strike-through (`<s>`, `<strike>`, `<del>`)
   * other inline html is rendered via (`Html.fromHtml(...)`)
 
+
 ### Emphasis
+
 *Lorem ipsum dolor sit amet*
+
 _Lorem ipsum dolor sit amet_
+
 <i>Lorem ipsum dolor sit amet</i>
+
 <em>Lorem ipsum dolor sit amet</em>
+
 <cite>Lorem ipsum dolor sit amet</cite>
+
 <dfn>Lorem ipsum dolor sit amet</dfn>
 
+
 ### Strong emphasis
+
 **Lorem ipsum dolor sit amet**
+
 __Lorem ipsum dolor sit amet__
+
 <b>Lorem ipsum dolor sit amet</b>
+
 <strong>Lorem ipsum dolor sit amet</strong>
 
+
 ### Strike-through
+
 ~~Lorem ipsum dolor sit amet~~
+
 <s>Lorem ipsum dolor sit amet</s>
+
 <strike>Lorem ipsum dolor sit amet</strike>
+
 <del>Lorem ipsum dolor sit amet</del>
 
+
 ---
 # Header 1
 ## Header 2
@@ -55,25 +82,34 @@ __Lorem ipsum dolor sit amet__
 ###### Header 6
 ---
 
+
 ### Links
+
 [click me](https://github.com)
+
 [click me][1]
+
 [click me][github]
+
 <a href="https://github.com">click me</a>
 
+
 ### Images
 // todo, normal ones & svg & gif
 
+
 ### Thematic break
 ---
 ***
 ___
 
+
 ### Quotes
 > Lorem ipsum dolor sit amet
 >> Lorem ipsum dolor sit amet
 >>> Lorem ipsum dolor sit amet
 
+
 ### Ordered lists
 1. Lorem ipsum dolor sit amet
 2. Lorem ipsum dolor sit amet
@@ -82,6 +118,7 @@ ___
    2. Lorem ipsum dolor sit amet
 3. Lorem ipsum dolor sit amet
 
+
 ### Non-ordered lists
 * Lorem ipsum dolor sit amet
    * Lorem ipsum dolor sit amet
@@ -90,6 +127,7 @@ ___
 * * Lorem ipsum dolor sit amet
 * Lorem ipsum dolor sit amet
 
+
 ### Inline code
 `Lorem` ipsum dolor sit amet
 Lorem `ipsum` dolor sit amet
@@ -99,17 +137,19 @@ Lorem ipsum dolor sit `amet`
 
 `Lorem ipsum dolor sit amet`
 
+
 ### Code block
-// todo syntax higlight
 ```
 Lorem ipsum dolor sit amet
 Lorem ipsum dolor sit amet
 Lorem ipsum dolor sit amet
 ```
 
+
 ### H.T.M.L.
 <b>O</b><i>K<s>A</s><sup>42<sup>43<sub><b>42</b></sub></sup></sup><u>Y</u></i>
 
+
 ### Tables
 Header #1 | Header #2 | Header #3
 ---: | :---: | :---

app/build.gradle

@@ -16,7 +16,7 @@ android {
 
 dependencies {
 
-    compile project(':library-renderer')
+    compile project(':library')
     compile project(':library-image-loader')
 
     compile 'ru.noties:debug:3.0.0@jar'

library-image-loader/build.gradle

@@ -15,7 +15,7 @@ android {
 
 dependencies {
 
-    compile project(':library-renderer')
+    compile project(':library')
     compile ANDROID_SVG
     compile ANDROID_GIF
     compile OK_HTTP

library/src/main/java/ru/noties/markwon/DrawablesScheduler.java

@@ -63,30 +63,34 @@ abstract class DrawablesScheduler {
             list = Collections.EMPTY_LIST;
         } else {
 
-            final Object[] spans = ((Spanned) cs).getSpans(0, length, Object.class);
+            final List<AsyncDrawable> drawables = new ArrayList<>(2);
-            if (spans != null
-                    && spans.length > 0) {
 
-                list = new ArrayList<>(2);
+            final Spanned spanned = (Spanned) cs;
+            final AsyncDrawableSpan[] asyncDrawableSpans = spanned.getSpans(0, length, AsyncDrawableSpan.class);
+            if (asyncDrawableSpans != null
+                    && asyncDrawableSpans.length > 0) {
+                for (AsyncDrawableSpan span : asyncDrawableSpans) {
+                    drawables.add(span.getDrawable());
+                }
+            }
 
-                for (Object span : spans) {
+            final DynamicDrawableSpan[] dynamicDrawableSpans = spanned.getSpans(0, length, DynamicDrawableSpan.class);
-                    if (span instanceof AsyncDrawableSpan) {
+            if (dynamicDrawableSpans != null
-
+                    && dynamicDrawableSpans.length > 0) {
-                        final AsyncDrawableSpan asyncDrawableSpan = (AsyncDrawableSpan) span;
+                for (DynamicDrawableSpan span : dynamicDrawableSpans) {
-                        list.add(asyncDrawableSpan.getDrawable());
+                    final Drawable d = span.getDrawable();
-                    } else if (span instanceof DynamicDrawableSpan) {
+                    if (d != null
-                        // it's really not optimal thing because it stores Drawable in WeakReference...
+                            && d instanceof AsyncDrawable) {
-                        // which is why it will be most likely already de-referenced...
+                        drawables.add((AsyncDrawable) d);
-                        final Drawable d = ((DynamicDrawableSpan) span).getDrawable();
-                        if (d != null
-                                && d instanceof AsyncDrawable) {
-                            list.add((AsyncDrawable) d);
-                        }
                     }
                 }
-            } else {
+            }
+
+            if (drawables.size() == 0) {
                 //noinspection unchecked
                 list = Collections.EMPTY_LIST;
+            } else {
+                list = drawables;
             }
         }
 

library/src/main/java/ru/noties/markwon/spans/TableRowSpan.java

@@ -17,8 +17,6 @@ import java.lang.annotation.RetentionPolicy;
 import java.util.ArrayList;
 import java.util.List;
 
-import ru.noties.debug.Debug;
-
 public class TableRowSpan extends ReplacementSpan {
 
     public static final int ALIGN_LEFT = 0;
@@ -155,12 +153,15 @@ public class TableRowSpan extends ReplacementSpan {
 
         final int w = width / size;
 
+        // feels like magic...
+        final int heightDiff = (bottom - top - height) / 4;
+
         if (odd) {
             final int save = canvas.save();
             try {
                 rect.set(0, 0, width, bottom - top);
                 theme.applyTableOddRowStyle(this.paint);
-                canvas.translate(x, top);
+                canvas.translate(x, top - heightDiff);
                 canvas.drawRect(rect, this.paint);
             } finally {
                 canvas.restoreToCount(save);
@@ -177,10 +178,10 @@ public class TableRowSpan extends ReplacementSpan {
             final int save = canvas.save();
             try {
 
-                canvas.translate(x + (i * w), top);
+                canvas.translate(x + (i * w), top - heightDiff);
                 canvas.drawRect(rect, this.paint);
 
-                canvas.translate(padding, padding);
+                canvas.translate(padding, padding + heightDiff);
                 layout.draw(canvas);
 
                 if (layout.getHeight() > maxHeight) {
@@ -205,9 +206,7 @@ public class TableRowSpan extends ReplacementSpan {
 
     private void makeNewLayouts() {
 
-        if (header) {
+        textPaint.setFakeBoldText(header);
-            textPaint.setFakeBoldText(true);
-        }
 
         final int columns = cells.size();
         final int padding = theme.tableCellPadding() * 2;

settings.gradle

@@ -1 +1 @@
-include ':app', ':library-renderer', ':library-image-loader'
+include ':app', ':library', ':library-image-loader'