Skip to content

feat: Learning Sites picker (multi-instance switching UI) #683

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

Merged
RawanMatar89 merged 5 commits into from
Sep 29, 2026
Merged

feat: Learning Sites picker (multi-instance switching UI) #683

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
bb2fa0f
feat: add the Learning Sites screen (list, switch, logout, branded si…
RawanMatar89 Sep 27, 2026
c1f8e18
feat: apply the instance's accent color app-wide
RawanMatar89 Sep 27, 2026
a693fac
fix: polish Learning Sites picker and sign-in flow
RawanMatar89 Sep 27, 2026
869b781
feat: redesign Learning Sites picker, fix session/theme bugs
RawanMatar89 Sep 27, 2026
e0ff860
fix: instance-switching and launch reliability fixes
RawanMatar89 Sep 27, 2026
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
8 changes: 8 additions & 0 deletions AppDates/AppDatesTests/Generated/AppDatesMocks.generated.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -341,6 +341,14 @@ public final class CoreStorageMock: CoreStorage, @unchecked Sendable {
}

}

public var sessionInstanceKeys: Set<String> = []
public func hasSession(forInstanceKey key: String) -> Bool {
sessionInstanceKeys.contains(key)
}
public func clearSession(forInstanceKey key: String) {
sessionInstanceKeys.remove(key)
}
}

public final class AuthInteractorProtocolMock: AuthInteractorProtocol, @unchecked Sendable {
Expand Down
28 changes: 28 additions & 0 deletions Authorization/Authorization.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
071009C728D1DA4F00344290 /* SignInViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 071009C628D1DA4F00344290 /* SignInViewModel.swift */; };
07169458296D913400E3DED6 /* Authorization.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0770DE3B28D0A319006D8A5D /* Authorization.framework */; platformFilter = ios; };
07169464296D96DD00E3DED6 /* SignInViewModelTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 07169463296D96DD00E3DED6 /* SignInViewModelTests.swift */; };
CC17B772EB764690BF49B5B4 /* LearningSitesViewModelTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = D20675D1281E4AFDB49DB428 /* LearningSitesViewModelTests.swift */; };
0770DE4728D0A3DA006D8A5D /* Core.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0770DE4628D0A3DA006D8A5D /* Core.framework */; };
0770DE4E28D0A677006D8A5D /* SignInView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0770DE4D28D0A677006D8A5D /* SignInView.swift */; };
0770DE6828D0BF03006D8A5D /* swiftgen.yml in Resources */ = {isa = PBXBuildFile; fileRef = 0770DE6728D0BF03006D8A5D /* swiftgen.yml */; };
Expand All @@ -45,6 +46,8 @@
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 */; };
D3823C1D148543EBAF6E72D5 /* LearningSitesViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3C1A59CA22C043B5B0B43646 /* LearningSitesViewModel.swift */; };
4B59BF99F958493F94F19119 /* LearningSitesView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9A9BDA13C3C4465B82EBFFA4 /* LearningSitesView.swift */; };
/* End PBXBuildFile section */

