Skip to content

Commit

Permalink
Merge pull request #47 from Team-Easy/fix/storeDistribution/#46
Browse files Browse the repository at this point in the history 
[Fix] 앱 스토어 심사 대상 내용 수정
  • Loading branch information
@FpRaArNkK
FpRaArNkK authored Sep 18, 2024
2 parents f46d794 + ec48db8 commit 1ffd411
Show file tree
Hide file tree
Showing 8 changed files with 33 additions and 20 deletions.
40 changes: 26 additions & 14 deletions Ondoset/Ondoset.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1282,33 +1282,39 @@
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 1;
DEVELOPMENT_ASSET_PATHS = "\"Ondoset/Preview Content\"";
DEVELOPMENT_TEAM = 8T2JAAS967;
ENABLE_PREVIEWS = YES;
GENERATE_INFOPLIST_FILE = YES;
INFOPLIST_FILE = Ondoset/Info.plist;
INFOPLIST_KEY_NSCameraUsageDescription = "카메라 접근을 위해 권한이 필요합니다. 허용하시겠습니까?";
INFOPLIST_KEY_NSLocationWhenInUseUsageDescription = "이 기능을 사용하기 위해 위치 권한이 필요합니다.";
INFOPLIST_KEY_NSPhotoLibraryUsageDescription = "사진 앨범 접근을 위해 권한이 필요합니다. 허용하시겠습니까?";
INFOPLIST_KEY_NSCameraUsageDescription = "옷 사진 업로드 및 착장 사진 업로드 기능을 위해 카메라 접근 권한이 필요합니다.";
INFOPLIST_KEY_NSLocationWhenInUseUsageDescription = "착장 추천 및 업로드 기능을 위해 위치 정보 접근 권한이 필요합니다.";
INFOPLIST_KEY_NSPhotoLibraryUsageDescription = "옷 사진 업로드 및 착장 사진 업로드 기능을 위해 앨범 접근 권한이 필요합니다.";
INFOPLIST_KEY_UIApplicationSceneManifest_Generation = YES;
INFOPLIST_KEY_UIApplicationSupportsIndirectInputEvents = YES;
INFOPLIST_KEY_UILaunchScreen_Generation = YES;
INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad = "UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight";
INFOPLIST_KEY_UISupportedInterfaceOrientations_iPhone = "UIInterfaceOrientationPortrait UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight";
INFOPLIST_KEY_UIStatusBarStyle = "";
INFOPLIST_KEY_UISupportedInterfaceOrientations = UIInterfaceOrientationPortrait;
INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad = "UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown";
INFOPLIST_KEY_UIUserInterfaceStyle = Light;
IPHONEOS_DEPLOYMENT_TARGET = 16.0;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
);
MARKETING_VERSION = 1.0;
PRODUCT_BUNDLE_IDENTIFIER = com.easy.Ondoset;
PRODUCT_BUNDLE_IDENTIFIER = com.Frank.Ondoset;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";
SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
SUPPORTS_MACCATALYST = NO;
SUPPORTS_XR_DESIGNED_FOR_IPHONE_IPAD = NO;
SWIFT_EMIT_LOC_STRINGS = YES;
SWIFT_VERSION = 5.0;
TARGETED_DEVICE_FAMILY = "1,2";
TARGETED_DEVICE_FAMILY = 1;
};
name = Debug;
};
Expand All @@ -1317,33 +1323,39 @@
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 1;
DEVELOPMENT_ASSET_PATHS = "\"Ondoset/Preview Content\"";
DEVELOPMENT_TEAM = 8T2JAAS967;
ENABLE_PREVIEWS = YES;
GENERATE_INFOPLIST_FILE = YES;
INFOPLIST_FILE = Ondoset/Info.plist;
INFOPLIST_KEY_NSCameraUsageDescription = "카메라 접근을 위해 권한이 필요합니다. 허용하시겠습니까?";
INFOPLIST_KEY_NSLocationWhenInUseUsageDescription = "이 기능을 사용하기 위해 위치 권한이 필요합니다.";
INFOPLIST_KEY_NSPhotoLibraryUsageDescription = "사진 앨범 접근을 위해 권한이 필요합니다. 허용하시겠습니까?";
INFOPLIST_KEY_NSCameraUsageDescription = "옷 사진 업로드 및 착장 사진 업로드 기능을 위해 카메라 접근 권한이 필요합니다.";
INFOPLIST_KEY_NSLocationWhenInUseUsageDescription = "착장 추천 및 업로드 기능을 위해 위치 정보 접근 권한이 필요합니다.";
INFOPLIST_KEY_NSPhotoLibraryUsageDescription = "옷 사진 업로드 및 착장 사진 업로드 기능을 위해 앨범 접근 권한이 필요합니다.";
INFOPLIST_KEY_UIApplicationSceneManifest_Generation = YES;
INFOPLIST_KEY_UIApplicationSupportsIndirectInputEvents = YES;
INFOPLIST_KEY_UILaunchScreen_Generation = YES;
INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad = "UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight";
INFOPLIST_KEY_UISupportedInterfaceOrientations_iPhone = "UIInterfaceOrientationPortrait UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight";
INFOPLIST_KEY_UIStatusBarStyle = "";
INFOPLIST_KEY_UISupportedInterfaceOrientations = UIInterfaceOrientationPortrait;
INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad = "UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown";
INFOPLIST_KEY_UIUserInterfaceStyle = Light;
IPHONEOS_DEPLOYMENT_TARGET = 16.0;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
);
MARKETING_VERSION = 1.0;
PRODUCT_BUNDLE_IDENTIFIER = com.easy.Ondoset;
PRODUCT_BUNDLE_IDENTIFIER = com.Frank.Ondoset;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";
SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
SUPPORTS_MACCATALYST = NO;
SUPPORTS_XR_DESIGNED_FOR_IPHONE_IPAD = NO;
SWIFT_EMIT_LOC_STRINGS = YES;
SWIFT_VERSION = 5.0;
TARGETED_DEVICE_FAMILY = "1,2";
TARGETED_DEVICE_FAMILY = 1;
};
name = Release;
};
Expand Down
1 change: 1 addition & 0 deletions Ondoset/Ondoset/Assets.xcassets/AppIcon.appiconset/Contents.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{
"images" : [
{
"filename" : "ondosetIcon.png",
"idiom" : "universal",
"platform" : "ios",
"size" : "1024x1024"
Expand Down
Binary file added Ondoset/Ondoset/Assets.xcassets/AppIcon.appiconset/ondosetIcon.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 2 additions & 1 deletion Ondoset/Ondoset/Common/Utils/Constants.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,8 @@ struct Constants {
let isAvailableUnivURL: Bool = false

let univURL = "http://ceprj.gachon.ac.kr:60019"
let ec2URL = "http://ec2-43-201-46-189.ap-northeast-2.compute.amazonaws.com:8080"
//let ec2URL = "http://ec2-43-201-46-189.ap-northeast-2.compute.amazonaws.com:8080"
let ec2URL = "https://ondoset.shop"


let windowScene = UIApplication.shared.connectedScenes.first as? UIWindowScene
Expand Down
2 changes: 2 additions & 0 deletions Ondoset/Ondoset/Data/API/Base/APIManager.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ final class APIManager {
result = try request.result.get()
} catch {
print("====네트워크 에러====")
print("\(String(data: result, encoding: .utf8))")
return nil
}

Expand All @@ -36,6 +37,7 @@ final class APIManager {
return decodedData.result
} catch {
print("====디코딩 에러====")
print("\(String(data: result, encoding: .utf8))")
return nil
}
}
Expand Down
5 changes: 0 additions & 5 deletions Ondoset/Ondoset/Info.plist
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,6 @@
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>NSAppTransportSecurity</key>
<dict>
<key>NSAllowsArbitraryLoads</key>
<true/>
</dict>
<key>UIAppFonts</key>
<array>
<string>Pretendard-Black.otf</string>
Expand Down
1 change: 1 addition & 0 deletions Ondoset/Ondoset/Presentation/Initial/SignUp/SignUpFirstView.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -109,6 +109,7 @@ struct SignUpFirstView: View {
.foregroundStyle(signUpVM.isNextBtnAvailable ? .white : .darkGray)
)
}
.disabled(!signUpVM.isNextBtnAvailable)

Spacer()
}
Expand Down
1 change: 1 addition & 0 deletions Ondoset/Ondoset/Presentation/Initial/SignUp/SignUpSecondView.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,7 @@ struct SignUpSecondView: View {
}
}
.padding(.top, 80)
.disabled(!signUpVM.isSignUpBtnAvailable)

Spacer()
}
Expand Down

0 comments on commit 1ffd411

Please sign in to comment.