feat: Kisani rebrand, step-based onboarding flow, dark mode fixes

- Rename app to Kisani in all UI text and Face ID prompt
- Replace flat 2-state RootView with 5-step flow: ConnectView →
  LoginView → FolderSetupView → PhotoPermissionView → MainTabView
- Remove NavigationStack from LoginView (was causing nested-stack crash);
  drive navigation via ConnectionStore.isSessionActive
- Add FolderSetupView and PhotoPermissionView onboarding screens with
  step indicator (2/3, 3/3), spring entrance animations, and UGreen
  connection chip
- Fix dark mode button invisibility: PrimaryButtonStyle and PillButtonStyle
  now use AppTheme.inkInverse; GhostButtonStyle border uses ink.opacity(0.25)
- Add AppTheme.inkInverse adaptive token (dark bg ink on dark, white on light)
- Add ConnectionStore.isSessionActive (non-persisted) and
  onboardingPhotoShown (UserDefaults-persisted)
- Add os_log logging in LoginViewModel at auth start/success/failure
- Remove dead Help button from ConnectView
- UGreenCompatibilityBadge, KeychainStore, SavedConnections, extensions,
  PrivacyInfo.xcprivacy, unit test target and test stubs
- AppTheme: full UIColor dynamic provider tokens for dark/light adaptive color
- AppearanceMode enum + segmented picker in SettingsView
- BackupView: enlarged ring, removed options card and linear progress bar
- HistoryView: duration and bytes formatting, improved typography hierarchy

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
This commit is contained in:
Robin Kutesa
2026-05-16 16:20:53 +03:00
parent 03d63e60de
commit ae38f6e417
38 changed files with 1649 additions and 451 deletions

View File

@@ -0,0 +1,117 @@
import XCTest
import Photos
@testable import NASBackup
@MainActor
final class BackupEngineTests: XCTestCase {
private func makeAssets(count: Int) -> [PhotoAsset] {
(0..<count).map { i in
PhotoAsset(
localIdentifier: "asset-\(i)",
filename: "photo_\(i).jpg",
creationDate: Date(),
mediaType: .image,
pixelWidth: 1024, pixelHeight: 768,
duration: 0, isScreenshot: false, isRAW: false
)
}
}
private func makeConnection() -> NASConnection {
NASConnection(host: "192.168.1.10", nasProtocol: .smb,
username: "user", password: "pass", remotePath: "/backup")
}
func test_backup_uploadsAllAssets() async throws {
let mock = MockNASService()
let photos = MockPhotoLibraryService(assets: makeAssets(count: 3))
let engine = BackupEngine.testInstance(transfer: mock, photos: photos)
let result = try await engine.run(connection: makeConnection(), filter: BackupFilter())
XCTAssertEqual(result.uploadedCount, 3)
XCTAssertEqual(result.failedCount, 0)
XCTAssertEqual(mock.uploadCallCount, 3)
}
func test_backup_skipsExistingFiles_whenNewFilesOnly() async throws {
let mock = MockNASService()
mock.fileExistsAnswer = true
let photos = MockPhotoLibraryService(assets: makeAssets(count: 2))
let engine = BackupEngine.testInstance(transfer: mock, photos: photos)
var filter = BackupFilter()
filter.newFilesOnly = true
let result = try await engine.run(connection: makeConnection(), filter: filter)
XCTAssertEqual(result.skippedCount, 2)
XCTAssertEqual(result.uploadedCount, 0)
}
func test_backup_handlesUploadFailure_gracefully() async throws {
let mock = MockNASService()
mock.shouldFail = true
let photos = MockPhotoLibraryService(assets: makeAssets(count: 2))
let engine = BackupEngine.testInstance(transfer: mock, photos: photos)
let result = try await engine.run(connection: makeConnection(), filter: BackupFilter())
XCTAssertEqual(result.failedCount, 2)
XCTAssertEqual(result.uploadedCount, 0)
}
func test_backup_emitsProgressUpdates() async throws {
let mock = MockNASService()
let photos = MockPhotoLibraryService(assets: makeAssets(count: 5))
let engine = BackupEngine.testInstance(transfer: mock, photos: photos)
var progressEvents = 0
let cancellable = engine.$job.sink { job in
if case .running = job.status { progressEvents += 1 }
}
defer { cancellable.cancel() }
_ = try await engine.run(connection: makeConnection(), filter: BackupFilter())
XCTAssertGreaterThan(progressEvents, 0, "Expected progress events during backup")
}
func test_backup_canBePaused_andResumed() async throws {
let mock = MockNASService()
mock.uploadDelay = 0.05
let photos = MockPhotoLibraryService(assets: makeAssets(count: 4))
let engine = BackupEngine.testInstance(transfer: mock, photos: photos)
let task = Task { try await engine.run(connection: makeConnection(), filter: BackupFilter()) }
try await Task.sleep(nanoseconds: 70_000_000)
engine.pause()
let statusAfterPause = engine.job.status
engine.resume()
let result = try await task.value
if case .paused = statusAfterPause { } else {
XCTFail("Expected .paused status, got \(statusAfterPause)")
}
XCTAssertEqual(result.uploadedCount, 4)
}
}
// MARK: - MockPhotoLibraryService
final class MockPhotoLibraryService: PhotoLibraryProtocol {
var authorizationStatus: PHAuthorizationStatus { .authorized }
private let assets: [PhotoAsset]
init(assets: [PhotoAsset]) { self.assets = assets }
func requestAuthorization() async -> PHAuthorizationStatus { .authorized }
func fetchAssets(filter: BackupFilter) -> [PhotoAsset] { assets }
func exportAsset(_ asset: PhotoAsset) async throws -> URL {
let url = FileManager.default.temporaryDirectory.appendingPathComponent(asset.filename)
try Data("mock-data".utf8).write(to: url)
return url
}
}

