diff --git a/MANIFEST.in b/MANIFEST.in index 6dbef5e..535639c 100644 --- a/MANIFEST.in +++ b/MANIFEST.in @@ -1,2 +1,3 @@ -global-include *.md *.png *.txt -global-exclude generated/*.png \ No newline at end of file +global-include *.md *.png *.ini +global-exclude ./generated +exclude deploy.py readme-template.md .gitignore \ No newline at end of file diff --git a/MockupEngineer/templates/galaxys20/preview.png b/MockupEngineer/templates/galaxys20/preview.png index af5176f..2ab16b2 100644 Binary files a/MockupEngineer/templates/galaxys20/preview.png and b/MockupEngineer/templates/galaxys20/preview.png differ diff --git a/MockupEngineer/templates/galaxys20ultra/preview.png b/MockupEngineer/templates/galaxys20ultra/preview.png index bfd17d6..6dd7818 100644 Binary files a/MockupEngineer/templates/galaxys20ultra/preview.png and b/MockupEngineer/templates/galaxys20ultra/preview.png differ diff --git a/MockupEngineer/templates/imac212015/preview.png b/MockupEngineer/templates/imac212015/preview.png index 28e48eb..9640dd6 100644 Binary files a/MockupEngineer/templates/imac212015/preview.png and b/MockupEngineer/templates/imac212015/preview.png differ diff --git a/MockupEngineer/templates/imac242021/blue.png b/MockupEngineer/templates/imac242021/blue.png new file mode 100644 index 0000000..2253db3 Binary files /dev/null and b/MockupEngineer/templates/imac242021/blue.png differ diff --git a/MockupEngineer/templates/imac242021/config.ini b/MockupEngineer/templates/imac242021/config.ini new file mode 100644 index 0000000..215c450 --- /dev/null +++ b/MockupEngineer/templates/imac242021/config.ini @@ -0,0 +1,26 @@ +# https://github.com/ulbwazhine/MockupEngineer + +[info] +manufacturer = Apple +name = iMac 24" +type = pc +year = 2021 +width = 4480 +height = 2520 + +[colors] +green = green.png +yellow = yellow.png +orange = orange.png +pink = pink.png +purple = purple.png +blue = blue.png +silver = silver.png + +[image] +width = 3529 +height = 1984 +x = 235 +y = 217 +mask = false +rotate = false diff --git a/MockupEngineer/templates/imac242021/green.png b/MockupEngineer/templates/imac242021/green.png new file mode 100644 index 0000000..714f33b Binary files /dev/null and b/MockupEngineer/templates/imac242021/green.png differ diff --git a/MockupEngineer/templates/imac242021/orange.png b/MockupEngineer/templates/imac242021/orange.png new file mode 100644 index 0000000..c56dd60 Binary files /dev/null and b/MockupEngineer/templates/imac242021/orange.png differ diff --git a/MockupEngineer/templates/imac242021/pink.png b/MockupEngineer/templates/imac242021/pink.png new file mode 100644 index 0000000..5970fae Binary files /dev/null and b/MockupEngineer/templates/imac242021/pink.png differ diff --git a/MockupEngineer/templates/imac242021/preview.png b/MockupEngineer/templates/imac242021/preview.png new file mode 100644 index 0000000..71bd815 Binary files /dev/null and b/MockupEngineer/templates/imac242021/preview.png differ diff --git a/MockupEngineer/templates/imac242021/purple.png b/MockupEngineer/templates/imac242021/purple.png new file mode 100644 index 0000000..3bea79c Binary files /dev/null and b/MockupEngineer/templates/imac242021/purple.png differ diff --git a/MockupEngineer/templates/imac242021/silver.png b/MockupEngineer/templates/imac242021/silver.png new file mode 100644 index 0000000..9f2ac4c Binary files /dev/null and b/MockupEngineer/templates/imac242021/silver.png differ diff --git a/MockupEngineer/templates/imac242021/yellow.png b/MockupEngineer/templates/imac242021/yellow.png new file mode 100644 index 0000000..497531f Binary files /dev/null and b/MockupEngineer/templates/imac242021/yellow.png differ diff --git a/MockupEngineer/templates/ipad9/preview.png b/MockupEngineer/templates/ipad9/preview.png index 045670f..9d5a741 100644 Binary files a/MockupEngineer/templates/ipad9/preview.png and b/MockupEngineer/templates/ipad9/preview.png differ diff --git a/MockupEngineer/templates/ipadair4/preview.png b/MockupEngineer/templates/ipadair4/preview.png index a751b6d..ec09957 100644 Binary files a/MockupEngineer/templates/ipadair4/preview.png and b/MockupEngineer/templates/ipadair4/preview.png differ diff --git a/MockupEngineer/templates/ipadmini5/preview.png b/MockupEngineer/templates/ipadmini5/preview.png index b7596ec..621a9c6 100644 Binary files a/MockupEngineer/templates/ipadmini5/preview.png and b/MockupEngineer/templates/ipadmini5/preview.png differ diff --git a/MockupEngineer/templates/ipadpro114/preview.png b/MockupEngineer/templates/ipadpro114/preview.png index e03062e..dffc5e4 100644 Binary files a/MockupEngineer/templates/ipadpro114/preview.png and b/MockupEngineer/templates/ipadpro114/preview.png differ diff --git a/MockupEngineer/templates/ipadpro134/preview.png b/MockupEngineer/templates/ipadpro134/preview.png index 3d2c497..deb678d 100644 Binary files a/MockupEngineer/templates/ipadpro134/preview.png and b/MockupEngineer/templates/ipadpro134/preview.png differ diff --git a/MockupEngineer/templates/iphone12/preview.png b/MockupEngineer/templates/iphone12/preview.png index 944b7dc..866d0b0 100644 Binary files a/MockupEngineer/templates/iphone12/preview.png and b/MockupEngineer/templates/iphone12/preview.png differ diff --git a/MockupEngineer/templates/iphone12mini/preview.png b/MockupEngineer/templates/iphone12mini/preview.png index 31c785a..9ef4095 100644 Binary files a/MockupEngineer/templates/iphone12mini/preview.png and b/MockupEngineer/templates/iphone12mini/preview.png differ diff --git a/MockupEngineer/templates/iphone12pro/preview.png b/MockupEngineer/templates/iphone12pro/preview.png index 8925a8c..4fc14e4 100644 Binary files a/MockupEngineer/templates/iphone12pro/preview.png and b/MockupEngineer/templates/iphone12pro/preview.png differ diff --git a/MockupEngineer/templates/iphone12promax/preview.png b/MockupEngineer/templates/iphone12promax/preview.png index adc8374..3734a77 100644 Binary files a/MockupEngineer/templates/iphone12promax/preview.png and b/MockupEngineer/templates/iphone12promax/preview.png differ diff --git a/MockupEngineer/templates/iphonese2020/preview.png b/MockupEngineer/templates/iphonese2020/preview.png index a9d35f0..e32e6a9 100644 Binary files a/MockupEngineer/templates/iphonese2020/preview.png and b/MockupEngineer/templates/iphonese2020/preview.png differ diff --git a/MockupEngineer/templates/iphonexr/preview.png b/MockupEngineer/templates/iphonexr/preview.png index 79a6201..4be7c32 100644 Binary files a/MockupEngineer/templates/iphonexr/preview.png and b/MockupEngineer/templates/iphonexr/preview.png differ diff --git a/MockupEngineer/templates/iphonexs/preview.png b/MockupEngineer/templates/iphonexs/preview.png index ef5f40d..0fa2234 100644 Binary files a/MockupEngineer/templates/iphonexs/preview.png and b/MockupEngineer/templates/iphonexs/preview.png differ diff --git a/MockupEngineer/templates/iphonexsmax/preview.png b/MockupEngineer/templates/iphonexsmax/preview.png index 14a1569..9e2b544 100644 Binary files a/MockupEngineer/templates/iphonexsmax/preview.png and b/MockupEngineer/templates/iphonexsmax/preview.png differ diff --git a/MockupEngineer/templates/macbook122016/preview.png b/MockupEngineer/templates/macbook122016/preview.png index 98eb811..236df13 100644 Binary files a/MockupEngineer/templates/macbook122016/preview.png and b/MockupEngineer/templates/macbook122016/preview.png differ diff --git a/MockupEngineer/templates/macbookair2020/config.ini b/MockupEngineer/templates/macbookair2020/config.ini new file mode 100644 index 0000000..6ff8c0b --- /dev/null +++ b/MockupEngineer/templates/macbookair2020/config.ini @@ -0,0 +1,20 @@ +# https://github.com/ulbwazhine/MockupEngineer + +[info] +manufacturer = Apple +name = MacBook Air (M1) +type = pc +year = 2020 +width = 2560 +height = 1600 + +[colors] +silver = silver.png + +[image] +width = 1297 +height = 814 +x = 252 +y = 142 +mask = false +rotate = false diff --git a/MockupEngineer/templates/macbookair2020/preview.png b/MockupEngineer/templates/macbookair2020/preview.png new file mode 100644 index 0000000..fb29d7c Binary files /dev/null and b/MockupEngineer/templates/macbookair2020/preview.png differ diff --git a/MockupEngineer/templates/macbookair2020/silver.png b/MockupEngineer/templates/macbookair2020/silver.png new file mode 100644 index 0000000..e728bb6 Binary files /dev/null and b/MockupEngineer/templates/macbookair2020/silver.png differ diff --git a/MockupEngineer/templates/macbookpro132015/preview.png b/MockupEngineer/templates/macbookpro132015/preview.png index cbad5e1..b019bd0 100644 Binary files a/MockupEngineer/templates/macbookpro132015/preview.png and b/MockupEngineer/templates/macbookpro132015/preview.png differ diff --git a/MockupEngineer/templates/macbookpro152015/preview.png b/MockupEngineer/templates/macbookpro152015/preview.png index a0a9c23..f5ec96b 100644 Binary files a/MockupEngineer/templates/macbookpro152015/preview.png and b/MockupEngineer/templates/macbookpro152015/preview.png differ diff --git a/MockupEngineer/templates/macbookpro162019/preview.png b/MockupEngineer/templates/macbookpro162019/preview.png index 0c43b28..73c0bda 100644 Binary files a/MockupEngineer/templates/macbookpro162019/preview.png and b/MockupEngineer/templates/macbookpro162019/preview.png differ diff --git a/MockupEngineer/templates/macbookpro162021/preview.png b/MockupEngineer/templates/macbookpro162021/preview.png index 33b2924..a9bbfa6 100644 Binary files a/MockupEngineer/templates/macbookpro162021/preview.png and b/MockupEngineer/templates/macbookpro162021/preview.png differ diff --git a/MockupEngineer/templates/pixel/preview.png b/MockupEngineer/templates/pixel/preview.png index f188bae..139e211 100644 Binary files a/MockupEngineer/templates/pixel/preview.png and b/MockupEngineer/templates/pixel/preview.png differ diff --git a/MockupEngineer/templates/pixel4/preview.png b/MockupEngineer/templates/pixel4/preview.png index 3b548df..4ca26a3 100644 Binary files a/MockupEngineer/templates/pixel4/preview.png and b/MockupEngineer/templates/pixel4/preview.png differ diff --git a/MockupEngineer/templates/pixel4xl/preview.png b/MockupEngineer/templates/pixel4xl/preview.png index a0d3b85..b7707da 100644 Binary files a/MockupEngineer/templates/pixel4xl/preview.png and b/MockupEngineer/templates/pixel4xl/preview.png differ diff --git a/MockupEngineer/templates/pixel5/preview.png b/MockupEngineer/templates/pixel5/preview.png index 2b87b85..707a78b 100644 Binary files a/MockupEngineer/templates/pixel5/preview.png and b/MockupEngineer/templates/pixel5/preview.png differ diff --git a/MockupEngineer/templates/pixelbookgo/preview.png b/MockupEngineer/templates/pixelbookgo/preview.png index 41f7cc8..34b3b5c 100644 Binary files a/MockupEngineer/templates/pixelbookgo/preview.png and b/MockupEngineer/templates/pixelbookgo/preview.png differ diff --git a/MockupEngineer/templates/prodisplayxdr/preview.png b/MockupEngineer/templates/prodisplayxdr/preview.png index 306b927..9aea904 100644 Binary files a/MockupEngineer/templates/prodisplayxdr/preview.png and b/MockupEngineer/templates/prodisplayxdr/preview.png differ diff --git a/MockupEngineer/templates/watchseries644mm/preview.png b/MockupEngineer/templates/watchseries644mm/preview.png index 0186d7b..4d04d91 100644 Binary files a/MockupEngineer/templates/watchseries644mm/preview.png and b/MockupEngineer/templates/watchseries644mm/preview.png differ diff --git a/deploy.py b/deploy.py index b452284..2afd5a5 100644 --- a/deploy.py +++ b/deploy.py @@ -12,8 +12,7 @@ from MockupEngineer import MockupEngineerInstance, generated_path def create_examples(): mockup = MockupEngineerInstance() - max_height = 1000 - max_width = 1000 + max_size = 1000 for template in mockup.templates: screenshot_path = FluentImage( @@ -26,13 +25,13 @@ def create_examples(): background_img = Image.new('RGBA', mockup_img.size, (255, 255, 255, 255)) background_img.paste(mockup_img, (0, 0), mockup_img) - if background_img.size[0] > max_width or background_img.size[1] > max_height: + if background_img.size[0] > max_size or background_img.size[1] > max_size: if background_img.size[0] > background_img.size[1]: - width = max_width - height = int(background_img.size[1] * (max_width / background_img.size[0])) + width = max_size + height = int(background_img.size[1] * (max_size / background_img.size[0])) else: - width = int(background_img.size[0] * (max_height / background_img.size[1])) - height = max_height + width = int(background_img.size[0] * (max_size / background_img.size[1])) + height = max_size background_img = background_img.resize((width, height), Image.ANTIALIAS) background_img.save(template.preview) diff --git a/readme.md b/readme.md index a72523a..4268fc4 100644 --- a/readme.md +++ b/readme.md @@ -167,10 +167,22 @@ Full list of all currently supported mockups * [Apple iMac 21"](https://raw.githubusercontent.com/ulbwazhine/MockupEngineer/main/MockupEngineer/templates/imac212015/preview.png) (2015) [4096 x 2304] * *Silver* +* [Apple iMac 24"](https://raw.githubusercontent.com/ulbwazhine/MockupEngineer/main/MockupEngineer/templates/imac242021/preview.png) (2021) [4480 x 2520] + * *Green* + * *Yellow* + * *Orange* + * *Pink* + * *Purple* + * *Blue* + * *Silver* + * [Apple MacBook 12"](https://raw.githubusercontent.com/ulbwazhine/MockupEngineer/main/MockupEngineer/templates/macbook122016/preview.png) (2016) [2304 x 1440] * *Space Gray* * *Gold* +* [Apple MacBook Air (M1)](https://raw.githubusercontent.com/ulbwazhine/MockupEngineer/main/MockupEngineer/templates/macbookair2020/preview.png) (2020) [2560 x 1600] + * *Silver* + * [Apple MacBook Pro 13"](https://raw.githubusercontent.com/ulbwazhine/MockupEngineer/main/MockupEngineer/templates/macbookpro132015/preview.png) (2015) [2560 x 1600] * *Silver* diff --git a/setup.py b/setup.py index ee917f1..1990717 100644 --- a/setup.py +++ b/setup.py @@ -3,7 +3,7 @@ from setuptools import setup, find_packages setup( name='MockupEngineer', - version='2022.02.02.3', + version='2022.02.03.4', packages=find_packages(), url='https://github.com/ulbwazhine/MockupEngineer', license='MIT',