Merge pull request #3 from playmoweb/new-helper-methods

New method added on ListUtils and StringUtils. Also added some tests

Author: kwiky

.travis.yml

@@ -0,0 +1,17 @@
+language: android
+android:
+  components:
+    - tools
+    - platform-tools
+    - tools
+
+    # The BuildTools version used by your project
+    - build-tools-27.0.3
+
+    # The SDK version used to compile your project
+    - android-27
+  licenses:
+      - 'android-sdk-license-.+'
+
+script:
+   - ./gradlew build connectedCheck

README.md

@@ -1,4 +1,4 @@
-# library-android-utils
+# library-android-utils [![Build Status](https://travis-ci.org/playmoweb/library-android-utils.svg?branch=master)](https://travis-ci.org/playmoweb/library-android-utils)
 
 ## Usage
 
@@ -15,7 +15,7 @@ allprojects {
 Step 2. Add the dependency
 ```
 dependencies {
-    compile "com.github.playmoweb:library-android-utils:1.0.0"
+    compile "com.github.playmoweb:library-android-utils:1.0.2"
 }
 ```
 

android-utils/build.gradle

@@ -1,15 +1,17 @@
 apply plugin: 'com.android.library'
 
 android {
+    buildToolsVersion '27.0.3'
     compileSdkVersion 27
     defaultConfig {
         minSdkVersion 16
         targetSdkVersion 27
         versionCode 1
-        versionName "1.0.0"
+        versionName "1.0.2"
     }
 }
 
 dependencies {
-    implementation 'com.android.support:support-annotations:27.1.0'
+    implementation "com.android.support:support-annotations:27.1.1"
+    testImplementation "junit:junit:4.12"
 }

android-utils/src/main/java/com/playmoweb/android/utils/ListUtils.java

@@ -1,6 +1,8 @@
 package com.playmoweb.android.utils;
 
+import java.lang.reflect.Array;
 import java.util.ArrayList;
+import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
 
@@ -80,4 +82,12 @@ public static List<Integer> range(final int from, final int to) {
         }
         return output;
     }
+
+    public static <T> T[] toArray(Collection<? extends T> itr, Class<T> type) {
+        return itr.toArray(newArray(type, itr.size()));
+    }
+
+    public static <T> T[] newArray(Class<T> type, int length) {
+        return (T[]) Array.newInstance(type, length);
+    }
 }

android-utils/src/main/java/com/playmoweb/android/utils/StringUtils.java

@@ -1,5 +1,9 @@
 package com.playmoweb.android.utils;
 
