Skip to content

Add new Play Store icons support #31

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

Open
lucienbl wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Add new Play Store icons support #31

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
25 changes: 24 additions & 1 deletion app/js/IconBase.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@

const
SHAPE_CIRCLE = 0,
SHAPE_SQUARE = 1;
SHAPE_SQUARE = 1,
SHAPE_SQUARE_NO_RADIUS = 2;

class IconBase {

Expand Down Expand Up @@ -37,31 +38,52 @@ class IconBase {
});
this.squareBasePath.remove();

this.squareNoRadiusBasePath = new paper.Path.Rectangle({
point: new paper.Point(center.x - radius, center.y - radius),
size: new paper.Size(radius * 2, radius * 2),
radius: 0,
shadowColor: 0,
shadowBlur: 0,
shadowOffset: 0,
name: IconBase.ID()
});
this.squareNoRadiusBasePath.remove();
}

setSquareShape() {
this.squareNoRadiusBasePath.replaceWith(this.squareBasePath);
this.circleBasePath.replaceWith(this.squareBasePath);
this.shape = SHAPE_SQUARE;
}

setCircularShape() {
this.squareNoRadiusBasePath.replaceWith(this.circleBasePath);
this.squareBasePath.replaceWith(this.circleBasePath);
this.shape = SHAPE_CIRCLE;
}

setSquareNoRadiusShape() {
this.squareBasePath.replaceWith(this.squareNoRadiusBasePath);
this.circleBasePath.replaceWith(this.squareNoRadiusBasePath);
this.shape = SHAPE_SQUARE_NO_RADIUS;
}

setColor(color) {
this.circleBasePath.fillColor = color;
this.squareBasePath.fillColor = color;
this.squareNoRadiusBasePath.fillColor = color;
}

setCenter(center) {
this.circleBasePath.center = center;
this.squareBasePath.center = center;
this.squareNoRadiusBasePath.center = center;
}

getPathWithoutShadows() {
if (this.shape === SHAPE_CIRCLE) return this.circleBasePath;
else if (this.shape == SHAPE_SQUARE) return this.squareBasePath;
else if (this.shape == SHAPE_SQUARE_NO_RADIUS) return this.squareNoRadiusBasePath;
console.warn('unknown base shape type ' + this.shape);
}

Expand All @@ -71,6 +93,7 @@ class IconBase {
remove() {
this.circleBasePath.remove();
this.squareBasePath.remove();
this.squareNoRadiusBasePath.remove();
}

}
Expand Down
7 changes: 5 additions & 2 deletions app/js/IconManager.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,13 +167,16 @@ class IconManager {
let baseShapePicker = this.containerEdit.find('#base-shape input[name="radio-base-shape"]');
this.setIconBaseShapeFunction = function(event, disableDraw) {
let setCircularShape = this.containerEdit.find('#base-shape-circle')[0].checked === true;
let setSquareShape = this.containerEdit.find('#base-shape-square')[0].checked === true;
if (setCircularShape) {
this.iconBase.setCircularShape();
} else {
} else if (setSquareShape) {
this.iconBase.setSquareShape();
} else {
this.iconBase.setSquareNoRadiusShape();
}
if (this.icon) {
ga('send', 'event', gaConstants.CATEGORY_EDITOR, gaConstants.ACTION_CHANGE_BASE_SHAPE, setCircularShape ? 'circular' : 'square');
ga('send', 'event', gaConstants.CATEGORY_EDITOR, gaConstants.ACTION_CHANGE_BASE_SHAPE, setCircularShape ? 'circular' : (setSquareShape ? 'square' : 'square-no-radius'));
this.icon.applyIcon();
this.icon.getIconShadow().applyShadow();
}
Expand Down
5 changes: 5 additions & 0 deletions app/templates/editor.static.jade
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,11 @@
label(for='base-shape-square')
span
span Square
.radio-inline
input(type='radio', name='radio-base-shape')#base-shape-square-no-radius
label(for='base-shape-square-no-radius')
span
span Square No Radius

.controls-entry
.row
Expand Down