yusiboyz/platform
1
0
Fork 0
Code Issues 1 Pull Requests Actions Packages Projects Releases Wiki Activity

resolve pbxproj merge conflict
All checks were successful
Security Checks / dependency-audit (push) Successful in 35s
Details
Security Checks / secret-scanning (push) Successful in 4s
Details
Security Checks / dockerfile-lint (push) Successful in 4s
Details

Browse Source
This commit is contained in:
Yusuf
2026-04-03 18:12:01 -05:00
parent 4d4e96c327
commit 9c1a661099
1 changed files with 61 additions and 110 deletions
Download Patch File Download Diff File Expand all files Collapse all files

171
ios/Platform/Platform.xcodeproj/project.pbxproj
View File

@@ -7,47 +7,40 @@
objects = { objects = {
/* Begin PBXBuildFile section */ /* Begin PBXBuildFile section */
A10001 /* PlatformApp.swift in Sources */ = {isa = PBXBuildFile; fileRef = B10001; }; A10001 /* PlatformApp.swift in Sources */ = {isa = PBXBuildFile; fileRef = B10001 /* PlatformApp.swift */; };
A10002 /* ContentView.swift in Sources */ = {isa = PBXBuildFile; fileRef = B10002; }; A10002 /* ContentView.swift in Sources */ = {isa = PBXBuildFile; fileRef = B10002 /* ContentView.swift */; };
A10003 /* Config.swift in Sources */ = {isa = PBXBuildFile; fileRef = B10003; }; A10003 /* Config.swift in Sources */ = {isa = PBXBuildFile; fileRef = B10003 /* Config.swift */; };
A10004 /* APIClient.swift in Sources */ = {isa = PBXBuildFile; fileRef = B10004; }; A10004 /* APIClient.swift in Sources */ = {isa = PBXBuildFile; fileRef = B10004 /* APIClient.swift */; };
A10005 /* AuthManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = B10005; }; A10005 /* AuthManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = B10005 /* AuthManager.swift */; };
A10006 /* LoginView.swift in Sources */ = {isa = PBXBuildFile; fileRef = B10006; }; A10006 /* LoginView.swift in Sources */ = {isa = PBXBuildFile; fileRef = B10006 /* LoginView.swift */; };
A10007 /* HomeView.swift in Sources */ = {isa = PBXBuildFile; fileRef = B10007; }; A10007 /* HomeView.swift in Sources */ = {isa = PBXBuildFile; fileRef = B10007 /* HomeView.swift */; };
A10008 /* HomeViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = B10008; }; A10008 /* HomeViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = B10008 /* HomeViewModel.swift */; };
A10009 /* FitnessModels.swift in Sources */ = {isa = PBXBuildFile; fileRef = B10009; }; A10009 /* FitnessModels.swift in Sources */ = {isa = PBXBuildFile; fileRef = B10009 /* FitnessModels.swift */; };
A10010 /* FitnessAPI.swift in Sources */ = {isa = PBXBuildFile; fileRef = B10010; }; A10010 /* FitnessAPI.swift in Sources */ = {isa = PBXBuildFile; fileRef = B10010 /* FitnessAPI.swift */; };
A10011 /* FitnessRepository.swift in Sources */ = {isa = PBXBuildFile; fileRef = B10011; }; A10011 /* FitnessRepository.swift in Sources */ = {isa = PBXBuildFile; fileRef = B10011 /* FitnessRepository.swift */; };
A10012 /* TodayViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = B10012; }; A10012 /* TodayViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = B10012 /* TodayViewModel.swift */; };
A10013 /* FoodSearchViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = B10013; }; A10013 /* FoodSearchViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = B10013 /* FoodSearchViewModel.swift */; };
A10014 /* TemplatesViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = B10014; }; A10014 /* TemplatesViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = B10014 /* TemplatesViewModel.swift */; };
A10015 /* GoalsViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = B10015; }; A10015 /* GoalsViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = B10015 /* GoalsViewModel.swift */; };
A10016 /* FitnessTabView.swift in Sources */ = {isa = PBXBuildFile; fileRef = B10016; }; A10016 /* FitnessTabView.swift in Sources */ = {isa = PBXBuildFile; fileRef = B10016 /* FitnessTabView.swift */; };
A10017 /* TodayView.swift in Sources */ = {isa = PBXBuildFile; fileRef = B10017; }; A10017 /* TodayView.swift in Sources */ = {isa = PBXBuildFile; fileRef = B10017 /* TodayView.swift */; };
A10018 /* MealSectionView.swift in Sources */ = {isa = PBXBuildFile; fileRef = B10018; }; A10018 /* MealSectionView.swift in Sources */ = {isa = PBXBuildFile; fileRef = B10018 /* MealSectionView.swift */; };
A10019 /* FoodSearchView.swift in Sources */ = {isa = PBXBuildFile; fileRef = B10019; }; A10019 /* FoodSearchView.swift in Sources */ = {isa = PBXBuildFile; fileRef = B10019 /* FoodSearchView.swift */; };
A10020 /* AddFoodSheet.swift in Sources */ = {isa = PBXBuildFile; fileRef = B10020; }; A10020 /* AddFoodSheet.swift in Sources */ = {isa = PBXBuildFile; fileRef = B10020 /* AddFoodSheet.swift */; };
A10021 /* FoodLibraryView.swift in Sources */ = {isa = PBXBuildFile; fileRef = B10021; }; A10021 /* FoodLibraryView.swift in Sources */ = {isa = PBXBuildFile; fileRef = B10021 /* FoodLibraryView.swift */; };
A10022 /* TemplatesView.swift in Sources */ = {isa = PBXBuildFile; fileRef = B10022; }; A10022 /* TemplatesView.swift in Sources */ = {isa = PBXBuildFile; fileRef = B10022 /* TemplatesView.swift */; };
A10023 /* GoalsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = B10023; }; A10023 /* GoalsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = B10023 /* GoalsView.swift */; };
A10024 /* EntryDetailView.swift in Sources */ = {isa = PBXBuildFile; fileRef = B10024; }; A10024 /* EntryDetailView.swift in Sources */ = {isa = PBXBuildFile; fileRef = B10024 /* EntryDetailView.swift */; };
A10025 /* AssistantChatView.swift in Sources */ = {isa = PBXBuildFile; fileRef = B10025; }; A10025 /* AssistantChatView.swift in Sources */ = {isa = PBXBuildFile; fileRef = B10025 /* AssistantChatView.swift */; };
A10026 /* AssistantViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = B10026; }; A10026 /* AssistantViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = B10026 /* AssistantViewModel.swift */; };
A10027 /* MacroRing.swift in Sources */ = {isa = PBXBuildFile; fileRef = B10027; }; A10027 /* MacroRing.swift in Sources */ = {isa = PBXBuildFile; fileRef = B10027 /* MacroRing.swift */; };
A10028 /* MacroBar.swift in Sources */ = {isa = PBXBuildFile; fileRef = B10028; }; A10028 /* MacroBar.swift in Sources */ = {isa = PBXBuildFile; fileRef = B10028 /* MacroBar.swift */; };
A10029 /* LoadingView.swift in Sources */ = {isa = PBXBuildFile; fileRef = B10029; }; A10029 /* LoadingView.swift in Sources */ = {isa = PBXBuildFile; fileRef = B10029 /* LoadingView.swift */; };
A10030 /* Color+Extensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = B10030; }; A10030 /* Color+Extensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = B10030 /* Color+Extensions.swift */; };
A10031 /* Date+Extensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = B10031; }; A10031 /* Date+Extensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = B10031 /* Date+Extensions.swift */; };
A10032 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = C10001; }; A10032 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = C10001 /* Assets.xcassets */; };
A10033 /* FeedbackView.swift in Sources */ = {isa = PBXBuildFile; fileRef = B10034; }; A10033 /* FeedbackView.swift in Sources */ = {isa = PBXBuildFile; fileRef = B10034 /* FeedbackView.swift */; };
A10040 /* ReaderModels.swift in Sources */ = {isa = PBXBuildFile; fileRef = B10040; }; F20549752F805F5800AE8DF5 /* ConfettiSwiftUI in Frameworks */ = {isa = PBXBuildFile; productRef = F20549742F805F5800AE8DF5 /* ConfettiSwiftUI */; };
A10041 /* ReaderAPI.swift in Sources */ = {isa = PBXBuildFile; fileRef = B10041; };
A10042 /* ReaderViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = B10042; };
A10043 /* ReaderTabView.swift in Sources */ = {isa = PBXBuildFile; fileRef = B10043; };
A10044 /* EntryListView.swift in Sources */ = {isa = PBXBuildFile; fileRef = B10044; };
A10045 /* ArticleView.swift in Sources */ = {isa = PBXBuildFile; fileRef = B10045; };
A10046 /* ArticleWebView.swift in Sources */ = {isa = PBXBuildFile; fileRef = B10046; };
A10047 /* FeedManagementSheet.swift in Sources */ = {isa = PBXBuildFile; fileRef = B10047; };
/* End PBXBuildFile section */ /* End PBXBuildFile section */
/* Begin PBXFileReference section */ /* Begin PBXFileReference section */
@@ -84,14 +77,6 @@
B10031 /* Date+Extensions.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Date+Extensions.swift"; sourceTree = "<group>"; }; B10031 /* Date+Extensions.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "Date+Extensions.swift"; sourceTree = "<group>"; };
B10033 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; }; B10033 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
B10034 /* FeedbackView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FeedbackView.swift; sourceTree = "<group>"; }; B10034 /* FeedbackView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FeedbackView.swift; sourceTree = "<group>"; };
B10040 /* ReaderModels.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ReaderModels.swift; sourceTree = "<group>"; };
B10041 /* ReaderAPI.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ReaderAPI.swift; sourceTree = "<group>"; };
B10042 /* ReaderViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ReaderViewModel.swift; sourceTree = "<group>"; };
B10043 /* ReaderTabView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ReaderTabView.swift; sourceTree = "<group>"; };
B10044 /* EntryListView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EntryListView.swift; sourceTree = "<group>"; };
B10045 /* ArticleView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ArticleView.swift; sourceTree = "<group>"; };
B10046 /* ArticleWebView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ArticleWebView.swift; sourceTree = "<group>"; };
B10047 /* FeedManagementSheet.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FeedManagementSheet.swift; sourceTree = "<group>"; };
C10001 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; }; C10001 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
D10001 /* Platform.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Platform.app; sourceTree = BUILT_PRODUCTS_DIR; }; D10001 /* Platform.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Platform.app; sourceTree = BUILT_PRODUCTS_DIR; };
/* End PBXFileReference section */ /* End PBXFileReference section */
@@ -101,6 +86,7 @@
isa = PBXFrameworksBuildPhase; isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647; buildActionMask = 2147483647;
files = ( files = (
F20549752F805F5800AE8DF5 /* ConfettiSwiftUI in Frameworks */,
); );
runOnlyForDeploymentPostprocessing = 0; runOnlyForDeploymentPostprocessing = 0;
}; };
@@ -147,7 +133,6 @@
F10007 /* Fitness */, F10007 /* Fitness */,
F10014 /* Assistant */, F10014 /* Assistant */,
F10021 /* Feedback */, F10021 /* Feedback */,
F10030 /* Reader */,
); );
path = Features; path = Features;
sourceTree = "<group>"; sourceTree = "<group>";
@@ -241,14 +226,6 @@
path = Assistant; path = Assistant;
sourceTree = "<group>"; sourceTree = "<group>";
}; };
F10021 /* Feedback */ = {
isa = PBXGroup;
children = (
B10034 /* FeedbackView.swift */,
);
path = Feedback;
sourceTree = "<group>";
};
F10015 /* Shared */ = { F10015 /* Shared */ = {
isa = PBXGroup; isa = PBXGroup;
children = ( children = (
@@ -285,51 +262,12 @@
name = Products; name = Products;
sourceTree = "<group>"; sourceTree = "<group>";
}; };
F10030 /* Reader */ = { F10021 /* Feedback */ = {
isa = PBXGroup; isa = PBXGroup;
children = ( children = (
F10031 /* Models */, B10034 /* FeedbackView.swift */,
F10032 /* API */,
F10033 /* ViewModels */,
F10034 /* Views */,
); );
path = Reader; path = Feedback;
sourceTree = "<group>";
};
F10031 /* Models */ = {
isa = PBXGroup;
children = (
B10040 /* ReaderModels.swift */,
);
path = Models;
sourceTree = "<group>";
};
F10032 /* API */ = {
isa = PBXGroup;
children = (
B10041 /* ReaderAPI.swift */,
);
path = API;
sourceTree = "<group>";
};
F10033 /* ViewModels */ = {
isa = PBXGroup;
children = (
B10042 /* ReaderViewModel.swift */,
);
path = ViewModels;
sourceTree = "<group>";
};
F10034 /* Views */ = {
isa = PBXGroup;
children = (
B10043 /* ReaderTabView.swift */,
B10044 /* EntryListView.swift */,
B10045 /* ArticleView.swift */,
B10046 /* ArticleWebView.swift */,
B10047 /* FeedManagementSheet.swift */,
);
path = Views;
sourceTree = "<group>"; sourceTree = "<group>";
}; };
/* End PBXGroup section */ /* End PBXGroup section */
@@ -376,6 +314,9 @@
Base, Base,
); );
mainGroup = F10001; mainGroup = F10001;
packageReferences = (
F20549732F805F5800AE8DF5 /* XCRemoteSwiftPackageReference "ConfettiSwiftUI" */,
);
productRefGroup = F10020 /* Products */; productRefGroup = F10020 /* Products */;
projectDirPath = ""; projectDirPath = "";
projectRoot = ""; projectRoot = "";
@@ -433,14 +374,6 @@
A10030 /* Color+Extensions.swift in Sources */, A10030 /* Color+Extensions.swift in Sources */,
A10031 /* Date+Extensions.swift in Sources */, A10031 /* Date+Extensions.swift in Sources */,
A10033 /* FeedbackView.swift in Sources */, A10033 /* FeedbackView.swift in Sources */,
A10040 /* ReaderModels.swift in Sources */,
A10041 /* ReaderAPI.swift in Sources */,
A10042 /* ReaderViewModel.swift in Sources */,
A10043 /* ReaderTabView.swift in Sources */,
A10044 /* EntryListView.swift in Sources */,
A10045 /* ArticleView.swift in Sources */,
A10046 /* ArticleWebView.swift in Sources */,
A10047 /* FeedManagementSheet.swift in Sources */,
); );
runOnlyForDeploymentPostprocessing = 0; runOnlyForDeploymentPostprocessing = 0;
}; };
@@ -573,7 +506,7 @@
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor; ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
CODE_SIGN_STYLE = Automatic; CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 1; CURRENT_PROJECT_VERSION = 1;
DEVELOPMENT_TEAM = ""; DEVELOPMENT_TEAM = CRN5A2VZ79;
ENABLE_PREVIEWS = YES; ENABLE_PREVIEWS = YES;
GENERATE_INFOPLIST_FILE = YES; GENERATE_INFOPLIST_FILE = YES;
INFOPLIST_FILE = Platform/Info.plist; INFOPLIST_FILE = Platform/Info.plist;
@@ -602,7 +535,7 @@
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor; ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
CODE_SIGN_STYLE = Automatic; CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 1; CURRENT_PROJECT_VERSION = 1;
DEVELOPMENT_TEAM = ""; DEVELOPMENT_TEAM = CRN5A2VZ79;
ENABLE_PREVIEWS = YES; ENABLE_PREVIEWS = YES;
GENERATE_INFOPLIST_FILE = YES; GENERATE_INFOPLIST_FILE = YES;
INFOPLIST_FILE = Platform/Info.plist; INFOPLIST_FILE = Platform/Info.plist;
@@ -647,6 +580,24 @@
}; };
/* End XCConfigurationList section */ /* End XCConfigurationList section */
/* Begin XCRemoteSwiftPackageReference section */
F20549732F805F5800AE8DF5 /* XCRemoteSwiftPackageReference "ConfettiSwiftUI" */ = {
isa = XCRemoteSwiftPackageReference;
repositoryURL = "https://github.com/simibac/ConfettiSwiftUI";
requirement = {
kind = upToNextMajorVersion;
minimumVersion = 3.0.0;
};
};
/* End XCRemoteSwiftPackageReference section */
/* Begin XCSwiftPackageProductDependency section */
F20549742F805F5800AE8DF5 /* ConfettiSwiftUI */ = {
isa = XCSwiftPackageProductDependency;
package = F20549732F805F5800AE8DF5 /* XCRemoteSwiftPackageReference "ConfettiSwiftUI" */;
productName = ConfettiSwiftUI;
};
/* End XCSwiftPackageProductDependency section */
}; };
rootObject = G10010 /* Project object */; rootObject = G10010 /* Project object */;
} }