Merge branch 'develop'

tiagohm · tiagohm · commit 43863cb106f2 · 2018-01-20T14:42:39.000-02:00
diff --git a/.gitignore b/.gitignore
@@ -3,7 +3,7 @@
 *.apk
 *.ap_
 
-# Files for the Dalvik VM
+# Files for the ART/Dalvik VM
 *.dex
 
 # Java class files
@@ -12,6 +12,7 @@
 # Generated files
 bin/
 gen/
+out/
 
 # Gradle files
 .gradle/
@@ -29,73 +30,157 @@ proguard/
 # Android Studio Navigation editor temp files
 .navigation/
 
+# Android Studio captures folder
+captures/
+
+# Intellij
+*.iml
+.idea/workspace.xml
+.idea/tasks.xml
+.idea/gradle.xml
+.idea/dictionaries
+.idea/libraries
+
+# Keystore files
+*.jks
+
+# External native build folder generated in Android Studio 2.2 and later
+.externalNativeBuild
+
+# Google Services (e.g. APIs or Firebase)
+google-services.json
+
+# Freeline
+freeline.py
+freeline/
+freeline_project_description.json
+
 ### Android Patch ###
 gen-external-apklibs
 
+### AndroidStudio ###
+# Covers files to be ignored for android development using Android Studio.
 
-### Java ###
-*.class
+# Built application files
 
-# Mobile Tools for Java (J2ME)
-.mtj.tmp/
+# Files for the ART/Dalvik VM
 
-# Package Files #
-*.jar
-*.war
-*.ear
+# Java class files
 
-# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
-hs_err_pid*
+# Generated files
 
+# Gradle files
+.gradle
 
-### Intellij ###
-# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio
+# Signing files
+.signing/
 
-*.iml
+# Local configuration file (sdk path, etc)
 
-## Directory-based project format:
-.idea/
-# if you remove the above rule, at least ignore the following:
+# Proguard folder generated by Eclipse
 
-# User-specific stuff:
-# .idea/workspace.xml
-# .idea/tasks.xml
-# .idea/dictionaries
+# Log Files
 
-# Sensitive or high-churn files:
-# .idea/dataSources.ids
-# .idea/dataSources.xml
-# .idea/sqlDataSources.xml
-# .idea/dynamic.xml
-# .idea/uiDesigner.xml
+# Android Studio
+/*/build/
+/*/local.properties
+/*/out
+/*/*/build
+/*/*/production
+*.ipr
+*~
+*.swp
 
-# Gradle:
-# .idea/gradle.xml
-# .idea/libraries
+# Android Patch
 
-# Mongo Explorer plugin:
-# .idea/mongoSettings.xml
+# External native build folder generated in Android Studio 2.2 and later
 
-## File-based project format:
-*.ipr
+# NDK
+obj/
+
+# IntelliJ IDEA
 *.iws
+/out/
 
-## Plugin-specific files:
+# User-specific configurations
+.idea/
 
-# IntelliJ
-/out/
-/captures
+# Keystore files
+
+# OS-specific files
+.DS_Store
+.DS_Store?
+._*
+.Spotlight-V100
+.Trashes
+ehthumbs.db
+Thumbs.db
+
+# Legacy Eclipse project files
+.classpath
+.project
+
+# Mobile Tools for Java (J2ME)
+.mtj.tmp/
+
+# Package Files #
+*.jar
+*.war
+*.ear
+
+# virtual machine crash logs (Reference: http://www.java.com/en/download/help/error_hotspot.xml)
+hs_err_pid*
+
+## Plugin-specific files:
 
 # mpeltonen/sbt-idea plugin
 .idea_modules/
 
 # JIRA plugin
 atlassian-ide-plugin.xml
 
+# Mongo Explorer plugin
+.idea/mongoSettings.xml
+
 # Crashlytics plugin (for Android Studio and IntelliJ)
 com_crashlytics_export_strings.xml
 crashlytics.properties
 crashlytics-build.properties
+fabric.properties
 
