added launch screen, images and colors

xramos · May 27, 2022 · 0e10364 · 0e10364
1 parent 628ab3d
commit 0e10364
Show file tree

Hide file tree

Showing 36 changed files with 112 additions and 97 deletions.
diff --git a/Pokemon/Pokemon/Assets.xcassets/AppIcon.appiconset/100.png b/Pokemon/Pokemon/Assets.xcassets/AppIcon.appiconset/100.png
diff --git a/Pokemon/Pokemon/Assets.xcassets/AppIcon.appiconset/1024.png b/Pokemon/Pokemon/Assets.xcassets/AppIcon.appiconset/1024.png
diff --git a/Pokemon/Pokemon/Assets.xcassets/AppIcon.appiconset/114.png b/Pokemon/Pokemon/Assets.xcassets/AppIcon.appiconset/114.png
diff --git a/Pokemon/Pokemon/Assets.xcassets/AppIcon.appiconset/120.png b/Pokemon/Pokemon/Assets.xcassets/AppIcon.appiconset/120.png
diff --git a/Pokemon/Pokemon/Assets.xcassets/AppIcon.appiconset/144.png b/Pokemon/Pokemon/Assets.xcassets/AppIcon.appiconset/144.png
diff --git a/Pokemon/Pokemon/Assets.xcassets/AppIcon.appiconset/152.png b/Pokemon/Pokemon/Assets.xcassets/AppIcon.appiconset/152.png
diff --git a/Pokemon/Pokemon/Assets.xcassets/AppIcon.appiconset/167.png b/Pokemon/Pokemon/Assets.xcassets/AppIcon.appiconset/167.png
diff --git a/Pokemon/Pokemon/Assets.xcassets/AppIcon.appiconset/180.png b/Pokemon/Pokemon/Assets.xcassets/AppIcon.appiconset/180.png
diff --git a/Pokemon/Pokemon/Assets.xcassets/AppIcon.appiconset/20.png b/Pokemon/Pokemon/Assets.xcassets/AppIcon.appiconset/20.png
diff --git a/Pokemon/Pokemon/Assets.xcassets/AppIcon.appiconset/29.png b/Pokemon/Pokemon/Assets.xcassets/AppIcon.appiconset/29.png
diff --git a/Pokemon/Pokemon/Assets.xcassets/AppIcon.appiconset/40.png b/Pokemon/Pokemon/Assets.xcassets/AppIcon.appiconset/40.png
diff --git a/Pokemon/Pokemon/Assets.xcassets/AppIcon.appiconset/50.png b/Pokemon/Pokemon/Assets.xcassets/AppIcon.appiconset/50.png
diff --git a/Pokemon/Pokemon/Assets.xcassets/AppIcon.appiconset/57.png b/Pokemon/Pokemon/Assets.xcassets/AppIcon.appiconset/57.png
diff --git a/Pokemon/Pokemon/Assets.xcassets/AppIcon.appiconset/58.png b/Pokemon/Pokemon/Assets.xcassets/AppIcon.appiconset/58.png
diff --git a/Pokemon/Pokemon/Assets.xcassets/AppIcon.appiconset/60.png b/Pokemon/Pokemon/Assets.xcassets/AppIcon.appiconset/60.png
diff --git a/Pokemon/Pokemon/Assets.xcassets/AppIcon.appiconset/72.png b/Pokemon/Pokemon/Assets.xcassets/AppIcon.appiconset/72.png
diff --git a/Pokemon/Pokemon/Assets.xcassets/AppIcon.appiconset/76.png b/Pokemon/Pokemon/Assets.xcassets/AppIcon.appiconset/76.png
diff --git a/Pokemon/Pokemon/Assets.xcassets/AppIcon.appiconset/80.png b/Pokemon/Pokemon/Assets.xcassets/AppIcon.appiconset/80.png
diff --git a/Pokemon/Pokemon/Assets.xcassets/AppIcon.appiconset/87.png b/Pokemon/Pokemon/Assets.xcassets/AppIcon.appiconset/87.png
diff --git a/Pokemon/Pokemon/Assets.xcassets/AppIcon.appiconset/Contents.json b/Pokemon/Pokemon/Assets.xcassets/AppIcon.appiconset/Contents.json
@@ -1,93 +1 @@
-{
-  "images" : [
-    {
-      "idiom" : "iphone",
-      "scale" : "2x",
-      "size" : "20x20"
-    },
-    {
-      "idiom" : "iphone",
-      "scale" : "3x",
-      "size" : "20x20"
-    },
-    {
-      "idiom" : "iphone",
-      "scale" : "2x",
-      "size" : "29x29"
-    },
-    {
-      "idiom" : "iphone",
-      "scale" : "3x",
-      "size" : "29x29"
-    },
-    {
-      "idiom" : "iphone",
-      "scale" : "2x",
-      "size" : "40x40"
-    },
-    {
-      "idiom" : "iphone",
-      "scale" : "3x",
-      "size" : "40x40"
-    },
-    {
-      "idiom" : "iphone",
-      "scale" : "2x",
-      "size" : "60x60"
-    },
-    {
-      "idiom" : "iphone",
-      "scale" : "3x",
-      "size" : "60x60"
-    },
-    {
-      "idiom" : "ipad",
-      "scale" : "1x",
-      "size" : "20x20"
-    },
-    {
-      "idiom" : "ipad",
-      "scale" : "2x",
-      "size" : "20x20"
-    },
-    {
-      "idiom" : "ipad",
-      "scale" : "1x",
-      "size" : "29x29"
-    },
-    {
-      "idiom" : "ipad",
-      "scale" : "2x",
-      "size" : "29x29"
-    },
-    {
-      "idiom" : "ipad",
-      "scale" : "1x",
-      "size" : "40x40"
-    },
-    {
-      "idiom" : "ipad",
-      "scale" : "2x",
-      "size" : "40x40"
-    },
-    {
-      "idiom" : "ipad",
-      "scale" : "2x",
-      "size" : "76x76"
-    },
-    {
-      "idiom" : "ipad",
-      "scale" : "2x",
-      "size" : "83.5x83.5"
-    },
-    {
-      "idiom" : "ios-marketing",
-      "scale" : "1x",
-      "size" : "1024x1024"
-    }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}
+{"images":[{"size":"60x60","expected-size":"180","filename":"180.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"iphone","scale":"3x"},{"size":"40x40","expected-size":"80","filename":"80.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"iphone","scale":"2x"},{"size":"40x40","expected-size":"120","filename":"120.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"iphone","scale":"3x"},{"size":"60x60","expected-size":"120","filename":"120.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"iphone","scale":"2x"},{"size":"57x57","expected-size":"57","filename":"57.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"iphone","scale":"1x"},{"size":"29x29","expected-size":"58","filename":"58.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"iphone","scale":"2x"},{"size":"29x29","expected-size":"29","filename":"29.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"iphone","scale":"1x"},{"size":"29x29","expected-size":"87","filename":"87.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"iphone","scale":"3x"},{"size":"57x57","expected-size":"114","filename":"114.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"iphone","scale":"2x"},{"size":"20x20","expected-size":"40","filename":"40.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"iphone","scale":"2x"},{"size":"20x20","expected-size":"60","filename":"60.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"iphone","scale":"3x"},{"size":"1024x1024","filename":"1024.png","expected-size":"1024","idiom":"ios-marketing","folder":"Assets.xcassets/AppIcon.appiconset/","scale":"1x"},{"size":"40x40","expected-size":"80","filename":"80.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"ipad","scale":"2x"},{"size":"72x72","expected-size":"72","filename":"72.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"ipad","scale":"1x"},{"size":"76x76","expected-size":"152","filename":"152.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"ipad","scale":"2x"},{"size":"50x50","expected-size":"100","filename":"100.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"ipad","scale":"2x"},{"size":"29x29","expected-size":"58","filename":"58.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"ipad","scale":"2x"},{"size":"76x76","expected-size":"76","filename":"76.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"ipad","scale":"1x"},{"size":"29x29","expected-size":"29","filename":"29.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"ipad","scale":"1x"},{"size":"50x50","expected-size":"50","filename":"50.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"ipad","scale":"1x"},{"size":"72x72","expected-size":"144","filename":"144.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"ipad","scale":"2x"},{"size":"40x40","expected-size":"40","filename":"40.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"ipad","scale":"1x"},{"size":"83.5x83.5","expected-size":"167","filename":"167.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"ipad","scale":"2x"},{"size":"20x20","expected-size":"20","filename":"20.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"ipad","scale":"1x"},{"size":"20x20","expected-size":"40","filename":"40.png","folder":"Assets.xcassets/AppIcon.appiconset/","idiom":"ipad","scale":"2x"}]}
diff --git a/Pokemon/Pokemon/Assets.xcassets/logo.imageset/Contents.json b/Pokemon/Pokemon/Assets.xcassets/logo.imageset/Contents.json
@@ -0,0 +1,26 @@
+{
+  "images" : [
+    {
+      "filename" : "pokemon logo.jpeg",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "pokemon logo-1.jpeg",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "pokemon logo-2.jpeg",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  },
+  "properties" : {
+    "template-rendering-intent" : "original"
+  }
+}
diff --git a/Pokemon/Pokemon/Assets.xcassets/logo.imageset/pokemon logo-1.jpeg b/Pokemon/Pokemon/Assets.xcassets/logo.imageset/pokemon logo-1.jpeg
diff --git a/Pokemon/Pokemon/Assets.xcassets/logo.imageset/pokemon logo-2.jpeg b/Pokemon/Pokemon/Assets.xcassets/logo.imageset/pokemon logo-2.jpeg
diff --git a/Pokemon/Pokemon/Assets.xcassets/logo.imageset/pokemon logo.jpeg b/Pokemon/Pokemon/Assets.xcassets/logo.imageset/pokemon logo.jpeg
diff --git a/Pokemon/Pokemon/Assets.xcassets/pokeball.imageset/Contents.json b/Pokemon/Pokemon/Assets.xcassets/pokeball.imageset/Contents.json
@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "filename" : "pokeball.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "pokeball-1.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "pokeball-2.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/Pokemon/Pokemon/Assets.xcassets/pokeball.imageset/pokeball-1.png b/Pokemon/Pokemon/Assets.xcassets/pokeball.imageset/pokeball-1.png
diff --git a/Pokemon/Pokemon/Assets.xcassets/pokeball.imageset/pokeball-2.png b/Pokemon/Pokemon/Assets.xcassets/pokeball.imageset/pokeball-2.png
diff --git a/Pokemon/Pokemon/Assets.xcassets/pokeball.imageset/pokeball.png b/Pokemon/Pokemon/Assets.xcassets/pokeball.imageset/pokeball.png
diff --git a/Pokemon/Pokemon/Assets.xcassets/pokedex.imageset/Contents.json b/Pokemon/Pokemon/Assets.xcassets/pokedex.imageset/Contents.json
@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "filename" : "pokedex.jpeg",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "pokedex-1.jpeg",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "pokedex-2.jpeg",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/Pokemon/Pokemon/Assets.xcassets/pokedex.imageset/pokedex-1.jpeg b/Pokemon/Pokemon/Assets.xcassets/pokedex.imageset/pokedex-1.jpeg
diff --git a/Pokemon/Pokemon/Assets.xcassets/pokedex.imageset/pokedex-2.jpeg b/Pokemon/Pokemon/Assets.xcassets/pokedex.imageset/pokedex-2.jpeg
diff --git a/Pokemon/Pokemon/Assets.xcassets/pokedex.imageset/pokedex.jpeg b/Pokemon/Pokemon/Assets.xcassets/pokedex.imageset/pokedex.jpeg
diff --git a/Pokemon/Pokemon/Assets.xcassets/pokemonYellow.colorset/Contents.json b/Pokemon/Pokemon/Assets.xcassets/pokemonYellow.colorset/Contents.json
@@ -0,0 +1,20 @@
+{
+  "colors" : [
+    {
+      "color" : {
+        "color-space" : "srgb",
+        "components" : {
+          "alpha" : "1.000",
+          "blue" : "0x05",
+          "green" : "0xCB",
+          "red" : "0xFF"
+        }
+      },
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/Pokemon/Pokemon/Entities/ServerEntities/ServerPokemon.swift b/Pokemon/Pokemon/Entities/ServerEntities/ServerPokemon.swift
@@ -13,7 +13,7 @@ struct ServerPokemon: Codable {
     let name: String
     let weight: Int
     let height: Int
-    let base_experience: Int
+    let baseExperience: Int
 
     let sprites: ServerSprite
     let types: [ServerTypes]?
@@ -29,8 +29,8 @@ struct ServerPokemon: Codable {
                        name: name,
                        weight: weight,
                        height: height,
-                       experience: base_experience,
-                       url: sprites.front_default,
+                       experience: baseExperience,
+                       url: sprites.frontDefault,
                        date: "",
                        types: pokemonTypes)
     }

diff --git a/Pokemon/Pokemon/Entities/ServerEntities/ServerSprite.swift b/Pokemon/Pokemon/Entities/ServerEntities/ServerSprite.swift
@@ -9,5 +9,5 @@ import Foundation
 
 struct ServerSprite: Codable {
 
-    let front_default: String
+    let frontDefault: String
 }
diff --git a/Pokemon/Pokemon/Info.plist b/Pokemon/Pokemon/Info.plist
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>UILaunchScreen</key>
+	<dict>
+		<key>UIColorName</key>
+		<string>white</string>
+		<key>UIImageName</key>
+		<string>logo</string>
+		<key>UIImageRespectsSafeAreaInsets</key>
+		<true/>
+	</dict>
+</dict>
+</plist>