Skip to content

Commit 617e7e9

Browse files
authored
Merge pull request #26 from kut7728/feature/#18
Feature/#18 날씨 아이콘 변경 & 핀 상세뷰 디자인 수정 & 데이터 연결
2 parents 986251e + 8b5291d commit 617e7e9

File tree

60 files changed

+405
-46
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

60 files changed

+405
-46
lines changed

Pinit/Pinit/Models/PinEntity.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ struct PinEntity {
2525
longitude: 126.97628375547349,
2626
address: "서울특별시 도로명주소 24번지",
2727
date: Date(),
28-
weather: "",
28+
weather: "01d",
2929
description: "샘플 설명 83",
3030
mediaPath: nil), // 이미지 없음
3131

@@ -35,7 +35,7 @@ struct PinEntity {
3535
longitude: 126.98134546666795,
3636
address: "서울특별시 도로명주소 51번지",
3737
date: Date(),
38-
weather: "",
38+
weather: "11d",
3939
description: "샘플 설명 67",
4040
mediaPath: nil), // 이미지 변환
4141

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
{
2+
"images" : [
3+
{
4+
"filename" : "clear-day.svg",
5+
"idiom" : "universal",
6+
"scale" : "1x"
7+
},
8+
{
9+
"idiom" : "universal",
10+
"scale" : "2x"
11+
},
12+
{
13+
"idiom" : "universal",
14+
"scale" : "3x"
15+
}
16+
],
17+
"info" : {
18+
"author" : "xcode",
19+
"version" : 1
20+
}
21+
}
Lines changed: 44 additions & 0 deletions
Loading
Binary file not shown.
Lines changed: 16 additions & 0 deletions
Loading

Pinit/Pinit/Resources/Assets.xcassets/weatherIcon/01d.imageset/Contents.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"images" : [
33
{
4-
"filename" : "01d.png",
4+
"filename" : "01d.svg",
55
"idiom" : "universal"
66
}
77
],
Binary file not shown.
Lines changed: 8 additions & 0 deletions
Loading

Pinit/Pinit/Resources/Assets.xcassets/weatherIcon/01n.imageset/Contents.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"images" : [
33
{
4-
"filename" : "01n.png",
4+
"filename" : "01n.svg",
55
"idiom" : "universal"
66
}
77
],
Binary file not shown.

0 commit comments

Comments
 (0)