diff --git a/Ruddarr.xcodeproj/project.pbxproj b/Ruddarr.xcodeproj/project.pbxproj index 32194856..bde1ae71 100644 --- a/Ruddarr.xcodeproj/project.pbxproj +++ b/Ruddarr.xcodeproj/project.pbxproj @@ -92,6 +92,7 @@ BB54D0282E90932400F5CF42 /* AppIconPlex.icon in Resources */ = {isa = PBXBuildFile; fileRef = BB54D01F2E90932400F5CF42 /* AppIconPlex.icon */; }; BB54D0292E90932400F5CF42 /* AppIconPodcasts.icon in Resources */ = {isa = PBXBuildFile; fileRef = BB54D0202E90932400F5CF42 /* AppIconPodcasts.icon */; }; BB54D02A2E90932400F5CF42 /* AppIconWarp.icon in Resources */ = {isa = PBXBuildFile; fileRef = BB54D0212E90932400F5CF42 /* AppIconWarp.icon */; }; + BB54D02B2E90932400F5CF42 /* AppIconOriginal.icon in Resources */ = {isa = PBXBuildFile; fileRef = BB54D02C2E90932400F5CF42 /* AppIconOriginal.icon */; }; BB581D1A2BA0ED5E0070DFFC /* CalendarView.swift in Sources */ = {isa = PBXBuildFile; fileRef = BB581D192BA0ED5E0070DFFC /* CalendarView.swift */; }; BB585E892BF55EF400A9AF25 /* EpisodeContextMenu.swift in Sources */ = {isa = PBXBuildFile; fileRef = BB585E882BF55EF400A9AF25 /* EpisodeContextMenu.swift */; }; BB63E1F02C17DE1A00BCCA94 /* Intents.swift in Sources */ = {isa = PBXBuildFile; fileRef = BB63E1EF2C17DE1A00BCCA94 /* Intents.swift */; }; @@ -346,6 +347,7 @@ BB54D01F2E90932400F5CF42 /* AppIconPlex.icon */ = {isa = PBXFileReference; lastKnownFileType = folder.iconcomposer.icon; path = AppIconPlex.icon; sourceTree = ""; }; BB54D0202E90932400F5CF42 /* AppIconPodcasts.icon */ = {isa = PBXFileReference; lastKnownFileType = folder.iconcomposer.icon; path = AppIconPodcasts.icon; sourceTree = ""; }; BB54D0212E90932400F5CF42 /* AppIconWarp.icon */ = {isa = PBXFileReference; lastKnownFileType = folder.iconcomposer.icon; path = AppIconWarp.icon; sourceTree = ""; }; + BB54D02C2E90932400F5CF42 /* AppIconOriginal.icon */ = {isa = PBXFileReference; lastKnownFileType = folder.iconcomposer.icon; path = AppIconOriginal.icon; sourceTree = ""; }; BB581D192BA0ED5E0070DFFC /* CalendarView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CalendarView.swift; sourceTree = ""; }; BB585E882BF55EF400A9AF25 /* EpisodeContextMenu.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EpisodeContextMenu.swift; sourceTree = ""; }; BB63E1EF2C17DE1A00BCCA94 /* Intents.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Intents.swift; sourceTree = ""; }; @@ -684,6 +686,7 @@ isa = PBXGroup; children = ( BB54D01A2E90932400F5CF42 /* AppIcon.icon */, + BB54D02C2E90932400F5CF42 /* AppIconOriginal.icon */, BB54D01B2E90932400F5CF42 /* AppIconBarbie.icon */, BB54D01C2E90932400F5CF42 /* AppIconBooks.icon */, BB54D01D2E90932400F5CF42 /* AppIconMono.icon */, @@ -1168,6 +1171,7 @@ BBA06B592F47D4B600A5F9B4 /* popular-movies.json in Resources */, BBD3F2D42BFA520700DE5D8E /* series-episode-history.json in Resources */, BB54D0232E90932400F5CF42 /* AppIcon.icon in Resources */, + BB54D02B2E90932400F5CF42 /* AppIconOriginal.icon in Resources */, BB54D0242E90932400F5CF42 /* AppIconBarbie.icon in Resources */, BB54D0252E90932400F5CF42 /* AppIconBooks.icon in Resources */, BB54D0262E90932400F5CF42 /* AppIconMono.icon in Resources */, diff --git a/Ruddarr/Assets.xcassets/AppIcons/Previews/AppIconPreviewDefault.imageset/ruddarr-icon.png b/Ruddarr/Assets.xcassets/AppIcons/Previews/AppIconPreviewDefault.imageset/ruddarr-icon.png index 2a82a4ef..80587627 100644 Binary files a/Ruddarr/Assets.xcassets/AppIcons/Previews/AppIconPreviewDefault.imageset/ruddarr-icon.png and b/Ruddarr/Assets.xcassets/AppIcons/Previews/AppIconPreviewDefault.imageset/ruddarr-icon.png differ diff --git a/Ruddarr/Assets.xcassets/AppIcons/Previews/AppIconPreviewOriginal.imageset/Contents.json b/Ruddarr/Assets.xcassets/AppIcons/Previews/AppIconPreviewOriginal.imageset/Contents.json new file mode 100644 index 00000000..a9b34d71 --- /dev/null +++ b/Ruddarr/Assets.xcassets/AppIcons/Previews/AppIconPreviewOriginal.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "filename" : "ruddarr-icon.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Ruddarr/Assets.xcassets/AppIcons/Previews/AppIconPreviewOriginal.imageset/ruddarr-icon.png b/Ruddarr/Assets.xcassets/AppIcons/Previews/AppIconPreviewOriginal.imageset/ruddarr-icon.png new file mode 100644 index 00000000..2a82a4ef Binary files /dev/null and b/Ruddarr/Assets.xcassets/AppIcons/Previews/AppIconPreviewOriginal.imageset/ruddarr-icon.png differ diff --git a/Ruddarr/Icons/AppIcon.icon/Assets/icon_transparent.png b/Ruddarr/Icons/AppIcon.icon/Assets/icon_transparent.png new file mode 100644 index 00000000..0bb4538e Binary files /dev/null and b/Ruddarr/Icons/AppIcon.icon/Assets/icon_transparent.png differ diff --git a/Ruddarr/Icons/AppIcon.icon/icon.json b/Ruddarr/Icons/AppIcon.icon/icon.json index d8efcd51..89aeb04b 100644 --- a/Ruddarr/Icons/AppIcon.icon/icon.json +++ b/Ruddarr/Icons/AppIcon.icon/icon.json @@ -4,33 +4,21 @@ }, "groups" : [ { - "hidden" : false, "layers" : [ { - "fill" : { - "solid" : "srgb:1.00000,1.00000,1.00000,1.00000" - }, - "glass" : true, - "hidden" : false, - "image-name" : "shape.svg", - "name" : "Shape", - "position" : { - "scale" : 2.1, - "translation-in-points" : [ - -9, - 12 - ] - } + "blend-mode" : "normal", + "glass" : false, + "image-name" : "icon_transparent.png", + "name" : "icon_transparent", + "opacity" : 1 } ], - "lighting" : "individual", "shadow" : { "kind" : "neutral", "opacity" : 0.5 }, - "specular" : true, "translucency" : { - "enabled" : false, + "enabled" : true, "value" : 0.5 } } diff --git a/Ruddarr/Icons/AppIcon.icon/Assets/shape.svg b/Ruddarr/Icons/AppIconOriginal.icon/Assets/shape.svg similarity index 100% rename from Ruddarr/Icons/AppIcon.icon/Assets/shape.svg rename to Ruddarr/Icons/AppIconOriginal.icon/Assets/shape.svg diff --git a/Ruddarr/Icons/AppIconOriginal.icon/icon.json b/Ruddarr/Icons/AppIconOriginal.icon/icon.json new file mode 100644 index 00000000..d8efcd51 --- /dev/null +++ b/Ruddarr/Icons/AppIconOriginal.icon/icon.json @@ -0,0 +1,44 @@ +{ + "fill" : { + "automatic-gradient" : "extended-srgb:0.00000,0.53333,1.00000,1.00000" + }, + "groups" : [ + { + "hidden" : false, + "layers" : [ + { + "fill" : { + "solid" : "srgb:1.00000,1.00000,1.00000,1.00000" + }, + "glass" : true, + "hidden" : false, + "image-name" : "shape.svg", + "name" : "Shape", + "position" : { + "scale" : 2.1, + "translation-in-points" : [ + -9, + 12 + ] + } + } + ], + "lighting" : "individual", + "shadow" : { + "kind" : "neutral", + "opacity" : 0.5 + }, + "specular" : true, + "translucency" : { + "enabled" : false, + "value" : 0.5 + } + } + ], + "supported-platforms" : { + "circles" : [ + "watchOS" + ], + "squares" : "shared" + } +} \ No newline at end of file diff --git a/Ruddarr/Services/Theme.swift b/Ruddarr/Services/Theme.swift index 41032b97..74233624 100644 --- a/Ruddarr/Services/Theme.swift +++ b/Ruddarr/Services/Theme.swift @@ -96,6 +96,7 @@ enum Appearance: String, Identifiable, CaseIterable { enum AppIcon: String, Identifiable, CaseIterable { case factory + case original case books case podcasts case music @@ -111,6 +112,7 @@ enum AppIcon: String, Identifiable, CaseIterable { var data: AppIconData { switch self { case .factory: AppIconData.factory + case .original: AppIconData.original case .music: AppIconData.music case .podcasts: AppIconData.podcasts case .books: AppIconData.books @@ -149,6 +151,10 @@ struct AppIconData { .init(label: String(localized: "Default", comment: "Default app icon name"), asset: "Default", locked: false) } + static var original: Self { + .init(label: String(localized: "Original", comment: "Original app icon name"), asset: "Original", locked: false) + } + static var podcasts: Self { .init(label: String(localized: "Podcasts"), asset: "Podcasts", locked: false) }