/* Begin PBXContainerItemProxy section */
Expand Down Expand Up @@ -83,6 +86,7 @@
071009C628D1DA4F00344290 /* SignInViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SignInViewModel.swift; sourceTree = "<group>"; };
07169454296D913300E3DED6 /* AuthorizationTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = AuthorizationTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
07169463296D96DD00E3DED6 /* SignInViewModelTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SignInViewModelTests.swift; sourceTree = "<group>"; };
D20675D1281E4AFDB49DB428 /* LearningSitesViewModelTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LearningSitesViewModelTests.swift; sourceTree = "<group>"; };
0770DE3B28D0A319006D8A5D /* Authorization.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Authorization.framework; sourceTree = BUILT_PRODUCTS_DIR; };
0770DE4628D0A3DA006D8A5D /* Core.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = Core.framework; sourceTree = BUILT_PRODUCTS_DIR; };
0770DE4D28D0A677006D8A5D /* SignInView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SignInView.swift; sourceTree = "<group>"; };
Expand Down Expand Up @@ -119,6 +123,8 @@
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>"; };
3C1A59CA22C043B5B0B43646 /* LearningSitesViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LearningSitesViewModel.swift; sourceTree = "<group>"; };
9A9BDA13C3C4465B82EBFFA4 /* LearningSitesView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LearningSitesView.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 @@ -190,6 +196,7 @@
99C165492C0C4EF000DC384D /* SSO */,
BA8B3A302AD5485100D25EF5 /* SocialAuth */,
E03261622AE6464A002CA7EB /* Startup */,
3B80FE1C87E04870A6AF2DA5 /* LearningSites */,
020C31BD290AADA700D6DEA2 /* Base */,
071009C528D1D9FA00344290 /* Login */,
07169462296D93E000E3DED6 /* Registration */,
Expand Down Expand Up @@ -223,6 +230,7 @@
children = (
022D0480297442B200E0059B /* Register */,
07169484296EC3D700E3DED6 /* Login */,
F316F4DD3C0A4F01BB8EF3AB /* LearningSites */,
);
path = Presentation;
sourceTree = "<group>";
Expand All @@ -236,6 +244,14 @@
path = Login;
sourceTree = "<group>";
};
F316F4DD3C0A4F01BB8EF3AB /* LearningSites */ = {
isa = PBXGroup;
children = (
D20675D1281E4AFDB49DB428 /* LearningSitesViewModelTests.swift */,
);
path = LearningSites;
sourceTree = "<group>";
};
0770DE3128D0A318006D8A5D = {
isa = PBXGroup;
children = (
Expand Down Expand Up @@ -368,6 +384,15 @@
path = Startup;
sourceTree = "<group>";
};
3B80FE1C87E04870A6AF2DA5 /* LearningSites */ = {
isa = PBXGroup;
children = (
3C1A59CA22C043B5B0B43646 /* LearningSitesViewModel.swift */,
9A9BDA13C3C4465B82EBFFA4 /* LearningSitesView.swift */,
);
path = LearningSites;
sourceTree = "<group>";
};
/* End PBXGroup section */

/* Begin PBXHeadersBuildPhase section */
Expand Down Expand Up @@ -556,6 +581,7 @@
files = (
022D0482297442BA00E0059B /* SignUpViewModelTests.swift in Sources */,
07169464296D96DD00E3DED6 /* SignInViewModelTests.swift in Sources */,
CC17B772EB764690BF49B5B4 /* LearningSitesViewModelTests.swift in Sources */,
A5B468112F29C845002A4ECA /* AuthorizationMocks.generated.swift in Sources */,
02E0618429DC2373006E9024 /* ResetPasswordViewModelTests.swift in Sources */,
);
Expand All @@ -580,6 +606,8 @@
02F3BFE5292533720051930C /* AuthorizationRouter.swift in Sources */,
99C1654F2C0C4F5900DC384D /* SSOWebView.swift in Sources */,
E03261662AE64AF4002CA7EB /* StartupView.swift in Sources */,
D3823C1D148543EBAF6E72D5 /* LearningSitesViewModel.swift in Sources */,
4B59BF99F958493F94F19119 /* LearningSitesView.swift in Sources */,
071009C728D1DA4F00344290 /* SignInViewModel.swift in Sources */,
BA8B3A322AD5487300D25EF5 /* SocialAuthView.swift in Sources */,
99C1654D2C0C4F2F00DC384D /* SSOHelper.swift in Sources */,
Expand Down
250 changes: 250 additions & 0 deletions Authorization/Authorization/Presentation/LearningSites/LearningSitesView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,250 @@
//
// LearningSitesView.swift
// Authorization
//
// Created by Rawan Matar on 22/09/2026.
//

import SwiftUI
import Core
import Theme

public struct LearningSitesView: View {

@Bindable private var viewModel: LearningSitesViewModel
@Environment(\.isHorizontal) private var isHorizontal

public init(viewModel: LearningSitesViewModel) {
self.viewModel = viewModel
}

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

VStack(alignment: .center) {
if viewModel.isSwitching {
// Fixed spacing, not a Spacer -- an unbounded Spacer here would expand
// to fill whatever room the ScrollView below doesn't claim.
VStack(alignment: .leading, spacing: 12) {
BackNavigationButton(
color: Theme.Colors.loginNavigationText,
action: { viewModel.router.back() }
)
.backViewStyle()
.padding(.leading, isHorizontal ? 48 : 16)
.accessibilityIdentifier("back_button")

// The site being switched FROM.
if let current = viewModel.currentInstance {
HStack(spacing: 12) {
InstanceThemedImage(
source: current.logoURLString,
allowsBundledAsset: true,
fallback: ThemeAssets.appLogo.swiftUIImage
)
.aspectRatio(contentMode: .fit)
.frame(width: 56, height: 56)

Text(current.name)
.font(Theme.Fonts.titleLarge)
.foregroundColor(Theme.Colors.loginNavigationText)
.accessibilityIdentifier("current_site_header_name")
}
.frame(maxWidth: .infinity, alignment: .center)
.padding(.bottom, 24)
}
}
.frame(maxWidth: .infinity, alignment: .leading)
} else {
ThemeAssets.appLogo.swiftUIImage
.resizable()
.aspectRatio(contentMode: .fit)
.frame(maxWidth: 189, maxHeight: 89)
.padding(.top, isHorizontal ? 20 : 40)
.padding(.bottom, isHorizontal ? 10 : 40)
.accessibilityIdentifier("logo_image")
}

ScrollView {
VStack(alignment: .leading, spacing: 24) {
if viewModel.isSwitching {
VStack(alignment: .leading, spacing: 4) {
Text(AuthLocalization.LearningSites.title)
.font(Theme.Fonts.displaySmall)
.foregroundColor(Theme.Colors.textPrimary)
.accessibilityIdentifier("learning_sites_title_text")

Text(AuthLocalization.LearningSites.subtitle)
.font(Theme.Fonts.titleSmall)
.foregroundColor(Theme.Colors.textSecondary)
.accessibilityIdentifier("learning_sites_subtitle_text")
}
} else {
VStack(alignment: .leading, spacing: 4) {
Text(AuthLocalization.LearningSites.getStarted)
.font(Theme.Fonts.displaySmall)
.foregroundColor(Theme.Colors.textPrimary)
.accessibilityIdentifier("get_started_text")

Text(AuthLocalization.LearningSites.welcomeSubtitle)
.font(Theme.Fonts.titleSmall)
.foregroundColor(Theme.Colors.textPrimary)
.accessibilityIdentifier("welcome_subtitle_text")
}
}

if let current = viewModel.currentInstance {
sitesSection(
title: AuthLocalization.LearningSites.currentSite,
sites: [current],
showsLogOut: true
)
}

if !viewModel.otherLearningSites.isEmpty {
sitesSection(
title: AuthLocalization.LearningSites.moreSites,
sites: viewModel.otherLearningSites,
showsLogOut: true
)
}

sitesSection(
title: AuthLocalization.LearningSites.addSite,
sites: viewModel.addableSites,
showsLogOut: false,
searchField: true
)
}
.frameLimit(width: proxy.size.width)
.padding(.horizontal, 24)
.padding(.top, 24)
}
.roundedBackground(Theme.Colors.background)
}
}
}
.navigationBarHidden(true)
.navigationBarBackButtonHidden(true)
}

