Move alternate icons to separate asset catalog

duckduckgo · Dec 5, 2024 · d46fa39 · d46fa39
1 parent a4e3b1b
commit d46fa39
Show file tree

Hide file tree

Showing 62 changed files with 276 additions and 164 deletions.
diff --git a/DuckDuckGo.xcodeproj/project.pbxproj b/DuckDuckGo.xcodeproj/project.pbxproj
diff --git a/...ns/AppIcon-Black.appiconset/Contents.json → ...ts/AppIcon-black.appiconset/Contents.json b/...ns/AppIcon-Black.appiconset/Contents.json → ...ts/AppIcon-black.appiconset/Contents.json
diff --git a/...appiconset/Icon-Color-Black-1024x1024.png → ...appiconset/Icon-Color-Black-1024x1024.png b/...appiconset/Icon-Color-Black-1024x1024.png → ...appiconset/Icon-Color-Black-1024x1024.png
diff --git a/...-Black.appiconset/Icon-Dark-1024x1024.png → ...-black.appiconset/Icon-Dark-1024x1024.png b/...-Black.appiconset/Icon-Dark-1024x1024.png → ...-black.appiconset/Icon-Dark-1024x1024.png
diff --git a/...lack.appiconset/Icon-Tinted-1024x1024.png → ...lack.appiconset/Icon-Tinted-1024x1024.png b/...lack.appiconset/Icon-Tinted-1024x1024.png → ...lack.appiconset/Icon-Tinted-1024x1024.png
diff --git a/...ons/AppIcon-Blue.appiconset/Contents.json → ...ets/AppIcon-blue.appiconset/Contents.json b/...ons/AppIcon-Blue.appiconset/Contents.json → ...ets/AppIcon-blue.appiconset/Contents.json
diff --git a/....appiconset/Icon-Color-Blue-1024x1024.png → ....appiconset/Icon-Color-Blue-1024x1024.png b/....appiconset/Icon-Color-Blue-1024x1024.png → ....appiconset/Icon-Color-Blue-1024x1024.png
diff --git a/...n-Blue.appiconset/Icon-Dark-1024x1024.png → ...n-blue.appiconset/Icon-Dark-1024x1024.png b/...n-Blue.appiconset/Icon-Dark-1024x1024.png → ...n-blue.appiconset/Icon-Dark-1024x1024.png
diff --git a/...Blue.appiconset/Icon-Tinted-1024x1024.png → ...blue.appiconset/Icon-Tinted-1024x1024.png b/...Blue.appiconset/Icon-Tinted-1024x1024.png → ...blue.appiconset/Icon-Tinted-1024x1024.png
diff --git a/...ns/AppIcon-Green.appiconset/Contents.json → ...ts/AppIcon-green.appiconset/Contents.json b/...ns/AppIcon-Green.appiconset/Contents.json → ...ts/AppIcon-green.appiconset/Contents.json
diff --git a/...appiconset/Icon-Color-Green-1024x1024.png → ...appiconset/Icon-Color-Green-1024x1024.png b/...appiconset/Icon-Color-Green-1024x1024.png → ...appiconset/Icon-Color-Green-1024x1024.png
diff --git a/...-Green.appiconset/Icon-Dark-1024x1024.png → ...-green.appiconset/Icon-Dark-1024x1024.png b/...-Green.appiconset/Icon-Dark-1024x1024.png → ...-green.appiconset/Icon-Dark-1024x1024.png
diff --git a/...reen.appiconset/Icon-Tinted-1024x1024.png → ...reen.appiconset/Icon-Tinted-1024x1024.png b/...reen.appiconset/Icon-Tinted-1024x1024.png → ...reen.appiconset/Icon-Tinted-1024x1024.png
diff --git a/...s/AppIcon-Purple.appiconset/Contents.json → ...s/AppIcon-purple.appiconset/Contents.json b/...s/AppIcon-Purple.appiconset/Contents.json → ...s/AppIcon-purple.appiconset/Contents.json
diff --git a/...ppiconset/Icon-Color-Purple-1024x1024.png → ...ppiconset/Icon-Color-Purple-1024x1024.png b/...ppiconset/Icon-Color-Purple-1024x1024.png → ...ppiconset/Icon-Color-Purple-1024x1024.png
diff --git a/...Purple.appiconset/Icon-Dark-1024x1024.png → ...purple.appiconset/Icon-Dark-1024x1024.png b/...Purple.appiconset/Icon-Dark-1024x1024.png → ...purple.appiconset/Icon-Dark-1024x1024.png
diff --git a/...rple.appiconset/Icon-Tinted-1024x1024.png → ...rple.appiconset/Icon-Tinted-1024x1024.png b/...rple.appiconset/Icon-Tinted-1024x1024.png → ...rple.appiconset/Icon-Tinted-1024x1024.png
diff --git a/...s/AppIcon-Yellow.appiconset/Contents.json → ...s/AppIcon-yellow.appiconset/Contents.json b/...s/AppIcon-Yellow.appiconset/Contents.json → ...s/AppIcon-yellow.appiconset/Contents.json
diff --git a/...ppiconset/Icon-Color-Yellow-1024x1024.png → ...ppiconset/Icon-Color-Yellow-1024x1024.png b/...ppiconset/Icon-Color-Yellow-1024x1024.png → ...ppiconset/Icon-Color-Yellow-1024x1024.png
diff --git a/...Yellow.appiconset/Icon-Dark-1024x1024.png → ...yellow.appiconset/Icon-Dark-1024x1024.png b/...Yellow.appiconset/Icon-Dark-1024x1024.png → ...yellow.appiconset/Icon-Dark-1024x1024.png
diff --git a/...llow.appiconset/Icon-Tinted-1024x1024.png → ...llow.appiconset/Icon-Tinted-1024x1024.png b/...llow.appiconset/Icon-Tinted-1024x1024.png → ...llow.appiconset/Icon-Tinted-1024x1024.png
diff --git a/....xcassets/AlternateAppIcons/Contents.json → .../AlternateAppIcons.xcassets/Contents.json b/....xcassets/AlternateAppIcons/Contents.json → .../AlternateAppIcons.xcassets/Contents.json
diff --git a/DuckDuckGo/[email protected] → ...-medium.imageset/[email protected] b/DuckDuckGo/[email protected] → ...-medium.imageset/[email protected]
diff --git a/DuckDuckGo/[email protected] → ...-medium.imageset/[email protected] b/DuckDuckGo/[email protected] → ...-medium.imageset/[email protected]
diff --git a/DuckDuckGo/AlternateAppIcons.xcassets/UIAssets/AppIcon-black-medium.imageset/Contents.json b/DuckDuckGo/AlternateAppIcons.xcassets/UIAssets/AppIcon-black-medium.imageset/Contents.json
@@ -0,0 +1,22 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "[email protected]",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "[email protected]",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/DuckDuckGo/[email protected] → ...k-small.imageset/[email protected] b/DuckDuckGo/[email protected] → ...k-small.imageset/[email protected]
diff --git a/DuckDuckGo/[email protected] → ...k-small.imageset/[email protected] b/DuckDuckGo/[email protected] → ...k-small.imageset/[email protected]
diff --git a/DuckDuckGo/AlternateAppIcons.xcassets/UIAssets/AppIcon-black-small.imageset/Contents.json b/DuckDuckGo/AlternateAppIcons.xcassets/UIAssets/AppIcon-black-small.imageset/Contents.json
@@ -0,0 +1,22 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "[email protected]",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "[email protected]",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/DuckDuckGo/[email protected] → ...e-medium.imageset/[email protected] b/DuckDuckGo/[email protected] → ...e-medium.imageset/[email protected]
diff --git a/DuckDuckGo/[email protected] → ...e-medium.imageset/[email protected] b/DuckDuckGo/[email protected] → ...e-medium.imageset/[email protected]
diff --git a/DuckDuckGo/AlternateAppIcons.xcassets/UIAssets/AppIcon-blue-medium.imageset/Contents.json b/DuckDuckGo/AlternateAppIcons.xcassets/UIAssets/AppIcon-blue-medium.imageset/Contents.json
@@ -0,0 +1,22 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "[email protected]",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "[email protected]",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/DuckDuckGo/[email protected] → ...ue-small.imageset/[email protected] b/DuckDuckGo/[email protected] → ...ue-small.imageset/[email protected]
diff --git a/DuckDuckGo/[email protected] → ...ue-small.imageset/[email protected] b/DuckDuckGo/[email protected] → ...ue-small.imageset/[email protected]
diff --git a/DuckDuckGo/AlternateAppIcons.xcassets/UIAssets/AppIcon-blue-small.imageset/Contents.json b/DuckDuckGo/AlternateAppIcons.xcassets/UIAssets/AppIcon-blue-small.imageset/Contents.json
@@ -0,0 +1,22 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "[email protected]",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "[email protected]",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/DuckDuckGo/[email protected] → ...-medium.imageset/[email protected] b/DuckDuckGo/[email protected] → ...-medium.imageset/[email protected]
diff --git a/DuckDuckGo/[email protected] → ...-medium.imageset/[email protected] b/DuckDuckGo/[email protected] → ...-medium.imageset/[email protected]
diff --git a/DuckDuckGo/AlternateAppIcons.xcassets/UIAssets/AppIcon-green-medium.imageset/Contents.json b/DuckDuckGo/AlternateAppIcons.xcassets/UIAssets/AppIcon-green-medium.imageset/Contents.json
@@ -0,0 +1,22 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "[email protected]",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "[email protected]",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/DuckDuckGo/[email protected] → ...n-small.imageset/[email protected] b/DuckDuckGo/[email protected] → ...n-small.imageset/[email protected]
diff --git a/DuckDuckGo/[email protected] → ...n-small.imageset/[email protected] b/DuckDuckGo/[email protected] → ...n-small.imageset/[email protected]
diff --git a/DuckDuckGo/AlternateAppIcons.xcassets/UIAssets/AppIcon-green-small.imageset/Contents.json b/DuckDuckGo/AlternateAppIcons.xcassets/UIAssets/AppIcon-green-small.imageset/Contents.json
@@ -0,0 +1,22 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "[email protected]",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "[email protected]",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/DuckDuckGo/[email protected] → ...medium.imageset/[email protected] b/DuckDuckGo/[email protected] → ...medium.imageset/[email protected]
diff --git a/DuckDuckGo/[email protected] → ...medium.imageset/[email protected] b/DuckDuckGo/[email protected] → ...medium.imageset/[email protected]
diff --git a/DuckDuckGo/AlternateAppIcons.xcassets/UIAssets/AppIcon-purple-medium.imageset/Contents.json b/DuckDuckGo/AlternateAppIcons.xcassets/UIAssets/AppIcon-purple-medium.imageset/Contents.json
@@ -0,0 +1,22 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "[email protected]",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "[email protected]",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/DuckDuckGo/[email protected] → ...-small.imageset/[email protected] b/DuckDuckGo/[email protected] → ...-small.imageset/[email protected]
diff --git a/DuckDuckGo/[email protected] → ...-small.imageset/[email protected] b/DuckDuckGo/[email protected] → ...-small.imageset/[email protected]
diff --git a/DuckDuckGo/AlternateAppIcons.xcassets/UIAssets/AppIcon-purple-small.imageset/Contents.json b/DuckDuckGo/AlternateAppIcons.xcassets/UIAssets/AppIcon-purple-small.imageset/Contents.json
@@ -0,0 +1,22 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "[email protected]",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "[email protected]",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/DuckDuckGo/[email protected] → ...medium.imageset/[email protected] b/DuckDuckGo/[email protected] → ...medium.imageset/[email protected]
diff --git a/DuckDuckGo/[email protected] → ...medium.imageset/[email protected] b/DuckDuckGo/[email protected] → ...medium.imageset/[email protected]
diff --git a/DuckDuckGo/AlternateAppIcons.xcassets/UIAssets/AppIcon-red-medium.imageset/Contents.json b/DuckDuckGo/AlternateAppIcons.xcassets/UIAssets/AppIcon-red-medium.imageset/Contents.json
@@ -0,0 +1,22 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "[email protected]",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "[email protected]",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/DuckDuckGo/[email protected] → ...red-small.imageset/[email protected] b/DuckDuckGo/[email protected] → ...red-small.imageset/[email protected]
diff --git a/DuckDuckGo/[email protected] → ...red-small.imageset/[email protected] b/DuckDuckGo/[email protected] → ...red-small.imageset/[email protected]
diff --git a/DuckDuckGo/AlternateAppIcons.xcassets/UIAssets/AppIcon-red-small.imageset/Contents.json b/DuckDuckGo/AlternateAppIcons.xcassets/UIAssets/AppIcon-red-small.imageset/Contents.json
@@ -0,0 +1,22 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "[email protected]",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "[email protected]",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/...cons.xcassets/UIAssets/AppIcon-yellow-medium.imageset/[email protected] b/...cons.xcassets/UIAssets/AppIcon-yellow-medium.imageset/[email protected]
diff --git a/...cons.xcassets/UIAssets/AppIcon-yellow-medium.imageset/[email protected] b/...cons.xcassets/UIAssets/AppIcon-yellow-medium.imageset/[email protected]
diff --git a/DuckDuckGo/AlternateAppIcons.xcassets/UIAssets/AppIcon-yellow-medium.imageset/Contents.json b/DuckDuckGo/AlternateAppIcons.xcassets/UIAssets/AppIcon-yellow-medium.imageset/Contents.json
@@ -0,0 +1,22 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "[email protected]",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "[email protected]",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/DuckDuckGo/[email protected] → ...-small.imageset/[email protected] b/DuckDuckGo/[email protected] → ...-small.imageset/[email protected]
diff --git a/DuckDuckGo/[email protected] → ...-small.imageset/[email protected] b/DuckDuckGo/[email protected] → ...-small.imageset/[email protected]
diff --git a/DuckDuckGo/AlternateAppIcons.xcassets/UIAssets/AppIcon-yellow-small.imageset/Contents.json b/DuckDuckGo/AlternateAppIcons.xcassets/UIAssets/AppIcon-yellow-small.imageset/Contents.json
@@ -0,0 +1,22 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "[email protected]",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "[email protected]",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/DuckDuckGo/AlternateAppIcons.xcassets/UIAssets/Contents.json b/DuckDuckGo/AlternateAppIcons.xcassets/UIAssets/Contents.json
@@ -0,0 +1,6 @@
+{
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/DuckDuckGo/AppIcon.swift b/DuckDuckGo/AppIcon.swift
@@ -43,29 +43,11 @@ enum AppIcon: String, CaseIterable {
     }
 
     var smallImage: UIImage? {
-        var image: UIImage?
-        switch self {
-        case .red: image = UIImage(named: "AppIconRed29x29")
-        case .yellow: image = UIImage(named: "AppIconYellow29x29")
-        case .green: image = UIImage(named: "AppIconGreen29x29")
-        case .blue: image = UIImage(named: "AppIconBlue29x29")
-        case .purple: image = UIImage(named: "AppIconPurple29x29")
-        case .black: image = UIImage(named: "AppIconBlack29x29")
-        }
-        return image
+        UIImage(named: "\(rawValue)-small")
     }
 
     var mediumImage: UIImage? {
-        var image: UIImage?
-        switch self {
-        case .red: image = UIImage(named: "AppIconRed60x60")
-        case .yellow: image = UIImage(named: "AppIconYellow60x60")
-        case .green: image = UIImage(named: "AppIconGreen60x60")
-        case .blue: image = UIImage(named: "AppIconBlue60x60")
-        case .purple: image = UIImage(named: "AppIconPurple60x60")
-        case .black: image = UIImage(named: "AppIconBlack60x60")
-        }
-        return image
+        UIImage(named: "\(rawValue)-medium")
     }
 
 }
diff --git a/DuckDuckGo/[email protected] b/DuckDuckGo/[email protected]
diff --git a/DuckDuckGo/[email protected] b/DuckDuckGo/[email protected]