Skip to content

Commit

Permalink
Merge branch 'liyang'
Browse files Browse the repository at this point in the history
  • Loading branch information
@sophiayk20
sophiayk20 committed Nov 8, 2023
2 parents 3dff963 + 22d3578 commit 50aa823
Show file tree
Hide file tree
Showing 5 changed files with 20 additions and 34 deletions.
Binary file modified app/.DS_Store
View file
Binary file not shown.
Binary file modified app/newHere1/.DS_Store
View file
Binary file not shown.
32 changes: 9 additions & 23 deletions app/newHere1/newHere.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
objects = {

/* Begin PBXBuildFile section */
1506543B2AF8484A004C7909 /* api_call.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1506543A2AF84849004C7909 /* api_call.swift */; };
1531A8DE2AED95FD009F644E /* newHereApp.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1531A8DD2AED95FD009F644E /* newHereApp.swift */; };
1531A8E02AED95FD009F644E /* ContentView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1531A8DF2AED95FD009F644E /* ContentView.swift */; };
1531A8E22AED95FF009F644E /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 1531A8E12AED95FF009F644E /* Assets.xcassets */; };
Expand All @@ -21,9 +20,6 @@
1531A90F2AED9917009F644E /* Post.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1531A90E2AED9917009F644E /* Post.swift */; };
1531A9132AEDAE2A009F644E /* LocationDataManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1531A9122AEDAE2A009F644E /* LocationDataManager.swift */; };
1531A9152AEDCADB009F644E /* Message.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1531A9142AEDCADB009F644E /* Message.swift */; };
15582E372AFB1544003910A2 /* Registration.swift in Sources */ = {isa = PBXBuildFile; fileRef = 15582E362AFB1544003910A2 /* Registration.swift */; };
1562EDE82AF6EA2B00A41779 /* CustomARView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1562EDE62AF6EA2B00A41779 /* CustomARView.swift */; };
1562EDE92AF6EA2B00A41779 /* CustomARViewRepresentable.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1562EDE72AF6EA2B00A41779 /* CustomARViewRepresentable.swift */; };
/* End PBXBuildFile section */

/* Begin PBXContainerItemProxy section */
Expand All @@ -44,7 +40,6 @@
/* End PBXContainerItemProxy section */

/* Begin PBXFileReference section */
1506543A2AF84849004C7909 /* api_call.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = api_call.swift; sourceTree = "<group>"; };
1531A8DA2AED95FD009F644E /* newHere.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = newHere.app; sourceTree = BUILT_PRODUCTS_DIR; };
1531A8DD2AED95FD009F644E /* newHereApp.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = newHereApp.swift; sourceTree = "<group>"; };
1531A8DF2AED95FD009F644E /* ContentView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ContentView.swift; sourceTree = "<group>"; };
Expand All @@ -62,9 +57,6 @@
1531A90E2AED9917009F644E /* Post.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Post.swift; sourceTree = "<group>"; };
1531A9122AEDAE2A009F644E /* LocationDataManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LocationDataManager.swift; sourceTree = "<group>"; };
1531A9142AEDCADB009F644E /* Message.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Message.swift; sourceTree = "<group>"; };
15582E362AFB1544003910A2 /* Registration.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Registration.swift; sourceTree = "<group>"; };
1562EDE62AF6EA2B00A41779 /* CustomARView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CustomARView.swift; sourceTree = "<group>"; };
1562EDE72AF6EA2B00A41779 /* CustomARViewRepresentable.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CustomARViewRepresentable.swift; sourceTree = "<group>"; };
/* End PBXFileReference section */

