Merge pull request #13636 from zilongshanren/refactorEditBox

refactor EditBox iOS&Android implementation

Author: zilongshanren

build/cocos2d_libs.xcodeproj/project.pbxproj

@@ -1224,6 +1224,8 @@
 299754F5193EC95400A54AC3 /* ObjectFactory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 299754F2193EC95400A54AC3 /* ObjectFactory.cpp */; };
 299754F6193EC95400A54AC3 /* ObjectFactory.h in Headers */ = {isa = PBXBuildFile; fileRef = 299754F3193EC95400A54AC3 /* ObjectFactory.h */; };
 299754F7193EC95400A54AC3 /* ObjectFactory.h in Headers */ = {isa = PBXBuildFile; fileRef = 299754F3193EC95400A54AC3 /* ObjectFactory.h */; };
+299B15AC1B93FC530008E196 /* UIEditBoxImpl-common.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 299B15AA1B93FC530008E196 /* UIEditBoxImpl-common.cpp */; };
+299B15AD1B93FC530008E196 /* UIEditBoxImpl-common.h in Headers */ = {isa = PBXBuildFile; fileRef = 299B15AB1B93FC530008E196 /* UIEditBoxImpl-common.h */; };
 299CF1FB19A434BC00C378C1 /* ccRandom.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 299CF1F919A434BC00C378C1 /* ccRandom.cpp */; };
 299CF1FC19A434BC00C378C1 /* ccRandom.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 299CF1F919A434BC00C378C1 /* ccRandom.cpp */; };
 299CF1FD19A434BC00C378C1 /* ccRandom.h in Headers */ = {isa = PBXBuildFile; fileRef = 299CF1FA19A434BC00C378C1 /* ccRandom.h */; };
