Skip to content

Commit 1111125

Browse files
Roy-wonjiRoy-wonji
committed
✨[feat]: 뒤로 가기 버튼 이슈 수정
 🪛[chore]: swift lint 도 spm으로 변경
1 parent 4d93f2e commit 1111125

File tree

21 files changed

+179
-493
lines changed

21 files changed

+179
-493
lines changed

‎MarketApp/.DS_Store‎

0 Bytes
Binary file not shown.

‎MarketApp/Application/AppDelegate.swift‎

Lines changed: 1 addition & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -21,19 +21,6 @@ class AppDelegate: UIViewController, UIApplicationDelegate, MessagingDelegate, U
2121
func application(_ application: UIApplication,
2222
didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey : Any]? = nil) -> Bool {
2323

24-
25-
// var filePath = Bundle.main.path(forResource: "GoogleService-Info", ofType: "plist")
26-
//#if DEVELOPE
27-
// filePath = Bundle.main.path(forResource: "GoogleService-Info-dev", ofType: "plist")
28-
//#endif
29-
// if let fileopts = FirebaseOptions(contentsOfFile: filePath!) {
30-
// FirebaseApp.configure(options: fileopts)
31-
// // init fcm
32-
// Messaging.messaging().delegate = self
33-
// } else {
34-
// assert(false, "Couldn't load config file")
35-
// }
36-
//
3724
FirebaseApp.configure()
3825
FirebaseConfiguration.shared.setLoggerLevel(FirebaseLoggerLevel.min)
3926
remoteConfig = RemoteConfig.remoteConfig()
@@ -65,7 +52,7 @@ class AppDelegate: UIViewController, UIApplicationDelegate, MessagingDelegate, U
6552
if status == .success {
6653
self.remoteConfig.activate() { (change, error) in
6754
guard let minVersion = self.remoteConfig["ios_lastest_version"].stringValue else {
68-
return
55+
return
6956
}
7057
}
7158
}

‎MarketApp/MarketApp.xcodeproj/project.pbxproj‎

Lines changed: 21 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1108,12 +1108,12 @@
11081108
EC892A972908189600D02F99 /* Sources */,
11091109
EC892A982908189600D02F99 /* Frameworks */,
11101110
EC892A992908189600D02F99 /* Resources */,
1111-
7F39FA95295333780041BF8B /* SwiftLint Script */,
11121111
7F2432B22958677000C1077E /* FirebaseCrashlytics Script */,
11131112
);
11141113
buildRules = (
11151114
);
11161115
dependencies = (
1116+
7F3425A429DD579C001748A9 /* PBXTargetDependency */,
11171117
);
11181118
name = MarketApp;
11191119
packageProductDependencies = (
@@ -1179,6 +1179,7 @@
11791179
7FA4B89329D88A8C00FA1569 /* XCRemoteSwiftPackageReference "Kingfisher" */,
11801180
7FA4B89629D88ACB00FA1569 /* XCRemoteSwiftPackageReference "PopupView" */,
11811181
7FA4B89F29D9933000FA1569 /* XCRemoteSwiftPackageReference "lottie-ios" */,
1182+
7F3425A129DD54AB001748A9 /* XCRemoteSwiftPackageReference "SwiftLintPlugin" */,
11821183
);
11831184
productRefGroup = EC892A9C2908189600D02F99 /* Products */;
11841185
projectDirPath = "";
@@ -1279,25 +1280,6 @@
12791280
shellPath = /bin/sh;
12801281
shellScript = "# Type a script or drag a script file from your workspace to insert its path.\n # \"${BUILD_DIR%/Build/*}/SourcePackages/checkouts/firebase-ios-sdk/Crashlytics/run\"\n\"${BUILD_DIR%Build/*}SourcePackages/checkouts/firebase-ios-sdk/Crashlytics/run\" \n";
12811282
};
1282-
7F39FA95295333780041BF8B /* SwiftLint Script */ = {
1283-
isa = PBXShellScriptBuildPhase;
1284-
alwaysOutOfDate = 1;
1285-
buildActionMask = 2147483647;
1286-
files = (
1287-
);
1288-
inputFileListPaths = (
1289-
);
1290-
inputPaths = (
1291-
);
1292-
name = "SwiftLint Script";
1293-
outputFileListPaths = (
1294-
);
1295-
outputPaths = (
1296-
);
1297-
runOnlyForDeploymentPostprocessing = 0;
1298-
shellPath = /bin/sh;
1299-
shellScript = "# Type a script or drag a script file from your workspace to insert its path.\nexport PATH=\"$PATH:/opt/homebrew/bin\"\nif which swiftlint > /dev/null; then\n swiftlint\nelse\n echo \"warning: SwiftLint not installed, download from https://github.com/realm/SwiftLint\"\nfi\n\n";
1300-
};
13011283
8736ED9C66FCC265B52F1C27 /* [CP] Check Pods Manifest.lock */ = {
13021284
isa = PBXShellScriptBuildPhase;
13031285
buildActionMask = 2147483647;
@@ -1458,6 +1440,10 @@
14581440
/* End PBXSourcesBuildPhase section */
14591441

14601442
/* Begin PBXTargetDependency section */
1443+
7F3425A429DD579C001748A9 /* PBXTargetDependency */ = {
1444+
isa = PBXTargetDependency;
1445+
productRef = 7F3425A329DD579C001748A9 /* SwiftLint */;
1446+
};
14611447
7FDB1E6429A2399C00019099 /* PBXTargetDependency */ = {
14621448
isa = PBXTargetDependency;
14631449
target = EC892A9A2908189600D02F99 /* MarketApp */;
@@ -1725,7 +1711,7 @@
17251711
"$(inherited)",
17261712
"@executable_path/Frameworks",
17271713
);
1728-
MARKETING_VERSION = 1.0.2;
1714+
MARKETING_VERSION = 1.0.3;
17291715
OTHER_SWIFT_FLAGS = "$(inherited) -D DEVELOPE";
17301716
PRODUCT_BUNDLE_IDENTIFIER = com.shoping.MarketApps;
17311717
PRODUCT_NAME = "$(TARGET_NAME)";
@@ -1769,7 +1755,7 @@
17691755
"$(inherited)",
17701756
"@executable_path/Frameworks",
17711757
);
1772-
MARKETING_VERSION = 1.0.2;
1758+
MARKETING_VERSION = 1.0.3;
17731759
OTHER_SWIFT_FLAGS = "$(inherited)";
17741760
PRODUCT_BUNDLE_IDENTIFIER = com.shoping.MarketApps;
17751761
PRODUCT_NAME = "$(TARGET_NAME)";
@@ -1825,6 +1811,14 @@
18251811
/* End XCConfigurationList section */
18261812

