Merge branch 'newtemplates2021'

fredyshox · Sep 26, 2021 · 0e43f28 · 0e43f28
2 parents 783d356 + 2775ddc
commit 0e43f28
Show file tree

Hide file tree

Showing 110 changed files with 95 additions and 17 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,5 +1,5 @@
 cmake_minimum_required(VERSION 3.16)
-project(ScreenFramer VERSION 1.2.1)
+project(ScreenFramer VERSION 1.2.2)
 
 # dependencies
 find_package(OpenCV 4 REQUIRED)

diff --git a/README.md b/README.md
@@ -70,6 +70,14 @@ Padding can be specified using fraction of template dimensions. Available option
 
 ##### iPhones
 
+* iPhone 12: `iphone12`
+  * Colors: `black`, `blue`, `green`, `red`, `white`
+* iPhone 12 Mini: `iphone12mini`
+  * Colors: `black`, `blue`, `green`, `red`, `white`
+* iPhone 12 Pro: `iphone12pro`
+  * Colors: `gold`, `graphite`, `pacific-blue`, `silver`
+* iPhone 12 Pro: `iphone12promax`
+  * Colors: `gold`, `graphite`, `pacific-blue`, `silver`
 * iPhone 11: `iphone11` 
   * Colors:  `black`,  `green`,  `purple`,  `red`,  `white`,  `yellow`
 * iPhone 11 Pro: `iphone11pro`
@@ -113,14 +121,14 @@ Padding can be specified using fraction of template dimensions. Available option
   * Colors: `silver`, `space-gray`
 * iPad Pro 12.9 (3/4 gen): `ipadpro129`
   * Colors: `silver`, `space-gray`
+* iPad Air 4 (2020): `ipadair4`
+  * Colors: `green`, `rose-gold`, `silver`, `sky-blue`, `space-gray`
 * iPad Air 3 (2019): `ipadair3`
   * Colors: `gold`, `silver`, `space-gray`
 * iPad Air 2: `ipadair2`
   * Colors: `gold`, `silver`, `space-gray`
 * iPad Mini 5 (2019): `ipadmini5`
   * Colors: `gold`, `silver`, `space-gray`
-* iPad Mini 4: `ipadmini4`
-  * Colors: `gold`, `silver`, `space-gray`
 
 ##### Apple Watch
 

