diff --git a/Weekand/Weekand/Domain/Enum/Status.swift b/Weekand/Weekand/Domain/Enum/Status.swift index c7ec316e..3f553130 100644 --- a/Weekand/Weekand/Domain/Enum/Status.swift +++ b/Weekand/Weekand/Domain/Enum/Status.swift @@ -10,7 +10,7 @@ import UIKit /// 일정 상태 정보 enum Status: String { - case upcoming = "UNCOMPLETED" + case upcoming = "NOT_YET" case completed = "COMPLETED" case incompleted = "INCOMPLETED" case undetermined = "UNDETERMINED" diff --git a/Weekand/Weekand/Presentation/MainScene/Common/View/WCategoryTitleLabel.swift b/Weekand/Weekand/Presentation/MainScene/Common/View/WCategoryTitleLabel.swift index 79ccdc3b..c28f4516 100644 --- a/Weekand/Weekand/Presentation/MainScene/Common/View/WCategoryTitleLabel.swift +++ b/Weekand/Weekand/Presentation/MainScene/Common/View/WCategoryTitleLabel.swift @@ -24,10 +24,10 @@ class WCategoryTitleLabel: WIconLabel { self.label.font = WFont.body1() self.label.textColor = .gray900 - self.stack.spacing = 7 + self.stack.spacing = 0 icon.snp.makeConstraints { make in - make.height.equalTo(10) + make.height.equalTo(24) make.width.equalTo(icon.snp.height) } @@ -47,7 +47,13 @@ class WCategoryTitleLabel: WIconLabel { extension WCategoryTitleLabel { public func editValue(color: UIColor, title: String) { - self.icon.backgroundColor = color + + if let categoryBox = UIImage(named: "box.filled")?.withTintColor(color) { + self.icon.image = categoryBox + } else { + self.icon.backgroundColor = color + } + self.label.text = title } } diff --git a/Weekand/Weekand/Presentation/MainScene/Common/View/WIconLabel.swift b/Weekand/Weekand/Presentation/MainScene/Common/View/WIconLabel.swift index b163de2f..8b8caca0 100644 --- a/Weekand/Weekand/Presentation/MainScene/Common/View/WIconLabel.swift +++ b/Weekand/Weekand/Presentation/MainScene/Common/View/WIconLabel.swift @@ -14,7 +14,7 @@ class WIconLabel: UIView { lazy var icon = UIImageView().then { $0.setContentHuggingPriority(.required, for: .vertical) - $0.contentMode = .scaleAspectFit + $0.contentMode = .scaleAspectFill } lazy var label = UILabel().then { $0.textAlignment = .left @@ -26,14 +26,14 @@ class WIconLabel: UIView { $0.addArrangedSubview(label) icon.snp.makeConstraints { make in - make.height.lessThanOrEqualTo(label.snp.height) make.width.equalTo(icon.snp.height) + make.centerY.equalToSuperview() } $0.axis = .horizontal $0.distribution = .fill $0.alignment = .center - $0.spacing = 5 + $0.spacing = 10 } override init(frame: CGRect) { diff --git a/Weekand/Weekand/Presentation/MainScene/Common/View/WStatusTimeLabel.swift b/Weekand/Weekand/Presentation/MainScene/Common/View/WStatusTimeLabel.swift index 13429d17..b95a1ec7 100644 --- a/Weekand/Weekand/Presentation/MainScene/Common/View/WStatusTimeLabel.swift +++ b/Weekand/Weekand/Presentation/MainScene/Common/View/WStatusTimeLabel.swift @@ -23,6 +23,11 @@ class WStatusTimeLabel: WIconLabel { self.label.font = WFont.body2() self.label.textColor = .gray400 + self.stack.spacing = 0 + + self.icon.snp.makeConstraints { make in + make.height.equalTo(24) + } } init(status: StatusIcon, title: String) { diff --git a/Weekand/Weekand/Presentation/MainScene/Main/View/MainViewController.swift b/Weekand/Weekand/Presentation/MainScene/Main/View/MainViewController.swift index 159c4bf7..e34a0f66 100644 --- a/Weekand/Weekand/Presentation/MainScene/Main/View/MainViewController.swift +++ b/Weekand/Weekand/Presentation/MainScene/Main/View/MainViewController.swift @@ -30,9 +30,16 @@ class MainViewController: UIViewController { var headerView = MainViewHeader() var tableView: UITableView! - lazy var foldButton = UIBarButtonItem(image: UIImage(named: "emptyImage")!, style: .plain, target: self, action: nil) + lazy var foldButton = UIBarButtonItem(image: UIImage(named: "emptyImage")!, style: .plain, target: self, action: nil).then { + let foldButtonImage = UIImage(named: "chevron.up") ?? UIImage(systemName: "chevron.up") + $0.setBackgroundImage(foldButtonImage?.withTintColor(.gray900), for: .normal, barMetrics: .default) + } lazy var searchButton = UIBarButtonItem(image: UIImage(named: "search") ?? UIImage(systemName: "magnifyingglass"), style: .plain, target: self, action: nil) lazy var alarmButton = UIBarButtonItem(image: UIImage(named: "alarm") ?? UIImage(systemName: "bell"), style: .plain, target: self, action: nil) + let spacer = UIBarButtonItem(barButtonSystemItem: .fixedSpace, target: nil, action: nil).then { + $0.width = 4 + } + lazy var floatingButton = UIButton().then { $0.backgroundColor = .mainColor @@ -67,10 +74,9 @@ class MainViewController: UIViewController { private func configureUI() { // Navigation Bar - let foldButtonImage = UIImage(named: "chevron.up") ?? UIImage(systemName: "chevron.up") - foldButton.setBackgroundImage(foldButtonImage?.withTintColor(.gray900), for: .normal, barMetrics: .default) - navigationItem.leftBarButtonItem = foldButton - navigationItem.rightBarButtonItems = [alarmButton, searchButton] + + navigationItem.setLeftBarButtonItems([spacer, foldButton], animated: false) + navigationItem.rightBarButtonItems = [spacer, alarmButton, searchButton] // Content View [ collectionView, headerView, tableView ].forEach { self.view.addSubview($0) } @@ -409,7 +415,7 @@ extension MainViewController { } if let safeImage = buttonImage { - navigationItem.leftBarButtonItem?.setBackgroundImage(safeImage.withTintColor(.gray900), for: .normal, barMetrics: .default) + foldButton.setBackgroundImage(safeImage.withTintColor(.gray900), for: .normal, barMetrics: .default) } UIView.animate(withDuration: 0.25) { diff --git a/Weekand/Weekand/Presentation/ProfileScene/Profile/ViewModel/ProfileViewModel.swift b/Weekand/Weekand/Presentation/ProfileScene/Profile/ViewModel/ProfileViewModel.swift index d3ce58d1..9281ea83 100644 --- a/Weekand/Weekand/Presentation/ProfileScene/Profile/ViewModel/ProfileViewModel.swift +++ b/Weekand/Weekand/Presentation/ProfileScene/Profile/ViewModel/ProfileViewModel.swift @@ -21,7 +21,7 @@ class ProfileViewModel: ViewModelType { private let profileUseCase: ProfileUseCase private let disposeBag = DisposeBag() - var userDeatil = BehaviorRelay(value: UserDetail.defaultData) + var userDeatil = PublishRelay() var buttonState = BehaviorRelay(value: ProfileButtonType.edit) var errorMessage = BehaviorRelay(value: nil) @@ -169,6 +169,7 @@ extension ProfileViewModel { }, onFailure: { error in print("\(#function) Error: \(error)") self.errorMessage.accept("\(error)") + self.userDeatil.accept(UserDetail.defaultData) }, onDisposed: nil) .disposed(by: disposeBag) } @@ -177,7 +178,7 @@ extension ProfileViewModel { private func followUser(id: String) { self.profileUseCase.createFollowee(id: id).subscribe(onSuccess: { _ in - BehaviorRelay.just(.following).bind(to: self.buttonState).disposed(by: self.disposeBag) + self.buttonState.accept(.following) }, onFailure: { error in print("\(#function) Error: \(error)") self.errorMessage.accept("\(error)") @@ -190,7 +191,7 @@ extension ProfileViewModel { private func unfollowUser(id: String) { self.profileUseCase.deleteFollowee(id: id).subscribe(onSuccess: { _ in - BehaviorRelay.just(.follow).bind(to: self.buttonState).disposed(by: self.disposeBag) + self.buttonState.accept(.follow) }, onFailure: { error in print("\(#function) Error: \(error)") diff --git a/Weekand/Weekand/Resources/Assets.xcassets/Symbols/Information/box.filled.imageset/Contents.json b/Weekand/Weekand/Resources/Assets.xcassets/Symbols/Information/box.filled.imageset/Contents.json new file mode 100644 index 00000000..61e8851c --- /dev/null +++ b/Weekand/Weekand/Resources/Assets.xcassets/Symbols/Information/box.filled.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "rectangle.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "rectangle@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "rectangle@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Weekand/Weekand/Resources/Assets.xcassets/Symbols/Information/box.filled.imageset/rectangle.png b/Weekand/Weekand/Resources/Assets.xcassets/Symbols/Information/box.filled.imageset/rectangle.png new file mode 100644 index 00000000..1e732950 Binary files /dev/null and b/Weekand/Weekand/Resources/Assets.xcassets/Symbols/Information/box.filled.imageset/rectangle.png differ diff --git a/Weekand/Weekand/Resources/Assets.xcassets/Symbols/Information/box.filled.imageset/rectangle@2x.png b/Weekand/Weekand/Resources/Assets.xcassets/Symbols/Information/box.filled.imageset/rectangle@2x.png new file mode 100644 index 00000000..b6b66126 Binary files /dev/null and b/Weekand/Weekand/Resources/Assets.xcassets/Symbols/Information/box.filled.imageset/rectangle@2x.png differ diff --git a/Weekand/Weekand/Resources/Assets.xcassets/Symbols/Information/box.filled.imageset/rectangle@3x.png b/Weekand/Weekand/Resources/Assets.xcassets/Symbols/Information/box.filled.imageset/rectangle@3x.png new file mode 100644 index 00000000..88bd5e20 Binary files /dev/null and b/Weekand/Weekand/Resources/Assets.xcassets/Symbols/Information/box.filled.imageset/rectangle@3x.png differ diff --git a/Weekand/Weekand/Resources/Assets.xcassets/Symbols/State/state.completed.imageset/Contents.json b/Weekand/Weekand/Resources/Assets.xcassets/Symbols/State/state.completed.imageset/Contents.json index 915ffe64..931fa322 100644 --- a/Weekand/Weekand/Resources/Assets.xcassets/Symbols/State/state.completed.imageset/Contents.json +++ b/Weekand/Weekand/Resources/Assets.xcassets/Symbols/State/state.completed.imageset/Contents.json @@ -1,17 +1,17 @@ { "images" : [ { - "filename" : "state.completed.png", + "filename" : "work_completed.png", "idiom" : "universal", "scale" : "1x" }, { - "filename" : "state.completed2x.png", + "filename" : "work_completed@2x.png", "idiom" : "universal", "scale" : "2x" }, { - "filename" : "state.completed3x.png", + "filename" : "work_completed@3x.png", "idiom" : "universal", "scale" : "3x" } diff --git a/Weekand/Weekand/Resources/Assets.xcassets/Symbols/State/state.completed.imageset/state.completed.png b/Weekand/Weekand/Resources/Assets.xcassets/Symbols/State/state.completed.imageset/state.completed.png deleted file mode 100644 index 54583be6..00000000 Binary files a/Weekand/Weekand/Resources/Assets.xcassets/Symbols/State/state.completed.imageset/state.completed.png and /dev/null differ diff --git a/Weekand/Weekand/Resources/Assets.xcassets/Symbols/State/state.completed.imageset/state.completed2x.png b/Weekand/Weekand/Resources/Assets.xcassets/Symbols/State/state.completed.imageset/state.completed2x.png deleted file mode 100644 index 12b22cbc..00000000 Binary files a/Weekand/Weekand/Resources/Assets.xcassets/Symbols/State/state.completed.imageset/state.completed2x.png and /dev/null differ diff --git a/Weekand/Weekand/Resources/Assets.xcassets/Symbols/State/state.completed.imageset/state.completed3x.png b/Weekand/Weekand/Resources/Assets.xcassets/Symbols/State/state.completed.imageset/state.completed3x.png deleted file mode 100644 index 5a25febb..00000000 Binary files a/Weekand/Weekand/Resources/Assets.xcassets/Symbols/State/state.completed.imageset/state.completed3x.png and /dev/null differ diff --git a/Weekand/Weekand/Resources/Assets.xcassets/Symbols/State/state.completed.imageset/work_completed.png b/Weekand/Weekand/Resources/Assets.xcassets/Symbols/State/state.completed.imageset/work_completed.png new file mode 100644 index 00000000..8d48afed Binary files /dev/null and b/Weekand/Weekand/Resources/Assets.xcassets/Symbols/State/state.completed.imageset/work_completed.png differ diff --git a/Weekand/Weekand/Resources/Assets.xcassets/Symbols/State/state.completed.imageset/work_completed@2x.png b/Weekand/Weekand/Resources/Assets.xcassets/Symbols/State/state.completed.imageset/work_completed@2x.png new file mode 100644 index 00000000..4e876064 Binary files /dev/null and b/Weekand/Weekand/Resources/Assets.xcassets/Symbols/State/state.completed.imageset/work_completed@2x.png differ diff --git a/Weekand/Weekand/Resources/Assets.xcassets/Symbols/State/state.completed.imageset/work_completed@3x.png b/Weekand/Weekand/Resources/Assets.xcassets/Symbols/State/state.completed.imageset/work_completed@3x.png new file mode 100644 index 00000000..ba5d8703 Binary files /dev/null and b/Weekand/Weekand/Resources/Assets.xcassets/Symbols/State/state.completed.imageset/work_completed@3x.png differ diff --git a/Weekand/Weekand/Resources/Assets.xcassets/Symbols/State/state.hold.imageset/Contents.json b/Weekand/Weekand/Resources/Assets.xcassets/Symbols/State/state.hold.imageset/Contents.json index 3e238ad2..8a968e55 100644 --- a/Weekand/Weekand/Resources/Assets.xcassets/Symbols/State/state.hold.imageset/Contents.json +++ b/Weekand/Weekand/Resources/Assets.xcassets/Symbols/State/state.hold.imageset/Contents.json @@ -1,17 +1,17 @@ { "images" : [ { - "filename" : "state.hold.png", + "filename" : "work_beforecheck.png", "idiom" : "universal", "scale" : "1x" }, { - "filename" : "state.hold2x.png", + "filename" : "work_beforecheck@2x.png", "idiom" : "universal", "scale" : "2x" }, { - "filename" : "state.hold3x.png", + "filename" : "work_beforecheck@3x.png", "idiom" : "universal", "scale" : "3x" } diff --git a/Weekand/Weekand/Resources/Assets.xcassets/Symbols/State/state.hold.imageset/state.hold.png b/Weekand/Weekand/Resources/Assets.xcassets/Symbols/State/state.hold.imageset/state.hold.png deleted file mode 100644 index bcd320d2..00000000 Binary files a/Weekand/Weekand/Resources/Assets.xcassets/Symbols/State/state.hold.imageset/state.hold.png and /dev/null differ diff --git a/Weekand/Weekand/Resources/Assets.xcassets/Symbols/State/state.hold.imageset/state.hold2x.png b/Weekand/Weekand/Resources/Assets.xcassets/Symbols/State/state.hold.imageset/state.hold2x.png deleted file mode 100644 index 05dc625c..00000000 Binary files a/Weekand/Weekand/Resources/Assets.xcassets/Symbols/State/state.hold.imageset/state.hold2x.png and /dev/null differ diff --git a/Weekand/Weekand/Resources/Assets.xcassets/Symbols/State/state.hold.imageset/state.hold3x.png b/Weekand/Weekand/Resources/Assets.xcassets/Symbols/State/state.hold.imageset/state.hold3x.png deleted file mode 100644 index bbda757f..00000000 Binary files a/Weekand/Weekand/Resources/Assets.xcassets/Symbols/State/state.hold.imageset/state.hold3x.png and /dev/null differ diff --git a/Weekand/Weekand/Resources/Assets.xcassets/Symbols/State/state.hold.imageset/work_beforecheck.png b/Weekand/Weekand/Resources/Assets.xcassets/Symbols/State/state.hold.imageset/work_beforecheck.png new file mode 100644 index 00000000..3115cb9e Binary files /dev/null and b/Weekand/Weekand/Resources/Assets.xcassets/Symbols/State/state.hold.imageset/work_beforecheck.png differ diff --git a/Weekand/Weekand/Resources/Assets.xcassets/Symbols/State/state.hold.imageset/work_beforecheck@2x.png b/Weekand/Weekand/Resources/Assets.xcassets/Symbols/State/state.hold.imageset/work_beforecheck@2x.png new file mode 100644 index 00000000..80a533a0 Binary files /dev/null and b/Weekand/Weekand/Resources/Assets.xcassets/Symbols/State/state.hold.imageset/work_beforecheck@2x.png differ diff --git a/Weekand/Weekand/Resources/Assets.xcassets/Symbols/State/state.hold.imageset/work_beforecheck@3x.png b/Weekand/Weekand/Resources/Assets.xcassets/Symbols/State/state.hold.imageset/work_beforecheck@3x.png new file mode 100644 index 00000000..068d75e9 Binary files /dev/null and b/Weekand/Weekand/Resources/Assets.xcassets/Symbols/State/state.hold.imageset/work_beforecheck@3x.png differ diff --git a/Weekand/Weekand/Resources/Assets.xcassets/Symbols/State/state.incomplete.imageset/Contents.json b/Weekand/Weekand/Resources/Assets.xcassets/Symbols/State/state.incomplete.imageset/Contents.json index 07ce8a64..9589b39e 100644 --- a/Weekand/Weekand/Resources/Assets.xcassets/Symbols/State/state.incomplete.imageset/Contents.json +++ b/Weekand/Weekand/Resources/Assets.xcassets/Symbols/State/state.incomplete.imageset/Contents.json @@ -1,17 +1,17 @@ { "images" : [ { - "filename" : "state.incomplete.png", + "filename" : "work_uncompleted.png", "idiom" : "universal", "scale" : "1x" }, { - "filename" : "state.incomplete2x.png", + "filename" : "work_uncompleted@2x.png", "idiom" : "universal", "scale" : "2x" }, { - "filename" : "state.incomplete3x.png", + "filename" : "work_uncompleted@3x.png", "idiom" : "universal", "scale" : "3x" } diff --git a/Weekand/Weekand/Resources/Assets.xcassets/Symbols/State/state.incomplete.imageset/state.incomplete.png b/Weekand/Weekand/Resources/Assets.xcassets/Symbols/State/state.incomplete.imageset/work_uncompleted.png similarity index 100% rename from Weekand/Weekand/Resources/Assets.xcassets/Symbols/State/state.incomplete.imageset/state.incomplete.png rename to Weekand/Weekand/Resources/Assets.xcassets/Symbols/State/state.incomplete.imageset/work_uncompleted.png diff --git a/Weekand/Weekand/Resources/Assets.xcassets/Symbols/State/state.incomplete.imageset/state.incomplete2x.png b/Weekand/Weekand/Resources/Assets.xcassets/Symbols/State/state.incomplete.imageset/work_uncompleted@2x.png similarity index 100% rename from Weekand/Weekand/Resources/Assets.xcassets/Symbols/State/state.incomplete.imageset/state.incomplete2x.png rename to Weekand/Weekand/Resources/Assets.xcassets/Symbols/State/state.incomplete.imageset/work_uncompleted@2x.png diff --git a/Weekand/Weekand/Resources/Assets.xcassets/Symbols/State/state.incomplete.imageset/state.incomplete3x.png b/Weekand/Weekand/Resources/Assets.xcassets/Symbols/State/state.incomplete.imageset/work_uncompleted@3x.png similarity index 100% rename from Weekand/Weekand/Resources/Assets.xcassets/Symbols/State/state.incomplete.imageset/state.incomplete3x.png rename to Weekand/Weekand/Resources/Assets.xcassets/Symbols/State/state.incomplete.imageset/work_uncompleted@3x.png diff --git a/Weekand/Weekand/Resources/Assets.xcassets/Symbols/State/state.proceeding.imageset/Contents.json b/Weekand/Weekand/Resources/Assets.xcassets/Symbols/State/state.proceeding.imageset/Contents.json index e931f891..bce83e6a 100644 --- a/Weekand/Weekand/Resources/Assets.xcassets/Symbols/State/state.proceeding.imageset/Contents.json +++ b/Weekand/Weekand/Resources/Assets.xcassets/Symbols/State/state.proceeding.imageset/Contents.json @@ -1,17 +1,17 @@ { "images" : [ { - "filename" : "state.proceeding.png", + "filename" : "work_ongoing.png", "idiom" : "universal", "scale" : "1x" }, { - "filename" : "state.proceeding2x.png", + "filename" : "work_ongoing@2x.png", "idiom" : "universal", "scale" : "2x" }, { - "filename" : "state.proceeding3x.png", + "filename" : "work_ongoing@3x.png", "idiom" : "universal", "scale" : "3x" } diff --git a/Weekand/Weekand/Resources/Assets.xcassets/Symbols/State/state.proceeding.imageset/state.proceeding.png b/Weekand/Weekand/Resources/Assets.xcassets/Symbols/State/state.proceeding.imageset/state.proceeding.png deleted file mode 100644 index 68e9e523..00000000 Binary files a/Weekand/Weekand/Resources/Assets.xcassets/Symbols/State/state.proceeding.imageset/state.proceeding.png and /dev/null differ diff --git a/Weekand/Weekand/Resources/Assets.xcassets/Symbols/State/state.proceeding.imageset/state.proceeding2x.png b/Weekand/Weekand/Resources/Assets.xcassets/Symbols/State/state.proceeding.imageset/state.proceeding2x.png deleted file mode 100644 index 46673cc6..00000000 Binary files a/Weekand/Weekand/Resources/Assets.xcassets/Symbols/State/state.proceeding.imageset/state.proceeding2x.png and /dev/null differ diff --git a/Weekand/Weekand/Resources/Assets.xcassets/Symbols/State/state.proceeding.imageset/state.proceeding3x.png b/Weekand/Weekand/Resources/Assets.xcassets/Symbols/State/state.proceeding.imageset/state.proceeding3x.png deleted file mode 100644 index ba42895d..00000000 Binary files a/Weekand/Weekand/Resources/Assets.xcassets/Symbols/State/state.proceeding.imageset/state.proceeding3x.png and /dev/null differ diff --git a/Weekand/Weekand/Resources/Assets.xcassets/Symbols/State/state.proceeding.imageset/work_ongoing.png b/Weekand/Weekand/Resources/Assets.xcassets/Symbols/State/state.proceeding.imageset/work_ongoing.png new file mode 100644 index 00000000..f60a92f0 Binary files /dev/null and b/Weekand/Weekand/Resources/Assets.xcassets/Symbols/State/state.proceeding.imageset/work_ongoing.png differ diff --git a/Weekand/Weekand/Resources/Assets.xcassets/Symbols/State/state.proceeding.imageset/work_ongoing@2x.png b/Weekand/Weekand/Resources/Assets.xcassets/Symbols/State/state.proceeding.imageset/work_ongoing@2x.png new file mode 100644 index 00000000..e56a0a80 Binary files /dev/null and b/Weekand/Weekand/Resources/Assets.xcassets/Symbols/State/state.proceeding.imageset/work_ongoing@2x.png differ diff --git a/Weekand/Weekand/Resources/Assets.xcassets/Symbols/State/state.proceeding.imageset/work_ongoing@3x.png b/Weekand/Weekand/Resources/Assets.xcassets/Symbols/State/state.proceeding.imageset/work_ongoing@3x.png new file mode 100644 index 00000000..673ac3ab Binary files /dev/null and b/Weekand/Weekand/Resources/Assets.xcassets/Symbols/State/state.proceeding.imageset/work_ongoing@3x.png differ diff --git a/Weekand/Weekand/Resources/Assets.xcassets/Symbols/State/state.upcomming.imageset/Contents.json b/Weekand/Weekand/Resources/Assets.xcassets/Symbols/State/state.upcomming.imageset/Contents.json index a7c9150c..37e9a0a7 100644 --- a/Weekand/Weekand/Resources/Assets.xcassets/Symbols/State/state.upcomming.imageset/Contents.json +++ b/Weekand/Weekand/Resources/Assets.xcassets/Symbols/State/state.upcomming.imageset/Contents.json @@ -1,17 +1,17 @@ { "images" : [ { - "filename" : "state.upcomming.png", + "filename" : "work_prearranged.png", "idiom" : "universal", "scale" : "1x" }, { - "filename" : "state.upcomming2x.png", + "filename" : "work_prearranged@2x.png", "idiom" : "universal", "scale" : "2x" }, { - "filename" : "state.upcomming3x.png", + "filename" : "work_prearranged@3x.png", "idiom" : "universal", "scale" : "3x" } diff --git a/Weekand/Weekand/Resources/Assets.xcassets/Symbols/State/state.upcomming.imageset/state.upcomming.png b/Weekand/Weekand/Resources/Assets.xcassets/Symbols/State/state.upcomming.imageset/work_prearranged.png similarity index 100% rename from Weekand/Weekand/Resources/Assets.xcassets/Symbols/State/state.upcomming.imageset/state.upcomming.png rename to Weekand/Weekand/Resources/Assets.xcassets/Symbols/State/state.upcomming.imageset/work_prearranged.png diff --git a/Weekand/Weekand/Resources/Assets.xcassets/Symbols/State/state.upcomming.imageset/state.upcomming2x.png b/Weekand/Weekand/Resources/Assets.xcassets/Symbols/State/state.upcomming.imageset/work_prearranged@2x.png similarity index 100% rename from Weekand/Weekand/Resources/Assets.xcassets/Symbols/State/state.upcomming.imageset/state.upcomming2x.png rename to Weekand/Weekand/Resources/Assets.xcassets/Symbols/State/state.upcomming.imageset/work_prearranged@2x.png diff --git a/Weekand/Weekand/Resources/Assets.xcassets/Symbols/State/state.upcomming.imageset/state.upcomming3x.png b/Weekand/Weekand/Resources/Assets.xcassets/Symbols/State/state.upcomming.imageset/work_prearranged@3x.png similarity index 100% rename from Weekand/Weekand/Resources/Assets.xcassets/Symbols/State/state.upcomming.imageset/state.upcomming3x.png rename to Weekand/Weekand/Resources/Assets.xcassets/Symbols/State/state.upcomming.imageset/work_prearranged@3x.png diff --git a/Weekand/Weekand/Resources/Assets.xcassets/Symbols/User Input/radio.disabled.imageset/Contents.json b/Weekand/Weekand/Resources/Assets.xcassets/Symbols/User Input/radio.disabled.imageset/Contents.json index c4aba994..e2fc2492 100644 --- a/Weekand/Weekand/Resources/Assets.xcassets/Symbols/User Input/radio.disabled.imageset/Contents.json +++ b/Weekand/Weekand/Resources/Assets.xcassets/Symbols/User Input/radio.disabled.imageset/Contents.json @@ -6,12 +6,12 @@ "scale" : "1x" }, { - "filename" : "radio_disabled2x.png", + "filename" : "radio_disabled@2x.png", "idiom" : "universal", "scale" : "2x" }, { - "filename" : "radio_disabled3x.png", + "filename" : "radio_disabled@3x.png", "idiom" : "universal", "scale" : "3x" } diff --git a/Weekand/Weekand/Resources/Assets.xcassets/Symbols/User Input/radio.disabled.imageset/radio_disabled.png b/Weekand/Weekand/Resources/Assets.xcassets/Symbols/User Input/radio.disabled.imageset/radio_disabled.png index dd6b5410..1253acf0 100644 Binary files a/Weekand/Weekand/Resources/Assets.xcassets/Symbols/User Input/radio.disabled.imageset/radio_disabled.png and b/Weekand/Weekand/Resources/Assets.xcassets/Symbols/User Input/radio.disabled.imageset/radio_disabled.png differ diff --git a/Weekand/Weekand/Resources/Assets.xcassets/Symbols/User Input/radio.disabled.imageset/radio_disabled2x.png b/Weekand/Weekand/Resources/Assets.xcassets/Symbols/User Input/radio.disabled.imageset/radio_disabled2x.png deleted file mode 100644 index 7580bd0b..00000000 Binary files a/Weekand/Weekand/Resources/Assets.xcassets/Symbols/User Input/radio.disabled.imageset/radio_disabled2x.png and /dev/null differ diff --git a/Weekand/Weekand/Resources/Assets.xcassets/Symbols/User Input/radio.disabled.imageset/radio_disabled3x.png b/Weekand/Weekand/Resources/Assets.xcassets/Symbols/User Input/radio.disabled.imageset/radio_disabled3x.png deleted file mode 100644 index 2a5c0b6a..00000000 Binary files a/Weekand/Weekand/Resources/Assets.xcassets/Symbols/User Input/radio.disabled.imageset/radio_disabled3x.png and /dev/null differ diff --git a/Weekand/Weekand/Resources/Assets.xcassets/Symbols/User Input/radio.disabled.imageset/radio_disabled@2x.png b/Weekand/Weekand/Resources/Assets.xcassets/Symbols/User Input/radio.disabled.imageset/radio_disabled@2x.png new file mode 100644 index 00000000..b8199a78 Binary files /dev/null and b/Weekand/Weekand/Resources/Assets.xcassets/Symbols/User Input/radio.disabled.imageset/radio_disabled@2x.png differ diff --git a/Weekand/Weekand/Resources/Assets.xcassets/Symbols/User Input/radio.disabled.imageset/radio_disabled@3x.png b/Weekand/Weekand/Resources/Assets.xcassets/Symbols/User Input/radio.disabled.imageset/radio_disabled@3x.png new file mode 100644 index 00000000..87d87049 Binary files /dev/null and b/Weekand/Weekand/Resources/Assets.xcassets/Symbols/User Input/radio.disabled.imageset/radio_disabled@3x.png differ