Skip to content

Commit

Permalink
Add more custom icons
Browse files Browse the repository at this point in the history
  • Loading branch information
robbiet480 committed Feb 12, 2020
1 parent 3896e4e commit 0d9fe22
Show file tree
Hide file tree
Showing 46 changed files with 752 additions and 529 deletions.
264 changes: 160 additions & 104 deletions HomeAssistant.xcodeproj/project.pbxproj

Large diffs are not rendered by default.

Binary file modified HomeAssistant/Resources/Alternate Icons/beta@2x.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified HomeAssistant/Resources/Alternate Icons/beta@3x.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified HomeAssistant/Resources/Alternate Icons/black@2x.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified HomeAssistant/Resources/Alternate Icons/black@3x.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified HomeAssistant/Resources/Alternate Icons/blue@2x.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified HomeAssistant/Resources/Alternate Icons/blue@3x.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified HomeAssistant/Resources/Alternate Icons/dev@2x.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified HomeAssistant/Resources/Alternate Icons/dev@3x.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified HomeAssistant/Resources/Alternate Icons/green@2x.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified HomeAssistant/Resources/Alternate Icons/green@3x.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified HomeAssistant/Resources/Alternate Icons/old-beta@2x.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified HomeAssistant/Resources/Alternate Icons/old-beta@3x.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified HomeAssistant/Resources/Alternate Icons/old-dev@2x.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified HomeAssistant/Resources/Alternate Icons/old-dev@3x.png
Binary file modified HomeAssistant/Resources/Alternate Icons/old-release@2x.png
Binary file modified HomeAssistant/Resources/Alternate Icons/old-release@3x.png
Binary file modified HomeAssistant/Resources/Alternate Icons/orange@2x.png
Binary file modified HomeAssistant/Resources/Alternate Icons/orange@3x.png
Binary file modified HomeAssistant/Resources/Alternate Icons/purple@2x.png
Binary file modified HomeAssistant/Resources/Alternate Icons/purple@3x.png
Binary file modified HomeAssistant/Resources/Alternate Icons/red@2x.png
Binary file modified HomeAssistant/Resources/Alternate Icons/red@3x.png
Binary file modified HomeAssistant/Resources/Alternate Icons/release@2x.png
Binary file modified HomeAssistant/Resources/Alternate Icons/release@3x.png
Binary file modified HomeAssistant/Resources/Alternate Icons/white@2x.png
Binary file modified HomeAssistant/Resources/Alternate Icons/white@3x.png
949 changes: 537 additions & 412 deletions HomeAssistant/Resources/Info.plist

Large diffs are not rendered by default.

