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.

Sign up for GitHub

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

Already on GitHub? Sign in to your account

feat: [FC-0047] Improved Dashboard Level Navigation #434

Merged
merged 24 commits into from
Jun 1, 2024
Merged

feat: [FC-0047] Improved Dashboard Level Navigation #434

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
e7edd62
feat: replace Discover page with new Learn page
IvanStepanok May 9, 2024
37aa051
fix: address feedback
IvanStepanok May 9, 2024
a973589
fix: address feedback
IvanStepanok May 9, 2024
a208e3f
Merge branch 'develop' into feat/dashboard_level_navigation
IvanStepanok May 10, 2024
ced59e3
fix: address feedback
IvanStepanok May 10, 2024
caef599
fix: address feedback
IvanStepanok May 10, 2024
f1c7bf3
fix: address feedback
IvanStepanok May 10, 2024
19a265e
fix: address feedback
IvanStepanok May 10, 2024
5bce027
fix: address feedback
IvanStepanok May 13, 2024
3012c6f
fix: change DropDown menu arrow direction
IvanStepanok May 15, 2024
0a1ce7c
fix: address feedback
IvanStepanok May 16, 2024
296c093
fix: address feedback
IvanStepanok May 20, 2024
52de67d
fix: address feedback
IvanStepanok May 21, 2024
c46d616
fix: address feedback
IvanStepanok May 23, 2024
8527f02
fix: address feedback
IvanStepanok May 24, 2024
be6dbf6
fix: address feedback
IvanStepanok May 27, 2024
b225629
fix: address feedback
IvanStepanok May 29, 2024
c37f9fb
fix: address feedback
IvanStepanok May 30, 2024
b7fab1b
fix: address feedback
IvanStepanok May 30, 2024
865bd61
fix: address feedback
IvanStepanok May 30, 2024
5a12666
fix: address feedback
IvanStepanok May 30, 2024
dab54f9
fix: address feedback
IvanStepanok May 30, 2024
d2f865f
fix: address feedback
IvanStepanok May 30, 2024
ebf8d86
Merge branch 'develop' into feat/dashboard_level_navigation
IvanStepanok May 30, 2024
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
20 changes: 16 additions & 4 deletions Core/Core.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,8 @@
028CE96929858ECC00B6B1C3 /* FlexibleKeyboardInputView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 028CE96829858ECC00B6B1C3 /* FlexibleKeyboardInputView.swift */; };
028F9F37293A44C700DE65D0 /* Data_ResetPassword.swift in Sources */ = {isa = PBXBuildFile; fileRef = 028F9F36293A44C700DE65D0 /* Data_ResetPassword.swift */; };
028F9F39293A452B00DE65D0 /* ResetPassword.swift in Sources */ = {isa = PBXBuildFile; fileRef = 028F9F38293A452B00DE65D0 /* ResetPassword.swift */; };
02935B732BCECAD000B22F66 /* Data_PrimaryEnrollment.swift in Sources */ = {isa = PBXBuildFile; fileRef = 02935B722BCECAD000B22F66 /* Data_PrimaryEnrollment.swift */; };
02935B752BCEE6D600B22F66 /* PrimaryEnrollment.swift in Sources */ = {isa = PBXBuildFile; fileRef = 02935B742BCEE6D600B22F66 /* PrimaryEnrollment.swift */; };
0295C885299B99DD00ABE571 /* RefreshableScrollView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0295C884299B99DD00ABE571 /* RefreshableScrollView.swift */; };
029EE3ED2BF6650500F64F33 /* Bundle.swift in Sources */ = {isa = PBXBuildFile; fileRef = 029EE3EC2BF6650500F64F33 /* Bundle.swift */; };
02A463112AEA966C00331037 /* AppReviewView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 02A463102AEA966C00331037 /* AppReviewView.swift */; };
Expand All @@ -77,7 +79,8 @@
02B2B594295C5C7A00914876 /* Thread.swift in Sources */ = {isa = PBXBuildFile; fileRef = 02B2B593295C5C7A00914876 /* Thread.swift */; };
02B3E3B32930198600A50475 /* AVPlayerViewControllerExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = 02B3E3B22930198600A50475 /* AVPlayerViewControllerExtension.swift */; };
02B3F16E2AB489A400DDDD4E /* RefreshableScrollViewCompat.swift in Sources */ = {isa = PBXBuildFile; fileRef = 02B3F16D2AB489A400DDDD4E /* RefreshableScrollViewCompat.swift */; };
02C917F029CDA99E00DBB8BD /* Data_Dashboard.swift in Sources */ = {isa = PBXBuildFile; fileRef = 02C917EF29CDA99E00DBB8BD /* Data_Dashboard.swift */; };
02C917F029CDA99E00DBB8BD /* Data_Enrollments.swift in Sources */ = {isa = PBXBuildFile; fileRef = 02C917EF29CDA99E00DBB8BD /* Data_Enrollments.swift */; };
02CA59842BD7DDBE00D517AA /* DashboardConfig.swift in Sources */ = {isa = PBXBuildFile; fileRef = 02CA59832BD7DDBE00D517AA /* DashboardConfig.swift */; };
02CF46C829546AA200A698EE /* NoCachedDataError.swift in Sources */ = {isa = PBXBuildFile; fileRef = 02CF46C729546AA200A698EE /* NoCachedDataError.swift */; };
02D400612B0678190029D168 /* SKStoreReviewControllerExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = 02D400602B0678190029D168 /* SKStoreReviewControllerExtension.swift */; };
02D800CC29348F460099CF16 /* ImagePicker.swift in Sources */ = {isa = PBXBuildFile; fileRef = 02D800CB29348F460099CF16 /* ImagePicker.swift */; };
Expand Down Expand Up @@ -250,6 +253,8 @@
028CE96829858ECC00B6B1C3 /* FlexibleKeyboardInputView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FlexibleKeyboardInputView.swift; sourceTree = "<group>"; };
028F9F36293A44C700DE65D0 /* Data_ResetPassword.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Data_ResetPassword.swift; sourceTree = "<group>"; };
028F9F38293A452B00DE65D0 /* ResetPassword.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ResetPassword.swift; sourceTree = "<group>"; };
02935B722BCECAD000B22F66 /* Data_PrimaryEnrollment.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Data_PrimaryEnrollment.swift; sourceTree = "<group>"; };
02935B742BCEE6D600B22F66 /* PrimaryEnrollment.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PrimaryEnrollment.swift; sourceTree = "<group>"; };
0295C884299B99DD00ABE571 /* RefreshableScrollView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RefreshableScrollView.swift; sourceTree = "<group>"; };
029EE3EC2BF6650500F64F33 /* Bundle.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Bundle.swift; sourceTree = "<group>"; };
02A463102AEA966C00331037 /* AppReviewView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppReviewView.swift; sourceTree = "<group>"; };
Expand All @@ -262,7 +267,8 @@
02B2B593295C5C7A00914876 /* Thread.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Thread.swift; sourceTree = "<group>"; };
02B3E3B22930198600A50475 /* AVPlayerViewControllerExtension.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AVPlayerViewControllerExtension.swift; sourceTree = "<group>"; };
02B3F16D2AB489A400DDDD4E /* RefreshableScrollViewCompat.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RefreshableScrollViewCompat.swift; sourceTree = "<group>"; };
02C917EF29CDA99E00DBB8BD /* Data_Dashboard.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Data_Dashboard.swift; sourceTree = "<group>"; };
02C917EF29CDA99E00DBB8BD /* Data_Enrollments.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Data_Enrollments.swift; sourceTree = "<group>"; };
02CA59832BD7DDBE00D517AA /* DashboardConfig.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DashboardConfig.swift; sourceTree = "<group>"; };
02CF46C729546AA200A698EE /* NoCachedDataError.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NoCachedDataError.swift; sourceTree = "<group>"; };
02D400602B0678190029D168 /* SKStoreReviewControllerExtension.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SKStoreReviewControllerExtension.swift; sourceTree = "<group>"; };
02D800CB29348F460099CF16 /* ImagePicker.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ImagePicker.swift; sourceTree = "<group>"; };
Expand Down Expand Up @@ -592,7 +598,8 @@
0727877628D23847002E9142 /* DataLayer.swift */,
0727878428D31657002E9142 /* Data_User.swift */,
0283347C28D4D3DE00C828FC /* Data_Discovery.swift */,
02C917EF29CDA99E00DBB8BD /* Data_Dashboard.swift */,
02C917EF29CDA99E00DBB8BD /* Data_Enrollments.swift */,
02935B722BCECAD000B22F66 /* Data_PrimaryEnrollment.swift */,
021D924728DC860C00ACC565 /* Data_UserProfile.swift */,
0259104929C4A5B6004B5A55 /* UserSettings.swift */,
070019A428F6F17900D5FC78 /* Data_Media.swift */,
Expand All @@ -618,6 +625,7 @@
children = (
0727878828D31734002E9142 /* User.swift */,
0284DBFD28D48C5300830893 /* CourseItem.swift */,
02935B742BCEE6D600B22F66 /* PrimaryEnrollment.swift */,
021D924F28DC89D100ACC565 /* UserProfile.swift */,
070019AB28F6FD0100D5FC78 /* CourseDetailBlock.swift */,
0248C92229C075EF00DC8402 /* CourseBlockModel.swift */,
Expand Down Expand Up @@ -848,6 +856,7 @@
BAFB99832B0E282E007D09F9 /* MicrosoftConfig.swift */,
BAFB998F2B14B377007D09F9 /* GoogleConfig.swift */,
BAFB99912B14E23D007D09F9 /* AppleSignInConfig.swift */,
02CA59832BD7DDBE00D517AA /* DashboardConfig.swift */,
A53A32342B233DEC005FE38A /* ThemeConfig.swift */,
E0D586192B2FF74C009B4BA7 /* DiscoveryConfig.swift */,
);
Expand Down Expand Up @@ -1086,6 +1095,7 @@
0255D5582936283A004DBC1A /* UploadBodyEncoding.swift in Sources */,
06619EAF2B973B25001FAADE /* AccessibilityInjection.swift in Sources */,
BAFB99822B0E2354007D09F9 /* FacebookConfig.swift in Sources */,
02935B732BCECAD000B22F66 /* Data_PrimaryEnrollment.swift in Sources */,
027BD3B32909475900392132 /* Publishers+KeyboardState.swift in Sources */,
06DEA4A32BBD66A700110D20 /* BackNavigationButton.swift in Sources */,
0727877D28D25212002E9142 /* ProgressBar.swift in Sources */,
Expand Down Expand Up @@ -1129,7 +1139,7 @@
02AFCC1A2AEFDC18000360F0 /* ThirdPartyMailer.swift in Sources */,
0770DE5F28D0B22C006D8A5D /* Strings.swift in Sources */,
BA981BCE2B8F5C49005707C2 /* Sequence+Extensions.swift in Sources */,
02C917F029CDA99E00DBB8BD /* Data_Dashboard.swift in Sources */,
02C917F029CDA99E00DBB8BD /* Data_Enrollments.swift in Sources */,
024FCD0028EF1CD300232339 /* WebBrowser.swift in Sources */,
027BD3B52909475900392132 /* KeyboardStateObserver.swift in Sources */,
0283347D28D4D3DE00C828FC /* Data_Discovery.swift in Sources */,
Expand Down Expand Up @@ -1192,9 +1202,11 @@
02F98A7F28F81EE900DE94C0 /* Container+App.swift in Sources */,
02B3F16E2AB489A400DDDD4E /* RefreshableScrollViewCompat.swift in Sources */,
0649879A2B4D69FF0071642A /* WebViewHTML.swift in Sources */,
02CA59842BD7DDBE00D517AA /* DashboardConfig.swift in Sources */,
0727877B28D24A1D002E9142 /* HeadersRedirectHandler.swift in Sources */,
0236961B28F9A28B00EEF206 /* AuthInteractor.swift in Sources */,
0770DE3028D09793006D8A5D /* EndPointType.swift in Sources */,
02935B752BCEE6D600B22F66 /* PrimaryEnrollment.swift in Sources */,
020C31C9290AC3F700D6DEA2 /* PickerFields.swift in Sources */,
02F6EF3B28D9B8EC00835477 /* CourseCellView.swift in Sources */,
023A1138291432FD00D0D354 /* FieldConfiguration.swift in Sources */,
Expand Down
15 changes: 15 additions & 0 deletions Core/Core/Assets.xcassets/NavigationBar/learn.imageset/Contents.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
{
"images" : [
{
"filename" : "learn filled.svg",
"idiom" : "universal"
}
],
"info" : {
"author" : "xcode",
"version" : 1
},
"properties" : {
"template-rendering-intent" : "template"
}
}
10 changes: 10 additions & 0 deletions Core/Core/Assets.xcassets/NavigationBar/learn.imageset/learn filled.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
15 changes: 15 additions & 0 deletions Core/Core/Assets.xcassets/chevron_right.imageset/Contents.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
{
"images" : [
{
"filename" : "chevron_right.svg",
"idiom" : "universal"
}
],
"info" : {
"author" : "xcode",
"version" : 1
},
"properties" : {
"template-rendering-intent" : "template"
}
}
15 changes: 15 additions & 0 deletions Core/Core/Assets.xcassets/chevron_right.imageset/chevron_right.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
12 changes: 12 additions & 0 deletions Core/Core/Assets.xcassets/learn_empty.imageset/Contents.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
{
"images" : [
{
"filename" : "learn_big.svg",
"idiom" : "universal"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
14 changes: 14 additions & 0 deletions Core/Core/Assets.xcassets/learn_empty.imageset/learn_big.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
21 changes: 21 additions & 0 deletions Core/Core/Assets.xcassets/resumeCourse.imageset/Contents.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
{
"images" : [
{
"filename" : "resumeCourse.svg",
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
3 changes: 3 additions & 0 deletions Core/Core/Assets.xcassets/resumeCourse.imageset/resumeCourse.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion Core/Core/Assets.xcassets/settings.imageset/Contents.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"images" : [
{
"filename" : "settingsIcon.svg",
"filename" : "icon-manage_accounts.svg",
"idiom" : "universal"
}
],
Expand Down
5 changes: 5 additions & 0 deletions Core/Core/Assets.xcassets/settings.imageset/icon-manage_accounts.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Loading