Skip to content

Commit d7cfdd8

Browse files
danieldanieleckidanieldanielecki
authored
Merge pull request #13 from Ditectrev/develop
Develop
2 parents 58bfa8b + ac85164 commit d7cfdd8

File tree

16 files changed

+571
-374
lines changed

16 files changed

+571
-374
lines changed

‎CloudMaster.xcodeproj/project.pbxproj‎

Lines changed: 26 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -11,19 +11,17 @@
1111
8D8D8A902C05A23600ACC61C /* CloudMasterUITests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8D8D8A8F2C05A23600ACC61C /* CloudMasterUITests.swift */; };
1212
8D8D8A922C05A23600ACC61C /* CloudMasterUITestsLaunchTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8D8D8A912C05A23600ACC61C /* CloudMasterUITestsLaunchTests.swift */; };
1313
8D8D8ACE2C05A27800ACC61C /* ConfirmPopup.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8D8D8A9F2C05A27800ACC61C /* ConfirmPopup.swift */; };
14-
8D8D8ACF2C05A27800ACC61C /* DownloadView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8D8D8AA02C05A27800ACC61C /* DownloadView.swift */; };
14+
8D8D8ACF2C05A27800ACC61C /* DownloadOverlayView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8D8D8AA02C05A27800ACC61C /* DownloadOverlayView.swift */; };
1515
8D8D8AD02C05A27800ACC61C /* NotificationSettingsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8D8D8AA12C05A27800ACC61C /* NotificationSettingsView.swift */; };
1616
8D8D8AD12C05A27800ACC61C /* CourseView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8D8D8AA42C05A27800ACC61C /* CourseView.swift */; };
1717
8D8D8AD22C05A27800ACC61C /* CoursesView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8D8D8AA72C05A27800ACC61C /* CoursesView.swift */; };
1818
8D8D8AD32C05A27800ACC61C /* UserExamData.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8D8D8AAA2C05A27800ACC61C /* UserExamData.swift */; };
1919
8D8D8AD42C05A27800ACC61C /* ExamModesView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8D8D8AAD2C05A27800ACC61C /* ExamModesView.swift */; };
20-
8D8D8AD52C05A27800ACC61C /* ExamQuestion.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8D8D8AAE2C05A27800ACC61C /* ExamQuestion.swift */; };
2120
8D8D8AD62C05A27800ACC61C /* ExamSummaryView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8D8D8AAF2C05A27800ACC61C /* ExamSummaryView.swift */; };
2221
8D8D8AD72C05A27800ACC61C /* ExamView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8D8D8AB02C05A27800ACC61C /* ExamView.swift */; };
2322
8D8D8AD82C05A27800ACC61C /* PreviousExamsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8D8D8AB12C05A27800ACC61C /* PreviousExamsView.swift */; };
2423
8D8D8AD92C05A27800ACC61C /* HomeView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8D8D8AB42C05A27800ACC61C /* HomeView.swift */; };
2524
8D8D8ADA2C05A27800ACC61C /* IntroView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8D8D8AB72C05A27800ACC61C /* IntroView.swift */; };
26-
8D8D8ADB2C05A27800ACC61C /* LoadingView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8D8D8AB82C05A27800ACC61C /* LoadingView.swift */; };
2725
8D8D8ADC2C05A27800ACC61C /* SettingsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8D8D8ABB2C05A27800ACC61C /* SettingsView.swift */; };
2826
8D8D8ADD2C05A27800ACC61C /* UserTrainingData.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8D8D8ABE2C05A27800ACC61C /* UserTrainingData.swift */; };
2927
8D8D8ADE2C05A27800ACC61C /* TrainingView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8D8D8AC02C05A27800ACC61C /* TrainingView.swift */; };
@@ -42,6 +40,7 @@
4240
8D8D8AF32C05A31D00ACC61C /* Icon.afpub in Resources */ = {isa = PBXBuildFile; fileRef = 8D8D8AED2C05A31C00ACC61C /* Icon.afpub */; };
4341
8D8D8AF42C05A31D00ACC61C /* Icon.png in Resources */ = {isa = PBXBuildFile; fileRef = 8D8D8AEE2C05A31C00ACC61C /* Icon.png */; };
4442
8D8D8AF82C05A32B00ACC61C /* swift.yml in Resources */ = {isa = PBXBuildFile; fileRef = 8D8D8AF52C05A32B00ACC61C /* swift.yml */; };
43+
8DABB7742C0D7D0300B40E25 /* DownloadViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8DABB7732C0D7D0300B40E25 /* DownloadViewModel.swift */; };
4544
/* End PBXBuildFile section */
4645

