Skip to content

Commit

Permalink
Merge pull request #118 from Gwamegis/deploy1.1.1
Browse files Browse the repository at this point in the history
[bugFix] 팀 앨범 커버 수정, 런치스크린 수정
  • Loading branch information
JMM00 authored May 18, 2023
2 parents 19af995 + 8e2aa11 commit c1c426c
Show file tree
Hide file tree
Showing 23 changed files with 54 additions and 98 deletions.
43 changes: 28 additions & 15 deletions Halmap.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
objects = {

/* Begin PBXBuildFile section */
200B06EF2A0897770011D18E /* MinimizableView in Frameworks */ = {isa = PBXBuildFile; productRef = 200B06EE2A0897770011D18E /* MinimizableView */; };
20317FB228F2CCBB00A30E09 /* TeamChangingView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 20317FB128F2CCBB00A30E09 /* TeamChangingView.swift */; };
203CAF022916762B00E838A1 /* FirebaseFirestore in Frameworks */ = {isa = PBXBuildFile; productRef = 203CAF012916762B00E838A1 /* FirebaseFirestore */; };
203CAF042916762B00E838A1 /* FirebaseFirestoreSwift in Frameworks */ = {isa = PBXBuildFile; productRef = 203CAF032916762B00E838A1 /* FirebaseFirestoreSwift */; };
Expand Down Expand Up @@ -106,6 +107,7 @@
203CAF022916762B00E838A1 /* FirebaseFirestore in Frameworks */,
203CAF042916762B00E838A1 /* FirebaseFirestoreSwift in Frameworks */,
203CAF062916762B00E838A1 /* FirebaseStorage in Frameworks */,
200B06EF2A0897770011D18E /* MinimizableView in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand Down Expand Up @@ -134,13 +136,13 @@
A81FFC7828F15D9900B0FC7C /* Halmap */ = {
isa = PBXGroup;
children = (
A81FFC8E28F1770500B0FC7C /* View */,
B2699E0B28F1CB5100267A4F /* Info.plist */,
F98F622729B4C9A80025F50E /* Theme */,
F9B95BBC28F2733200728048 /* Data */,
A81FFCA028F1B2E300B0FC7C /* Extensions */,
A81FFC7928F15D9900B0FC7C /* HalmapApp.swift */,
A81FFC7B28F15D9900B0FC7C /* ContentView.swift */,
A81FFC8E28F1770500B0FC7C /* View */,
A81FFC7D28F15D9C00B0FC7C /* Assets.xcassets */,
A81FFC8228F15D9C00B0FC7C /* Persistence.swift */,
A81FFC8428F15D9C00B0FC7C /* Halmap.xcdatamodeld */,
Expand Down Expand Up @@ -277,6 +279,7 @@
203CAF012916762B00E838A1 /* FirebaseFirestore */,
203CAF032916762B00E838A1 /* FirebaseFirestoreSwift */,
203CAF052916762B00E838A1 /* FirebaseStorage */,
200B06EE2A0897770011D18E /* MinimizableView */,
);
productName = Halmap;
productReference = A81FFC7628F15D9900B0FC7C /* Halmap.app */;
Expand Down Expand Up @@ -308,6 +311,7 @@
mainGroup = A81FFC6D28F15D9900B0FC7C;
packageReferences = (
203CAF002916762B00E838A1 /* XCRemoteSwiftPackageReference "firebase-ios-sdk" */,
200B06ED2A0897770011D18E /* XCRemoteSwiftPackageReference "MinimizableView" */,
);
productRefGroup = A81FFC7728F15D9900B0FC7C /* Products */;
projectDirPath = "";
Expand Down Expand Up @@ -498,12 +502,11 @@
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution";
CODE_SIGN_STYLE = Manual;
CURRENT_PROJECT_VERSION = 3;
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 5;
DEVELOPMENT_ASSET_PATHS = "\"Halmap/Preview Content\"";
DEVELOPMENT_TEAM = "";
"DEVELOPMENT_TEAM[sdk=iphoneos*]" = 22A6RK2943;
DEVELOPMENT_TEAM = Y6P5ZFWBM8;
ENABLE_PREVIEWS = YES;
GENERATE_INFOPLIST_FILE = YES;
INFOPLIST_FILE = Halmap/Info.plist;
Expand All @@ -516,11 +519,10 @@
"$(inherited)",
"@executable_path/Frameworks",
);
MARKETING_VERSION = 1.0.2;
MARKETING_VERSION = 1.1.1;
PRODUCT_BUNDLE_IDENTIFIER = com.Gwamegis.Halmap;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";
"PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = Moya_AppStore_AppStore;
SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
SUPPORTS_MACCATALYST = NO;
SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = NO;
Expand All @@ -535,12 +537,11 @@
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution";
CODE_SIGN_STYLE = Manual;
CURRENT_PROJECT_VERSION = 3;
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 5;
DEVELOPMENT_ASSET_PATHS = "\"Halmap/Preview Content\"";
DEVELOPMENT_TEAM = "";
"DEVELOPMENT_TEAM[sdk=iphoneos*]" = 22A6RK2943;
DEVELOPMENT_TEAM = Y6P5ZFWBM8;
ENABLE_PREVIEWS = YES;
GENERATE_INFOPLIST_FILE = YES;
INFOPLIST_FILE = Halmap/Info.plist;
Expand All @@ -553,11 +554,10 @@
"$(inherited)",
"@executable_path/Frameworks",
);
MARKETING_VERSION = 1.0.2;
MARKETING_VERSION = 1.1.1;
PRODUCT_BUNDLE_IDENTIFIER = com.Gwamegis.Halmap;
PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = "";
"PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = Moya_AppStore_AppStore;
SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
SUPPORTS_MACCATALYST = NO;
SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = NO;
Expand Down Expand Up @@ -591,6 +591,14 @@
/* End XCConfigurationList section */

