Skip to content
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
1 change: 1 addition & 0 deletions .swiftlint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ opt_in_rules: # some rules are only opt-in
excluded: # paths to ignore during linting. Takes precedence over `included`.
- Carthage
- DerivedData
- build
- Pods
- DerivedData
- Core/CoreTests
Expand Down
4 changes: 4 additions & 0 deletions Authorization/Authorization.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@
DE843D6BB1B9DDA398494890 /* Pods_App_Authorization.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 47BCFB7C19382EECF15131B6 /* Pods_App_Authorization.framework */; };
E03261642AE64676002CA7EB /* StartupViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = E03261632AE64676002CA7EB /* StartupViewModel.swift */; };
E03261662AE64AF4002CA7EB /* StartupView.swift in Sources */ = {isa = PBXBuildFile; fileRef = E03261652AE64AF4002CA7EB /* StartupView.swift */; };
E03261682AE64AF4002CA7EB /* SandboxSplashView.swift in Sources */ = {isa = PBXBuildFile; fileRef = E03261672AE64AF4002CA7EB /* SandboxSplashView.swift */; };
/* End PBXBuildFile section */

/* Begin PBXContainerItemProxy section */
Expand Down Expand Up @@ -119,6 +120,7 @@
CEB25A002CC13A36007FC792 /* SocialAuthResponse.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SocialAuthResponse.swift; sourceTree = "<group>"; };
E03261632AE64676002CA7EB /* StartupViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = StartupViewModel.swift; sourceTree = "<group>"; };
E03261652AE64AF4002CA7EB /* StartupView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = StartupView.swift; sourceTree = "<group>"; };
E03261672AE64AF4002CA7EB /* SandboxSplashView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SandboxSplashView.swift; sourceTree = "<group>"; };
E78971D8E6ED2116BBF9FD66 /* Pods-App-Authorization.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-App-Authorization.release.xcconfig"; path = "Target Support Files/Pods-App-Authorization/Pods-App-Authorization.release.xcconfig"; sourceTree = "<group>"; };
F52826C68AEA1CF4769389EA /* Pods-App-Authorization.releasestage.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-App-Authorization.releasestage.xcconfig"; path = "Target Support Files/Pods-App-Authorization/Pods-App-Authorization.releasestage.xcconfig"; sourceTree = "<group>"; };
F5802BBA113276950ABCD9B3 /* Pods-App-Authorization.releaseprod.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-App-Authorization.releaseprod.xcconfig"; path = "Target Support Files/Pods-App-Authorization/Pods-App-Authorization.releaseprod.xcconfig"; sourceTree = "<group>"; };
Expand Down Expand Up @@ -364,6 +366,7 @@
children = (
E03261632AE64676002CA7EB /* StartupViewModel.swift */,
E03261652AE64AF4002CA7EB /* StartupView.swift */,
E03261672AE64AF4002CA7EB /* SandboxSplashView.swift */,
);
path = Startup;
sourceTree = "<group>";
Expand Down Expand Up @@ -580,6 +583,7 @@
02F3BFE5292533720051930C /* AuthorizationRouter.swift in Sources */,
99C1654F2C0C4F5900DC384D /* SSOWebView.swift in Sources */,
E03261662AE64AF4002CA7EB /* StartupView.swift in Sources */,
E03261682AE64AF4002CA7EB /* SandboxSplashView.swift in Sources */,
071009C728D1DA4F00344290 /* SignInViewModel.swift in Sources */,
BA8B3A322AD5487300D25EF5 /* SocialAuthView.swift in Sources */,
99C1654D2C0C4F2F00DC384D /* SSOHelper.swift in Sources */,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ public struct SignInView: View {
ThemeAssets.appLogo.swiftUIImage
.resizable()
.aspectRatio(contentMode: .fit)
.frame(maxWidth: 189, maxHeight: 89)
.frame(maxWidth: 263, maxHeight: 76)
.padding(.top, isHorizontal ? 20 : 40)
.padding(.bottom, isHorizontal ? 10 : 40)
.accessibilityIdentifier("logo_image")
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,100 @@
//
// SandboxSplashView.swift
// Authorization
//

import SwiftUI
import Core
import Theme

public struct SandboxSplashView: View {

@Environment(\.isHorizontal) private var isHorizontal

private let router: AuthorizationRouter

public init(router: AuthorizationRouter) {
self.router = router
}

public var body: some View {
ZStack(alignment: .top) {
VStack {
ThemeAssets.headerBackground.swiftUIImage
.resizable()
.edgesIgnoringSafeArea(.top)
.accessibilityIdentifier("sandbox_splash_bg_image")
}
.frame(maxWidth: .infinity, maxHeight: 200)

VStack(alignment: .center) {
ThemeAssets.appLogo.swiftUIImage
.resizable()
.aspectRatio(contentMode: .fit)
.frame(maxWidth: 263, maxHeight: 76)
.padding(.top, isHorizontal ? 20 : 40)
.padding(.bottom, isHorizontal ? 10 : 40)
.accessibilityIdentifier("sandbox_splash_logo")

GeometryReader { proxy in
ScrollView {
VStack(alignment: .center, spacing: 16) {
Text("Welcome to the Open edX\u{00AE} Mobile App")
.font(Theme.Fonts.displaySmall)
.foregroundColor(Theme.Colors.textPrimary)
.multilineTextAlignment(.center)
.padding(.top, 8)
.accessibilityIdentifier("sandbox_splash_title")

Text(
"This app was built for you to explore the Open edX\u{00AE} Mobile App. "
+ "Courses are for demonstration purposes only."
)
.font(Theme.Fonts.titleSmall)
.foregroundColor(Theme.Colors.textPrimary)
.multilineTextAlignment(.center)
.accessibilityIdentifier("sandbox_splash_subtitle")

StyledButton(
"Start Exploring",
action: {
router.showLoginScreen(sourceScreen: .default)
},
iconImage: CoreAssets.arrowRight16.swiftUIImage,
iconPosition: .right
)
.frame(maxWidth: .infinity)
.padding(.top, 24)
.accessibilityIdentifier("sandbox_splash_start_button")

Spacer()
}
.padding(.horizontal, 24)
.padding(.top, 50)
.frameLimit(width: proxy.size.width)
}
.roundedBackground(Theme.Colors.loginBackground)
}
}
}
.navigationBarHidden(true)
.ignoresSafeArea(.all, edges: .horizontal)
.background(Theme.Colors.background.ignoresSafeArea(.all))
}
}

#if DEBUG
struct SandboxSplashView_Previews: PreviewProvider {
static var previews: some View {
SandboxSplashView(router: AuthorizationRouterMock())
.preferredColorScheme(.light)
.previewDisplayName("SandboxSplashView Light")
.loadFonts()

SandboxSplashView(router: AuthorizationRouterMock())
.preferredColorScheme(.dark)
.previewDisplayName("SandboxSplashView Dark")
.loadFonts()
}
}
#endif
20 changes: 19 additions & 1 deletion Core/Core/Configuration/Connectivity.swift
Original file line number Diff line number Diff line change
Expand Up @@ -28,14 +28,17 @@ public class Connectivity: ConnectivityProtocol {
private let verificationURL: URL
private let verificationTimeout: TimeInterval
private let cacheValidity: TimeInterval = 30
private let offlineDebounce: TimeInterval = 1.5

private var lastVerificationDate: TimeInterval?
private var lastVerificationResult: Bool = true
private var offlineTask: Task<Void, Never>?

public let internetReachableSubject = CurrentValueSubject<InternetState?, Never>(nil)

private(set) var _isInternetAvailable: Bool = true {
didSet {
guard oldValue != _isInternetAvailable else { return }
Task { @MainActor in
internetReachableSubject.send(_isInternetAvailable ? .reachable : .notReachable)
}
Expand Down Expand Up @@ -71,9 +74,10 @@ public class Connectivity: ConnectivityProtocol {
Task { @MainActor in
switch status {
case .reachable:
self.cancelOfflineDebounce()
await self.performVerification()
case .notReachable, .unknown:
self.updateAvailability(false, at: 0)
self.scheduleOffline()
}
}
}
Expand All @@ -83,6 +87,20 @@ public class Connectivity: ConnectivityProtocol {
networkManager?.stopListening()
}

private func scheduleOffline() {
offlineTask?.cancel()
offlineTask = Task { @MainActor in
try? await Task.sleep(nanoseconds: UInt64(offlineDebounce * 1_000_000_000))
guard !Task.isCancelled else { return }
updateAvailability(false, at: 0)
}
}

private func cancelOfflineDebounce() {
offlineTask?.cancel()
offlineTask = nil
}

private func performVerification() async {
let now = Date().timeIntervalSince1970
let live = await verifyInternet()
Expand Down
6 changes: 5 additions & 1 deletion Core/Core/View/Base/OfflineSnackBarView.swift
Original file line number Diff line number Diff line change
Expand Up @@ -69,17 +69,21 @@ public struct OfflineSnackBarView: View {
dismiss = false
}
case .reachable:
break
withAnimation {
dismiss = true
}
case .none:
break
}
})
}
}

#if DEBUG
struct OfflineSnackBarView_Previews: PreviewProvider {
static var previews: some View {
let configMock = ConfigMock()
OfflineSnackBarView(connectivity: Connectivity(config: configMock), reloadAction: {})
}
}
#endif
2 changes: 2 additions & 0 deletions Core/Core/View/Base/WebBrowser.swift
Original file line number Diff line number Diff line change
Expand Up @@ -79,9 +79,11 @@ public struct WebBrowser: View {
}
}

#if DEBUG
struct WebBrowser_Previews: PreviewProvider {
static var previews: some View {
let configMock = ConfigMock()
WebBrowser(url: "", pageTitle: "", connectivity: Connectivity(config: configMock))
}
}
#endif
2 changes: 1 addition & 1 deletion Course/Course/Presentation/Unit/Subviews/WebView.swift
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ struct WebView: View {
url: url,
dataUrl: localUrl,
viewModel: Container.shared.resolve(WebUnitViewModel.self)!,
connectivity: Connectivity(config: ConfigMock()),
connectivity: Connectivity(config: Container.shared.resolve(ConfigProtocol.self)!),
injections: injections,
blockID: blockID
)
Expand Down
Loading