4746
/* Begin PBXContainerItemProxy section */
@@ -69,19 +68,17 @@
6968
8D8D8A8F2C05A23600ACC61C /* CloudMasterUITests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CloudMasterUITests.swift; sourceTree = "<group>"; };
7069
8D8D8A912C05A23600ACC61C /* CloudMasterUITestsLaunchTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CloudMasterUITestsLaunchTests.swift; sourceTree = "<group>"; };
7170
8D8D8A9F2C05A27800ACC61C /* ConfirmPopup.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ConfirmPopup.swift; sourceTree = "<group>"; };
72-
8D8D8AA02C05A27800ACC61C /* DownloadView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = DownloadView.swift; sourceTree = "<group>"; };
71+
8D8D8AA02C05A27800ACC61C /* DownloadOverlayView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = DownloadOverlayView.swift; sourceTree = "<group>"; };
7372
8D8D8AA12C05A27800ACC61C /* NotificationSettingsView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NotificationSettingsView.swift; sourceTree = "<group>"; };
7473
8D8D8AA42C05A27800ACC61C /* CourseView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CourseView.swift; sourceTree = "<group>"; };
7574
8D8D8AA72C05A27800ACC61C /* CoursesView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CoursesView.swift; sourceTree = "<group>"; };
7675
8D8D8AAA2C05A27800ACC61C /* UserExamData.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = UserExamData.swift; sourceTree = "<group>"; };
7776
8D8D8AAD2C05A27800ACC61C /* ExamModesView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ExamModesView.swift; sourceTree = "<group>"; };
78-
8D8D8AAE2C05A27800ACC61C /* ExamQuestion.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ExamQuestion.swift; sourceTree = "<group>"; };
7977
8D8D8AAF2C05A27800ACC61C /* ExamSummaryView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ExamSummaryView.swift; sourceTree = "<group>"; };
8078
8D8D8AB02C05A27800ACC61C /* ExamView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ExamView.swift; sourceTree = "<group>"; };
8179
8D8D8AB12C05A27800ACC61C /* PreviousExamsView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PreviousExamsView.swift; sourceTree = "<group>"; };
8280
8D8D8AB42C05A27800ACC61C /* HomeView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = HomeView.swift; sourceTree = "<group>"; };
8381
8D8D8AB72C05A27800ACC61C /* IntroView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = IntroView.swift; sourceTree = "<group>"; };
84-
8D8D8AB82C05A27800ACC61C /* LoadingView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = LoadingView.swift; sourceTree = "<group>"; };
8582
8D8D8ABB2C05A27800ACC61C /* SettingsView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SettingsView.swift; sourceTree = "<group>"; };
8683
8D8D8ABE2C05A27800ACC61C /* UserTrainingData.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = UserTrainingData.swift; sourceTree = "<group>"; };
8784
8D8D8AC02C05A27800ACC61C /* TrainingView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = TrainingView.swift; sourceTree = "<group>"; };
@@ -100,6 +97,7 @@
10097
8D8D8AED2C05A31C00ACC61C /* Icon.afpub */ = {isa = PBXFileReference; lastKnownFileType = file; path = Icon.afpub; sourceTree = "<group>"; };
10198
8D8D8AEE2C05A31C00ACC61C /* Icon.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = Icon.png; sourceTree = "<group>"; };
10299
8D8D8AF52C05A32B00ACC61C /* swift.yml */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.yaml; path = swift.yml; sourceTree = "<group>"; };
100+
8DABB7732C0D7D0300B40E25 /* DownloadViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DownloadViewModel.swift; sourceTree = "<group>"; };
103101
/* End PBXFileReference section */
104102

