-
Notifications
You must be signed in to change notification settings - Fork 16
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: webview based discovery implementation #219
Merged
saeedbashir
merged 15 commits into
openedx:develop
from
saeedbashir:saeed/web_discovery
Jan 17, 2024
Merged
Changes from 14 commits
Commits
Show all changes
15 commits
Select commit
Hold shift + click to select a range
d656376
feat: webview discovery implimentation
saeedbashir c542202
fix: update framework settings
saeedbashir 634b73b
chore: moving course detail related code to Discovery framwrok
saeedbashir 6666cb8
chore: regenerating tests
saeedbashir cec1608
refactor: moving course detail tests to discovery framework
saeedbashir f19b0e6
refactor: mistankly course detail tests was added in discussion, now …
saeedbashir 4779971
fix: fix the unresponsive clicks of webview
saeedbashir 80c7799
refactor: address review feedback
saeedbashir 370d2c7
fix: fix typo
saeedbashir 8d28140
refactor: rename class
saeedbashir 4cc33df
fix: add the missing import
saeedbashir 4c9ab03
refactor: removing extra space
saeedbashir 86205d5
Merge branch 'develop' into saeed/web_discovery
saeedbashir acec545
refactor: move notication name to central place
saeedbashir 574b74f
refactor: address review feedback
saeedbashir File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,57 @@ | ||
| // | ||
| // DiscoveryConfig.swift | ||
| // Core | ||
| // | ||
| // Created by SaeedBashir on 12/18/23. | ||
| // | ||
|
|
||
| import Foundation | ||
|
|
||
| public enum DiscoveryConfigType: String { | ||
| case native | ||
| case webview | ||
| case none | ||
| } | ||
|
|
||
| private enum DiscoveryKeys: String, RawStringExtractable { | ||
| case discoveryType = "TYPE" | ||
| case webview = "WEBVIEW" | ||
| case baseURL = "BASE_URL" | ||
| case courseDetailTemplate = "COURSE_DETAIL_TEMPLATE" | ||
| case programDetailTemplate = "PROGRAM_DETAIL_TEMPLATE" | ||
| } | ||
|
|
||
| public class DiscoveryWebviewConfig: NSObject { | ||
| public let baseURL: String? | ||
| public let courseDetailTemplate: String? | ||
| public let programDetailTemplate: String? | ||
|
|
||
| init(dictionary: [String: AnyObject]) { | ||
| baseURL = dictionary[DiscoveryKeys.baseURL] as? String | ||
| courseDetailTemplate = dictionary[DiscoveryKeys.courseDetailTemplate] as? String | ||
| programDetailTemplate = dictionary[DiscoveryKeys.programDetailTemplate] as? String | ||
| } | ||
| } | ||
|
|
||
| public class DiscoveryConfig: NSObject { | ||
| public let type: DiscoveryConfigType | ||
| public let webview: DiscoveryWebviewConfig | ||
|
|
||
| init(dictionary: [String: AnyObject]) { | ||
| type = (dictionary[DiscoveryKeys.discoveryType] as? String).flatMap { | ||
| DiscoveryConfigType(rawValue: $0) | ||
| } ?? .none | ||
| webview = DiscoveryWebviewConfig(dictionary: dictionary[DiscoveryKeys.webview] as? [String: AnyObject] ?? [:]) | ||
| } | ||
|
|
||
| public var enabled: Bool { | ||
| return type != .none | ||
| } | ||
| } | ||
|
|
||
| private let key = "DISCOVERY" | ||
| extension Config { | ||
| public var discovery: DiscoveryConfig { | ||
| DiscoveryConfig(dictionary: self[key] as? [String: AnyObject] ?? [:]) | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,27 @@ | ||
| // | ||
| // RawStringExtactable.swift | ||
| // Core | ||
| // | ||
| // Created by SaeedBashir on 12/18/23. | ||
| // | ||
|
|
||
| import Foundation | ||
|
|
||
| public protocol RawStringExtractable { | ||
| var rawValue: String { get } | ||
| } | ||
|
|
||
| public protocol DictionaryExtractionExtension { | ||
| associatedtype Key | ||
| associatedtype Value | ||
| subscript(key: Key) -> Value? { get } | ||
| } | ||
|
|
||
| extension Dictionary: DictionaryExtractionExtension {} | ||
|
|
||
| public extension DictionaryExtractionExtension where Self.Key == String { | ||
|
|
||
| subscript(key :RawStringExtractable) -> Value? { | ||
| return self[key.rawValue] | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Is it necessary to have a localized version of the string at this moment?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
We don't add translations on the go. Files will be translated later.