diff --git a/ios/Ascently.xcodeproj/project.pbxproj b/ios/Ascently.xcodeproj/project.pbxproj index 8238c67..55fa71e 100644 --- a/ios/Ascently.xcodeproj/project.pbxproj +++ b/ios/Ascently.xcodeproj/project.pbxproj @@ -460,7 +460,7 @@ D24C19742E75002A0045894C /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { - ASSETCATALOG_COMPILER_ALTERNATE_APPICON_NAMES = Balls; + ASSETCATALOG_COMPILER_ALTERNATE_APPICON_NAMES = "Balls Pride Trans Lesbian Enby Bi"; ASSETCATALOG_COMPILER_APPICON_NAME = Icon; ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor; CODE_SIGN_ENTITLEMENTS = Ascently/Ascently.entitlements; @@ -512,7 +512,7 @@ D24C19752E75002A0045894C /* Release */ = { isa = XCBuildConfiguration; buildSettings = { - ASSETCATALOG_COMPILER_ALTERNATE_APPICON_NAMES = Balls; + ASSETCATALOG_COMPILER_ALTERNATE_APPICON_NAMES = "Balls Pride Trans Lesbian Enby Bi"; ASSETCATALOG_COMPILER_APPICON_NAME = Icon; ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor; CODE_SIGN_ENTITLEMENTS = Ascently/Ascently.entitlements; 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 79778eb..c4856d1 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/Bi.icon/Assets/AscentlyBiBlue.png b/ios/Ascently/Bi.icon/Assets/AscentlyBiBlue.png new file mode 100644 index 0000000..de90734 Binary files /dev/null and b/ios/Ascently/Bi.icon/Assets/AscentlyBiBlue.png differ diff --git a/ios/Ascently/Bi.icon/Assets/AscentlyBiPink.png b/ios/Ascently/Bi.icon/Assets/AscentlyBiPink.png new file mode 100644 index 0000000..03013ad Binary files /dev/null and b/ios/Ascently/Bi.icon/Assets/AscentlyBiPink.png differ diff --git a/ios/Ascently/Bi.icon/Assets/AscentlyBiPurple.png b/ios/Ascently/Bi.icon/Assets/AscentlyBiPurple.png new file mode 100644 index 0000000..d2a678e Binary files /dev/null and b/ios/Ascently/Bi.icon/Assets/AscentlyBiPurple.png differ diff --git a/ios/Ascently/Bi.icon/icon.json b/ios/Ascently/Bi.icon/icon.json new file mode 100644 index 0000000..8af6be3 --- /dev/null +++ b/ios/Ascently/Bi.icon/icon.json @@ -0,0 +1,56 @@ +{ + "fill" : "automatic", + "groups" : [ + { + "layers" : [ + { + "image-name" : "AscentlyBiBlue.png", + "name" : "AscentlyBiBlue", + "position" : { + "scale" : 0.5, + "translation-in-points" : [ + 103.3033720318974, + 89.61597895201449 + ] + } + }, + { + "image-name" : "AscentlyBiPurple.png", + "name" : "AscentlyBiPurple", + "position" : { + "scale" : 0.6, + "translation-in-points" : [ + 52.22951746701784, + 44.45130454558263 + ] + } + }, + { + "image-name" : "AscentlyBiPink.png", + "name" : "AscentlyBiPink", + "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/Enby.icon/Assets/AscentlyEnbyBlack.png b/ios/Ascently/Enby.icon/Assets/AscentlyEnbyBlack.png new file mode 100644 index 0000000..8e370ca Binary files /dev/null and b/ios/Ascently/Enby.icon/Assets/AscentlyEnbyBlack.png differ diff --git a/ios/Ascently/Enby.icon/Assets/AscentlyEnbyPurple.png b/ios/Ascently/Enby.icon/Assets/AscentlyEnbyPurple.png new file mode 100644 index 0000000..3ce2f6f Binary files /dev/null and b/ios/Ascently/Enby.icon/Assets/AscentlyEnbyPurple.png differ diff --git a/ios/Ascently/Enby.icon/Assets/AscentlyEnbyWhite.png b/ios/Ascently/Enby.icon/Assets/AscentlyEnbyWhite.png new file mode 100644 index 0000000..1862e63 Binary files /dev/null and b/ios/Ascently/Enby.icon/Assets/AscentlyEnbyWhite.png differ diff --git a/ios/Ascently/Enby.icon/Assets/AscentlyEnbyYellow.png b/ios/Ascently/Enby.icon/Assets/AscentlyEnbyYellow.png new file mode 100644 index 0000000..a18a1c1 Binary files /dev/null and b/ios/Ascently/Enby.icon/Assets/AscentlyEnbyYellow.png differ diff --git a/ios/Ascently/Enby.icon/icon.json b/ios/Ascently/Enby.icon/icon.json new file mode 100644 index 0000000..3eb38b1 --- /dev/null +++ b/ios/Ascently/Enby.icon/icon.json @@ -0,0 +1,67 @@ +{ + "fill" : "automatic", + "groups" : [ + { + "layers" : [ + { + "image-name" : "AscentlyEnbyYellow.png", + "name" : "AscentlyEnbyYellow", + "position" : { + "scale" : 0.4, + "translation-in-points" : [ + 2.17046922693007, + 57.25015517558532 + ] + } + }, + { + "image-name" : "AscentlyEnbyWhite.png", + "name" : "AscentlyEnbyWhite", + "position" : { + "scale" : 0.5, + "translation-in-points" : [ + 3.5797767879914275, + 39.45555690497569 + ] + } + }, + { + "image-name" : "AscentlyEnbyPurple.png", + "name" : "AscentlyEnbyPurple", + "position" : { + "scale" : 0.6, + "translation-in-points" : [ + 1.2888098929849576, + 20.660262557762508 + ] + } + }, + { + "image-name" : "AscentlyEnbyBlack.png", + "name" : "AscentlyEnbyBlack", + "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/Lesbian.icon/Assets/AscentlyLesbianDarkOrange.png b/ios/Ascently/Lesbian.icon/Assets/AscentlyLesbianDarkOrange.png new file mode 100644 index 0000000..6405dab Binary files /dev/null and b/ios/Ascently/Lesbian.icon/Assets/AscentlyLesbianDarkOrange.png differ diff --git a/ios/Ascently/Lesbian.icon/Assets/AscentlyLesbianDarkRose.png b/ios/Ascently/Lesbian.icon/Assets/AscentlyLesbianDarkRose.png new file mode 100644 index 0000000..8caf39a Binary files /dev/null and b/ios/Ascently/Lesbian.icon/Assets/AscentlyLesbianDarkRose.png differ diff --git a/ios/Ascently/Lesbian.icon/Assets/AscentlyLesbianDustyPink.png b/ios/Ascently/Lesbian.icon/Assets/AscentlyLesbianDustyPink.png new file mode 100644 index 0000000..51593b9 Binary files /dev/null and b/ios/Ascently/Lesbian.icon/Assets/AscentlyLesbianDustyPink.png differ diff --git a/ios/Ascently/Lesbian.icon/Assets/AscentlyLesbianLightOrange.png b/ios/Ascently/Lesbian.icon/Assets/AscentlyLesbianLightOrange.png new file mode 100644 index 0000000..1f3efcd Binary files /dev/null and b/ios/Ascently/Lesbian.icon/Assets/AscentlyLesbianLightOrange.png differ diff --git a/ios/Ascently/Lesbian.icon/Assets/AscentlyLesbianOrange.png b/ios/Ascently/Lesbian.icon/Assets/AscentlyLesbianOrange.png new file mode 100644 index 0000000..7bf1fcc Binary files /dev/null and b/ios/Ascently/Lesbian.icon/Assets/AscentlyLesbianOrange.png differ diff --git a/ios/Ascently/Lesbian.icon/Assets/AscentlyLesbianPink.png b/ios/Ascently/Lesbian.icon/Assets/AscentlyLesbianPink.png new file mode 100644 index 0000000..4c8b303 Binary files /dev/null and b/ios/Ascently/Lesbian.icon/Assets/AscentlyLesbianPink.png differ diff --git a/ios/Ascently/Lesbian.icon/icon.json b/ios/Ascently/Lesbian.icon/icon.json new file mode 100644 index 0000000..6445542 --- /dev/null +++ b/ios/Ascently/Lesbian.icon/icon.json @@ -0,0 +1,95 @@ +{ + "fill" : "automatic", + "groups" : [ + { + "layers" : [ + { + "blend-mode" : "normal", + "image-name" : "AscentlyLesbianDarkRose.png", + "name" : "AscentlyLesbianDarkRose", + "position" : { + "scale" : 0.2, + "translation-in-points" : [ + -262.1182952725325, + 223.6381362543554 + ] + } + }, + { + "blend-mode" : "normal", + "image-name" : "AscentlyLesbianDustyPink.png", + "name" : "AscentlyLesbianDustyPink", + "position" : { + "scale" : 0.3, + "translation-in-points" : [ + -209.7587555742847, + 179.5733935018924 + ] + } + }, + { + "blend-mode" : "normal", + "image-name" : "AscentlyLesbianPink.png", + "name" : "AscentlyLesbianPink", + "position" : { + "scale" : 0.4, + "translation-in-points" : [ + -158.0346362340688, + 135.83476297272654 + ] + } + }, + { + "blend-mode" : "normal", + "image-name" : "AscentlyLesbianLightOrange.png", + "name" : "AscentlyLesbianLightOrange", + "position" : { + "scale" : 0.5, + "translation-in-points" : [ + -106.63948555089338, + 90.22853679410112 + ] + } + }, + { + "blend-mode" : "normal", + "image-name" : "AscentlyLesbianOrange.png", + "name" : "AscentlyLesbianOrange", + "position" : { + "scale" : 0.6, + "translation-in-points" : [ + -53.734375, + 45.125 + ] + } + }, + { + "blend-mode" : "normal", + "image-name" : "AscentlyLesbianDarkOrange.png", + "name" : "AscentlyLesbianDarkOrange", + "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/Pride.icon/Assets/AscentlyPrideBlue.png b/ios/Ascently/Pride.icon/Assets/AscentlyPrideBlue.png new file mode 100644 index 0000000..54c929e Binary files /dev/null and b/ios/Ascently/Pride.icon/Assets/AscentlyPrideBlue.png differ diff --git a/ios/Ascently/Pride.icon/Assets/AscentlyPrideGreen.png b/ios/Ascently/Pride.icon/Assets/AscentlyPrideGreen.png new file mode 100644 index 0000000..bc06656 Binary files /dev/null and b/ios/Ascently/Pride.icon/Assets/AscentlyPrideGreen.png differ diff --git a/ios/Ascently/Pride.icon/Assets/AscentlyPrideOrange.png b/ios/Ascently/Pride.icon/Assets/AscentlyPrideOrange.png new file mode 100644 index 0000000..4a5d6ba Binary files /dev/null and b/ios/Ascently/Pride.icon/Assets/AscentlyPrideOrange.png differ diff --git a/ios/Ascently/Pride.icon/Assets/AscentlyPridePurple.png b/ios/Ascently/Pride.icon/Assets/AscentlyPridePurple.png new file mode 100644 index 0000000..96f0867 Binary files /dev/null and b/ios/Ascently/Pride.icon/Assets/AscentlyPridePurple.png differ diff --git a/ios/Ascently/Pride.icon/Assets/AscentlyPrideRed.png b/ios/Ascently/Pride.icon/Assets/AscentlyPrideRed.png new file mode 100644 index 0000000..5a95f93 Binary files /dev/null and b/ios/Ascently/Pride.icon/Assets/AscentlyPrideRed.png differ diff --git a/ios/Ascently/Pride.icon/Assets/AscentlyPrideYellow.png b/ios/Ascently/Pride.icon/Assets/AscentlyPrideYellow.png new file mode 100644 index 0000000..7388a32 Binary files /dev/null and b/ios/Ascently/Pride.icon/Assets/AscentlyPrideYellow.png differ diff --git a/ios/Ascently/Pride.icon/icon.json b/ios/Ascently/Pride.icon/icon.json new file mode 100644 index 0000000..10bee8d --- /dev/null +++ b/ios/Ascently/Pride.icon/icon.json @@ -0,0 +1,90 @@ +{ + "fill" : "automatic", + "groups" : [ + { + "layers" : [ + { + "glass" : true, + "image-name" : "AscentlyPridePurple.png", + "name" : "AscentlyPridePurple", + "position" : { + "scale" : 0.2, + "translation-in-points" : [ + 261.33312440800023, + 225.98735919808558 + ] + } + }, + { + "image-name" : "AscentlyPrideBlue.png", + "name" : "AscentlyPrideBlue", + "position" : { + "scale" : 0.3, + "translation-in-points" : [ + 208.7958513297372, + 182.17013891753604 + ] + } + }, + { + "image-name" : "AscentlyPrideGreen.png", + "name" : "AscentlyPrideGreen", + "position" : { + "scale" : 0.4, + "translation-in-points" : [ + 159.12124296418187, + 138.63843261157083 + ] + } + }, + { + "image-name" : "AscentlyPrideYellow.png", + "name" : "AscentlyPrideYellow", + "position" : { + "scale" : 0.5, + "translation-in-points" : [ + 106.78092927846878, + 91.24931820626618 + ] + } + }, + { + "image-name" : "AscentlyPrideOrange.png", + "name" : "AscentlyPrideOrange", + "position" : { + "scale" : 0.6, + "translation-in-points" : [ + 50.9140625, + 44.484375 + ] + } + }, + { + "image-name" : "AscentlyPrideRed.png", + "name" : "AscentlyPrideRed", + "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/Trans.icon/Assets/AscentlyTransBlue 2.png b/ios/Ascently/Trans.icon/Assets/AscentlyTransBlue 2.png new file mode 100644 index 0000000..544c8dc Binary files /dev/null and b/ios/Ascently/Trans.icon/Assets/AscentlyTransBlue 2.png differ diff --git a/ios/Ascently/Trans.icon/Assets/AscentlyTransBlue.png b/ios/Ascently/Trans.icon/Assets/AscentlyTransBlue.png new file mode 100644 index 0000000..544c8dc Binary files /dev/null and b/ios/Ascently/Trans.icon/Assets/AscentlyTransBlue.png differ diff --git a/ios/Ascently/Trans.icon/Assets/AscentlyTransPink 2.png b/ios/Ascently/Trans.icon/Assets/AscentlyTransPink 2.png new file mode 100644 index 0000000..e07ff61 Binary files /dev/null and b/ios/Ascently/Trans.icon/Assets/AscentlyTransPink 2.png differ diff --git a/ios/Ascently/Trans.icon/Assets/AscentlyTransPink.png b/ios/Ascently/Trans.icon/Assets/AscentlyTransPink.png new file mode 100644 index 0000000..e07ff61 Binary files /dev/null and b/ios/Ascently/Trans.icon/Assets/AscentlyTransPink.png differ diff --git a/ios/Ascently/Trans.icon/Assets/AscentlyTransWhite.png b/ios/Ascently/Trans.icon/Assets/AscentlyTransWhite.png new file mode 100644 index 0000000..c2c8754 Binary files /dev/null and b/ios/Ascently/Trans.icon/Assets/AscentlyTransWhite.png differ diff --git a/ios/Ascently/Trans.icon/icon.json b/ios/Ascently/Trans.icon/icon.json new file mode 100644 index 0000000..5887ee8 --- /dev/null +++ b/ios/Ascently/Trans.icon/icon.json @@ -0,0 +1,78 @@ +{ + "fill" : "automatic", + "groups" : [ + { + "layers" : [ + { + "image-name" : "AscentlyTransBlue 2.png", + "name" : "AscentlyTransBlue 2", + "position" : { + "scale" : 0.3, + "translation-in-points" : [ + 2.34375, + 68.515625 + ] + } + }, + { + "image-name" : "AscentlyTransPink 2.png", + "name" : "AscentlyTransPink 2", + "position" : { + "scale" : 0.4, + "translation-in-points" : [ + 0.84375, + 49.453125 + ] + } + }, + { + "image-name" : "AscentlyTransWhite.png", + "name" : "AscentlyTransWhite", + "position" : { + "scale" : 0.5, + "translation-in-points" : [ + 1.953125, + 34.265625 + ] + } + }, + { + "image-name" : "AscentlyTransPink.png", + "name" : "AscentlyTransPink", + "position" : { + "scale" : 0.6, + "translation-in-points" : [ + -0.0546875, + 17.4921875 + ] + } + }, + { + "image-name" : "AscentlyTransBlue.png", + "name" : "AscentlyTransBlue", + "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/Views/SettingsView.swift b/ios/Ascently/Views/SettingsView.swift index 6d3472c..672cc39 100644 --- a/ios/Ascently/Views/SettingsView.swift +++ b/ios/Ascently/Views/SettingsView.swift @@ -180,13 +180,12 @@ struct AppIconSection: View { setIcon(nil) }) { HStack { - Image(systemName: "triangle.fill") Text("Peaks") .foregroundColor(.primary) Spacer() if currentIcon == nil { Image(systemName: "checkmark") - .foregroundColor(.blue) + .foregroundColor(.primary) } } } @@ -195,13 +194,82 @@ struct AppIconSection: View { setIcon("Balls") }) { HStack { - Image(systemName: "circle.fill") Text("Balls") .foregroundColor(.primary) Spacer() if currentIcon == "Balls" { Image(systemName: "checkmark") - .foregroundColor(.blue) + .foregroundColor(.primary) + } + } + } + + Button(action: { + setIcon("Pride") + }) { + HStack { + Text("Pride") + .foregroundColor(.primary) + Spacer() + if currentIcon == "Pride" { + Image(systemName: "checkmark") + .foregroundColor(.primary) + } + } + } + + Button(action: { + setIcon("Trans") + }) { + HStack { + Text("Trans Pride") + .foregroundColor(.primary) + Spacer() + if currentIcon == "Trans" { + Image(systemName: "checkmark") + .foregroundColor(.primary) + } + } + } + + Button(action: { + setIcon("Enby") + }) { + HStack { + Text("Non-Binary Pride") + .foregroundColor(.primary) + Spacer() + if currentIcon == "Enby" { + Image(systemName: "checkmark") + .foregroundColor(.primary) + } + } + } + + Button(action: { + setIcon("Bi") + }) { + HStack { + Text("Bisexual Pride") + .foregroundColor(.primary) + Spacer() + if currentIcon == "Bi" { + Image(systemName: "checkmark") + .foregroundColor(.primary) + } + } + } + + Button(action: { + setIcon("Lesbian") + }) { + HStack { + Text("Lesbian Pride") + .foregroundColor(.primary) + Spacer() + if currentIcon == "Lesbian" { + Image(systemName: "checkmark") + .foregroundColor(.primary) } } }