18271813
/* Begin XCRemoteSwiftPackageReference section */
1814+
7F3425A129DD54AB001748A9 /* XCRemoteSwiftPackageReference "SwiftLintPlugin" */ = {
1815+
isa = XCRemoteSwiftPackageReference;
1816+
repositoryURL = "https://github.com/lukepistrol/SwiftLintPlugin";
1817+
requirement = {
1818+
kind = upToNextMajorVersion;
1819+
minimumVersion = 0.2.3;
1820+
};
1821+
};
18281822
7FA4B86F29D8893000FA1569 /* XCRemoteSwiftPackageReference "firebase-ios-sdk" */ = {
18291823
isa = XCRemoteSwiftPackageReference;
18301824
repositoryURL = "https://github.com/firebase/firebase-ios-sdk";
@@ -1876,6 +1870,11 @@
18761870
/* End XCRemoteSwiftPackageReference section */
18771871

18781872
/* Begin XCSwiftPackageProductDependency section */
1873+
7F3425A329DD579C001748A9 /* SwiftLint */ = {
1874+
isa = XCSwiftPackageProductDependency;
1875+
package = 7F3425A129DD54AB001748A9 /* XCRemoteSwiftPackageReference "SwiftLintPlugin" */;
1876+
productName = "plugin:SwiftLint";
1877+
};
18791878
7F3B45FE29D9DCE7001335BE /* FirebaseAnalytics */ = {
18801879
isa = XCSwiftPackageProductDependency;
18811880
package = 7FA4B86F29D8893000FA1569 /* XCRemoteSwiftPackageReference "firebase-ios-sdk" */;

‎MarketApp/MarketApp.xcodeproj/xcshareddata/xcschemes/MarketApp.xcscheme‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "1420"
3+
LastUpgradeVersion = "1430"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"

‎MarketApp/MarketApp/View/Authorization/Login/LoginView.swift‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -68,10 +68,9 @@ struct LoginView: View {
6868
}
6969
.bounce(false)
7070
}
71+
7172
.navigationDestination(isPresented: $showMainView) {
72-
NavigationStack {
73-
MainTabView()
74-
}
73+
MainTabView()
7574
.navigationBarHidden(true)
7675
}
7776

@@ -85,6 +84,7 @@ struct LoginView: View {
8584
SignUPView()
8685
}
8786
}
87+
.navigationBarHidden(true)
8888
.popup(isPresented: $loginErrorPopUp) {
8989
POPUPViews(title: "로그인 에러", message: "아이디와 비밀 번호를 한번 확인 해주세요", cancelTitle: "취소", confiremTitle: "확인", color: Color.colorAsset.mainColor)
9090
} customize: { view in

‎MarketApp/MarketApp/View/ProductDetail/ProductView.swift‎

Lines changed: 28 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@ struct ProductView: View {
2828

2929
var body: some View {
3030

31-
if !transName.isEmpty {
32-
VStack {
31+
VStack {
32+
if viewModel.shoesName != nil {
3333
ScrollView(.vertical, showsIndicators: true) {
3434

3535
productTopImageView()
@@ -39,27 +39,33 @@ struct ProductView: View {
3939
DetailImageView(transName: transName)
4040
}
4141
.bounce(false)
42-
4342
.onAppear {
4443
print("신발 이름 \(transName)")
4544
viewModel.shoesName = transName
4645
viewModel.mainDetailShoesRequest()
4746
}
47+
} else {
48+
Spacer()
49+
50+
LottieLoadingView()
51+
.onAppear {
52+
print("신발 이름 \(transName)")
53+
viewModel.shoesName = transName
54+
viewModel.mainDetailShoesRequest()
55+
}
4856
}
49-
.navigationBarBackButtonHidden(true)
50-
.navigationTitle("")
51-
.toolbar {
52-
ToolbarItem(placement: .navigationBarTrailing) {
53-
shareButton()
54-
}
57+
}
58+
.navigationBarBackButtonHidden(true)
59+
.navigationTitle("")
60+
.toolbar {
61+
ToolbarItem(placement: .navigationBarTrailing) {
62+
shareButton()
5563
}
56-
.toolbar {
57-
ToolbarItem(placement: .navigationBarLeading) {
58-
customBackButton()
59-
}
64+
}
65+
.toolbar {
66+
ToolbarItem(placement: .navigationBarLeading) {
67+
customBackButton()
6068
}
61-
} else {
62-
LottieLoadingView()
6369
}
6470
}
6571

@@ -88,17 +94,17 @@ struct ProductView: View {
8894
, autoScroll: .active(5)) { imageUrl in
8995
ProductImage(image: imageUrl)
9096
}
91-
.frame(height: 300)
92-
.readSize {
93-
bannerSize = $0 }
97+
.frame(height: 300)
98+
.readSize {
99+
bannerSize = $0 }
94100

95101

96102
VStack(spacing: 10) {
97103
PagerIndicator(selectedPage: $pageIndex
98104
, size: 8, activeColor: Color.colorAsset.blueGray
99105
, inactiveColor: Color.colorAsset.lightBlack
100106
, pageCount: imageUrls.count)
101-
.padding(.bottom, 20)
107+
.padding(.bottom, 20)
102108
}
103109
.transition(.opacity.animation(.easeInOut(duration: 0.5)))
104110
} else {
@@ -107,7 +113,7 @@ struct ProductView: View {
107113
}
108114
}
109115
}
110-
116+
111117
//MARK: 배너 이미지 view
112118
@ViewBuilder
113119
private func ProductImage(image: String) -> some View {
@@ -117,7 +123,7 @@ struct ProductView: View {
117123
.scaledToFill()
118124
.frame(height: 300)
119125
}
120-
126+
121127
//MARK: - 공유 버튼
122128
@ViewBuilder
123129
private func shareButton() -> some View {
@@ -201,7 +207,7 @@ struct ProductView: View {
201207
}.frame(width: 50)
202208
}
203209
.padding()
204-
}
210+
}
205211
}
206212

207213
@ViewBuilder

‎MarketApp/MarketApp/View/Tab/MainTabView.swift‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,7 @@ struct MainTabView: View {
6464
}
6565
})
6666
.navigationTitle("")
67+
.navigationBarHidden(true)
6768
.navigationBarTitleDisplayMode(.inline)
6869
.onAppear{
6970
UITabBar.appearance().tintColor = UIColor(Color.colorAsset.blueGray)

‎MarketApp/Podfile‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,6 @@ target 'MarketApp' do
66
use_frameworks!
77

88
# Pods for MarketApp
9-
#pod 'Alamofire'
10-
pod 'SwiftLint'
11-
129

1310
target 'MarketAppTests' do
1411
inherit! :search_paths

‎MarketApp/Podfile.lock‎

Lines changed: 1 addition & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,3 @@
1-
PODS:
2-
- SwiftLint (0.51.0)
3-
4-
DEPENDENCIES:
5-
- SwiftLint
6-
7-
SPEC REPOS:
8-
trunk:
9-
- SwiftLint
10-
11-
SPEC CHECKSUMS:
12-
SwiftLint: 1b7561918a19e23bfed960e40759086e70f4dba5
13-
14-
PODFILE CHECKSUM: e8f4c511fb3a527323d75616e3f626514bcc9d96
1+
PODFILE CHECKSUM: f91a9e56a2e230964023a401d37f5a2246aebc51
152

163
COCOAPODS: 1.12.0

‎MarketApp/Pods/Manifest.lock‎

Lines changed: 1 addition & 14 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)