Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[ZP-12866] Use FakeR instead of R.java #11

Merged
merged 4 commits into from
Aug 30, 2023
Merged

[ZP-12866] Use FakeR instead of R.java #11

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
77c5450
Use FakeR
zenput-paul Aug 29, 2023
1bd92fc
23.8.30-H08M18S42
zenput-paul Aug 30, 2023
a4b2648
23.8.30-H08M20S22
zenput-paul Aug 30, 2023
e4f9951
23.8.30-H10M56S57
zenput-paul Aug 30, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions package-lock.json
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
View file
Original file line number Diff line number Diff line change
@@ -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": {
2 changes: 1 addition & 1 deletion plugin.xml
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<plugin xmlns="http://www.phonegap.com/ns/plugins/1.0" xmlns:android="http://schemas.android.com/apk/res/android" id="@zenput/cordova-plugin-image-picker" version="22.10.20-H17M24S13">
<plugin xmlns="http://www.phonegap.com/ns/plugins/1.0" xmlns:android="http://schemas.android.com/apk/res/android" id="@zenput/cordova-plugin-image-picker" version="23.8.30-H10M56S57">
<dependency id="@zenput/cordova-plugin-donkeyfont" version="22.3.7-H11M08S09"/>
<name>@zenput/cordova-plugin-image-picker</name>
<description>
14 changes: 7 additions & 7 deletions src/android/Library/src/MultiImageChooserActivity.java
View file
Original file line number Diff line number Diff line change
@@ -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,21 +411,23 @@ 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();
circlePaint.setTypeface(mDonkeyFont);
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);
}
}
}