Skip to content

Commit

Permalink
Merge branch 'feature/change-navigation-controller-to-swiftui' of htt…
Browse files Browse the repository at this point in the history 
…ps://github.com/raccoongang/educationx-app-ios into feature/change-navigation-controller-to-swiftui
  • Loading branch information
@IvanStepanok @volodymyr-chekyrta
IvanStepanok authored and volodymyr-chekyrta committed Aug 11, 2023
2 parents 2f87c93 + d53e988 commit f4b7659
Show file tree
Hide file tree
Showing 5 changed files with 114 additions and 108 deletions.
54 changes: 29 additions & 25 deletions Discovery/Discovery/Presentation/DiscoveryView.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -80,25 +80,28 @@ public struct DiscoveryView: View {
.padding(.bottom, 20)
Spacer()
}.padding(.leading, 10)
ForEach(Array(viewModel.courses.enumerated()),
id: \.offset) { index, course in
CourseCellView(model: course,
type: .discovery,
index: index,
cellsCount: viewModel.courses.count)
.padding(.horizontal, 24)
.onAppear {
Task {
await viewModel.getDiscoveryCourses(index: index)
ForEach(Array(viewModel.courses.enumerated()), id: \.offset) { index, course in
CourseCellView(
model: course,
type: .discovery,
index: index,
cellsCount: viewModel.courses.count
).padding(.horizontal, 24)
.onAppear {
Task {
await viewModel.getDiscoveryCourses(index: index)
}
}
.onTapGesture {
viewModel.discoveryCourseClicked(
courseID: course.courseID,
courseName: course.name
)
router.showCourseDetais(
courseID: course.courseID,
title: course.name
)
}
}
.onTapGesture {
viewModel.discoveryCourseClicked(courseID: course.courseID, courseName: course.name)
router.showCourseDetais(
courseID: course.courseID,
title: course.name
)
}
}

// MARK: - ProgressBar
Expand All @@ -116,13 +119,14 @@ public struct DiscoveryView: View {
}

// MARK: - Offline mode SnackBar
OfflineSnackBarView(connectivity: viewModel.connectivity,
reloadAction: {
viewModel.courses = []
viewModel.totalPages = 1
viewModel.nextPage = 1
await viewModel.discovery(page: 1, withProgress: isIOS14)
})
OfflineSnackBarView(
connectivity: viewModel.connectivity,
reloadAction: {
viewModel.courses = []
viewModel.totalPages = 1
viewModel.nextPage = 1
await viewModel.discovery(page: 1, withProgress: isIOS14)
})

// MARK: - Error Alert
if viewModel.showError {
Expand Down
8 changes: 5 additions & 3 deletions Discovery/Discovery/Presentation/DiscoveryViewModel.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,11 @@ public class DiscoveryViewModel: ObservableObject {
private let interactor: DiscoveryInteractorProtocol
private let analytics: DiscoveryAnalytics

public init(interactor: DiscoveryInteractorProtocol,
connectivity: ConnectivityProtocol,
analytics: DiscoveryAnalytics) {
public init(
interactor: DiscoveryInteractorProtocol,
connectivity: ConnectivityProtocol,
analytics: DiscoveryAnalytics
) {
self.interactor = interactor
self.connectivity = connectivity
self.analytics = analytics
Expand Down
4 changes: 2 additions & 2 deletions OpenEdX.xcodeproj/xcshareddata/xcschemes/OpenEdXStage.xcscheme
View file
Original file line number Diff line number Diff line change
Expand Up @@ -101,8 +101,8 @@
</TestAction>
<LaunchAction
buildConfiguration = "DebugStage"
selectedDebuggerIdentifier = ""
selectedLauncherIdentifier = "Xcode.IDEFoundation.Launcher.PosixSpawn"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
launchStyle = "0"
useCustomWorkingDirectory = "NO"
ignoresPersistentStateOnLaunch = "NO"
Expand Down
100 changes: 50 additions & 50 deletions OpenEdX/Environment.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,78 +12,78 @@ import FirebaseCore
enum `Environment`: String {
case debugDev = "DebugDev"
case releaseDev = "ReleaseDev"

case debugStage = "DebugStage"
case releaseStage = "ReleaseStage"

case debugProd = "DebugProd"
case releaseProd = "ReleaseProd"
}

class BuildConfiguration {
static let shared = BuildConfiguration()

var environment: Environment

var baseURL: String {
switch environment {
case .debugDev, .releaseDev:
return "https://lms-rg-app-ios-dev.raccoongang.com"
case .debugStage, .releaseStage:
return "https://lms-rg-app-ios-stage.raccoongang.com"
case .debugProd, .releaseProd:
return "https://example.com"
case .debugDev, .releaseDev:
return "https://example-dev.com"
case .debugStage, .releaseStage:
return "https://example-stage.com"
case .debugProd, .releaseProd:
return "https://example.com"
}
}

var clientId: String {
switch environment {
case .debugDev, .releaseDev:
return "T7od4OFlYni7hTMnepfQuF1XUoqsESjEClltL40T"
case .debugStage, .releaseStage:
return "kHDbLaYlc1lpY1obmyAAEp9dX9qPqeDrBiVGQFIy"
case .debugProd, .releaseProd:
return "PROD_CLIENT_ID"
case .debugDev, .releaseDev:
return "DEV_CLIENT_ID"
case .debugStage, .releaseStage:
return "STAGE_CLIENT_ID"
case .debugProd, .releaseProd:
return "PROD_CLIENT_ID"
}
}

var firebaseOptions: FirebaseOptions {
switch environment {
case .debugDev, .releaseDev:
let firebaseOptions = FirebaseOptions(googleAppID: "1:60657986297:ios:bf0254060e5c3779581028",
gcmSenderID: "60657986297")
firebaseOptions.apiKey = "AIzaSyCKj--Dfkq08r4P1d2q7Tz36gu9SQ9Apbs"
firebaseOptions.projectID = "openedxmobile-dev"
firebaseOptions.bundleID = "com.raccoongang.NewEdX.dev"
firebaseOptions.clientID = "60657986297-t6utefrq6tt0tscr85igqh0ni9gtis8l.apps.googleusercontent.com"
firebaseOptions.storageBucket = "openedxmobile-dev.appspot.com"
return firebaseOptions
case .debugStage, .releaseStage:
let firebaseOptions = FirebaseOptions(googleAppID: "1:156114692773:ios:8058bca851a8bc7c187b4c",
gcmSenderID: "156114692773")
firebaseOptions.apiKey = "AIzaSyCKAIXDLM7pnX43P_viTsfgbxrLBOaJwGo"
firebaseOptions.projectID = "openedxmobile-stage"
firebaseOptions.bundleID = "com.raccoongang.NewEdX.stage"
firebaseOptions.clientID = "156114692773-r5pgdcdjqq7sup75fdla4lk3q3kjc6m8.apps.googleusercontent.com"
firebaseOptions.storageBucket = "openedxmobile-stage.appspot.com"
return firebaseOptions
case .debugProd, .releaseProd:
let firebaseOptions = FirebaseOptions(googleAppID: "",
gcmSenderID: "")
firebaseOptions.apiKey = ""
firebaseOptions.projectID = ""
firebaseOptions.bundleID = ""
firebaseOptions.clientID = ""
firebaseOptions.storageBucket = ""
return firebaseOptions
case .debugDev, .releaseDev:
let firebaseOptions = FirebaseOptions(googleAppID: "",
gcmSenderID: "")
firebaseOptions.apiKey = ""
firebaseOptions.projectID = ""
firebaseOptions.bundleID = ""
firebaseOptions.clientID = ""
firebaseOptions.storageBucket = ""

return firebaseOptions
case .debugStage, .releaseStage:
let firebaseOptions = FirebaseOptions(googleAppID: "",
gcmSenderID: "")
firebaseOptions.apiKey = ""
firebaseOptions.projectID = ""
firebaseOptions.bundleID = ""
firebaseOptions.clientID = ""
firebaseOptions.storageBucket = ""

return firebaseOptions
case .debugProd, .releaseProd:
let firebaseOptions = FirebaseOptions(googleAppID: "",
gcmSenderID: "")
firebaseOptions.apiKey = ""
firebaseOptions.projectID = ""
firebaseOptions.bundleID = ""
firebaseOptions.clientID = ""
firebaseOptions.storageBucket = ""

return firebaseOptions
}
}

init() {
let currentConfiguration = Bundle.main.object(forInfoDictionaryKey: "Configuration") as! String
environment = Environment(rawValue: currentConfiguration)!
}
}
}
56 changes: 28 additions & 28 deletions OpenEdX/View/MainScreenView.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,27 +17,14 @@ struct MainScreenView: View {

@State private var selection: MainTab = .discovery

func titleBar() -> String {
switch selection {
case .discovery:
return DiscoveryLocalization.title
case .dashboard:
return DashboardLocalization.title
case .programs:
return CoreLocalization.Mainscreen.programs
case .profile:
return ProfileLocalization.title
}
}

enum MainTab {
case discovery
case dashboard
case programs
case profile
}

let analytics = Container.shared.resolve(MainScreenAnalytics.self)!
private let analytics = Container.shared.resolve(MainScreenAnalytics.self)!

init() {
UINavigationBar.appearance().isTranslucent = false
Expand Down Expand Up @@ -68,7 +55,7 @@ struct MainScreenView: View {
Text(CoreLocalization.Mainscreen.discovery)
}
.tag(MainTab.discovery)

VStack {
DashboardView(
viewModel: Container.shared.resolve(DashboardViewModel.self)!,
Expand All @@ -89,7 +76,7 @@ struct MainScreenView: View {
Text(CoreLocalization.Mainscreen.programs)
}
.tag(MainTab.programs)

VStack {
ProfileView(
viewModel: Container.shared.resolve(ProfileViewModel.self)!
Expand All @@ -104,18 +91,31 @@ struct MainScreenView: View {
.navigationBarHidden(selection == .profile)
.navigationBarBackButtonHidden(false)
.navigationTitle(titleBar())
.onChange(of: selection, perform: { selection in
switch selection {
case .discovery:
analytics.mainDiscoveryTabClicked()
case .dashboard:
analytics.mainDashboardTabClicked()
case .programs:
analytics.mainProgramsTabClicked()
case .profile:
analytics.mainProfileTabClicked()
}
})
.onChange(of: selection, perform: { selection in
switch selection {
case .discovery:
analytics.mainDiscoveryTabClicked()
case .dashboard:
analytics.mainDashboardTabClicked()
case .programs:
analytics.mainProgramsTabClicked()
case .profile:
analytics.mainProfileTabClicked()
}
})
}

private func titleBar() -> String {
switch selection {
case .discovery:
return DiscoveryLocalization.title
case .dashboard:
return DashboardLocalization.title
case .programs:
return CoreLocalization.Mainscreen.programs
case .profile:
return ProfileLocalization.title
}
}

struct MainScreenView_Previews: PreviewProvider {
Expand Down

0 comments on commit f4b7659

Please sign in to comment.