Merge pull request #24 from NickM-27/develop

Develop

Author: NickM-27

.idea/assetWizardSettings.xml

@@ -18,7 +18,7 @@ On your module's `build.gradle` file add this statement to the `dependencies` se
 
 ```groovy
 dependencies {
-    implementation 'com.nick.mowen.linkpreview:linkpreview:2.0'
+    implementation 'com.nick.mowen.linkpreview:linkpreview:2.1'
 }
 ```
 

.idea/codeStyles/codeStyleConfig.xml

@@ -1,13 +1,13 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 buildscript {
-    ext.kotlin_version = '1.3.10'
+    ext.kotlin_version = '1.3.20'
     repositories {
         google()
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.3.0-beta04'
+        classpath 'com.android.tools.build:gradle:3.3.0'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
 
         //For Library

.idea/dictionaries/nickmowen.xml

@@ -9,8 +9,8 @@ android {
     defaultConfig {
         minSdkVersion 19
         targetSdkVersion 28
-        versionCode 15
-        versionName "2.0"
+        versionCode 17
+        versionName "2.2"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
     buildTypes {
@@ -31,7 +31,7 @@ dependencies {
     implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
 
     //Other
-    implementation 'org.jsoup:jsoup:1.11.2'
+    implementation 'org.jsoup:jsoup:1.11.3'
     //noinspection GradleDependency
     implementation 'com.github.bumptech.glide:glide:3.8.0'
 
@@ -43,8 +43,8 @@ dependencies {
 
     //Testing libraries
     testImplementation 'org.jetbrains.kotlin:kotlin-test-junit:1.2.31'
-    androidTestImplementation 'androidx.test:runner:1.1.0'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.0'
+    androidTestImplementation 'androidx.test:runner:1.1.1'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.1'
 }
 
 ext {
@@ -54,7 +54,7 @@ ext {
 
     publishedGroupId = 'com.nick.mowen.linkpreview'
     artifact = 'linkpreview'
-    libraryVersion = '2.0'
+    libraryVersion = '2.2'
     libraryDescription = 'A convenient view that shows a clickable preview of a link'
     siteUrl = 'https://github.com/NickM-27/LinkPreview'
     gitUrl = 'https://github.com/NickM-27/LinkPreview.git'

.idea/misc.xml

@@ -7,7 +7,5 @@ object BindingAdapter {
 
     @BindingAdapter("parsedLink")
     @JvmStatic
-    fun setParsedLink(view: LinkPreview, link: String) {
-        view.parseTextForLink(link)
-    }
+    fun setParsedLink(view: LinkPreview, link: String) = view.parseTextForLink(link)
 }

.idea/vcs.xml

@@ -3,4 +3,14 @@ package com.nick.mowen.linkpreview.extension
 /**
  * Checks whether a string is a url by using Regex
  */
-fun String.isUrl(): Boolean = this.matches(Regex("https?://(www\\.)?[-a-zA-Z0-9@:%._+~#=]{2,256}\\.[a-z]{2,6}\\b([-a-zA-Z0-9@:%_+.~#?&/=]*)"))
+fun String.isUrl(): Boolean = this.matches(Regex(REGEX_URL))
+
+/**
+ * Parses the link from the full string
+ */
+fun String.parseUrl(): String = REGEX_URL.toRegex().find(this)?.value ?: ""
+
+/**
+ * Regex pattern that matches to standard urls
+ */
+private const val REGEX_URL = "https?://(www\\.)?[-a-zA-Z0-9@:%._+~#=]{2,256}\\.[a-z]{2,6}\\b([-a-zA-Z0-9@:%_+.~#?&/=]*)"