Skip to content

add LessonKit, CourseCompletionKit #53

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
AnnaDluzhinskaya wants to merge 1 commit into
base: main
Choose a base branch
from
Open

add LessonKit, CourseCompletionKit #53

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 34 additions & 0 deletions ReusEd.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@

/* Begin PBXBuildFile section */
2A105B0B2851DCF100DB971B /* TabBarModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2A105B0A2851DCF100DB971B /* TabBarModel.swift */; };
2A1506A92872EB790029DD9A /* LessonKit in Frameworks */ = {isa = PBXBuildFile; productRef = 2A1506A82872EB790029DD9A /* LessonKit */; };
2A1506AC2872F6E90029DD9A /* CourseCompletionKit in Frameworks */ = {isa = PBXBuildFile; productRef = 2A1506AB2872F6E90029DD9A /* CourseCompletionKit */; };
2A1B302C2860595500A2F20D /* ViewAssetsModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2A1B302B2860595500A2F20D /* ViewAssetsModel.swift */; };
2A5A80E9285B2C8E00809CB2 /* AutoRotateVideoPlayerView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2A5A80E8285B2C8E00809CB2 /* AutoRotateVideoPlayerView.swift */; };
2A5A80EB285B5CC500809CB2 /* VideoDescriptionView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2A5A80EA285B5CC500809CB2 /* VideoDescriptionView.swift */; };
Expand Down Expand Up @@ -220,7 +222,9 @@
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
2A1506A92872EB790029DD9A /* LessonKit in Frameworks */,
7A08F099286DEF9B006442BF /* OnBoardingKit in Frameworks */,
2A1506AC2872F6E90029DD9A /* CourseCompletionKit in Frameworks */,
F889E44EEDB64B288FE6FEE7 /* Pods_ReusEd.framework in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
Expand Down Expand Up @@ -606,6 +610,8 @@
name = ReusEd;
packageProductDependencies = (
7A08F098286DEF9B006442BF /* OnBoardingKit */,
2A1506A82872EB790029DD9A /* LessonKit */,
2A1506AB2872F6E90029DD9A /* CourseCompletionKit */,
);
productName = ReusEd;
productReference = 7A038BFF284F324300B1376F /* ReusEd.app */;
Expand Down Expand Up @@ -637,6 +643,8 @@
mainGroup = 7A038BF6284F324300B1376F;
packageReferences = (
7A08F097286DEF9B006442BF /* XCRemoteSwiftPackageReference "OnBoardingKit" */,
2A1506A72872EB790029DD9A /* XCRemoteSwiftPackageReference "LessonKit" */,
2A1506AA2872F6E90029DD9A /* XCRemoteSwiftPackageReference "CourseCompletionKit" */,
);
productRefGroup = 7A038C00284F324300B1376F /* Products */;
projectDirPath = "";
Expand Down Expand Up @@ -1036,6 +1044,22 @@
/* End XCConfigurationList section */

