Merge branch 'master' into feature/switch-to-coroutines

Author: TostF

MaskedEditText/src/main/java/br/com/sapereaude/maskedEditText/MaskedEditText.java

@@ -25,7 +25,19 @@
 public class MaskedEditText extends AppCompatEditText implements TextWatcher {
 
     public static final String SPACE = " ";
-    private String mask;
+	private final OnEditorActionListener onEditorActionListener = new OnEditorActionListener() {
+		@Override
+		public boolean onEditorAction(TextView v, int actionId,KeyEvent event) {
+			switch (actionId) {
+//				case EditorInfo.IME_ACTION_NEXT:
+				// fixing actionNext
+//					return false;
+				default:
+					return true;
+			}
+		}
+	};
+	private String mask;
 	private char charRepresentation;
 	private boolean keepHint;
 	private int[] rawToMask;
@@ -41,11 +53,11 @@ public class MaskedEditText extends AppCompatEditText implements TextWatcher {
 	private int lastValidMaskPosition;
 	private boolean selectionChanged;
 	private OnFocusChangeListener focusChangeListener;
-    private String allowedChars;
-    private String deniedChars;
-    private BehaviorProcessor<String> rawTextState = BehaviorProcessor.create();
+  private String allowedChars;
+  private String deniedChars;
+  private BehaviorProcessor<String> rawTextState = BehaviorProcessor.create();
 	private boolean blockFurtherSelectionChanges = false;
-
+  
     public MaskedEditText(Context context) {
 		super(context);
 		init();
@@ -60,6 +72,7 @@ public MaskedEditText(Context context, AttributeSet attrs) {
 
         allowedChars = attributes.getString(R.styleable.MaskedEditText_allowed_chars);
         deniedChars = attributes.getString(R.styleable.MaskedEditText_denied_chars);
+        boolean enableImeAction = attributes.getBoolean(R.styleable.MaskedEditText_enable_ime_action, false);
 
 		String representation = attributes.getString(R.styleable.MaskedEditText_char_representation);
 
@@ -73,19 +86,12 @@ public MaskedEditText(Context context, AttributeSet attrs) {
 
 		cleanUp();
 
-		// Ignoring enter key presses
-		setOnEditorActionListener(new OnEditorActionListener() {
-			@Override
-			public boolean onEditorAction(TextView v, int actionId,KeyEvent event) {
-				switch (actionId) {
-//				case EditorInfo.IME_ACTION_NEXT:
-					// fixing actionNext
-//					return false;
-				default:
-					return true;
-				}
-			}
-		});
+		// Ignoring enter key presses if needed
+		if (!enableImeAction) {
+			setOnEditorActionListener(onEditorActionListener);
+		} else {
+			setOnEditorActionListener(null);
+		}
 		attributes.recycle();
 	}
 
@@ -130,12 +136,14 @@ public void setOnFocusChangeListener(OnFocusChangeListener listener) {
 
 	private void cleanUp() {
 		initialized = false;
-
+		if(mask == null || mask.isEmpty()){
+                    return;
+                }
 		generatePositionArrays();
-
-		rawText = new RawText();
-		selection = rawToMask[0];
-
+                if (!shouldKeepText || rawText == null) {
+                    rawText = new RawText();
+                    selection = rawToMask[0];
+                }
 		editingBefore = true;
 		editingOnChanged = true;
 		editingAfter = true;
@@ -183,6 +191,14 @@ public MaskedEditText(Context context, AttributeSet attrs, int defStyle) {
 		init();
 	}
 
+        public void setShouldKeepText(boolean shouldKeepText) {
+            this.shouldKeepText = shouldKeepText;
+        }
+
+        public boolean isKeepingText() {
+            return shouldKeepText;
+        }
+
 	public void setMask(String mask) {
 		this.mask = mask;
 		cleanUp();
@@ -192,6 +208,13 @@ public String getMask() {
 		return this.mask;
 	}
 
+	public void setImeActionEnabled(boolean isEnabled) {
+		if (isEnabled)
+			setOnEditorActionListener(onEditorActionListener);
+		else
+			setOnEditorActionListener(null);
+	}
+
 	public String getRawText() {
 		return this.rawText.getText();
 	}
@@ -240,9 +263,7 @@ private void generatePositionArrays() {
 		char[] charsInMask = charsInMaskAux.toCharArray();
 
 		rawToMask = new int[charIndex];
-		for (int i = 0; i < charIndex; i++) {
-			rawToMask[i] = aux[i];
-		}
+		System.arraycopy(aux, 0, rawToMask, 0, charIndex);
 	}
 
 	private void init() {

MaskedEditText/src/main/res/values/attrs.xml

@@ -3,6 +3,7 @@
 	<declare-styleable name="MaskedEditText">
 		<attr name="mask" format="string" />
         <attr name="allowed_chars" format="string" />
+        <attr name="enable_ime_action" format="boolean" />
         <attr name="denied_chars" format="string" />
 		<attr name="char_representation" format="string" />
 		<attr name="keep_hint" format="boolean" />

README.md

@@ -66,7 +66,20 @@ You can also change the mask and the representation character programatically:
 	editText.setMask("##/##/####");
 	// Logging the mask
 	Log.i("Mask", editText.getMask());
+	
+To enable Enter softkey action (IME action):
 
+	<br.com.sapereaude.maskedEditText.MaskedEditText
+	    ...
+	    mask:enable_ime_action="true"
+	    ...
+	/>
+    
+Or programmatically:
+
+	MaskedEditText editText = (MaskedEditText) findViewById(R.id.my_edit_text)
+	editText.setImeActionEnabled(true);
+	
 *************************************************************************************************
 ## ru_RU
 
@@ -118,3 +131,16 @@ _mask_ задаёт требуемую маску, символ '#' задаёт
 	editText.setMask("##/##/####");
 	// Logging the mask
 	Log.i("Mask", editText.getMask());
+	
+Чтобы включить обработку нажатия Enter (IME action):
+
+	<br.com.sapereaude.maskedEditText.MaskedEditText
+	    ...
+	    mask:enable_ime_action="true"
+	    ...
+	/>
+    
+Или программно:
+
+	MaskedEditText editText = (MaskedEditText) findViewById(R.id.my_edit_text)
+	editText.setImeActionEnabled(true);