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.

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

[#223], [#236], [#372], [#380] 223 lint,236 space,372 font,380 issue #398

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
5261a30
[#223] 업로드 모달 뷰컨 스위프트 린트 수정
jeongyeob97 Feb 26, 2021
2a59e9e
[#233] UITextField Extension 스위프트 린트 수정
jeongyeob97 Feb 26, 2021
b38f990
[#233] ListTableViewCell 스위프트 린트 수정
jeongyeob97 Feb 26, 2021
609137f
[#233] ListViewController 스위프트 린트 수정
jeongyeob97 Feb 26, 2021
d7068e7
[#233] ListFilterModalViewController 스위프트 린트 수정
jeongyeob97 Feb 26, 2021
a0ed2b6
[#233] StatisticsViewController 스위프트 린트 수정
jeongyeob97 Feb 26, 2021
0859f1a
[#233] MoodStatViewController 스위프트 린트 수정
jeongyeob97 Feb 26, 2021
3ddf716
[#372] 통계 스토리보드 폰트 수정
jeongyeob97 Feb 26, 2021
24f1331
[#236, #372] 폰트 자간 행간 수정
jeongyeob97 Feb 26, 2021
dd70e14
[#236] wordTextSpacing String+Extension에 추가
jeongyeob97 Feb 26, 2021
d484dcd
[#236,#372] 스토리보드 폰트 수정
jeongyeob97 Feb 26, 2021
9b63506
[#236, #372] 리스트뷰, 리스토모달 스토리보드 폰트 및 행자간 수정
jeongyeob97 Feb 26, 2021
1115cc4
[#236, #372] 오픈 소스 스토리보드 폰트 및 행자간 수정
jeongyeob97 Feb 26, 2021
9857307
[#236, #372] 개인정보 이용 약관 스토리보드 및 행자간 수정
jeongyeob97 Feb 26, 2021
2f9ccf2
[#236, #372] 서비스 이용 약관 스토리보드 및 행자간 수정
jeongyeob97 Feb 26, 2021
40a8c69
[#236, #372] DiaryWrite 스토리보드 폰트 수정 및 행자간 수정
jeongyeob97 Feb 26, 2021
a02dc9f
[#380] 버튼이 아닌 뷰를 눌렀을 때 다이어로 넘어가게 설정
jeongyeob97 Mar 1, 2021
6a04381
[#380] 개행문자 있을 때 처리
jeongyeob97 Mar 1, 2021
0037c87
[#380] 리스트 필터 모달 수정
jeongyeob97 Mar 1, 2021
fa39528
[#380] 모달 윤년 고려
jeongyeob97 Mar 1, 2021
3e11434
[#380] 리스트 네비게이션 아이템 간격 수정
jeongyeob97 Mar 1, 2021
12b7d9f
[#236] wordSpacing --> textSpacing
jeongyeob97 Mar 1, 2021
9245f56
[#236] attributed Truncate Tail 설정
jeongyeob97 Mar 1, 2021
642c245
[#380] 간격 수정
jeongyeob97 Mar 1, 2021
23f39f4
Merge branch 'develop' into 223_lint,236_space,372_font,380_issue
jeongyeob97 Mar 1, 2021
991e30a
[#380] develop과 머지 시 충돌 해결
jeongyeob97 Mar 1, 2021
affcbea
[#380] 필터 아이콘 수정
jeongyeob97 Mar 1, 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
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
{
"images" : [
{
"filename" : "icAngry14Black.png",
"scale" : "1x",
"idiom" : "universal",
"scale" : "1x"
"filename" : "icAngry14Black.png"
},
{
"filename" : "[email protected]",
"idiom" : "universal",
"filename" : "[email protected]",
"scale" : "2x"
},
{
Expand All @@ -17,7 +17,7 @@
}
],
"info" : {
"author" : "xcode",
"version" : 1
"version" : 1,
"author" : "xcode"
}
}
}
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,23 +1,23 @@
{
"images" : [
{
"filename" : "icAngryBlue.png",
"scale" : "1x",
"idiom" : "universal",
"scale" : "1x"
"filename" : "icAngryBlue.png"
},
{
"filename" : "[email protected]",
"idiom" : "universal",
"scale" : "2x"
"scale" : "2x",
"idiom" : "universal"
},
{
"filename" : "[email protected]",
"scale" : "3x",
"idiom" : "universal",
"scale" : "3x"
"filename" : "[email protected]"
}
],
"info" : {
"author" : "xcode",
"version" : 1
"version" : 1,
"author" : "xcode"
}
}
}
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
Expand Up @@ -6,18 +6,18 @@
"scale" : "1x"
},
{
"filename" : "[email protected]",
"scale" : "2x",
"idiom" : "universal",
"scale" : "2x"
"filename" : "[email protected]"
},
{
"filename" : "[email protected]",
"idiom" : "universal",
"filename" : "[email protected]",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
"version" : 1,
"author" : "xcode"
}
}
}
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
Expand Up @@ -12,12 +12,12 @@
},
{
"filename" : "[email protected]",
"idiom" : "universal",
"scale" : "3x"
"scale" : "3x",
"idiom" : "universal"
}
],
"info" : {
"author" : "xcode",
"version" : 1
"version" : 1,
"author" : "xcode"
}
}
}
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,23 +1,23 @@
{
"images" : [
{
"filename" : "icConsole14Black.png",
"idiom" : "universal",
"filename" : "icConsole14Black.png",
"scale" : "1x"
},
{
"filename" : "[email protected]",
"idiom" : "universal",
"scale" : "2x"
"scale" : "2x",
"idiom" : "universal"
},
{
"filename" : "[email protected]",
"idiom" : "universal",
"filename" : "[email protected]",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
"version" : 1,
"author" : "xcode"
}
}
}
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
Expand Up @@ -2,13 +2,13 @@
"images" : [
{
"filename" : "icConsoleBlue.png",
"idiom" : "universal",
"scale" : "1x"
"scale" : "1x",
"idiom" : "universal"
},
{
"filename" : "[email protected]",
"idiom" : "universal",
"scale" : "2x"
"scale" : "2x",
"idiom" : "universal"
},
{
"filename" : "[email protected]",
Expand All @@ -17,7 +17,7 @@
}
],
"info" : {
"author" : "xcode",
"version" : 1
"version" : 1,
"author" : "xcode"
}
}
}
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,23 +1,23 @@
{
"images" : [
{
"filename" : "icDaily14Black.png",
"scale" : "1x",
"idiom" : "universal",
"scale" : "1x"
"filename" : "icDaily14Black.png"
},
{
"filename" : "[email protected]",
"scale" : "2x",
"idiom" : "universal",
"scale" : "2x"
"filename" : "[email protected]"
},
{
"filename" : "[email protected]",
"idiom" : "universal",
"scale" : "3x"
"scale" : "3x",
"idiom" : "universal"
}
],
"info" : {
"author" : "xcode",
"version" : 1
"version" : 1,
"author" : "xcode"
}
}
}
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
Expand Up @@ -2,22 +2,22 @@
"images" : [
{
"filename" : "icDailyBlue.png",
"idiom" : "universal",
"scale" : "1x"
"scale" : "1x",
"idiom" : "universal"
},
{
"scale" : "2x",
"filename" : "[email protected]",
"idiom" : "universal",
"scale" : "2x"
"idiom" : "universal"
},
{
"filename" : "[email protected]",
"idiom" : "universal",
"scale" : "3x"
"scale" : "3x",
"filename" : "[email protected]"
}
],
"info" : {
"author" : "xcode",
"version" : 1
"version" : 1,
"author" : "xcode"
}
}
}
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
Expand Up @@ -6,9 +6,9 @@
"scale" : "1x"
},
{
"filename" : "[email protected]",
"idiom" : "universal",
"scale" : "2x"
"scale" : "2x",
"filename" : "[email protected]"
},
{
"filename" : "[email protected]",
Expand All @@ -17,7 +17,7 @@
}
],
"info" : {
"author" : "xcode",
"version" : 1
"version" : 1,
"author" : "xcode"
}
}
}
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,13 +1,13 @@
{
"images" : [
{
"filename" : "icHappyBlue.png",
"idiom" : "universal",
"filename" : "icHappyBlue.png",
"scale" : "1x"
},
{
"filename" : "[email protected]",
"idiom" : "universal",
"filename" : "[email protected]",
"scale" : "2x"
},
{
Expand All @@ -17,7 +17,7 @@
}
],
"info" : {
"author" : "xcode",
"version" : 1
"version" : 1,
"author" : "xcode"
}
}
}
Original file line number Diff line number Diff line change
@@ -1,23 +1,23 @@
{
"images" : [
{
"filename" : "icLove14Black.png",
"idiom" : "universal",
"scale" : "1x"
"scale" : "1x",
"filename" : "icLove14Black.png"
},
{
"filename" : "[email protected]",
"scale" : "2x",
"idiom" : "universal",
"scale" : "2x"
"filename" : "[email protected]"
},
{
"scale" : "3x",
"filename" : "[email protected]",
"idiom" : "universal",
"scale" : "3x"
"idiom" : "universal"
}
],
"info" : {
"author" : "xcode",
"version" : 1
"version" : 1,
"author" : "xcode"
}
}
}
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
{
"images" : [
{
"filename" : "icLoveBlue.png",
"idiom" : "universal",
"filename" : "icLoveBlue.png",
"scale" : "1x"
},
{
Expand All @@ -17,7 +17,7 @@
}
],
"info" : {
"author" : "xcode",
"version" : 1
"version" : 1,
"author" : "xcode"
}
}
}
Original file line number Diff line number Diff line change
@@ -1,23 +1,23 @@
{
"images" : [
{
"filename" : "icMemory14Black.png",
"idiom" : "universal",
"filename" : "icMemory14Black.png",
"scale" : "1x"
},
{
"filename" : "[email protected]",
"idiom" : "universal",
"scale" : "2x"
"scale" : "2x",
"idiom" : "universal"
},
{
"filename" : "[email protected]",
"idiom" : "universal",
"scale" : "3x"
"scale" : "3x",
"idiom" : "universal"
}
],
"info" : {
"author" : "xcode",
"version" : 1
"version" : 1,
"author" : "xcode"
}
}
}
Loading