diff --git a/DNSecure/Assets.xcassets/HowToActivate/MakeServiceActive.imageset/Contents.json b/DNSecure/Assets.xcassets/HowToActivate/MakeServiceActive.imageset/Contents.json new file mode 100644 index 0000000..a7b497b --- /dev/null +++ b/DNSecure/Assets.xcassets/HowToActivate/MakeServiceActive.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "IMG_0244.jpg", + "idiom" : "universal", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/DNSecure/Assets.xcassets/HowToActivate/MakeServiceActive.imageset/IMG_0244.jpg b/DNSecure/Assets.xcassets/HowToActivate/MakeServiceActive.imageset/IMG_0244.jpg new file mode 100644 index 0000000..2246a0c Binary files /dev/null and b/DNSecure/Assets.xcassets/HowToActivate/MakeServiceActive.imageset/IMG_0244.jpg differ diff --git a/DNSecure/Assets.xcassets/HowToActivate/NetworkSettings.imageset/Contents.json b/DNSecure/Assets.xcassets/HowToActivate/NetworkSettings.imageset/Contents.json new file mode 100644 index 0000000..c32e378 --- /dev/null +++ b/DNSecure/Assets.xcassets/HowToActivate/NetworkSettings.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "Screen Shot 2021-02-13 at 11.25.16 AM.jpg", + "idiom" : "universal", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/DNSecure/Assets.xcassets/HowToActivate/NetworkSettings.imageset/Screen Shot 2021-02-13 at 11.25.16 AM.jpg b/DNSecure/Assets.xcassets/HowToActivate/NetworkSettings.imageset/Screen Shot 2021-02-13 at 11.25.16 AM.jpg new file mode 100644 index 0000000..433f1ca Binary files /dev/null and b/DNSecure/Assets.xcassets/HowToActivate/NetworkSettings.imageset/Screen Shot 2021-02-13 at 11.25.16 AM.jpg differ diff --git a/DNSecure/Assets.xcassets/HowToActivate/SystemPreferences.imageset/Contents.json b/DNSecure/Assets.xcassets/HowToActivate/SystemPreferences.imageset/Contents.json new file mode 100644 index 0000000..4e2bb5d --- /dev/null +++ b/DNSecure/Assets.xcassets/HowToActivate/SystemPreferences.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "Screen Shot 2021-02-13 at 11.36.47 AM.jpg", + "idiom" : "universal", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/DNSecure/Assets.xcassets/HowToActivate/SystemPreferences.imageset/Screen Shot 2021-02-13 at 11.36.47 AM.jpg b/DNSecure/Assets.xcassets/HowToActivate/SystemPreferences.imageset/Screen Shot 2021-02-13 at 11.36.47 AM.jpg new file mode 100644 index 0000000..64d177d Binary files /dev/null and b/DNSecure/Assets.xcassets/HowToActivate/SystemPreferences.imageset/Screen Shot 2021-02-13 at 11.36.47 AM.jpg differ diff --git a/DNSecure/Assets.xcassets/HowToActivate/SystemPreferencesIcon.imageset/Contents.json b/DNSecure/Assets.xcassets/HowToActivate/SystemPreferencesIcon.imageset/Contents.json new file mode 100644 index 0000000..11eb740 --- /dev/null +++ b/DNSecure/Assets.xcassets/HowToActivate/SystemPreferencesIcon.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "IMG_0250.jpg", + "idiom" : "universal", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/DNSecure/Assets.xcassets/HowToActivate/SystemPreferencesIcon.imageset/IMG_0250.jpg b/DNSecure/Assets.xcassets/HowToActivate/SystemPreferencesIcon.imageset/IMG_0250.jpg new file mode 100644 index 0000000..bb1390b Binary files /dev/null and b/DNSecure/Assets.xcassets/HowToActivate/SystemPreferencesIcon.imageset/IMG_0250.jpg differ diff --git a/DNSecure/Views/HowToActivateView.swift b/DNSecure/Views/HowToActivateView.swift index 6e87cbc..a08158a 100644 --- a/DNSecure/Views/HowToActivateView.swift +++ b/DNSecure/Views/HowToActivateView.swift @@ -36,35 +36,70 @@ extension HowToActivateView: View { .scaledToFit() .frame(maxHeight: 200) } - VStack(alignment: .leading) { - Text("3. Open the Settings") - Image("Settings") - .resizable() - .scaledToFit() - .frame(maxHeight: 200) - } - VStack(alignment: .leading) { - Text("4. Go to \"General\" > \"VPN & Network\" > \"DNS\"") - ScrollView(.horizontal) { + #if targetEnvironment(macCatalyst) + VStack(alignment: .leading) { + Text("3. Open the System Preferences") + Image("SystemPreferencesIcon") + .resizable() + .scaledToFit() + .frame(maxHeight: 200) + } + VStack(alignment: .leading) { + Text("4. Go to Network settings") + Image("SystemPreferences") + .resizable() + .scaledToFit() + .frame(maxHeight: 400) + } + VStack(alignment: .leading) { HStack { - Image("GeneralVPNNetwork") - .resizable() - .scaledToFit() - .frame(maxHeight: 200) - Image("DNS") - .resizable() - .scaledToFit() - .frame(maxHeight: 200) + Text("5. Select \"\(Bundle.main.displayName!)\" and click") + Image(systemName: "ellipsis.circle") + Text("button") + } + Image("NetworkSettings") + .resizable() + .scaledToFit() + .frame(maxHeight: 400) + } + VStack(alignment: .leading) { + Text("6. Click \"Make Service Active\"") + Image("MakeServiceActive") + .resizable() + .scaledToFit() + .frame(maxHeight: 200) + } + #else + VStack(alignment: .leading) { + Text("3. Open the Settings") + Image("Settings") + .resizable() + .scaledToFit() + .frame(maxHeight: 200) + } + VStack(alignment: .leading) { + Text("4. Go to \"General\" > \"VPN & Network\" > \"DNS\"") + ScrollView(.horizontal) { + HStack { + Image("GeneralVPNNetwork") + .resizable() + .scaledToFit() + .frame(maxHeight: 200) + Image("DNS") + .resizable() + .scaledToFit() + .frame(maxHeight: 200) + } } } - } - VStack(alignment: .leading) { - Text("5. \"Automatic\" is selected by default, so select \"\(Bundle.main.displayName!)\"") - Image("DNSProvider") - .resizable() - .scaledToFit() - .frame(maxHeight: 200) - } + VStack(alignment: .leading) { + Text("5. \"Automatic\" is selected by default, so select \"\(Bundle.main.displayName!)\"") + Image("DNSProvider") + .resizable() + .scaledToFit() + .frame(maxHeight: 200) + } + #endif } } if self.isSheet {