diff --git a/Resources/Apple iPad 10.2 Gold.png b/Resources/Apple iPad 10.2 Gold.png
diff --git a/Resources/Apple iPad 10.2 Silver.png b/Resources/Apple iPad 10.2 Silver.png
diff --git a/Resources/Apple iPad 10.2 Space Gray.png b/Resources/Apple iPad 10.2 Space Gray.png
diff --git a/Resources/Apple iPad Air (2019) 2020 Green.png b/Resources/Apple iPad Air (2019) 2020 Green.png
diff --git a/Resources/Apple iPad Air (2019) 2020 Rose Gold.png b/Resources/Apple iPad Air (2019) 2020 Rose Gold.png
diff --git a/Resources/Apple iPad Air (2019) 2020 Silver.png b/Resources/Apple iPad Air (2019) 2020 Silver.png
diff --git a/Resources/Apple iPad Air (2019) 2020 Sky Blue.png b/Resources/Apple iPad Air (2019) 2020 Sky Blue.png
diff --git a/Resources/Apple iPad Air (2019) 2020 Space Gray.png b/Resources/Apple iPad Air (2019) 2020 Space Gray.png
diff --git a/Resources/Apple iPad Air (2019) Gold.png b/Resources/Apple iPad Air (2019) Gold.png
diff --git a/Resources/Apple iPad Air (2019) Silver.png b/Resources/Apple iPad Air (2019) Silver.png
diff --git a/Resources/Apple iPad Air (2019) Space Gray.png b/Resources/Apple iPad Air (2019) Space Gray.png
diff --git a/Resources/Apple iPad Air 2 Gold.png b/Resources/Apple iPad Air 2 Gold.png
diff --git a/Resources/Apple iPad Air 2 Silver.png b/Resources/Apple iPad Air 2 Silver.png
diff --git a/Resources/Apple iPad Air 2 Space Gray.png b/Resources/Apple iPad Air 2 Space Gray.png
diff --git a/Resources/Apple iPad Mini (2019) Gold.png b/Resources/Apple iPad Mini (2019) Gold.png
diff --git a/Resources/Apple iPad Mini (2019) Silver.png b/Resources/Apple iPad Mini (2019) Silver.png
diff --git a/Resources/Apple iPad Mini (2019) Space Gray.png b/Resources/Apple iPad Mini (2019) Space Gray.png
diff --git a/Resources/Apple iPad Mini 4 Gold.png b/Resources/Apple iPad Mini 4 Gold.png
diff --git a/Resources/Apple iPad Mini 4 Silver.png b/Resources/Apple iPad Mini 4 Silver.png
diff --git a/Resources/Apple iPad Mini 4 Space Gray.png b/Resources/Apple iPad Mini 4 Space Gray.png
diff --git a/Resources/Apple iPad Pro (11-inch) Silver.png b/Resources/Apple iPad Pro (11-inch) Silver.png
diff --git a/Resources/Apple iPad Pro (11-inch) Space Gray.png b/Resources/Apple iPad Pro (11-inch) Space Gray.png
diff --git a/Resources/Apple iPad Pro (12.9-inch) (3rd generation) Silver.png b/Resources/Apple iPad Pro (12.9-inch) (3rd generation) Silver.png
diff --git a/Resources/Apple iPad Pro (12.9-inch) (3rd generation) Space Gray.png b/Resources/Apple iPad Pro (12.9-inch) (3rd generation) Space Gray.png
diff --git a/Resources/Apple iPad Pro Gold.png b/Resources/Apple iPad Pro Gold.png
diff --git a/Resources/Apple iPad Pro Silver.png b/Resources/Apple iPad Pro Silver.png
diff --git a/Resources/Apple iPad Pro Space Gray.png b/Resources/Apple iPad Pro Space Gray.png
diff --git a/Resources/Apple iPhone 11 Black.png b/Resources/Apple iPhone 11 Black.png
diff --git a/Resources/Apple iPhone 11 Green.png b/Resources/Apple iPhone 11 Green.png
diff --git a/Resources/Apple iPhone 11 Pro Gold.png b/Resources/Apple iPhone 11 Pro Gold.png
diff --git a/Resources/Apple iPhone 11 Pro Max Gold.png b/Resources/Apple iPhone 11 Pro Max Gold.png
diff --git a/Resources/Apple iPhone 11 Pro Max Midnight Green.png b/Resources/Apple iPhone 11 Pro Max Midnight Green.png
diff --git a/Resources/Apple iPhone 11 Pro Max Silver.png b/Resources/Apple iPhone 11 Pro Max Silver.png
diff --git a/Resources/Apple iPhone 11 Pro Max Space Gray.png b/Resources/Apple iPhone 11 Pro Max Space Gray.png
diff --git a/Resources/Apple iPhone 11 Pro Midnight Green.png b/Resources/Apple iPhone 11 Pro Midnight Green.png
diff --git a/Resources/Apple iPhone 11 Pro Silver.png b/Resources/Apple iPhone 11 Pro Silver.png
diff --git a/Resources/Apple iPhone 11 Pro Space Gray.png b/Resources/Apple iPhone 11 Pro Space Gray.png
diff --git a/Resources/Apple iPhone 11 Purple.png b/Resources/Apple iPhone 11 Purple.png
diff --git a/Resources/Apple iPhone 11 Red.png b/Resources/Apple iPhone 11 Red.png
diff --git a/Resources/Apple iPhone 11 White.png b/Resources/Apple iPhone 11 White.png
diff --git a/Resources/Apple iPhone 11 Yellow.png b/Resources/Apple iPhone 11 Yellow.png
diff --git a/Resources/Apple iPhone 12 Black.png b/Resources/Apple iPhone 12 Black.png
diff --git a/Resources/Apple iPhone 12 Blue.png b/Resources/Apple iPhone 12 Blue.png
diff --git a/Resources/Apple iPhone 12 Green.png b/Resources/Apple iPhone 12 Green.png
diff --git a/Resources/Apple iPhone 12 Mini Black.png b/Resources/Apple iPhone 12 Mini Black.png
diff --git a/Resources/Apple iPhone 12 Mini Blue.png b/Resources/Apple iPhone 12 Mini Blue.png
diff --git a/Resources/Apple iPhone 12 Mini Green.png b/Resources/Apple iPhone 12 Mini Green.png
diff --git a/Resources/Apple iPhone 12 Mini Red.png b/Resources/Apple iPhone 12 Mini Red.png
diff --git a/Resources/Apple iPhone 12 Mini White.png b/Resources/Apple iPhone 12 Mini White.png
diff --git a/Resources/Apple iPhone 12 Pro Gold.png b/Resources/Apple iPhone 12 Pro Gold.png
diff --git a/Resources/Apple iPhone 12 Pro Graphite.png b/Resources/Apple iPhone 12 Pro Graphite.png
diff --git a/Resources/Apple iPhone 12 Pro Max Gold.png b/Resources/Apple iPhone 12 Pro Max Gold.png
diff --git a/Resources/Apple iPhone 12 Pro Max Graphite.png b/Resources/Apple iPhone 12 Pro Max Graphite.png
diff --git a/Resources/Apple iPhone 12 Pro Max Pacific Blue.png b/Resources/Apple iPhone 12 Pro Max Pacific Blue.png
diff --git a/Resources/Apple iPhone 12 Pro Max Silver.png b/Resources/Apple iPhone 12 Pro Max Silver.png
diff --git a/Resources/Apple iPhone 12 Pro Pacific Blue.png b/Resources/Apple iPhone 12 Pro Pacific Blue.png
diff --git a/Resources/Apple iPhone 12 Pro Silver.png b/Resources/Apple iPhone 12 Pro Silver.png
diff --git a/Resources/Apple iPhone 12 Red.png b/Resources/Apple iPhone 12 Red.png
diff --git a/Resources/Apple iPhone 12 White.png b/Resources/Apple iPhone 12 White.png
diff --git a/Resources/Apple iPhone 5c Blue.png b/Resources/Apple iPhone 5c Blue.png
diff --git a/Resources/Apple iPhone 5c Green.png b/Resources/Apple iPhone 5c Green.png
diff --git a/Resources/Apple iPhone 5c Red.png b/Resources/Apple iPhone 5c Red.png
diff --git a/Resources/Apple iPhone 5c White.png b/Resources/Apple iPhone 5c White.png
diff --git a/Resources/Apple iPhone 5c Yellow.png b/Resources/Apple iPhone 5c Yellow.png
diff --git a/Resources/Apple iPhone 5s Gold.png b/Resources/Apple iPhone 5s Gold.png
diff --git a/Resources/Apple iPhone 5s Silver.png b/Resources/Apple iPhone 5s Silver.png
diff --git a/Resources/Apple iPhone 5s Space Gray.png b/Resources/Apple iPhone 5s Space Gray.png
diff --git a/Resources/Apple iPhone 6s Gold.png b/Resources/Apple iPhone 6s Gold.png
diff --git a/Resources/Apple iPhone 6s Plus Gold.png b/Resources/Apple iPhone 6s Plus Gold.png
diff --git a/Resources/Apple iPhone 6s Plus Rose Gold.png b/Resources/Apple iPhone 6s Plus Rose Gold.png
diff --git a/Resources/Apple iPhone 6s Plus Silver.png b/Resources/Apple iPhone 6s Plus Silver.png
diff --git a/Resources/Apple iPhone 6s Plus Space Gray.png b/Resources/Apple iPhone 6s Plus Space Gray.png
diff --git a/Resources/Apple iPhone 6s Rose Gold.png b/Resources/Apple iPhone 6s Rose Gold.png
diff --git a/Resources/Apple iPhone 6s Silver.png b/Resources/Apple iPhone 6s Silver.png
diff --git a/Resources/Apple iPhone 6s Space Gray.png b/Resources/Apple iPhone 6s Space Gray.png
diff --git a/Resources/Apple iPhone 7 Gold.png b/Resources/Apple iPhone 7 Gold.png
diff --git a/Resources/Apple iPhone 7 Jet Black.png b/Resources/Apple iPhone 7 Jet Black.png
diff --git a/Resources/Apple iPhone 7 Matte Black.png b/Resources/Apple iPhone 7 Matte Black.png
diff --git a/Resources/Apple iPhone 7 Plus Gold.png b/Resources/Apple iPhone 7 Plus Gold.png
diff --git a/Resources/Apple iPhone 7 Plus Jet Black.png b/Resources/Apple iPhone 7 Plus Jet Black.png
diff --git a/Resources/Apple iPhone 7 Plus Matte Black.png b/Resources/Apple iPhone 7 Plus Matte Black.png
diff --git a/Resources/Apple iPhone 7 Plus Rose Gold.png b/Resources/Apple iPhone 7 Plus Rose Gold.png
diff --git a/Resources/Apple iPhone 7 Plus Silver.png b/Resources/Apple iPhone 7 Plus Silver.png
diff --git a/Resources/Apple iPhone 7 Rose Gold.png b/Resources/Apple iPhone 7 Rose Gold.png
diff --git a/Resources/Apple iPhone 7 Silver.png b/Resources/Apple iPhone 7 Silver.png
diff --git a/Resources/Apple iPhone 8 Gold.png b/Resources/Apple iPhone 8 Gold.png
diff --git a/Resources/Apple iPhone 8 Plus Gold.png b/Resources/Apple iPhone 8 Plus Gold.png
diff --git a/Resources/Apple iPhone 8 Plus Silver.png b/Resources/Apple iPhone 8 Plus Silver.png
diff --git a/Resources/Apple iPhone 8 Plus Space Gray.png b/Resources/Apple iPhone 8 Plus Space Gray.png
diff --git a/Resources/Apple iPhone 8 Silver.png b/Resources/Apple iPhone 8 Silver.png
diff --git a/Resources/Apple iPhone 8 Space Gray.png b/Resources/Apple iPhone 8 Space Gray.png
diff --git a/Resources/Apple iPhone X Silver.png b/Resources/Apple iPhone X Silver.png
diff --git a/Resources/Apple iPhone X Space Gray.png b/Resources/Apple iPhone X Space Gray.png
diff --git a/Resources/Apple iPhone XR Blue.png b/Resources/Apple iPhone XR Blue.png
diff --git a/Resources/Apple iPhone XR Coral.png b/Resources/Apple iPhone XR Coral.png
diff --git a/Resources/Apple iPhone XR Red.png b/Resources/Apple iPhone XR Red.png
diff --git a/Resources/Apple iPhone XR Silver.png b/Resources/Apple iPhone XR Silver.png
diff --git a/Resources/Apple iPhone XR Space Gray.png b/Resources/Apple iPhone XR Space Gray.png
diff --git a/Resources/Apple iPhone XR Yellow.png b/Resources/Apple iPhone XR Yellow.png
diff --git a/Resources/Apple iPhone XS Gold.png b/Resources/Apple iPhone XS Gold.png
diff --git a/Resources/Apple iPhone XS Max Gold.png b/Resources/Apple iPhone XS Max Gold.png
diff --git a/Resources/Apple iPhone XS Max Silver.png b/Resources/Apple iPhone XS Max Silver.png
diff --git a/Resources/Apple iPhone XS Max Space Gray.png b/Resources/Apple iPhone XS Max Space Gray.png
diff --git a/Resources/Apple iPhone XS Silver.png b/Resources/Apple iPhone XS Silver.png
diff --git a/Resources/Apple iPhone XS Space Gray.png b/Resources/Apple iPhone XS Space Gray.png
diff --git a/Resources/contents.json b/Resources/contents.json
@@ -22,7 +22,7 @@
             "space-gray": "Apple iPad Air 2 Space Gray.png"
         },
         "left": 111,
