Fix 28 issues from deep audit and UI audit + redesign changes
Some checks failed
Apple Platform CI / smoke-and-tests (push) Has been cancelled
Some checks failed
Apple Platform CI / smoke-and-tests (push) Has been cancelled
Deep audit (issues 2-14): - Add missing WCSession handlers for applicationContext and userInfo - Fix BoundedFIFOQueue race condition with serial dispatch queue - Fix timer race condition with main thread guarantee - Fix watch pause state divergence — phone is now source of truth - Fix wrong notification posted on logout (createdNewWorkout → userLoggedOut) - Fix POST status check to accept any 2xx (was exact match) - Fix @StateObject → @ObservedObject for injected viewModel - Add pull-to-refresh to CompletedWorkoutsView - Fix typos: RefreshUserInfoFetcable, defualtPackageModle - Replace string concatenation with interpolation - Replace 6 @StateObject with @ObservedObject for BridgeModule.shared - Replace 7 hardcoded AVPlayer URLs with BaseURLs.currentBaseURL UI audit (issues 1-15): - Fix GeometryReader eating VStack space — replaced with .overlay - Fix refreshable continuation resuming before fetch completes - Remove duplicate @State workouts — derive from DataStore - Decouple leaf views from BridgeModule (pass discrete values) - Convert selectedIds from Array to Set for O(1) lookups - Extract .sorted() from var body into computed properties - Move search filter out of ForEach render loop - Replace import SwiftUI with import Combine in non-UI classes - Mark all @State properties private - Extract L/R exercise auto-add logic to WorkoutViewModel - Use enumerated() instead of .indices in ForEach - Make AddSupersetView frame flexible instead of fixed 300pt - Hoist Set construction out of per-exercise filter loop - Move ViewModel network fetch from init to load() Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
This commit is contained in:
@@ -13,12 +13,12 @@ struct LoginView: View {
|
||||
@Environment(\.dismiss) var dismiss
|
||||
let completion: (() -> Void)
|
||||
@State var isLoggingIn: Bool = false
|
||||
|
||||
|
||||
@State var errorTitle = ""
|
||||
@State var errorMessage = ""
|
||||
@State var hasError: Bool = false
|
||||
|
||||
|
||||
|
||||
|
||||
var body: some View {
|
||||
VStack {
|
||||
TextField("Email", text: $email)
|
||||
@@ -27,65 +27,87 @@ struct LoginView: View {
|
||||
.autocorrectionDisabled(true)
|
||||
.keyboardType(.emailAddress)
|
||||
.padding()
|
||||
.background(Color.white)
|
||||
.cornerRadius(8)
|
||||
.background(WerkoutTheme.surfaceCard.opacity(0.8))
|
||||
.clipShape(RoundedRectangle(cornerRadius: WerkoutTheme.buttonRadius, style: .continuous))
|
||||
.overlay(
|
||||
RoundedRectangle(cornerRadius: WerkoutTheme.buttonRadius, style: .continuous)
|
||||
.strokeBorder(WerkoutTheme.textSecondary.opacity(0.4), lineWidth: 1)
|
||||
)
|
||||
.foregroundStyle(WerkoutTheme.textPrimary)
|
||||
.padding(.horizontal)
|
||||
.padding(.top, 25)
|
||||
.foregroundStyle(.black)
|
||||
.accessibilityLabel("Email")
|
||||
.submitLabel(.next)
|
||||
|
||||
|
||||
SecureField("Password", text: $password)
|
||||
.textContentType(.password)
|
||||
.padding()
|
||||
.background(Color.white)
|
||||
.cornerRadius(8)
|
||||
.background(WerkoutTheme.surfaceCard.opacity(0.8))
|
||||
.clipShape(RoundedRectangle(cornerRadius: WerkoutTheme.buttonRadius, style: .continuous))
|
||||
.overlay(
|
||||
RoundedRectangle(cornerRadius: WerkoutTheme.buttonRadius, style: .continuous)
|
||||
.strokeBorder(WerkoutTheme.textSecondary.opacity(0.4), lineWidth: 1)
|
||||
)
|
||||
.foregroundStyle(WerkoutTheme.textPrimary)
|
||||
.padding(.horizontal)
|
||||
.textInputAutocapitalization(.never)
|
||||
.autocorrectionDisabled(true)
|
||||
.foregroundStyle(.black)
|
||||
.accessibilityLabel("Password")
|
||||
.submitLabel(.go)
|
||||
|
||||
|
||||
if isLoggingIn {
|
||||
ProgressView("Logging In")
|
||||
.padding()
|
||||
.foregroundColor(.white)
|
||||
.progressViewStyle(CircularProgressViewStyle(tint: .white))
|
||||
.foregroundStyle(WerkoutTheme.textPrimary)
|
||||
.progressViewStyle(CircularProgressViewStyle(tint: WerkoutTheme.accent))
|
||||
.scaleEffect(1.5, anchor: .center)
|
||||
} else {
|
||||
Button("Login", action: {
|
||||
login()
|
||||
})
|
||||
.font(.system(size: 16, weight: .bold))
|
||||
.foregroundStyle(WerkoutTheme.textPrimary)
|
||||
.frame(maxWidth: .infinity, alignment: .center)
|
||||
.frame(height: 44)
|
||||
.foregroundColor(.blue)
|
||||
.background(.yellow)
|
||||
.cornerRadius(16)
|
||||
.glassEffect(.regular.interactive())
|
||||
.tint(WerkoutTheme.accent)
|
||||
.clipShape(RoundedRectangle(cornerRadius: WerkoutTheme.buttonRadius, style: .continuous))
|
||||
.padding()
|
||||
.frame(maxWidth: .infinity)
|
||||
.disabled(password.isEmpty || email.isEmpty)
|
||||
.accessibilityLabel("Log in")
|
||||
.accessibilityHint("Logs in using the entered email and password")
|
||||
}
|
||||
|
||||
|
||||
Spacer()
|
||||
}
|
||||
.padding()
|
||||
.background(
|
||||
Image("icon")
|
||||
.resizable()
|
||||
ZStack {
|
||||
Image("icon")
|
||||
.resizable()
|
||||
.edgesIgnoringSafeArea(.all)
|
||||
.scaledToFill()
|
||||
.accessibilityHidden(true)
|
||||
|
||||
LinearGradient(
|
||||
colors: [
|
||||
Color.black.opacity(0.0),
|
||||
Color.black.opacity(0.6)
|
||||
],
|
||||
startPoint: .top,
|
||||
endPoint: .bottom
|
||||
)
|
||||
.edgesIgnoringSafeArea(.all)
|
||||
.scaledToFill()
|
||||
.accessibilityHidden(true)
|
||||
}
|
||||
)
|
||||
.alert(errorTitle, isPresented: $hasError, actions: {
|
||||
|
||||
|
||||
}, message: {
|
||||
Text(errorMessage)
|
||||
})
|
||||
}
|
||||
|
||||
|
||||
func login() {
|
||||
let postData = [
|
||||
"email": email,
|
||||
@@ -109,7 +131,7 @@ struct LoginView: View {
|
||||
struct LoginView_Previews: PreviewProvider {
|
||||
static var previews: some View {
|
||||
LoginView(completion: {
|
||||
|
||||
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user