Skip to content

Commit

Permalink
remove padding from generated icons
Browse files Browse the repository at this point in the history
  • Loading branch information
@YehudaKremer
YehudaKremer committed Mar 11, 2023
1 parent ccb525d commit ad67250
Show file tree
Hide file tree
Showing 3 changed files with 59 additions and 77 deletions.
4 changes: 4 additions & 0 deletions CHANGELOG.md
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
# Changelog

## 3.9.0

- remove padding from generated icons (fix [#179](https://github.com/YehudaKremer/msix/issues/179))

## 3.8.4

- add `screenshot` and `issue_tracker` to the package metadata
Expand Down
130 changes: 54 additions & 76 deletions lib/src/assets.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -112,19 +112,12 @@ class Assets {

/// Generate icon with specified size, padding and scale
Future<void> _generateIcon(String name, _Size size,
{double scale = 1,
double paddingWidthPercent = 0,
double paddingHeightPercent = 0}) async {
double scaledWidth = size.width * scale;
double scaledHeight = size.height * scale;
int widthLessPaddingWidth =
(scaledWidth - (scaledWidth * paddingWidthPercent)).ceil();
int heightLessPaddingHeight =
(scaledHeight - (scaledHeight * paddingHeightPercent)).ceil();
Interpolation interpolation =
widthLessPaddingWidth < 200 || heightLessPaddingHeight < 200
? Interpolation.average
: Interpolation.cubic;
{double scale = 1}) async {
int scaledWidth = (size.width * scale).ceil();
int scaledHeight = (size.height * scale).ceil();
Interpolation interpolation = scaledWidth < 200 || scaledHeight < 200
? Interpolation.average
: Interpolation.cubic;

if (_config.trimLogo) {
try {
Expand All @@ -133,16 +126,16 @@ class Assets {
}

Image resizedImage;
if (widthLessPaddingWidth > heightLessPaddingHeight) {
if (scaledWidth > scaledHeight) {
resizedImage = copyResize(
image,
height: heightLessPaddingHeight,
height: scaledHeight,
interpolation: interpolation,
);
} else {
resizedImage = copyResize(
image,
width: widthLessPaddingWidth,
width: scaledWidth,
interpolation: interpolation,
);
}
Expand Down Expand Up @@ -173,60 +166,47 @@ class Assets {
Future<void> _generateAssetsIconsPart1(SendPort port) async {
await Future.wait([
// SmallTile
_generateIcon('SmallTile', const _Size(71, 71),
paddingWidthPercent: 0.34, paddingHeightPercent: 0.5),
_generateIcon('SmallTile', const _Size(71, 71),
paddingWidthPercent: 0.34, paddingHeightPercent: 0.34, scale: 1.25),
_generateIcon('SmallTile', const _Size(71, 71),
paddingWidthPercent: 0.34, paddingHeightPercent: 0.34, scale: 1.5),
_generateIcon('SmallTile', const _Size(71, 71),
paddingWidthPercent: 0.34, paddingHeightPercent: 0.34, scale: 2),
_generateIcon('SmallTile', const _Size(71, 71),
paddingWidthPercent: 0.34, paddingHeightPercent: 0.34, scale: 4),
_generateIcon('SmallTile', const _Size(71, 71)),
_generateIcon('SmallTile', const _Size(71, 71), scale: 1.25),
_generateIcon('SmallTile', const _Size(71, 71), scale: 1.5),
_generateIcon('SmallTile', const _Size(71, 71), scale: 2),
_generateIcon('SmallTile', const _Size(71, 71), scale: 4),
// Square150x150Logo (Medium tile)
_generateIcon('Square150x150Logo', const _Size(150, 150),
paddingWidthPercent: 0.34, paddingHeightPercent: 0.5),
_generateIcon('Square150x150Logo', const _Size(150, 150),
paddingWidthPercent: 0.34, paddingHeightPercent: 0.5, scale: 1.25),
_generateIcon('Square150x150Logo', const _Size(150, 150),
paddingWidthPercent: 0.34, paddingHeightPercent: 0.5, scale: 1.5),
_generateIcon('Square150x150Logo', const _Size(150, 150),
paddingWidthPercent: 0.34, paddingHeightPercent: 0.5, scale: 2),
_generateIcon('Square150x150Logo', const _Size(150, 150),
paddingWidthPercent: 0.34, paddingHeightPercent: 0.5, scale: 4),
_generateIcon(
'Square150x150Logo',
const _Size(150, 150),
),
_generateIcon('Square150x150Logo', const _Size(150, 150), scale: 1.25),
_generateIcon('Square150x150Logo', const _Size(150, 150), scale: 1.5),
_generateIcon('Square150x150Logo', const _Size(150, 150), scale: 2),
_generateIcon('Square150x150Logo', const _Size(150, 150), scale: 4),
// Wide310x150Logo (Wide tile)
_generateIcon('Wide310x150Logo', const _Size(310, 150),
paddingWidthPercent: 0.34, paddingHeightPercent: 0.5),
_generateIcon('Wide310x150Logo', const _Size(310, 150),
paddingWidthPercent: 0.34, paddingHeightPercent: 0.5, scale: 1.25),
_generateIcon('Wide310x150Logo', const _Size(310, 150),
paddingWidthPercent: 0.34, paddingHeightPercent: 0.5, scale: 1.5),
_generateIcon('Wide310x150Logo', const _Size(310, 150),
paddingWidthPercent: 0.34, paddingHeightPercent: 0.5, scale: 2),
_generateIcon('Wide310x150Logo', const _Size(310, 150),
paddingWidthPercent: 0.34, paddingHeightPercent: 0.5, scale: 4),
_generateIcon(
'Wide310x150Logo',
const _Size(310, 150),
),
_generateIcon('Wide310x150Logo', const _Size(310, 150), scale: 1.25),
_generateIcon('Wide310x150Logo', const _Size(310, 150), scale: 1.5),
_generateIcon('Wide310x150Logo', const _Size(310, 150), scale: 2),
_generateIcon('Wide310x150Logo', const _Size(310, 150), scale: 4),
// LargeTile
_generateIcon('LargeTile', const _Size(310, 310),
paddingWidthPercent: 0.34, paddingHeightPercent: 0.5),
_generateIcon('LargeTile', const _Size(310, 310),
paddingWidthPercent: 0.34, paddingHeightPercent: 0.5, scale: 1.25),
_generateIcon('LargeTile', const _Size(310, 310),
paddingWidthPercent: 0.34, paddingHeightPercent: 0.5, scale: 1.5),
_generateIcon('LargeTile', const _Size(310, 310),
paddingWidthPercent: 0.34, paddingHeightPercent: 0.5, scale: 2),
_generateIcon('LargeTile', const _Size(310, 310),
paddingWidthPercent: 0.34, paddingHeightPercent: 0.5, scale: 4),
_generateIcon(
'LargeTile',
const _Size(310, 310),
),
_generateIcon('LargeTile', const _Size(310, 310), scale: 1.25),
_generateIcon('LargeTile', const _Size(310, 310), scale: 1.5),
_generateIcon('LargeTile', const _Size(310, 310), scale: 2),
_generateIcon('LargeTile', const _Size(310, 310), scale: 4),
// Square44x44Logo (App icon)
_generateIcon('Square44x44Logo', const _Size(44, 44),
paddingWidthPercent: 0.16, paddingHeightPercent: 0.16),
_generateIcon('Square44x44Logo', const _Size(44, 44),
paddingWidthPercent: 0.16, paddingHeightPercent: 0.16, scale: 1.25),
_generateIcon('Square44x44Logo', const _Size(44, 44),
paddingWidthPercent: 0.16, paddingHeightPercent: 0.16, scale: 1.5),
_generateIcon('Square44x44Logo', const _Size(44, 44),
paddingWidthPercent: 0.16, paddingHeightPercent: 0.16, scale: 2),
_generateIcon('Square44x44Logo', const _Size(44, 44),
paddingWidthPercent: 0.16, paddingHeightPercent: 0.16, scale: 4),
_generateIcon(
'Square44x44Logo',
const _Size(44, 44),
),
_generateIcon('Square44x44Logo', const _Size(44, 44), scale: 1.25),
_generateIcon('Square44x44Logo', const _Size(44, 44), scale: 1.5),
_generateIcon('Square44x44Logo', const _Size(44, 44), scale: 2),
_generateIcon('Square44x44Logo', const _Size(44, 44), scale: 4),
]);

Isolate.exit(port);
Expand Down Expand Up @@ -315,16 +295,14 @@ class Assets {
_generateIcon('Square44x44Logo.altform-lightunplated_targetsize-96',
const _Size(96, 96)),
// SplashScreen
_generateIcon('SplashScreen', const _Size(620, 300),
paddingWidthPercent: 0.34, paddingHeightPercent: 0.5),
_generateIcon('SplashScreen', const _Size(620, 300),
paddingWidthPercent: 0.34, paddingHeightPercent: 0.5, scale: 1.25),
_generateIcon('SplashScreen', const _Size(620, 300),
paddingWidthPercent: 0.34, paddingHeightPercent: 0.5, scale: 1.5),
_generateIcon('SplashScreen', const _Size(620, 300),
paddingWidthPercent: 0.34, paddingHeightPercent: 0.5, scale: 2),
_generateIcon('SplashScreen', const _Size(620, 300),
paddingWidthPercent: 0.34, paddingHeightPercent: 0.5, scale: 4),
_generateIcon(
'SplashScreen',
const _Size(620, 300),
),
_generateIcon('SplashScreen', const _Size(620, 300), scale: 1.25),
_generateIcon('SplashScreen', const _Size(620, 300), scale: 1.5),
_generateIcon('SplashScreen', const _Size(620, 300), scale: 2),
_generateIcon('SplashScreen', const _Size(620, 300), scale: 4),
// BadgeLogo
_generateIcon('BadgeLogo', const _Size(24, 24)),
_generateIcon('BadgeLogo', const _Size(24, 24), scale: 1.25),
Expand Down
2 changes: 1 addition & 1 deletion pubspec.yaml
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name: msix
description: A command-line tool that create Msix installer from your flutter windows-build files.
version: 3.8.4
version: 3.9.0
maintainer: Yehuda Kremer ([email protected])
homepage: https://github.com/YehudaKremer/msix
issue_tracker: https://github.com/YehudaKremer/msix/issues
Expand Down

0 comments on commit ad67250

Please sign in to comment.