@ViewBuilder
private func sitesSection(
title: String,
sites: [Instance],
showsLogOut: Bool,
searchField: Bool = false
) -> some View {
VStack(alignment: .leading, spacing: 12) {
Text(title)
.font(Theme.Fonts.titleMedium)
.foregroundColor(Theme.Colors.textPrimary)

if searchField {
searchBar
}

if sites.isEmpty && searchField {
Text(AuthLocalization.LearningSites.emptySearch)
.font(Theme.Fonts.bodySmall)
.foregroundColor(Theme.Colors.textSecondary)
} else {
ForEach(sites) { instance in
siteRow(instance, showsLogOut: showsLogOut)
Divider()
}
}
}
}

private var searchBar: some View {
HStack(spacing: 11) {
Image(systemName: "magnifyingglass")
.padding(.leading, 16)
.foregroundColor(Theme.Colors.textInputTextColor)
TextField("", text: $viewModel.searchText)
.autocapitalization(.none)
.autocorrectionDisabled()
.frame(minHeight: 50)
.font(Theme.Fonts.bodyLarge)
.foregroundColor(Theme.Colors.textInputTextColor)
.accessibilityIdentifier("learning_sites_search_field")
}
.overlay(
Theme.Shapes.textInputShape
.stroke(lineWidth: 1)
.fill(Theme.Colors.textInputStroke)
)
.background(
Theme.InputFieldBackground(
placeHolder: AuthLocalization.LearningSites.searchPlaceholder,
text: viewModel.searchText,
padding: 48
)
)
}

// A `Button` can't nest inside another `Button`'s label -- the outer one swallows every
// tap. The row itself is tappable via `.onTapGesture`; the X stays a real, separate
// `Button` so it keeps receiving its own taps.
private func siteRow(_ instance: Instance, showsLogOut: Bool) -> some View {
HStack(spacing: 12) {
InstanceThemedImage(
source: instance.logoURLString,
allowsBundledAsset: true,
fallback: ThemeAssets.appLogo.swiftUIImage
)
.aspectRatio(contentMode: .fit)
.frame(width: 50, height: 50)

VStack(alignment: .leading, spacing: 2) {
Text(instance.baseURL.host ?? instance.baseURL.absoluteString)
.font(Theme.Fonts.labelMedium)
.foregroundColor(Theme.Colors.textSecondary)
Text(instance.name)
.font(Theme.Fonts.titleSmall)
.foregroundColor(Theme.Colors.textPrimary)
}

Spacer()

if showsLogOut {
Button(action: { presentLogOutConfirm(for: instance) }, label: {
Image(systemName: "xmark.circle.fill")
.foregroundColor(Theme.Colors.textSecondary)
})
.accessibilityIdentifier("log_out_site_button")
}
}
.frame(minHeight: 60)
.contentShape(Rectangle())
.onTapGesture {
Task { await viewModel.select(instance) }
}
.accessibilityIdentifier("select_site_button")
}

private func presentLogOutConfirm(for instance: Instance) {
viewModel.router.presentAlert(
alertTitle: AuthLocalization.LearningSites.logOutTitle,
alertMessage: AuthLocalization.LearningSites.logOutMessage(instance.name),
positiveAction: AuthLocalization.LearningSites.logOutAction,
onCloseTapped: {
viewModel.router.dismiss(animated: true)
},
firstButtonTapped: {
viewModel.router.dismiss(animated: true)
Task { await viewModel.logOut(instance) }
},
type: .logOut
)
}
}
Loading
Loading