Skip to content

Commit

Permalink
Release 8.3.35
Browse files Browse the repository at this point in the history
  • Loading branch information
pushwoosh authored and pushwoosh committed Dec 26, 2024
1 parent fcdc42d commit 4137be5
Show file tree
Hide file tree
Showing 10 changed files with 324 additions and 203 deletions.
1 change: 1 addition & 0 deletions .github/ISSUE_TEMPLATE/bug_report.yml
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,7 @@ body:
label: Your Pushwoosh Cordova plugin version
description: Your version of the Cordova plugin integrated into the application. You may find it on the [releases page](https://github.com/Pushwoosh/pushwoosh-phonegap-plugin/releases)
options:
- 8.3.35
- 8.3.34
- 8.3.33
- 8.3.28
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,13 @@ Cross-Platform push notifications by Pushwoosh for Cordova / PhoneGap
Using npm:

```
cordova plugin add pushwoosh-cordova-plugin@8.3.34
cordova plugin add pushwoosh-cordova-plugin@8.3.35
```

Using git:

```
cordova plugin add https://github.com/Pushwoosh/pushwoosh-phonegap-plugin.git#8.3.34
cordova plugin add https://github.com/Pushwoosh/pushwoosh-phonegap-plugin.git#8.3.35
```

### Guide
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "pushwoosh-cordova-plugin",
"version": "8.3.34",
"version": "8.3.35",
"description": "\n This plugin allows you to send and receive push notifications. Powered by Pushwoosh (www.pushwoosh.com).\n ",
"main":"www/PushNotification.js",
"typings":"types/index.d.ts",
Expand Down
18 changes: 9 additions & 9 deletions plugin.xml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<plugin xmlns="http://apache.org/cordova/ns/plugins/1.0" xmlns:android="http://schemas.android.com/apk/res/android" id="pushwoosh-cordova-plugin" version="8.3.34">
<plugin xmlns="http://apache.org/cordova/ns/plugins/1.0" xmlns:android="http://schemas.android.com/apk/res/android" id="pushwoosh-cordova-plugin" version="8.3.35">

<name>Pushwoosh</name>

Expand Down Expand Up @@ -77,13 +77,13 @@
<framework src="com.github.bumptech.glide:glide:4.10.0" />
<framework src="org.jetbrains.kotlin:kotlin-stdlib-jre7:1.1.60" />

<framework src="com.pushwoosh:pushwoosh:6.7.14"/>
<framework src="com.pushwoosh:pushwoosh-amazon:6.7.14"/>
<framework src="com.pushwoosh:pushwoosh-firebase:6.7.14"/>
<framework src="com.pushwoosh:pushwoosh-badge:6.7.14"/>
<framework src="com.pushwoosh:pushwoosh-inbox:6.7.14"/>
<framework src="com.pushwoosh:pushwoosh-inbox-ui:6.7.14"/>
<framework src="com.pushwoosh:pushwoosh-huawei:6.7.14"/>
<framework src="com.pushwoosh:pushwoosh:6.7.16"/>
<framework src="com.pushwoosh:pushwoosh-amazon:6.7.16"/>
<framework src="com.pushwoosh:pushwoosh-firebase:6.7.16"/>
<framework src="com.pushwoosh:pushwoosh-badge:6.7.16"/>
<framework src="com.pushwoosh:pushwoosh-inbox:6.7.16"/>
<framework src="com.pushwoosh:pushwoosh-inbox-ui:6.7.16"/>
<framework src="com.pushwoosh:pushwoosh-huawei:6.7.16"/>
</platform>

<!-- ios -->
Expand Down Expand Up @@ -125,7 +125,7 @@
<source url="https://github.com/CocoaPods/Specs.git"/>
</config>
<pods use-frameworks="true">
<pod name="PushwooshXCFramework" spec="6.7.9" />
<pod name="PushwooshXCFramework" spec="6.7.11" />
<pod name="PushwooshInboxUIXCFramework" spec="6.1.2" />
</pods>
</podspec>
Expand Down
11 changes: 11 additions & 0 deletions src/android/android.iml
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<module type="JAVA_MODULE" version="4">
<component name="NewModuleRootManager" inherit-compiler-output="true">
<exclude-output />
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
</component>
</module>
Original file line number Diff line number Diff line change
Expand Up @@ -50,8 +50,9 @@ private static Integer parseColor(String colorString) {

private Integer optColor(String key, Integer defaultValue) {
Integer color = parseColor(style.optString(key));
if (color == null)
if (color == null) {
return defaultValue;
}
return color;
}

Expand Down Expand Up @@ -84,8 +85,7 @@ private Drawable optImage(String key, Drawable defaultValue) {
if (imagePath != null && imagePath.length() != 0) {
try {
return getDrawable(imagePath);
}
catch (IOException e) {
} catch (IOException e) {
e.printStackTrace();
}

Expand Down Expand Up @@ -129,8 +129,9 @@ public void parse() {
}

public static void setStyle(Context context, JSONObject styleObject) {
if (styleObject != null)
if (styleObject != null) {
new StyleParser(context, styleObject).parse();
}
}

}
Loading

0 comments on commit 4137be5

Please sign in to comment.