diff --git a/ios/Ascently.xcodeproj/project.pbxproj b/ios/Ascently.xcodeproj/project.pbxproj index c8e3e43..4212897 100644 --- a/ios/Ascently.xcodeproj/project.pbxproj +++ b/ios/Ascently.xcodeproj/project.pbxproj @@ -460,13 +460,13 @@ D24C19742E75002A0045894C /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { - ASSETCATALOG_COMPILER_ALTERNATE_APPICON_NAMES = "Balls Pride Trans Lesbian Enby Bi Pan"; + ASSETCATALOG_COMPILER_ALTERNATE_APPICON_NAMES = "Balls Pride Trans Lesbian Enby Bi Pan Gay Loss"; ASSETCATALOG_COMPILER_APPICON_NAME = Peaks; ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor; CODE_SIGN_ENTITLEMENTS = Ascently/Ascently.entitlements; CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 48; + CURRENT_PROJECT_VERSION = 49; DEVELOPMENT_TEAM = 4BC9Y2LL4B; DRIVERKIT_DEPLOYMENT_TARGET = 24.6; ENABLE_PREVIEWS = YES; @@ -512,13 +512,13 @@ D24C19752E75002A0045894C /* Release */ = { isa = XCBuildConfiguration; buildSettings = { - ASSETCATALOG_COMPILER_ALTERNATE_APPICON_NAMES = "Balls Pride Trans Lesbian Enby Bi Pan"; + ASSETCATALOG_COMPILER_ALTERNATE_APPICON_NAMES = "Balls Pride Trans Lesbian Enby Bi Pan Gay Loss"; ASSETCATALOG_COMPILER_APPICON_NAME = Peaks; ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor; CODE_SIGN_ENTITLEMENTS = Ascently/Ascently.entitlements; CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 48; + CURRENT_PROJECT_VERSION = 49; DEVELOPMENT_TEAM = 4BC9Y2LL4B; DRIVERKIT_DEPLOYMENT_TARGET = 24.6; ENABLE_PREVIEWS = YES; @@ -610,7 +610,7 @@ ASSETCATALOG_COMPILER_WIDGET_BACKGROUND_COLOR_NAME = WidgetBackground; CODE_SIGN_ENTITLEMENTS = SessionStatusLiveExtension.entitlements; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 48; + CURRENT_PROJECT_VERSION = 49; DEVELOPMENT_TEAM = 4BC9Y2LL4B; GENERATE_INFOPLIST_FILE = YES; INFOPLIST_FILE = SessionStatusLive/Info.plist; @@ -641,7 +641,7 @@ ASSETCATALOG_COMPILER_WIDGET_BACKGROUND_COLOR_NAME = WidgetBackground; CODE_SIGN_ENTITLEMENTS = SessionStatusLiveExtension.entitlements; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 48; + CURRENT_PROJECT_VERSION = 49; DEVELOPMENT_TEAM = 4BC9Y2LL4B; GENERATE_INFOPLIST_FILE = YES; INFOPLIST_FILE = SessionStatusLive/Info.plist; 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 eb6392d..6bcc91a 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/Gay.icon/Assets/AscentlyGayBlue.png b/ios/Ascently/Gay.icon/Assets/AscentlyGayBlue.png new file mode 100644 index 0000000..58703be Binary files /dev/null and b/ios/Ascently/Gay.icon/Assets/AscentlyGayBlue.png differ diff --git a/ios/Ascently/Gay.icon/Assets/AscentlyGayDarkBlue.png b/ios/Ascently/Gay.icon/Assets/AscentlyGayDarkBlue.png new file mode 100644 index 0000000..0d4c357 Binary files /dev/null and b/ios/Ascently/Gay.icon/Assets/AscentlyGayDarkBlue.png differ diff --git a/ios/Ascently/Gay.icon/Assets/AscentlyGayDarkGreen.png b/ios/Ascently/Gay.icon/Assets/AscentlyGayDarkGreen.png new file mode 100644 index 0000000..cd765ee Binary files /dev/null and b/ios/Ascently/Gay.icon/Assets/AscentlyGayDarkGreen.png differ diff --git a/ios/Ascently/Gay.icon/Assets/AscentlyGayGreen.png b/ios/Ascently/Gay.icon/Assets/AscentlyGayGreen.png new file mode 100644 index 0000000..21a5679 Binary files /dev/null and b/ios/Ascently/Gay.icon/Assets/AscentlyGayGreen.png differ diff --git a/ios/Ascently/Gay.icon/Assets/AscentlyGayLightBlue.png b/ios/Ascently/Gay.icon/Assets/AscentlyGayLightBlue.png new file mode 100644 index 0000000..b3ad8ae Binary files /dev/null and b/ios/Ascently/Gay.icon/Assets/AscentlyGayLightBlue.png differ diff --git a/ios/Ascently/Gay.icon/Assets/AscentlyGayLightGreen.png b/ios/Ascently/Gay.icon/Assets/AscentlyGayLightGreen.png new file mode 100644 index 0000000..d215033 Binary files /dev/null and b/ios/Ascently/Gay.icon/Assets/AscentlyGayLightGreen.png differ diff --git a/ios/Ascently/Gay.icon/Assets/AscentlyGayWhite.png b/ios/Ascently/Gay.icon/Assets/AscentlyGayWhite.png new file mode 100644 index 0000000..88d7e8d Binary files /dev/null and b/ios/Ascently/Gay.icon/Assets/AscentlyGayWhite.png differ diff --git a/ios/Ascently/Gay.icon/icon.json b/ios/Ascently/Gay.icon/icon.json new file mode 100644 index 0000000..fe64a95 --- /dev/null +++ b/ios/Ascently/Gay.icon/icon.json @@ -0,0 +1,100 @@ +{ + "fill" : "automatic", + "groups" : [ + { + "layers" : [ + { + "image-name" : "AscentlyGayDarkBlue.png", + "name" : "AscentlyGayDarkBlue", + "position" : { + "scale" : 0.1, + "translation-in-points" : [ + 310.3109038708518, + 268.51915188743055 + ] + } + }, + { + "image-name" : "AscentlyGayBlue.png", + "name" : "AscentlyGayBlue", + "position" : { + "scale" : 0.2, + "translation-in-points" : [ + 256.74709727330895, + 223.14027483654624 + ] + } + }, + { + "image-name" : "AscentlyGayLightBlue.png", + "name" : "AscentlyGayLightBlue", + "position" : { + "scale" : 0.3, + "translation-in-points" : [ + 205.90293882922413, + 178.6755090412264 + ] + } + }, + { + "image-name" : "AscentlyGayWhite.png", + "name" : "AscentlyGayWhite", + "position" : { + "scale" : 0.4, + "translation-in-points" : [ + 155.16481082482767, + 134.12218495264162 + ] + } + }, + { + "image-name" : "AscentlyGayLightGreen.png", + "name" : "AscentlyGayLightGreen", + "position" : { + "scale" : 0.5, + "translation-in-points" : [ + 103.05243597030815, + 88.66555310378573 + ] + } + }, + { + "image-name" : "AscentlyGayGreen.png", + "name" : "AscentlyGayGreen", + "position" : { + "scale" : 0.6, + "translation-in-points" : [ + 52.23658982195185, + 44.839904477203575 + ] + } + }, + { + "image-name" : "AscentlyGayDarkGreen.png", + "name" : "AscentlyGayDarkGreen", + "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/Loss.icon/Assets/AscetlyTriangle1.png b/ios/Ascently/Loss.icon/Assets/AscetlyTriangle1.png new file mode 100644 index 0000000..8e11486 Binary files /dev/null and b/ios/Ascently/Loss.icon/Assets/AscetlyTriangle1.png differ diff --git a/ios/Ascently/Loss.icon/Assets/AscetlyTriangle2 2.png b/ios/Ascently/Loss.icon/Assets/AscetlyTriangle2 2.png new file mode 100644 index 0000000..2be7e73 Binary files /dev/null and b/ios/Ascently/Loss.icon/Assets/AscetlyTriangle2 2.png differ diff --git a/ios/Ascently/Loss.icon/Assets/AscetlyTriangle2.png b/ios/Ascently/Loss.icon/Assets/AscetlyTriangle2.png new file mode 100644 index 0000000..76af92d Binary files /dev/null and b/ios/Ascently/Loss.icon/Assets/AscetlyTriangle2.png differ diff --git a/ios/Ascently/Loss.icon/icon.json b/ios/Ascently/Loss.icon/icon.json new file mode 100644 index 0000000..beb733f --- /dev/null +++ b/ios/Ascently/Loss.icon/icon.json @@ -0,0 +1,100 @@ +{ + "fill" : "automatic", + "groups" : [ + { + "layers" : [ + { + "image-name" : "AscetlyTriangle1.png", + "name" : "AscetlyTriangle1", + "position" : { + "scale" : 0.3, + "translation-in-points" : [ + -233.3046875, + -226.703125 + ] + } + }, + { + "image-name" : "AscetlyTriangle2.png", + "name" : "AscetlyTriangle2", + "position" : { + "scale" : 0.3, + "translation-in-points" : [ + 229.078125, + -225.5234375 + ] + } + }, + { + "image-name" : "AscetlyTriangle1.png", + "name" : "AscetlyTriangle1", + "position" : { + "scale" : 0.2, + "translation-in-points" : [ + 109.82172229457004, + -188.45752746110693 + ] + } + }, + { + "image-name" : "AscetlyTriangle2.png", + "name" : "AscetlyTriangle2", + "position" : { + "scale" : 0.3, + "translation-in-points" : [ + -175.51648415989322, + 187.17564929470825 + ] + } + }, + { + "image-name" : "AscetlyTriangle1.png", + "name" : "AscetlyTriangle1", + "position" : { + "scale" : 0.3, + "translation-in-points" : [ + -282.9895849116331, + 187.65385356072886 + ] + } + }, + { + "image-name" : "AscetlyTriangle2 2.png", + "name" : "AscetlyTriangle2 2", + "position" : { + "scale" : 0.2, + "translation-in-points" : [ + 279.27255440242436, + 292.15535460179336 + ] + } + }, + { + "image-name" : "AscetlyTriangle1.png", + "name" : "AscetlyTriangle1", + "position" : { + "scale" : 0.3, + "translation-in-points" : [ + 196.03206587241937, + 183.14521924511502 + ] + } + } + ], + "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/Views/SettingsView.swift b/ios/Ascently/Views/SettingsView.swift index 9c52637..7fd4543 100644 --- a/ios/Ascently/Views/SettingsView.swift +++ b/ios/Ascently/Views/SettingsView.swift @@ -204,6 +204,20 @@ struct AppIconSection: View { } } + Button(action: { + setIcon("Loss") + }) { + HStack { + Text("Loss") + .foregroundColor(.primary) + Spacer() + if currentIcon == "Loss" { + Image(systemName: "checkmark") + .foregroundColor(.primary) + } + } + } + Button(action: { setIcon("Pride") }) { @@ -287,6 +301,20 @@ struct AppIconSection: View { } } } + + Button(action: { + setIcon("Gay") + }) { + HStack { + Text("Gay Pride") + .foregroundColor(.primary) + Spacer() + if currentIcon == "Gay" { + Image(systemName: "checkmark") + .foregroundColor(.primary) + } + } + } } .onAppear { currentIcon = UIApplication.shared.alternateIconName