@@ -4108,6 +4110,8 @@
 2986667918B1B079000E39CA /* CCTweenFunction.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCTweenFunction.h; sourceTree = "<group>"; };
 299754F2193EC95400A54AC3 /* ObjectFactory.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = ObjectFactory.cpp; path = ../base/ObjectFactory.cpp; sourceTree = "<group>"; };
 299754F3193EC95400A54AC3 /* ObjectFactory.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ObjectFactory.h; path = ../base/ObjectFactory.h; sourceTree = "<group>"; };
+299B15AA1B93FC530008E196 /* UIEditBoxImpl-common.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = "UIEditBoxImpl-common.cpp"; sourceTree = "<group>"; };
+299B15AB1B93FC530008E196 /* UIEditBoxImpl-common.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "UIEditBoxImpl-common.h"; sourceTree = "<group>"; };
 299CF1F919A434BC00C378C1 /* ccRandom.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = ccRandom.cpp; path = ../base/ccRandom.cpp; sourceTree = "<group>"; };
 299CF1FA19A434BC00C378C1 /* ccRandom.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ccRandom.h; path = ../base/ccRandom.h; sourceTree = "<group>"; };
 29BDBA52195D597A003225C9 /* UIDeprecated.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = UIDeprecated.cpp; sourceTree = "<group>"; };
@@ -6816,6 +6820,8 @@
 292DB12E19B4574100A80320 /* UIEditBox */ = {
 isa = PBXGroup;
 children = (
+299B15AA1B93FC530008E196 /* UIEditBoxImpl-common.cpp */,
+299B15AB1B93FC530008E196 /* UIEditBoxImpl-common.h */,
 50ED2BDC19BEAF7900A0AB90 /* UIEditBoxImpl-win32.h */,
 50ED2BDE19BEAF7900A0AB90 /* UIEditBoxImpl-win32.cpp */,
 292DB12F19B4574100A80320 /* UIEditBox.cpp */,
@@ -10540,6 +10546,7 @@
 15AE1BEB19AAE01E00C27E9E /* CCControlButton.h in Headers */,
 B6CAB1F81AF9AA1A00B9B856 /* btDbvt.h in Headers */,
 B665E35D1AA80A6500DDB1C5 /* CCPUOnRandomObserver.h in Headers */,
+299B15AD1B93FC530008E196 /* UIEditBoxImpl-common.h in Headers */,
 1A570281180BCC900088DEC7 /* CCSprite.h in Headers */,
 B6DD2FD21B04825B00E47F5F /* DetourNode.h in Headers */,
 1A570285180BCC900088DEC7 /* CCSpriteBatchNode.h in Headers */,
@@ -12226,6 +12233,7 @@
 B6DD2FC41B04825B00E47F5F /* DetourNavMesh.cpp in Sources */,
 B6CAAFFB1AF9A9E100B9B856 /* CCPhysics3DWorld.cpp in Sources */,
 B665E3471AA80A6500DDB1C5 /* CCPUOnExpireObserverTranslator.cpp in Sources */,
+299B15AC1B93FC530008E196 /* UIEditBoxImpl-common.cpp in Sources */,
 B6CAB2A41AF9AA1A00B9B856 /* btConvexHullShape.cpp in Sources */,
 15AE1AA519AAD40300C27E9E /* b2Fixture.cpp in Sources */,
 B29A7DE219EE1B7700872B35 /* MeshAttachment.c in Sources */,

cocos/platform/android/java/src/org/cocos2dx/lib/Cocos2dxEditBox.java

@@ -26,8 +26,11 @@ of this software and associated documentation files (the "Software"), to deal
 
 import android.content.Context;
 import android.graphics.Color;
+import android.graphics.Typeface;
 import android.text.InputFilter;
 import android.text.InputType;
+import android.text.method.PasswordTransformationMethod;
+import android.util.Log;
 import android.view.Gravity;
 import android.view.KeyEvent;
 import android.view.View;
@@ -106,6 +109,12 @@ public class Cocos2dxEditBox extends EditText {
  private int mInputModeContraints;
  private int mMaxLength;
 
+ //OpenGL view scaleX
+ private float mScaleX;
+
+
+
+
  public Cocos2dxEditBox(Context context){
  super(context);
  }
@@ -121,6 +130,15 @@ public void setEditBoxViewRect(int left, int top, int maxWidth, int maxHeight) {
  this.setLayoutParams(layoutParams);
  }
 
+ public float getOpenGLViewScaleX() {
+ return mScaleX;
+ }
+
+ public void setOpenGLViewScaleX(float mScaleX) {
+ this.mScaleX = mScaleX;
+ }
+
+
  public void setMaxLength(int maxLength){
  this.mMaxLength = maxLength;
 
@@ -210,6 +228,8 @@ public void setInputFlag(int inputFlag) {
  switch (inputFlag) {
  case kEditBoxInputFlagPassword:
  this.mInputFlagConstraints = InputType.TYPE_CLASS_TEXT | InputType.TYPE_TEXT_VARIATION_PASSWORD;
+ this.setTypeface(Typeface.DEFAULT);
+ this.setTransformationMethod(new PasswordTransformationMethod());
  break;
  case kEditBoxInputFlagSensitive:
  this.mInputFlagConstraints = InputType.TYPE_TEXT_FLAG_NO_SUGGESTIONS;

cocos/platform/android/java/src/org/cocos2dx/lib/Cocos2dxEditBoxHelper.java

@@ -75,8 +75,17 @@ public Cocos2dxEditBoxHelper(ResizeLayout layout) {
  Cocos2dxEditBoxHelper.mEditBoxArray = new SparseArray<Cocos2dxEditBox>();
  }
 
+ public static int convertToSP(float point){
+ Resources r = mCocos2dxActivity.getResources();
 
- public static int createEditBox(final int left, final int top, final int width, final int height) {
+ int convertedValue = (int)TypedValue.applyDimension(
+ TypedValue.COMPLEX_UNIT_SP, point, r.getDisplayMetrics());
+
+ return convertedValue;
+
+ }
+
+ public static int createEditBox(final int left, final int top, final int width, final int height, final float scaleX) {
  final int index = mViewTag;
  mCocos2dxActivity.runOnUiThread(new Runnable() {
  @Override
@@ -92,6 +101,17 @@ public void run() {
  editBox.setBackgroundColor(Color.TRANSPARENT);
  editBox.setTextColor(Color.WHITE);
  editBox.setSingleLine();
+ editBox.setOpenGLViewScaleX(scaleX);
+ Resources r = mCocos2dxActivity.getResources();
+ float density = r.getDisplayMetrics().density;
+ int paddingBottom = (int)(height * 0.33f / density);
+ paddingBottom = convertToSP(paddingBottom - 5 * scaleX / density);
+ paddingBottom = paddingBottom / 2;
+ int paddingTop = paddingBottom;
+ int paddingLeft = (int)(5 * scaleX / density);
+ paddingLeft = convertToSP(paddingLeft);
+
+ editBox.setPadding(paddingLeft,paddingTop, 0, paddingBottom);
 
 
  FrameLayout.LayoutParams lParams = new FrameLayout.LayoutParams(
@@ -101,7 +121,7 @@ public void run() {
  lParams.leftMargin = left;
  lParams.topMargin = top;
  lParams.width = width;
- lParams.height = height+20;
+ lParams.height = height;
  lParams.gravity = Gravity.TOP | Gravity.LEFT;
 
  mFrameLayout.addView(editBox, lParams);
@@ -222,7 +242,10 @@ public void run() {
  }
  //TODO: The font size is not the same across all the anroid devices...
  if (fontSize >= 0){
- editBox.setTextSize(TypedValue.COMPLEX_UNIT_SP, fontSize);
+ float density = mCocos2dxActivity.getResources().getDisplayMetrics().density;
+// Log.e("XXX", "density is " + density);
+ editBox.setTextSize(TypedValue.COMPLEX_UNIT_SP,
+ fontSize / density );
  }
  editBox.setTypeface(tf);
  }

cocos/platform/android/jni/Java_org_cocos2dx_lib_Cocos2dxHelper.cpp

@@ -390,12 +390,12 @@ void deleteValueForKeyJNI(const char* key)
  }
 }
 
-int addEditBoxJNI(int left, int top, int width, int height){
+int addEditBoxJNI(int left, int top, int width, int height, float scaleX){
  JniMethodInfo t;
 
  int ret = -1;
- if (JniHelper::getStaticMethodInfo(t, EDITBOX_CLASS_NAME, "createEditBox", "(IIII)I")) {
- ret = t.env->CallStaticIntMethod(t.classID, t.methodID, left, top, width, height);
+ if (JniHelper::getStaticMethodInfo(t, EDITBOX_CLASS_NAME, "createEditBox", "(IIIIF)I")) {
+ ret = t.env->CallStaticIntMethod(t.classID, t.methodID, left, top, width, height, scaleX);
  t.env->DeleteLocalRef(t.classID);
  }
  return ret;

cocos/platform/android/jni/Java_org_cocos2dx_lib_Cocos2dxHelper.h

@@ -55,7 +55,7 @@ extern void setStringForKeyJNI(const char* key, const char* value);
 extern void deleteValueForKeyJNI(const char* key);
 extern void conversionEncodingJNI(const char* src, int byteSize, const char* fromCharset, char* dst, const char* newCharset);
 //Added for new Android EditBox
-extern int addEditBoxJNI(int left, int top, int width, int height);
+extern int addEditBoxJNI(int left, int top, int width, int height, float scaleX);
 extern void removeEditBoxJNI(int index);
 extern void setEditBoxViewRectJNI(int index, int left, int top, int width, int height);
 extern void setMaxLengthJNI(int index, int maxLength);

cocos/ui/Android.mk

@@ -42,6 +42,7 @@ UIWebView.cpp \
 UIWebViewImpl-android.cpp \
 UIEditBox/UIEditBox.cpp \
 UIEditBox/UIEditBoxImpl-android.cpp \
+UIEditBox/UIEditBoxImpl-common.cpp \
 UILayoutComponent.cpp \
 
 LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/../editor-support