+import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
+
+import java.util.Collection;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
@@ -10,7 +14,16 @@
  */
 public class StringUtils {
 
-    public static String decodeUnicode(final String encoded) {
+    /**
+     * Returns true if the string is null or 0-length.
+     * @param str the string to be examined
+     * @return true if str is null or zero length
+     */
+    public static boolean isEmpty(@Nullable CharSequence str) {
+        return str == null || str.length() == 0;
+    }
+
+    public static String decodeUnicode(@NonNull final String encoded) {
         final Pattern p = Pattern.compile("%u([0-9a-f]{4})", Pattern.CASE_INSENSITIVE);
 
         final Matcher m = p.matcher(encoded);
@@ -24,22 +37,26 @@ public static String decodeUnicode(final String encoded) {
         return decoded.toString();
     }
 
-    public static String capitalizeFirstLetter(final String original) {
+    public static String capitalizeFirstLetter(@Nullable final String original) {
         if (original == null || original.length() == 0) {
             return original;
         }
         return original.substring(0, 1).toUpperCase() + original.substring(1);
     }
 
+    public static String implode(final String separator, final Collection<String> data) {
+        return implode(separator, ListUtils.toArray(data, String.class));
+    }
+
     public static String implode(final String separator, final String... data) {
         final StringBuilder sb = new StringBuilder();
         for (int i = 0; i < data.length - 1; i++) {
-            //data.length - 1 => to not add separator at the end
-            if (!data[i].matches(" *")) {//empty string are ""; " "; "  "; and so on
+            if (!isEmpty(data[i]) && !data[i].matches(" *")) {//empty string are ""; " "; "  "; and so on
                 sb.append(data[i]);
                 sb.append(separator);
             }
         }
+        //data.length - 1 => to not add separator at the end
         sb.append(data[data.length - 1].trim());
         return sb.toString();
     }

android-utils/src/test/java/com/playmoweb/android/utils/StringUtilsTest.java

@@ -0,0 +1,43 @@
+package com.playmoweb.android.utils;
+
+import org.junit.Test;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import static org.junit.Assert.assertEquals;
+
+/**
+ * StringUtilsTest
+ *
+ * @author Playmoweb
+ */
+public class StringUtilsTest {
+
+    @Test
+    public void testImplodeOne() {
+        String result = StringUtils.implode(", ", "test1");
+        assertEquals("test1", result);
+    }
+
+    @Test
+    public void testImplodeTwo() {
+        String result = StringUtils.implode(", ", "test1", "test2");
+        assertEquals("test1, test2", result);
+    }
+
+    @Test
+    public void testImplodeList() {
+        List<String> strings = new ArrayList<>(2);
+        strings.add("test1");
+        strings.add("test2");
+        String result = StringUtils.implode(", ", strings);
+        assertEquals("test1, test2", result);
+    }
+
+    @Test
+    public void testImplodeWithNull() {
+        String result = StringUtils.implode(", ", "test1", null, "test2");
+        assertEquals("test1, test2", result);
+    }
+}

gradle/wrapper/gradle-wrapper.jar

@@ -1,6 +1,5 @@
-#Fri Mar 23 10:13:38 CET 2018
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.7-all.zip

gradle/wrapper/gradle-wrapper.properties

@@ -1,25 +1,43 @@
-#!/usr/bin/env bash
+#!/usr/bin/env sh
 
 ##############################################################################
 ##
 ##  Gradle start up script for UN*X
 ##
 ##############################################################################
 
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS=""
+# Attempt to set APP_HOME
+# Resolve links: $0 may be a link
+PRG="$0"
+# Need this for relative symlinks.
+while [ -h "$PRG" ] ; do
+    ls=`ls -ld "$PRG"`
+    link=`expr "$ls" : '.*-> \(.*\)$'`
+    if expr "$link" : '/.*' > /dev/null; then
+        PRG="$link"
+    else
+        PRG=`dirname "$PRG"`"/$link"
+    fi
+done
+SAVED="`pwd`"
+cd "`dirname \"$PRG\"`/" >/dev/null
+APP_HOME="`pwd -P`"
+cd "$SAVED" >/dev/null
 
 APP_NAME="Gradle"
 APP_BASE_NAME=`basename "$0"`
 
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS=""
+
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD="maximum"
 
-warn ( ) {
+warn () {
     echo "$*"
 }
 
-die ( ) {
+die () {
     echo
     echo "$*"
     echo
@@ -30,6 +48,7 @@ die ( ) {
 cygwin=false
 msys=false
 darwin=false
+nonstop=false
 case "`uname`" in
   CYGWIN* )
     cygwin=true
@@ -40,26 +59,11 @@ case "`uname`" in
   MINGW* )
     msys=true
     ;;
+  NONSTOP* )
+    nonstop=true
+    ;;
 esac
 
-# Attempt to set APP_HOME
-# Resolve links: $0 may be a link
-PRG="$0"
-# Need this for relative symlinks.
-while [ -h "$PRG" ] ; do
-    ls=`ls -ld "$PRG"`
-    link=`expr "$ls" : '.*-> \(.*\)$'`
-    if expr "$link" : '/.*' > /dev/null; then
-        PRG="$link"
-    else
-        PRG=`dirname "$PRG"`"/$link"
-    fi
-done
-SAVED="`pwd`"
-cd "`dirname \"$PRG\"`/" >/dev/null
-APP_HOME="`pwd -P`"
-cd "$SAVED" >/dev/null
-
 CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
 
 # Determine the Java command to use to start the JVM.
@@ -85,7 +89,7 @@ location of your Java installation."
 fi
 
 # Increase the maximum file descriptors if we can.
-if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then
+if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
     MAX_FD_LIMIT=`ulimit -H -n`
     if [ $? -eq 0 ] ; then
         if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
@@ -150,11 +154,19 @@ if $cygwin ; then
     esac
 fi
 
-# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules
-function splitJvmOpts() {
-    JVM_OPTS=("$@")
+# Escape application args
+save () {
+    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
+    echo " "
 }
-eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS
-JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME"
+APP_ARGS=$(save "$@")
+
+# Collect all arguments for the java command, following the shell quoting and substitution rules
+eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
+
+# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
+if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
+  cd "$(dirname "$0")"
+fi
 
-exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@"
+exec "$JAVACMD" "$@"

gradlew

@@ -8,14 +8,14 @@
 @rem Set local scope for the variables with windows NT shell
 if "%OS%"=="Windows_NT" setlocal
 
-@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-set DEFAULT_JVM_OPTS=
-
 set DIRNAME=%~dp0
 if "%DIRNAME%" == "" set DIRNAME=.
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS=
+
 @rem Find java.exe
 if defined JAVA_HOME goto findJavaFromJavaHome
 
@@ -46,10 +46,9 @@ echo location of your Java installation.
 goto fail
 
 :init
-@rem Get command-line arguments, handling Windowz variants
+@rem Get command-line arguments, handling Windows variants
 
 if not "%OS%" == "Windows_NT" goto win9xME_args
-if "%@eval[2+2]" == "4" goto 4NT_args
 
 :win9xME_args
 @rem Slurp the command line arguments.
@@ -60,11 +59,6 @@ set _SKIP=2
 if "x%~1" == "x" goto execute
 
 set CMD_LINE_ARGS=%*
-goto execute
-
-:4NT_args
-@rem Get arguments from the 4NT Shell from JP Software
-set CMD_LINE_ARGS=%$
 
 :execute
 @rem Setup the command line