105103
/* Begin PBXFrameworksBuildPhase section */
@@ -184,8 +182,9 @@
184182
8D8D8AA22C05A27800ACC61C /* Common */ = {
185183
isa = PBXGroup;
186184
children = (
185+
8DABB7722C0D7CF900B40E25 /* ViewModels */,
187186
8D8D8A9F2C05A27800ACC61C /* ConfirmPopup.swift */,
188-
8D8D8AA02C05A27800ACC61C /* DownloadView.swift */,
187+
8D8D8AA02C05A27800ACC61C /* DownloadOverlayView.swift */,
189188
8D8D8AA12C05A27800ACC61C /* NotificationSettingsView.swift */,
190189
);
191190
path = Common;
@@ -250,7 +249,6 @@
250249
isa = PBXGroup;
251250
children = (
252251
8D8D8AAD2C05A27800ACC61C /* ExamModesView.swift */,
253-
8D8D8AAE2C05A27800ACC61C /* ExamQuestion.swift */,
254252
8D8D8AAF2C05A27800ACC61C /* ExamSummaryView.swift */,
255253
8D8D8AB02C05A27800ACC61C /* ExamView.swift */,
256254
8D8D8AB12C05A27800ACC61C /* PreviousExamsView.swift */,
@@ -288,7 +286,6 @@
288286
isa = PBXGroup;
289287
children = (
290288
8D8D8AB72C05A27800ACC61C /* IntroView.swift */,
291-
8D8D8AB82C05A27800ACC61C /* LoadingView.swift */,
292289
);
293290
path = Views;
294291
sourceTree = "<group>";
@@ -411,6 +408,14 @@
411408
path = .github;
412409
sourceTree = "<group>";
413410
};
411+
8DABB7722C0D7CF900B40E25 /* ViewModels */ = {
412+
isa = PBXGroup;
413+
children = (
414+
8DABB7732C0D7D0300B40E25 /* DownloadViewModel.swift */,
415+
);
416+
path = ViewModels;
417+
sourceTree = "<group>";
418+
};
414419
/* End PBXGroup section */
415420

416421
/* Begin PBXNativeTarget section */
@@ -551,7 +556,6 @@
551556
buildActionMask = 2147483647;
552557
files = (
553558
8D8D8ADC2C05A27800ACC61C /* SettingsView.swift in Sources */,
554-
8D8D8AD52C05A27800ACC61C /* ExamQuestion.swift in Sources */,
555559
8D8D8ADE2C05A27800ACC61C /* TrainingView.swift in Sources */,
556560
8D8D8AD02C05A27800ACC61C /* NotificationSettingsView.swift in Sources */,
557561
8D8D8AE22C05A27800ACC61C /* DownloadUtility.swift in Sources */,
@@ -560,8 +564,7 @@
560564
8D8D8ADA2C05A27800ACC61C /* IntroView.swift in Sources */,
561565
8D8D8AE02C05A27800ACC61C /* CloudMaster.swift in Sources */,
562566
8D8D8ADD2C05A27800ACC61C /* UserTrainingData.swift in Sources */,
563-
8D8D8ADB2C05A27800ACC61C /* LoadingView.swift in Sources */,
564-
8D8D8ACF2C05A27800ACC61C /* DownloadView.swift in Sources */,
567+
8D8D8ACF2C05A27800ACC61C /* DownloadOverlayView.swift in Sources */,
565568
8D8D8AD32C05A27800ACC61C /* UserExamData.swift in Sources */,
566569
8D8D8AD82C05A27800ACC61C /* PreviousExamsView.swift in Sources */,
567570
8D8D8AE42C05A27800ACC61C /* QuestionLoader.swift in Sources */,
@@ -572,6 +575,7 @@
572575
8D8D8AD42C05A27800ACC61C /* ExamModesView.swift in Sources */,
573576
8D8D8AE12C05A27800ACC61C /* Courses.swift in Sources */,
574577
8D8D8AD12C05A27800ACC61C /* CourseView.swift in Sources */,
578+
8DABB7742C0D7D0300B40E25 /* DownloadViewModel.swift in Sources */,
575579
);
576580
runOnlyForDeploymentPostprocessing = 0;
577581
};
@@ -733,10 +737,11 @@
733737
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
734738
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
735739
CLANG_ENABLE_MODULES = YES;
740+
CODE_SIGN_IDENTITY = "Apple Development";
736741
CODE_SIGN_STYLE = Automatic;
737-
CURRENT_PROJECT_VERSION = 1;
742+
CURRENT_PROJECT_VERSION = 3;
738743
DEVELOPMENT_ASSET_PATHS = "\"CloudMaster/Preview Content\"";
739-
DEVELOPMENT_TEAM = 9D3QHQ7CMS;
744+
DEVELOPMENT_TEAM = "";
740745
ENABLE_PREVIEWS = YES;
741746
GENERATE_INFOPLIST_FILE = YES;
742747
INFOPLIST_KEY_CFBundleDisplayName = "CloudMaster Swift";
@@ -749,9 +754,10 @@
749754
"$(inherited)",
750755
"@executable_path/Frameworks",
751756
);
752-
MARKETING_VERSION = 1.0.1;
757+
MARKETING_VERSION = 1.0.2;
753758
PRODUCT_BUNDLE_IDENTIFIER = com.ditectrev.cloudmasterswift;
754759
PRODUCT_NAME = "CloudMaster Swift";
760+
PROVISIONING_PROFILE_SPECIFIER = "";
755761
SWIFT_EMIT_LOC_STRINGS = YES;
756762
SWIFT_OBJC_BRIDGING_HEADER = "";
757763
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
@@ -766,10 +772,11 @@
766772
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
767773
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
768774
CLANG_ENABLE_MODULES = YES;
775+
CODE_SIGN_IDENTITY = "Apple Development";
769776
CODE_SIGN_STYLE = Automatic;
770-
CURRENT_PROJECT_VERSION = 1;
777+
CURRENT_PROJECT_VERSION = 3;
771778
DEVELOPMENT_ASSET_PATHS = "\"CloudMaster/Preview Content\"";
772-
DEVELOPMENT_TEAM = 9D3QHQ7CMS;
779+
DEVELOPMENT_TEAM = "";
773780
ENABLE_PREVIEWS = YES;
774781
GENERATE_INFOPLIST_FILE = YES;
775782
INFOPLIST_KEY_CFBundleDisplayName = "CloudMaster Swift";
@@ -782,9 +789,10 @@
782789
"$(inherited)",
783790
"@executable_path/Frameworks",
784791
);
785-
MARKETING_VERSION = 1.0.1;
792+
MARKETING_VERSION = 1.0.2;
786793
PRODUCT_BUNDLE_IDENTIFIER = com.ditectrev.cloudmasterswift;
787794
PRODUCT_NAME = "CloudMaster Swift";
795+
PROVISIONING_PROFILE_SPECIFIER = "";
788796
SWIFT_EMIT_LOC_STRINGS = YES;
789797
SWIFT_OBJC_BRIDGING_HEADER = "";
790798
SWIFT_VERSION = 5.0;

‎CloudMaster.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
3+
<plist version="1.0">
4+
<dict/>
5+
</plist>

‎CloudMaster.xcodeproj/project.xcworkspace/xcuserdata/benedikt.xcuserdatad/WorkspaceSettings.xcsettings‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
3+
<plist version="1.0">
4+
<dict>
5+
<key>BuildLocationStyle</key>
6+
<string>UseAppPreferences</string>
7+
<key>CustomBuildLocationType</key>
8+
<string>RelativeToDerivedData</string>
9+
<key>DerivedDataLocationStyle</key>
10+
<string>Default</string>
11+
<key>ShowSharedSchemesAutomaticallyEnabled</key>
12+
<true/>
13+
</dict>
14+
</plist>

‎CloudMaster.xcodeproj/xcuserdata/benedikt.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<Bucket
3+
uuid = "BEC5EB92-6DEC-4473-BA5C-F49FA2713EC7"
4+
type = "1"
5+
version = "2.0">
6+
</Bucket>

0 commit comments

Comments
 (0)