Skip to content

Commit

Permalink
updated target dir for fonts under cordova android 7.0.0 new scaffold…
Browse files Browse the repository at this point in the history
…ing #71
  • Loading branch information
EddyVerbruggen committed Mar 30, 2018
1 parent 7ab53b9 commit 8f02442
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 5 deletions.
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "cordova-plugin-native-keyboard",
"version": "1.5.0",
"version": "1.5.1",
"description": "This plugin aims to solve common keyboard problems encountered with Cordova / PhoneGap apps. The messenger component (see screenshots) is ready for production, but this plugin will have more tricks up its sleeve. I'll document those once they're ready for primetime as well.",
"cordova": {
"id": "cordova-plugin-native-keyboard",
Expand Down Expand Up @@ -34,4 +34,4 @@
"url": "https://github.com/EddyVerbruggen/cordova-plugin-native-keyboard/issues"
},
"homepage": "https://github.com/EddyVerbruggen/cordova-plugin-native-keyboard#readme"
}
}
11 changes: 8 additions & 3 deletions plugin.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<plugin xmlns="http://apache.org/cordova/ns/plugins/1.0"
xmlns:android="http://schemas.android.com/apk/res/android"
id="cordova-plugin-native-keyboard"
version="1.5.0">
version="1.5.1">

<name>Native Keyboard</name>

Expand Down Expand Up @@ -48,6 +48,11 @@
<source-file src="src/android/res/values/font_awesome.xml" target-dir="res/values" />
<source-file src="src/android/res/drawable/cursor.xml" target-dir="res/drawable" />

<!-- cordova-android < 7 -->
<source-file src="src/android/assets/fonts/fontawesome-webfont.ttf" target-dir="assets/fonts" />
<source-file src="src/android/assets/fonts/ionicons.ttf" target-dir="assets/fonts" />

<!-- cordova-android >= 7 -->
<source-file src="src/android/assets/fonts/fontawesome-webfont.ttf" target-dir="app/src/main/assets/fonts" />
<source-file src="src/android/assets/fonts/ionicons.ttf" target-dir="app/src/main/assets/fonts" />

Expand Down Expand Up @@ -81,10 +86,10 @@
<string>FontAwesome.ttf</string>
</array>
</config-file>

<config-file target="*-Info.plist" parent="NativeKeyboardPluginLicense">
<string>$LICENSE</string>
</config-file>
</platform>

</plugin>
</plugin>

0 comments on commit 8f02442

Please sign in to comment.