Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[My routine/feat] [My routine/refac] #20

Merged
merged 6 commits into from
Apr 6, 2021
Merged

[My routine/feat] [My routine/refac] #20

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
b3bc324
[refac] merge
minseungseon Mar 22, 2021
b4db0b1
Merge branch 'develop' of https://github.com/weekFlex/Cartier into My…
minseungseon Mar 26, 2021
339b11d
[feat] UITableView Delegate 설정 - UISwipeActionConfiguration 을 통해 수정 삭…
minseungseon Mar 26, 2021
9ec8fab
[feat] 테이블 뷰 왼쪽으로 스와이프 할 때 나오는 edit action, delete action 추가 완료
minseungseon Apr 2, 2021
17e819b
[refac] 민희님이 mention 해주신 부분 수정 --> new routine 을 footer view 로 이동
minseungseon Apr 2, 2021
db9911f
Merge branch 'develop' of https://github.com/weekFlex/Cartier into My…
minseungseon Apr 2, 2021
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
2 changes: 1 addition & 1 deletion WeekFlex/Podfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,4 +33,4 @@ SPEC CHECKSUMS:

PODFILE CHECKSUM: f8a75cd5d955ea9933e3e2065e0b955b78cacaeb

COCOAPODS: 1.10.1
COCOAPODS: 1.10.0
6 changes: 3 additions & 3 deletions WeekFlex/WeekFlex.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@
9BB52E7B25F0C2F6001C63E5 /* UIFont+Extension.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UIFont+Extension.swift"; sourceTree = "<group>"; };
9BC81A9F25FA80CB001B1D83 /* AddRoutine.storyboard */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; path = AddRoutine.storyboard; sourceTree = "<group>"; };
9E5FD60125F4CAD6008EB927 /* MyRoutine.storyboard */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; path = MyRoutine.storyboard; sourceTree = "<group>"; };
9E5FD60825F4CB33008EB927 /* MyRoutineListVC.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MyRoutineListVC.swift; sourceTree = "<group>"; };
9E5FD60825F4CB33008EB927 /* MyRoutineListVC.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MyRoutineListVC.swift; sourceTree = "<group>"; wrapsLines = 0; };
9E5FD60B25F4CBD5008EB927 /* MyRoutineAddVC.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MyRoutineAddVC.swift; sourceTree = "<group>"; };
9E5FD66426045B0C008EB927 /* UIColor+Extension.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UIColor+Extension.swift"; sourceTree = "<group>"; };
9E5FD6BF260733DF008EB927 /* UIView+Extension.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UIView+Extension.swift"; sourceTree = "<group>"; };
Expand Down Expand Up @@ -665,7 +665,7 @@
CODE_SIGN_ENTITLEMENTS = WeekFlex/WeekFlex.entitlements;
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
DEVELOPMENT_TEAM = DUQE66MABG;
DEVELOPMENT_TEAM = WFRFQ5S6AR;
INFOPLIST_FILE = WeekFlex/Info.plist;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
Expand All @@ -687,7 +687,7 @@
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
CODE_SIGN_ENTITLEMENTS = WeekFlex/WeekFlex.entitlements;
CODE_SIGN_STYLE = Automatic;
DEVELOPMENT_TEAM = DUQE66MABG;
DEVELOPMENT_TEAM = WFRFQ5S6AR;
INFOPLIST_FILE = WeekFlex/Info.plist;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
Expand Down
190 changes: 97 additions & 93 deletions WeekFlex/WeekFlex/Global/Extension/UIColor+Extension.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,97 +9,101 @@ import Foundation
import UIKit

extension UIColor {

@nonobjc class var white: UIColor {
return UIColor(white: 1.0, alpha: 1.0)
}

@nonobjc class var bgSelected: UIColor {
return UIColor(white: 245.0 / 255.0, alpha: 1.0)
}

@nonobjc class var gray1: UIColor {
return UIColor(white: 238.0 / 255.0, alpha: 1.0)
}

@nonobjc class var gray2: UIColor {
return UIColor(white: 204.0 / 255.0, alpha: 1.0)
}

@nonobjc class var gray3: UIColor {
return UIColor(red: 164.0 / 255.0, green: 164.0 / 255.0, blue: 169.0 / 255.0, alpha: 1.0)
}

@nonobjc class var gray4: UIColor {
return UIColor(white: 102.0 / 255.0, alpha: 1.0)
}

@nonobjc class var gray5: UIColor {
return UIColor(white: 51.0 / 255.0, alpha: 1.0)
}

@nonobjc class var black: UIColor {
return UIColor(white: 24.0 / 255.0, alpha: 1.0)
}

@nonobjc class var color1: UIColor {
return UIColor(red: 1.0, green: 104.0 / 255.0, blue: 104.0 / 255.0, alpha: 1.0)
}

@nonobjc class var color5: UIColor {
return UIColor(red: 244.0 / 255.0, green: 175.0 / 255.0, blue: 206.0 / 255.0, alpha: 1.0)
}

@nonobjc class var color6: UIColor {
return UIColor(red: 104.0 / 255.0, green: 79.0 / 255.0, blue: 252.0 / 255.0, alpha: 1.0)
}

@nonobjc class var color3: UIColor {
return UIColor(red: 1.0, green: 214.0 / 255.0, blue: 67.0 / 255.0, alpha: 1.0)
}

@nonobjc class var color2: UIColor {
return UIColor(red: 1.0, green: 157.0 / 255.0, blue: 67.0 / 255.0, alpha: 1.0)
}

@nonobjc class var color7: UIColor {
return UIColor(red: 141.0 / 255.0, green: 166.0 / 255.0, blue: 1.0, alpha: 1.0)
}

@nonobjc class var color8: UIColor {
return UIColor(red: 42.0 / 255.0, green: 181.0 / 255.0, blue: 241.0 / 255.0, alpha: 1.0)
}

@nonobjc class var color4: UIColor {
return UIColor(red: 249.0 / 255.0, green: 235.0 / 255.0, blue: 136.0 / 255.0, alpha: 1.0)
}

@nonobjc class var color9: UIColor {
return UIColor(red: 0.0, green: 215.0 / 255.0, blue: 121.0 / 255.0, alpha: 1.0)
}

@nonobjc class var color12: UIColor {
return UIColor(red: 77.0 / 255.0, green: 81.0 / 255.0, blue: 246.0 / 255.0, alpha: 1.0)
}

@nonobjc class var color11: UIColor {
return UIColor(red: 110.0 / 255.0, green: 201.0 / 255.0, blue: 196.0 / 255.0, alpha: 1.0)
}

@nonobjc class var color10: UIColor {
return UIColor(red: 34.0 / 255.0, green: 185.0 / 255.0, blue: 176.0 / 255.0, alpha: 1.0)
}

@nonobjc class var color13: UIColor {
return UIColor(red: 143.0 / 255.0, green: 114.0 / 255.0, blue: 225.0 / 255.0, alpha: 1.0)
}

@nonobjc class var color14: UIColor {
return UIColor(red: 1.0, green: 102.0 / 255.0, blue: 65.0 / 255.0, alpha: 1.0)
}

@nonobjc class var color15: UIColor {
return UIColor(red: 251.0 / 255.0, green: 101.0 / 255.0, blue: 209.0 / 255.0, alpha: 1.0)
}


@nonobjc class var white: UIColor {
return UIColor(white: 1.0, alpha: 1.0)
}

@nonobjc class var bgSelected: UIColor {
return UIColor(white: 245.0 / 255.0, alpha: 1.0)
}

@nonobjc class var gray1: UIColor {
return UIColor(white: 238.0 / 255.0, alpha: 1.0)
}

@nonobjc class var gray2: UIColor {
return UIColor(white: 204.0 / 255.0, alpha: 1.0)
}

@nonobjc class var gray3: UIColor {
return UIColor(red: 164.0 / 255.0, green: 164.0 / 255.0, blue: 169.0 / 255.0, alpha: 1.0)
}

@nonobjc class var gray4: UIColor {
return UIColor(white: 102.0 / 255.0, alpha: 1.0)
}

@nonobjc class var gray5: UIColor {
return UIColor(white: 51.0 / 255.0, alpha: 1.0)
}

@nonobjc class var black: UIColor {
return UIColor(white: 24.0 / 255.0, alpha: 1.0)
}

@nonobjc class var color1: UIColor {
return UIColor(red: 1.0, green: 104.0 / 255.0, blue: 104.0 / 255.0, alpha: 1.0)
}

@nonobjc class var color5: UIColor {
return UIColor(red: 244.0 / 255.0, green: 175.0 / 255.0, blue: 206.0 / 255.0, alpha: 1.0)
}

@nonobjc class var color6: UIColor {
return UIColor(red: 104.0 / 255.0, green: 79.0 / 255.0, blue: 252.0 / 255.0, alpha: 1.0)
}

@nonobjc class var color3: UIColor {
return UIColor(red: 1.0, green: 214.0 / 255.0, blue: 67.0 / 255.0, alpha: 1.0)
}

@nonobjc class var color2: UIColor {
return UIColor(red: 1.0, green: 157.0 / 255.0, blue: 67.0 / 255.0, alpha: 1.0)
}

@nonobjc class var color7: UIColor {
return UIColor(red: 141.0 / 255.0, green: 166.0 / 255.0, blue: 1.0, alpha: 1.0)
}

@nonobjc class var color8: UIColor {
return UIColor(red: 42.0 / 255.0, green: 181.0 / 255.0, blue: 241.0 / 255.0, alpha: 1.0)
}

@nonobjc class var color4: UIColor {
return UIColor(red: 249.0 / 255.0, green: 235.0 / 255.0, blue: 136.0 / 255.0, alpha: 1.0)
}

@nonobjc class var color9: UIColor {
return UIColor(red: 0.0, green: 215.0 / 255.0, blue: 121.0 / 255.0, alpha: 1.0)
}

@nonobjc class var color12: UIColor {
return UIColor(red: 77.0 / 255.0, green: 81.0 / 255.0, blue: 246.0 / 255.0, alpha: 1.0)
}

@nonobjc class var color11: UIColor {
return UIColor(red: 110.0 / 255.0, green: 201.0 / 255.0, blue: 196.0 / 255.0, alpha: 1.0)
}

@nonobjc class var color10: UIColor {
return UIColor(red: 34.0 / 255.0, green: 185.0 / 255.0, blue: 176.0 / 255.0, alpha: 1.0)
}

@nonobjc class var color13: UIColor {
return UIColor(red: 143.0 / 255.0, green: 114.0 / 255.0, blue: 225.0 / 255.0, alpha: 1.0)
}

@nonobjc class var color14: UIColor {
return UIColor(red: 1.0, green: 102.0 / 255.0, blue: 65.0 / 255.0, alpha: 1.0)
}

@nonobjc class var color15: UIColor {
return UIColor(red: 251.0 / 255.0, green: 101.0 / 255.0, blue: 209.0 / 255.0, alpha: 1.0)
}

@nonobjc class var lightSalmon: UIColor {
return UIColor(red: 1.0, green: 153.0 / 255.0, blue: 153.0 / 255.0, alpha: 1.0)
}

}
2 changes: 1 addition & 1 deletion WeekFlex/WeekFlex/Info.plist
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
<key>UISceneDelegateClassName</key>
<string>$(PRODUCT_MODULE_NAME).SceneDelegate</string>
<key>UISceneStoryboardFile</key>
<string>Main</string>
<string>MyRoutine</string>
</dict>
</array>
</dict>
Expand Down
10 changes: 5 additions & 5 deletions WeekFlex/WeekFlex/Screen/MyRoutine/Cell/MyRoutineListItemTableViewCell.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,11 +31,11 @@ class MyRoutineListItemTableViewCell: UITableViewCell {
super.setSelected(selected, animated: animated)
}

override func layoutSubviews() {
super.layoutSubviews()
let bottomSpace: CGFloat = 8
self.contentView.frame = self.contentView.frame.inset(by: UIEdgeInsets(top: 0, left: 0, bottom: bottomSpace, right: 0))
}
// override func layoutSubviews() {
// super.layoutSubviews()
// let bottomSpace: CGFloat = 8
// self.contentView.frame = self.contentView.frame.inset(by: UIEdgeInsets(top: 0, left: 0, bottom: bottomSpace, right: 0))
// }

// MARK: Function

Expand Down
Loading