diff --git a/MockupEngineer/templates/imac212015/__init__.py b/MockupEngineer/templates/imac212015/__init__.py new file mode 100644 index 0000000..5f0430e --- /dev/null +++ b/MockupEngineer/templates/imac212015/__init__.py @@ -0,0 +1,26 @@ +from dataclasses import dataclass + +from MockupEngineer.templates import Template + + +@dataclass +class Device(Template): + def __device_init__(self): + self.manufacturer = 'Apple' + self.name = 'iMac 21"' + self.type = 'pc' + self.year = 2015 + self.resolution = '{width} x {height}'.format(width=4096, height=2304) + + self.__template_path__ = 'imac212015' + self.__colors__ = {"Silver": 'silver'} + + self.__portrait_width__ = 1693 + self.__portrait_height__ = 954 + self.__portrait_x__ = 173 + self.__portrait_y__ = 178 + + self.__landscape_width__ = 1693 + self.__landscape_height__ = 954 + self.__landscape_x__ = 173 + self.__landscape_y__ = 178 diff --git a/MockupEngineer/templates/imac212015/example.png b/MockupEngineer/templates/imac212015/example.png new file mode 100644 index 0000000..57ebb8f Binary files /dev/null and b/MockupEngineer/templates/imac212015/example.png differ diff --git a/MockupEngineer/templates/imac212015/silver/landscape.png b/MockupEngineer/templates/imac212015/silver/landscape.png new file mode 100644 index 0000000..ed41e01 Binary files /dev/null and b/MockupEngineer/templates/imac212015/silver/landscape.png differ diff --git a/MockupEngineer/templates/imac212015/silver/portrait.png b/MockupEngineer/templates/imac212015/silver/portrait.png new file mode 100644 index 0000000..fada6e5 Binary files /dev/null and b/MockupEngineer/templates/imac212015/silver/portrait.png differ diff --git a/MockupEngineer/templates/macbookpro132015/__init__.py b/MockupEngineer/templates/macbookpro132015/__init__.py new file mode 100644 index 0000000..fe78db8 --- /dev/null +++ b/MockupEngineer/templates/macbookpro132015/__init__.py @@ -0,0 +1,26 @@ +from dataclasses import dataclass + +from MockupEngineer.templates import Template + + +@dataclass +class Device(Template): + def __device_init__(self): + self.manufacturer = 'Apple' + self.name = 'MacBook Pro 13"' + self.type = 'pc' + self.year = 2015 + self.resolution = '{width} x {height}'.format(width=2560, height=1600) + + self.__template_path__ = 'macbookpro132015' + self.__colors__ = {"Silver": 'silver'} + + self.__portrait_width__ = 1424 + self.__portrait_height__ = 890 + self.__portrait_x__ = 388 + self.__portrait_y__ = 176 + + self.__landscape_width__ = 1424 + self.__landscape_height__ = 890 + self.__landscape_x__ = 388 + self.__landscape_y__ = 176 diff --git a/MockupEngineer/templates/macbookpro132015/example.png b/MockupEngineer/templates/macbookpro132015/example.png new file mode 100644 index 0000000..d442b5e Binary files /dev/null and b/MockupEngineer/templates/macbookpro132015/example.png differ diff --git a/MockupEngineer/templates/macbookpro132015/silver/landscape.png b/MockupEngineer/templates/macbookpro132015/silver/landscape.png new file mode 100644 index 0000000..a04da4e Binary files /dev/null and b/MockupEngineer/templates/macbookpro132015/silver/landscape.png differ diff --git a/MockupEngineer/templates/macbookpro132015/silver/portrait.png b/MockupEngineer/templates/macbookpro132015/silver/portrait.png new file mode 100644 index 0000000..139857a Binary files /dev/null and b/MockupEngineer/templates/macbookpro132015/silver/portrait.png differ diff --git a/MockupEngineer/templates/macbookpro152015/__init__.py b/MockupEngineer/templates/macbookpro152015/__init__.py new file mode 100644 index 0000000..b49b15f --- /dev/null +++ b/MockupEngineer/templates/macbookpro152015/__init__.py @@ -0,0 +1,26 @@ +from dataclasses import dataclass + +from MockupEngineer.templates import Template + + +@dataclass +class Device(Template): + def __device_init__(self): + self.manufacturer = 'Apple' + self.name = 'MacBook Pro 15"' + self.type = 'pc' + self.year = 2015 + self.resolution = '{width} x {height}'.format(width=2880, height=1800) + + self.__template_path__ = 'macbookpro152015' + self.__colors__ = {"Silver": 'silver'} + + self.__portrait_width__ = 1450 + self.__portrait_height__ = 906 + self.__portrait_x__ = 328 + self.__portrait_y__ = 167 + + self.__landscape_width__ = 1450 + self.__landscape_height__ = 906 + self.__landscape_x__ = 328 + self.__landscape_y__ = 167 diff --git a/MockupEngineer/templates/macbookpro152015/example.png b/MockupEngineer/templates/macbookpro152015/example.png new file mode 100644 index 0000000..3193777 Binary files /dev/null and b/MockupEngineer/templates/macbookpro152015/example.png differ diff --git a/MockupEngineer/templates/macbookpro152015/silver/landscape.png b/MockupEngineer/templates/macbookpro152015/silver/landscape.png new file mode 100644 index 0000000..acbee72 Binary files /dev/null and b/MockupEngineer/templates/macbookpro152015/silver/landscape.png differ diff --git a/MockupEngineer/templates/macbookpro152015/silver/portrait.png b/MockupEngineer/templates/macbookpro152015/silver/portrait.png new file mode 100644 index 0000000..db7372c Binary files /dev/null and b/MockupEngineer/templates/macbookpro152015/silver/portrait.png differ diff --git a/readme.md b/readme.md index 439067b..2f8cd26 100644 --- a/readme.md +++ b/readme.md @@ -137,6 +137,20 @@ Full list of all currently supported mockups * Just Black * Sorta Sage +### Computers +* [Apple iMac 21"](https://raw.githubusercontent.com/ulbwazhine/MockupEngineer/main/MockupEngineer/templates/imac212015/example.png) [4096 x 2304] (2015) + * Silver + +* [Apple MacBook 12"](https://raw.githubusercontent.com/ulbwazhine/MockupEngineer/main/MockupEngineer/templates/macbook122016/example.png) [2304 x 1440] (2016) + * Gold + * Space Gray + +* [Apple MacBook Pro 13"](https://raw.githubusercontent.com/ulbwazhine/MockupEngineer/main/MockupEngineer/templates/macbookpro132015/example.png) [2560 x 1600] (2015) + * Silver + +* [Apple MacBook Pro 15"](https://raw.githubusercontent.com/ulbwazhine/MockupEngineer/main/MockupEngineer/templates/macbookpro152015/example.png) [2880 x 1800] (2015) + * Silver + ### Tablets * [Apple iPad 9](https://raw.githubusercontent.com/ulbwazhine/MockupEngineer/main/MockupEngineer/templates/ipad9/example.png) [2160 x 1620] (2021) * Gold @@ -163,11 +177,6 @@ Full list of all currently supported mockups * Silver * Space Gray -### Computers -* [Apple MacBook 12"](https://raw.githubusercontent.com/ulbwazhine/MockupEngineer/main/MockupEngineer/templates/macbook122016/example.png) [2304 x 1440] (2016) - * Gold - * Space Gray - ### Wearable devices * [Apple Watch Series 6 44mm](https://raw.githubusercontent.com/ulbwazhine/MockupEngineer/main/MockupEngineer/templates/watchseries644mm/example.png) [368 x 448] (2020) * Aluminum Case - Blue diff --git a/setup.py b/setup.py index 0cf5b00..6b0562c 100644 --- a/setup.py +++ b/setup.py @@ -3,7 +3,7 @@ from setuptools import setup, find_packages setup( name='MockupEngineer', - version='2022.01.25.1', + version='2022.01.25.2', packages=find_packages(), url='https://github.com/ulbwazhine/MockupEngineer', license='MIT',