diff --git a/package-lock.json b/package-lock.json index b2dc7126..684f4547 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "@zenput/cordova-plugin-image-picker", - "version": "22.10.20-H17M24S13", + "version": "23.8.30-H10M56S57", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "@zenput/cordova-plugin-image-picker", - "version": "22.10.20-H17M24S13", + "version": "23.8.30-H10M56S57", "license": "MIT", "devDependencies": { "eslint": "5.12.0", diff --git a/package.json b/package.json index 3c07bf23..b63bba87 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@zenput/cordova-plugin-image-picker", - "version": "22.10.20-H17M24S13", + "version": "23.8.30-H10M56S57", "description": "Allows selection of multiple images from the camera roll/gallery in a Cordova app", "author": "Zenput", "cordova": { diff --git a/plugin.xml b/plugin.xml index 54d50a0f..35d78047 100644 --- a/plugin.xml +++ b/plugin.xml @@ -1,5 +1,5 @@ - + @zenput/cordova-plugin-image-picker diff --git a/src/android/Library/src/MultiImageChooserActivity.java b/src/android/Library/src/MultiImageChooserActivity.java index d717f75b..1d084aec 100644 --- a/src/android/Library/src/MultiImageChooserActivity.java +++ b/src/android/Library/src/MultiImageChooserActivity.java @@ -42,8 +42,6 @@ import java.util.Map.Entry; import java.util.Set; -import com.zenput.mobile.R; - import android.app.Activity; import android.app.ActionBar; import android.app.AlertDialog; @@ -413,7 +411,7 @@ protected void onDraw(Canvas canvas) { iconPaint.setTextSize(size); if (this.checked) { - int imagePickerBlue = getResources().getColor(R.color.imagePickerBlue); + int imagePickerBlue = getResources().getColor(fakeR.getId("color", "imagePickerBlue")); iconPaint.setColor(imagePickerBlue); iconPaint.setAlpha(255); Paint circlePaint = new Paint(); @@ -421,13 +419,15 @@ protected void onDraw(Canvas canvas) { circlePaint.setColor(Color.WHITE); circlePaint.setTextSize(size); - - canvas.drawText(getString(R.string.icon_zp_v2_circle), padding, padding + size, circlePaint); - canvas.drawText(getString(R.string.icon_zp_v2_gallery_image_selected), padding, padding+size, iconPaint); + canvas.drawText(getString(fakeR.getId("string", "icon_zp_v2_circle")), padding, padding + size, + circlePaint); + canvas.drawText(getString(fakeR.getId("string", "icon_zp_v2_gallery_image_selected")), padding, + padding + size, iconPaint); } else { iconPaint.setColor(Color.WHITE); iconPaint.setAlpha(255); - canvas.drawText(getString(R.string.icon_zp_v2_gallery_image_unselected), padding, padding+size, iconPaint); + canvas.drawText(getString(fakeR.getId("string", "icon_zp_v2_gallery_image_unselected")), padding, + padding + size, iconPaint); } } }