diff --git a/ios/Ascently.xcodeproj/project.pbxproj b/ios/Ascently.xcodeproj/project.pbxproj index 26c39fb..c8e3e43 100644 --- a/ios/Ascently.xcodeproj/project.pbxproj +++ b/ios/Ascently.xcodeproj/project.pbxproj @@ -460,8 +460,8 @@ D24C19742E75002A0045894C /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { - ASSETCATALOG_COMPILER_ALTERNATE_APPICON_NAMES = "Balls Pride Trans Lesbian Enby Bi"; - ASSETCATALOG_COMPILER_APPICON_NAME = Icon; + ASSETCATALOG_COMPILER_ALTERNATE_APPICON_NAMES = "Balls Pride Trans Lesbian Enby Bi Pan"; + ASSETCATALOG_COMPILER_APPICON_NAME = Peaks; ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor; CODE_SIGN_ENTITLEMENTS = Ascently/Ascently.entitlements; CODE_SIGN_IDENTITY = "Apple Development"; @@ -512,8 +512,8 @@ D24C19752E75002A0045894C /* Release */ = { isa = XCBuildConfiguration; buildSettings = { - ASSETCATALOG_COMPILER_ALTERNATE_APPICON_NAMES = "Balls Pride Trans Lesbian Enby Bi"; - ASSETCATALOG_COMPILER_APPICON_NAME = Icon; + ASSETCATALOG_COMPILER_ALTERNATE_APPICON_NAMES = "Balls Pride Trans Lesbian Enby Bi Pan"; + ASSETCATALOG_COMPILER_APPICON_NAME = Peaks; ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor; CODE_SIGN_ENTITLEMENTS = Ascently/Ascently.entitlements; CODE_SIGN_IDENTITY = "Apple Development"; diff --git a/ios/Ascently.xcodeproj/project.xcworkspace/xcuserdata/atridad.xcuserdatad/UserInterfaceState.xcuserstate b/ios/Ascently.xcodeproj/project.xcworkspace/xcuserdata/atridad.xcuserdatad/UserInterfaceState.xcuserstate index 0cd5b44..eb6392d 100644 Binary files a/ios/Ascently.xcodeproj/project.xcworkspace/xcuserdata/atridad.xcuserdatad/UserInterfaceState.xcuserstate and b/ios/Ascently.xcodeproj/project.xcworkspace/xcuserdata/atridad.xcuserdatad/UserInterfaceState.xcuserstate differ diff --git a/ios/Ascently/Enby.icon/icon.json b/ios/Ascently/Enby.icon/icon.json index a01524e..7874348 100644 --- a/ios/Ascently/Enby.icon/icon.json +++ b/ios/Ascently/Enby.icon/icon.json @@ -4,10 +4,13 @@ { "layers" : [ { + "blend-mode" : "normal", + "glass" : true, + "hidden" : false, "image-name" : "AscentlyEnbyYellow.png", "name" : "AscentlyEnbyYellow", "position" : { - "scale" : 0.15, + "scale" : 0.2, "translation-in-points" : [ 2.17046922693007, 57.25015517558532 @@ -15,10 +18,11 @@ } }, { + "blend-mode" : "normal", "image-name" : "AscentlyEnbyWhite.png", "name" : "AscentlyEnbyWhite", "position" : { - "scale" : 0.35, + "scale" : 0.4, "translation-in-points" : [ 3.5797767879914275, 39.45555690497569 @@ -26,6 +30,7 @@ } }, { + "blend-mode" : "normal", "image-name" : "AscentlyEnbyPurple.png", "name" : "AscentlyEnbyPurple", "position" : { @@ -37,6 +42,7 @@ } }, { + "blend-mode" : "normal", "image-name" : "AscentlyEnbyBlack.png", "name" : "AscentlyEnbyBlack", "position" : { diff --git a/ios/Ascently/Pan.icon/Assets/AscentlyPanBlue.png b/ios/Ascently/Pan.icon/Assets/AscentlyPanBlue.png new file mode 100644 index 0000000..ba10575 Binary files /dev/null and b/ios/Ascently/Pan.icon/Assets/AscentlyPanBlue.png differ diff --git a/ios/Ascently/Pan.icon/Assets/AscentlyPanPink.png b/ios/Ascently/Pan.icon/Assets/AscentlyPanPink.png new file mode 100644 index 0000000..d027607 Binary files /dev/null and b/ios/Ascently/Pan.icon/Assets/AscentlyPanPink.png differ diff --git a/ios/Ascently/Pan.icon/Assets/AscentlyPanYellow.png b/ios/Ascently/Pan.icon/Assets/AscentlyPanYellow.png new file mode 100644 index 0000000..e2eed97 Binary files /dev/null and b/ios/Ascently/Pan.icon/Assets/AscentlyPanYellow.png differ diff --git a/ios/Ascently/Pan.icon/icon.json b/ios/Ascently/Pan.icon/icon.json new file mode 100644 index 0000000..9d8af75 --- /dev/null +++ b/ios/Ascently/Pan.icon/icon.json @@ -0,0 +1,56 @@ +{ + "fill" : "automatic", + "groups" : [ + { + "layers" : [ + { + "image-name" : "AscentlyPanBlue.png", + "name" : "AscentlyPanBlue", + "position" : { + "scale" : 0.5, + "translation-in-points" : [ + 104.70996037782118, + 90.85744041806392 + ] + } + }, + { + "image-name" : "AscentlyPanYellow.png", + "name" : "AscentlyPanYellow", + "position" : { + "scale" : 0.6, + "translation-in-points" : [ + 52.60885224890252, + 46.29197733709991 + ] + } + }, + { + "image-name" : "AscentlyPanPink.png", + "name" : "AscentlyPanPink", + "position" : { + "scale" : 0.7, + "translation-in-points" : [ + 0, + 0 + ] + } + } + ], + "shadow" : { + "kind" : "neutral", + "opacity" : 0.5 + }, + "translucency" : { + "enabled" : true, + "value" : 0.5 + } + } + ], + "supported-platforms" : { + "circles" : [ + "watchOS" + ], + "squares" : "shared" + } +} \ No newline at end of file diff --git a/ios/Ascently/Icon.icon/Assets/AscetlyTriangle1.png b/ios/Ascently/Peaks.icon/Assets/AscetlyTriangle1.png similarity index 100% rename from ios/Ascently/Icon.icon/Assets/AscetlyTriangle1.png rename to ios/Ascently/Peaks.icon/Assets/AscetlyTriangle1.png diff --git a/ios/Ascently/Icon.icon/Assets/AscetlyTriangle2.png b/ios/Ascently/Peaks.icon/Assets/AscetlyTriangle2.png similarity index 100% rename from ios/Ascently/Icon.icon/Assets/AscetlyTriangle2.png rename to ios/Ascently/Peaks.icon/Assets/AscetlyTriangle2.png diff --git a/ios/Ascently/Icon.icon/icon.json b/ios/Ascently/Peaks.icon/icon.json similarity index 100% rename from ios/Ascently/Icon.icon/icon.json rename to ios/Ascently/Peaks.icon/icon.json diff --git a/ios/Ascently/Views/SettingsView.swift b/ios/Ascently/Views/SettingsView.swift index 672cc39..9c52637 100644 --- a/ios/Ascently/Views/SettingsView.swift +++ b/ios/Ascently/Views/SettingsView.swift @@ -273,6 +273,20 @@ struct AppIconSection: View { } } } + + Button(action: { + setIcon("Pan") + }) { + HStack { + Text("Pansexual Pride") + .foregroundColor(.primary) + Spacer() + if currentIcon == "Pan" { + Image(systemName: "checkmark") + .foregroundColor(.primary) + } + } + } } .onAppear { currentIcon = UIApplication.shared.alternateIconName