move WPEditText to WordPressUtils and reorganize WordPressUtils

maxme · maxme · commit 3c894b2438eb · 2015-02-09T17:37:56.000+01:00
diff --git a/WordPressUtils/src/main/java/org/wordpress/android/util/AlertUtils.java b/WordPressUtils/src/main/java/org/wordpress/android/util/AlertUtils.java
@@ -21,7 +21,7 @@
 import android.content.Context;
 import android.content.DialogInterface;
 
-public class AlertUtil {
+public class AlertUtils {
     /**
      * Show Alert Dialog
      * @param context
diff --git a/WordPressUtils/src/main/java/org/wordpress/android/util/EmoticonsUtils.java b/WordPressUtils/src/main/java/org/wordpress/android/util/EmoticonsUtils.java
@@ -14,7 +14,7 @@
 import static android.os.Build.VERSION.SDK_INT;
 import static android.os.Build.VERSION_CODES;
 
-public class Emoticons {
+public class EmoticonsUtils {
     public static final int EMOTICON_COLOR = 0xFF21759B;
     private static final boolean HAS_EMOJI = SDK_INT >= VERSION_CODES.JELLY_BEAN;
     private static final Map<String, String> wpSmilies;
@@ -82,7 +82,7 @@ public static String lookupImageSmiley(String url, String ifNone){
     public static Spanned replaceEmoticonsWithEmoji(SpannableStringBuilder html){
         ImageSpan imgs[] = html.getSpans(0, html.length(), ImageSpan.class);
         for (ImageSpan img : imgs) {
-            String emoticon = Emoticons.lookupImageSmiley(img.getSource());
+            String emoticon = EmoticonsUtils.lookupImageSmiley(img.getSource());
             if (!emoticon.equals("")) {
                 int start = html.getSpanStart(img);
                 html.replace(start, html.getSpanEnd(img), emoticon);
@@ -103,4 +103,4 @@ public static String replaceEmoticonsWithEmoji(final String text) {
             return text;
         }
     }
-}
+}
diff --git a/WordPressUtils/src/main/java/org/wordpress/android/util/HtmlUtils.java b/WordPressUtils/src/main/java/org/wordpress/android/util/HtmlUtils.java
@@ -10,6 +10,9 @@
 import android.text.style.QuoteSpan;
 
 import org.apache.commons.lang.StringEscapeUtils;
+import org.wordpress.android.util.helpers.WPHtmlTagHandler;
+import org.wordpress.android.util.helpers.WPImageGetter;
+import org.wordpress.android.util.helpers.WPQuoteSpan;
 
 public class HtmlUtils {
     /*
@@ -111,7 +114,7 @@ public static String stripScript(final String text) {
     }
 
     /**
-     * an alternative to Html.fromHtml() supporting <ul>, <ol>, <blockquote> tags and replacing Emoticons with Emojis
+     * an alternative to Html.fromHtml() supporting <ul>, <ol>, <blockquote> tags and replacing EmoticonsUtils with Emojis
      */
     public static SpannableStringBuilder fromHtml(String source, WPImageGetter wpImageGetter) {
         SpannableStringBuilder html;
@@ -121,7 +124,7 @@ public static SpannableStringBuilder fromHtml(String source, WPImageGetter wpIma
             // In case our tag handler fails
             html = (SpannableStringBuilder) Html.fromHtml(source, wpImageGetter, null);
         }
-        Emoticons.replaceEmoticonsWithEmoji(html);
+        EmoticonsUtils.replaceEmoticonsWithEmoji(html);
         QuoteSpan spans[] = html.getSpans(0, html.length(), QuoteSpan.class);
         for (QuoteSpan span : spans) {
             html.setSpan(new WPQuoteSpan(), html.getSpanStart(span), html.getSpanEnd(span), html.getSpanFlags(span));
diff --git a/WordPressUtils/src/main/java/org/wordpress/android/util/JSONUtils.java b/WordPressUtils/src/main/java/org/wordpress/android/util/JSONUtils.java
@@ -10,7 +10,7 @@
 import java.util.ArrayList;
 import java.util.Iterator;
 
-public class JSONUtil {
+public class JSONUtils {
     private static String QUERY_SEPERATOR=".";
     private static String QUERY_ARRAY_INDEX_START="[";
     private static String QUERY_ARRAY_INDEX_END="]";
@@ -19,7 +19,7 @@ public class JSONUtil {
 
     private static final String JSON_NULL_STR = "null";
 
-    private static final String TAG="JSONUtil";
+    private static final String TAG="JSONUtils";
     /**
      * Given a JSONObject and a key path (e.g property.child) and a default it will
      * traverse the object graph and pull out the desired property
@@ -232,4 +232,4 @@ public static JSONObject getJSONChild(final JSONObject jsonParent, final String
         }
         return jsonChild;
     }
-}
+}
diff --git a/WordPressUtils/src/main/java/org/wordpress/android/util/StringUtils.java b/WordPressUtils/src/main/java/org/wordpress/android/util/StringUtils.java
@@ -214,8 +214,8 @@ public static String replaceUnicodeSurrogateBlocksWithHTMLEntities(final String
             final int codepoint = inputString.codePointAt(offset);
             final char current = inputString.charAt(offset);
             if (Character.isHighSurrogate(current) || Character.isLowSurrogate(current)) {
-                if (Emoticons.wpSmiliesCodePointToText.get(codepoint) != null) {
-                    out.append(Emoticons.wpSmiliesCodePointToText.get(codepoint));
+                if (EmoticonsUtils.wpSmiliesCodePointToText.get(codepoint) != null) {
+                    out.append(EmoticonsUtils.wpSmiliesCodePointToText.get(codepoint));
                 } else {
                     final String htmlEscapedChar = "&#x" + Integer.toHexString(codepoint) + ";";
                     out.append(htmlEscapedChar);
@@ -275,4 +275,4 @@ public static int stringToInt(String s, int defaultValue) {
             return defaultValue;
         }
     }
-}
+}
diff --git a/WordPressUtils/src/main/java/org/wordpress/android/util/UserEmailUtils.java b/WordPressUtils/src/main/java/org/wordpress/android/util/UserEmailUtils.java
@@ -7,7 +7,7 @@
 
 import java.util.regex.Pattern;
 
-public class UserEmail {
+public class UserEmailUtils {
     /**
      * Get primary account and return its name if it matches the email address pattern.
      *
diff --git a/WordPressUtils/src/main/java/org/wordpress/android/util/helpers/ListScrollPositionManager.java b/WordPressUtils/src/main/java/org/wordpress/android/util/helpers/ListScrollPositionManager.java
@@ -1,4 +1,4 @@
-package org.wordpress.android.util;
+package org.wordpress.android.util.helpers;
 
 import android.content.Context;
 import android.content.SharedPreferences;
diff --git a/WordPressUtils/src/main/java/org/wordpress/android/util/helpers/LocationHelper.java b/WordPressUtils/src/main/java/org/wordpress/android/util/helpers/LocationHelper.java
@@ -1,5 +1,5 @@
 //This Handy-Dandy class acquired and tweaked from http://stackoverflow.com/a/3145655/309558
-package org.wordpress.android.util;
+package org.wordpress.android.util.helpers;
 
 import java.util.Timer;
 import java.util.TimerTask;
diff --git a/WordPressUtils/src/main/java/org/wordpress/android/util/helpers/SwipeToRefreshHelper.java b/WordPressUtils/src/main/java/org/wordpress/android/util/helpers/SwipeToRefreshHelper.java
@@ -1,4 +1,4 @@
-package org.wordpress.android.util.ptr;
+package org.wordpress.android.util.helpers;
 
 import android.app.Activity;
 import android.content.Context;
diff --git a/WordPressUtils/src/main/java/org/wordpress/android/util/helpers/Version.java b/WordPressUtils/src/main/java/org/wordpress/android/util/helpers/Version.java
@@ -1,4 +1,4 @@
-package org.wordpress.android.util;
+package org.wordpress.android.util.helpers;
 
 //See: http://stackoverflow.com/a/11024200
 public class Version implements Comparable<Version> {
@@ -44,4 +44,4 @@ public Version(String version) {
             return false;
         return this.compareTo((Version) that) == 0;
     }
-}
+}
diff --git a/WordPressUtils/src/main/java/org/wordpress/android/util/helpers/WPHtmlTagHandler.java b/WordPressUtils/src/main/java/org/wordpress/android/util/helpers/WPHtmlTagHandler.java
@@ -1,4 +1,4 @@
-package org.wordpress.android.util;
+package org.wordpress.android.util.helpers;
 
 import android.text.Editable;
 import android.text.Html;
diff --git a/WordPressUtils/src/main/java/org/wordpress/android/util/helpers/WPImageGetter.java b/WordPressUtils/src/main/java/org/wordpress/android/util/helpers/WPImageGetter.java
@@ -1,4 +1,4 @@
-package org.wordpress.android.util;
+package org.wordpress.android.util.helpers;
 
 import android.graphics.Canvas;
 import android.graphics.drawable.BitmapDrawable;
@@ -10,7 +10,9 @@
 import com.android.volley.VolleyError;
 import com.android.volley.toolbox.ImageLoader;
 
+import org.wordpress.android.util.AppLog;
 import org.wordpress.android.util.AppLog.T;
+import org.wordpress.android.util.PhotonUtils;
 
 import java.lang.ref.WeakReference;
 
diff --git a/WordPressUtils/src/main/java/org/wordpress/android/util/helpers/WPQuoteSpan.java b/WordPressUtils/src/main/java/org/wordpress/android/util/helpers/WPQuoteSpan.java
@@ -1,4 +1,4 @@
-package org.wordpress.android.util;
+package org.wordpress.android.util.helpers;
 
 import android.graphics.Canvas;
 import android.graphics.Paint;
diff --git a/WordPressUtils/src/main/java/org/wordpress/android/util/helpers/WPWebChromeClient.java b/WordPressUtils/src/main/java/org/wordpress/android/util/helpers/WPWebChromeClient.java
@@ -1,4 +1,4 @@
-package org.wordpress.android.util;
+package org.wordpress.android.util.helpers;
 
 import android.app.Activity;
 import android.view.View;
@@ -38,4 +38,4 @@ public void onProgressChanged(WebView webView, int progress) {
             }
         }
     }
-}
+}
diff --git a/WordPressUtils/src/main/java/org/wordpress/android/util/widgets/AutoResizeTextView.java b/WordPressUtils/src/main/java/org/wordpress/android/util/widgets/AutoResizeTextView.java
@@ -1,4 +1,4 @@
-package org.wordpress.android.util;
+package org.wordpress.android.util.widgets;
 
 import android.content.Context;
 import android.text.Layout;
diff --git a/WordPressUtils/src/main/java/org/wordpress/android/util/widgets/WPEditText.java b/WordPressUtils/src/main/java/org/wordpress/android/util/widgets/WPEditText.java
@@ -0,0 +1,57 @@
+package org.wordpress.android.util.widgets;
+
+import android.content.Context;
+import android.util.AttributeSet;
+import android.view.KeyEvent;
+import android.widget.EditText;
+
+public class WPEditText extends EditText {
+    private EditTextImeBackListener mOnImeBack;
+    private OnSelectionChangedListener onSelectionChangedListener;
+
+    public WPEditText(Context context) {
+        super(context);
+    }
+
+    public WPEditText(Context context, AttributeSet attrs) {
+        super(context, attrs);
+    }
+
+    public WPEditText(Context context, AttributeSet attrs, int defStyle) {
+        super(context, attrs, defStyle);
+    }
+
+    @Override
+    protected void onSelectionChanged(int selStart, int selEnd) {
+        if (onSelectionChangedListener != null) {
+            onSelectionChangedListener.onSelectionChanged();
+        }
+    }
+
+    @Override
+    public boolean onKeyPreIme(int keyCode, KeyEvent event) {
+        if (event.getKeyCode() == KeyEvent.KEYCODE_BACK
+                && event.getAction() == KeyEvent.ACTION_UP) {
+            if (mOnImeBack != null)
+                mOnImeBack.onImeBack(this, this.getText().toString());
+        }
+
+        return super.onKeyPreIme(keyCode, event);
+    }
+
+    public void setOnEditTextImeBackListener(EditTextImeBackListener listener) {
+        mOnImeBack = listener;
+    }
+
+    public interface EditTextImeBackListener {
+        public abstract void onImeBack(WPEditText ctrl, String text);
+    }
+
+    public void setOnSelectionChangedListener(OnSelectionChangedListener listener) {
+        onSelectionChangedListener = listener;
+    }
+
+    public interface OnSelectionChangedListener {
+        public abstract void onSelectionChanged();
+    }
+}

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`
`8`	`8`	`import java.util.regex.Pattern;`
`9`	`9`
`10`		`-public class UserEmail {`
	`10`	`+public class UserEmailUtils {`
`11`	`11`	`/**`
`12`	`12`	`* Get primary account and return its name if it matches the email address pattern.`
`13`	`13`	`*`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package org.wordpress.android.util;`
	`1`	`+package org.wordpress.android.util.helpers;`
`2`	`2`
`3`	`3`	`import android.content.Context;`
`4`	`4`	`import android.content.SharedPreferences;`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package org.wordpress.android.util.ptr;`
	`1`	`+package org.wordpress.android.util.helpers;`
`2`	`2`
`3`	`3`	`import android.app.Activity;`
`4`	`4`	`import android.content.Context;`