Loverde-Company-LTDA/LCEssentials
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 18 Wiki Activity

[logged-out-auth-intro] Merge into main, resolve entitlements/pbxproj conflicts

Browse Source 
Union of both branches' entitlements (aps-environment + location.push
from this branch, App Attest CDhash opt-in from PR #41). Signing
settings resolved to Manual/Apple Distribution/AppStore profile -
this branch independently introduced the same Automatic/Apple
Development regression as PR #41 (see e93ccd2); one line
(PROVISIONING_PROFILE_SPECIFIER) merged silently to the broken value
without a marked conflict, caught by manual review and corrected
alongside the marked conflicts.
This commit is contained in:
Daniel Arantes Loverde
2026-08-24 11:42:00 -03:00
parent e93ccd2f45 f4b2cce849
commit 9cb3654eb8
5 changed files with 39 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Darwin/Entitlements.plist
View File

@@ -2,11 +2,15 @@
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>aps-environment</key>
<string>development</string>
<key>com.apple.developer.devicecheck.app-attest-opt-in</key>
<array>
<string>CDhash</string>
</array>
<key>com.apple.developer.devicecheck.appattest-environment</key>
<string>$(APP_ATTEST_ENVIRONMENT)</string>
<key>com.apple.developer.location.push</key>
<true/>
</dict>
</plist>

4
Darwin/PediFoods.xcodeproj/project.pbxproj
View File

@@ -183,7 +183,7 @@
ENABLE_PREVIEWS = YES;
INFOPLIST_KEY_CFBundleDisplayName = "Pedi Foods";
INFOPLIST_KEY_ITSAppUsesNonExemptEncryption = NO;
INFOPLIST_KEY_NSLocationWhenInUseUsageDescription = "PediFoods uses your location to show nearby stores and estimate delivery times.";
INFOPLIST_KEY_NSLocationWhenInUseUsageDescription = "PediFoods usa sua localização para mostrar lojas perto de você";
INFOPLIST_KEY_UISupportedInterfaceOrientations = UIInterfaceOrientationPortrait;
LD_RUNPATH_SEARCH_PATHS = "@executable_path/Frameworks";
"LD_RUNPATH_SEARCH_PATHS[sdk=macosx*]" = "@executable_path/../Frameworks";
@@ -204,7 +204,7 @@
ENABLE_PREVIEWS = YES;
INFOPLIST_KEY_CFBundleDisplayName = "Pedi Foods";
INFOPLIST_KEY_ITSAppUsesNonExemptEncryption = NO;
INFOPLIST_KEY_NSLocationWhenInUseUsageDescription = "PediFoods uses your location to show nearby stores and estimate delivery times.";
INFOPLIST_KEY_NSLocationWhenInUseUsageDescription = "PediFoods usa sua localização para mostrar lojas perto de você";
INFOPLIST_KEY_UISupportedInterfaceOrientations = UIInterfaceOrientationPortrait;
LD_RUNPATH_SEARCH_PATHS = "@executable_path/Frameworks";
"LD_RUNPATH_SEARCH_PATHS[sdk=macosx*]" = "@executable_path/../Frameworks";

9
Sources/PediFoods/Resources/Localizable.xcstrings
View File

@@ -456,12 +456,6 @@
"Entrar" : {
"comment" : "A link that directs the user to the login screen.",
"isCommentAutoGenerated" : true
},
"Entrar ou Cadastrar" : {
},
"Entre na sua conta" : {
},
"Entrega" : {
"comment" : "A text describing delivery mode.",
@@ -514,9 +508,6 @@
},
"Excluir sua conta?" : {
},
"Faça login ou cadastre-se para ver seu perfil, pedidos e endereços." : {
},
"Favorite" : {
"comment" : "Item editor title label for marking the item as a favorite",

8
Sources/PediFoods/Views/Main/MainTabView.swift
View File

@@ -19,12 +19,12 @@ struct MainTabView: View {
CartView(appState: $appState, selectedTab: $selectedTab, root: $root)
}
case .profile:
NavigationStack {
if appState.session.isAuthenticated {
if appState.session.isAuthenticated {
NavigationStack {
ProfileView(root: $root, selectedTab: $selectedTab, tokenStore: tokenStore, appState: $appState)
} else {
ProfileLoggedOutView(root: $root)
}
} else {
ProfileLoggedOutView(root: $root, selectedTab: $selectedTab, tokenStore: tokenStore, appState: $appState)
}
}
}

64
Sources/PediFoods/Views/Main/ProfileView.swift
View File

@@ -312,45 +312,39 @@ struct ProfileView: View {
struct ProfileLoggedOutView: View {
@Binding var root: RootFlow
@Binding var selectedTab: MainTab
let tokenStore: TokenStore
@Binding var appState: AppState
@State private var path: [Route] = []
@State private var entryAnimationToken = 0
var body: some View {
VStack(spacing: 18) {
Spacer()
Image(systemName: "person.crop.circle.badge.questionmark")
.font(.system(size: 56, weight: .regular))
.foregroundStyle(AppColors.textMuted)
Text("Entre na sua conta")
.font(AppTypography.heading2)
.foregroundStyle(AppColors.textPrimary)
Text("Faça login ou cadastre-se para ver seu perfil, pedidos e endereços.")
.font(AppTypography.body)
.foregroundStyle(AppColors.textMuted)
.multilineTextAlignment(.center)
.padding(.horizontal, 32)
Button {
root = .auth
} label: {
Text("Entrar ou Cadastrar")
.font(AppTypography.heading3)
.foregroundStyle(AppColors.textInverse)
.frame(maxWidth: .infinity)
.padding(.vertical, 14)
.background(AppColors.primary)
.clipShape(RoundedRectangle(cornerRadius: 16, style: .continuous))
NavigationStack(path: $path) {
LoginView(
root: $root,
selectedTab: $selectedTab,
tokenStore: tokenStore,
appState: $appState,
shouldPrepareEntryAnimation: true,
authEntryAnimationToken: entryAnimationToken,
navigate: { route in path.append(route) }
)
.onAppear { entryAnimationToken += 1 }
.navigationDestination(for: Route.self) { route in
switch route {
case .terms:
TermsOfUseView()
case .policy:
PrivacyPolicyView()
case .registration:
RegistrationView(root: $root, selectedTab: $selectedTab, tokenStore: tokenStore, appState: $appState, navigate: { route in path.append(route) })
case .loginEmail:
LoginEmailView(root: $root, selectedTab: $selectedTab, tokenStore: tokenStore, appState: $appState, navigate: { route in path.append(route) })
case .otp(let email, let phoneNumber):
OtpView(email: email, phoneNumber: phoneNumber, root: $root, selectedTab: $selectedTab, tokenStore: tokenStore, appState: $appState)
}
}
.buttonStyle(.plain)
.padding(.horizontal, 32)
.padding(.top, 8)
Spacer()
Spacer()
}
.frame(maxWidth: .infinity, maxHeight: .infinity)
.background(AppColors.backgroundLight)
}
}