Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions Runnect-iOS/.swiftlint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ disabled_rules:
- type_name
- legacy_constructor
- unused_setter_value
- force_try

included:
- Runnect-iOS
Expand Down
1 change: 1 addition & 0 deletions Runnect-iOS/Runnect-iOS/Global/Literal/ImageLiterals.swift
Original file line number Diff line number Diff line change
Expand Up @@ -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") }
}

Expand Down
Original file line number Diff line number Diff line change
@@ -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"
}
Expand Down
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.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -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
}
}
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,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"
}
Expand Down
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.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -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"
}
Expand Down
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.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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: "기록 보러가기")
Expand Down Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ final class ListEmptyView: UIView {
).then {
$0.axis = .vertical
$0.alignment = .center
$0.spacing = 22
$0.spacing = 24
}

// MARK: - initialization
Expand Down Expand Up @@ -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()
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -180,14 +178,16 @@ 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
make.edges.equalTo(scrollView.contentLayoutGuide)
make.width.equalTo(scrollView.snp.width)
make.height.greaterThanOrEqualTo(scrollView)
}

setContentViewLayout()

saveButton.snp.makeConstraints { make in
make.leading.trailing.equalTo(view.safeAreaLayoutGuide).inset(16)
Expand Down Expand Up @@ -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)
}
}

Expand Down