/* Begin XCRemoteSwiftPackageReference section */
200B06ED2A0897770011D18E /* XCRemoteSwiftPackageReference "MinimizableView" */ = {
isa = XCRemoteSwiftPackageReference;
repositoryURL = "https://github.com/DominikButz/MinimizableView.git";
requirement = {
kind = upToNextMajorVersion;
minimumVersion = 2.0.0;
};
};
203CAF002916762B00E838A1 /* XCRemoteSwiftPackageReference "firebase-ios-sdk" */ = {
isa = XCRemoteSwiftPackageReference;
repositoryURL = "https://github.com/firebase/firebase-ios-sdk.git";
Expand All @@ -602,6 +610,11 @@
/* End XCRemoteSwiftPackageReference section */

/* Begin XCSwiftPackageProductDependency section */
200B06EE2A0897770011D18E /* MinimizableView */ = {
isa = XCSwiftPackageProductDependency;
package = 200B06ED2A0897770011D18E /* XCRemoteSwiftPackageReference "MinimizableView" */;
productName = MinimizableView;
};
203CAF012916762B00E838A1 /* FirebaseFirestore */ = {
isa = XCSwiftPackageProductDependency;
package = 203CAF002916762B00E838A1 /* XCRemoteSwiftPackageReference "firebase-ios-sdk" */;
Expand Down
6 changes: 3 additions & 3 deletions Halmap/Assets.xcassets/LaunchScreen.imageset/Contents.json
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
{
"images" : [
{
"filename" : "LaunchScreen.svg",
"filename" : "Moya_Launch_screen.png",
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "[email protected]",
"filename" : "Moya_Launch_screen 1.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "[email protected]",
"filename" : "Moya_Launch_screen 2.png",
"idiom" : "universal",
"scale" : "3x"
}
Expand Down
21 changes: 0 additions & 21 deletions Halmap/Assets.xcassets/LaunchScreen.imageset/LaunchScreen.svg

This file was deleted.

21 changes: 0 additions & 21 deletions Halmap/Assets.xcassets/LaunchScreen.imageset/[email protected]

This file was deleted.

21 changes: 0 additions & 21 deletions Halmap/Assets.xcassets/LaunchScreen.imageset/[email protected]

This file was deleted.

Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"images" : [
{
"filename" : "KT.png",
"filename" : "KtOnboarding.png",
"idiom" : "universal",
"scale" : "1x"
},
Expand Down
Binary file removed Halmap/Assets.xcassets/팀 로고/Kt.imageset/KT.png
Binary file not shown.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"images" : [
{
"filename" : "SSG.png",
"filename" : "SSGOnboarding.png",
"idiom" : "universal",
"scale" : "1x"
},
Expand Down
Binary file not shown.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 6 additions & 0 deletions Halmap/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,12 @@
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>BGTaskSchedulerPermittedIdentifiers</key>
<array>
<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
</array>
<key></key>
<string></string>
<key>UIAppFonts</key>
<array>
<string>Pretendard-Bold.otf</string>
Expand Down
2 changes: 1 addition & 1 deletion Halmap/View/MainSongListTabView.swift
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ struct MainSongListTabView: View {
@ObservedObject var dataManager = DataManager()
@State private var showingTeamChaingView: Bool = false
@State var index = 0

// SongInformationView
@State private var showingFullScreenCover = false

Expand Down
28 changes: 14 additions & 14 deletions Halmap/View/SongInformation/SongPlayerView.swift
Original file line number Diff line number Diff line change
Expand Up @@ -51,13 +51,13 @@ struct SongPlayerView: View {

// Buttons
HStack(spacing: 52) {
Button {
//이전곡 재생 기능
} label: {
Image(systemName: "backward.end.fill")
.font(.system(size: 28, weight: .regular))
.foregroundColor(.customGray)
}
// Button {
// //이전곡 재생 기능
// } label: {
// Image(systemName: "backward.end.fill")
// .font(.system(size: 28, weight: .regular))
// .foregroundColor(.customGray)
// }

Button {
if !audioManager.isPlaying {
Expand All @@ -71,13 +71,13 @@ struct SongPlayerView: View {
.foregroundColor(.customGray)
}

Button {
//다음곡 재생 기능
} label: {
Image(systemName: "forward.end.fill")
.font(.system(size: 28, weight: .regular))
.foregroundColor(.customGray)
}
// Button {
// //다음곡 재생 기능
// } label: {
// Image(systemName: "forward.end.fill")
// .font(.system(size: 28, weight: .regular))
// .foregroundColor(.customGray)
// }
}
.padding(.bottom, 54)

Expand Down

0 comments on commit c1c426c

Please sign in to comment.