-# Gradle-Wrapper
+### AndroidStudio Patch ###
+# Google Services plugin
+
+!/gradle/wrapper/gradle-wrapper.jar
+
+### Java ###
+# Compiled class file
+
+# Log file
+
+# BlueJ files
+*.ctxt
+
+# Mobile Tools for Java (J2ME)
+
+# Package Files #
+*.zip
+*.tar.gz
+*.rar
+
+# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
+
+### Gradle ###
+/build/
+
+# Ignore Gradle GUI config
+gradle-app.setting
+
+# Avoid ignoring Gradle wrapper jar file (.jar files are usually ignored)
 !gradle-wrapper.jar
+
+# Cache of project
+.gradletasknamecache
+
+# # Work around https://youtrack.jetbrains.com/issue/IDEA-116898
+# gradle/wrapper/gradle-wrapper.properties
diff --git a/build.gradle b/build.gradle
@@ -3,6 +3,7 @@
 buildscript {
     repositories {
         jcenter()
+        google()
     }
     dependencies {
         classpath 'com.android.tools.build:gradle:3.0.1'
diff --git a/library/build.gradle b/library/build.gradle
@@ -31,14 +31,14 @@ dependencies {
     androidTestImplementation 'com.android.support.test:runner:1.0.1'
     androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.1'
     //Flexmark
-    implementation 'com.vladsch.flexmark:flexmark:0.27.0'
-    implementation 'com.vladsch.flexmark:flexmark-ext-tables:0.27.0'
-    implementation 'com.vladsch.flexmark:flexmark-ext-gfm-strikethrough:0.27.0'
-    implementation 'com.vladsch.flexmark:flexmark-ext-gfm-tasklist:0.27.0'
-    implementation 'com.vladsch.flexmark:flexmark-ext-autolink:0.27.0'
-    implementation 'com.vladsch.flexmark:flexmark-ext-abbreviation:0.27.0'
-    implementation 'com.vladsch.flexmark:flexmark-ext-superscript:0.27.0'
-    implementation 'com.vladsch.flexmark:flexmark-ext-footnotes:0.27.0'
+    implementation 'com.vladsch.flexmark:flexmark:0.28.32'
+    implementation 'com.vladsch.flexmark:flexmark-ext-tables:0.28.32'
+    implementation 'com.vladsch.flexmark:flexmark-ext-gfm-strikethrough:0.28.32'
+    implementation 'com.vladsch.flexmark:flexmark-ext-gfm-tasklist:0.28.32'
+    implementation 'com.vladsch.flexmark:flexmark-ext-autolink:0.28.32'
+    implementation 'com.vladsch.flexmark:flexmark-ext-abbreviation:0.28.32'
+    implementation 'com.vladsch.flexmark:flexmark-ext-superscript:0.28.32'
+    implementation 'com.vladsch.flexmark:flexmark-ext-footnotes:0.28.32'
     //Logger
     implementation 'com.orhanobut:logger:1.15'
 }
diff --git a/library/src/main/java/br/tiagohm/markdownview/ext/bean/internal/BeanDelimiterProcessor.java b/library/src/main/java/br/tiagohm/markdownview/ext/bean/internal/BeanDelimiterProcessor.java
@@ -31,6 +31,21 @@ public Node unmatchedDelimiterNode(InlineParser inlineParser, final DelimiterRun
         return null;
     }
 
+    @Override
+    public boolean canBeOpener(String before, String after, boolean leftFlanking, boolean rightFlanking, boolean beforeIsPunctuation, boolean afterIsPunctuation, boolean beforeIsWhitespace, boolean afterIsWhiteSpace) {
+        return leftFlanking;
+    }
+
+    @Override
+    public boolean canBeCloser(String before, String after, boolean leftFlanking, boolean rightFlanking, boolean beforeIsPunctuation, boolean afterIsPunctuation, boolean beforeIsWhitespace, boolean afterIsWhiteSpace) {
+        return rightFlanking;
+    }
+
+    @Override
+    public boolean skipNonOpenerCloser() {
+        return false;
+    }
+
     @Override
     public int getDelimiterUse(DelimiterRun opener, DelimiterRun closer) {
         if (opener.length() == 2 && closer.length() == 2) {
@@ -45,14 +60,4 @@ public void process(Delimiter opener, Delimiter closer, int delimitersUsed) {
         Bean loc = new Bean(opener.getTailChars(delimitersUsed), BasedSequence.NULL, closer.getLeadChars(delimitersUsed));
         opener.moveNodesBetweenDelimitersTo(loc, closer);
     }
-
-    @Override
-    public boolean canBeOpener(boolean leftFlanking, boolean rightFlanking, boolean beforeIsPunctuation, boolean afterIsPunctuation, boolean beforeIsWhitespace, boolean afterIsWhiteSpace) {
-        return leftFlanking;
-    }
-
-    @Override
-    public boolean canBeCloser(boolean leftFlanking, boolean rightFlanking, boolean beforeIsPunctuation, boolean afterIsPunctuation, boolean beforeIsWhitespace, boolean afterIsWhiteSpace) {
-        return rightFlanking;
-    }
 }
diff --git a/library/src/main/java/br/tiagohm/markdownview/ext/emoji/internal/EmojiDelimiterProcessor.java b/library/src/main/java/br/tiagohm/markdownview/ext/emoji/internal/EmojiDelimiterProcessor.java
@@ -40,6 +40,21 @@ public Node unmatchedDelimiterNode(InlineParser inlineParser, final DelimiterRun
         return null;
     }
 
+    @Override
+    public boolean canBeOpener(String before, String after, boolean leftFlanking, boolean rightFlanking, boolean beforeIsPunctuation, boolean afterIsPunctuation, boolean beforeIsWhitespace, boolean afterIsWhiteSpace) {
+        return leftFlanking && !"0123456789".contains(before);
+    }
+
+    @Override
+    public boolean canBeCloser(String before, String after, boolean leftFlanking, boolean rightFlanking, boolean beforeIsPunctuation, boolean afterIsPunctuation, boolean beforeIsWhitespace, boolean afterIsWhiteSpace) {
+        return rightFlanking && !"0123456789".contains(after);
+    }
+
+    @Override
+    public boolean skipNonOpenerCloser() {
+        return true;
+    }
+
     @Override
     public void process(Delimiter opener, Delimiter closer, int delimitersUsed) {
         // Normal case, wrap nodes between delimiters in emoji node.
@@ -51,14 +66,4 @@ public void process(Delimiter opener, Delimiter closer, int delimitersUsed) {
             opener.convertDelimitersToText(delimitersUsed, closer);
         }
     }
-
-    @Override
-    public boolean canBeOpener(boolean leftFlanking, boolean rightFlanking, boolean beforeIsPunctuation, boolean afterIsPunctuation, boolean beforeIsWhitespace, boolean afterIsWhiteSpace) {
-        return leftFlanking;
-    }
-
-    @Override
-    public boolean canBeCloser(boolean leftFlanking, boolean rightFlanking, boolean beforeIsPunctuation, boolean afterIsPunctuation, boolean beforeIsWhitespace, boolean afterIsWhiteSpace) {
-        return rightFlanking;
-    }
 }
diff --git a/library/src/main/java/br/tiagohm/markdownview/ext/kbd/internal/KeystrokeDelimiterProcessor.java b/library/src/main/java/br/tiagohm/markdownview/ext/kbd/internal/KeystrokeDelimiterProcessor.java
@@ -31,6 +31,21 @@ public Node unmatchedDelimiterNode(InlineParser inlineParser, final DelimiterRun
         return null;
     }
 
+    @Override
+    public boolean canBeOpener(String before, String after, boolean leftFlanking, boolean rightFlanking, boolean beforeIsPunctuation, boolean afterIsPunctuation, boolean beforeIsWhitespace, boolean afterIsWhiteSpace) {
+        return leftFlanking;
+    }
+
+    @Override
+    public boolean canBeCloser(String before, String after, boolean leftFlanking, boolean rightFlanking, boolean beforeIsPunctuation, boolean afterIsPunctuation, boolean beforeIsWhitespace, boolean afterIsWhiteSpace) {
+        return rightFlanking;
+    }
+
+    @Override
+    public boolean skipNonOpenerCloser() {
+        return false;
+    }
+
     @Override
     public int getDelimiterUse(DelimiterRun opener, DelimiterRun closer) {
         if (opener.length() >= 1 && closer.length() >= 1) {
@@ -47,14 +62,4 @@ public void process(Delimiter opener, Delimiter closer, int delimitersUsed) {
         Keystroke kbd = new Keystroke(opener.getTailChars(delimitersUsed), BasedSequence.NULL, closer.getLeadChars(delimitersUsed));
         opener.moveNodesBetweenDelimitersTo(kbd, closer);
     }
-
-    @Override
-    public boolean canBeOpener(boolean leftFlanking, boolean rightFlanking, boolean beforeIsPunctuation, boolean afterIsPunctuation, boolean beforeIsWhitespace, boolean afterIsWhiteSpace) {
-        return leftFlanking;
-    }
-
-    @Override
-    public boolean canBeCloser(boolean leftFlanking, boolean rightFlanking, boolean beforeIsPunctuation, boolean afterIsPunctuation, boolean beforeIsWhitespace, boolean afterIsWhiteSpace) {
-        return rightFlanking;
-    }
 }
diff --git a/library/src/main/java/br/tiagohm/markdownview/ext/label/internal/LabelDelimiterProcessor.java b/library/src/main/java/br/tiagohm/markdownview/ext/label/internal/LabelDelimiterProcessor.java
@@ -31,6 +31,21 @@ public Node unmatchedDelimiterNode(InlineParser inlineParser, final DelimiterRun
         return null;
     }
 
+    @Override
+    public boolean canBeOpener(String before, String after, boolean leftFlanking, boolean rightFlanking, boolean beforeIsPunctuation, boolean afterIsPunctuation, boolean beforeIsWhitespace, boolean afterIsWhiteSpace) {
+        return leftFlanking;
+    }
+
+    @Override
+    public boolean canBeCloser(String before, String after, boolean leftFlanking, boolean rightFlanking, boolean beforeIsPunctuation, boolean afterIsPunctuation, boolean beforeIsWhitespace, boolean afterIsWhiteSpace) {
+        return rightFlanking;
+    }
+
+    @Override
+    public boolean skipNonOpenerCloser() {
+        return false;
+    }
+
     @Override
     public int getDelimiterUse(DelimiterRun opener, DelimiterRun closer) {
         if (opener.length() >= 2 && closer.length() >= 2) {
@@ -46,14 +61,4 @@ public void process(Delimiter opener, Delimiter closer, int delimitersUsed) {
         Label lbl = new Label(delimitersUsed, opener.getTailChars(delimitersUsed), BasedSequence.NULL, closer.getLeadChars(delimitersUsed));
         opener.moveNodesBetweenDelimitersTo(lbl, closer);
     }
-
-    @Override
-    public boolean canBeOpener(boolean leftFlanking, boolean rightFlanking, boolean beforeIsPunctuation, boolean afterIsPunctuation, boolean beforeIsWhitespace, boolean afterIsWhiteSpace) {
-        return leftFlanking;
-    }
-
-    @Override
-    public boolean canBeCloser(boolean leftFlanking, boolean rightFlanking, boolean beforeIsPunctuation, boolean afterIsPunctuation, boolean beforeIsWhitespace, boolean afterIsWhiteSpace) {
-        return rightFlanking;
-    }
 }
diff --git a/library/src/main/java/br/tiagohm/markdownview/ext/mark/internal/MarkDelimiterProcessor.java b/library/src/main/java/br/tiagohm/markdownview/ext/mark/internal/MarkDelimiterProcessor.java
diff --git a/library/src/main/java/br/tiagohm/markdownview/ext/mathjax/internal/MathJaxDelimiterProcessor.java b/library/src/main/java/br/tiagohm/markdownview/ext/mathjax/internal/MathJaxDelimiterProcessor.java

Original file line number	Diff line number	Diff line change
`@@ -3,6 +3,7 @@`
`3`	`3`	`buildscript {`
`4`	`4`	`repositories {`
`5`	`5`	`jcenter()`
	`6`	`+ google()`
`6`	`7`	`}`
`7`	`8`	`dependencies {`
`8`	`9`	`classpath 'com.android.tools.build:gradle:3.0.1'`