Migrate from iOS 17 Observation to iOS 16-compatible Combine architecture.

Lower deployment target to iOS 16, replace @Observable with ObservableObject, add navigation and UI compatibility shims, and include login smoke UI tests.

Co-authored-by: Cursor <cursoragent@cursor.com>
This commit is contained in:
2026-06-26 10:16:35 +08:00
parent c32a610ee0
commit 26f4d0e671
127 changed files with 2320 additions and 1465 deletions

View File

@ -6,7 +6,7 @@
//
import Foundation
import Observation
import Combine
///
@MainActor
@ -16,10 +16,9 @@ protocol OperatingAreaServing {
}
@MainActor
@Observable
/// API
final class OperatingAreaAPI {
@ObservationIgnored private let client: APIClient
private let client: APIClient
/// API
init(client: APIClient) {

View File

@ -6,18 +6,17 @@
//
import Foundation
import Observation
import Combine
@MainActor
@Observable
/// ViewModel
final class OperatingAreaViewModel {
private(set) var mode: OperatingAreaEntryMode?
private(set) var loading = false
private(set) var items: [OperatingAreaItem] = []
private(set) var fenceRings: [OperatingFenceRing] = []
private(set) var blockReason: OperatingAreaBlockReason?
private(set) var errorMessage: String?
final class OperatingAreaViewModel: ObservableObject {
@Published private(set) var mode: OperatingAreaEntryMode?
@Published private(set) var loading = false
@Published private(set) var items: [OperatingAreaItem] = []
@Published private(set) var fenceRings: [OperatingFenceRing] = []
@Published private(set) var blockReason: OperatingAreaBlockReason?
@Published private(set) var errorMessage: String?
///
func reload(

View File

@ -14,13 +14,13 @@ import MAMapKit
///
struct OperatingAreaView: View {
@Environment(AccountContext.self) private var accountContext
@Environment(PermissionContext.self) private var permissionContext
@Environment(OperatingAreaAPI.self) private var operatingAreaAPI
@Environment(ToastCenter.self) private var toastCenter
@EnvironmentObject private var accountContext: AccountContext
@EnvironmentObject private var permissionContext: PermissionContext
@Environment(\.operatingAreaAPI) private var operatingAreaAPI
@EnvironmentObject private var toastCenter: ToastCenter
@Environment(\.globalLoading) private var globalLoading
@State private var viewModel = OperatingAreaViewModel()
@StateObject private var viewModel = OperatingAreaViewModel()
var body: some View {
ScrollView {
@ -87,7 +87,7 @@ struct OperatingAreaView: View {
}
if let reason = viewModel.blockReason {
ContentUnavailableView(reason.message, systemImage: "mappin.slash")
AppContentUnavailableView(reason.message, systemImage: "mappin.slash")
.frame(maxWidth: .infinity, minHeight: 260)
.background(Color(hex: 0xF8FAFC), in: RoundedRectangle(cornerRadius: 8))
.overlay(alignment: .bottom) {