7 changes: 7 additions & 0 deletions HomeAssistant/Resources/en.lproj/Localizable.strings
Original file line number Diff line number Diff line change
Expand Up @@ -471,12 +471,19 @@
"settings_details.general.app_icon.enum.beta" = "Beta";
"settings_details.general.app_icon.enum.black" = "Black";
"settings_details.general.app_icon.enum.blue" = "Blue";
"settings_details.general.app_icon.enum.caribbean_green" = "Caribbean Green";
"settings_details.general.app_icon.enum.cornflower_blue" = "Cornflower Blue";
"settings_details.general.app_icon.enum.crimson" = "Crimson";
"settings_details.general.app_icon.enum.dev" = "Dev";
"settings_details.general.app_icon.enum.electric_violet" = "Electric Violet";
"settings_details.general.app_icon.enum.fire_orange" = "Fire Orange";
"settings_details.general.app_icon.enum.green" = "Green";
"settings_details.general.app_icon.enum.ha_blue" = "Home Assistant Blue";
"settings_details.general.app_icon.enum.old_beta" = "Old Beta";
"settings_details.general.app_icon.enum.old_dev" = "Old Dev";
"settings_details.general.app_icon.enum.old_release" = "Old Release";
"settings_details.general.app_icon.enum.orange" = "Orange";
"settings_details.general.app_icon.enum.pink" = "Pink";
"settings_details.general.app_icon.enum.purple" = "Purple";
"settings_details.general.app_icon.enum.red" = "Red";
"settings_details.general.app_icon.enum.release" = "Release";
Expand Down
43 changes: 32 additions & 11 deletions HomeAssistant/Views/SettingsDetailViewController.swift
Original file line number Diff line number Diff line change
Expand Up @@ -583,43 +583,64 @@ enum AppIcon: String, CaseIterable {
case Dev = "dev"
case Black = "black"
case Blue = "blue"
case CaribbeanGreen = "caribbean-green"
case CornflowerBlue = "cornflower-blue"
case Crimson = "crimson"
case ElectricViolet = "electric-violet"
case FireOrange = "fire-orange"
case Green = "green"
case HaBlue = "ha-blue"
case OldBeta = "old-beta"
case OldDev = "old-dev"
case OldRelease = "old-release"
case Orange = "orange"
case Pink = "pink"
case Purple = "purple"
case Red = "red"
case White = "white"
case OldRelease = "old-release"
case OldBeta = "old-beta"
case OldDev = "old-dev"

var title: String {
switch self {
case .Release:
return L10n.SettingsDetails.General.AppIcon.Enum.release
case .Beta:
return L10n.SettingsDetails.General.AppIcon.Enum.beta
case .Dev:
return L10n.SettingsDetails.General.AppIcon.Enum.dev
case .Release:
return L10n.SettingsDetails.General.AppIcon.Enum.release
case .Black:
return L10n.SettingsDetails.General.AppIcon.Enum.black
case .Blue:
return L10n.SettingsDetails.General.AppIcon.Enum.blue
case .CaribbeanGreen:
return L10n.SettingsDetails.General.AppIcon.Enum.caribbeanGreen
case .CornflowerBlue:
return L10n.SettingsDetails.General.AppIcon.Enum.cornflowerBlue
case .Crimson:
return L10n.SettingsDetails.General.AppIcon.Enum.crimson
case .ElectricViolet:
return L10n.SettingsDetails.General.AppIcon.Enum.electricViolet
case .FireOrange:
return L10n.SettingsDetails.General.AppIcon.Enum.fireOrange
case .Green:
return L10n.SettingsDetails.General.AppIcon.Enum.green
case .HaBlue:
return L10n.SettingsDetails.General.AppIcon.Enum.haBlue
case .OldBeta:
return L10n.SettingsDetails.General.AppIcon.Enum.oldBeta
case .OldDev:
return L10n.SettingsDetails.General.AppIcon.Enum.oldDev
case .OldRelease:
return L10n.SettingsDetails.General.AppIcon.Enum.oldRelease
case .Orange:
return L10n.SettingsDetails.General.AppIcon.Enum.orange
case .Pink:
return L10n.SettingsDetails.General.AppIcon.Enum.pink
case .Purple:
return L10n.SettingsDetails.General.AppIcon.Enum.purple
case .Red:
return L10n.SettingsDetails.General.AppIcon.Enum.red
case .White:
return L10n.SettingsDetails.General.AppIcon.Enum.white
case .OldRelease:
return L10n.SettingsDetails.General.AppIcon.Enum.oldRelease
case .OldBeta:
return L10n.SettingsDetails.General.AppIcon.Enum.oldBeta
case .OldDev:
return L10n.SettingsDetails.General.AppIcon.Enum.oldDev
}
}
}
Expand Down
14 changes: 14 additions & 0 deletions Shared/Resources/Swiftgen/Strings.swift
Original file line number Diff line number Diff line change
Expand Up @@ -1237,10 +1237,22 @@ internal enum L10n {
internal static let black = L10n.tr("Localizable", "settings_details.general.app_icon.enum.black")
/// Blue
internal static let blue = L10n.tr("Localizable", "settings_details.general.app_icon.enum.blue")
/// Caribbean Green
internal static let caribbeanGreen = L10n.tr("Localizable", "settings_details.general.app_icon.enum.caribbean_green")
/// Cornflower Blue
internal static let cornflowerBlue = L10n.tr("Localizable", "settings_details.general.app_icon.enum.cornflower_blue")
/// Crimson
internal static let crimson = L10n.tr("Localizable", "settings_details.general.app_icon.enum.crimson")
/// Dev
internal static let dev = L10n.tr("Localizable", "settings_details.general.app_icon.enum.dev")
/// Electric Violet
internal static let electricViolet = L10n.tr("Localizable", "settings_details.general.app_icon.enum.electric_violet")
/// Fire Orange
internal static let fireOrange = L10n.tr("Localizable", "settings_details.general.app_icon.enum.fire_orange")
/// Green
internal static let green = L10n.tr("Localizable", "settings_details.general.app_icon.enum.green")
/// Home Assistant Blue
internal static let haBlue = L10n.tr("Localizable", "settings_details.general.app_icon.enum.ha_blue")
/// Old Beta
internal static let oldBeta = L10n.tr("Localizable", "settings_details.general.app_icon.enum.old_beta")
/// Old Dev
Expand All @@ -1249,6 +1261,8 @@ internal enum L10n {
internal static let oldRelease = L10n.tr("Localizable", "settings_details.general.app_icon.enum.old_release")
/// Orange
internal static let orange = L10n.tr("Localizable", "settings_details.general.app_icon.enum.orange")
/// Pink
internal static let pink = L10n.tr("Localizable", "settings_details.general.app_icon.enum.pink")
/// Purple
internal static let purple = L10n.tr("Localizable", "settings_details.general.app_icon.enum.purple")
/// Red
Expand Down
4 changes: 2 additions & 2 deletions icons/Alternates/AlternateGenerator.sh
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/bin/bash
for filename in *.png; do
convert "$filename" -resize 120x120 "../../HomeAssistant/Resources/Alternate Icons/${filename%.png}@2x.png"
convert "$filename" -resize 180x180 "../../HomeAssistant/Resources/Alternate Icons/${filename%.png}@3x.png"
sips -Z 120x120 "$filename" --out "../../HomeAssistant/Resources/Alternate Icons/${filename%.png}@2x.png"
sips -Z 180x180 "$filename" --out "../../HomeAssistant/Resources/Alternate Icons/${filename%.png}@3x.png"

echo "<key>${filename%.png}</key>
<dict>
Expand Down

0 comments on commit 0d9fe22

Please sign in to comment.