Skip to content

Commit e60ffc9

Browse files
the0neyouseekthe0neyouseek
authored
Onboarding Screen (MonitorControl#906)
This PR is related to this issue: MonitorControl#676 ### What's new - ✨ Add an onboarding screen (only appear on first launch) - 🇫🇷 French translations for the new onboarding screen - 🛠 Reorganize AppDelegate a bit - 🛠 Move View Controllers into folders ### What's left to do All current translations beside French & English (for the new onboarding) are missing for now. If you want to help with translations, please read the opening post of this discussion: MonitorControl#637
1 parent 4d408a5 commit e60ffc9

File tree

37 files changed

+944
-39
lines changed

37 files changed

+944
-39
lines changed

‎MonitorControl.xcodeproj/project.pbxproj‎

Lines changed: 26 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,7 @@
5656
F0445D3820023E710025AE82 /* MainPrefsViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = F0445D3720023E710025AE82 /* MainPrefsViewController.swift */; };
5757
F06792EA200A73460066C438 /* main.swift in Sources */ = {isa = PBXBuildFile; fileRef = F06792E9200A73460066C438 /* main.swift */; };
5858
F06792F6200A745F0066C438 /* MonitorControlHelper.app in [Login] Copy Helper to start at Login */ = {isa = PBXBuildFile; fileRef = F06792E7200A73460066C438 /* MonitorControlHelper.app */; settings = {ATTRIBUTES = (RemoveHeadersOnCopy, ); }; };
59+
F0A489C4279C71B200BEDFD6 /* OnboardingViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = F0A489C3279C71B200BEDFD6 /* OnboardingViewController.swift */; };
5960
FE4E0896249D584C003A50BB /* OSDUtils.swift in Sources */ = {isa = PBXBuildFile; fileRef = FE4E0895249D584C003A50BB /* OSDUtils.swift */; };
6061
/* End PBXBuildFile section */
6162

@@ -157,6 +158,7 @@
157158
F06792E9200A73460066C438 /* main.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = main.swift; sourceTree = "<group>"; };
158159
F06792F0200A73470066C438 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
159160
F06792F1200A73470066C438 /* MonitorControlHelper.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = MonitorControlHelper.entitlements; sourceTree = "<group>"; };
161+
F0A489C3279C71B200BEDFD6 /* OnboardingViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OnboardingViewController.swift; sourceTree = "<group>"; };
160162
FE4E0895249D584C003A50BB /* OSDUtils.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OSDUtils.swift; sourceTree = "<group>"; };
161163
/* End PBXFileReference section */
162164

@@ -311,12 +313,8 @@
311313
F0445D3620023D5B0025AE82 /* View Controllers */ = {
312314
isa = PBXGroup;
313315
children = (
314-
F0445D3720023E710025AE82 /* MainPrefsViewController.swift */,
315-
AA25F6CE26E680510087F3A2 /* MenuslidersPrefsViewController.swift */,
316-
AA25F6D026E681D30087F3A2 /* KeyboardPrefsViewController.swift */,
317-
AA062E8926C9A039007E628C /* DisplaysPrefsViewController.swift */,
318-
AA062E8D26CA7BE5007E628C /* DisplaysPrefsCellView.swift */,
319-
AA665A5C26C5892800FEF2C1 /* AboutPrefsViewController.swift */,
316+
F0A489C2279C719200BEDFD6 /* Onboarding */,
317+
F0A489C1279C718400BEDFD6 /* Preferences */,
320318
);
321319
path = "View Controllers";
322320
sourceTree = "<group>";
@@ -331,6 +329,27 @@
331329
path = MonitorControlHelper;
332330
sourceTree = "<group>";
333331
};
332+
F0A489C1279C718400BEDFD6 /* Preferences */ = {
333+
isa = PBXGroup;
334+
children = (
335+
F0445D3720023E710025AE82 /* MainPrefsViewController.swift */,
336+
AA25F6CE26E680510087F3A2 /* MenuslidersPrefsViewController.swift */,
337+
AA25F6D026E681D30087F3A2 /* KeyboardPrefsViewController.swift */,
338+
AA062E8926C9A039007E628C /* DisplaysPrefsViewController.swift */,
339+
AA062E8D26CA7BE5007E628C /* DisplaysPrefsCellView.swift */,
340+
AA665A5C26C5892800FEF2C1 /* AboutPrefsViewController.swift */,
341+
);
342+
path = Preferences;
343+
sourceTree = "<group>";
344+
};
345+
F0A489C2279C719200BEDFD6 /* Onboarding */ = {
346+
isa = PBXGroup;
347+
children = (
348+
F0A489C3279C71B200BEDFD6 /* OnboardingViewController.swift */,
349+
);
350+
path = Onboarding;
351+
sourceTree = "<group>";
352+
};
334353
/* End PBXGroup section */
335354

