diff --git a/Runnect-iOS/.swiftlint.yml b/Runnect-iOS/.swiftlint.yml index b4b8db1c..9057c5bf 100644 --- a/Runnect-iOS/.swiftlint.yml +++ b/Runnect-iOS/.swiftlint.yml @@ -5,6 +5,7 @@ disabled_rules: - type_name - legacy_constructor - unused_setter_value + - force_try included: - Runnect-iOS diff --git a/Runnect-iOS/Runnect-iOS/Global/Literal/ImageLiterals.swift b/Runnect-iOS/Runnect-iOS/Global/Literal/ImageLiterals.swift index 98648761..26949435 100644 --- a/Runnect-iOS/Runnect-iOS/Global/Literal/ImageLiterals.swift +++ b/Runnect-iOS/Runnect-iOS/Global/Literal/ImageLiterals.swift @@ -61,6 +61,7 @@ enum ImageLiterals { static var imgStorage: UIImage { .load(named: "img_storage") } static var imgLock: UIImage { .load(named: "img_lock") } static var imgTelescope: UIImage { .load(named: "img_telescope") } + static var imgSpaceship: UIImage { .load(named: "img_spaceship") } static var imgAppIcon: UIImage { .load(named: "img_app_icon") } } diff --git a/Runnect-iOS/Runnect-iOS/Global/Resource/Assets.xcassets/img_paper.imageset/Contents.json b/Runnect-iOS/Runnect-iOS/Global/Resource/Assets.xcassets/img_paper.imageset/Contents.json index 036e9750..8b807a08 100644 --- a/Runnect-iOS/Runnect-iOS/Global/Resource/Assets.xcassets/img_paper.imageset/Contents.json +++ b/Runnect-iOS/Runnect-iOS/Global/Resource/Assets.xcassets/img_paper.imageset/Contents.json @@ -1,17 +1,17 @@ { "images" : [ { - "filename" : "draw_img_paper 1.png", + "filename" : "Group 9449.png", "idiom" : "universal", "scale" : "1x" }, { - "filename" : "draw_img_paper 1@2x.png", + "filename" : "Group 9449@2x.png", "idiom" : "universal", "scale" : "2x" }, { - "filename" : "draw_img_paper 1@3x.png", + "filename" : "Group 9449@3x.png", "idiom" : "universal", "scale" : "3x" } diff --git a/Runnect-iOS/Runnect-iOS/Global/Resource/Assets.xcassets/img_paper.imageset/Group 9449.png b/Runnect-iOS/Runnect-iOS/Global/Resource/Assets.xcassets/img_paper.imageset/Group 9449.png new file mode 100644 index 00000000..d880a293 Binary files /dev/null and b/Runnect-iOS/Runnect-iOS/Global/Resource/Assets.xcassets/img_paper.imageset/Group 9449.png differ diff --git a/Runnect-iOS/Runnect-iOS/Global/Resource/Assets.xcassets/img_paper.imageset/Group 9449@2x.png b/Runnect-iOS/Runnect-iOS/Global/Resource/Assets.xcassets/img_paper.imageset/Group 9449@2x.png new file mode 100644 index 00000000..b5f7e7b3 Binary files /dev/null and b/Runnect-iOS/Runnect-iOS/Global/Resource/Assets.xcassets/img_paper.imageset/Group 9449@2x.png differ diff --git a/Runnect-iOS/Runnect-iOS/Global/Resource/Assets.xcassets/img_paper.imageset/Group 9449@3x.png b/Runnect-iOS/Runnect-iOS/Global/Resource/Assets.xcassets/img_paper.imageset/Group 9449@3x.png new file mode 100644 index 00000000..2e5924ba Binary files /dev/null and b/Runnect-iOS/Runnect-iOS/Global/Resource/Assets.xcassets/img_paper.imageset/Group 9449@3x.png differ diff --git a/Runnect-iOS/Runnect-iOS/Global/Resource/Assets.xcassets/img_paper.imageset/draw_img_paper 1.png b/Runnect-iOS/Runnect-iOS/Global/Resource/Assets.xcassets/img_paper.imageset/draw_img_paper 1.png deleted file mode 100644 index 372d5a9b..00000000 Binary files a/Runnect-iOS/Runnect-iOS/Global/Resource/Assets.xcassets/img_paper.imageset/draw_img_paper 1.png and /dev/null differ diff --git a/Runnect-iOS/Runnect-iOS/Global/Resource/Assets.xcassets/img_paper.imageset/draw_img_paper 1@2x.png b/Runnect-iOS/Runnect-iOS/Global/Resource/Assets.xcassets/img_paper.imageset/draw_img_paper 1@2x.png deleted file mode 100644 index 185c5410..00000000 Binary files a/Runnect-iOS/Runnect-iOS/Global/Resource/Assets.xcassets/img_paper.imageset/draw_img_paper 1@2x.png and /dev/null differ diff --git a/Runnect-iOS/Runnect-iOS/Global/Resource/Assets.xcassets/img_paper.imageset/draw_img_paper 1@3x.png b/Runnect-iOS/Runnect-iOS/Global/Resource/Assets.xcassets/img_paper.imageset/draw_img_paper 1@3x.png deleted file mode 100644 index c4164961..00000000 Binary files a/Runnect-iOS/Runnect-iOS/Global/Resource/Assets.xcassets/img_paper.imageset/draw_img_paper 1@3x.png and /dev/null differ diff --git a/Runnect-iOS/Runnect-iOS/Global/Resource/Assets.xcassets/img_spaceship.imageset/Contents.json b/Runnect-iOS/Runnect-iOS/Global/Resource/Assets.xcassets/img_spaceship.imageset/Contents.json new file mode 100644 index 00000000..68b59a18 --- /dev/null +++ b/Runnect-iOS/Runnect-iOS/Global/Resource/Assets.xcassets/img_spaceship.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "Group 9448.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "Group 9448@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "Group 9448@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Runnect-iOS/Runnect-iOS/Global/Resource/Assets.xcassets/img_spaceship.imageset/Group 9448.png b/Runnect-iOS/Runnect-iOS/Global/Resource/Assets.xcassets/img_spaceship.imageset/Group 9448.png new file mode 100644 index 00000000..f79f5d69 Binary files /dev/null and b/Runnect-iOS/Runnect-iOS/Global/Resource/Assets.xcassets/img_spaceship.imageset/Group 9448.png differ diff --git a/Runnect-iOS/Runnect-iOS/Global/Resource/Assets.xcassets/img_spaceship.imageset/Group 9448@2x.png b/Runnect-iOS/Runnect-iOS/Global/Resource/Assets.xcassets/img_spaceship.imageset/Group 9448@2x.png new file mode 100644 index 00000000..c242fc82 Binary files /dev/null and b/Runnect-iOS/Runnect-iOS/Global/Resource/Assets.xcassets/img_spaceship.imageset/Group 9448@2x.png differ diff --git a/Runnect-iOS/Runnect-iOS/Global/Resource/Assets.xcassets/img_spaceship.imageset/Group 9448@3x.png b/Runnect-iOS/Runnect-iOS/Global/Resource/Assets.xcassets/img_spaceship.imageset/Group 9448@3x.png new file mode 100644 index 00000000..0cd9f815 Binary files /dev/null and b/Runnect-iOS/Runnect-iOS/Global/Resource/Assets.xcassets/img_spaceship.imageset/Group 9448@3x.png differ diff --git a/Runnect-iOS/Runnect-iOS/Global/Resource/Assets.xcassets/img_stamp.imageset/Contents.json b/Runnect-iOS/Runnect-iOS/Global/Resource/Assets.xcassets/img_stamp.imageset/Contents.json index c53c9ce7..6df801ad 100644 --- a/Runnect-iOS/Runnect-iOS/Global/Resource/Assets.xcassets/img_stamp.imageset/Contents.json +++ b/Runnect-iOS/Runnect-iOS/Global/Resource/Assets.xcassets/img_stamp.imageset/Contents.json @@ -1,17 +1,17 @@ { "images" : [ { - "filename" : "mypage_img_stamp.png", + "filename" : "Group 9447.png", "idiom" : "universal", "scale" : "1x" }, { - "filename" : "mypage_img_stamp@2x.png", + "filename" : "Group 9447@2x.png", "idiom" : "universal", "scale" : "2x" }, { - "filename" : "mypage_img_stamp@3x.png", + "filename" : "Group 9447@3x.png", "idiom" : "universal", "scale" : "3x" } diff --git a/Runnect-iOS/Runnect-iOS/Global/Resource/Assets.xcassets/img_stamp.imageset/Group 9447.png b/Runnect-iOS/Runnect-iOS/Global/Resource/Assets.xcassets/img_stamp.imageset/Group 9447.png new file mode 100644 index 00000000..55308058 Binary files /dev/null and b/Runnect-iOS/Runnect-iOS/Global/Resource/Assets.xcassets/img_stamp.imageset/Group 9447.png differ diff --git a/Runnect-iOS/Runnect-iOS/Global/Resource/Assets.xcassets/img_stamp.imageset/Group 9447@2x.png b/Runnect-iOS/Runnect-iOS/Global/Resource/Assets.xcassets/img_stamp.imageset/Group 9447@2x.png new file mode 100644 index 00000000..f981fe6a Binary files /dev/null and b/Runnect-iOS/Runnect-iOS/Global/Resource/Assets.xcassets/img_stamp.imageset/Group 9447@2x.png differ diff --git a/Runnect-iOS/Runnect-iOS/Global/Resource/Assets.xcassets/img_stamp.imageset/Group 9447@3x.png b/Runnect-iOS/Runnect-iOS/Global/Resource/Assets.xcassets/img_stamp.imageset/Group 9447@3x.png new file mode 100644 index 00000000..a938bf1e Binary files /dev/null and b/Runnect-iOS/Runnect-iOS/Global/Resource/Assets.xcassets/img_stamp.imageset/Group 9447@3x.png differ diff --git a/Runnect-iOS/Runnect-iOS/Global/Resource/Assets.xcassets/img_stamp.imageset/mypage_img_stamp.png b/Runnect-iOS/Runnect-iOS/Global/Resource/Assets.xcassets/img_stamp.imageset/mypage_img_stamp.png deleted file mode 100644 index 7890f894..00000000 Binary files a/Runnect-iOS/Runnect-iOS/Global/Resource/Assets.xcassets/img_stamp.imageset/mypage_img_stamp.png and /dev/null differ diff --git a/Runnect-iOS/Runnect-iOS/Global/Resource/Assets.xcassets/img_stamp.imageset/mypage_img_stamp@2x.png b/Runnect-iOS/Runnect-iOS/Global/Resource/Assets.xcassets/img_stamp.imageset/mypage_img_stamp@2x.png deleted file mode 100644 index 20babd6e..00000000 Binary files a/Runnect-iOS/Runnect-iOS/Global/Resource/Assets.xcassets/img_stamp.imageset/mypage_img_stamp@2x.png and /dev/null differ diff --git a/Runnect-iOS/Runnect-iOS/Global/Resource/Assets.xcassets/img_stamp.imageset/mypage_img_stamp@3x.png b/Runnect-iOS/Runnect-iOS/Global/Resource/Assets.xcassets/img_stamp.imageset/mypage_img_stamp@3x.png deleted file mode 100644 index 439f0f3e..00000000 Binary files a/Runnect-iOS/Runnect-iOS/Global/Resource/Assets.xcassets/img_stamp.imageset/mypage_img_stamp@3x.png and /dev/null differ diff --git a/Runnect-iOS/Runnect-iOS/Global/Resource/Assets.xcassets/img_storage.imageset/Contents.json b/Runnect-iOS/Runnect-iOS/Global/Resource/Assets.xcassets/img_storage.imageset/Contents.json index 30239c9d..f55a306e 100644 --- a/Runnect-iOS/Runnect-iOS/Global/Resource/Assets.xcassets/img_storage.imageset/Contents.json +++ b/Runnect-iOS/Runnect-iOS/Global/Resource/Assets.xcassets/img_storage.imageset/Contents.json @@ -1,17 +1,17 @@ { "images" : [ { - "filename" : "storage_img_empty.png", + "filename" : "Group 9446.png", "idiom" : "universal", "scale" : "1x" }, { - "filename" : "storage_img_empty@2x.png", + "filename" : "Group 9446@2x.png", "idiom" : "universal", "scale" : "2x" }, { - "filename" : "storage_img_empty@3x.png", + "filename" : "Group 9446@3x.png", "idiom" : "universal", "scale" : "3x" } diff --git a/Runnect-iOS/Runnect-iOS/Global/Resource/Assets.xcassets/img_storage.imageset/Group 9446.png b/Runnect-iOS/Runnect-iOS/Global/Resource/Assets.xcassets/img_storage.imageset/Group 9446.png new file mode 100644 index 00000000..2b15824c Binary files /dev/null and b/Runnect-iOS/Runnect-iOS/Global/Resource/Assets.xcassets/img_storage.imageset/Group 9446.png differ diff --git a/Runnect-iOS/Runnect-iOS/Global/Resource/Assets.xcassets/img_storage.imageset/Group 9446@2x.png b/Runnect-iOS/Runnect-iOS/Global/Resource/Assets.xcassets/img_storage.imageset/Group 9446@2x.png new file mode 100644 index 00000000..f810d9d1 Binary files /dev/null and b/Runnect-iOS/Runnect-iOS/Global/Resource/Assets.xcassets/img_storage.imageset/Group 9446@2x.png differ diff --git a/Runnect-iOS/Runnect-iOS/Global/Resource/Assets.xcassets/img_storage.imageset/Group 9446@3x.png b/Runnect-iOS/Runnect-iOS/Global/Resource/Assets.xcassets/img_storage.imageset/Group 9446@3x.png new file mode 100644 index 00000000..c098f812 Binary files /dev/null and b/Runnect-iOS/Runnect-iOS/Global/Resource/Assets.xcassets/img_storage.imageset/Group 9446@3x.png differ diff --git a/Runnect-iOS/Runnect-iOS/Global/Resource/Assets.xcassets/img_storage.imageset/storage_img_empty.png b/Runnect-iOS/Runnect-iOS/Global/Resource/Assets.xcassets/img_storage.imageset/storage_img_empty.png deleted file mode 100644 index 37e437d5..00000000 Binary files a/Runnect-iOS/Runnect-iOS/Global/Resource/Assets.xcassets/img_storage.imageset/storage_img_empty.png and /dev/null differ diff --git a/Runnect-iOS/Runnect-iOS/Global/Resource/Assets.xcassets/img_storage.imageset/storage_img_empty@2x.png b/Runnect-iOS/Runnect-iOS/Global/Resource/Assets.xcassets/img_storage.imageset/storage_img_empty@2x.png deleted file mode 100644 index 26f6f41d..00000000 Binary files a/Runnect-iOS/Runnect-iOS/Global/Resource/Assets.xcassets/img_storage.imageset/storage_img_empty@2x.png and /dev/null differ diff --git a/Runnect-iOS/Runnect-iOS/Global/Resource/Assets.xcassets/img_storage.imageset/storage_img_empty@3x.png b/Runnect-iOS/Runnect-iOS/Global/Resource/Assets.xcassets/img_storage.imageset/storage_img_empty@3x.png deleted file mode 100644 index 23180c87..00000000 Binary files a/Runnect-iOS/Runnect-iOS/Global/Resource/Assets.xcassets/img_storage.imageset/storage_img_empty@3x.png and /dev/null differ diff --git a/Runnect-iOS/Runnect-iOS/Global/UIComponents/CustomAlertVC.swift b/Runnect-iOS/Runnect-iOS/Global/UIComponents/CustomAlertVC.swift index 307e5116..96ff2f46 100644 --- a/Runnect-iOS/Runnect-iOS/Global/UIComponents/CustomAlertVC.swift +++ b/Runnect-iOS/Runnect-iOS/Global/UIComponents/CustomAlertVC.swift @@ -103,6 +103,8 @@ extension CustomAlertVC { alertImageView.snp.makeConstraints { make in make.top.equalToSuperview().inset(38) make.centerX.equalToSuperview() + make.width.equalTo(189) + make.height.equalTo(169) } contentsLabel.snp.makeConstraints { make in diff --git a/Runnect-iOS/Runnect-iOS/Global/UIComponents/CustomBottomSheetVC.swift b/Runnect-iOS/Runnect-iOS/Global/UIComponents/CustomBottomSheetVC.swift index 662fa560..611dda82 100644 --- a/Runnect-iOS/Runnect-iOS/Global/UIComponents/CustomBottomSheetVC.swift +++ b/Runnect-iOS/Runnect-iOS/Global/UIComponents/CustomBottomSheetVC.swift @@ -33,7 +33,7 @@ final class CustomBottomSheetVC: UIViewController { } private let mainImageView = UIImageView().then { - $0.image = ImageLiterals.imgTelescope + $0.image = ImageLiterals.imgSpaceship } private let completeButton = CustomButton(title: "기록 보러가기") @@ -84,14 +84,14 @@ extension CustomBottomSheetVC { contentsLabel.snp.makeConstraints { make in make.centerX.equalToSuperview() - make.top.equalToSuperview().inset(26) + make.top.equalToSuperview().inset(30) } mainImageView.snp.makeConstraints { make in make.centerX.equalToSuperview() - make.top.equalTo(contentsLabel.snp.bottom).offset(8) - make.width.equalTo(223) - make.height.equalTo(180) + make.top.equalTo(contentsLabel.snp.bottom).offset(24) + make.width.equalTo(267) + make.height.equalTo(158) } completeButton.snp.makeConstraints { make in diff --git a/Runnect-iOS/Runnect-iOS/Global/UIComponents/ListEmptyView.swift b/Runnect-iOS/Runnect-iOS/Global/UIComponents/ListEmptyView.swift index 28f7544e..b8d60788 100644 --- a/Runnect-iOS/Runnect-iOS/Global/UIComponents/ListEmptyView.swift +++ b/Runnect-iOS/Runnect-iOS/Global/UIComponents/ListEmptyView.swift @@ -38,7 +38,7 @@ final class ListEmptyView: UIView { ).then { $0.axis = .vertical $0.alignment = .center - $0.spacing = 22 + $0.spacing = 24 } // MARK: - initialization @@ -89,6 +89,10 @@ extension ListEmptyView { make.leading.trailing.equalToSuperview() } + mainImageView.snp.makeConstraints { make in + make.width.height.equalTo(148) + } + containerStackView.snp.makeConstraints { make in make.edges.equalToSuperview() } diff --git a/Runnect-iOS/Runnect-iOS/Presentation/MyPage/VC/InfoVC/GoalRewardInfoVC.swift b/Runnect-iOS/Runnect-iOS/Presentation/MyPage/VC/InfoVC/GoalRewardInfoVC.swift index af4451db..472deefd 100644 --- a/Runnect-iOS/Runnect-iOS/Presentation/MyPage/VC/InfoVC/GoalRewardInfoVC.swift +++ b/Runnect-iOS/Runnect-iOS/Presentation/MyPage/VC/InfoVC/GoalRewardInfoVC.swift @@ -98,21 +98,21 @@ extension GoalRewardInfoVC { stampTopView.snp.makeConstraints { make in make.top.equalTo(navibar.snp.bottom) make.leading.trailing.equalTo(view.safeAreaLayoutGuide) - make.height.equalTo(235) } stampTopView.addSubviews(stampImage, stampExcourageLabel) stampImage.snp.makeConstraints { make in - make.top.equalToSuperview() + make.top.equalToSuperview().inset(18) make.centerX.equalToSuperview() - make.width.equalTo(181) - make.height.equalTo(167) + make.width.equalTo(139) + make.height.equalTo(126) } stampExcourageLabel.snp.makeConstraints { make in - make.top.equalTo(stampImage.snp.bottom).offset(16) + make.top.equalTo(stampImage.snp.bottom).offset(32) make.centerX.equalToSuperview() + make.bottom.equalToSuperview().inset(37) } stampCollectionView.snp.makeConstraints { make in diff --git a/Runnect-iOS/Runnect-iOS/Presentation/Running/VC/RunningRecordVC.swift b/Runnect-iOS/Runnect-iOS/Presentation/Running/VC/RunningRecordVC.swift index b524114d..8b41dc2f 100644 --- a/Runnect-iOS/Runnect-iOS/Presentation/Running/VC/RunningRecordVC.swift +++ b/Runnect-iOS/Runnect-iOS/Presentation/Running/VC/RunningRecordVC.swift @@ -169,8 +169,6 @@ extension RunningRecordVC { private func setLayout() { view.addSubviews(naviBar, scrollView, saveButton) scrollView.addSubviews(contentView) - - setContentViewLayout() naviBar.snp.makeConstraints { make in make.leading.top.trailing.equalTo(view.safeAreaLayoutGuide) @@ -180,7 +178,7 @@ extension RunningRecordVC { scrollView.snp.makeConstraints { make in make.top.equalTo(naviBar.snp.bottom) make.leading.trailing.equalTo(view.safeAreaLayoutGuide) - make.bottom.equalTo(view.safeAreaLayoutGuide).inset(91) + make.bottom.equalTo(saveButton.snp.top) } contentView.snp.makeConstraints { make in @@ -188,6 +186,8 @@ extension RunningRecordVC { make.width.equalTo(scrollView.snp.width) make.height.greaterThanOrEqualTo(scrollView) } + + setContentViewLayout() saveButton.snp.makeConstraints { make in make.leading.trailing.equalTo(view.safeAreaLayoutGuide).inset(16) @@ -248,7 +248,7 @@ extension RunningRecordVC { statsContainerStackView.snp.makeConstraints { make in make.top.equalTo(dividerView.snp.bottom).offset(25) make.centerX.equalToSuperview() - make.bottom.equalToSuperview().inset(25) + make.bottom.lessThanOrEqualToSuperview().inset(25) } }