Skip to content

Commit

Permalink
Merge pull request #31 from shankari/master
Browse files Browse the repository at this point in the history
Change the class import script to work with the cordova 7+
  • Loading branch information
shankari authored Apr 6, 2020
2 parents 3602c22 + 69c097e commit b938289
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 3 deletions.
2 changes: 1 addition & 1 deletion hooks/android/addResourcesClassImport.js
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ module.exports = function (ctx) {
path = ctx.requireCordovaModule('path'),
Q = ctx.requireCordovaModule('q');

var platformSourcesRoot = path.join(ctx.opts.projectRoot, 'platforms/android/src');
var platformSourcesRoot = path.join(ctx.opts.projectRoot, 'platforms/android/app/src/main/java/');
var pluginSourcesRoot = path.join(ctx.opts.plugin.dir, 'src/android');

var androidPluginsData = JSON.parse(fs.readFileSync(path.join(ctx.opts.projectRoot, 'plugins', 'android.json'), 'utf8'));
Expand Down
3 changes: 2 additions & 1 deletion plugin.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<plugin xmlns="http://www.phonegap.com/ns/plugins/1.0"
id="edu.berkeley.eecs.emission.cordova.unifiedlogger"
version="1.3.1">
version="1.3.2">

<name>UnifiedLogger</name>
<description>Log messages from both native code and javacript. Since this is
Expand All @@ -12,6 +12,7 @@

<engines>
<engine name="cordova" version=">=3.6.0"/>
<engine name="cordova-android" version=">=7.0.0"/>
</engines>

<asset src="www/unifiedlogger.js" target="js/unifiedlogger.js"/>
Expand Down
2 changes: 1 addition & 1 deletion src/android/NotificationHelper.java
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ public static Notification.Builder getNotificationBuilderForApp(Context context,
} else {
builder = new Notification.Builder(context);
}
Bitmap appIcon = BitmapFactory.decodeResource(context.getResources(), R.mipmap.icon);
Bitmap appIcon = BitmapFactory.decodeResource(context.getResources(), R.mipmap.ic_launcher);
builder.setLargeIcon(appIcon);
builder.setSmallIcon(R.drawable.ic_visibility_black);
builder.setContentTitle(context.getString(R.string.app_name));
Expand Down

0 comments on commit b938289

Please sign in to comment.