Skip to content
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.

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

Feat: connect OEXFoundation to project #528

Draft
wants to merge 3 commits into
base: develop
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@

import SwiftUI
import Core
import OEXFoundation
import Theme
import Swinject

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@

import Foundation
import Core
import OEXFoundation
import SwiftUI
import Alamofire
import AuthenticationServices
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@

import SwiftUI
import Core
import OEXFoundation
import Theme

public struct SignUpView: View {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@

import Foundation
import Core
import OEXFoundation
import SwiftUI
import AuthenticationServices
import FacebookLogin
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@

import SwiftUI
import Core
import OEXFoundation
import Theme

public struct ResetPasswordView: View {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@

import SwiftUI
import Core
import OEXFoundation

public class ResetPasswordViewModel: ObservableObject {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import SwiftyMocky
import XCTest
@testable import Core
@testable import Authorization
import OEXFoundation
import Alamofire
import SwiftUI

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import SwiftyMocky
import XCTest
@testable import Core
@testable import Authorization
import OEXFoundation
import Alamofire
import SwiftUI

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import SwiftyMocky
import XCTest
@testable import Core
@testable import Authorization
import OEXFoundation
import Alamofire
import SwiftUI

Expand Down
129 changes: 17 additions & 112 deletions Core/Core.xcodeproj/project.pbxproj

Large diffs are not rendered by default.

3 changes: 2 additions & 1 deletion Core/Core/AvoidingHelpers/Scroller/KeyboardScroller.swift
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
//

import UIKit
import OEXFoundation

final class KeyboardScroller {
static func scroll(
Expand Down Expand Up @@ -57,7 +58,7 @@ final class KeyboardScroller {
self.options = options
self.partialAvoidingPadding = partialAvoidingPadding

globalWindow = UIApplication.shared.keyWindow ?? UIWindow()
globalWindow = UIApplication.shared.oexKeyWindow ?? UIWindow()
calculateGlobalFrames()
}

Expand Down
1 change: 1 addition & 0 deletions Core/Core/Configuration/Config/AgreementConfig.swift
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
//

import Foundation
import OEXFoundation

private enum AgreementKeys: String, RawStringExtractable {
case privacyPolicyURL = "PRIVACY_POLICY_URL"
Expand Down
1 change: 1 addition & 0 deletions Core/Core/Configuration/Config/BranchConfig.swift
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
//

import Foundation
import OEXFoundation

private enum BranchKeys: String, RawStringExtractable {
case enabled = "ENABLED"
Expand Down
1 change: 1 addition & 0 deletions Core/Core/Configuration/Config/BrazeConfig.swift
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
//

import Foundation
import OEXFoundation

private enum BrazeKeys: String, RawStringExtractable {
case enabled = "ENABLED"
Expand Down
1 change: 1 addition & 0 deletions Core/Core/Configuration/Config/DashboardConfig.swift
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
//

import Foundation
import OEXFoundation

public enum DashboardConfigType: String {
case gallery
Expand Down
1 change: 1 addition & 0 deletions Core/Core/Configuration/Config/DiscoveryConfig.swift
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
//

import Foundation
import OEXFoundation

public enum DiscoveryConfigType: String {
case native
Expand Down
1 change: 1 addition & 0 deletions Core/Core/Configuration/Config/FullStoryConfig.swift
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
//

import Foundation
import OEXFoundation

private enum Keys: String, RawStringExtractable {
case enabled = "ENABLED"
Expand Down
1 change: 1 addition & 0 deletions Core/Core/Configuration/Config/SegmentConfig.swift
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
//

import Foundation
import OEXFoundation

private enum SegmentKeys: String, RawStringExtractable {
case enabled = "ENABLED"
Expand Down
1 change: 1 addition & 0 deletions Core/Core/Configuration/Config/UIComponentsConfig.swift
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
//

import Foundation
import OEXFoundation

private enum Keys: String, RawStringExtractable {
case courseDropDownNavigationEnabled = "COURSE_DROPDOWN_NAVIGATION_ENABLED"
Expand Down
1 change: 1 addition & 0 deletions Core/Core/Configuration/Connectivity.swift
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@

import Alamofire
import Combine
import Foundation

public enum InternetState {
case reachable
Expand Down
1 change: 1 addition & 0 deletions Core/Core/Data/Repository/AuthRepository.swift
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
//

import Foundation
import OEXFoundation

public protocol AuthRepositoryProtocol {
func login(username: String, password: String) async throws -> User
Expand Down
1 change: 1 addition & 0 deletions Core/Core/Data/Repository/OfflineSyncRepository.swift
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
//

import Foundation
import OEXFoundation

public protocol OfflineSyncRepositoryProtocol {
func submitOfflineProgress(courseID: String, blockID: String, data: String) async throws -> Bool
Expand Down
17 changes: 0 additions & 17 deletions Core/Core/Extensions/AVPlayerViewControllerExtension.swift

This file was deleted.

15 changes: 0 additions & 15 deletions Core/Core/Extensions/Bundle.swift

This file was deleted.

33 changes: 0 additions & 33 deletions Core/Core/Extensions/CGColorExtension.swift

This file was deleted.

15 changes: 0 additions & 15 deletions Core/Core/Extensions/CollectionExtension.swift

This file was deleted.

22 changes: 0 additions & 22 deletions Core/Core/Extensions/Container+App.swift

This file was deleted.

25 changes: 0 additions & 25 deletions Core/Core/Extensions/DebugLog.swift

This file was deleted.

18 changes: 0 additions & 18 deletions Core/Core/Extensions/Dictionary+JSON.swift

This file was deleted.

16 changes: 0 additions & 16 deletions Core/Core/Extensions/DispatchQueue+App.swift

This file was deleted.

25 changes: 0 additions & 25 deletions Core/Core/Extensions/IntExtension.swift

This file was deleted.

8 changes: 0 additions & 8 deletions Core/Core/Extensions/Notification.swift
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ public extension Notification.Name {
static let onCourseEnrolled = Notification.Name("onCourseEnrolled")
static let onblockCompletionRequested = Notification.Name("onblockCompletionRequested")
static let onTokenRefreshFailed = Notification.Name("onTokenRefreshFailed")
static let onActualVersionReceived = Notification.Name("onActualVersionReceived")
static let onAppUpgradeAccountSettingsTapped = Notification.Name("onAppUpgradeAccountSettingsTapped")
static let onNewVersionAvaliable = Notification.Name("onNewVersionAvaliable")
static let webviewReloadNotification = Notification.Name("webviewReloadNotification")
Expand All @@ -25,10 +24,3 @@ public extension Notification.Name {
static let tryDownloadAgain = Notification.Name("tryDownloadAgain")
static let refreshEnrollments = Notification.Name("refreshEnrollments")
}

public extension Notification {
enum UserInfoKey: String {
case isForced
}
}

Loading
Loading