Merge pull request #92 from tygalive/master

Add WhatsApp click to chat support

Author: jrvansuita

app/src/main/java/com/vansuita/materialabout/sample/helper/SampleHelper.java

@@ -59,7 +59,8 @@ public void loadAbout() {
                 .addDribbbleLink("user")
                 .addLinkedInLink("arleu-cezar-vansuita-júnior-83769271")
                 .addEmailLink("[email protected]")
-                .addWhatsappLink("Jr", "+554799650629")
+                .addWhatsAppDirectChat( "554799650629")
+                //.addWhatsappLink("Jr", "+554799650629")
                 .addSkypeLink("user")
                 .addGoogleLink("user")
                 .addAndroidLink("user")

library/src/main/java/com/vansuita/materialabout/builder/AboutBuilder.java

@@ -8,8 +8,11 @@
 import android.graphics.drawable.BitmapDrawable;
 import android.net.Uri;
 import androidx.annotation.NonNull;
+
+import android.text.TextUtils;
 import android.view.View;
 
+import androidx.annotation.Nullable;
 import androidx.cardview.widget.CardView;
 
 import com.vansuita.materialabout.R;
@@ -1120,6 +1123,7 @@ public AboutBuilder addSkypeLink(String phone) {
      * @return the same {@link AboutBuilder} instance
      */
     @NonNull
+    @Deprecated
     public AboutBuilder addWhatsappLink(int name, int phone) {
         return addWhatsappLink(context.getString(name), context.getString(phone));
     }
@@ -1131,10 +1135,65 @@ public AboutBuilder addWhatsappLink(int name, int phone) {
      * @return the same {@link AboutBuilder} instance
      */
     @NonNull
+    @Deprecated
     public AboutBuilder addWhatsappLink(String name, String phone) {
         return addLink(R.mipmap.whatsapp, R.string.whastapp, util.openAddContact(name, phone));
     }
 
+    /**
+     * Starts a new direct Whatsapp chat
+     *
+     * @param phone any phone number
+     * @return the same {@link AboutBuilder} instance
+     */
+    @NonNull
+    public AboutBuilder addWhatsAppDirectChat(int phone) {
+        return addWhatsAppDirectChat(context.getString(phone));
+    }
+
+    /**
+     * Starts a new direct Whatsapp chat
+     *
+     * @param phone any phone number
+     * @return the same {@link AboutBuilder} instance
+     *
+     */
+    @NonNull
+    public AboutBuilder addWhatsAppDirectChat(@NonNull String  phone) {
+        return addWhatsAppDirectChat(phone, null);
+    }
+
+    /**
+     * Starts a new direct Whatsapp chat with a default message
+     *
+     * @param phone any phone number
+     * @param message the message to pre-fill
+     * @return the same {@link AboutBuilder} instance
+     */
+    @NonNull
+    public AboutBuilder addWhatsAppDirectChat(int phone, int message) {
+        return addWhatsAppDirectChat(context.getString(phone), context.getString(message));
+    }
+
+    /**
+     * Starts a new direct Whatsapp chat with a default message
+     *
+     * @link https://faq.whatsapp.com/general/chats/how-to-use-click-to-chat
+     * @param phone any phone number
+     * @param message the message to pre-fill
+     * @throws IllegalArgumentException Phone number should be in international format and not contain any brackets, leading zeroes, or dashes.
+     * @return the same {@link AboutBuilder} instance
+     *
+     */
+    @NonNull
+    public AboutBuilder addWhatsAppDirectChat(@NonNull String  phone, @Nullable String message) {
+        if (!TextUtils.isDigitsOnly(phone) || phone.startsWith("0")){
+            throw new IllegalArgumentException("Phone number should be in international format and not contain any brackets, leading zeroes, or dashes.");
+        }
+
+        return addLink(R.mipmap.whatsapp, R.string.whastapp, context.getString(R.string.uri_whatsapp, phone, message == null ? "" : message));
+    }
+
     /**
      * Adds a Android link on the links section
      *

library/src/main/res/values/consts.xml

@@ -39,4 +39,6 @@
     <string name="uri_play_store_apps_list">market://search?q=pub:%s</string>
     <string name="uri_play_store_apps_list_website">https://play.google.com/store/search?q=%s</string>
 
+    <string name="uri_whatsapp">https://wa.me/%1$s?text=%2$s</string>
+
 </resources>