fix(android): Avoid conflicts when ionic-plugin-keyboard is installed (…

…#104)
ionic-team · Aug 21, 2019 · 893dc8e · 893dc8e
1 parent 659d402
commit 893dc8e
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 14 deletions.
diff --git a/plugin.xml b/plugin.xml
@@ -21,7 +21,7 @@
         </js-module>
 
         <config-file target="config.xml" parent="/*">
-            <feature name="Keyboard">
+            <feature name="CDVIonicKeyboard">
                 <param name="ios-package" value="CDVIonicKeyboard" onload="true"/>
             </feature>
         </config-file>
@@ -36,12 +36,12 @@
             <clobbers target="window.Keyboard"/>
         </js-module>
         <config-file target="config.xml" parent="/*">
-            <feature name="Keyboard">
-                <param name="android-package" value="io.ionic.keyboard.IonicKeyboard" onload="true"/>
+            <feature name="CDVIonicKeyboard">
+                <param name="android-package" value="io.ionic.keyboard.CDVIonicKeyboard" onload="true"/>
             </feature>
         </config-file>
 
-        <source-file src="src/android/IonicKeyboard.java" target-dir="src/io/ionic/keyboard"/>
+        <source-file src="src/android/CDVIonicKeyboard.java" target-dir="src/io/ionic/keyboard"/>
     </platform>
 
 </plugin>
diff --git a/src/android/IonicKeyboard.java → src/android/CDVIonicKeyboard.java b/src/android/IonicKeyboard.java → src/android/CDVIonicKeyboard.java
@@ -21,7 +21,7 @@
 import android.graphics.Point;
 import android.os.Build;
 
-public class IonicKeyboard extends CordovaPlugin {
+public class CDVIonicKeyboard extends CordovaPlugin {
     private OnGlobalLayoutListener list;
     private View rootView;
 

diff --git a/www/android/keyboard.js b/www/android/keyboard.js
@@ -42,11 +42,11 @@ Keyboard.hideFormAccessoryBar = Keyboard.hideKeyboardAccessoryBar = function (hi
 };
 
 Keyboard.hide = function () {
-    exec(null, null, "Keyboard", "hide", []);
+    exec(null, null, "CDVIonicKeyboard", "hide", []);
 };
 
 Keyboard.show = function () {
-    exec(null, null, "Keyboard", "show", []);
+    exec(null, null, "CDVIonicKeyboard", "show", []);
 };
 
 Keyboard.disableScroll = function (disable) {
@@ -62,7 +62,7 @@ Keyboard.setKeyboardStyle = function(style) {
 };
 
 channel.onCordovaReady.subscribe(function () {
-    exec(success, null, 'Keyboard', 'init', []);
+    exec(success, null, 'CDVIonicKeyboard', 'init', []);
 
     function success(msg) {
         var action = msg.charAt(0);

diff --git a/www/ios/keyboard.js b/www/ios/keyboard.js
@@ -70,14 +70,14 @@ Keyboard.fireOnResize = function (height, screenHeight, ele) {
 
 Keyboard.hideFormAccessoryBar = function (hide, success) {
     if (hide !== null && hide !== undefined) {
-        exec(success, null, "Keyboard", "hideFormAccessoryBar", [hide]);
+        exec(success, null, "CDVIonicKeyboard", "hideFormAccessoryBar", [hide]);
     } else {
-        exec(success, null, "Keyboard", "hideFormAccessoryBar", []);
+        exec(success, null, "CDVIonicKeyboard", "hideFormAccessoryBar", []);
     }
 };
 
 Keyboard.hide = function () {
-    exec(null, null, "Keyboard", "hide", []);
+    exec(null, null, "CDVIonicKeyboard", "hide", []);
 };
 
 Keyboard.show = function () {
@@ -87,15 +87,15 @@ Keyboard.show = function () {
 };
 
 Keyboard.disableScroll = function (disable) {
-    exec(null, null, "Keyboard", "disableScroll", [disable]);
+    exec(null, null, "CDVIonicKeyboard", "disableScroll", [disable]);
 };
 
 Keyboard.setResizeMode = function (mode) {
-    exec(null, null, "Keyboard", "setResizeMode", [mode]);
+    exec(null, null, "CDVIonicKeyboard", "setResizeMode", [mode]);
 }
 
 Keyboard.setKeyboardStyle = function(style) {
-    exec(null, null, "Keyboard", "keyboardStyle", [style]);
+    exec(null, null, "CDVIonicKeyboard", "keyboardStyle", [style]);
 };
 
 Keyboard.isVisible = false;