/* Begin PBXFrameworksBuildPhase section */
Expand Down Expand Up @@ -118,13 +110,9 @@
1531A8DD2AED95FD009F644E /* newHereApp.swift */,
1531A8DF2AED95FD009F644E /* ContentView.swift */,
1531A9082AED9618009F644E /* Home.swift */,
1562EDE62AF6EA2B00A41779 /* CustomARView.swift */,
1562EDE72AF6EA2B00A41779 /* CustomARViewRepresentable.swift */,
1531A90C2AED9663009F644E /* Messages.swift */,
1531A90A2AED964A009F644E /* Profile.swift */,
1531A90E2AED9917009F644E /* Post.swift */,
15582E362AFB1544003910A2 /* Registration.swift */,
1506543A2AF84849004C7909 /* api_call.swift */,
1531A9142AEDCADB009F644E /* Message.swift */,
1531A9122AEDAE2A009F644E /* LocationDataManager.swift */,
1531A8E12AED95FF009F644E /* Assets.xcassets */,
Expand Down Expand Up @@ -293,10 +281,6 @@
1531A8E02AED95FD009F644E /* ContentView.swift in Sources */,
1531A90B2AED964A009F644E /* Profile.swift in Sources */,
1531A90D2AED9663009F644E /* Messages.swift in Sources */,
15582E372AFB1544003910A2 /* Registration.swift in Sources */,
1562EDE82AF6EA2B00A41779 /* CustomARView.swift in Sources */,
1506543B2AF8484A004C7909 /* api_call.swift in Sources */,
1562EDE92AF6EA2B00A41779 /* CustomARViewRepresentable.swift in Sources */,
1531A90F2AED9917009F644E /* Post.swift in Sources */,
1531A9152AEDCADB009F644E /* Message.swift in Sources */,
1531A9092AED9618009F644E /* Home.swift in Sources */,
Expand Down Expand Up @@ -457,15 +441,15 @@
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
CODE_SIGN_ENTITLEMENTS = newHere/newHere.entitlements;
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 1;
DEVELOPMENT_ASSET_PATHS = "\"newHere/Preview Content\"";
DEVELOPMENT_TEAM = A7X36A78B2;
DEVELOPMENT_TEAM = ACLZN9M2VC;
ENABLE_HARDENED_RUNTIME = YES;
ENABLE_PREVIEWS = YES;
GENERATE_INFOPLIST_FILE = YES;
INFOPLIST_KEY_LSApplicationCategoryType = "";
INFOPLIST_KEY_NSCameraUsageDescription = "Here needs access to your camera.";
INFOPLIST_KEY_NSLocationWhenInUseUsageDescription = "Here needs to access your location data to tell you your location";
"INFOPLIST_KEY_UIApplicationSceneManifest_Generation[sdk=iphoneos*]" = YES;
"INFOPLIST_KEY_UIApplicationSceneManifest_Generation[sdk=iphonesimulator*]" = YES;
Expand All @@ -477,13 +461,14 @@
"INFOPLIST_KEY_UIStatusBarStyle[sdk=iphonesimulator*]" = UIStatusBarStyleDefault;
INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad = "UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight";
INFOPLIST_KEY_UISupportedInterfaceOrientations_iPhone = "UIInterfaceOrientationPortrait UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight";
IPHONEOS_DEPLOYMENT_TARGET = 16.6;
IPHONEOS_DEPLOYMENT_TARGET = 17.0;
LD_RUNPATH_SEARCH_PATHS = "@executable_path/Frameworks";
"LD_RUNPATH_SEARCH_PATHS[sdk=macosx*]" = "@executable_path/../Frameworks";
MACOSX_DEPLOYMENT_TARGET = 14.0;
MARKETING_VERSION = 1.0;
PRODUCT_BUNDLE_IDENTIFIER = com.eric.newHere;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";
SDKROOT = auto;
SUPPORTED_PLATFORMS = "iphoneos iphonesimulator macosx";
SWIFT_EMIT_LOC_STRINGS = YES;
Expand All @@ -498,10 +483,10 @@
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
CODE_SIGN_ENTITLEMENTS = newHere/newHere.entitlements;
CODE_SIGN_STYLE = Automatic;
CODE_SIGN_STYLE = Manual;
CURRENT_PROJECT_VERSION = 1;
DEVELOPMENT_ASSET_PATHS = "\"newHere/Preview Content\"";
DEVELOPMENT_TEAM = A7X36A78B2;
DEVELOPMENT_TEAM = "";
ENABLE_HARDENED_RUNTIME = YES;
ENABLE_PREVIEWS = YES;
GENERATE_INFOPLIST_FILE = YES;
Expand All @@ -525,6 +510,7 @@
MARKETING_VERSION = 1.0;
PRODUCT_BUNDLE_IDENTIFIER = com.eric.newHere;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";
SDKROOT = auto;
SUPPORTED_PLATFORMS = "iphoneos iphonesimulator macosx";
SWIFT_EMIT_LOC_STRINGS = YES;
Expand All @@ -540,7 +526,7 @@
BUNDLE_LOADER = "$(TEST_HOST)";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 1;
DEVELOPMENT_TEAM = A7X36A78B2;
DEVELOPMENT_TEAM = ACLZN9M2VC;
GENERATE_INFOPLIST_FILE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 17.0;
MACOSX_DEPLOYMENT_TARGET = 14.0;
Expand Down Expand Up @@ -585,7 +571,7 @@
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 1;
DEVELOPMENT_TEAM = A7X36A78B2;
DEVELOPMENT_TEAM = ACLZN9M2VC;
GENERATE_INFOPLIST_FILE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 17.0;
MACOSX_DEPLOYMENT_TARGET = 14.0;
Expand Down
8 changes: 4 additions & 4 deletions app/newHere1/newHere/Post.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -95,8 +95,8 @@ struct PostsPopup: View {
Text("Close")
.font(.headline)
.padding()
.background(Color.blue)
.foregroundColor(.white)
.background(Color.blue.opacity(0.8))
.foregroundColor(.white.opacity(0.8))
.cornerRadius(10)
}
.padding(.trailing, 20) // Adjust the position of the close button
Expand All @@ -120,7 +120,7 @@ struct PostsPopup: View {
}, label: {
Image(systemName: "square.and.arrow.up.fill")
.resizable()
.foregroundColor(.blue)
.foregroundColor(.blue.opacity(0.8))
.frame(width: 24, height: 24)
.padding(.leading, 20)
})
Expand Down Expand Up @@ -158,7 +158,7 @@ struct PostsPopup: View {
}, label: {
Image(systemName: "paperplane.fill")
.resizable()
.foregroundColor(.blue)
.foregroundColor(.blue.opacity(0.8))
.frame(width: 24, height: 24)
.padding(.trailing, 20)
})
Expand Down
14 changes: 7 additions & 7 deletions app/newHere1/newHere/Profile.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,8 +51,8 @@ struct ProfilePopup: View {
Text("Close")
.font(.headline)
.padding()
.background(Color.blue)
.foregroundColor(.white)
.background(Color.blue.opacity(0.8))
.foregroundColor(.white.opacity(0.8))
.cornerRadius(10)
}
.padding(.trailing, 20) // Adjust the position of the close button
Expand Down Expand Up @@ -122,8 +122,8 @@ struct ProfileButtons: View {
Image(systemName: "person.badge.plus")
.font(.system(size: 20))
.padding(10)
.background(Color.blue)
.foregroundColor(.white)
.background(Color.blue.opacity(0.8))
.foregroundColor(.white.opacity(0.8))
.clipShape(Circle())
}
}
Expand All @@ -142,13 +142,13 @@ struct ProfileStats: View {
VStack {
Text(stat.title)
.font(.caption)
.foregroundColor(.gray)
.foregroundColor(.gray.opacity(0.8))

Text(stat.value)
.font(.headline)
}
.padding()
.background(Color.white)
.background(Color.white.opacity(0.8))
.cornerRadius(8)
.shadow(radius: 3)
}
Expand All @@ -169,7 +169,7 @@ struct ProfileStatItem: View {

Text(title)
.font(.subheadline)
.foregroundColor(.gray)
.foregroundColor(.gray.opacity(0.8))
}
}
}
Expand Down

0 comments on commit 50aa823

Please sign in to comment.