-        "res_height": 2496,
+        "res_height": 2495,
         "res_width": 1763,
         "right": 1647,
         "top": 224
@@ -41,19 +41,21 @@
         "right": 1741,
         "top": 192
     },
-    "ipadmini4": {
-        "bottom": 2326,
+    "ipadair4": {
+        "bottom": 2474,
         "default_image": "space-gray",
         "images": {
-            "gold": "Apple iPad Mini 4 Gold.png",
-            "silver": "Apple iPad Mini 4 Silver.png",
-            "space-gray": "Apple iPad Mini 4 Space Gray.png"
+            "green": "Apple iPad Air (2019) 2020 Green.png",
+            "rose-gold": "Apple iPad Air (2019) 2020 Rose Gold.png",
+            "silver": "Apple iPad Air (2019) 2020 Silver.png",
+            "sky-blue": "Apple iPad Air (2019) 2020 Sky Blue.png",
+            "space-gray": "Apple iPad Air (2019) 2020 Space Gray.png"
         },
-        "left": 96,
-        "res_height": 2604,
-        "res_width": 1728,
-        "right": 1632,
-        "top": 278
+        "left": 110,
+        "res_height": 2584,
+        "res_width": 1864,
+        "right": 1750,
+        "top": 114
     },
     "ipadmini5": {
         "bottom": 2327,
@@ -156,6 +158,68 @@
         "right": 1328,
         "top": 78
     },
+    "iphone12": {
+        "bottom": 2595,
+        "default_image": "black",
+        "images": {
+            "black": "Apple iPhone 12 Black.png",
+            "blue": "Apple iPhone 12 Blue.png",
+            "green": "Apple iPhone 12 Green.png",
+            "red": "Apple iPhone 12 Red.png",
+            "white": "Apple iPhone 12 White.png"
+        },
+        "left": 72,
+        "res_height": 2658,
+        "res_width": 1314,
+        "right": 1242,
+        "top": 63
+    },
+    "iphone12mini": {
+        "bottom": 2399,
+        "default_image": "black",
+        "images": {
+            "black": "Apple iPhone 12 Mini Black.png",
+            "blue": "Apple iPhone 12 Mini Blue.png",
+            "green": "Apple iPhone 12 Mini Green.png",
+            "red": "Apple iPhone 12 Mini Red.png",
+            "white": "Apple iPhone 12 Mini White.png"
+        },
+        "left": 70,
+        "res_height": 2458,
+        "res_width": 1220,
+        "right": 1150,
+        "top": 59
+    },
+    "iphone12pro": {
+        "bottom": 2595,
+        "default_image": "silver",
+        "images": {
+            "gold": "Apple iPhone 12 Pro Gold.png",
+            "graphite": "Apple iPhone 12 Pro Graphite.png",
+            "pacific-blue": "Apple iPhone 12 Pro Pacific Blue.png",
+            "silver": "Apple iPhone 12 Pro Silver.png"
+        },
+        "left": 72,
+        "res_height": 2658,
+        "res_width": 1314,
+        "right": 1242,
+        "top": 63
+    },
+    "iphone12promax": {
+        "bottom": 2840,
+        "default_image": "silver",
+        "images": {
+            "gold": "Apple iPhone 12 Pro Max Gold.png",
+            "graphite": "Apple iPhone 12 Pro Max Graphite.png",
+            "pacific-blue": "Apple iPhone 12 Pro Max Pacific Blue.png",
+            "silver": "Apple iPhone 12 Pro Max Silver.png"
+        },
+        "left": 74,
+        "res_height": 2902,
+        "res_width": 1432,
+        "right": 1358,
+        "top": 62
+    },
     "iphone5c": {
         "bottom": 1375,
         "default_image": "white",

diff --git a/Tools/common.py b/Tools/common.py
@@ -11,6 +11,8 @@
   "Rose Gold",
   "Jet Black",
   "Matte Black",
+  "Pacific Blue",
+  "Sky Blue",
   "Clearly White",
   "Just Black",
   "Not Pink",
@@ -50,7 +52,8 @@
   "Green",
   "Gray",
   "Coral",
-  "Purple"
+  "Purple",
+  "Graphite",
 ]
 
 # every apple device right now is available in one of these colors
@@ -68,14 +71,17 @@
 
 # renaming, prefer generation over years
 IPAD_AIR_YEAR = "2019"
+NEW_IPAD_AIR_YEAR = "2020"
 IPAD_MINI_YEAR = "2019"
 IPAD_AIR_GEN = "3"
+NEW_IPAD_AIR_GEN = "4"
 IPAD_MINI_GEN = "5"
 IPAD_PRO_12_9_GEN = "3"
 RENAME_SCHEME = {
     "iPad Pro (11 inch)": "iPad Pro 11",
     f"iPad Pro (12.9 inch) ({IPAD_PRO_12_9_GEN}rd generation)": "iPad Pro 12.9",
     f"iPad Air ({IPAD_AIR_YEAR})": f"iPad Air {IPAD_AIR_GEN}",
+    f"iPad Air ({IPAD_AIR_YEAR}) {NEW_IPAD_AIR_YEAR}": f"iPad Air {NEW_IPAD_AIR_GEN}",
     f"iPad Mini ({IPAD_MINI_YEAR})": f"iPad Mini {IPAD_MINI_GEN}",
     f"iPodTouch Portrait": "iPod Touch"
 }

diff --git a/Tools/fastlane-templates.py b/Tools/fastlane-templates.py
@@ -28,8 +28,8 @@ def main():
     repo_dir = path.join(resource_dir, "frameit-frames-gh-pages")
 
     print("Downloading frameit frames...")
-    if os.system(f"wget -q --show-progress -O \"{zip_path}\" \"{FRAMEIT_URL}\" && unzip -d \"{resource_dir}\" \"{zip_path}\"") != 0:
-        exit(2)
+    status_code = os.system(f"wget -q --show-progress -O \"{zip_path}\" \"{FRAMEIT_URL}\" && unzip -d \"{resource_dir}\" \"{zip_path}\"")
+    print(f"Status code: {status_code}")
 
     # path to latest frames
     frameit_dir = path.join(repo_dir, "latest")