diff --git a/.gitignore b/.gitignore index 3e3e2a9d2..998e24696 100644 --- a/.gitignore +++ b/.gitignore @@ -4,9 +4,9 @@ ## User settings xcuserdata/* -/NewEdX.xcodeproj/xcuserdata/ -/NewEdX.xcworkspace/xcuserdata/ -/NewEdX.xcworkspace/xcshareddata/swiftpm/Package.resolved +/OpenEdX.xcodeproj/xcuserdata/ +/OpenEdX.xcworkspace/xcuserdata/ +/OpenEdX.xcworkspace/xcshareddata/swiftpm/Package.resolved ## compatibility with Xcode 8 and earlier (ignoring not required starting Xcode 9) *.xcscmblueprint diff --git a/Authorization/Authorization.xcodeproj.xcworkspace/contents.xcworkspacedata b/Authorization/Authorization.xcodeproj.xcworkspace/contents.xcworkspacedata index 080e833b6..7ae574247 100644 --- a/Authorization/Authorization.xcodeproj.xcworkspace/contents.xcworkspacedata +++ b/Authorization/Authorization.xcodeproj.xcworkspace/contents.xcworkspacedata @@ -8,7 +8,7 @@ location = "group:../Core/Core.xcodeproj"> + location = "group:../OpenEdX.xcodeproj"> diff --git a/Authorization/Authorization.xcodeproj/project.pbxproj b/Authorization/Authorization.xcodeproj/project.pbxproj index 6eed8e006..b4c539d33 100644 --- a/Authorization/Authorization.xcodeproj/project.pbxproj +++ b/Authorization/Authorization.xcodeproj/project.pbxproj @@ -590,7 +590,7 @@ "@loader_path/Frameworks", ); MARKETING_VERSION = 1.0; - PRODUCT_BUNDLE_IDENTIFIER = com.raccoongang.Authorization; + PRODUCT_BUNDLE_IDENTIFIER = org.openedx.Authorization; PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)"; SKIP_INSTALL = YES; SUPPORTED_PLATFORMS = "iphoneos iphonesimulator"; @@ -613,7 +613,7 @@ GENERATE_INFOPLIST_FILE = YES; IPHONEOS_DEPLOYMENT_TARGET = 14.0; MARKETING_VERSION = 1.0; - PRODUCT_BUNDLE_IDENTIFIER = com.raccoongang.AuthorizationTests; + PRODUCT_BUNDLE_IDENTIFIER = org.openedx.AuthorizationTests; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_EMIT_LOC_STRINGS = NO; SWIFT_VERSION = 5.0; @@ -701,7 +701,7 @@ "@loader_path/Frameworks", ); MARKETING_VERSION = 1.0; - PRODUCT_BUNDLE_IDENTIFIER = com.raccoongang.Authorization; + PRODUCT_BUNDLE_IDENTIFIER = org.openedx.Authorization; PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)"; SKIP_INSTALL = YES; SUPPORTED_PLATFORMS = "iphoneos iphonesimulator"; @@ -723,7 +723,7 @@ GENERATE_INFOPLIST_FILE = YES; IPHONEOS_DEPLOYMENT_TARGET = 14.0; MARKETING_VERSION = 1.0; - PRODUCT_BUNDLE_IDENTIFIER = com.raccoongang.AuthorizationTests; + PRODUCT_BUNDLE_IDENTIFIER = org.openedx.AuthorizationTests; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_EMIT_LOC_STRINGS = NO; SWIFT_VERSION = 5.0; @@ -741,7 +741,7 @@ GENERATE_INFOPLIST_FILE = YES; IPHONEOS_DEPLOYMENT_TARGET = 14.0; MARKETING_VERSION = 1.0; - PRODUCT_BUNDLE_IDENTIFIER = com.raccoongang.AuthorizationTests; + PRODUCT_BUNDLE_IDENTIFIER = org.openedx.AuthorizationTests; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_EMIT_LOC_STRINGS = NO; SWIFT_VERSION = 5.0; @@ -759,7 +759,7 @@ GENERATE_INFOPLIST_FILE = YES; IPHONEOS_DEPLOYMENT_TARGET = 14.0; MARKETING_VERSION = 1.0; - PRODUCT_BUNDLE_IDENTIFIER = com.raccoongang.AuthorizationTests; + PRODUCT_BUNDLE_IDENTIFIER = org.openedx.AuthorizationTests; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_EMIT_LOC_STRINGS = NO; SWIFT_VERSION = 5.0; @@ -777,7 +777,7 @@ GENERATE_INFOPLIST_FILE = YES; IPHONEOS_DEPLOYMENT_TARGET = 14.0; MARKETING_VERSION = 1.0; - PRODUCT_BUNDLE_IDENTIFIER = com.raccoongang.AuthorizationTests; + PRODUCT_BUNDLE_IDENTIFIER = org.openedx.AuthorizationTests; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_EMIT_LOC_STRINGS = NO; SWIFT_VERSION = 5.0; @@ -795,7 +795,7 @@ GENERATE_INFOPLIST_FILE = YES; IPHONEOS_DEPLOYMENT_TARGET = 14.0; MARKETING_VERSION = 1.0; - PRODUCT_BUNDLE_IDENTIFIER = com.raccoongang.AuthorizationTests; + PRODUCT_BUNDLE_IDENTIFIER = org.openedx.AuthorizationTests; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_EMIT_LOC_STRINGS = NO; SWIFT_VERSION = 5.0; @@ -813,7 +813,7 @@ GENERATE_INFOPLIST_FILE = YES; IPHONEOS_DEPLOYMENT_TARGET = 14.0; MARKETING_VERSION = 1.0; - PRODUCT_BUNDLE_IDENTIFIER = com.raccoongang.AuthorizationTests; + PRODUCT_BUNDLE_IDENTIFIER = org.openedx.AuthorizationTests; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_EMIT_LOC_STRINGS = NO; SWIFT_VERSION = 5.0; @@ -831,7 +831,7 @@ GENERATE_INFOPLIST_FILE = YES; IPHONEOS_DEPLOYMENT_TARGET = 14.0; MARKETING_VERSION = 1.0; - PRODUCT_BUNDLE_IDENTIFIER = com.raccoongang.AuthorizationTests; + PRODUCT_BUNDLE_IDENTIFIER = org.openedx.AuthorizationTests; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_EMIT_LOC_STRINGS = NO; SWIFT_VERSION = 5.0; @@ -925,7 +925,7 @@ "@loader_path/Frameworks", ); MARKETING_VERSION = 1.0; - PRODUCT_BUNDLE_IDENTIFIER = com.raccoongang.Authorization; + PRODUCT_BUNDLE_IDENTIFIER = org.openedx.Authorization; PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)"; SKIP_INSTALL = YES; SUPPORTED_PLATFORMS = "iphoneos iphonesimulator"; @@ -1018,7 +1018,7 @@ "@loader_path/Frameworks", ); MARKETING_VERSION = 1.0; - PRODUCT_BUNDLE_IDENTIFIER = com.raccoongang.Authorization; + PRODUCT_BUNDLE_IDENTIFIER = org.openedx.Authorization; PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)"; SKIP_INSTALL = YES; SUPPORTED_PLATFORMS = "iphoneos iphonesimulator"; @@ -1116,7 +1116,7 @@ "@loader_path/Frameworks", ); MARKETING_VERSION = 1.0; - PRODUCT_BUNDLE_IDENTIFIER = com.raccoongang.Authorization; + PRODUCT_BUNDLE_IDENTIFIER = org.openedx.Authorization; PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)"; SKIP_INSTALL = YES; SUPPORTED_PLATFORMS = "iphoneos iphonesimulator"; @@ -1209,7 +1209,7 @@ "@loader_path/Frameworks", ); MARKETING_VERSION = 1.0; - PRODUCT_BUNDLE_IDENTIFIER = com.raccoongang.Authorization; + PRODUCT_BUNDLE_IDENTIFIER = org.openedx.Authorization; PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)"; SKIP_INSTALL = YES; SUPPORTED_PLATFORMS = "iphoneos iphonesimulator"; @@ -1365,7 +1365,7 @@ "@loader_path/Frameworks", ); MARKETING_VERSION = 1.0; - PRODUCT_BUNDLE_IDENTIFIER = com.raccoongang.Authorization; + PRODUCT_BUNDLE_IDENTIFIER = org.openedx.Authorization; PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)"; SKIP_INSTALL = YES; SUPPORTED_PLATFORMS = "iphoneos iphonesimulator"; @@ -1400,7 +1400,7 @@ "@loader_path/Frameworks", ); MARKETING_VERSION = 1.0; - PRODUCT_BUNDLE_IDENTIFIER = com.raccoongang.Authorization; + PRODUCT_BUNDLE_IDENTIFIER = org.openedx.Authorization; PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)"; SKIP_INSTALL = YES; SUPPORTED_PLATFORMS = "iphoneos iphonesimulator"; diff --git a/Core/Core.xcodeproj.xcworkspace/contents.xcworkspacedata b/Core/Core.xcodeproj.xcworkspace/contents.xcworkspacedata index f211704ff..0efc22dd7 100644 --- a/Core/Core.xcodeproj.xcworkspace/contents.xcworkspacedata +++ b/Core/Core.xcodeproj.xcworkspace/contents.xcworkspacedata @@ -5,7 +5,7 @@ location = "group:Core.xcodeproj"> + location = "group:../OpenEdX.xcodeproj"> diff --git a/Core/Core.xcodeproj/project.pbxproj b/Core/Core.xcodeproj/project.pbxproj index 8a681437e..a23953164 100644 --- a/Core/Core.xcodeproj/project.pbxproj +++ b/Core/Core.xcodeproj/project.pbxproj @@ -958,7 +958,7 @@ "@loader_path/Frameworks", ); MARKETING_VERSION = 1.0; - PRODUCT_BUNDLE_IDENTIFIER = com.raccoongang.Core; + PRODUCT_BUNDLE_IDENTIFIER = org.openedx.Core; PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)"; SKIP_INSTALL = YES; SUPPORTED_PLATFORMS = "iphoneos iphonesimulator"; @@ -980,7 +980,7 @@ GENERATE_INFOPLIST_FILE = YES; IPHONEOS_DEPLOYMENT_TARGET = 16.2; MARKETING_VERSION = 1.0; - PRODUCT_BUNDLE_IDENTIFIER = com.raccoongang.CoreTests; + PRODUCT_BUNDLE_IDENTIFIER = org.openedx.CoreTests; PRODUCT_NAME = "$(TARGET_NAME)"; SUPPORTED_PLATFORMS = "iphoneos iphonesimulator"; SUPPORTS_MACCATALYST = NO; @@ -1071,7 +1071,7 @@ "@loader_path/Frameworks", ); MARKETING_VERSION = 1.0; - PRODUCT_BUNDLE_IDENTIFIER = com.raccoongang.Core; + PRODUCT_BUNDLE_IDENTIFIER = org.openedx.Core; PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)"; SKIP_INSTALL = YES; SUPPORTED_PLATFORMS = "iphoneos iphonesimulator"; @@ -1092,7 +1092,7 @@ GENERATE_INFOPLIST_FILE = YES; IPHONEOS_DEPLOYMENT_TARGET = 16.2; MARKETING_VERSION = 1.0; - PRODUCT_BUNDLE_IDENTIFIER = com.raccoongang.CoreTests; + PRODUCT_BUNDLE_IDENTIFIER = org.openedx.CoreTests; PRODUCT_NAME = "$(TARGET_NAME)"; SUPPORTED_PLATFORMS = "iphoneos iphonesimulator"; SUPPORTS_MACCATALYST = NO; @@ -1112,7 +1112,7 @@ GENERATE_INFOPLIST_FILE = YES; IPHONEOS_DEPLOYMENT_TARGET = 16.2; MARKETING_VERSION = 1.0; - PRODUCT_BUNDLE_IDENTIFIER = com.raccoongang.CoreTests; + PRODUCT_BUNDLE_IDENTIFIER = org.openedx.CoreTests; PRODUCT_NAME = "$(TARGET_NAME)"; SUPPORTED_PLATFORMS = "iphoneos iphonesimulator"; SUPPORTS_MACCATALYST = NO; @@ -1132,7 +1132,7 @@ GENERATE_INFOPLIST_FILE = YES; IPHONEOS_DEPLOYMENT_TARGET = 16.2; MARKETING_VERSION = 1.0; - PRODUCT_BUNDLE_IDENTIFIER = com.raccoongang.CoreTests; + PRODUCT_BUNDLE_IDENTIFIER = org.openedx.CoreTests; PRODUCT_NAME = "$(TARGET_NAME)"; SUPPORTED_PLATFORMS = "iphoneos iphonesimulator"; SUPPORTS_MACCATALYST = NO; @@ -1152,7 +1152,7 @@ GENERATE_INFOPLIST_FILE = YES; IPHONEOS_DEPLOYMENT_TARGET = 16.2; MARKETING_VERSION = 1.0; - PRODUCT_BUNDLE_IDENTIFIER = com.raccoongang.CoreTests; + PRODUCT_BUNDLE_IDENTIFIER = org.openedx.CoreTests; PRODUCT_NAME = "$(TARGET_NAME)"; SUPPORTED_PLATFORMS = "iphoneos iphonesimulator"; SUPPORTS_MACCATALYST = NO; @@ -1172,7 +1172,7 @@ GENERATE_INFOPLIST_FILE = YES; IPHONEOS_DEPLOYMENT_TARGET = 16.2; MARKETING_VERSION = 1.0; - PRODUCT_BUNDLE_IDENTIFIER = com.raccoongang.CoreTests; + PRODUCT_BUNDLE_IDENTIFIER = org.openedx.CoreTests; PRODUCT_NAME = "$(TARGET_NAME)"; SUPPORTED_PLATFORMS = "iphoneos iphonesimulator"; SUPPORTS_MACCATALYST = NO; @@ -1192,7 +1192,7 @@ GENERATE_INFOPLIST_FILE = YES; IPHONEOS_DEPLOYMENT_TARGET = 16.2; MARKETING_VERSION = 1.0; - PRODUCT_BUNDLE_IDENTIFIER = com.raccoongang.CoreTests; + PRODUCT_BUNDLE_IDENTIFIER = org.openedx.CoreTests; PRODUCT_NAME = "$(TARGET_NAME)"; SUPPORTED_PLATFORMS = "iphoneos iphonesimulator"; SUPPORTS_MACCATALYST = NO; @@ -1212,7 +1212,7 @@ GENERATE_INFOPLIST_FILE = YES; IPHONEOS_DEPLOYMENT_TARGET = 16.2; MARKETING_VERSION = 1.0; - PRODUCT_BUNDLE_IDENTIFIER = com.raccoongang.CoreTests; + PRODUCT_BUNDLE_IDENTIFIER = org.openedx.CoreTests; PRODUCT_NAME = "$(TARGET_NAME)"; SUPPORTED_PLATFORMS = "iphoneos iphonesimulator"; SUPPORTS_MACCATALYST = NO; @@ -1309,7 +1309,7 @@ "@loader_path/Frameworks", ); MARKETING_VERSION = 1.0; - PRODUCT_BUNDLE_IDENTIFIER = com.raccoongang.Core; + PRODUCT_BUNDLE_IDENTIFIER = org.openedx.Core; PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)"; SKIP_INSTALL = YES; SUPPORTED_PLATFORMS = "iphoneos iphonesimulator"; @@ -1402,7 +1402,7 @@ "@loader_path/Frameworks", ); MARKETING_VERSION = 1.0; - PRODUCT_BUNDLE_IDENTIFIER = com.raccoongang.Core; + PRODUCT_BUNDLE_IDENTIFIER = org.openedx.Core; PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)"; SKIP_INSTALL = YES; SUPPORTED_PLATFORMS = "iphoneos iphonesimulator"; @@ -1500,7 +1500,7 @@ "@loader_path/Frameworks", ); MARKETING_VERSION = 1.0; - PRODUCT_BUNDLE_IDENTIFIER = com.raccoongang.Core; + PRODUCT_BUNDLE_IDENTIFIER = org.openedx.Core; PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)"; SKIP_INSTALL = YES; SUPPORTED_PLATFORMS = "iphoneos iphonesimulator"; @@ -1593,7 +1593,7 @@ "@loader_path/Frameworks", ); MARKETING_VERSION = 1.0; - PRODUCT_BUNDLE_IDENTIFIER = com.raccoongang.Core; + PRODUCT_BUNDLE_IDENTIFIER = org.openedx.Core; PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)"; SKIP_INSTALL = YES; SUPPORTED_PLATFORMS = "iphoneos iphonesimulator"; @@ -1749,7 +1749,7 @@ "@loader_path/Frameworks", ); MARKETING_VERSION = 1.0; - PRODUCT_BUNDLE_IDENTIFIER = com.raccoongang.Core; + PRODUCT_BUNDLE_IDENTIFIER = org.openedx.Core; PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)"; SKIP_INSTALL = YES; SUPPORTED_PLATFORMS = "iphoneos iphonesimulator"; @@ -1784,7 +1784,7 @@ "@loader_path/Frameworks", ); MARKETING_VERSION = 1.0; - PRODUCT_BUNDLE_IDENTIFIER = com.raccoongang.Core; + PRODUCT_BUNDLE_IDENTIFIER = org.openedx.Core; PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)"; SKIP_INSTALL = YES; SUPPORTED_PLATFORMS = "iphoneos iphonesimulator"; diff --git a/Core/Core/Analytics/AnalyticsManager.swift b/Core/Core/Analytics/AnalyticsManager.swift deleted file mode 100644 index 9972ab43a..000000000 --- a/Core/Core/Analytics/AnalyticsManager.swift +++ /dev/null @@ -1,294 +0,0 @@ -// -// AnalyticsManager.swift -// NewEdX -// -// Created by  Stepanok Ivan on 27.06.2023. -// - -import Foundation -import FirebaseAnalytics -import Authorization -import Discovery -import Dashboard -import Profile -import Course -import Discussion - -public protocol BaseCourseAnalytics { - associatedtype Event: RawRepresentable where Event.RawValue == String - func logEvent(_ event: Event, parameters: [String: Any]?) -} - -public class AnalyticsManager: BaseCourseAnalytics, - AuthorizationAnalytics, - MainScreenAnalytics, - DiscoveryAnalytics, - DashboardAnalytics, - ProfileAnalytics, - CourseAnalytics, - DiscussionAnalytics { - - public enum Event: String { - case userLogin = "User_Login" - case signUpClicked = "Sign_up_Clicked" - case createAccountClicked = "Create_Account_Clicked" - case registrationSuccess = "Registration_Success" - case userLogout = "User_Logout" - case forgotPasswordClicked = "Forgot_password_Clicked" - case resetPasswordClicked = "Reset_password_Clicked" - - case mainDiscoveryTabClicked = "Main_Discovery_tab_Clicked" - case mainDashboardTabClicked = "Main_Dashboard_tab_Clicked" - case mainProgramsTabClicked = "Main_Programs_tab_Clicked" - case mainProfileTabClicked = "Main_Profile_tab_Clicked" - - case discoverySearchBarClicked = "Discovery_Search_Bar_Clicked" - case discoveryCoursesSearch = "Discovery_Courses_Search" - case discoveryCourseClicked = "Discovery_Course_Clicked" - - case dashboardCourseClicked = "Dashboard_Course_Clicked" - - case profileEditClicked = "Profile_Edit_Clicked" - case profileEditDoneClicked = "Profile_Edit_Done_Clicked" - case profileDeleteAccountClicked = "Profile_Delete_Account_Clicked" - case profileVideoSettingsClicked = "Profile_Video_settings_Clicked" - case privacyPolicyClicked = "Privacy_Policy_Clicked" - case cookiePolicyClicked = "Cookie_Policy_Clicked" - case emailSupportClicked = "Email_Support_Clicked" - - case courseEnrollClicked = "Course_Enroll_Clicked" - case courseEnrollSuccess = "Course_Enroll_Success" - case viewCourseClicked = "View_Course_Clicked" - case resumeCourseTapped = "Resume_Course_Tapped" - case sequentialClicked = "Sequential_Clicked" - case verticalClicked = "Vertical_Clicked" - case nextBlockClicked = "Next_Block_Clicked" - case prevBlockClicked = "Prev_Block_Clicked" - case finishVerticalClicked = "Finish_Vertical_Clicked" - case finishVerticalNextSectionClicked = "Finish_Vertical_Next_section_Clicked" - case finishVerticalBackToOutlineClicked = "Finish_Vertical_Back_to_outline_Clicked" - case courseOutlineCourseTabClicked = "Course_Outline_Course_tab_Clicked" - case courseOutlineVideosTabClicked = "Course_Outline_Videos_tab_Clicked" - case courseOutlineDiscussionTabClicked = "Course_Outline_Discussion_tab_Clicked" - case courseOutlineHandoutsTabClicked = "Course_Outline_Handouts_tab_Clicked" - - case discussionAllPostsClicked = "Discussion_All_Posts_Clicked" - case discussionFollowingClicked = "Discussion_Following_Clicked" - case discussionTopicClicked = "Discussion_Topic_Clicked" - } - - public func logEvent(_ event: Event, parameters: [String: Any]?) { - Analytics.setAnalyticsCollectionEnabled(true) - Analytics.logEvent(event.rawValue, parameters: parameters) - } - - public func userLogin(method: LoginMethod) { - logEvent(.userLogin, parameters: ["method": method.rawValue]) - } - - public func signUpClicked() { - logEvent(.signUpClicked, parameters: nil) - } - - public func createAccountClicked(provider: LoginProvider) { - logEvent(.createAccountClicked, - parameters: ["provider": provider.rawValue]) - } - - public func registrationSuccess(provider: LoginProvider) { - logEvent(.registrationSuccess, - parameters: ["provider": provider.rawValue]) - } - - public func forgotPasswordClicked() { - logEvent(.forgotPasswordClicked, parameters: nil) - } - - public func resetPasswordClicked(success: Bool) { - logEvent(.resetPasswordClicked, parameters: ["success": success]) - } - - // MARK: MainScreenAnalytics - - public func mainDiscoveryTabClicked() { - logEvent(.mainDiscoveryTabClicked, parameters: nil) - } - - public func mainDashboardTabClicked() { - logEvent(.mainDashboardTabClicked, parameters: nil) - } - - public func mainProgramsTabClicked() { - logEvent(.mainProgramsTabClicked, parameters: nil) - } - - public func mainProfileTabClicked() { - logEvent(.mainProfileTabClicked, parameters: nil) - } - - // MARK: Discovery - - public func discoverySearchBarClicked() { - logEvent(.discoverySearchBarClicked, parameters: nil) - } - - public func discoveryCoursesSearch(label: String, coursesCount: Int) { - logEvent(.discoveryCoursesSearch, - parameters: ["label": label, - "courses_count": coursesCount]) - } - - public func discoveryCourseClicked(courseID: String, courseName: String) { - logEvent(.discoveryCourseClicked, parameters: ["course_id": courseID, - "course_name": courseName]) - } - - // MARK: Dashboard - - public func dashboardCourseClicked(courseID: String, courseName: String) { - logEvent(.dashboardCourseClicked, parameters: ["course_id": courseID, - "course_name": courseName]) - } - - // MARK: Profile - - public func profileEditClicked() { - logEvent(.profileEditClicked, parameters: nil) - } - - public func profileEditDoneClicked() { - logEvent(.profileEditDoneClicked, parameters: nil) - } - - public func profileDeleteAccountClicked() { - logEvent(.profileDeleteAccountClicked, parameters: nil) - } - - public func profileVideoSettingsClicked() { - logEvent(.profileVideoSettingsClicked, parameters: nil) - } - - public func privacyPolicyClicked() { - logEvent(.privacyPolicyClicked, parameters: nil) - } - - public func cookiePolicyClicked() { - logEvent(.cookiePolicyClicked, parameters: nil) - } - - public func emailSupportClicked() { - logEvent(.emailSupportClicked, parameters: nil) - } - - public func userLogout(force: Bool) { - logEvent(.userLogout, parameters: ["force": force]) - } - - // MARK: Course - - public func courseEnrollClicked(courseId: String, courseName: String) { - logEvent(.courseEnrollClicked, parameters: ["course_id": courseId, - "course_name": courseName]) - } - - public func courseEnrollSuccess(courseId: String, courseName: String) { - logEvent(.courseEnrollSuccess, parameters: ["course_id": courseId, - "course_name": courseName]) - } - - public func viewCourseClicked(courseId: String, courseName: String) { - logEvent(.viewCourseClicked, parameters: ["course_id": courseId, - "course_name": courseName]) - } - - public func resumeCourseTapped(courseId: String, courseName: String, blockId: String) { - logEvent(.resumeCourseTapped, parameters: ["course_id": courseId, - "course_name": courseName]) - } - - public func sequentialClicked(courseId: String, courseName: String, blockId: String, blockName: String) { - logEvent(.sequentialClicked, parameters: ["course_id": courseId, - "course_name": courseName, - "block_id": blockId, - "block_name": blockName]) - } - - public func verticalClicked(courseId: String, courseName: String, blockId: String, blockName: String) { - logEvent(.verticalClicked, parameters: ["course_id": courseId, - "course_name": courseName, - "block_id": blockId, - "block_name": blockName]) - } - - public func nextBlockClicked(courseId: String, courseName: String, blockId: String, blockName: String) { - logEvent(.nextBlockClicked, parameters: ["course_id": courseId, - "course_name": courseName, - "block_id": blockId, - "block_name": blockName]) - } - - public func prevBlockClicked(courseId: String, courseName: String, blockId: String, blockName: String) { - logEvent(.prevBlockClicked, parameters: ["course_id": courseId, - "course_name": courseName, - "block_id": blockId, - "block_name": blockName]) - } - - public func finishVerticalClicked(courseId: String, courseName: String, blockId: String, blockName: String) { - logEvent(.finishVerticalClicked, parameters: ["course_id": courseId, - "course_name": courseName, - "block_id": blockId, - "block_name": blockName]) - } - - public func finishVerticalNextSectionClicked(courseId: String, courseName: String, blockId: String, blockName: String) { - logEvent(.finishVerticalNextSectionClicked, parameters: ["course_id": courseId, - "course_name": courseName, - "block_id": blockId, - "block_name": blockName]) - } - - public func finishVerticalBackToOutlineClicked(courseId: String, courseName: String) { - logEvent(.finishVerticalBackToOutlineClicked, parameters: ["course_id": courseId, - "course_name": courseName]) - } - - public func courseOutlineCourseTabClicked(courseId: String, courseName: String) { - logEvent(.courseOutlineCourseTabClicked, parameters: ["course_id": courseId, - "course_name": courseName]) - } - - public func courseOutlineVideosTabClicked(courseId: String, courseName: String) { - logEvent(.courseOutlineVideosTabClicked, parameters: ["course_id": courseId, - "course_name": courseName]) - } - - public func courseOutlineDiscussionTabClicked(courseId: String, courseName: String) { - logEvent(.courseOutlineDiscussionTabClicked, parameters: ["course_id": courseId, - "course_name": courseName]) - } - - public func courseOutlineHandoutsTabClicked(courseId: String, courseName: String) { - logEvent(.courseOutlineHandoutsTabClicked, parameters: ["course_id": courseId, - "course_name": courseName]) - } - - // MARK: Discussion - - public func discussionAllPostsClicked(courseId: String, courseName: String) { - logEvent(.discussionAllPostsClicked, parameters: ["course_id": courseId, - "course_name": courseName]) - } - - public func discussionFollowingClicked(courseId: String, courseName: String) { - logEvent(.discussionFollowingClicked, parameters: ["course_id": courseId, - "course_name": courseName]) - } - - public func discussionTopicClicked(courseId: String, courseName: String, topicId: String, topicName: String) { - logEvent(.discussionAllPostsClicked, parameters: ["course_id": courseId, - "course_name": courseName, - "topic_id": topicId, - "topic_name": topicName]) - } -} diff --git a/Core/Core/Configuration/Connectivity.swift b/Core/Core/Configuration/Connectivity.swift index 7a04f494a..b825a9ddb 100644 --- a/Core/Core/Configuration/Connectivity.swift +++ b/Core/Core/Configuration/Connectivity.swift @@ -1,6 +1,6 @@ // // Connectivity.swift -// NewEdX +// OpenEdX // // Created by  Stepanok Ivan on 15.12.2022. // diff --git a/Course/Course.xcodeproj.xcworkspace/contents.xcworkspacedata b/Course/Course.xcodeproj.xcworkspace/contents.xcworkspacedata index b74ad64b7..6e6981f01 100644 --- a/Course/Course.xcodeproj.xcworkspace/contents.xcworkspacedata +++ b/Course/Course.xcodeproj.xcworkspace/contents.xcworkspacedata @@ -17,7 +17,7 @@ location = "group:../Discovery/Discovery.xcodeproj"> + location = "group:../OpenEdX.xcodeproj"> diff --git a/Course/Course.xcodeproj/project.pbxproj b/Course/Course.xcodeproj/project.pbxproj index 5af6ffb85..9baaaedb5 100644 --- a/Course/Course.xcodeproj/project.pbxproj +++ b/Course/Course.xcodeproj/project.pbxproj @@ -755,7 +755,7 @@ IPHONEOS_DEPLOYMENT_TARGET = 14.0; MACOSX_DEPLOYMENT_TARGET = 12.6; MARKETING_VERSION = 1.0; - PRODUCT_BUNDLE_IDENTIFIER = stepanok.CourseTests; + PRODUCT_BUNDLE_IDENTIFIER = org.openedx.CourseTests; PRODUCT_NAME = "$(TARGET_NAME)"; SDKROOT = auto; SUPPORTED_PLATFORMS = "iphoneos iphonesimulator macosx"; @@ -776,7 +776,7 @@ IPHONEOS_DEPLOYMENT_TARGET = 14.0; MACOSX_DEPLOYMENT_TARGET = 12.6; MARKETING_VERSION = 1.0; - PRODUCT_BUNDLE_IDENTIFIER = stepanok.CourseTests; + PRODUCT_BUNDLE_IDENTIFIER = org.openedx.CourseTests; PRODUCT_NAME = "$(TARGET_NAME)"; SDKROOT = auto; SUPPORTED_PLATFORMS = "iphoneos iphonesimulator macosx"; @@ -797,7 +797,7 @@ IPHONEOS_DEPLOYMENT_TARGET = 14.0; MACOSX_DEPLOYMENT_TARGET = 12.6; MARKETING_VERSION = 1.0; - PRODUCT_BUNDLE_IDENTIFIER = stepanok.CourseTests; + PRODUCT_BUNDLE_IDENTIFIER = org.openedx.CourseTests; PRODUCT_NAME = "$(TARGET_NAME)"; SDKROOT = auto; SUPPORTED_PLATFORMS = "iphoneos iphonesimulator macosx"; @@ -818,7 +818,7 @@ IPHONEOS_DEPLOYMENT_TARGET = 14.0; MACOSX_DEPLOYMENT_TARGET = 12.6; MARKETING_VERSION = 1.0; - PRODUCT_BUNDLE_IDENTIFIER = stepanok.CourseTests; + PRODUCT_BUNDLE_IDENTIFIER = org.openedx.CourseTests; PRODUCT_NAME = "$(TARGET_NAME)"; SDKROOT = auto; SUPPORTED_PLATFORMS = "iphoneos iphonesimulator macosx"; @@ -839,7 +839,7 @@ IPHONEOS_DEPLOYMENT_TARGET = 14.0; MACOSX_DEPLOYMENT_TARGET = 12.6; MARKETING_VERSION = 1.0; - PRODUCT_BUNDLE_IDENTIFIER = stepanok.CourseTests; + PRODUCT_BUNDLE_IDENTIFIER = org.openedx.CourseTests; PRODUCT_NAME = "$(TARGET_NAME)"; SDKROOT = auto; SUPPORTED_PLATFORMS = "iphoneos iphonesimulator macosx"; @@ -860,7 +860,7 @@ IPHONEOS_DEPLOYMENT_TARGET = 14.0; MACOSX_DEPLOYMENT_TARGET = 12.6; MARKETING_VERSION = 1.0; - PRODUCT_BUNDLE_IDENTIFIER = stepanok.CourseTests; + PRODUCT_BUNDLE_IDENTIFIER = org.openedx.CourseTests; PRODUCT_NAME = "$(TARGET_NAME)"; SDKROOT = auto; SUPPORTED_PLATFORMS = "iphoneos iphonesimulator macosx"; @@ -1014,7 +1014,7 @@ "@loader_path/Frameworks", ); MARKETING_VERSION = 1.0; - PRODUCT_BUNDLE_IDENTIFIER = com.raccoongang.CourseDetails; + PRODUCT_BUNDLE_IDENTIFIER = org.openedx.CourseDetails; PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)"; SKIP_INSTALL = YES; SUPPORTED_PLATFORMS = "iphoneos iphonesimulator"; @@ -1049,7 +1049,7 @@ "@loader_path/Frameworks", ); MARKETING_VERSION = 1.0; - PRODUCT_BUNDLE_IDENTIFIER = com.raccoongang.CourseDetails; + PRODUCT_BUNDLE_IDENTIFIER = org.openedx.CourseDetails; PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)"; SKIP_INSTALL = YES; SUPPORTED_PLATFORMS = "iphoneos iphonesimulator"; @@ -1147,7 +1147,7 @@ "@loader_path/Frameworks", ); MARKETING_VERSION = 1.0; - PRODUCT_BUNDLE_IDENTIFIER = com.raccoongang.CourseDetails; + PRODUCT_BUNDLE_IDENTIFIER = org.openedx.CourseDetails; PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)"; SKIP_INSTALL = YES; SUPPORTED_PLATFORMS = "iphoneos iphonesimulator"; @@ -1246,7 +1246,7 @@ "@loader_path/Frameworks", ); MARKETING_VERSION = 1.0; - PRODUCT_BUNDLE_IDENTIFIER = com.raccoongang.CourseDetails; + PRODUCT_BUNDLE_IDENTIFIER = org.openedx.CourseDetails; PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)"; SKIP_INSTALL = YES; SUPPORTED_PLATFORMS = "iphoneos iphonesimulator"; @@ -1339,7 +1339,7 @@ "@loader_path/Frameworks", ); MARKETING_VERSION = 1.0; - PRODUCT_BUNDLE_IDENTIFIER = com.raccoongang.CourseDetails; + PRODUCT_BUNDLE_IDENTIFIER = org.openedx.CourseDetails; PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)"; SKIP_INSTALL = YES; SUPPORTED_PLATFORMS = "iphoneos iphonesimulator"; @@ -1431,7 +1431,7 @@ "@loader_path/Frameworks", ); MARKETING_VERSION = 1.0; - PRODUCT_BUNDLE_IDENTIFIER = com.raccoongang.CourseDetails; + PRODUCT_BUNDLE_IDENTIFIER = org.openedx.CourseDetails; PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)"; SKIP_INSTALL = YES; SUPPORTED_PLATFORMS = "iphoneos iphonesimulator"; @@ -1529,7 +1529,7 @@ "@loader_path/Frameworks", ); MARKETING_VERSION = 1.0; - PRODUCT_BUNDLE_IDENTIFIER = com.raccoongang.CourseDetails; + PRODUCT_BUNDLE_IDENTIFIER = org.openedx.CourseDetails; PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)"; SKIP_INSTALL = YES; SUPPORTED_PLATFORMS = "iphoneos iphonesimulator"; @@ -1553,7 +1553,7 @@ IPHONEOS_DEPLOYMENT_TARGET = 14.0; MACOSX_DEPLOYMENT_TARGET = 12.6; MARKETING_VERSION = 1.0; - PRODUCT_BUNDLE_IDENTIFIER = stepanok.CourseTests; + PRODUCT_BUNDLE_IDENTIFIER = org.openedx.CourseTests; PRODUCT_NAME = "$(TARGET_NAME)"; SDKROOT = auto; SUPPORTED_PLATFORMS = "iphoneos iphonesimulator macosx"; @@ -1643,7 +1643,7 @@ "@loader_path/Frameworks", ); MARKETING_VERSION = 1.0; - PRODUCT_BUNDLE_IDENTIFIER = com.raccoongang.CourseDetails; + PRODUCT_BUNDLE_IDENTIFIER = org.openedx.CourseDetails; PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)"; SKIP_INSTALL = YES; SUPPORTED_PLATFORMS = "iphoneos iphonesimulator"; @@ -1666,7 +1666,7 @@ IPHONEOS_DEPLOYMENT_TARGET = 14.0; MACOSX_DEPLOYMENT_TARGET = 12.6; MARKETING_VERSION = 1.0; - PRODUCT_BUNDLE_IDENTIFIER = stepanok.CourseTests; + PRODUCT_BUNDLE_IDENTIFIER = org.openedx.CourseTests; PRODUCT_NAME = "$(TARGET_NAME)"; SDKROOT = auto; SUPPORTED_PLATFORMS = "iphoneos iphonesimulator macosx"; diff --git a/Dashboard/Dashboard.xcodeproj.xcworkspace/contents.xcworkspacedata b/Dashboard/Dashboard.xcodeproj.xcworkspace/contents.xcworkspacedata index 33772a869..fe487fea7 100644 --- a/Dashboard/Dashboard.xcodeproj.xcworkspace/contents.xcworkspacedata +++ b/Dashboard/Dashboard.xcodeproj.xcworkspace/contents.xcworkspacedata @@ -14,7 +14,7 @@ location = "group:../Discovery/Discovery.xcodeproj"> + location = "group:../OpenEdX.xcodeproj"> diff --git a/Dashboard/Dashboard.xcodeproj/project.pbxproj b/Dashboard/Dashboard.xcodeproj/project.pbxproj index b5103d7da..4aee39a87 100644 --- a/Dashboard/Dashboard.xcodeproj/project.pbxproj +++ b/Dashboard/Dashboard.xcodeproj/project.pbxproj @@ -491,7 +491,7 @@ IPHONEOS_DEPLOYMENT_TARGET = 14.0; MACOSX_DEPLOYMENT_TARGET = 12.6; MARKETING_VERSION = 1.0; - PRODUCT_BUNDLE_IDENTIFIER = stepanok.DashboardTests; + PRODUCT_BUNDLE_IDENTIFIER = org.openedx.DashboardTests; PRODUCT_NAME = "$(TARGET_NAME)"; SDKROOT = auto; SUPPORTED_PLATFORMS = "iphoneos iphonesimulator macosx"; @@ -512,7 +512,7 @@ IPHONEOS_DEPLOYMENT_TARGET = 14.0; MACOSX_DEPLOYMENT_TARGET = 12.6; MARKETING_VERSION = 1.0; - PRODUCT_BUNDLE_IDENTIFIER = stepanok.DashboardTests; + PRODUCT_BUNDLE_IDENTIFIER = org.openedx.DashboardTests; PRODUCT_NAME = "$(TARGET_NAME)"; SDKROOT = auto; SUPPORTED_PLATFORMS = "iphoneos iphonesimulator macosx"; @@ -533,7 +533,7 @@ IPHONEOS_DEPLOYMENT_TARGET = 14.0; MACOSX_DEPLOYMENT_TARGET = 12.6; MARKETING_VERSION = 1.0; - PRODUCT_BUNDLE_IDENTIFIER = stepanok.DashboardTests; + PRODUCT_BUNDLE_IDENTIFIER = org.openedx.DashboardTests; PRODUCT_NAME = "$(TARGET_NAME)"; SDKROOT = auto; SUPPORTED_PLATFORMS = "iphoneos iphonesimulator macosx"; @@ -554,7 +554,7 @@ IPHONEOS_DEPLOYMENT_TARGET = 14.0; MACOSX_DEPLOYMENT_TARGET = 12.6; MARKETING_VERSION = 1.0; - PRODUCT_BUNDLE_IDENTIFIER = stepanok.DashboardTests; + PRODUCT_BUNDLE_IDENTIFIER = org.openedx.DashboardTests; PRODUCT_NAME = "$(TARGET_NAME)"; SDKROOT = auto; SUPPORTED_PLATFORMS = "iphoneos iphonesimulator macosx"; @@ -575,7 +575,7 @@ IPHONEOS_DEPLOYMENT_TARGET = 14.0; MACOSX_DEPLOYMENT_TARGET = 12.6; MARKETING_VERSION = 1.0; - PRODUCT_BUNDLE_IDENTIFIER = stepanok.DashboardTests; + PRODUCT_BUNDLE_IDENTIFIER = org.openedx.DashboardTests; PRODUCT_NAME = "$(TARGET_NAME)"; SDKROOT = auto; SUPPORTED_PLATFORMS = "iphoneos iphonesimulator macosx"; @@ -596,7 +596,7 @@ IPHONEOS_DEPLOYMENT_TARGET = 14.0; MACOSX_DEPLOYMENT_TARGET = 12.6; MARKETING_VERSION = 1.0; - PRODUCT_BUNDLE_IDENTIFIER = stepanok.DashboardTests; + PRODUCT_BUNDLE_IDENTIFIER = org.openedx.DashboardTests; PRODUCT_NAME = "$(TARGET_NAME)"; SDKROOT = auto; SUPPORTED_PLATFORMS = "iphoneos iphonesimulator macosx"; @@ -692,7 +692,7 @@ "@loader_path/Frameworks", ); MARKETING_VERSION = 1.0; - PRODUCT_BUNDLE_IDENTIFIER = com.raccoongang.Dashboard; + PRODUCT_BUNDLE_IDENTIFIER = org.openedx.Dashboard; PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)"; SKIP_INSTALL = YES; SUPPORTED_PLATFORMS = "iphoneos iphonesimulator"; @@ -716,7 +716,7 @@ IPHONEOS_DEPLOYMENT_TARGET = 14.0; MACOSX_DEPLOYMENT_TARGET = 12.6; MARKETING_VERSION = 1.0; - PRODUCT_BUNDLE_IDENTIFIER = stepanok.DashboardTests; + PRODUCT_BUNDLE_IDENTIFIER = org.openedx.DashboardTests; PRODUCT_NAME = "$(TARGET_NAME)"; SDKROOT = auto; SUPPORTED_PLATFORMS = "iphoneos iphonesimulator macosx"; @@ -806,7 +806,7 @@ "@loader_path/Frameworks", ); MARKETING_VERSION = 1.0; - PRODUCT_BUNDLE_IDENTIFIER = com.raccoongang.Dashboard; + PRODUCT_BUNDLE_IDENTIFIER = org.openedx.Dashboard; PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)"; SKIP_INSTALL = YES; SUPPORTED_PLATFORMS = "iphoneos iphonesimulator"; @@ -829,7 +829,7 @@ IPHONEOS_DEPLOYMENT_TARGET = 14.0; MACOSX_DEPLOYMENT_TARGET = 12.6; MARKETING_VERSION = 1.0; - PRODUCT_BUNDLE_IDENTIFIER = stepanok.DashboardTests; + PRODUCT_BUNDLE_IDENTIFIER = org.openedx.DashboardTests; PRODUCT_NAME = "$(TARGET_NAME)"; SDKROOT = auto; SUPPORTED_PLATFORMS = "iphoneos iphonesimulator macosx"; @@ -983,7 +983,7 @@ "@loader_path/Frameworks", ); MARKETING_VERSION = 1.0; - PRODUCT_BUNDLE_IDENTIFIER = com.raccoongang.Dashboard; + PRODUCT_BUNDLE_IDENTIFIER = org.openedx.Dashboard; PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)"; SKIP_INSTALL = YES; SUPPORTED_PLATFORMS = "iphoneos iphonesimulator"; @@ -1018,7 +1018,7 @@ "@loader_path/Frameworks", ); MARKETING_VERSION = 1.0; - PRODUCT_BUNDLE_IDENTIFIER = com.raccoongang.Dashboard; + PRODUCT_BUNDLE_IDENTIFIER = org.openedx.Dashboard; PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)"; SKIP_INSTALL = YES; SUPPORTED_PLATFORMS = "iphoneos iphonesimulator"; @@ -1116,7 +1116,7 @@ "@loader_path/Frameworks", ); MARKETING_VERSION = 1.0; - PRODUCT_BUNDLE_IDENTIFIER = com.raccoongang.Dashboard; + PRODUCT_BUNDLE_IDENTIFIER = org.openedx.Dashboard; PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)"; SKIP_INSTALL = YES; SUPPORTED_PLATFORMS = "iphoneos iphonesimulator"; @@ -1209,7 +1209,7 @@ "@loader_path/Frameworks", ); MARKETING_VERSION = 1.0; - PRODUCT_BUNDLE_IDENTIFIER = com.raccoongang.Dashboard; + PRODUCT_BUNDLE_IDENTIFIER = org.openedx.Dashboard; PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)"; SKIP_INSTALL = YES; SUPPORTED_PLATFORMS = "iphoneos iphonesimulator"; @@ -1307,7 +1307,7 @@ "@loader_path/Frameworks", ); MARKETING_VERSION = 1.0; - PRODUCT_BUNDLE_IDENTIFIER = com.raccoongang.Dashboard; + PRODUCT_BUNDLE_IDENTIFIER = org.openedx.Dashboard; PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)"; SKIP_INSTALL = YES; SUPPORTED_PLATFORMS = "iphoneos iphonesimulator"; @@ -1400,7 +1400,7 @@ "@loader_path/Frameworks", ); MARKETING_VERSION = 1.0; - PRODUCT_BUNDLE_IDENTIFIER = com.raccoongang.Dashboard; + PRODUCT_BUNDLE_IDENTIFIER = org.openedx.Dashboard; PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)"; SKIP_INSTALL = YES; SUPPORTED_PLATFORMS = "iphoneos iphonesimulator"; diff --git a/Discovery/Discovery.xcodeproj.xcworkspace/contents.xcworkspacedata b/Discovery/Discovery.xcodeproj.xcworkspace/contents.xcworkspacedata index 9ccd451c4..21947269f 100644 --- a/Discovery/Discovery.xcodeproj.xcworkspace/contents.xcworkspacedata +++ b/Discovery/Discovery.xcodeproj.xcworkspace/contents.xcworkspacedata @@ -11,7 +11,7 @@ location = "group:Discovery.xcodeproj"> + location = "group:../OpenEdX.xcodeproj"> diff --git a/Discovery/Discovery.xcodeproj/project.pbxproj b/Discovery/Discovery.xcodeproj/project.pbxproj index b6213f2ff..59b0d96ae 100644 --- a/Discovery/Discovery.xcodeproj/project.pbxproj +++ b/Discovery/Discovery.xcodeproj/project.pbxproj @@ -517,7 +517,7 @@ IPHONEOS_DEPLOYMENT_TARGET = 14.0; MACOSX_DEPLOYMENT_TARGET = 12.6; MARKETING_VERSION = 1.0; - PRODUCT_BUNDLE_IDENTIFIER = stepanok.DiscoveryUnitTests; + PRODUCT_BUNDLE_IDENTIFIER = org.openedx.DiscoveryUnitTests; PRODUCT_NAME = "$(TARGET_NAME)"; SDKROOT = auto; SUPPORTED_PLATFORMS = "iphoneos iphonesimulator macosx"; @@ -538,7 +538,7 @@ IPHONEOS_DEPLOYMENT_TARGET = 14.0; MACOSX_DEPLOYMENT_TARGET = 12.6; MARKETING_VERSION = 1.0; - PRODUCT_BUNDLE_IDENTIFIER = stepanok.DiscoveryUnitTests; + PRODUCT_BUNDLE_IDENTIFIER = org.openedx.DiscoveryUnitTests; PRODUCT_NAME = "$(TARGET_NAME)"; SDKROOT = auto; SUPPORTED_PLATFORMS = "iphoneos iphonesimulator macosx"; @@ -559,7 +559,7 @@ IPHONEOS_DEPLOYMENT_TARGET = 14.0; MACOSX_DEPLOYMENT_TARGET = 12.6; MARKETING_VERSION = 1.0; - PRODUCT_BUNDLE_IDENTIFIER = stepanok.DiscoveryUnitTests; + PRODUCT_BUNDLE_IDENTIFIER = org.openedx.DiscoveryUnitTests; PRODUCT_NAME = "$(TARGET_NAME)"; SDKROOT = auto; SUPPORTED_PLATFORMS = "iphoneos iphonesimulator macosx"; @@ -580,7 +580,7 @@ IPHONEOS_DEPLOYMENT_TARGET = 14.0; MACOSX_DEPLOYMENT_TARGET = 12.6; MARKETING_VERSION = 1.0; - PRODUCT_BUNDLE_IDENTIFIER = stepanok.DiscoveryUnitTests; + PRODUCT_BUNDLE_IDENTIFIER = org.openedx.DiscoveryUnitTests; PRODUCT_NAME = "$(TARGET_NAME)"; SDKROOT = auto; SUPPORTED_PLATFORMS = "iphoneos iphonesimulator macosx"; @@ -601,7 +601,7 @@ IPHONEOS_DEPLOYMENT_TARGET = 14.0; MACOSX_DEPLOYMENT_TARGET = 12.6; MARKETING_VERSION = 1.0; - PRODUCT_BUNDLE_IDENTIFIER = stepanok.DiscoveryUnitTests; + PRODUCT_BUNDLE_IDENTIFIER = org.openedx.DiscoveryUnitTests; PRODUCT_NAME = "$(TARGET_NAME)"; SDKROOT = auto; SUPPORTED_PLATFORMS = "iphoneos iphonesimulator macosx"; @@ -622,7 +622,7 @@ IPHONEOS_DEPLOYMENT_TARGET = 14.0; MACOSX_DEPLOYMENT_TARGET = 12.6; MARKETING_VERSION = 1.0; - PRODUCT_BUNDLE_IDENTIFIER = stepanok.DiscoveryUnitTests; + PRODUCT_BUNDLE_IDENTIFIER = org.openedx.DiscoveryUnitTests; PRODUCT_NAME = "$(TARGET_NAME)"; SDKROOT = auto; SUPPORTED_PLATFORMS = "iphoneos iphonesimulator macosx"; @@ -718,7 +718,7 @@ "@loader_path/Frameworks", ); MARKETING_VERSION = 1.0; - PRODUCT_BUNDLE_IDENTIFIER = com.raccoongang.Discovery; + PRODUCT_BUNDLE_IDENTIFIER = org.openedx.Discovery; PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)"; SKIP_INSTALL = YES; SUPPORTED_PLATFORMS = "iphoneos iphonesimulator"; @@ -742,7 +742,7 @@ IPHONEOS_DEPLOYMENT_TARGET = 14.0; MACOSX_DEPLOYMENT_TARGET = 12.6; MARKETING_VERSION = 1.0; - PRODUCT_BUNDLE_IDENTIFIER = stepanok.DiscoveryUnitTests; + PRODUCT_BUNDLE_IDENTIFIER = org.openedx.DiscoveryUnitTests; PRODUCT_NAME = "$(TARGET_NAME)"; SDKROOT = auto; SUPPORTED_PLATFORMS = "iphoneos iphonesimulator macosx"; @@ -832,7 +832,7 @@ "@loader_path/Frameworks", ); MARKETING_VERSION = 1.0; - PRODUCT_BUNDLE_IDENTIFIER = com.raccoongang.Discovery; + PRODUCT_BUNDLE_IDENTIFIER = org.openedx.Discovery; PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)"; SKIP_INSTALL = YES; SUPPORTED_PLATFORMS = "iphoneos iphonesimulator"; @@ -855,7 +855,7 @@ IPHONEOS_DEPLOYMENT_TARGET = 14.0; MACOSX_DEPLOYMENT_TARGET = 12.6; MARKETING_VERSION = 1.0; - PRODUCT_BUNDLE_IDENTIFIER = stepanok.DiscoveryUnitTests; + PRODUCT_BUNDLE_IDENTIFIER = org.openedx.DiscoveryUnitTests; PRODUCT_NAME = "$(TARGET_NAME)"; SDKROOT = auto; SUPPORTED_PLATFORMS = "iphoneos iphonesimulator macosx"; @@ -1009,7 +1009,7 @@ "@loader_path/Frameworks", ); MARKETING_VERSION = 1.0; - PRODUCT_BUNDLE_IDENTIFIER = com.raccoongang.Discovery; + PRODUCT_BUNDLE_IDENTIFIER = org.openedx.Discovery; PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)"; SKIP_INSTALL = YES; SUPPORTED_PLATFORMS = "iphoneos iphonesimulator"; @@ -1044,7 +1044,7 @@ "@loader_path/Frameworks", ); MARKETING_VERSION = 1.0; - PRODUCT_BUNDLE_IDENTIFIER = com.raccoongang.Discovery; + PRODUCT_BUNDLE_IDENTIFIER = org.openedx.Discovery; PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)"; SKIP_INSTALL = YES; SUPPORTED_PLATFORMS = "iphoneos iphonesimulator"; @@ -1142,7 +1142,7 @@ "@loader_path/Frameworks", ); MARKETING_VERSION = 1.0; - PRODUCT_BUNDLE_IDENTIFIER = com.raccoongang.Discovery; + PRODUCT_BUNDLE_IDENTIFIER = org.openedx.Discovery; PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)"; SKIP_INSTALL = YES; SUPPORTED_PLATFORMS = "iphoneos iphonesimulator"; @@ -1241,7 +1241,7 @@ "@loader_path/Frameworks", ); MARKETING_VERSION = 1.0; - PRODUCT_BUNDLE_IDENTIFIER = com.raccoongang.Discovery; + PRODUCT_BUNDLE_IDENTIFIER = org.openedx.Discovery; PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)"; SKIP_INSTALL = YES; SUPPORTED_PLATFORMS = "iphoneos iphonesimulator"; @@ -1334,7 +1334,7 @@ "@loader_path/Frameworks", ); MARKETING_VERSION = 1.0; - PRODUCT_BUNDLE_IDENTIFIER = com.raccoongang.Discovery; + PRODUCT_BUNDLE_IDENTIFIER = org.openedx.Discovery; PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)"; SKIP_INSTALL = YES; SUPPORTED_PLATFORMS = "iphoneos iphonesimulator"; @@ -1426,7 +1426,7 @@ "@loader_path/Frameworks", ); MARKETING_VERSION = 1.0; - PRODUCT_BUNDLE_IDENTIFIER = com.raccoongang.Discovery; + PRODUCT_BUNDLE_IDENTIFIER = org.openedx.Discovery; PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)"; SKIP_INSTALL = YES; SUPPORTED_PLATFORMS = "iphoneos iphonesimulator"; diff --git a/Discussion/Discussion.xcodeproj.xcworkspace/contents.xcworkspacedata b/Discussion/Discussion.xcodeproj.xcworkspace/contents.xcworkspacedata index 698b13400..85b36c90c 100644 --- a/Discussion/Discussion.xcodeproj.xcworkspace/contents.xcworkspacedata +++ b/Discussion/Discussion.xcodeproj.xcworkspace/contents.xcworkspacedata @@ -19,9 +19,6 @@ - - @@ -29,6 +26,6 @@ location = "group:../Pods/Pods.xcodeproj"> + location = "group:../OpenEdX.xcodeproj"> diff --git a/Discussion/Discussion.xcodeproj/project.pbxproj b/Discussion/Discussion.xcodeproj/project.pbxproj index 8f4b4c86b..cfd6abaff 100644 --- a/Discussion/Discussion.xcodeproj/project.pbxproj +++ b/Discussion/Discussion.xcodeproj/project.pbxproj @@ -889,7 +889,7 @@ "@loader_path/Frameworks", ); MARKETING_VERSION = 1.0; - PRODUCT_BUNDLE_IDENTIFIER = com.raccoongang.Discussion; + PRODUCT_BUNDLE_IDENTIFIER = org.openedx.Discussion; PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)"; SKIP_INSTALL = YES; SUPPORTED_PLATFORMS = "iphoneos iphonesimulator"; @@ -923,7 +923,7 @@ "@loader_path/Frameworks", ); MARKETING_VERSION = 1.0; - PRODUCT_BUNDLE_IDENTIFIER = com.raccoongang.Discussion; + PRODUCT_BUNDLE_IDENTIFIER = org.openedx.Discussion; PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)"; SKIP_INSTALL = YES; SUPPORTED_PLATFORMS = "iphoneos iphonesimulator"; @@ -1020,7 +1020,7 @@ "@loader_path/Frameworks", ); MARKETING_VERSION = 1.0; - PRODUCT_BUNDLE_IDENTIFIER = com.raccoongang.Discussion; + PRODUCT_BUNDLE_IDENTIFIER = org.openedx.Discussion; PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)"; SKIP_INSTALL = YES; SUPPORTED_PLATFORMS = "iphoneos iphonesimulator"; @@ -1118,7 +1118,7 @@ "@loader_path/Frameworks", ); MARKETING_VERSION = 1.0; - PRODUCT_BUNDLE_IDENTIFIER = com.raccoongang.Discussion; + PRODUCT_BUNDLE_IDENTIFIER = org.openedx.Discussion; PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)"; SKIP_INSTALL = YES; SUPPORTED_PLATFORMS = "iphoneos iphonesimulator"; @@ -1210,7 +1210,7 @@ "@loader_path/Frameworks", ); MARKETING_VERSION = 1.0; - PRODUCT_BUNDLE_IDENTIFIER = com.raccoongang.Discussion; + PRODUCT_BUNDLE_IDENTIFIER = org.openedx.Discussion; PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)"; SKIP_INSTALL = YES; SUPPORTED_PLATFORMS = "iphoneos iphonesimulator"; @@ -1301,7 +1301,7 @@ "@loader_path/Frameworks", ); MARKETING_VERSION = 1.0; - PRODUCT_BUNDLE_IDENTIFIER = com.raccoongang.Discussion; + PRODUCT_BUNDLE_IDENTIFIER = org.openedx.Discussion; PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)"; SKIP_INSTALL = YES; SUPPORTED_PLATFORMS = "iphoneos iphonesimulator"; @@ -1324,7 +1324,7 @@ IPHONEOS_DEPLOYMENT_TARGET = 14.0; MACOSX_DEPLOYMENT_TARGET = 12.6; MARKETING_VERSION = 1.0; - PRODUCT_BUNDLE_IDENTIFIER = stepanok.DiscussionTests; + PRODUCT_BUNDLE_IDENTIFIER = org.openedx.DiscussionTests; PRODUCT_NAME = "$(TARGET_NAME)"; SDKROOT = auto; SUPPORTED_PLATFORMS = "iphoneos iphonesimulator macosx"; @@ -1345,7 +1345,7 @@ IPHONEOS_DEPLOYMENT_TARGET = 14.0; MACOSX_DEPLOYMENT_TARGET = 12.6; MARKETING_VERSION = 1.0; - PRODUCT_BUNDLE_IDENTIFIER = stepanok.DiscussionTests; + PRODUCT_BUNDLE_IDENTIFIER = org.openedx.DiscussionTests; PRODUCT_NAME = "$(TARGET_NAME)"; SDKROOT = auto; SUPPORTED_PLATFORMS = "iphoneos iphonesimulator macosx"; @@ -1366,7 +1366,7 @@ IPHONEOS_DEPLOYMENT_TARGET = 14.0; MACOSX_DEPLOYMENT_TARGET = 12.6; MARKETING_VERSION = 1.0; - PRODUCT_BUNDLE_IDENTIFIER = stepanok.DiscussionTests; + PRODUCT_BUNDLE_IDENTIFIER = org.openedx.DiscussionTests; PRODUCT_NAME = "$(TARGET_NAME)"; SDKROOT = auto; SUPPORTED_PLATFORMS = "iphoneos iphonesimulator macosx"; @@ -1387,7 +1387,7 @@ IPHONEOS_DEPLOYMENT_TARGET = 14.0; MACOSX_DEPLOYMENT_TARGET = 12.6; MARKETING_VERSION = 1.0; - PRODUCT_BUNDLE_IDENTIFIER = stepanok.DiscussionTests; + PRODUCT_BUNDLE_IDENTIFIER = org.openedx.DiscussionTests; PRODUCT_NAME = "$(TARGET_NAME)"; SDKROOT = auto; SUPPORTED_PLATFORMS = "iphoneos iphonesimulator macosx"; @@ -1408,7 +1408,7 @@ IPHONEOS_DEPLOYMENT_TARGET = 14.0; MACOSX_DEPLOYMENT_TARGET = 12.6; MARKETING_VERSION = 1.0; - PRODUCT_BUNDLE_IDENTIFIER = stepanok.DiscussionTests; + PRODUCT_BUNDLE_IDENTIFIER = org.openedx.DiscussionTests; PRODUCT_NAME = "$(TARGET_NAME)"; SDKROOT = auto; SUPPORTED_PLATFORMS = "iphoneos iphonesimulator macosx"; @@ -1429,7 +1429,7 @@ IPHONEOS_DEPLOYMENT_TARGET = 14.0; MACOSX_DEPLOYMENT_TARGET = 12.6; MARKETING_VERSION = 1.0; - PRODUCT_BUNDLE_IDENTIFIER = stepanok.DiscussionTests; + PRODUCT_BUNDLE_IDENTIFIER = org.openedx.DiscussionTests; PRODUCT_NAME = "$(TARGET_NAME)"; SDKROOT = auto; SUPPORTED_PLATFORMS = "iphoneos iphonesimulator macosx"; @@ -1524,7 +1524,7 @@ "@loader_path/Frameworks", ); MARKETING_VERSION = 1.0; - PRODUCT_BUNDLE_IDENTIFIER = com.raccoongang.Discussion; + PRODUCT_BUNDLE_IDENTIFIER = org.openedx.Discussion; PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)"; SKIP_INSTALL = YES; SUPPORTED_PLATFORMS = "iphoneos iphonesimulator"; @@ -1548,7 +1548,7 @@ IPHONEOS_DEPLOYMENT_TARGET = 14.0; MACOSX_DEPLOYMENT_TARGET = 12.6; MARKETING_VERSION = 1.0; - PRODUCT_BUNDLE_IDENTIFIER = stepanok.DiscussionTests; + PRODUCT_BUNDLE_IDENTIFIER = org.openedx.DiscussionTests; PRODUCT_NAME = "$(TARGET_NAME)"; SDKROOT = auto; SUPPORTED_PLATFORMS = "iphoneos iphonesimulator macosx"; @@ -1637,7 +1637,7 @@ "@loader_path/Frameworks", ); MARKETING_VERSION = 1.0; - PRODUCT_BUNDLE_IDENTIFIER = com.raccoongang.Discussion; + PRODUCT_BUNDLE_IDENTIFIER = org.openedx.Discussion; PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)"; SKIP_INSTALL = YES; SUPPORTED_PLATFORMS = "iphoneos iphonesimulator"; @@ -1660,7 +1660,7 @@ IPHONEOS_DEPLOYMENT_TARGET = 14.0; MACOSX_DEPLOYMENT_TARGET = 12.6; MARKETING_VERSION = 1.0; - PRODUCT_BUNDLE_IDENTIFIER = stepanok.DiscussionTests; + PRODUCT_BUNDLE_IDENTIFIER = org.openedx.DiscussionTests; PRODUCT_NAME = "$(TARGET_NAME)"; SDKROOT = auto; SUPPORTED_PLATFORMS = "iphoneos iphonesimulator macosx"; diff --git a/NewEdX.xcodeproj/project.pbxproj b/OpenEdX.xcodeproj/project.pbxproj similarity index 89% rename from NewEdX.xcodeproj/project.pbxproj rename to OpenEdX.xcodeproj/project.pbxproj index 90dfa72b7..35a452168 100644 --- a/NewEdX.xcodeproj/project.pbxproj +++ b/OpenEdX.xcodeproj/project.pbxproj @@ -38,7 +38,7 @@ 07D5DA3528D075AA00752FD9 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 07D5DA3428D075AA00752FD9 /* AppDelegate.swift */; }; 07D5DA3E28D075AB00752FD9 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 07D5DA3D28D075AB00752FD9 /* Assets.xcassets */; }; 07D5DA4128D075AB00752FD9 /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 07D5DA3F28D075AB00752FD9 /* LaunchScreen.storyboard */; }; - F9D8E3EA58261028C3968180 /* Pods_App_NewEdX.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 16B61E47E3D4524ED0463D63 /* Pods_App_NewEdX.framework */; }; + 95C140F3BDF778364986E83B /* Pods_App_OpenEdX.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F138C15C3A2515F8F94DAA8B /* Pods_App_OpenEdX.framework */; }; /* End PBXBuildFile section */ /* Begin PBXCopyFilesBuildPhase section */ @@ -68,7 +68,7 @@ 02512FF1299534300024D438 /* CoreDataHandler.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CoreDataHandler.swift; sourceTree = ""; }; 025C77A028E463E900B3DFA3 /* CourseOutline.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = CourseOutline.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 025DE1A328DB4DAE0053E0F4 /* Profile.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = Profile.framework; sourceTree = BUILT_PRODUCTS_DIR; }; - 025EF2F7297177F300B838AB /* NewEdX.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = NewEdX.entitlements; sourceTree = ""; }; + 025EF2F7297177F300B838AB /* OpenEdX.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = OpenEdX.entitlements; sourceTree = ""; }; 027DB32F28D8A063002B6862 /* Dashboard.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = Dashboard.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 0298DF2F2A4EF7230023A257 /* AnalyticsManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AnalyticsManager.swift; sourceTree = ""; }; 02B6B3C428E1E61400232911 /* CourseDetails.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = CourseDetails.framework; sourceTree = BUILT_PRODUCTS_DIR; }; @@ -91,17 +91,17 @@ 0770DE4F28D0A707006D8A5D /* NetworkAssembly.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NetworkAssembly.swift; sourceTree = ""; }; 0770DE6528D0BCC7006D8A5D /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/Localizable.strings; sourceTree = ""; }; 07A7D78E28F5C9060000BE81 /* Core.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = Core.framework; sourceTree = BUILT_PRODUCTS_DIR; }; - 07D5DA3128D075AA00752FD9 /* NewEdX.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = NewEdX.app; sourceTree = BUILT_PRODUCTS_DIR; }; + 07D5DA3128D075AA00752FD9 /* OpenEdX.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = OpenEdX.app; sourceTree = BUILT_PRODUCTS_DIR; }; 07D5DA3428D075AA00752FD9 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = ""; }; 07D5DA3D28D075AB00752FD9 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = ""; }; 07D5DA4028D075AB00752FD9 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = ""; }; - 16B61E47E3D4524ED0463D63 /* Pods_App_NewEdX.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_App_NewEdX.framework; sourceTree = BUILT_PRODUCTS_DIR; }; - 31F7D13F89ABEA0C978F4988 /* Pods-App-NewEdX.debugstage.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-App-NewEdX.debugstage.xcconfig"; path = "Target Support Files/Pods-App-NewEdX/Pods-App-NewEdX.debugstage.xcconfig"; sourceTree = ""; }; - 92E99692D520163574381814 /* Pods-App-NewEdX.releasestage.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-App-NewEdX.releasestage.xcconfig"; path = "Target Support Files/Pods-App-NewEdX/Pods-App-NewEdX.releasestage.xcconfig"; sourceTree = ""; }; - B65009A9300CA1C0AA1ADA13 /* Pods-App-NewEdX.debugprod.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-App-NewEdX.debugprod.xcconfig"; path = "Target Support Files/Pods-App-NewEdX/Pods-App-NewEdX.debugprod.xcconfig"; sourceTree = ""; }; - B7A07A23F1B105D41A41426C /* Pods-App-NewEdX.debugdev.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-App-NewEdX.debugdev.xcconfig"; path = "Target Support Files/Pods-App-NewEdX/Pods-App-NewEdX.debugdev.xcconfig"; sourceTree = ""; }; - DAFCB10EBCC10B9CE95D5140 /* Pods-App-NewEdX.releasedev.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-App-NewEdX.releasedev.xcconfig"; path = "Target Support Files/Pods-App-NewEdX/Pods-App-NewEdX.releasedev.xcconfig"; sourceTree = ""; }; - E8680E764DC8A25C24EA74D5 /* Pods-App-NewEdX.releaseprod.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-App-NewEdX.releaseprod.xcconfig"; path = "Target Support Files/Pods-App-NewEdX/Pods-App-NewEdX.releaseprod.xcconfig"; sourceTree = ""; }; + 1499CCAD7A0D8A3E6AF39794 /* Pods-App-OpenEdX.debugprod.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-App-OpenEdX.debugprod.xcconfig"; path = "Target Support Files/Pods-App-OpenEdX/Pods-App-OpenEdX.debugprod.xcconfig"; sourceTree = ""; }; + 6F54C19C823A769E18923FA8 /* Pods-App-OpenEdX.debugstage.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-App-OpenEdX.debugstage.xcconfig"; path = "Target Support Files/Pods-App-OpenEdX/Pods-App-OpenEdX.debugstage.xcconfig"; sourceTree = ""; }; + 8284179FC05AEE2591573E20 /* Pods-App-OpenEdX.debugdev.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-App-OpenEdX.debugdev.xcconfig"; path = "Target Support Files/Pods-App-OpenEdX/Pods-App-OpenEdX.debugdev.xcconfig"; sourceTree = ""; }; + A24D6A8E1BC4DF46AD68904C /* Pods-App-OpenEdX.releaseprod.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-App-OpenEdX.releaseprod.xcconfig"; path = "Target Support Files/Pods-App-OpenEdX/Pods-App-OpenEdX.releaseprod.xcconfig"; sourceTree = ""; }; + A89AD827F52CF6A6B903606E /* Pods-App-OpenEdX.releasestage.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-App-OpenEdX.releasestage.xcconfig"; path = "Target Support Files/Pods-App-OpenEdX/Pods-App-OpenEdX.releasestage.xcconfig"; sourceTree = ""; }; + BB08ACD2CCA33D6DDDDD31B4 /* Pods-App-OpenEdX.releasedev.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-App-OpenEdX.releasedev.xcconfig"; path = "Target Support Files/Pods-App-OpenEdX/Pods-App-OpenEdX.releasedev.xcconfig"; sourceTree = ""; }; + F138C15C3A2515F8F94DAA8B /* Pods_App_OpenEdX.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_App_OpenEdX.framework; sourceTree = BUILT_PRODUCTS_DIR; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -116,7 +116,7 @@ 0218196428F734FA00202564 /* Discussion.framework in Frameworks */, 0219C67728F4347600D64452 /* Course.framework in Frameworks */, 027DB33028D8A063002B6862 /* Dashboard.framework in Frameworks */, - F9D8E3EA58261028C3968180 /* Pods_App_NewEdX.framework in Frameworks */, + 95C140F3BDF778364986E83B /* Pods_App_OpenEdX.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -144,7 +144,7 @@ 07D5DA2828D075AA00752FD9 = { isa = PBXGroup; children = ( - 07D5DA3328D075AA00752FD9 /* NewEdX */, + 07D5DA3328D075AA00752FD9 /* OpenEdX */, 07D5DA3228D075AA00752FD9 /* Products */, 55A895025FB07897BA68E063 /* Pods */, 4E6FB43543890E90BB88D64D /* Frameworks */, @@ -154,15 +154,15 @@ 07D5DA3228D075AA00752FD9 /* Products */ = { isa = PBXGroup; children = ( - 07D5DA3128D075AA00752FD9 /* NewEdX.app */, + 07D5DA3128D075AA00752FD9 /* OpenEdX.app */, ); name = Products; sourceTree = ""; }; - 07D5DA3328D075AA00752FD9 /* NewEdX */ = { + 07D5DA3328D075AA00752FD9 /* OpenEdX */ = { isa = PBXGroup; children = ( - 025EF2F7297177F300B838AB /* NewEdX.entitlements */, + 025EF2F7297177F300B838AB /* OpenEdX.entitlements */, 07D5DA3428D075AA00752FD9 /* AppDelegate.swift */, 0770DE1628D080A1006D8A5D /* RouteController.swift */, 0770DE1F28D0858A006D8A5D /* Router.swift */, @@ -180,7 +180,7 @@ 02ED50D629A6554E008341CD /* сountries.json */, 0770DE6628D0BCC7006D8A5D /* Localizable.strings */, ); - path = NewEdX; + path = OpenEdX; sourceTree = ""; }; 4E6FB43543890E90BB88D64D /* Frameworks */ = { @@ -196,7 +196,7 @@ 072787B028D34D83002E9142 /* Discovery.framework */, 0770DE4A28D0A462006D8A5D /* Authorization.framework */, 0770DE1228D07845006D8A5D /* Core.framework */, - 16B61E47E3D4524ED0463D63 /* Pods_App_NewEdX.framework */, + F138C15C3A2515F8F94DAA8B /* Pods_App_OpenEdX.framework */, ); name = Frameworks; sourceTree = ""; @@ -204,12 +204,12 @@ 55A895025FB07897BA68E063 /* Pods */ = { isa = PBXGroup; children = ( - B65009A9300CA1C0AA1ADA13 /* Pods-App-NewEdX.debugprod.xcconfig */, - 31F7D13F89ABEA0C978F4988 /* Pods-App-NewEdX.debugstage.xcconfig */, - B7A07A23F1B105D41A41426C /* Pods-App-NewEdX.debugdev.xcconfig */, - E8680E764DC8A25C24EA74D5 /* Pods-App-NewEdX.releaseprod.xcconfig */, - 92E99692D520163574381814 /* Pods-App-NewEdX.releasestage.xcconfig */, - DAFCB10EBCC10B9CE95D5140 /* Pods-App-NewEdX.releasedev.xcconfig */, + 1499CCAD7A0D8A3E6AF39794 /* Pods-App-OpenEdX.debugprod.xcconfig */, + 6F54C19C823A769E18923FA8 /* Pods-App-OpenEdX.debugstage.xcconfig */, + 8284179FC05AEE2591573E20 /* Pods-App-OpenEdX.debugdev.xcconfig */, + A24D6A8E1BC4DF46AD68904C /* Pods-App-OpenEdX.releaseprod.xcconfig */, + A89AD827F52CF6A6B903606E /* Pods-App-OpenEdX.releasestage.xcconfig */, + BB08ACD2CCA33D6DDDDD31B4 /* Pods-App-OpenEdX.releasedev.xcconfig */, ); path = Pods; sourceTree = ""; @@ -217,11 +217,11 @@ /* End PBXGroup section */ /* Begin PBXNativeTarget section */ - 07D5DA3028D075AA00752FD9 /* NewEdX */ = { + 07D5DA3028D075AA00752FD9 /* OpenEdX */ = { isa = PBXNativeTarget; - buildConfigurationList = 07D5DA4528D075AB00752FD9 /* Build configuration list for PBXNativeTarget "NewEdX" */; + buildConfigurationList = 07D5DA4528D075AB00752FD9 /* Build configuration list for PBXNativeTarget "OpenEdX" */; buildPhases = ( - 46EB6B53644A79B05619EEAD /* [CP] Check Pods Manifest.lock */, + 3165870BC90D2FA438CFF0A9 /* [CP] Check Pods Manifest.lock */, 0770DE2328D08647006D8A5D /* SwiftLint */, 07D5DA2D28D075AA00752FD9 /* Sources */, 07D5DA2E28D075AA00752FD9 /* Frameworks */, @@ -233,9 +233,9 @@ ); dependencies = ( ); - name = NewEdX; - productName = NewEdX; - productReference = 07D5DA3128D075AA00752FD9 /* NewEdX.app */; + name = OpenEdX; + productName = OpenEdX; + productReference = 07D5DA3128D075AA00752FD9 /* OpenEdX.app */; productType = "com.apple.product-type.application"; }; /* End PBXNativeTarget section */ @@ -253,7 +253,7 @@ }; }; }; - buildConfigurationList = 07D5DA2C28D075AA00752FD9 /* Build configuration list for PBXProject "NewEdX" */; + buildConfigurationList = 07D5DA2C28D075AA00752FD9 /* Build configuration list for PBXProject "OpenEdX" */; compatibilityVersion = "Xcode 13.0"; developmentRegion = en; hasScannedForEncodings = 0; @@ -267,7 +267,7 @@ projectDirPath = ""; projectRoot = ""; targets = ( - 07D5DA3028D075AA00752FD9 /* NewEdX */, + 07D5DA3028D075AA00752FD9 /* OpenEdX */, ); }; /* End PBXProject section */ @@ -325,7 +325,7 @@ shellPath = /bin/sh; shellScript = "\"${PODS_ROOT}/SwiftLint/swiftlint\"\n"; }; - 46EB6B53644A79B05619EEAD /* [CP] Check Pods Manifest.lock */ = { + 3165870BC90D2FA438CFF0A9 /* [CP] Check Pods Manifest.lock */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( @@ -340,7 +340,7 @@ outputFileListPaths = ( ); outputPaths = ( - "$(DERIVED_FILE_DIR)/Pods-App-NewEdX-checkManifestLockResult.txt", + "$(DERIVED_FILE_DIR)/Pods-App-OpenEdX-checkManifestLockResult.txt", ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; @@ -472,16 +472,16 @@ }; 02DD1C9629E80CC200F35DCE /* DebugStage */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 31F7D13F89ABEA0C978F4988 /* Pods-App-NewEdX.debugstage.xcconfig */; + baseConfigurationReference = 6F54C19C823A769E18923FA8 /* Pods-App-OpenEdX.debugstage.xcconfig */; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor; - CODE_SIGN_ENTITLEMENTS = NewEdX/NewEdX.entitlements; + CODE_SIGN_ENTITLEMENTS = OpenEdX/OpenEdX.entitlements; CODE_SIGN_STYLE = Automatic; CURRENT_PROJECT_VERSION = 1; DEVELOPMENT_TEAM = L8PG7LC3Y3; GENERATE_INFOPLIST_FILE = YES; - INFOPLIST_FILE = NewEdX/Info.plist; + INFOPLIST_FILE = OpenEdX/Info.plist; INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.education"; INFOPLIST_KEY_UIApplicationSupportsIndirectInputEvents = YES; INFOPLIST_KEY_UILaunchStoryboardName = LaunchScreen; @@ -494,7 +494,7 @@ "@executable_path/Frameworks", ); MARKETING_VERSION = 0.1; - PRODUCT_BUNDLE_IDENTIFIER = com.raccoongang.NewEdX.stage; + PRODUCT_BUNDLE_IDENTIFIER = org.openedx.app.stage; PRODUCT_NAME = "$(TARGET_NAME) Stage"; SUPPORTED_PLATFORMS = "iphoneos iphonesimulator"; SUPPORTS_MACCATALYST = NO; @@ -561,16 +561,16 @@ }; 02DD1C9829E80CCB00F35DCE /* ReleaseStage */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 92E99692D520163574381814 /* Pods-App-NewEdX.releasestage.xcconfig */; + baseConfigurationReference = A89AD827F52CF6A6B903606E /* Pods-App-OpenEdX.releasestage.xcconfig */; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor; - CODE_SIGN_ENTITLEMENTS = NewEdX/NewEdX.entitlements; + CODE_SIGN_ENTITLEMENTS = OpenEdX/OpenEdX.entitlements; CODE_SIGN_STYLE = Automatic; CURRENT_PROJECT_VERSION = 1; DEVELOPMENT_TEAM = L8PG7LC3Y3; GENERATE_INFOPLIST_FILE = YES; - INFOPLIST_FILE = NewEdX/Info.plist; + INFOPLIST_FILE = OpenEdX/Info.plist; INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.education"; INFOPLIST_KEY_UIApplicationSupportsIndirectInputEvents = YES; INFOPLIST_KEY_UILaunchStoryboardName = LaunchScreen; @@ -583,7 +583,7 @@ "@executable_path/Frameworks", ); MARKETING_VERSION = 0.1; - PRODUCT_BUNDLE_IDENTIFIER = com.raccoongang.NewEdX.stage; + PRODUCT_BUNDLE_IDENTIFIER = org.openedx.app.stage; PRODUCT_NAME = "$(TARGET_NAME) Stage"; SUPPORTED_PLATFORMS = "iphoneos iphonesimulator"; SUPPORTS_MACCATALYST = NO; @@ -656,16 +656,16 @@ }; 0727875928D231FD002E9142 /* DebugDev */ = { isa = XCBuildConfiguration; - baseConfigurationReference = B7A07A23F1B105D41A41426C /* Pods-App-NewEdX.debugdev.xcconfig */; + baseConfigurationReference = 8284179FC05AEE2591573E20 /* Pods-App-OpenEdX.debugdev.xcconfig */; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor; - CODE_SIGN_ENTITLEMENTS = NewEdX/NewEdX.entitlements; + CODE_SIGN_ENTITLEMENTS = OpenEdX/OpenEdX.entitlements; CODE_SIGN_STYLE = Automatic; CURRENT_PROJECT_VERSION = 1; DEVELOPMENT_TEAM = L8PG7LC3Y3; GENERATE_INFOPLIST_FILE = YES; - INFOPLIST_FILE = NewEdX/Info.plist; + INFOPLIST_FILE = OpenEdX/Info.plist; INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.education"; INFOPLIST_KEY_UIApplicationSupportsIndirectInputEvents = YES; INFOPLIST_KEY_UILaunchStoryboardName = LaunchScreen; @@ -678,7 +678,7 @@ "@executable_path/Frameworks", ); MARKETING_VERSION = 0.1; - PRODUCT_BUNDLE_IDENTIFIER = com.raccoongang.NewEdX.dev; + PRODUCT_BUNDLE_IDENTIFIER = org.openedx.app.dev; PRODUCT_NAME = "$(TARGET_NAME) Dev"; SUPPORTED_PLATFORMS = "iphoneos iphonesimulator"; SUPPORTS_MACCATALYST = NO; @@ -745,16 +745,16 @@ }; 0727875B28D23204002E9142 /* ReleaseDev */ = { isa = XCBuildConfiguration; - baseConfigurationReference = DAFCB10EBCC10B9CE95D5140 /* Pods-App-NewEdX.releasedev.xcconfig */; + baseConfigurationReference = BB08ACD2CCA33D6DDDDD31B4 /* Pods-App-OpenEdX.releasedev.xcconfig */; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor; - CODE_SIGN_ENTITLEMENTS = NewEdX/NewEdX.entitlements; + CODE_SIGN_ENTITLEMENTS = OpenEdX/OpenEdX.entitlements; CODE_SIGN_STYLE = Automatic; CURRENT_PROJECT_VERSION = 1; DEVELOPMENT_TEAM = L8PG7LC3Y3; GENERATE_INFOPLIST_FILE = YES; - INFOPLIST_FILE = NewEdX/Info.plist; + INFOPLIST_FILE = OpenEdX/Info.plist; INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.education"; INFOPLIST_KEY_UIApplicationSupportsIndirectInputEvents = YES; INFOPLIST_KEY_UILaunchStoryboardName = LaunchScreen; @@ -767,7 +767,7 @@ "@executable_path/Frameworks", ); MARKETING_VERSION = 0.1; - PRODUCT_BUNDLE_IDENTIFIER = com.raccoongang.NewEdX.dev; + PRODUCT_BUNDLE_IDENTIFIER = org.openedx.app.dev; PRODUCT_NAME = "$(TARGET_NAME) Dev"; SUPPORTED_PLATFORMS = "iphoneos iphonesimulator"; SUPPORTS_MACCATALYST = NO; @@ -894,16 +894,16 @@ }; 07D5DA4628D075AB00752FD9 /* DebugProd */ = { isa = XCBuildConfiguration; - baseConfigurationReference = B65009A9300CA1C0AA1ADA13 /* Pods-App-NewEdX.debugprod.xcconfig */; + baseConfigurationReference = 1499CCAD7A0D8A3E6AF39794 /* Pods-App-OpenEdX.debugprod.xcconfig */; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor; - CODE_SIGN_ENTITLEMENTS = NewEdX/NewEdX.entitlements; + CODE_SIGN_ENTITLEMENTS = OpenEdX/OpenEdX.entitlements; CODE_SIGN_STYLE = Automatic; CURRENT_PROJECT_VERSION = 1; DEVELOPMENT_TEAM = L8PG7LC3Y3; GENERATE_INFOPLIST_FILE = YES; - INFOPLIST_FILE = NewEdX/Info.plist; + INFOPLIST_FILE = OpenEdX/Info.plist; INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.education"; INFOPLIST_KEY_UIApplicationSupportsIndirectInputEvents = YES; INFOPLIST_KEY_UILaunchStoryboardName = LaunchScreen; @@ -916,7 +916,7 @@ "@executable_path/Frameworks", ); MARKETING_VERSION = 0.1; - PRODUCT_BUNDLE_IDENTIFIER = com.raccoongang.NewEdX; + PRODUCT_BUNDLE_IDENTIFIER = org.openedx.app; PRODUCT_NAME = "$(TARGET_NAME)"; SUPPORTED_PLATFORMS = "iphoneos iphonesimulator"; SUPPORTS_MACCATALYST = NO; @@ -929,16 +929,16 @@ }; 07D5DA4728D075AB00752FD9 /* ReleaseProd */ = { isa = XCBuildConfiguration; - baseConfigurationReference = E8680E764DC8A25C24EA74D5 /* Pods-App-NewEdX.releaseprod.xcconfig */; + baseConfigurationReference = A24D6A8E1BC4DF46AD68904C /* Pods-App-OpenEdX.releaseprod.xcconfig */; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor; - CODE_SIGN_ENTITLEMENTS = NewEdX/NewEdX.entitlements; + CODE_SIGN_ENTITLEMENTS = OpenEdX/OpenEdX.entitlements; CODE_SIGN_STYLE = Automatic; CURRENT_PROJECT_VERSION = 1; DEVELOPMENT_TEAM = L8PG7LC3Y3; GENERATE_INFOPLIST_FILE = YES; - INFOPLIST_FILE = NewEdX/Info.plist; + INFOPLIST_FILE = OpenEdX/Info.plist; INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.education"; INFOPLIST_KEY_UIApplicationSupportsIndirectInputEvents = YES; INFOPLIST_KEY_UILaunchStoryboardName = LaunchScreen; @@ -951,7 +951,7 @@ "@executable_path/Frameworks", ); MARKETING_VERSION = 0.1; - PRODUCT_BUNDLE_IDENTIFIER = com.raccoongang.NewEdX; + PRODUCT_BUNDLE_IDENTIFIER = org.openedx.app; PRODUCT_NAME = "$(TARGET_NAME)"; SUPPORTED_PLATFORMS = "iphoneos iphonesimulator"; SUPPORTS_MACCATALYST = NO; @@ -965,7 +965,7 @@ /* End XCBuildConfiguration section */ /* Begin XCConfigurationList section */ - 07D5DA2C28D075AA00752FD9 /* Build configuration list for PBXProject "NewEdX" */ = { + 07D5DA2C28D075AA00752FD9 /* Build configuration list for PBXProject "OpenEdX" */ = { isa = XCConfigurationList; buildConfigurations = ( 07D5DA4328D075AB00752FD9 /* DebugProd */, @@ -978,7 +978,7 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = ReleaseProd; }; - 07D5DA4528D075AB00752FD9 /* Build configuration list for PBXNativeTarget "NewEdX" */ = { + 07D5DA4528D075AB00752FD9 /* Build configuration list for PBXNativeTarget "OpenEdX" */ = { isa = XCConfigurationList; buildConfigurations = ( 07D5DA4628D075AB00752FD9 /* DebugProd */, diff --git a/NewEdX.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/OpenEdX.xcodeproj/project.xcworkspace/contents.xcworkspacedata similarity index 100% rename from NewEdX.xcodeproj/project.xcworkspace/contents.xcworkspacedata rename to OpenEdX.xcodeproj/project.xcworkspace/contents.xcworkspacedata diff --git a/NewEdX.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/OpenEdX.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist similarity index 100% rename from NewEdX.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist rename to OpenEdX.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist diff --git a/NewEdX.xcodeproj/project.xcworkspace/xcuserdata/vchekyrta.xcuserdatad/UserInterfaceState.xcuserstate b/OpenEdX.xcodeproj/project.xcworkspace/xcuserdata/vchekyrta.xcuserdatad/UserInterfaceState.xcuserstate similarity index 100% rename from NewEdX.xcodeproj/project.xcworkspace/xcuserdata/vchekyrta.xcuserdatad/UserInterfaceState.xcuserstate rename to OpenEdX.xcodeproj/project.xcworkspace/xcuserdata/vchekyrta.xcuserdatad/UserInterfaceState.xcuserstate diff --git a/NewEdX.xcodeproj/xcshareddata/xcschemes/NewEdXDev.xcscheme b/OpenEdX.xcodeproj/xcshareddata/xcschemes/OpenEdXDev.xcscheme similarity index 92% rename from NewEdX.xcodeproj/xcshareddata/xcschemes/NewEdXDev.xcscheme rename to OpenEdX.xcodeproj/xcshareddata/xcschemes/OpenEdXDev.xcscheme index 598dba3ba..3a38de2f5 100644 --- a/NewEdX.xcodeproj/xcshareddata/xcschemes/NewEdXDev.xcscheme +++ b/OpenEdX.xcodeproj/xcshareddata/xcschemes/OpenEdXDev.xcscheme @@ -15,9 +15,9 @@ + BuildableName = "OpenEdX.app" + BlueprintName = "OpenEdX" + ReferencedContainer = "container:OpenEdX.xcodeproj"> @@ -114,9 +114,9 @@ + BuildableName = "OpenEdX.app" + BlueprintName = "OpenEdX" + ReferencedContainer = "container:OpenEdX.xcodeproj"> + BuildableName = "OpenEdX.app" + BlueprintName = "OpenEdX" + ReferencedContainer = "container:OpenEdX.xcodeproj"> diff --git a/NewEdX.xcodeproj/xcshareddata/xcschemes/NewEdXProd.xcscheme b/OpenEdX.xcodeproj/xcshareddata/xcschemes/OpenEdXProd.xcscheme similarity index 94% rename from NewEdX.xcodeproj/xcshareddata/xcschemes/NewEdXProd.xcscheme rename to OpenEdX.xcodeproj/xcshareddata/xcschemes/OpenEdXProd.xcscheme index ec6caa524..7e7b99171 100644 --- a/NewEdX.xcodeproj/xcshareddata/xcschemes/NewEdXProd.xcscheme +++ b/OpenEdX.xcodeproj/xcshareddata/xcschemes/OpenEdXProd.xcscheme @@ -15,9 +15,9 @@ + BuildableName = "OpenEdX.app" + BlueprintName = "OpenEdX" + ReferencedContainer = "container:OpenEdX.xcodeproj"> @@ -150,9 +150,9 @@ + BuildableName = "OpenEdX.app" + BlueprintName = "OpenEdX" + ReferencedContainer = "container:OpenEdX.xcodeproj"> + BuildableName = "OpenEdX.app" + BlueprintName = "OpenEdX" + ReferencedContainer = "container:OpenEdX.xcodeproj"> diff --git a/NewEdX.xcodeproj/xcshareddata/xcschemes/NewEdXStage.xcscheme b/OpenEdX.xcodeproj/xcshareddata/xcschemes/OpenEdXStage.xcscheme similarity index 92% rename from NewEdX.xcodeproj/xcshareddata/xcschemes/NewEdXStage.xcscheme rename to OpenEdX.xcodeproj/xcshareddata/xcschemes/OpenEdXStage.xcscheme index 9d9ab0527..8e378a196 100644 --- a/NewEdX.xcodeproj/xcshareddata/xcschemes/NewEdXStage.xcscheme +++ b/OpenEdX.xcodeproj/xcshareddata/xcschemes/OpenEdXStage.xcscheme @@ -15,9 +15,9 @@ + BuildableName = "OpenEdX.app" + BlueprintName = "OpenEdX" + ReferencedContainer = "container:OpenEdX.xcodeproj"> @@ -114,9 +114,9 @@ + BuildableName = "OpenEdX.app" + BlueprintName = "OpenEdX" + ReferencedContainer = "container:OpenEdX.xcodeproj"> + BuildableName = "OpenEdX.app" + BlueprintName = "OpenEdX" + ReferencedContainer = "container:OpenEdX.xcodeproj"> diff --git a/NewEdX.xcworkspace/contents.xcworkspacedata b/OpenEdX.xcworkspace/contents.xcworkspacedata similarity index 94% rename from NewEdX.xcworkspace/contents.xcworkspacedata rename to OpenEdX.xcworkspace/contents.xcworkspacedata index c93c80108..6afcf4628 100644 --- a/NewEdX.xcworkspace/contents.xcworkspacedata +++ b/OpenEdX.xcworkspace/contents.xcworkspacedata @@ -2,7 +2,7 @@ + location = "group:OpenEdX.xcodeproj"> diff --git a/NewEdX.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/OpenEdX.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist similarity index 100% rename from NewEdX.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist rename to OpenEdX.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist diff --git a/OpenEdX.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings b/OpenEdX.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings new file mode 100644 index 000000000..0c67376eb --- /dev/null +++ b/OpenEdX.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings @@ -0,0 +1,5 @@ + + + + + diff --git a/NewEdX/AnalyticsManager.swift b/OpenEdX/AnalyticsManager.swift similarity index 99% rename from NewEdX/AnalyticsManager.swift rename to OpenEdX/AnalyticsManager.swift index c765cc648..04a11b640 100644 --- a/NewEdX/AnalyticsManager.swift +++ b/OpenEdX/AnalyticsManager.swift @@ -1,6 +1,6 @@ // // AnalyticsManager.swift -// NewEdX +// OpenEdX // // Created by  Stepanok Ivan on 27.06.2023. // diff --git a/NewEdX/AppDelegate.swift b/OpenEdX/AppDelegate.swift similarity index 99% rename from NewEdX/AppDelegate.swift rename to OpenEdX/AppDelegate.swift index 7e8cd9ad1..931f65420 100644 --- a/NewEdX/AppDelegate.swift +++ b/OpenEdX/AppDelegate.swift @@ -1,6 +1,6 @@ // // AppDelegate.swift -// NewEdX +// OpenEdX // // Created by Vladimir Chekyrta on 13.09.2022. // diff --git a/NewEdX/Assets.xcassets/AccentColor.colorset/Contents.json b/OpenEdX/Assets.xcassets/AccentColor.colorset/Contents.json similarity index 100% rename from NewEdX/Assets.xcassets/AccentColor.colorset/Contents.json rename to OpenEdX/Assets.xcassets/AccentColor.colorset/Contents.json diff --git a/NewEdX/Assets.xcassets/AppIcon.appiconset/Contents.json b/OpenEdX/Assets.xcassets/AppIcon.appiconset/Contents.json similarity index 100% rename from NewEdX/Assets.xcassets/AppIcon.appiconset/Contents.json rename to OpenEdX/Assets.xcassets/AppIcon.appiconset/Contents.json diff --git a/NewEdX/Assets.xcassets/AppIcon.appiconset/app icon.jpg b/OpenEdX/Assets.xcassets/AppIcon.appiconset/app icon.jpg similarity index 100% rename from NewEdX/Assets.xcassets/AppIcon.appiconset/app icon.jpg rename to OpenEdX/Assets.xcassets/AppIcon.appiconset/app icon.jpg diff --git a/NewEdX/Assets.xcassets/Contents.json b/OpenEdX/Assets.xcassets/Contents.json similarity index 100% rename from NewEdX/Assets.xcassets/Contents.json rename to OpenEdX/Assets.xcassets/Contents.json diff --git a/NewEdX/Assets.xcassets/SplachBackground.colorset/Contents.json b/OpenEdX/Assets.xcassets/SplachBackground.colorset/Contents.json similarity index 100% rename from NewEdX/Assets.xcassets/SplachBackground.colorset/Contents.json rename to OpenEdX/Assets.xcassets/SplachBackground.colorset/Contents.json diff --git a/NewEdX/Assets.xcassets/appLogo.imageset/Contents.json b/OpenEdX/Assets.xcassets/appLogo.imageset/Contents.json similarity index 100% rename from NewEdX/Assets.xcassets/appLogo.imageset/Contents.json rename to OpenEdX/Assets.xcassets/appLogo.imageset/Contents.json diff --git a/NewEdX/Assets.xcassets/appLogo.imageset/Group 21.svg b/OpenEdX/Assets.xcassets/appLogo.imageset/Group 21.svg similarity index 100% rename from NewEdX/Assets.xcassets/appLogo.imageset/Group 21.svg rename to OpenEdX/Assets.xcassets/appLogo.imageset/Group 21.svg diff --git a/NewEdX/Base.lproj/LaunchScreen.storyboard b/OpenEdX/Base.lproj/LaunchScreen.storyboard similarity index 100% rename from NewEdX/Base.lproj/LaunchScreen.storyboard rename to OpenEdX/Base.lproj/LaunchScreen.storyboard diff --git a/NewEdX/Base.lproj/languages.json b/OpenEdX/Base.lproj/languages.json similarity index 100% rename from NewEdX/Base.lproj/languages.json rename to OpenEdX/Base.lproj/languages.json diff --git "a/NewEdX/Base.lproj/\321\201ountries.json" "b/OpenEdX/Base.lproj/\321\201ountries.json" similarity index 100% rename from "NewEdX/Base.lproj/\321\201ountries.json" rename to "OpenEdX/Base.lproj/\321\201ountries.json" diff --git a/OpenEdX/Configuration.json b/OpenEdX/Configuration.json new file mode 100644 index 000000000..68f6b7a89 --- /dev/null +++ b/OpenEdX/Configuration.json @@ -0,0 +1,26 @@ +{ + "DebugDev": { + "baseURL": "https://lms-rg-app-ios-dev.raccoongang.com", + "clientId": "T7od4OFlYni7hTMnepfQuF1XUoqsESjEClltL40T" + }, + "ReleaseDev": { + "baseURL": "https://lms-rg-app-ios-dev.raccoongang.com", + "clientId": "T7od4OFlYni7hTMnepfQuF1XUoqsESjEClltL40T" + }, + "DebugStage": { + "baseURL": "https://lms-rg-app-ios-stage.raccoongang.com", + "clientId": "kHDbLaYlc1lpY1obmyAAEp9dX9qPqeDrBiVGQFIy" + }, + "ReleaseStage": { + "baseURL": "https://lms-rg-app-ios-stage.raccoongang.com", + "clientId": "kHDbLaYlc1lpY1obmyAAEp9dX9qPqeDrBiVGQFIy" + }, + "DebugProd": { + "baseURL": "https://example.com", + "clientId": "PROD_CLIENT_ID" + }, + "ReleaseProd": { + "baseURL": "https://example.com", + "clientId": "PROD_CLIENT_ID" + } +} diff --git a/NewEdX/CoreDataHandler.swift b/OpenEdX/CoreDataHandler.swift similarity index 98% rename from NewEdX/CoreDataHandler.swift rename to OpenEdX/CoreDataHandler.swift index da1a19ac7..9746c78fd 100644 --- a/NewEdX/CoreDataHandler.swift +++ b/OpenEdX/CoreDataHandler.swift @@ -1,6 +1,6 @@ // // CoreDataHandler.swift -// NewEdX +// OpenEdX // // Created by  Stepanok Ivan on 09.02.2023. // diff --git a/NewEdX/DI/AppAssembly.swift b/OpenEdX/DI/AppAssembly.swift similarity index 99% rename from NewEdX/DI/AppAssembly.swift rename to OpenEdX/DI/AppAssembly.swift index 111f05ab1..2e1dabda0 100644 --- a/NewEdX/DI/AppAssembly.swift +++ b/OpenEdX/DI/AppAssembly.swift @@ -1,6 +1,6 @@ // // AppAssembly.swift -// NewEdX +// OpenEdX // // Created by Vladimir Chekyrta on 13.09.2022. // diff --git a/NewEdX/DI/NetworkAssembly.swift b/OpenEdX/DI/NetworkAssembly.swift similarity index 99% rename from NewEdX/DI/NetworkAssembly.swift rename to OpenEdX/DI/NetworkAssembly.swift index cf92bed98..f609b5bc5 100644 --- a/NewEdX/DI/NetworkAssembly.swift +++ b/OpenEdX/DI/NetworkAssembly.swift @@ -1,6 +1,6 @@ // // NetworkAssembly.swift -// NewEdX +// OpenEdX // // Created by Vladimir Chekyrta on 13.09.2022. // diff --git a/NewEdX/DI/ScreenAssembly.swift b/OpenEdX/DI/ScreenAssembly.swift similarity index 99% rename from NewEdX/DI/ScreenAssembly.swift rename to OpenEdX/DI/ScreenAssembly.swift index be302d701..a4b8fa1b9 100644 --- a/NewEdX/DI/ScreenAssembly.swift +++ b/OpenEdX/DI/ScreenAssembly.swift @@ -1,6 +1,6 @@ // // ScreenAssembly.swift -// NewEdX +// OpenEdX // // Created by Vladimir Chekyrta on 14.09.2022. // diff --git a/NewEdX/Environment.swift b/OpenEdX/Environment.swift similarity index 99% rename from NewEdX/Environment.swift rename to OpenEdX/Environment.swift index 8e020c28c..e89c0bb88 100644 --- a/NewEdX/Environment.swift +++ b/OpenEdX/Environment.swift @@ -1,6 +1,6 @@ // // Environment.swift -// NewEdX +// OpenEdX // // Created by Vladimir Chekyrta on 14.09.2022. // diff --git a/NewEdX/Info.plist b/OpenEdX/Info.plist similarity index 86% rename from NewEdX/Info.plist rename to OpenEdX/Info.plist index 66662cd72..b94522839 100644 --- a/NewEdX/Info.plist +++ b/OpenEdX/Info.plist @@ -6,13 +6,13 @@ $(CONFIGURATION) FirebaseAppDelegateProxyEnabled + FirebaseAutomaticScreenReportingEnabled + ITSAppUsesNonExemptEncryption UIAppFonts UIViewControllerBasedStatusBarAppearance - FirebaseAutomaticScreenReportingEnabled - diff --git a/NewEdX/MainScreenAnalytics.swift b/OpenEdX/MainScreenAnalytics.swift similarity index 96% rename from NewEdX/MainScreenAnalytics.swift rename to OpenEdX/MainScreenAnalytics.swift index 8c554dffb..39dd9e484 100644 --- a/NewEdX/MainScreenAnalytics.swift +++ b/OpenEdX/MainScreenAnalytics.swift @@ -1,6 +1,6 @@ // // MainScreenAnalytics.swift -// NewEdX +// OpenEdX // // Created by  Stepanok Ivan on 29.06.2023. // diff --git a/NewEdX/NewEdX.entitlements b/OpenEdX/OpenEdX.entitlements similarity index 100% rename from NewEdX/NewEdX.entitlements rename to OpenEdX/OpenEdX.entitlements diff --git a/NewEdX/RouteController.swift b/OpenEdX/RouteController.swift similarity index 99% rename from NewEdX/RouteController.swift rename to OpenEdX/RouteController.swift index 8c2497e34..a4264ca0a 100644 --- a/NewEdX/RouteController.swift +++ b/OpenEdX/RouteController.swift @@ -1,6 +1,6 @@ // // RouteController.swift -// NewEdX +// OpenEdX // // Created by Vladimir Chekyrta on 13.09.2022. // diff --git a/NewEdX/Router.swift b/OpenEdX/Router.swift similarity index 99% rename from NewEdX/Router.swift rename to OpenEdX/Router.swift index c9f5acb6a..03f48dfee 100644 --- a/NewEdX/Router.swift +++ b/OpenEdX/Router.swift @@ -1,6 +1,6 @@ // // RouterImpl.swift -// NewEdX +// OpenEdX // // Created by Vladimir Chekyrta on 13.09.2022. // diff --git a/NewEdX/SwiftUIHostController.swift b/OpenEdX/SwiftUIHostController.swift similarity index 99% rename from NewEdX/SwiftUIHostController.swift rename to OpenEdX/SwiftUIHostController.swift index 09bcfde30..922edce15 100644 --- a/NewEdX/SwiftUIHostController.swift +++ b/OpenEdX/SwiftUIHostController.swift @@ -1,6 +1,6 @@ // // SwiftUIHostController.swift -// NewEdX +// OpenEdX // // Created by Vladimir Chekyrta on 13.09.2022. // diff --git a/NewEdX/View/MainScreenView.swift b/OpenEdX/View/MainScreenView.swift similarity index 99% rename from NewEdX/View/MainScreenView.swift rename to OpenEdX/View/MainScreenView.swift index 639efcbf4..fa57435d4 100644 --- a/NewEdX/View/MainScreenView.swift +++ b/OpenEdX/View/MainScreenView.swift @@ -1,6 +1,6 @@ // // MainScreenView.swift -// NewEdX +// OpenEdX // // Created by Vladimir Chekyrta on 15.09.2022. // diff --git a/NewEdX/en.lproj/Localizable.strings b/OpenEdX/en.lproj/Localizable.strings similarity index 88% rename from NewEdX/en.lproj/Localizable.strings rename to OpenEdX/en.lproj/Localizable.strings index ed63e3c25..8e7d62729 100644 --- a/NewEdX/en.lproj/Localizable.strings +++ b/OpenEdX/en.lproj/Localizable.strings @@ -1,6 +1,6 @@ /* Localizable.strings - NewEdX + OpenEdX Created by Vladimir Chekyrta on 13.09.2022. diff --git a/NewEdX/uk.lproj/LaunchScreen.strings b/OpenEdX/uk.lproj/LaunchScreen.strings similarity index 100% rename from NewEdX/uk.lproj/LaunchScreen.strings rename to OpenEdX/uk.lproj/LaunchScreen.strings diff --git a/NewEdX/uk.lproj/Localizable.strings b/OpenEdX/uk.lproj/Localizable.strings similarity index 88% rename from NewEdX/uk.lproj/Localizable.strings rename to OpenEdX/uk.lproj/Localizable.strings index ed63e3c25..8e7d62729 100644 --- a/NewEdX/uk.lproj/Localizable.strings +++ b/OpenEdX/uk.lproj/Localizable.strings @@ -1,6 +1,6 @@ /* Localizable.strings - NewEdX + OpenEdX Created by Vladimir Chekyrta on 13.09.2022. diff --git a/NewEdX/uk.lproj/languages.json b/OpenEdX/uk.lproj/languages.json similarity index 100% rename from NewEdX/uk.lproj/languages.json rename to OpenEdX/uk.lproj/languages.json diff --git "a/NewEdX/uk.lproj/\321\201ountries.json" "b/OpenEdX/uk.lproj/\321\201ountries.json" similarity index 100% rename from "NewEdX/uk.lproj/\321\201ountries.json" rename to "OpenEdX/uk.lproj/\321\201ountries.json" diff --git a/Podfile b/Podfile index 1e80d0312..1d97fa467 100644 --- a/Podfile +++ b/Podfile @@ -8,9 +8,9 @@ abstract_target "App" do #CodeGen for resources pod 'SwiftGen', '~> 6.6' - target "NewEdX" do + target "OpenEdX" do inherit! :complete - workspace './NewEdX.xcodeproj' + workspace './OpenEdX.xcodeproj' end target "Core" do diff --git a/Podfile.lock b/Podfile.lock index 2d715ae54..5b998cd5e 100644 --- a/Podfile.lock +++ b/Podfile.lock @@ -180,6 +180,6 @@ SPEC CHECKSUMS: SwiftyMocky: c5e96e4ff76ec6dbf5a5941aeb039b5a546954a0 Swinject: 893c9a543000ac2f10ee4cbaf0933c6992c935d5 -PODFILE CHECKSUM: e535ea6bf82dfd5be3ef0ea79b6907f520e57993 +PODFILE CHECKSUM: 1639b311802f5d36686512914067b7221ff97a64 -COCOAPODS: 1.12.0 +COCOAPODS: 1.12.1 diff --git a/Profile/Profile.xcodeproj.xcworkspace/contents.xcworkspacedata b/Profile/Profile.xcodeproj.xcworkspace/contents.xcworkspacedata index 4159659ea..964f294a7 100644 --- a/Profile/Profile.xcodeproj.xcworkspace/contents.xcworkspacedata +++ b/Profile/Profile.xcodeproj.xcworkspace/contents.xcworkspacedata @@ -14,7 +14,7 @@ location = "group:../Discovery/Discovery.xcodeproj"> + location = "group:../OpenEdX.xcodeproj"> diff --git a/Profile/Profile.xcodeproj/project.pbxproj b/Profile/Profile.xcodeproj/project.pbxproj index 87c456633..c92a7d9d7 100644 --- a/Profile/Profile.xcodeproj/project.pbxproj +++ b/Profile/Profile.xcodeproj/project.pbxproj @@ -732,7 +732,7 @@ "@loader_path/Frameworks", ); MARKETING_VERSION = 1.0; - PRODUCT_BUNDLE_IDENTIFIER = com.raccoongang.Profile; + PRODUCT_BUNDLE_IDENTIFIER = org.openedx.Profile; PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)"; SKIP_INSTALL = YES; SUPPORTED_PLATFORMS = "iphoneos iphonesimulator"; @@ -767,7 +767,7 @@ "@loader_path/Frameworks", ); MARKETING_VERSION = 1.0; - PRODUCT_BUNDLE_IDENTIFIER = com.raccoongang.Profile; + PRODUCT_BUNDLE_IDENTIFIER = org.openedx.Profile; PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)"; SKIP_INSTALL = YES; SUPPORTED_PLATFORMS = "iphoneos iphonesimulator"; @@ -864,7 +864,7 @@ "@loader_path/Frameworks", ); MARKETING_VERSION = 1.0; - PRODUCT_BUNDLE_IDENTIFIER = com.raccoongang.Profile; + PRODUCT_BUNDLE_IDENTIFIER = org.openedx.Profile; PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)"; SKIP_INSTALL = YES; SUPPORTED_PLATFORMS = "iphoneos iphonesimulator"; @@ -962,7 +962,7 @@ "@loader_path/Frameworks", ); MARKETING_VERSION = 1.0; - PRODUCT_BUNDLE_IDENTIFIER = com.raccoongang.Profile; + PRODUCT_BUNDLE_IDENTIFIER = org.openedx.Profile; PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)"; SKIP_INSTALL = YES; SUPPORTED_PLATFORMS = "iphoneos iphonesimulator"; @@ -1054,7 +1054,7 @@ "@loader_path/Frameworks", ); MARKETING_VERSION = 1.0; - PRODUCT_BUNDLE_IDENTIFIER = com.raccoongang.Profile; + PRODUCT_BUNDLE_IDENTIFIER = org.openedx.Profile; PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)"; SKIP_INSTALL = YES; SUPPORTED_PLATFORMS = "iphoneos iphonesimulator"; @@ -1145,7 +1145,7 @@ "@loader_path/Frameworks", ); MARKETING_VERSION = 1.0; - PRODUCT_BUNDLE_IDENTIFIER = com.raccoongang.Profile; + PRODUCT_BUNDLE_IDENTIFIER = org.openedx.Profile; PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)"; SKIP_INSTALL = YES; SUPPORTED_PLATFORMS = "iphoneos iphonesimulator"; @@ -1163,12 +1163,12 @@ buildSettings = { CODE_SIGN_STYLE = Automatic; CURRENT_PROJECT_VERSION = 1; - DEVELOPMENT_TEAM = KHU94Q2JSS; + DEVELOPMENT_TEAM = L8PG7LC3Y3; GENERATE_INFOPLIST_FILE = YES; IPHONEOS_DEPLOYMENT_TARGET = 14.0; MACOSX_DEPLOYMENT_TARGET = 12.6; MARKETING_VERSION = 1.0; - PRODUCT_BUNDLE_IDENTIFIER = stepanok.ProfileTests; + PRODUCT_BUNDLE_IDENTIFIER = org.openedx.ProfileTests; PRODUCT_NAME = "$(TARGET_NAME)"; SDKROOT = auto; SUPPORTED_PLATFORMS = "iphoneos iphonesimulator macosx"; @@ -1184,12 +1184,12 @@ buildSettings = { CODE_SIGN_STYLE = Automatic; CURRENT_PROJECT_VERSION = 1; - DEVELOPMENT_TEAM = KHU94Q2JSS; + DEVELOPMENT_TEAM = L8PG7LC3Y3; GENERATE_INFOPLIST_FILE = YES; IPHONEOS_DEPLOYMENT_TARGET = 14.0; MACOSX_DEPLOYMENT_TARGET = 12.6; MARKETING_VERSION = 1.0; - PRODUCT_BUNDLE_IDENTIFIER = stepanok.ProfileTests; + PRODUCT_BUNDLE_IDENTIFIER = org.openedx.ProfileTests; PRODUCT_NAME = "$(TARGET_NAME)"; SDKROOT = auto; SUPPORTED_PLATFORMS = "iphoneos iphonesimulator macosx"; @@ -1205,12 +1205,12 @@ buildSettings = { CODE_SIGN_STYLE = Automatic; CURRENT_PROJECT_VERSION = 1; - DEVELOPMENT_TEAM = KHU94Q2JSS; + DEVELOPMENT_TEAM = L8PG7LC3Y3; GENERATE_INFOPLIST_FILE = YES; IPHONEOS_DEPLOYMENT_TARGET = 14.0; MACOSX_DEPLOYMENT_TARGET = 12.6; MARKETING_VERSION = 1.0; - PRODUCT_BUNDLE_IDENTIFIER = stepanok.ProfileTests; + PRODUCT_BUNDLE_IDENTIFIER = org.openedx.ProfileTests; PRODUCT_NAME = "$(TARGET_NAME)"; SDKROOT = auto; SUPPORTED_PLATFORMS = "iphoneos iphonesimulator macosx"; @@ -1226,12 +1226,12 @@ buildSettings = { CODE_SIGN_STYLE = Automatic; CURRENT_PROJECT_VERSION = 1; - DEVELOPMENT_TEAM = KHU94Q2JSS; + DEVELOPMENT_TEAM = L8PG7LC3Y3; GENERATE_INFOPLIST_FILE = YES; IPHONEOS_DEPLOYMENT_TARGET = 14.0; MACOSX_DEPLOYMENT_TARGET = 12.6; MARKETING_VERSION = 1.0; - PRODUCT_BUNDLE_IDENTIFIER = stepanok.ProfileTests; + PRODUCT_BUNDLE_IDENTIFIER = org.openedx.ProfileTests; PRODUCT_NAME = "$(TARGET_NAME)"; SDKROOT = auto; SUPPORTED_PLATFORMS = "iphoneos iphonesimulator macosx"; @@ -1247,12 +1247,12 @@ buildSettings = { CODE_SIGN_STYLE = Automatic; CURRENT_PROJECT_VERSION = 1; - DEVELOPMENT_TEAM = KHU94Q2JSS; + DEVELOPMENT_TEAM = L8PG7LC3Y3; GENERATE_INFOPLIST_FILE = YES; IPHONEOS_DEPLOYMENT_TARGET = 14.0; MACOSX_DEPLOYMENT_TARGET = 12.6; MARKETING_VERSION = 1.0; - PRODUCT_BUNDLE_IDENTIFIER = stepanok.ProfileTests; + PRODUCT_BUNDLE_IDENTIFIER = org.openedx.ProfileTests; PRODUCT_NAME = "$(TARGET_NAME)"; SDKROOT = auto; SUPPORTED_PLATFORMS = "iphoneos iphonesimulator macosx"; @@ -1268,12 +1268,12 @@ buildSettings = { CODE_SIGN_STYLE = Automatic; CURRENT_PROJECT_VERSION = 1; - DEVELOPMENT_TEAM = KHU94Q2JSS; + DEVELOPMENT_TEAM = L8PG7LC3Y3; GENERATE_INFOPLIST_FILE = YES; IPHONEOS_DEPLOYMENT_TARGET = 14.0; MACOSX_DEPLOYMENT_TARGET = 12.6; MARKETING_VERSION = 1.0; - PRODUCT_BUNDLE_IDENTIFIER = stepanok.ProfileTests; + PRODUCT_BUNDLE_IDENTIFIER = org.openedx.ProfileTests; PRODUCT_NAME = "$(TARGET_NAME)"; SDKROOT = auto; SUPPORTED_PLATFORMS = "iphoneos iphonesimulator macosx"; @@ -1368,7 +1368,7 @@ "@loader_path/Frameworks", ); MARKETING_VERSION = 1.0; - PRODUCT_BUNDLE_IDENTIFIER = com.raccoongang.Profile; + PRODUCT_BUNDLE_IDENTIFIER = org.openedx.Profile; PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)"; SKIP_INSTALL = YES; SUPPORTED_PLATFORMS = "iphoneos iphonesimulator"; @@ -1387,12 +1387,12 @@ buildSettings = { CODE_SIGN_STYLE = Automatic; CURRENT_PROJECT_VERSION = 1; - DEVELOPMENT_TEAM = KHU94Q2JSS; + DEVELOPMENT_TEAM = L8PG7LC3Y3; GENERATE_INFOPLIST_FILE = YES; IPHONEOS_DEPLOYMENT_TARGET = 14.0; MACOSX_DEPLOYMENT_TARGET = 12.6; MARKETING_VERSION = 1.0; - PRODUCT_BUNDLE_IDENTIFIER = stepanok.ProfileTests; + PRODUCT_BUNDLE_IDENTIFIER = org.openedx.ProfileTests; PRODUCT_NAME = "$(TARGET_NAME)"; SDKROOT = auto; SUPPORTED_PLATFORMS = "iphoneos iphonesimulator macosx"; @@ -1481,7 +1481,7 @@ "@loader_path/Frameworks", ); MARKETING_VERSION = 1.0; - PRODUCT_BUNDLE_IDENTIFIER = com.raccoongang.Profile; + PRODUCT_BUNDLE_IDENTIFIER = org.openedx.Profile; PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)"; SKIP_INSTALL = YES; SUPPORTED_PLATFORMS = "iphoneos iphonesimulator"; @@ -1499,12 +1499,12 @@ buildSettings = { CODE_SIGN_STYLE = Automatic; CURRENT_PROJECT_VERSION = 1; - DEVELOPMENT_TEAM = KHU94Q2JSS; + DEVELOPMENT_TEAM = L8PG7LC3Y3; GENERATE_INFOPLIST_FILE = YES; IPHONEOS_DEPLOYMENT_TARGET = 14.0; MACOSX_DEPLOYMENT_TARGET = 12.6; MARKETING_VERSION = 1.0; - PRODUCT_BUNDLE_IDENTIFIER = stepanok.ProfileTests; + PRODUCT_BUNDLE_IDENTIFIER = org.openedx.ProfileTests; PRODUCT_NAME = "$(TARGET_NAME)"; SDKROOT = auto; SUPPORTED_PLATFORMS = "iphoneos iphonesimulator macosx"; diff --git a/README.md b/README.md index d89789884..9a9afef9b 100644 --- a/README.md +++ b/README.md @@ -9,11 +9,11 @@ Modern vision of the mobile application for the Open EdX platform from Raccoon G 2. Navigate to the project folder and run ``pod install``. -3. Open ``NewEdX.xcworkspace``. +3. Open ``OpenEdX.xcworkspace``. -4. Ensure that the ``NewEdXDev`` or ``NewEdXProd`` scheme is selected. +4. Ensure that the ``OpenEdXDev`` or ``OpenEdXProd`` scheme is selected. -5. Configure the [``Environment.swift`` file](https://github.com/raccoongang/new-edx-app-ios/blob/main/NewEdX/Environment.swift) with URLs and OAuth credentials for your Open edX instance. +5. Configure the [``Environment.swift`` file](https://github.com/raccoongang/new-edx-app-ios/blob/main/OpenEdX/Environment.swift) with URLs and OAuth credentials for your Open edX instance. 6. Click the **Run** button. @@ -26,6 +26,8 @@ You can find the plugin with the API and installation guide [here](https://githu Please feel welcome to develop any of the suggested features below and submit a pull request. - ✅ ~~Migrate to the new APIs~~ +- ✅ ~~New Navigation~~ +- ✅ ~~Analytics and Crashlytics~~ - Recent searches - Migrate to the Olive and JWT token - UnAuth User mode diff --git a/fastlane/Fastfile b/fastlane/Fastfile index ce734301b..aa059c588 100644 --- a/fastlane/Fastfile +++ b/fastlane/Fastfile @@ -26,8 +26,8 @@ end lane :unit_tests do run_tests( - workspace: "NewEdX.xcworkspace", + workspace: "OpenEdX.xcworkspace", device: "iPhone 14", - scheme: "NewEdXDev" + scheme: "OpenEdXDev" ) end