Merge branch 'master' into remove-domain

Conflicts:
 linkable-text/src/main/java/com/github/fobid/linkabletext/widget/LinkableTextView.java
 sample/src/main/java/com/github/fobid/linkabletext/sample/ui/activity/ListViewActivity.java
 sample/src/main/java/com/github/fobid/linkabletext/sample/ui/activity/MainActivity.java
 sample/src/main/java/com/github/fobid/linkabletext/sample/ui/activity/RecyclerViewActivity.java

Author: fobidlim

CHANGELOG.md

@@ -1,3 +1,6 @@
+## 0.1.1
+- Added `setEnabledLinks()`, `setEnabledHashtag`, `setEnabledMention`, `setEnabledEmailAddress`, `setEnabledPhone`, `setEnabledWebUrl`, `setEnabledDomainName`, `setEnabledIpAddress` to `LinkableTextView`.
+
 ## 0.1.0
 - This is first public version.
 - `LinkableTextView` supports clickable @mentions, #hashtags, links, emails, phones and ....

README.md

@@ -1,4 +1,7 @@
 # Linkable Text Library
+[![Android Arsenal](https://img.shields.io/badge/Android%20Arsenal-linkable--text-green.svg?style=flat)](http://android-arsenal.com/details/1/4674)
+
+[![Join the chat at https://gitter.im/fobid/linkable-text/Lobby](https://badges.gitter.im/fobid/linkable-text/Lobby.svg)](https://gitter.im/fobid/linkable-text?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
 
 [![Github Release][release-image]][release-url]
 
@@ -7,20 +10,29 @@ You can download Linkable Text Sample application on Google Play.
 [![Get it on Google Play](http://www.android.com/images/brand/get_it_on_play_logo_small.png)](https://play.google.com/store/apps/details?id=com.github.fobid.linkabletext.sample)
 
 # Download
-Download [the latest JAR](https://repo1.maven.org/maven2/com/github/fobid/linkabletext/0.1.0/linkabletext-0.1.0.aar) or grab via Maven:
+Download [the latest JAR](https://repo1.maven.org/maven2/com/github/fobid/linkabletext/0.1.1/linkabletext-0.1.1.aar) or grab via Maven:
 ```
 <dependency>
   <groupId>com.github.fobid</groupId>
   <artifactId>linkable-text</artifactId>
-  <version>0.1.0</version>
+  <version>0.1.1</version>
 </dependency>
 ```
 or Gradle:
 ```
-compile 'com.github.fobid:linkable-text:0.1.0'
+compile 'com.github.fobid:linkable-text:0.1.1'
 ```
 
 # Usage
+```
+ <com.github.fobid.linkabletext.widget.LinkableTextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content" />
+```
+If you don't want to set link, then add `app:enabledLinks="false"` in your xml.
+Or, `LinkableTextView.setEnabledLinks(false)` in your code.
+
+You must call `LinkableTextView.setOnLinkClickListener()` after `setText()` to set links  clickable.
 
 # License
 ```
@@ -39,5 +51,5 @@ See the License for the specific language governing permissions and
 limitations under the License.
 ```
 
-[release-image]: https://img.shields.io/badge/release-v0.1.0-lightgrey.svg
-[release-url]: https://github.com/fobid/linkable-text-android/releases/tag/v0.1.0
+[release-image]: https://img.shields.io/badge/release-v0.1.1-lightgrey.svg
+[release-url]: https://github.com/fobid/linkable-text-android/releases/tag/v0.1.1

linkable-text/build.gradle

@@ -3,7 +3,7 @@ apply plugin: 'com.jfrog.bintray'
 apply plugin: 'com.github.dcendents.android-maven'
 apply plugin: 'signing'
 
-version = '0.1.0'
+version = '0.1.1'
 
 def siteUrl = 'https://github.com/fobid/linkable-text-android'       // Homepage URL of the library
 def gitUrl = 'https://github.com/fobid/linkable-text-android.git'    // Git repository URL
@@ -16,7 +16,7 @@ android {
     defaultConfig {
         minSdkVersion 9
         targetSdkVersion 24
-        versionCode 1
+        versionCode 2
         versionName version
 
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
@@ -110,12 +110,12 @@ bintray {
                 sign = true //Determines whether to GPG sign the files. The default is false
                 passphrase = properties.getProperty("bintray.gpg.password") //Optional. The passphrase for GPG signing'
             }
-//            mavenCentralSync {
-//                sync = true //Optional (true by default). Determines whether to sync the version to Maven Central.
-//                user = properties.getProperty("bintray.oss.user") //OSS user token
-//                password = properties.getProperty("bintray.oss.password") //OSS user password
-//                close = '1' //Optional property. By default the staging repository is closed and artifacts are released to Maven Central. You can optionally turn this behaviour off (by puting 0 as value) and release the version manually.
-//            }
+            mavenCentralSync {
+                sync = true //Optional (true by default). Determines whether to sync the version to Maven Central.
+                user = properties.getProperty("bintray.oss.user") //OSS user token
+                password = properties.getProperty("bintray.oss.password") //OSS user password
+                close = '1' //Optional property. By default the staging repository is closed and artifacts are released to Maven Central. You can optionally turn this behaviour off (by puting 0 as value) and release the version manually.
+            }
         }
     }
 }

linkable-text/src/main/java/com/github/fobid/linkabletext/util/LinkableMovementMethod.java renamed to linkable-text/src/main/java/com/github/fobid/linkabletext/text/method/LinkableMovementMethod.java

@@ -1,4 +1,4 @@
-package com.github.fobid.linkabletext.util;
+package com.github.fobid.linkabletext.text.method;
 
 import android.text.Layout;
 import android.text.Selection;
@@ -8,6 +8,7 @@
 import android.view.MotionEvent;
 
 import com.github.fobid.linkabletext.annotation.LinkType;
+import com.github.fobid.linkabletext.view.LinkableCallback;
 import com.github.fobid.linkabletext.widget.LinkableTextView;
 
 /**
@@ -16,10 +17,10 @@
 
 public class LinkableMovementMethod extends LinkMovementMethod {
 
-    private static final String SOCIAL_UI_BASE_SCHEME = "http://blog.fobid.me";
-    public static final String SOCIAL_UI_HASHTAG_SCHEME = SOCIAL_UI_BASE_SCHEME + "/hashtag";
-    public static final String SOCIAL_UI_MENTION_SCHEME = SOCIAL_UI_BASE_SCHEME + "/mention";
-    public static final String SOCIAL_UI_IP_ADDRESS_SCHEME = SOCIAL_UI_BASE_SCHEME + "/ip";
+    private static final String LINKABLE_BASE_SCHEME = "https://github.com/fobid/linkable-text-android";
+    public static final String LINKABLE_HASHTAG_SCHEME = LINKABLE_BASE_SCHEME + "/hashtag";
+    public static final String LINKABLE_MENTION_SCHEME = LINKABLE_BASE_SCHEME + "/mention";
+    public static final String LINKABLE_IP_ADDRESS_SCHEME = LINKABLE_BASE_SCHEME + "/ip";
 
     private final LinkableCallback mLinkableCallback;
 
@@ -67,16 +68,16 @@ public boolean onTouchEvent(android.widget.TextView widget, android.text.Spannab
     }
 
     private void handleLink(String link) {
-        if (link.startsWith(SOCIAL_UI_HASHTAG_SCHEME)) {
-            String hashtag = link.replaceFirst(SOCIAL_UI_HASHTAG_SCHEME, "");
+        if (link.startsWith(LINKABLE_HASHTAG_SCHEME)) {
+            String hashtag = link.replaceFirst(LINKABLE_HASHTAG_SCHEME, "");
             hashtag = hashtag.replaceFirst(".*#", "");
             mLinkableCallback.onMatch(LinkableTextView.Link.HASH_TAG, hashtag);
-        } else if (link.startsWith(SOCIAL_UI_MENTION_SCHEME)) {
-            String mention = link.replaceFirst(SOCIAL_UI_MENTION_SCHEME, "");
+        } else if (link.startsWith(LINKABLE_MENTION_SCHEME)) {
+            String mention = link.replaceFirst(LINKABLE_MENTION_SCHEME, "");
             mention = mention.replaceFirst(".*@", "");
             mLinkableCallback.onMatch(LinkableTextView.Link.MENTION, mention);
-        } else if (link.startsWith(SOCIAL_UI_IP_ADDRESS_SCHEME)) {
-            String ip = link.replaceFirst(SOCIAL_UI_IP_ADDRESS_SCHEME, "");
+        } else if (link.startsWith(LINKABLE_IP_ADDRESS_SCHEME)) {
+            String ip = link.replaceFirst(LINKABLE_IP_ADDRESS_SCHEME, "");
             ip = ip.replaceFirst(".", "");
             mLinkableCallback.onMatch(LinkableTextView.Link.IP_ADDRESS, ip);
         } else if (Patterns.EMAIL_ADDRESS.matcher(link).matches()) {

linkable-text/src/main/java/com/github/fobid/linkabletext/util/LinkableCallback.java renamed to linkable-text/src/main/java/com/github/fobid/linkabletext/view/LinkableCallback.java

@@ -1,4 +1,4 @@
-package com.github.fobid.linkabletext.util;
+package com.github.fobid.linkabletext.view;
 
 import com.github.fobid.linkabletext.annotation.LinkType;
 

linkable-text/src/main/java/com/github/fobid/linkabletext/util/OnLinkableClickListener.java renamed to linkable-text/src/main/java/com/github/fobid/linkabletext/view/OnLinkClickListener.java

@@ -1,10 +1,10 @@
-package com.github.fobid.linkabletext.util;
+package com.github.fobid.linkabletext.view;
 
 /**
  * Created by partner on 2016-11-17.
  */
 
-public interface OnLinkableClickListener {
+public interface OnLinkClickListener {
     void onHashtagClick(String hashtag);
 
     void onMentionClick(String mention);

linkable-text/src/main/java/com/github/fobid/linkabletext/widget/LinkableTextView.java

@@ -4,6 +4,7 @@
 import android.content.Context;
 import android.content.res.TypedArray;
 import android.os.Build;
+import android.support.annotation.Nullable;
 import android.text.TextUtils;
 import android.text.method.MovementMethod;
 import android.text.util.Linkify;
@@ -13,9 +14,9 @@
 
 import com.github.fobid.linkabletext.R;
 import com.github.fobid.linkabletext.annotation.LinkType;
-import com.github.fobid.linkabletext.util.LinkableCallback;
-import com.github.fobid.linkabletext.util.LinkableMovementMethod;
-import com.github.fobid.linkabletext.util.OnLinkableClickListener;
+import com.github.fobid.linkabletext.text.method.LinkableMovementMethod;
+import com.github.fobid.linkabletext.view.LinkableCallback;
+import com.github.fobid.linkabletext.view.OnLinkClickListener;
 
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
@@ -39,6 +40,7 @@ public interface Link {
     private static Pattern MENTION_PATTERN;
     private static Pattern HASHTAG_PATTERN;
 
+    private boolean enabledLinks = true;
     private boolean enabledHashtag = true;
     private boolean enabledMention = true;
     private boolean enabledEmailAddress = true;
@@ -84,6 +86,8 @@ private void initView(Context context, AttributeSet attrs) {
                 mentionPattern = a.getString(attr);
             else if (attr == R.styleable.LinkableTextView_pattern_hashtag)
                 hashtagPattern = a.getString(attr);
+            else if (attr == R.styleable.LinkableTextView_enabledLinks)
+                enabledLinks = a.getBoolean(attr, true);
             else if (attr == R.styleable.LinkableTextView_enabledHashtag)
                 enabledHashtag = a.getBoolean(attr, true);
             else if (attr == R.styleable.LinkableTextView_enabledMention)
@@ -99,6 +103,7 @@ else if (attr == R.styleable.LinkableTextView_enabledIp_address)
         }
         setMentionPattern(mentionPattern);
         setHashtagPattern(hashtagPattern);
+        setEnabledLinks(enabledLinks);
         setEnabledHashtag(enabledHashtag);
         setEnabledMention(enabledMention);
         setEnabledEmailAddress(enabledEmailAddress);
@@ -109,7 +114,7 @@ else if (attr == R.styleable.LinkableTextView_enabledIp_address)
         a.recycle();
     }
 
-    public void setMentionPattern(String mentionPattern) {
+    public void setMentionPattern(@Nullable String mentionPattern) {
         if (!TextUtils.isEmpty(mentionPattern)) {
             MENTION_PATTERN = Pattern.compile(mentionPattern);
         } else {
@@ -121,7 +126,11 @@ public Pattern getMentionPattern() {
         return MENTION_PATTERN;
     }
 
-    public void setHashtagPattern(String hashTagPattern) {
+    public void setDefaultMentionPattern() {
+        setMentionPattern(null);
+    }
+
+    public void setHashtagPattern(@Nullable String hashTagPattern) {
         if (!TextUtils.isEmpty(hashTagPattern)) {
             HASHTAG_PATTERN = Pattern.compile(hashTagPattern);
         } else {
@@ -133,12 +142,16 @@ public Pattern getHashtagPattern() {
         return HASHTAG_PATTERN;
     }
 
-    public boolean isEnabledEmailAddress() {
-        return enabledEmailAddress;
+    public void setDefaultHashtagPattern() {
+        setHashtagPattern(null);
     }
 
-    public void setEnabledEmailAddress(boolean enabledEmailAddress) {
-        this.enabledEmailAddress = enabledEmailAddress;
+    public boolean isEnabledLinks() {
+        return enabledLinks;
+    }
+
+    public void setEnabledLinks(boolean enabledLinks) {
+        this.enabledLinks = enabledLinks;
     }
 
     public boolean isEnabledHashtag() {
@@ -149,14 +162,6 @@ public void setEnabledHashtag(boolean enabledHashtag) {
         this.enabledHashtag = enabledHashtag;
     }
 
-    public boolean isEnabledIpAddress() {
-        return enabledIpAddress;
-    }
-
-    public void setEnabledIpAddress(boolean enabledIpAddress) {
-        this.enabledIpAddress = enabledIpAddress;
-    }
-
     public boolean isEnabledMention() {
         return enabledMention;
     }
@@ -165,6 +170,14 @@ public void setEnabledMention(boolean enabledMention) {
         this.enabledMention = enabledMention;
     }
 
+    public boolean isEnabledEmailAddress() {
+        return enabledEmailAddress;
+    }
+
+    public void setEnabledEmailAddress(boolean enabledEmailAddress) {
+        this.enabledEmailAddress = enabledEmailAddress;
+    }
+
     public boolean isEnabledPhone() {
         return enabledPhone;
     }
@@ -181,68 +194,83 @@ public void setEnabledWebUrl(boolean enabledWebUrl) {
         this.enabledWebUrl = enabledWebUrl;
     }
 
-    public void addLinks(final OnLinkableClickListener actionHandler) {
-        addLinks(new LinkableCallback() {
+    public boolean isEnabledIpAddress() {
+        return enabledIpAddress;
+    }
+
+    public void setEnabledIpAddress(boolean enabledIpAddress) {
+        this.enabledIpAddress = enabledIpAddress;
+    }
+
+
+    public void setOnLinkClickListener(@Nullable final OnLinkClickListener listener) {
+        setOnLinkClickListener(new LinkableCallback() {
             @Override
             public void onMatch(@LinkType int type, String value) {
+                if (listener == null || !enabledLinks)
+                    return;
+
                 switch (type) {
-                    case Link.HASH_TAG: {
+                    case Link.HASH_TAG:
                         if (enabledHashtag)
-                            actionHandler.onHashtagClick(value);
+                            listener.onHashtagClick(value);
                         break;
-                    }
-                    case Link.MENTION: {
+
+                    case Link.MENTION:
                         if (enabledMention)
-                            actionHandler.onMentionClick(value);
+                            listener.onMentionClick(value);
                         break;
-                    }
-                    case Link.EMAIL_ADDRESS: {
+
+                    case Link.EMAIL_ADDRESS:
                         if (enabledEmailAddress)
-                            actionHandler.onEmailAddressClick(value);
+                            listener.onEmailAddressClick(value);
                         break;
-                    }
                     case Link.IP_ADDRESS:
                         if (!enabledIpAddress)
                             break;
-                    case Link.WEB_URL: {
+                    case Link.WEB_URL:
                         if (enabledWebUrl)
-                            actionHandler.onWebUrlClick(value);
+                            listener.onWebUrlClick(value);
                         break;
-                    }
-                    case Link.PHONE: {
+
+                    case Link.PHONE:
                         if (enabledPhone)
-                            actionHandler.onPhoneClick(value);
+                            listener.onPhoneClick(value);
                         break;
-                    }
                 }
             }
         });
     }
 
-    public void addLinks(LinkableCallback callback) {
+    public void setOnLinkClickListener(@Nullable final LinkableCallback callback) {
         Linkify.TransformFilter filter = new Linkify.TransformFilter() {
             public final String transformUrl(final Matcher match, String url) {
                 return match.group();
             }
         };
 
-        if (enabledHashtag)
-            Linkify.addLinks(this, HASHTAG_PATTERN, LinkableMovementMethod.SOCIAL_UI_HASHTAG_SCHEME, null, filter);
+        if (enabledLinks) {
+            if (enabledHashtag)
+                Linkify.addLinks(this, HASHTAG_PATTERN,
+                        LinkableMovementMethod.LINKABLE_HASHTAG_SCHEME, null, filter);
 
-        if (enabledMention)
-            Linkify.addLinks(this, MENTION_PATTERN, LinkableMovementMethod.SOCIAL_UI_MENTION_SCHEME, null, filter);
+            if (enabledMention)
+                Linkify.addLinks(this, MENTION_PATTERN,
+                        LinkableMovementMethod.LINKABLE_MENTION_SCHEME, null, filter);
 
-        if (enabledEmailAddress)
-            Linkify.addLinks(this, Patterns.EMAIL_ADDRESS, null, null, filter);
+            if (enabledEmailAddress)
+                Linkify.addLinks(this, Patterns.EMAIL_ADDRESS, null, null, filter);
 
-        if (enabledPhone)
-            Linkify.addLinks(this, Patterns.PHONE, null, null, filter);
+            if (enabledPhone)
+                Linkify.addLinks(this, Patterns.PHONE, null, null, filter);
 
-        if (enabledWebUrl)
-            Linkify.addLinks(this, Patterns.WEB_URL, null, null, filter);
+            if (enabledWebUrl)
+                Linkify.addLinks(this, Patterns.WEB_URL, null, null, filter);
 
-        if (enabledIpAddress)
-            Linkify.addLinks(this, IP_ADDRESS_PATTERN, LinkableMovementMethod.SOCIAL_UI_IP_ADDRESS_SCHEME, null, filter);
+            if (enabledIpAddress)
+                Linkify.addLinks(this, IP_ADDRESS_PATTERN,
+                        LinkableMovementMethod.LINKABLE_IP_ADDRESS_SCHEME, null, filter);
+        }
 
         MovementMethod movementMethod = null;
         if (callback != null) {