Skip to content

Commit

Permalink
Add support for cordova-android 7+
Browse files Browse the repository at this point in the history 
This also addresses the following error:
wymsee#262
  • Loading branch information
@davidofwatkins
davidofwatkins committed Apr 20, 2018
1 parent 20cb99d commit 8a93476
Show file tree
Hide file tree
Showing 2 changed files with 28 additions and 28 deletions.
54 changes: 27 additions & 27 deletions plugin.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@

<!-- android -->
<platform name="android">
<config-file target="res/xml/config.xml" parent="/*">
<config-file target="app/src/main/res/xml/config.xml" parent="/*">
<feature name="ImagePicker">
<param name="android-package" value="com.synconset.ImagePicker"/>
</feature>
Expand All @@ -90,32 +90,32 @@
<source-file src="src/android/Library/src/ImageFetcher.java" target-dir="src/com/synconset"/>
<source-file src="src/android/Library/src/MultiImageChooserActivity.java" target-dir="src/com/synconset"/>

<source-file src="src/android/Library/res/anim/image_pop_in.xml" target-dir="res/anim"/>
<source-file src="src/android/Library/res/drawable/grid_background.xml" target-dir="res/drawable"/>
<source-file src="src/android/Library/res/drawable-hdpi/image_bg.9.png" target-dir="res/drawable-hdpi"/>
<source-file src="src/android/Library/res/drawable-hdpi/loading_icon.png" target-dir="res/drawable-hdpi"/>
<source-file src="src/android/Library/res/drawable-mdpi/ic_action_discard_dark.png" target-dir="res/drawable-mdpi"/>
<source-file src="src/android/Library/res/drawable-mdpi/ic_action_discard_light.png" target-dir="res/drawable-mdpi"/>
<source-file src="src/android/Library/res/drawable-mdpi/ic_action_done_dark.png" target-dir="res/drawable-mdpi"/>
<source-file src="src/android/Library/res/drawable-mdpi/ic_action_done_light.png" target-dir="res/drawable-mdpi"/>
<source-file src="src/android/Library/res/drawable-mdpi/ic_launcher.png" target-dir="res/drawable-mdpi"/>
<source-file src="src/android/Library/res/drawable-xhdpi/ic_action_discard_dark.png" target-dir="res/drawable-xhdpi"/>
<source-file src="src/android/Library/res/drawable-xhdpi/ic_action_discard_light.png" target-dir="res/drawable-xhdpi"/>
<source-file src="src/android/Library/res/drawable-xhdpi/ic_action_done_dark.png" target-dir="res/drawable-xhdpi"/>
<source-file src="src/android/Library/res/drawable-xhdpi/ic_action_done_light.png" target-dir="res/drawable-xhdpi"/>
<source-file src="src/android/Library/res/drawable-xhdpi/ic_launcher.png" target-dir="res/drawable-xhdpi"/>
<source-file src="src/android/Library/res/layout/actionbar_custom_view_done_discard.xml" target-dir="res/layout"/>
<source-file src="src/android/Library/res/layout/actionbar_discard_button.xml" target-dir="res/layout"/>
<source-file src="src/android/Library/res/layout/actionbar_done_button.xml" target-dir="res/layout"/>
<source-file src="src/android/Library/res/layout/multiselectorgrid.xml" target-dir="res/layout"/>
<source-file src="src/android/Library/res/values/multiimagechooser_strings_en.xml" target-dir="res/values"/>
<source-file src="src/android/Library/res/values/themes.xml" target-dir="res/values"/>
<source-file src="src/android/Library/res/anim/image_pop_in.xml" target-dir="app/src/main/res/anim"/>
<source-file src="src/android/Library/res/drawable/grid_background.xml" target-dir="app/src/main/res/drawable"/>
<source-file src="src/android/Library/res/drawable-hdpi/image_bg.9.png" target-dir="app/src/main/res/drawable-hdpi"/>
<source-file src="src/android/Library/res/drawable-hdpi/loading_icon.png" target-dir="app/src/main/res/drawable-hdpi"/>
<source-file src="src/android/Library/res/drawable-mdpi/ic_action_discard_dark.png" target-dir="app/src/main/res/drawable-mdpi"/>
<source-file src="src/android/Library/res/drawable-mdpi/ic_action_discard_light.png" target-dir="app/src/main/res/drawable-mdpi"/>
<source-file src="src/android/Library/res/drawable-mdpi/ic_action_done_dark.png" target-dir="app/src/main/res/drawable-mdpi"/>
<source-file src="src/android/Library/res/drawable-mdpi/ic_action_done_light.png" target-dir="app/src/main/res/drawable-mdpi"/>
<source-file src="src/android/Library/res/drawable-mdpi/ic_launcher.png" target-dir="app/src/main/res/drawable-mdpi"/>
<source-file src="src/android/Library/res/drawable-xhdpi/ic_action_discard_dark.png" target-dir="app/src/main/res/drawable-xhdpi"/>
<source-file src="src/android/Library/res/drawable-xhdpi/ic_action_discard_light.png" target-dir="app/src/main/res/drawable-xhdpi"/>
<source-file src="src/android/Library/res/drawable-xhdpi/ic_action_done_dark.png" target-dir="app/src/main/res/drawable-xhdpi"/>
<source-file src="src/android/Library/res/drawable-xhdpi/ic_action_done_light.png" target-dir="app/src/main/res/drawable-xhdpi"/>
<source-file src="src/android/Library/res/drawable-xhdpi/ic_launcher.png" target-dir="app/src/main/res/drawable-xhdpi"/>
<source-file src="src/android/Library/res/layout/actionbar_custom_view_done_discard.xml" target-dir="app/src/main/res/layout"/>
<source-file src="src/android/Library/res/layout/actionbar_discard_button.xml" target-dir="app/src/main/res/layout"/>
<source-file src="src/android/Library/res/layout/actionbar_done_button.xml" target-dir="app/src/main/res/layout"/>
<source-file src="src/android/Library/res/layout/multiselectorgrid.xml" target-dir="app/src/main/res/layout"/>
<source-file src="src/android/Library/res/values/multiimagechooser_strings_en.xml" target-dir="app/src/main/res/values"/>
<source-file src="src/android/Library/res/values/themes.xml" target-dir="app/src/main/res/values"/>

