cordova-plugin-cronapp-decimal-keyboard 1.0.1 → 2.9.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cordova-plugin-cronapp-decimal-keyboard",
-  "version": "1.0.1",
+  "version": "2.9.1",
   "description": "Plugin to display decimal keyboard on Cordova and Phonegap applications",
   "main": "index.js",
   "scripts": {
@@ -12,7 +12,7 @@
   },
   "keywords": [
     "cordova",
-    "decimal", 
+    "decimal",
     "cronapp",
     "keypad"
   ],

package/plugin.xml

@@ -1,28 +1,27 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-<plugin xmlns="http://apache.org/cordova/ns/plugins/1.0" id="cordova-plugin-cronapp-decimal-keyboard" version="1.0.1">
+<plugin xmlns="http://apache.org/cordova/ns/plugins/1.0" id="cordova-plugin-cronapp-decimal-keyboard" version="2.9.1">
     <name>Decimal Keyboard</name>
     <description>Cordova Decimal Keyboard Plugin</description>
     <license>Apache 2.0</license>
     <keywords>cordova,keyboard, decimal keyboard</keywords>
 
     <engines>
-	<engine name="cordova" version=">=3.2.0" />
+	<engine name="cordova" version="&gt;=3.2.0"/>
     </engines>
 
     <js-module src="www/decimal-keyboard.js" name="decimalKeyboard">
-    	<clobbers target="window.DecimalKeyboard" />
+    	<clobbers target="window.DecimalKeyboard"/>
     </js-module>
 
     <!-- ios -->
     <platform name="ios">
         <config-file target="config.xml" parent="/*">
             <feature name="DecimalKeyboard">
-                <param name="ios-package" value="CDVDecimalKeyboard" onload="true" />
+                <param name="ios-package" value="CDVDecimalKeyboard" onload="true"/>
             </feature>
         </config-file>
 
-        <header-file src="src/ios/CDVDecimalKeyboard.h" />
-        <source-file src="src/ios/CDVDecimalKeyboard.m" />
+        <header-file src="src/ios/CDVDecimalKeyboard.h"/>
+        <source-file src="src/ios/CDVDecimalKeyboard.m"/>
     </platform>
-</plugin>
+</plugin>

package/src/ios/CDVDecimalKeyboard.m

@@ -63,7 +63,17 @@ BOOL isAppInBackground=NO;
     }
     decimalButton = [UIButton buttonWithType:UIButtonTypeCustom];
     [self setDecimalChar];
-    [decimalButton setTitleColor:[UIColor colorWithRed:0/255.0 green:0/255.0 blue:0/255.0 alpha:1.0] forState:UIControlStateNormal];
+    
+    if (@available(iOS 13.0, *)) {
+        if (UITraitCollection.currentTraitCollection.userInterfaceStyle == UIUserInterfaceStyleDark) {
+            [decimalButton setTitleColor:[UIColor colorWithRed:255/255.0 green:255/255.0 blue:255/255.0 alpha:1.0] forState:UIControlStateNormal];
+        } else {
+            [decimalButton setTitleColor:[UIColor colorWithRed:0/255.0 green:0/255.0 blue:0/255.0 alpha:1.0] forState:UIControlStateNormal];
+        }
+    } else {
+        [decimalButton setTitleColor:[UIColor colorWithRed:0/255.0 green:0/255.0 blue:0/255.0 alpha:1.0] forState:UIControlStateNormal];
+    }
+    
     decimalButton.titleLabel.font = [UIFont systemFontOfSize:40.0];
     [decimalButton addTarget:self action:@selector(buttonPressed:)
             forControlEvents:UIControlEventTouchUpInside];
@@ -74,8 +84,7 @@ BOOL isAppInBackground=NO;
     
     
     decimalButton.contentVerticalAlignment = UIControlContentVerticalAlignmentCenter;
-    [decimalButton setTitleEdgeInsets:UIEdgeInsetsMake(-20.0f, 0.0f, 0.0f, 0.0f)];
-    [decimalButton setBackgroundColor: [UIColor colorWithRed:210/255.0 green:213/255.0 blue:218/255.0 alpha:1.0]];
+    [decimalButton setTitleEdgeInsets:UIEdgeInsetsMake(-30.0f, 0.0f, 0.0f, 0.0f)];
     
     // locate keyboard view
     UIWindow* tempWindow = nil;
@@ -154,12 +163,10 @@ BOOL isDifferentKeyboardShown=NO;
 }
 
 - (void)buttonPressed:(UIButton *)button {
-    [decimalButton setBackgroundColor: [UIColor colorWithRed:210/255.0 green:213/255.0 blue:218/255.0 alpha:1.0]];
     [self evaluateJavaScript:@"DecimalKeyboard.addDecimal();" completionHandler:nil];
 }
 
 - (void)buttonTapped:(UIButton *)button {
-    [decimalButton setBackgroundColor: [UIColor colorWithRed:255/255.0 green:255/255.0 blue:255/255.0 alpha:1.0]];
 }
 - (void)buttonPressCancel:(UIButton *)button{
     [decimalButton setBackgroundColor: [UIColor colorWithRed:210/255.0 green:213/255.0 blue:218/255.0 alpha:1.0]];
@@ -224,14 +231,7 @@ BOOL stopSearching=NO;
 
 - (void) evaluateJavaScript:(NSString *)script
           completionHandler:(void (^ _Nullable)(NSString * _Nullable response, NSError * _Nullable error))completionHandler {
-
-    if ([self.webView isKindOfClass:UIWebView.class]) {
-        UIWebView *webview = (UIWebView*)self.webView;
-        NSString *response = [webview stringByEvaluatingJavaScriptFromString:script];
-        if (completionHandler) completionHandler(response, nil);
-    }
-    
-    else if ([self.webView isKindOfClass:WKWebView.class]) {
+    if ([self.webView isKindOfClass:WKWebView.class]) {
         WKWebView *webview = (WKWebView*)self.webView;
         [webview evaluateJavaScript:script completionHandler:^(id result, NSError *error) {
             if (completionHandler) {