Removed base character limit.

Ali Abdul-Karim · Ali Abdul-Karim · commit eef29428c797 · 2017-02-21T11:58:05.000+02:00
Using get int instead of get float on iOS.
diff --git a/release/NativeEditPlugin/Plugins/Android/nativeeditplugin.jar b/release/NativeEditPlugin/Plugins/Android/nativeeditplugin.jar
diff --git a/release/NativeEditPlugin/Plugins/iOS/EditBox_iOS.m b/release/NativeEditPlugin/Plugins/iOS/EditBox_iOS.m
@@ -188,7 +188,7 @@ -(void) create:(JsonObject*)json
     float y = [json getFloat:@"y"] * viewController.view.bounds.size.height;
     float width = [json getFloat:@"width"] * viewController.view.bounds.size.width;
     float height = [json getFloat:@"height"] * viewController.view.bounds.size.height;
-    characterLimit =[json getFloat:@"characterLimit"];
+    characterLimit = [json getInt:@"characterLimit"];
     
     float textColor_r = [json getFloat:@"textColor_r"];
     float textColor_g = [json getFloat:@"textColor_g"];
@@ -522,7 +522,10 @@ - (BOOL)textField:(UITextField *)textField shouldChangeCharactersInRange:(NSRang
     }
     
     NSUInteger newLength = [textField.text length] + [string length] - range.length;
-    return newLength <= characterLimit;
+    if(characterLimit > 0)
+        return newLength <= characterLimit;
+    else
+        return newLength;
 }
 
 -(void) textFieldDidChange :(UITextField *)theTextField{
diff --git a/release/NativeEditPlugin/scripts/NativeEditBox.cs b/release/NativeEditPlugin/scripts/NativeEditBox.cs
@@ -80,8 +80,6 @@ public enum ReturnKeyType { Default, Next, Done };
 	private const string MSG_RETURN_PRESSED = "ReturnPressed";
 	private const string MSG_GET_TEXT = "GetText";
 
-	private const int characterLimitDefault = 40;
-
 	public InputField InputField { get { return objUnityInput; } }
 	public string text
 	{
@@ -208,11 +206,7 @@ private void PrepareNativeEdit()
 		
 		mConfig.placeHolder = placeHolder.text;
 		mConfig.placeHolderColor = placeHolder.color;
-
-		if (objUnityInput.characterLimit > 1)
-			mConfig.characterLimit = objUnityInput.characterLimit;
-		else
-			mConfig.characterLimit = characterLimitDefault;
+		mConfig.characterLimit = objUnityInput.characterLimit;
 
 		if (useInputFieldFont)
 			mConfig.font = objUnityText.font.fontNames.Length > 0 ? objUnityText.font.fontNames[0] : "Arial";
diff --git a/src/androidProj/nativeeditplugin/src/main/java/com/bkmin/android/EditBox.java b/src/androidProj/nativeeditplugin/src/main/java/com/bkmin/android/EditBox.java
@@ -308,13 +308,15 @@ public void onFocusChange(View v, boolean hasFocus) {
                 public void afterTextChanged(Editable s)
                 {
                     JSONObject jsonToUnity = new JSONObject();
-                    if(s.length() >= characterLimit+1)
+
+                    if(s.length() >= characterLimit+1 && characterLimit > 0)
                     {
                         s.delete(s.length() - 1,
                                 s.length());
                         edit.setText(s);
                         edit.setSelection(s.length());
                     }
+
                     try
                     {
                         jsonToUnity.put("msg", MSG_TEXT_CHANGE);

Original file line number	Diff line number	Diff line change
`@@ -308,13 +308,15 @@ public void onFocusChange(View v, boolean hasFocus) {`
`308`	`308`	`public void afterTextChanged(Editable s)`
`309`	`309`	`{`
`310`	`310`	`JSONObject jsonToUnity = new JSONObject();`
`311`		`- if(s.length() >= characterLimit+1)`
	`311`	`+`
	`312`	`+ if(s.length() >= characterLimit+1 && characterLimit > 0)`
`312`	`313`	`{`
`313`	`314`	`s.delete(s.length() - 1,`
`314`	`315`	`s.length());`
`315`	`316`	`edit.setText(s);`
`316`	`317`	`edit.setSelection(s.length());`
`317`	`318`	`}`
	`319`	`+`
`318`	`320`	`try`
`319`	`321`	`{`
`320`	`322`	`jsonToUnity.put("msg", MSG_TEXT_CHANGE);`