diff --git a/PHP Monitor.xcodeproj/project.pbxproj b/PHP Monitor.xcodeproj/project.pbxproj index 0aa078f..b955110 100644 --- a/PHP Monitor.xcodeproj/project.pbxproj +++ b/PHP Monitor.xcodeproj/project.pbxproj @@ -3350,7 +3350,7 @@ C4975D0828CD190C00FFB4E8 /* Release.Dev */ = { isa = XCBuildConfiguration; buildSettings = { - ASSETCATALOG_COMPILER_APPICON_NAME = AppIconEA; + ASSETCATALOG_COMPILER_APPICON_NAME = AppIconDev; ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AppColor; CODE_SIGN_ENTITLEMENTS = phpmon/phpmon.entitlements; CODE_SIGN_IDENTITY = "Apple Development"; @@ -3460,7 +3460,7 @@ C4975D0B28CD193A00FFB4E8 /* Debug.Dev */ = { isa = XCBuildConfiguration; buildSettings = { - ASSETCATALOG_COMPILER_APPICON_NAME = AppIconEA; + ASSETCATALOG_COMPILER_APPICON_NAME = AppIconDev; ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AppColor; CODE_SIGN_ENTITLEMENTS = phpmon/phpmon.entitlements; CODE_SIGN_IDENTITY = "Apple Development"; diff --git a/phpmon/Assets.xcassets/AppColorBeta.colorset/Contents.json b/phpmon/Assets.xcassets/AppColorBeta.colorset/Contents.json new file mode 100644 index 0000000..4fc8e42 --- /dev/null +++ b/phpmon/Assets.xcassets/AppColorBeta.colorset/Contents.json @@ -0,0 +1,38 @@ +{ + "colors" : [ + { + "color" : { + "color-space" : "srgb", + "components" : { + "alpha" : "1.000", + "blue" : "0.988", + "green" : "0.580", + "red" : "0.278" + } + }, + "idiom" : "universal" + }, + { + "appearances" : [ + { + "appearance" : "luminosity", + "value" : "dark" + } + ], + "color" : { + "color-space" : "srgb", + "components" : { + "alpha" : "1.000", + "blue" : "0.988", + "green" : "0.723", + "red" : "0.277" + } + }, + "idiom" : "universal" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/phpmon/Assets.xcassets/AppIconEA.appiconset/Contents.json b/phpmon/Assets.xcassets/AppIconEA.appiconset/Contents.json deleted file mode 100644 index 64dc11e..0000000 --- a/phpmon/Assets.xcassets/AppIconEA.appiconset/Contents.json +++ /dev/null @@ -1,68 +0,0 @@ -{ - "images" : [ - { - "filename" : "icon_16x16.png", - "idiom" : "mac", - "scale" : "1x", - "size" : "16x16" - }, - { - "filename" : "icon_16x16@2x.png", - "idiom" : "mac", - "scale" : "2x", - "size" : "16x16" - }, - { - "filename" : "icon_32x32.png", - "idiom" : "mac", - "scale" : "1x", - "size" : "32x32" - }, - { - "filename" : "icon_32x32@2x.png", - "idiom" : "mac", - "scale" : "2x", - "size" : "32x32" - }, - { - "filename" : "icon_128x128.png", - "idiom" : "mac", - "scale" : "1x", - "size" : "128x128" - }, - { - "filename" : "icon_128x128@2x.png", - "idiom" : "mac", - "scale" : "2x", - "size" : "128x128" - }, - { - "filename" : "icon_256x256.png", - "idiom" : "mac", - "scale" : "1x", - "size" : "256x256" - }, - { - "filename" : "icon_256x256@2x.png", - "idiom" : "mac", - "scale" : "2x", - "size" : "256x256" - }, - { - "filename" : "icon_512x512.png", - "idiom" : "mac", - "scale" : "1x", - "size" : "512x512" - }, - { - "filename" : "icon_512x512@2x.png", - "idiom" : "mac", - "scale" : "2x", - "size" : "512x512" - } - ], - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/phpmon/Assets.xcassets/AppIconEA.appiconset/icon_128x128.png b/phpmon/Assets.xcassets/AppIconEA.appiconset/icon_128x128.png deleted file mode 100644 index 82ddfd3..0000000 Binary files a/phpmon/Assets.xcassets/AppIconEA.appiconset/icon_128x128.png and /dev/null differ diff --git a/phpmon/Assets.xcassets/AppIconEA.appiconset/icon_128x128@2x.png b/phpmon/Assets.xcassets/AppIconEA.appiconset/icon_128x128@2x.png deleted file mode 100644 index 58966cc..0000000 Binary files a/phpmon/Assets.xcassets/AppIconEA.appiconset/icon_128x128@2x.png and /dev/null differ diff --git a/phpmon/Assets.xcassets/AppIconEA.appiconset/icon_16x16.png b/phpmon/Assets.xcassets/AppIconEA.appiconset/icon_16x16.png deleted file mode 100644 index 3fdda5b..0000000 Binary files a/phpmon/Assets.xcassets/AppIconEA.appiconset/icon_16x16.png and /dev/null differ diff --git a/phpmon/Assets.xcassets/AppIconEA.appiconset/icon_16x16@2x.png b/phpmon/Assets.xcassets/AppIconEA.appiconset/icon_16x16@2x.png deleted file mode 100644 index 64ac9c3..0000000 Binary files a/phpmon/Assets.xcassets/AppIconEA.appiconset/icon_16x16@2x.png and /dev/null differ diff --git a/phpmon/Assets.xcassets/AppIconEA.appiconset/icon_256x256.png b/phpmon/Assets.xcassets/AppIconEA.appiconset/icon_256x256.png deleted file mode 100644 index 58966cc..0000000 Binary files a/phpmon/Assets.xcassets/AppIconEA.appiconset/icon_256x256.png and /dev/null differ diff --git a/phpmon/Assets.xcassets/AppIconEA.appiconset/icon_256x256@2x.png b/phpmon/Assets.xcassets/AppIconEA.appiconset/icon_256x256@2x.png deleted file mode 100644 index 22c2b15..0000000 Binary files a/phpmon/Assets.xcassets/AppIconEA.appiconset/icon_256x256@2x.png and /dev/null differ diff --git a/phpmon/Assets.xcassets/AppIconEA.appiconset/icon_32x32.png b/phpmon/Assets.xcassets/AppIconEA.appiconset/icon_32x32.png deleted file mode 100644 index 64ac9c3..0000000 Binary files a/phpmon/Assets.xcassets/AppIconEA.appiconset/icon_32x32.png and /dev/null differ diff --git a/phpmon/Assets.xcassets/AppIconEA.appiconset/icon_32x32@2x.png b/phpmon/Assets.xcassets/AppIconEA.appiconset/icon_32x32@2x.png deleted file mode 100644 index b6627de..0000000 Binary files a/phpmon/Assets.xcassets/AppIconEA.appiconset/icon_32x32@2x.png and /dev/null differ diff --git a/phpmon/Assets.xcassets/AppIconEA.appiconset/icon_512x512.png b/phpmon/Assets.xcassets/AppIconEA.appiconset/icon_512x512.png deleted file mode 100644 index 22c2b15..0000000 Binary files a/phpmon/Assets.xcassets/AppIconEA.appiconset/icon_512x512.png and /dev/null differ diff --git a/phpmon/Assets.xcassets/AppIconEA.appiconset/icon_512x512@2x.png b/phpmon/Assets.xcassets/AppIconEA.appiconset/icon_512x512@2x.png deleted file mode 100644 index 0da8cc9..0000000 Binary files a/phpmon/Assets.xcassets/AppIconEA.appiconset/icon_512x512@2x.png and /dev/null differ diff --git a/phpmon/Domain/SwiftUI/Onboarding/OnboardingView.swift b/phpmon/Domain/SwiftUI/Onboarding/OnboardingView.swift index b1261be..740d23b 100644 --- a/phpmon/Domain/SwiftUI/Onboarding/OnboardingView.swift +++ b/phpmon/Domain/SwiftUI/Onboarding/OnboardingView.swift @@ -59,10 +59,12 @@ struct OnboardingView: View { .font(.title) .bold() .padding(.bottom, 5) + .padding(.top, 8) + .foregroundColor(Color.appPrimary) Text( Valet.installed - ? "onboarding.explore".localized - : "onboarding.explore.lite".localized + ? "onboarding.explore".localizedForSwiftUI + : "onboarding.explore.lite".localizedForSwiftUI ) .padding(.bottom) .padding(.trailing) diff --git a/phpmon/Localizable.strings b/phpmon/Localizable.strings index bcb17ff..0a2e2b6 100644 --- a/phpmon/Localizable.strings +++ b/phpmon/Localizable.strings @@ -677,12 +677,12 @@ When files like these are missing, it's recommended to reinstall the appropriate "onboarding.title" = "Welcome Tour"; "onboarding.welcome" = "Welcome to PHP Monitor!"; -"onboarding.explore" = "Congrats, you now have access to PHP Monitor's entire suite of functionality. You can learn more about some of the features that PHP Monitor has to offer on this screen."; -"onboarding.explore.lite" = "Congrats, you now have access to a subset of PHP Monitor's features. Please note that some features are currently disabled because Laravel Valet is not installed (or disabled.)"; +"onboarding.explore" = "You now have access to PHP Monitor's entire suite of functionality. You can learn more about some of the features that PHP Monitor has to offer on this screen."; +"onboarding.explore.lite" = "You now have access to PHP Monitor's most important features. +Please note that some features (greyed out below) are currently unavailable because Laravel Valet is not active."; "onboarding.tour.menu_bar.title" = "Power In Your Menu Bar"; "onboarding.tour.menu_bar" = "PHP Monitor lives in your menu bar. From this menu, you can access most of PHP Monitor's key functionality, including switching the globally linked PHP version, locating config files, and much more."; -"onboarding.tour.faq_hint" = "**Questions? Unsure why features are unavailable?** -I recommend that you check out the [README](https://github.com/nicoverbruggen/phpmon/blob/main/README.md) on GitHub: it contains a comprehensive FAQ with various tips and common questions and answers."; +"onboarding.tour.faq_hint" = "**Questions?** I recommend that you check out the [README](https://github.com/nicoverbruggen/phpmon/blob/main/README.md) on GitHub: it contains a comprehensive FAQ with various tips and common questions and answers."; "onboarding.tour.services.title" = "Manage Homebrew Services"; "onboarding.tour.services" = "Once you click on the menu bar item, you can see at a glance based on the checkmarks or crosses if all of the Homebrew services are up and running. You can also click on a service to quickly toggle it."; "onboarding.tour.domains.title" = "Manage Domains";