<source-file src="src/android/Library/res/values-de/multiimagechooser_strings_de.xml" target-dir="res/values-de"/>
<source-file src="src/android/Library/res/values-es/multiimagechooser_strings_es.xml" target-dir="res/values-es"/>
<source-file src="src/android/Library/res/values-fr/multiimagechooser_strings_fr.xml" target-dir="res/values-fr"/>
<source-file src="src/android/Library/res/values-hu/multiimagechooser_strings_hu.xml" target-dir="res/values-hu"/>
<source-file src="src/android/Library/res/values-ja/multiimagechooser_strings_ja.xml" target-dir="res/values-ja"/>
<source-file src="src/android/Library/res/values-ko/multiimagechooser_strings_ko.xml" target-dir="res/values-ko"/>
<source-file src="src/android/Library/res/values-de/multiimagechooser_strings_de.xml" target-dir="app/src/main/res/values-de"/>
<source-file src="src/android/Library/res/values-es/multiimagechooser_strings_es.xml" target-dir="app/src/main/res/values-es"/>
<source-file src="src/android/Library/res/values-fr/multiimagechooser_strings_fr.xml" target-dir="app/src/main/res/values-fr"/>
<source-file src="src/android/Library/res/values-hu/multiimagechooser_strings_hu.xml" target-dir="app/src/main/res/values-hu"/>
<source-file src="src/android/Library/res/values-ja/multiimagechooser_strings_ja.xml" target-dir="app/src/main/res/values-ja"/>
<source-file src="src/android/Library/res/values-ko/multiimagechooser_strings_ko.xml" target-dir="app/src/main/res/values-ko"/>
</platform>
</plugin>
2 changes: 1 addition & 1 deletion src/android/Library/src/ImageFetcher.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -290,7 +290,7 @@ public BitmapFetcherTask getBitmapDownloaderTask() {
private final HashMap<Integer, Bitmap> sHardBitmapCache = new LinkedHashMap<Integer, Bitmap>(
HARD_CACHE_CAPACITY / 2, 0.75f, true) {
@Override
protected boolean removeEldestEntry(LinkedHashMap.Entry<Integer, Bitmap> eldest) {
protected boolean removeEldestEntry(HashMap.Entry<Integer, Bitmap> eldest) {
if (size() > HARD_CACHE_CAPACITY) {
// Entries push-out of hard reference cache are transferred to
// soft reference cache
Expand Down

0 comments on commit 8a93476

Please sign in to comment.