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

👻 fix/qa #38

Merged
merged 8 commits into from
Jan 16, 2021
Merged

👻 fix/qa #38

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
e18cb2a
:lipstick: 그림자 적용
O-O-wl Jan 10, 2021
2626d40
:bug: 제한 글자수 이상 복붙시 clipping 되게 구현
O-O-wl Jan 10, 2021
bfa8125
:sparkles: 커스텀 바텀 시트 구현
O-O-wl Jan 11, 2021
f0cb9e3
:art: 불필요한 코드 삭제및 코드 컨벤션 터치업
O-O-wl Jan 11, 2021
1e8a034
:bug: 바텀시트 버그 수정
O-O-wl Jan 16, 2021
630c174
:bug: Conflict 해결과정 누락 코드 수정
O-O-wl Jan 16, 2021
13fcf42
:bento: 누락된 lottie 파일 추가
O-O-wl Jan 16, 2021
e421d4e
:bug: k 포맷 수정
O-O-wl Jan 16, 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
11 changes: 2 additions & 9 deletions Dear-World/Dear-World.xcodeproj/MessageCountBadgeView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,14 @@
// Created by rookie.w on 2020/12/26.
//

import Then
import SnapKit
import Then
import UIKit

final class MessageCountBadgeView: UIView {
private var totalCount: UILabel = UILabel()

public var count: Int? {
var count: Int? {
didSet {
self.totalCount.text = count?.formatted
}
Expand All @@ -24,13 +24,6 @@ final class MessageCountBadgeView: UIView {
setupSubviews()
}

// override public func didMoveToSuperview() {
// self.snp.makeConstraints {
// $0.centerX.equalToSuperview()
// $0.top.equalToSuperview().inset(60)
// }
// }
//
private func setupUI() {
self.snp.makeConstraints {
$0.width.equalTo(88)
Expand Down
40 changes: 36 additions & 4 deletions Dear-World/Dear-World.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@
121BDB592597652A0062B15A /* MessageTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 121BDB582597652A0062B15A /* MessageTableViewCell.swift */; };
121BDB672597982F0062B15A /* DiscoverReactor.swift in Sources */ = {isa = PBXBuildFile; fileRef = 121BDB662597982F0062B15A /* DiscoverReactor.swift */; };
121BDB8E259829840062B15A /* CountrySelectController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 121BDB8D259829840062B15A /* CountrySelectController.swift */; };
1221913B25B19EB8001D0D10 /* heartfull.json in Resources */ = {isa = PBXBuildFile; fileRef = 1221913A25B19EB8001D0D10 /* heartfull.json */; };
12257E1825A622750007E65E /* SortTypeSelectController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 12257E1725A622750007E65E /* SortTypeSelectController.swift */; };
1263E09725A1C87400E3F121 /* Message.API.Countries.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1263E09625A1C87400E3F121 /* Message.API.Countries.swift */; };
1263E09C25A1C8DD00E3F121 /* Message.Model.Countries.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1263E09B25A1C8DD00E3F121 /* Message.Model.Countries.swift */; };
Expand Down Expand Up @@ -70,6 +69,13 @@
3971EB32259A8BC90084E6DC /* SwiftRichString in Frameworks */ = {isa = PBXBuildFile; productRef = 3971EB31259A8BC90084E6DC /* SwiftRichString */; };
3971EB37259A9C550084E6DC /* Message.API.SendMessage.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3971EB36259A9C550084E6DC /* Message.API.SendMessage.swift */; };
3971EB3C259A9C860084E6DC /* Message.Model.SendMessage.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3971EB3B259A9C860084E6DC /* Message.Model.SendMessage.swift */; };
39965E6425ABAF7200069860 /* ItemBottomSheetViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 39965E6325ABAF7200069860 /* ItemBottomSheetViewController.swift */; };
39965E6925ABCD1700069860 /* Promisable.swift in Sources */ = {isa = PBXBuildFile; fileRef = 39965E6825ABCD1700069860 /* Promisable.swift */; };
39965E7225ABD52400069860 /* BottomSheetItemCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 39965E7125ABD52400069860 /* BottomSheetItemCell.swift */; };
39965E7A25ABDF8100069860 /* ItemBottomReactor.swift in Sources */ = {isa = PBXBuildFile; fileRef = 39965E7925ABDF8100069860 /* ItemBottomReactor.swift */; };
39965E8825ABE32400069860 /* BottomSheetItemHeaderView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 39965E8725ABE32400069860 /* BottomSheetItemHeaderView.swift */; };
39965E8D25ACA87A00069860 /* BottomSheetItem.swift in Sources */ = {isa = PBXBuildFile; fileRef = 39965E8C25ACA87A00069860 /* BottomSheetItem.swift */; };
39965F2525B2E20A00069860 /* heart_fill.json in Resources */ = {isa = PBXBuildFile; fileRef = 39965F2425B2E20900069860 /* heart_fill.json */; };
39C832282597651F00236DDF /* RxRelay in Frameworks */ = {isa = PBXBuildFile; productRef = 39C832272597651F00236DDF /* RxRelay */; };
39C8322A2597651F00236DDF /* RxSwift in Frameworks */ = {isa = PBXBuildFile; productRef = 39C832292597651F00236DDF /* RxSwift */; };
39C8322C2597651F00236DDF /* RxCocoa in Frameworks */ = {isa = PBXBuildFile; productRef = 39C8322B2597651F00236DDF /* RxCocoa */; };
Expand Down Expand Up @@ -116,7 +122,6 @@
121BDB582597652A0062B15A /* MessageTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MessageTableViewCell.swift; sourceTree = "<group>"; };
121BDB662597982F0062B15A /* DiscoverReactor.swift */ = {isa = PBXFileReference; indentWidth = 2; lastKnownFileType = sourcecode.swift; path = DiscoverReactor.swift; sourceTree = "<group>"; tabWidth = 2; };
121BDB8D259829840062B15A /* CountrySelectController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CountrySelectController.swift; sourceTree = "<group>"; };
1221913A25B19EB8001D0D10 /* heartfull.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; name = heartfull.json; path = ../../../../Downloads/heartfull.json; sourceTree = "<group>"; };
12257E1725A622750007E65E /* SortTypeSelectController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SortTypeSelectController.swift; sourceTree = "<group>"; };
1263E09625A1C87400E3F121 /* Message.API.Countries.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Message.API.Countries.swift; sourceTree = "<group>"; };
1263E09B25A1C8DD00E3F121 /* Message.Model.Countries.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Message.Model.Countries.swift; sourceTree = "<group>"; };
Expand Down Expand Up @@ -166,6 +171,13 @@
3971EB28259A7D720084E6DC /* SendMessageReactor.swift */ = {isa = PBXFileReference; indentWidth = 2; lastKnownFileType = sourcecode.swift; path = SendMessageReactor.swift; sourceTree = "<group>"; tabWidth = 2; };
3971EB36259A9C550084E6DC /* Message.API.SendMessage.swift */ = {isa = PBXFileReference; indentWidth = 2; lastKnownFileType = sourcecode.swift; path = Message.API.SendMessage.swift; sourceTree = "<group>"; tabWidth = 2; };
3971EB3B259A9C860084E6DC /* Message.Model.SendMessage.swift */ = {isa = PBXFileReference; indentWidth = 2; lastKnownFileType = sourcecode.swift; name = Message.Model.SendMessage.swift; path = "Dear-World/Source/Domain/Message/API/Message.Model.SendMessage.swift"; sourceTree = SOURCE_ROOT; tabWidth = 2; };
39965E6325ABAF7200069860 /* ItemBottomSheetViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ItemBottomSheetViewController.swift; sourceTree = "<group>"; };
39965E6825ABCD1700069860 /* Promisable.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Promisable.swift; sourceTree = "<group>"; };
39965E7125ABD52400069860 /* BottomSheetItemCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BottomSheetItemCell.swift; sourceTree = "<group>"; };
39965E7925ABDF8100069860 /* ItemBottomReactor.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ItemBottomReactor.swift; sourceTree = "<group>"; };
39965E8725ABE32400069860 /* BottomSheetItemHeaderView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BottomSheetItemHeaderView.swift; sourceTree = "<group>"; };
39965E8C25ACA87A00069860 /* BottomSheetItem.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BottomSheetItem.swift; sourceTree = "<group>"; };
39965F2425B2E20900069860 /* heart_fill.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = heart_fill.json; sourceTree = "<group>"; };
39E9F7CF25A1738F00BC2CC2 /* AboutReactor.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AboutReactor.swift; sourceTree = "<group>"; };
39E9F7DA25A1BBED00BC2CC2 /* PixelWorldMapView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PixelWorldMapView.swift; sourceTree = "<group>"; };
39E9F7DF25A1BC3C00BC2CC2 /* NoticeBadge.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NoticeBadge.swift; sourceTree = "<group>"; };
Expand Down Expand Up @@ -233,6 +245,7 @@
children = (
3902F14F2597531600A3DF8C /* Extension */,
39EED240259D0227007452E1 /* Revision.swift */,
39965E6825ABCD1700069860 /* Promisable.swift */,
);
path = Common;
sourceTree = "<group>";
Expand Down Expand Up @@ -373,8 +386,8 @@
395825AE25948E66007325AB /* Resource */ = {
isa = PBXGroup;
children = (
39965F2425B2E20900069860 /* heart_fill.json */,
39658F9F259ADE770050D180 /* splash_1x.json */,
1221913A25B19EB8001D0D10 /* heartfull.json */,
395825B625948EE4007325AB /* Colors.xcassets */,
3958258325948E43007325AB /* Assets.xcassets */,
3958258525948E43007325AB /* LaunchScreen.storyboard */,
Expand Down Expand Up @@ -422,6 +435,7 @@
395825B425948EC6007325AB /* View */ = {
isa = PBXGroup;
children = (
39965E7025ABD4E400069860 /* BottomSheet */,
121BDB292597259E0062B15A /* MessageCountBadgeView.swift */,
39F465812597811900621327 /* CheerButton.swift */,
121BDB8D259829840062B15A /* CountrySelectController.swift */,
Expand Down Expand Up @@ -559,6 +573,18 @@
path = API;
sourceTree = "<group>";
};
39965E7025ABD4E400069860 /* BottomSheet */ = {
isa = PBXGroup;
children = (
39965E7925ABDF8100069860 /* ItemBottomReactor.swift */,
39965E6325ABAF7200069860 /* ItemBottomSheetViewController.swift */,
39965E7125ABD52400069860 /* BottomSheetItemCell.swift */,
39965E8725ABE32400069860 /* BottomSheetItemHeaderView.swift */,
39965E8C25ACA87A00069860 /* BottomSheetItem.swift */,
);
path = BottomSheet;
sourceTree = "<group>";
};
39E9F7E425A1C78900BC2CC2 /* World Map */ = {
isa = PBXGroup;
children = (
Expand Down Expand Up @@ -742,7 +768,7 @@
39518C7725A8FA2400F777D1 /* GoogleService-Info.plist in Resources */,
395825B725948EE4007325AB /* Colors.xcassets in Resources */,
3958258425948E43007325AB /* Assets.xcassets in Resources */,
1221913B25B19EB8001D0D10 /* heartfull.json in Resources */,
39965F2525B2E20A00069860 /* heart_fill.json in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand Down Expand Up @@ -837,6 +863,8 @@
395A4177259DF9F900F10531 /* MainTabBarController.swift in Sources */,
3971EB18259A7BC10084E6DC /* Emoji.swift in Sources */,
3902F1132597049D00A3DF8C /* SendMessageViewController.swift in Sources */,
39965E6925ABCD1700069860 /* Promisable.swift in Sources */,
39965E7A25ABDF8100069860 /* ItemBottomReactor.swift in Sources */,
3914D9E6259F3FA1009765B0 /* Message.Model.Messages.swift in Sources */,
39F0C1A02598877600A7001F /* NetworkError.swift in Sources */,
121BDB592597652A0062B15A /* MessageTableViewCell.swift in Sources */,
Expand All @@ -862,21 +890,25 @@
39F0C19B2598860100A7001F /* ResponseWrapper.swift in Sources */,
39E9F7E625A1C80300BC2CC2 /* WorldMap.swift in Sources */,
3971EB3C259A9C860084E6DC /* Message.Model.SendMessage.swift in Sources */,
39965E8D25ACA87A00069860 /* BottomSheetItem.swift in Sources */,
39658FAF259AE4E40050D180 /* World.swift in Sources */,
3971EB24259A7C420084E6DC /* Emoji.Model.Random.swift in Sources */,
39F0C1632597B34F00A7001F /* UIView+.swift in Sources */,
3971EB1F259A7C0E0084E6DC /* Emoji.API.Random.swift in Sources */,
393E0D4025A23A12000DB3B9 /* World.Model.Map.swift in Sources */,
3902F1052596F26D00A3DF8C /* CheeringMapViewController.swift in Sources */,
39965E6425ABAF7200069860 /* ItemBottomSheetViewController.swift in Sources */,
39F0C1B72598927C00A7001F /* ErrorView.swift in Sources */,
39672DC12598E95A001D7E69 /* TextView.swift in Sources */,
1263E09C25A1C8DD00E3F121 /* Message.Model.Countries.swift in Sources */,
39F0C176259860D700A7001F /* UIControl+Rx.swift in Sources */,
121BDB2A2597259E0062B15A /* MessageCountBadgeView.swift in Sources */,
39F0C16B2597C7DF00A7001F /* UIImage+.swift in Sources */,
393E0D5725A2BE3C000DB3B9 /* AboutTeamViewController.swift in Sources */,
39965E7225ABD52400069860 /* BottomSheetItemCell.swift in Sources */,
39E9F7E025A1BC3C00BC2CC2 /* NoticeBadge.swift in Sources */,
12257E1825A622750007E65E /* SortTypeSelectController.swift in Sources */,
39965E8825ABE32400069860 /* BottomSheetItemHeaderView.swift in Sources */,
39E9F7ED25A1C84900BC2CC2 /* WorldMap.Model.Country.swift in Sources */,
39658FC0259AE58C0050D180 /* World.Model.Country.swift in Sources */,
121BDB8E259829840062B15A /* CountrySelectController.swift in Sources */,
Expand Down
1 change: 1 addition & 0 deletions Dear-World/Dear-World/Resource/heart_fill.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"v":"5.7.4","fr":29.9700012207031,"ip":0,"op":60.0000024438501,"w":200,"h":200,"nm":"","ddd":0,"assets":[],"layers":[{"ddd":0,"ind":2,"ty":4,"nm":"모양 레이어 5","sr":1,"ks":{"o":{"a":1,"k":[{"t":8,"s":[0],"h":1},{"t":16,"s":[100],"h":1},{"t":27.0000010997325,"s":[0],"h":1}],"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[91.5,100,0],"ix":2,"l":2},"a":{"a":0,"k":[-5.937,1.587,0],"ix":1,"l":2},"s":{"a":1,"k":[{"i":{"x":[0.667,0.667,0.667],"y":[1,1,1]},"o":{"x":[0.333,0.333,0.333],"y":[0,0,0]},"t":8,"s":[110,110,100]},{"i":{"x":[0.667,0.667,0.667],"y":[1,1,1]},"o":{"x":[0.333,0.333,0.333],"y":[0,0,0]},"t":16,"s":[126,126,100]},{"t":27.0000010997325,"s":[138,138,100]}],"ix":6,"l":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"d":1,"ty":"el","s":{"a":0,"k":[8.426,8.426],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"nm":"타원 패스 1","mn":"ADBE Vector Shape - Ellipse","hd":false},{"ty":"st","c":{"a":0,"k":[0.050980392157,0.796078431373,0.737254901961,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":0,"k":2,"ix":5},"lc":1,"lj":1,"ml":4,"bm":0,"nm":"선 1","mn":"ADBE Vector Graphic - Stroke","hd":false},{"ty":"fl","c":{"a":0,"k":[0.051799332862,0.794515931373,0.736900658701,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"칠 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[-24.287,-58.287],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":1,"k":[{"i":{"x":[0.667,0.667],"y":[1,1]},"o":{"x":[0.333,0.333],"y":[0,0]},"t":8,"s":[18,18]},{"i":{"x":[0.667,0.667],"y":[1,1]},"o":{"x":[0.333,0.333],"y":[0,0]},"t":14,"s":[54,54]},{"t":19.0000007738859,"s":[12,12]}],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"변형"}],"nm":"타원 1","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false},{"ty":"rp","c":{"a":0,"k":9,"ix":1},"o":{"a":0,"k":0,"ix":2},"m":1,"ix":2,"tr":{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":41,"ix":4},"so":{"a":0,"k":100,"ix":5},"eo":{"a":0,"k":100,"ix":6},"nm":"변형"},"nm":"반복 1","mn":"ADBE Vector Filter - Repeater","hd":false}],"ip":1.00000004073083,"op":61.0000024845809,"st":1.00000004073083,"bm":0},{"ddd":0,"ind":3,"ty":4,"nm":"모양 레이어 4","sr":1,"ks":{"o":{"a":1,"k":[{"t":7,"s":[0],"h":1},{"t":11,"s":[100],"h":1},{"t":20.0000008146167,"s":[0],"h":1}],"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[91.5,100,0],"ix":2,"l":2},"a":{"a":0,"k":[-5.937,1.587,0],"ix":1,"l":2},"s":{"a":1,"k":[{"i":{"x":[0.667,0.667,0.667],"y":[1,1,1]},"o":{"x":[0.333,0.333,0.333],"y":[0,0,0]},"t":7,"s":[110,110,100]},{"i":{"x":[0.667,0.667,0.667],"y":[1,1,1]},"o":{"x":[0.333,0.333,0.333],"y":[0,0,0]},"t":11,"s":[111,111,100]},{"t":20.0000008146167,"s":[128,128,100]}],"ix":6,"l":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"d":1,"ty":"el","s":{"a":0,"k":[8.426,8.426],"ix":2},"p":{"a":0,"k":[0,0],"ix":3},"nm":"타원 패스 1","mn":"ADBE Vector Shape - Ellipse","hd":false},{"ty":"st","c":{"a":0,"k":[0.980392156863,0.21568627451,0.4,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":0,"k":2,"ix":5},"lc":1,"lj":1,"ml":4,"bm":0,"nm":"선 1","mn":"ADBE Vector Graphic - Stroke","hd":false},{"ty":"fl","c":{"a":0,"k":[0.980392156863,0.21568627451,0.4,1],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"칠 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[-24.287,-58.287],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":1,"k":[{"i":{"x":[0.667,0.667],"y":[1,1]},"o":{"x":[0.333,0.333],"y":[0,0]},"t":7,"s":[18,18]},{"i":{"x":[0.667,0.667],"y":[1,1]},"o":{"x":[0.333,0.333],"y":[0,0]},"t":11,"s":[80,80]},{"t":16.0000006516934,"s":[12,12]}],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"변형"}],"nm":"타원 1","np":3,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false},{"ty":"rp","c":{"a":0,"k":9,"ix":1},"o":{"a":0,"k":0,"ix":2},"m":1,"ix":2,"tr":{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":40,"ix":4},"so":{"a":0,"k":100,"ix":5},"eo":{"a":0,"k":100,"ix":6},"nm":"변형"},"nm":"반복 1","mn":"ADBE Vector Filter - Repeater","hd":false}],"ip":1.00000004073083,"op":61.0000024845809,"st":1.00000004073083,"bm":0},{"ddd":0,"ind":7,"ty":4,"nm":"heart","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[100.5,100.75,0],"ix":2,"l":2},"a":{"a":0,"k":[51,43,0],"ix":1,"l":2},"s":{"a":1,"k":[{"i":{"x":[0.833,0.833,0.833],"y":[1,1,1]},"o":{"x":[0.333,0.333,0.333],"y":[0,0,0]},"t":0,"s":[100,100,100]},{"i":{"x":[0.667,0.667,0.667],"y":[1,1,1]},"o":{"x":[0.333,0.333,0.333],"y":[0,0,0]},"t":5,"s":[60,60,100]},{"i":{"x":[0.667,0.667,0.667],"y":[1,1,1]},"o":{"x":[0.333,0.333,0.333],"y":[0,0,0]},"t":12,"s":[100,100,100]},{"i":{"x":[0.833,0.833,0.833],"y":[1,1,1]},"o":{"x":[0.167,0.167,0.167],"y":[0,0,0]},"t":17,"s":[80,80,100]},{"i":{"x":[0.571,0.571,0.571],"y":[1,1,1]},"o":{"x":[0.174,0.174,0.174],"y":[0,0,0]},"t":23,"s":[100,100,100]},{"i":{"x":[0.667,0.667,0.667],"y":[1,1,1]},"o":{"x":[0.399,0.399,0.399],"y":[0,0,0]},"t":30,"s":[100,100,100]},{"i":{"x":[0.667,0.667,0.667],"y":[1,1,1]},"o":{"x":[0.333,0.333,0.333],"y":[0,0,0]},"t":38,"s":[130,130,100]},{"i":{"x":[0.833,0.833,0.833],"y":[1,1,1]},"o":{"x":[0.333,0.333,0.333],"y":[0,0,0]},"t":45,"s":[80,80,100]},{"t":55.0000022401959,"s":[100,100,100]}],"ix":6,"l":2}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[5.491,5.707],[7.198,0],[5.087,-8.058],[9.076,0],[5.215,-5.417],[-0.307,-8.035],[-1.964,-1.007],[-0.266,0],[-0.243,0.126],[-11.932,9.608],[-0.47,12.312]],"o":[[-5.215,-5.417],[-9.074,0],[-5.085,-8.058],[-7.198,0],[-5.491,5.707],[1.11,29.108],[0.243,0.126],[0.266,0],[0.488,-0.25],[16.237,-13.073],[0.307,-8.035]],"v":[[41.819,-33.758],[22.568,-42.159],[0,-29.21],[-22.568,-42.159],[-41.819,-33.758],[-49.978,-12.135],[-0.778,41.972],[0,42.159],[0.778,41.972],[24.801,26.122],[49.978,-12.135]],"c":true},"ix":2},"nm":"패스 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"fl","c":{"a":1,"k":[{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":0,"s":[0.838999986649,0.866999983788,0.98400002718,1]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":5,"s":[0.838999968884,0.866999966491,0.984000052658,1]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":12,"s":[0.980392158031,0.215686276555,0.40000000596,1]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":30,"s":[0.980392158031,0.215686276555,0.40000000596,1]},{"i":{"x":[0.833],"y":[0.833]},"o":{"x":[0.167],"y":[0.167]},"t":38,"s":[0.839215695858,0.866666674614,0.984313726425,1]},{"t":45.0000018328876,"s":[0.839215695858,0.866666674614,0.984313726425,1]}],"ix":4},"o":{"a":0,"k":100,"ix":5},"r":1,"bm":0,"nm":"칠 1","mn":"ADBE Vector Graphic - Fill","hd":false},{"ty":"tr","p":{"a":0,"k":[51,42.604],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[100,100],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"변형"}],"nm":"그룹 1","np":4,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":120.0000048877,"st":0,"bm":0}],"markers":[]}
2 changes: 1 addition & 1 deletion Dear-World/Dear-World/Source/Common/Extension/Number+.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ extension Int {
extension Double {
var decimalFormat: String? {
let numberFormatter: NumberFormatter = NumberFormatter().then {
$0.roundingMode = .halfEven
$0.roundingMode = .down
$0.minimumFractionDigits = 0
$0.maximumFractionDigits = 1
$0.numberStyle = .decimal
Expand Down
Loading