336355
/* Begin PBXNativeTarget section */
@@ -581,6 +600,7 @@
581600
F03A8DF21FFBAA6F0034DC27 /* OtherDisplay.swift in Sources */,
582601
AA78BDBD2709FE7B00CA8DF7 /* UpdaterDelegate.swift in Sources */,
583602
AA44E7052703790100E06865 /* KeyboardShortcuts+Extension.swift in Sources */,
603+
F0A489C4279C71B200BEDFD6 /* OnboardingViewController.swift in Sources */,
584604
AA16139B26BE772E00DCF027 /* Arm64DDC.swift in Sources */,
585605
F0445D3820023E710025AE82 /* MainPrefsViewController.swift in Sources */,
586606
28D1DDF2227FBE71004CB494 /* NSScreen+Extension.swift in Sources */,

‎MonitorControl/Assets.xcassets/onboarding_icon_keyboard.imageset/Contents.json‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
{
2+
"images" : [
3+
{
4+
"filename" : "icon_keyboard.png",
5+
"idiom" : "mac",
6+
"scale" : "1x"
7+
},
8+
{
9+
"filename" : "[email protected]",
10+
"idiom" : "mac",
11+
"scale" : "2x"
12+
}
13+
],
14+
"info" : {
15+
"author" : "xcode",
16+
"version" : 1
17+
}
18+
}

‎MonitorControl/Assets.xcassets/onboarding_icon_keyboard.imageset/icon_keyboard.png‎

1.19 KB
Loading

‎MonitorControl/Assets.xcassets/onboarding_icon_keyboard.imageset/[email protected]‎

2.48 KB
Loading

‎MonitorControl/Assets.xcassets/onboarding_icon_person.imageset/Contents.json‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
{
2+
"images" : [
3+
{
4+
"filename" : "icon_person.png",
5+
"idiom" : "mac",
6+
"scale" : "1x"
7+
},
8+
{
9+
"filename" : "[email protected]",
10+
"idiom" : "mac",
11+
"scale" : "2x"
12+
}
13+
],
14+
"info" : {
15+
"author" : "xcode",
16+
"version" : 1
17+
}
18+
}

‎MonitorControl/Assets.xcassets/onboarding_icon_person.imageset/icon_person.png‎

1.38 KB
Loading

‎MonitorControl/Assets.xcassets/onboarding_icon_person.imageset/[email protected]‎

3.18 KB
Loading

‎MonitorControl/Assets.xcassets/onboarding_keyboard.imageset/Contents.json‎

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
{
2+
"images" : [
3+
{
4+
"filename" : "onboarding_keyboard.png",
5+
"idiom" : "mac",
6+
"scale" : "1x"
7+
},
8+
{
9+
"appearances" : [
10+
{
11+
"appearance" : "luminosity",
12+
"value" : "dark"
13+
}
14+
],
15+
"filename" : "onboarding_keyboard_dark.png",
16+
"idiom" : "mac",
17+
"scale" : "1x"
18+
},
19+
{
20+
"filename" : "[email protected]",
21+
"idiom" : "mac",
22+
"scale" : "2x"
23+
},
24+
{
25+
"appearances" : [
26+
{
27+
"appearance" : "luminosity",
28+
"value" : "dark"
29+
}
30+
],
31+
"filename" : "[email protected]",
32+
"idiom" : "mac",
33+
"scale" : "2x"
34+
}
35+
],
36+
"info" : {
37+
"author" : "xcode",
38+
"version" : 1
39+
}
40+
}

‎MonitorControl/Assets.xcassets/onboarding_keyboard.imageset/onboarding_keyboard.png‎

30.9 KB
Loading

‎MonitorControl/Assets.xcassets/onboarding_keyboard.imageset/[email protected]‎

102 KB
Loading

0 commit comments

Comments
 (0)