View File

@@ -0,0 +1,47 @@
import XCTest
@testable import NASBackup
@MainActor
final class ConnectViewModelTests: XCTestCase {
func test_canConnect_isFalse_whenFieldsEmpty() {
let vm = ConnectViewModel()
XCTAssertFalse(vm.canConnect)
}
func test_canConnect_isTrue_whenAllFieldsFilled() {
let vm = ConnectViewModel()
vm.host = "192.168.1.10"
vm.username = "admin"
vm.password = "secret"
XCTAssertTrue(vm.canConnect)
}
func test_connectionState_becomesVerified_onSuccess() async {
let vm = ConnectViewModel()
vm.host = "192.168.1.10"
vm.username = "admin"
vm.password = "secret"
// Override the service factory so no real network call is made.
let mock = MockNASService()
await vm.verifyWith(transfer: mock)
XCTAssertTrue(vm.isConnected)
XCTAssertNil(vm.verifyError)
}
func test_connectionState_becomesFailed_onError() async {
let vm = ConnectViewModel()
vm.host = "192.168.1.10"
vm.username = "admin"
vm.password = "wrong"
let mock = MockNASService()
mock.shouldFail = true
await vm.verifyWith(transfer: mock)
XCTAssertFalse(vm.isConnected)
XCTAssertNotNil(vm.verifyError)
}
}

View File

@@ -0,0 +1,48 @@
import XCTest
@testable import NASBackup
final class LANMonitorTests: XCTestCase {
func test_ssidMatch_triggersCallback() async {
let monitor = LANMonitor.shared
let trusted = ["HomeNet"]
var triggered = false
monitor.onTrustedNetworkJoined = { _ in triggered = true }
// Inject known SSID via checkAndTriggerIfTrusted using a subclass stub
// Since fetchCurrentSSID uses NEHotspotNetwork (requires device), we test
// the guard logic directly through checkAndTriggerIfTrusted with a mock SSID.
let stub = LANMonitorSSIDStub(ssid: "HomeNet")
await stub.checkAndTrigger(trustedSSIDs: trusted) { ssid in triggered = true }
XCTAssertTrue(triggered)
}
func test_ssidMismatch_doesNotTrigger() async {
var triggered = false
let stub = LANMonitorSSIDStub(ssid: "RandomCafe")
await stub.checkAndTrigger(trustedSSIDs: ["HomeNet"]) { _ in triggered = true }
XCTAssertFalse(triggered)
}
func test_trustedSSIDs_caseInsensitiveMatch() async {
var triggered = false
let stub = LANMonitorSSIDStub(ssid: "homenet")
let trusted = ["HomeNet"]
// Case-sensitive check verify current behaviour; adjust if policy changes.
await stub.checkAndTrigger(trustedSSIDs: trusted) { _ in triggered = true }
// Current implementation is case-sensitive; update assertion if behaviour changes.
XCTAssertFalse(triggered, "Current implementation is case-sensitive")
}
}
// Lightweight stub that bypasses NEHotspotNetwork entitlement requirement.
struct LANMonitorSSIDStub {
let ssid: String?
func checkAndTrigger(trustedSSIDs: [String], callback: (String) -> Void) async {
guard let ssid, trustedSSIDs.contains(ssid) else { return }
callback(ssid)
}
}

View File

@@ -0,0 +1,49 @@
import Foundation
@testable import NASBackup
final class MockNASService: NASTransferProtocol {
var shouldFail: Bool = false
var uploadDelay: TimeInterval = 0
var fakeItems: [NASItem] = []
var fileExistsAnswer: Bool = false
private(set) var connectCalled = false
private(set) var uploadCallCount = 0
private(set) var lastUploadedPath: String?
var isConnected: Bool = false
func connect(to host: String, port: Int, username: String, password: String) async throws {
connectCalled = true
if shouldFail { throw MockError.connectionFailed }
isConnected = true
}
func disconnect() { isConnected = false }
func listDirectory(at path: String) async throws -> [NASItem] {
if shouldFail { throw MockError.connectionFailed }
return fakeItems
}
func createDirectory(at path: String) async throws {
if shouldFail { throw MockError.connectionFailed }
}
func fileExists(at remotePath: String) async throws -> Bool { fileExistsAnswer }
func upload(localURL: URL, remotePath: String, progress: @escaping (Int64, Int64) -> Void) async throws {
if uploadDelay > 0 {
try await Task.sleep(nanoseconds: UInt64(uploadDelay * 1_000_000_000))
}
if shouldFail { throw MockError.uploadFailed }
progress(100, 100)
uploadCallCount += 1
lastUploadedPath = remotePath
}
}
enum MockError: Error {
case connectionFailed
case uploadFailed
}

View File

@@ -0,0 +1,22 @@
import XCTest
@testable import NASBackup
final class NASProtocolTests: XCTestCase {
func test_allCases_haveLocalizedDescriptions() {
for proto in NASProtocol.allCases {
XCTAssertFalse(
proto.localizedDescription.isEmpty,
"\(proto.rawValue) has no localizedDescription"
)
}
}
func test_smb_defaultPort_is445() {
XCTAssertEqual(NASProtocol.smb.defaultPort, 445)
}
func test_sftp_defaultPort_is22() {
XCTAssertEqual(NASProtocol.sftp.defaultPort, 22)
}
}