/* Begin XCRemoteSwiftPackageReference section */
2A1506A72872EB790029DD9A /* XCRemoteSwiftPackageReference "LessonKit" */ = {
isa = XCRemoteSwiftPackageReference;
repositoryURL = "https://github.com/iOSerler/LessonKit.git";
requirement = {
branch = main;
kind = branch;
};
};
2A1506AA2872F6E90029DD9A /* XCRemoteSwiftPackageReference "CourseCompletionKit" */ = {
isa = XCRemoteSwiftPackageReference;
repositoryURL = "https://github.com/iOSerler/CourseCompletionKit.git";
requirement = {
branch = main;
kind = branch;
};
};
7A08F097286DEF9B006442BF /* XCRemoteSwiftPackageReference "OnBoardingKit" */ = {
isa = XCRemoteSwiftPackageReference;
repositoryURL = "https://github.com/iOSerler/OnBoardingKit";
Expand All @@ -1047,6 +1071,16 @@
/* End XCRemoteSwiftPackageReference section */

/* Begin XCSwiftPackageProductDependency section */
2A1506A82872EB790029DD9A /* LessonKit */ = {
isa = XCSwiftPackageProductDependency;
package = 2A1506A72872EB790029DD9A /* XCRemoteSwiftPackageReference "LessonKit" */;
productName = LessonKit;
};
2A1506AB2872F6E90029DD9A /* CourseCompletionKit */ = {
isa = XCSwiftPackageProductDependency;
package = 2A1506AA2872F6E90029DD9A /* XCRemoteSwiftPackageReference "CourseCompletionKit" */;
productName = CourseCompletionKit;
};
7A08F098286DEF9B006442BF /* OnBoardingKit */ = {
isa = XCSwiftPackageProductDependency;
package = 7A08F097286DEF9B006442BF /* XCRemoteSwiftPackageReference "OnBoardingKit" */;
Expand Down
21 changes: 12 additions & 9 deletions ReusEd/Models/ViewAssetsModel.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,10 @@ import Foundation
import SwiftUI
import PersonalizationKit
import OnBoardingKit
struct ViewAssets: PersonalizationAssets, OnBoardingAssets {
import LessonKit
import CourseCompletionKit

struct ViewAssets: PersonalizationAssets, OnBoardingAssets, VideoLessonAssets, TextLessonAssets, QuizLessonAssets, CourseCompletionAssets {
var titleFont: String
var descriptionFont: String
var mainTextColor: UIColor
Expand All @@ -24,10 +27,10 @@ struct ViewAssets: PersonalizationAssets, OnBoardingAssets {
var borderColor: UIColor
var completeProgressColor: UIColor
var pinkAccentColor: UIColor
var successMain: Color
var successLighter: Color
var errorMain: Color
var errorLighter: Color
var successMain: UIColor
var successLighter: UIColor
var errorMain: UIColor
var errorLighter: UIColor
/// icons
var timeImage: String
var filterButtonImage: String
Expand Down Expand Up @@ -75,10 +78,10 @@ var viewAssets = ViewAssets(
borderColor: #colorLiteral(red: 0.9450980392, green: 0.9450980392, blue: 0.9529411765, alpha: 1),
completeProgressColor: #colorLiteral(red: 0.1254901961, green: 0.7490196078, blue: 0.3333333333, alpha: 1),
pinkAccentColor: #colorLiteral(red: 0.8784313725, green: 0.4470588235, blue: 0.6431372549, alpha: 1),
successMain: Color(#colorLiteral(red: 0.09219645709, green: 0.7787792087, blue: 0.4071886837, alpha: 1)),
successLighter: Color(#colorLiteral(red: 0.8235294118, green: 0.9490196078, blue: 0.8666666667, alpha: 1)),
errorMain: Color(#colorLiteral(red: 0.8392156863, green: 0.2509803922, blue: 0.2705882353, alpha: 1)),
errorLighter: Color(#colorLiteral(red: 0.968627451, green: 0.8509803922, blue: 0.8549019608, alpha: 1)),
successMain: #colorLiteral(red: 0.09219645709, green: 0.7787792087, blue: 0.4071886837, alpha: 1),
successLighter: #colorLiteral(red: 0.8235294118, green: 0.9490196078, blue: 0.8666666667, alpha: 1),
errorMain: #colorLiteral(red: 0.8392156863, green: 0.2509803922, blue: 0.2705882353, alpha: 1),
errorLighter: #colorLiteral(red: 0.968627451, green: 0.8509803922, blue: 0.8549019608, alpha: 1),
timeImage: "timer",
filterButtonImage: "filter",
authorIcon: "author",
Expand Down
2 changes: 1 addition & 1 deletion ReusEd/Resources/courses.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
"id": 4,
"title": "Section 4 - Final Quiz",
"lessons": [
6,5
5
]
}
]
Expand Down
2 changes: 1 addition & 1 deletion ReusEd/Resources/lessons.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -235,7 +235,7 @@
},
{
"id": 6,
"type": "quiz",
"type": "finalQuiz",
"title": "Quiz",
"description": "Solve the quiz to test your knowledge!",
"quizData": {
Expand Down
Loading