diff --git a/Pinit/Pinit/Models/PinEntity.swift b/Pinit/Pinit/Models/PinEntity.swift index d63abe1..c00c271 100644 --- a/Pinit/Pinit/Models/PinEntity.swift +++ b/Pinit/Pinit/Models/PinEntity.swift @@ -25,7 +25,7 @@ struct PinEntity { longitude: 126.97628375547349, address: "서울특별시 도로명주소 24번지", date: Date(), - weather: "비", + weather: "01d", description: "샘플 설명 83", mediaPath: nil), // 이미지 없음 @@ -35,7 +35,7 @@ struct PinEntity { longitude: 126.98134546666795, address: "서울특별시 도로명주소 51번지", date: Date(), - weather: "눈", + weather: "11d", description: "샘플 설명 67", mediaPath: nil), // 이미지 변환 diff --git a/Pinit/Pinit/Resources/Assets.xcassets/clear-day.imageset/Contents.json b/Pinit/Pinit/Resources/Assets.xcassets/clear-day.imageset/Contents.json new file mode 100644 index 0000000..41dfcff --- /dev/null +++ b/Pinit/Pinit/Resources/Assets.xcassets/clear-day.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "filename" : "clear-day.svg", + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "scale" : "2x" + }, + { + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Pinit/Pinit/Resources/Assets.xcassets/clear-day.imageset/clear-day.svg b/Pinit/Pinit/Resources/Assets.xcassets/clear-day.imageset/clear-day.svg new file mode 100644 index 0000000..f9dce1c --- /dev/null +++ b/Pinit/Pinit/Resources/Assets.xcassets/clear-day.imageset/clear-day.svg @@ -0,0 +1,44 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Pinit/Pinit/Resources/Assets.xcassets/weatherIcon/01d.imageset/01d.png b/Pinit/Pinit/Resources/Assets.xcassets/weatherIcon/01d.imageset/01d.png deleted file mode 100644 index 87d2a51..0000000 Binary files a/Pinit/Pinit/Resources/Assets.xcassets/weatherIcon/01d.imageset/01d.png and /dev/null differ diff --git a/Pinit/Pinit/Resources/Assets.xcassets/weatherIcon/01d.imageset/01d.svg b/Pinit/Pinit/Resources/Assets.xcassets/weatherIcon/01d.imageset/01d.svg new file mode 100644 index 0000000..decaab7 --- /dev/null +++ b/Pinit/Pinit/Resources/Assets.xcassets/weatherIcon/01d.imageset/01d.svg @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Pinit/Pinit/Resources/Assets.xcassets/weatherIcon/01d.imageset/Contents.json b/Pinit/Pinit/Resources/Assets.xcassets/weatherIcon/01d.imageset/Contents.json index 60e45fb..b68beb6 100644 --- a/Pinit/Pinit/Resources/Assets.xcassets/weatherIcon/01d.imageset/Contents.json +++ b/Pinit/Pinit/Resources/Assets.xcassets/weatherIcon/01d.imageset/Contents.json @@ -1,7 +1,7 @@ { "images" : [ { - "filename" : "01d.png", + "filename" : "01d.svg", "idiom" : "universal" } ], diff --git a/Pinit/Pinit/Resources/Assets.xcassets/weatherIcon/01n.imageset/01n.png b/Pinit/Pinit/Resources/Assets.xcassets/weatherIcon/01n.imageset/01n.png deleted file mode 100644 index 527137b..0000000 Binary files a/Pinit/Pinit/Resources/Assets.xcassets/weatherIcon/01n.imageset/01n.png and /dev/null differ diff --git a/Pinit/Pinit/Resources/Assets.xcassets/weatherIcon/01n.imageset/01n.svg b/Pinit/Pinit/Resources/Assets.xcassets/weatherIcon/01n.imageset/01n.svg new file mode 100644 index 0000000..41eb4f5 --- /dev/null +++ b/Pinit/Pinit/Resources/Assets.xcassets/weatherIcon/01n.imageset/01n.svg @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/Pinit/Pinit/Resources/Assets.xcassets/weatherIcon/01n.imageset/Contents.json b/Pinit/Pinit/Resources/Assets.xcassets/weatherIcon/01n.imageset/Contents.json index 8a8cf33..dc2a0e8 100644 --- a/Pinit/Pinit/Resources/Assets.xcassets/weatherIcon/01n.imageset/Contents.json +++ b/Pinit/Pinit/Resources/Assets.xcassets/weatherIcon/01n.imageset/Contents.json @@ -1,7 +1,7 @@ { "images" : [ { - "filename" : "01n.png", + "filename" : "01n.svg", "idiom" : "universal" } ], diff --git a/Pinit/Pinit/Resources/Assets.xcassets/weatherIcon/02d.imageset/02d.png b/Pinit/Pinit/Resources/Assets.xcassets/weatherIcon/02d.imageset/02d.png deleted file mode 100644 index 01c3c9b..0000000 Binary files a/Pinit/Pinit/Resources/Assets.xcassets/weatherIcon/02d.imageset/02d.png and /dev/null differ diff --git a/Pinit/Pinit/Resources/Assets.xcassets/weatherIcon/02d.imageset/02d.svg b/Pinit/Pinit/Resources/Assets.xcassets/weatherIcon/02d.imageset/02d.svg new file mode 100644 index 0000000..05856dc --- /dev/null +++ b/Pinit/Pinit/Resources/Assets.xcassets/weatherIcon/02d.imageset/02d.svg @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/Pinit/Pinit/Resources/Assets.xcassets/weatherIcon/02d.imageset/Contents.json b/Pinit/Pinit/Resources/Assets.xcassets/weatherIcon/02d.imageset/Contents.json index 97441fe..1a0e9d2 100644 --- a/Pinit/Pinit/Resources/Assets.xcassets/weatherIcon/02d.imageset/Contents.json +++ b/Pinit/Pinit/Resources/Assets.xcassets/weatherIcon/02d.imageset/Contents.json @@ -1,7 +1,7 @@ { "images" : [ { - "filename" : "02d.png", + "filename" : "02d.svg", "idiom" : "universal" } ], diff --git a/Pinit/Pinit/Resources/Assets.xcassets/weatherIcon/02n.imageset/02n.png b/Pinit/Pinit/Resources/Assets.xcassets/weatherIcon/02n.imageset/02n.png deleted file mode 100644 index b6583d2..0000000 Binary files a/Pinit/Pinit/Resources/Assets.xcassets/weatherIcon/02n.imageset/02n.png and /dev/null differ diff --git a/Pinit/Pinit/Resources/Assets.xcassets/weatherIcon/02n.imageset/02n.svg b/Pinit/Pinit/Resources/Assets.xcassets/weatherIcon/02n.imageset/02n.svg new file mode 100644 index 0000000..5b07eb5 --- /dev/null +++ b/Pinit/Pinit/Resources/Assets.xcassets/weatherIcon/02n.imageset/02n.svg @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/Pinit/Pinit/Resources/Assets.xcassets/weatherIcon/02n.imageset/Contents.json b/Pinit/Pinit/Resources/Assets.xcassets/weatherIcon/02n.imageset/Contents.json index 8d62610..beb3807 100644 --- a/Pinit/Pinit/Resources/Assets.xcassets/weatherIcon/02n.imageset/Contents.json +++ b/Pinit/Pinit/Resources/Assets.xcassets/weatherIcon/02n.imageset/Contents.json @@ -1,7 +1,7 @@ { "images" : [ { - "filename" : "02n.png", + "filename" : "02n.svg", "idiom" : "universal" } ], diff --git a/Pinit/Pinit/Resources/Assets.xcassets/weatherIcon/03d.imageset/03d.png b/Pinit/Pinit/Resources/Assets.xcassets/weatherIcon/03d.imageset/03d.png deleted file mode 100644 index c0f7e07..0000000 Binary files a/Pinit/Pinit/Resources/Assets.xcassets/weatherIcon/03d.imageset/03d.png and /dev/null differ diff --git a/Pinit/Pinit/Resources/Assets.xcassets/weatherIcon/03d.imageset/03d.svg b/Pinit/Pinit/Resources/Assets.xcassets/weatherIcon/03d.imageset/03d.svg new file mode 100644 index 0000000..facc080 --- /dev/null +++ b/Pinit/Pinit/Resources/Assets.xcassets/weatherIcon/03d.imageset/03d.svg @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/Pinit/Pinit/Resources/Assets.xcassets/weatherIcon/03d.imageset/Contents.json b/Pinit/Pinit/Resources/Assets.xcassets/weatherIcon/03d.imageset/Contents.json index b0df74d..9996c33 100644 --- a/Pinit/Pinit/Resources/Assets.xcassets/weatherIcon/03d.imageset/Contents.json +++ b/Pinit/Pinit/Resources/Assets.xcassets/weatherIcon/03d.imageset/Contents.json @@ -1,7 +1,7 @@ { "images" : [ { - "filename" : "03d.png", + "filename" : "03d.svg", "idiom" : "universal" } ], diff --git a/Pinit/Pinit/Resources/Assets.xcassets/weatherIcon/03n.imageset/03n.png b/Pinit/Pinit/Resources/Assets.xcassets/weatherIcon/03n.imageset/03n.png deleted file mode 100644 index c0f7e07..0000000 Binary files a/Pinit/Pinit/Resources/Assets.xcassets/weatherIcon/03n.imageset/03n.png and /dev/null differ diff --git a/Pinit/Pinit/Resources/Assets.xcassets/weatherIcon/03n.imageset/03n.svg b/Pinit/Pinit/Resources/Assets.xcassets/weatherIcon/03n.imageset/03n.svg new file mode 100644 index 0000000..ed4c608 --- /dev/null +++ b/Pinit/Pinit/Resources/Assets.xcassets/weatherIcon/03n.imageset/03n.svg @@ -0,0 +1,10 @@ + + + + + + + + + + \ No newline at end of file diff --git a/Pinit/Pinit/Resources/Assets.xcassets/weatherIcon/03n.imageset/Contents.json b/Pinit/Pinit/Resources/Assets.xcassets/weatherIcon/03n.imageset/Contents.json index a6a0c76..be53aa6 100644 --- a/Pinit/Pinit/Resources/Assets.xcassets/weatherIcon/03n.imageset/Contents.json +++ b/Pinit/Pinit/Resources/Assets.xcassets/weatherIcon/03n.imageset/Contents.json @@ -1,7 +1,7 @@ { "images" : [ { - "filename" : "03n.png", + "filename" : "03n.svg", "idiom" : "universal" } ], diff --git a/Pinit/Pinit/Resources/Assets.xcassets/weatherIcon/04d.imageset/04d.png b/Pinit/Pinit/Resources/Assets.xcassets/weatherIcon/04d.imageset/04d.png deleted file mode 100644 index 34346dc..0000000 Binary files a/Pinit/Pinit/Resources/Assets.xcassets/weatherIcon/04d.imageset/04d.png and /dev/null differ diff --git a/Pinit/Pinit/Resources/Assets.xcassets/weatherIcon/04d.imageset/04d.svg b/Pinit/Pinit/Resources/Assets.xcassets/weatherIcon/04d.imageset/04d.svg new file mode 100644 index 0000000..4d81f74 --- /dev/null +++ b/Pinit/Pinit/Resources/Assets.xcassets/weatherIcon/04d.imageset/04d.svg @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/Pinit/Pinit/Resources/Assets.xcassets/weatherIcon/04d.imageset/Contents.json b/Pinit/Pinit/Resources/Assets.xcassets/weatherIcon/04d.imageset/Contents.json index 9fc19d7..c6b78da 100644 --- a/Pinit/Pinit/Resources/Assets.xcassets/weatherIcon/04d.imageset/Contents.json +++ b/Pinit/Pinit/Resources/Assets.xcassets/weatherIcon/04d.imageset/Contents.json @@ -1,7 +1,7 @@ { "images" : [ { - "filename" : "04d.png", + "filename" : "04d.svg", "idiom" : "universal" } ], diff --git a/Pinit/Pinit/Resources/Assets.xcassets/weatherIcon/04n.imageset/04n.png b/Pinit/Pinit/Resources/Assets.xcassets/weatherIcon/04n.imageset/04n.png deleted file mode 100644 index 34346dc..0000000 Binary files a/Pinit/Pinit/Resources/Assets.xcassets/weatherIcon/04n.imageset/04n.png and /dev/null differ diff --git a/Pinit/Pinit/Resources/Assets.xcassets/weatherIcon/04n.imageset/04n.svg b/Pinit/Pinit/Resources/Assets.xcassets/weatherIcon/04n.imageset/04n.svg new file mode 100644 index 0000000..4d81f74 --- /dev/null +++ b/Pinit/Pinit/Resources/Assets.xcassets/weatherIcon/04n.imageset/04n.svg @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/Pinit/Pinit/Resources/Assets.xcassets/weatherIcon/04n.imageset/Contents.json b/Pinit/Pinit/Resources/Assets.xcassets/weatherIcon/04n.imageset/Contents.json index 4a444b7..955afc4 100644 --- a/Pinit/Pinit/Resources/Assets.xcassets/weatherIcon/04n.imageset/Contents.json +++ b/Pinit/Pinit/Resources/Assets.xcassets/weatherIcon/04n.imageset/Contents.json @@ -1,7 +1,7 @@ { "images" : [ { - "filename" : "04n.png", + "filename" : "04n.svg", "idiom" : "universal" } ], diff --git a/Pinit/Pinit/Resources/Assets.xcassets/weatherIcon/09d.imageset/09d.png b/Pinit/Pinit/Resources/Assets.xcassets/weatherIcon/09d.imageset/09d.png deleted file mode 100644 index 022feb3..0000000 Binary files a/Pinit/Pinit/Resources/Assets.xcassets/weatherIcon/09d.imageset/09d.png and /dev/null differ diff --git a/Pinit/Pinit/Resources/Assets.xcassets/weatherIcon/09d.imageset/09d.svg b/Pinit/Pinit/Resources/Assets.xcassets/weatherIcon/09d.imageset/09d.svg new file mode 100644 index 0000000..eb66623 --- /dev/null +++ b/Pinit/Pinit/Resources/Assets.xcassets/weatherIcon/09d.imageset/09d.svg @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Pinit/Pinit/Resources/Assets.xcassets/weatherIcon/09d.imageset/Contents.json b/Pinit/Pinit/Resources/Assets.xcassets/weatherIcon/09d.imageset/Contents.json index 5f72daf..5309c06 100644 --- a/Pinit/Pinit/Resources/Assets.xcassets/weatherIcon/09d.imageset/Contents.json +++ b/Pinit/Pinit/Resources/Assets.xcassets/weatherIcon/09d.imageset/Contents.json @@ -1,7 +1,7 @@ { "images" : [ { - "filename" : "09d.png", + "filename" : "09d.svg", "idiom" : "universal" } ], diff --git a/Pinit/Pinit/Resources/Assets.xcassets/weatherIcon/09n.imageset/09n.png b/Pinit/Pinit/Resources/Assets.xcassets/weatherIcon/09n.imageset/09n.png deleted file mode 100644 index 022feb3..0000000 Binary files a/Pinit/Pinit/Resources/Assets.xcassets/weatherIcon/09n.imageset/09n.png and /dev/null differ diff --git a/Pinit/Pinit/Resources/Assets.xcassets/weatherIcon/09n.imageset/09n.svg b/Pinit/Pinit/Resources/Assets.xcassets/weatherIcon/09n.imageset/09n.svg new file mode 100644 index 0000000..eb66623 --- /dev/null +++ b/Pinit/Pinit/Resources/Assets.xcassets/weatherIcon/09n.imageset/09n.svg @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Pinit/Pinit/Resources/Assets.xcassets/weatherIcon/09n.imageset/Contents.json b/Pinit/Pinit/Resources/Assets.xcassets/weatherIcon/09n.imageset/Contents.json index 226ddbb..df636a6 100644 --- a/Pinit/Pinit/Resources/Assets.xcassets/weatherIcon/09n.imageset/Contents.json +++ b/Pinit/Pinit/Resources/Assets.xcassets/weatherIcon/09n.imageset/Contents.json @@ -1,7 +1,7 @@ { "images" : [ { - "filename" : "09n.png", + "filename" : "09n.svg", "idiom" : "universal" } ], diff --git a/Pinit/Pinit/Resources/Assets.xcassets/weatherIcon/10d.imageset/10d.png b/Pinit/Pinit/Resources/Assets.xcassets/weatherIcon/10d.imageset/10d.png deleted file mode 100644 index 12d13ae..0000000 Binary files a/Pinit/Pinit/Resources/Assets.xcassets/weatherIcon/10d.imageset/10d.png and /dev/null differ diff --git a/Pinit/Pinit/Resources/Assets.xcassets/weatherIcon/10d.imageset/10d.svg b/Pinit/Pinit/Resources/Assets.xcassets/weatherIcon/10d.imageset/10d.svg new file mode 100644 index 0000000..4fad7a2 --- /dev/null +++ b/Pinit/Pinit/Resources/Assets.xcassets/weatherIcon/10d.imageset/10d.svg @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Pinit/Pinit/Resources/Assets.xcassets/weatherIcon/10d.imageset/Contents.json b/Pinit/Pinit/Resources/Assets.xcassets/weatherIcon/10d.imageset/Contents.json index c75e9ea..f09fc46 100644 --- a/Pinit/Pinit/Resources/Assets.xcassets/weatherIcon/10d.imageset/Contents.json +++ b/Pinit/Pinit/Resources/Assets.xcassets/weatherIcon/10d.imageset/Contents.json @@ -1,7 +1,7 @@ { "images" : [ { - "filename" : "10d.png", + "filename" : "10d.svg", "idiom" : "universal" } ], diff --git a/Pinit/Pinit/Resources/Assets.xcassets/weatherIcon/10n.imageset/10n.png b/Pinit/Pinit/Resources/Assets.xcassets/weatherIcon/10n.imageset/10n.png deleted file mode 100644 index 1f884d1..0000000 Binary files a/Pinit/Pinit/Resources/Assets.xcassets/weatherIcon/10n.imageset/10n.png and /dev/null differ diff --git a/Pinit/Pinit/Resources/Assets.xcassets/weatherIcon/10n.imageset/10n.svg b/Pinit/Pinit/Resources/Assets.xcassets/weatherIcon/10n.imageset/10n.svg new file mode 100644 index 0000000..4fad7a2 --- /dev/null +++ b/Pinit/Pinit/Resources/Assets.xcassets/weatherIcon/10n.imageset/10n.svg @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Pinit/Pinit/Resources/Assets.xcassets/weatherIcon/10n.imageset/Contents.json b/Pinit/Pinit/Resources/Assets.xcassets/weatherIcon/10n.imageset/Contents.json index d2ca6fc..882d44b 100644 --- a/Pinit/Pinit/Resources/Assets.xcassets/weatherIcon/10n.imageset/Contents.json +++ b/Pinit/Pinit/Resources/Assets.xcassets/weatherIcon/10n.imageset/Contents.json @@ -1,7 +1,7 @@ { "images" : [ { - "filename" : "10n.png", + "filename" : "10n.svg", "idiom" : "universal" } ], diff --git a/Pinit/Pinit/Resources/Assets.xcassets/weatherIcon/11d.imageset/11d.png b/Pinit/Pinit/Resources/Assets.xcassets/weatherIcon/11d.imageset/11d.png deleted file mode 100644 index 87aa027..0000000 Binary files a/Pinit/Pinit/Resources/Assets.xcassets/weatherIcon/11d.imageset/11d.png and /dev/null differ diff --git a/Pinit/Pinit/Resources/Assets.xcassets/weatherIcon/11d.imageset/11d.svg b/Pinit/Pinit/Resources/Assets.xcassets/weatherIcon/11d.imageset/11d.svg new file mode 100644 index 0000000..746d623 --- /dev/null +++ b/Pinit/Pinit/Resources/Assets.xcassets/weatherIcon/11d.imageset/11d.svg @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Pinit/Pinit/Resources/Assets.xcassets/weatherIcon/11d.imageset/Contents.json b/Pinit/Pinit/Resources/Assets.xcassets/weatherIcon/11d.imageset/Contents.json index a00034c..e8863dd 100644 --- a/Pinit/Pinit/Resources/Assets.xcassets/weatherIcon/11d.imageset/Contents.json +++ b/Pinit/Pinit/Resources/Assets.xcassets/weatherIcon/11d.imageset/Contents.json @@ -1,7 +1,7 @@ { "images" : [ { - "filename" : "11d.png", + "filename" : "11d.svg", "idiom" : "universal" } ], diff --git a/Pinit/Pinit/Resources/Assets.xcassets/weatherIcon/11n.imageset/11n.png b/Pinit/Pinit/Resources/Assets.xcassets/weatherIcon/11n.imageset/11n.png deleted file mode 100644 index 87aa027..0000000 Binary files a/Pinit/Pinit/Resources/Assets.xcassets/weatherIcon/11n.imageset/11n.png and /dev/null differ diff --git a/Pinit/Pinit/Resources/Assets.xcassets/weatherIcon/11n.imageset/11n.svg b/Pinit/Pinit/Resources/Assets.xcassets/weatherIcon/11n.imageset/11n.svg new file mode 100644 index 0000000..746d623 --- /dev/null +++ b/Pinit/Pinit/Resources/Assets.xcassets/weatherIcon/11n.imageset/11n.svg @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Pinit/Pinit/Resources/Assets.xcassets/weatherIcon/11n.imageset/Contents.json b/Pinit/Pinit/Resources/Assets.xcassets/weatherIcon/11n.imageset/Contents.json index 5c9ffcd..38657f0 100644 --- a/Pinit/Pinit/Resources/Assets.xcassets/weatherIcon/11n.imageset/Contents.json +++ b/Pinit/Pinit/Resources/Assets.xcassets/weatherIcon/11n.imageset/Contents.json @@ -1,7 +1,7 @@ { "images" : [ { - "filename" : "11n.png", + "filename" : "11n.svg", "idiom" : "universal" } ], diff --git a/Pinit/Pinit/Resources/Assets.xcassets/weatherIcon/13d.imageset/13d.png b/Pinit/Pinit/Resources/Assets.xcassets/weatherIcon/13d.imageset/13d.png deleted file mode 100644 index 5bff6c5..0000000 Binary files a/Pinit/Pinit/Resources/Assets.xcassets/weatherIcon/13d.imageset/13d.png and /dev/null differ diff --git a/Pinit/Pinit/Resources/Assets.xcassets/weatherIcon/13d.imageset/13d.svg b/Pinit/Pinit/Resources/Assets.xcassets/weatherIcon/13d.imageset/13d.svg new file mode 100644 index 0000000..bfade67 --- /dev/null +++ b/Pinit/Pinit/Resources/Assets.xcassets/weatherIcon/13d.imageset/13d.svg @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Pinit/Pinit/Resources/Assets.xcassets/weatherIcon/13d.imageset/Contents.json b/Pinit/Pinit/Resources/Assets.xcassets/weatherIcon/13d.imageset/Contents.json index 08250c4..74bb8ac 100644 --- a/Pinit/Pinit/Resources/Assets.xcassets/weatherIcon/13d.imageset/Contents.json +++ b/Pinit/Pinit/Resources/Assets.xcassets/weatherIcon/13d.imageset/Contents.json @@ -1,7 +1,7 @@ { "images" : [ { - "filename" : "13d.png", + "filename" : "13d.svg", "idiom" : "universal" } ], diff --git a/Pinit/Pinit/Resources/Assets.xcassets/weatherIcon/13n.imageset/13n.png b/Pinit/Pinit/Resources/Assets.xcassets/weatherIcon/13n.imageset/13n.png deleted file mode 100644 index 5bff6c5..0000000 Binary files a/Pinit/Pinit/Resources/Assets.xcassets/weatherIcon/13n.imageset/13n.png and /dev/null differ diff --git a/Pinit/Pinit/Resources/Assets.xcassets/weatherIcon/13n.imageset/13n.svg b/Pinit/Pinit/Resources/Assets.xcassets/weatherIcon/13n.imageset/13n.svg new file mode 100644 index 0000000..bf40bc7 --- /dev/null +++ b/Pinit/Pinit/Resources/Assets.xcassets/weatherIcon/13n.imageset/13n.svg @@ -0,0 +1,14 @@ + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Pinit/Pinit/Resources/Assets.xcassets/weatherIcon/13n.imageset/Contents.json b/Pinit/Pinit/Resources/Assets.xcassets/weatherIcon/13n.imageset/Contents.json index c9e69de..7e68ac3 100644 --- a/Pinit/Pinit/Resources/Assets.xcassets/weatherIcon/13n.imageset/Contents.json +++ b/Pinit/Pinit/Resources/Assets.xcassets/weatherIcon/13n.imageset/Contents.json @@ -1,7 +1,7 @@ { "images" : [ { - "filename" : "13n.png", + "filename" : "13n.svg", "idiom" : "universal" } ], diff --git a/Pinit/Pinit/Resources/Assets.xcassets/weatherIcon/50d.imageset/50d.png b/Pinit/Pinit/Resources/Assets.xcassets/weatherIcon/50d.imageset/50d.png deleted file mode 100644 index a1f918b..0000000 Binary files a/Pinit/Pinit/Resources/Assets.xcassets/weatherIcon/50d.imageset/50d.png and /dev/null differ diff --git a/Pinit/Pinit/Resources/Assets.xcassets/weatherIcon/50d.imageset/50d.svg b/Pinit/Pinit/Resources/Assets.xcassets/weatherIcon/50d.imageset/50d.svg new file mode 100644 index 0000000..e0bce92 --- /dev/null +++ b/Pinit/Pinit/Resources/Assets.xcassets/weatherIcon/50d.imageset/50d.svg @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Pinit/Pinit/Resources/Assets.xcassets/weatherIcon/50d.imageset/Contents.json b/Pinit/Pinit/Resources/Assets.xcassets/weatherIcon/50d.imageset/Contents.json index bdd7d65..45134fd 100644 --- a/Pinit/Pinit/Resources/Assets.xcassets/weatherIcon/50d.imageset/Contents.json +++ b/Pinit/Pinit/Resources/Assets.xcassets/weatherIcon/50d.imageset/Contents.json @@ -1,7 +1,7 @@ { "images" : [ { - "filename" : "50d.png", + "filename" : "50d.svg", "idiom" : "universal" } ], diff --git a/Pinit/Pinit/Resources/Assets.xcassets/weatherIcon/50n.imageset/50n.png b/Pinit/Pinit/Resources/Assets.xcassets/weatherIcon/50n.imageset/50n.png deleted file mode 100644 index a1f918b..0000000 Binary files a/Pinit/Pinit/Resources/Assets.xcassets/weatherIcon/50n.imageset/50n.png and /dev/null differ diff --git a/Pinit/Pinit/Resources/Assets.xcassets/weatherIcon/50n.imageset/50n.svg b/Pinit/Pinit/Resources/Assets.xcassets/weatherIcon/50n.imageset/50n.svg new file mode 100644 index 0000000..e0bce92 --- /dev/null +++ b/Pinit/Pinit/Resources/Assets.xcassets/weatherIcon/50n.imageset/50n.svg @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Pinit/Pinit/Resources/Assets.xcassets/weatherIcon/50n.imageset/Contents.json b/Pinit/Pinit/Resources/Assets.xcassets/weatherIcon/50n.imageset/Contents.json index e871e5b..e8e748d 100644 --- a/Pinit/Pinit/Resources/Assets.xcassets/weatherIcon/50n.imageset/Contents.json +++ b/Pinit/Pinit/Resources/Assets.xcassets/weatherIcon/50n.imageset/Contents.json @@ -1,7 +1,7 @@ { "images" : [ { - "filename" : "50n.png", + "filename" : "50n.svg", "idiom" : "universal" } ], diff --git a/Pinit/Pinit/Views/Home/HomeViewController.swift b/Pinit/Pinit/Views/Home/HomeViewController.swift index 1c3b5cd..3b907b1 100644 --- a/Pinit/Pinit/Views/Home/HomeViewController.swift +++ b/Pinit/Pinit/Views/Home/HomeViewController.swift @@ -58,6 +58,7 @@ class HomeViewController: UIViewController { override func viewWillAppear(_ animated: Bool) { super.viewWillAppear(animated) + print("HHH") // loadAnnotations() } @@ -193,8 +194,8 @@ extension HomeViewController: MKMapViewDelegate { let visibleAnnotations = mapView.annotations(in: mapView.visibleMapRect) let visibleMarkers = visibleAnnotations.compactMap { $0 as? CustomAnnotation } // BottomSheet의 CollectionView 업데이트 - adapter?.data = visibleMarkers.map{ $0.pinData } - bottomSheet.collectionView.reloadData() +// adapter?.data = visibleMarkers.map{ $0.pinData } +// bottomSheet.collectionView.reloadData() } } @@ -224,7 +225,13 @@ extension HomeViewController: PinCollectionViewAdapterDelegate { func selectedItem(selected: PinEntity) { print("Selected: \(selected)") // 여기서 화면 이동 - // PinDetailViewController(usecase: usecase, pin: selected) + let vc = PinDetailViewController(selected) + vc.sendToBack = {[weak self] entity in + guard let entity else { return } + let annotation = CustomAnnotation(pinData: entity) + self?.mapView.removeAnnotation(annotation) + } + present(vc, animated: true) } func deletedItem(deleted: PinEntity?) { diff --git a/Pinit/Pinit/Views/PinDetail/PinDetailHeader.swift b/Pinit/Pinit/Views/PinDetail/PinDetailHeader.swift index 884dba7..e3f36e3 100644 --- a/Pinit/Pinit/Views/PinDetail/PinDetailHeader.swift +++ b/Pinit/Pinit/Views/PinDetail/PinDetailHeader.swift @@ -34,14 +34,15 @@ class PinDetailHeader: UIView { let label = UILabel() label.text = "핀 제목 예시" label.font = DesignSystemFont.Pretendard_Bold30.value + label.numberOfLines = 0 return label }() - // 핀 날씨 - public lazy var pinWeather: UILabel = { - let label = UILabel() - label.text = "맑음" - return label + public lazy var pinWeather: UIImageView = { + let view = UIImageView() + view.image = UIImage(named: "clear-day") + view.contentMode = .scaleAspectFit + return view }() // 핀 생성 날짜 @@ -106,19 +107,21 @@ class PinDetailHeader: UIView { // subView pinTitle.snp.makeConstraints { $0.top.equalToSuperview().inset(10) + $0.width.lessThanOrEqualTo(260) + $0.width.greaterThanOrEqualTo(160) $0.leading.equalToSuperview().inset(10) } pinWeather.snp.makeConstraints { - $0.top.equalToSuperview().inset(10) - $0.leading.equalTo(pinTitle.snp.trailing).offset(10) - $0.bottomMargin.equalTo(pinTitle.snp.bottom) + $0.trailing.equalTo(pinMenuButton.snp.leading).offset(-10) + + $0.top.equalTo(pinTitle).offset(5) + $0.width.height.equalTo(40) } pinMenuButton.snp.makeConstraints { - $0.top.equalToSuperview().inset(10) + $0.top.equalTo(pinTitle) $0.trailing.equalToSuperview().inset(10) - } pinDate.snp.makeConstraints { @@ -151,3 +154,6 @@ class PinDetailHeader: UIView { PinDetailHeader() } +#Preview { + PinDetailViewController(PinEntity.sampleData[0]) +} diff --git a/Pinit/Pinit/Views/PinDetail/PinDetailViewController.swift b/Pinit/Pinit/Views/PinDetail/PinDetailViewController.swift index cb9851d..c4b0f82 100644 --- a/Pinit/Pinit/Views/PinDetail/PinDetailViewController.swift +++ b/Pinit/Pinit/Views/PinDetail/PinDetailViewController.swift @@ -16,6 +16,8 @@ final class PinDetailViewController: UIViewController { private var pinTableView = UITableView(frame: .zero, style: .grouped) private var pinEntity: PinEntity + private var useCase = DIContainer.usecase + var sendToBack: ((PinEntity?) -> Void)! init(_ entity: PinEntity) { self.pinEntity = entity @@ -43,9 +45,18 @@ final class PinDetailViewController: UIViewController { setupReviewTable() addComponents() + loadReviewData() + + reviewPanelContainer.commitButton.addTarget(self, action: #selector(onCommitButtonTapped), for: .touchUpInside) } + private func loadReviewData() { + self.useCase.fetchAllReviewsByPinID(pinID: self.pinEntity.pin_id) {[weak self] items in + self?.datasource = items + self?.pinTableView.reloadData() + } + } // MARK: - View // 지도 뷰 @@ -55,7 +66,7 @@ final class PinDetailViewController: UIViewController { let long = pinEntity.longitude let center = CLLocationCoordinate2D(latitude: lat, longitude: long) // San Francisco, CA - let region = MKCoordinateRegion(center: center, span: MKCoordinateSpan(latitudeDelta: 0.05, longitudeDelta: 0.05)) + let region = MKCoordinateRegion(center: center, span: MKCoordinateSpan(latitudeDelta: 0.005, longitudeDelta: 0.005)) map.setRegion(region, animated: true) map.showsUserLocation = true @@ -146,6 +157,17 @@ extension PinDetailViewController { self.dismiss(animated: true, completion: nil) } + @objc func onCommitButtonTapped() { + var review: ReviewEntity = ReviewEntity(id: UUID(), pinID: pinEntity.pin_id, date: Date(), description: reviewPanelContainer.reviewText.text ?? "") + + reviewPanelContainer.reviewText.text = "" + + useCase.addReview(review: review) + self.datasource.append(review) + + self.pinTableView.reloadData() + } + @objc func pinMenuButtonTapped() { let actionSheet = UIAlertController(title: nil, message: nil, preferredStyle: .actionSheet) @@ -155,8 +177,11 @@ extension PinDetailViewController { vc.modalPresentationStyle = .fullScreen self.present(vc, animated: true, completion: nil) } - let deleteAction = UIAlertAction(title: "삭제", style: .destructive) { _ in + let deleteAction = UIAlertAction(title: "삭제", style: .destructive) {[weak self] _ in print("삭제") + self?.useCase.deletePin(pinID: (self?.pinEntity.pin_id)!) + self?.sendToBack(self?.pinEntity) + self?.dismiss(animated: true, completion: nil) } let cancelAction = UIAlertAction(title: "취소", style: .cancel, handler: nil) @@ -180,15 +205,15 @@ extension PinDetailViewController: UITableViewDataSource, UITableViewDelegate { } // swipeAction -// func tableView(_ tableView: UITableView, trailingSwipeActionsConfigurationForRowAt indexPath: IndexPath) -> UISwipeActionsConfiguration? { -// let action = UIContextualAction(style: .destructive, title: "삭제") { [weak self] _, _, completion in -// if let deleted = self?.datasource.remove(at: indexPath.row).id { -// self?.coreData.deleteContent(id: deleted) -// self?.pinTableView.deleteRows(at: [indexPath], with: .automatic) -// } -// } -// return UISwipeActionsConfiguration(actions: [action]) -// } + func tableView(_ tableView: UITableView, trailingSwipeActionsConfigurationForRowAt indexPath: IndexPath) -> UISwipeActionsConfiguration? { + let action = UIContextualAction(style: .destructive, title: "삭제") { [weak self] _, _, completion in + if let deleted = self?.datasource.remove(at: indexPath.row).id { + self?.useCase.deleteReview(reviewId: deleted) + self?.pinTableView.deleteRows(at: [indexPath], with: .automatic) + } + } + return UISwipeActionsConfiguration(actions: [action]) + } // numberOfRowsInSection func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int { @@ -216,7 +241,7 @@ extension PinDetailViewController: UITableViewDataSource, UITableViewDelegate { header.pinDate.text = pinEntity.date.koreanDateString() header.pinTitle.text = pinEntity.title header.pinImageView.image = pinEntity.mediaPath - header.pinWeather.text = pinEntity.weather + header.pinWeather.image = UIImage(named: pinEntity.weather) header.pinDescription.text = pinEntity.description header.pinMenuButton.addTarget(self, action: #selector(pinMenuButtonTapped), for: .touchUpInside) return header @@ -237,7 +262,6 @@ extension PinDetailViewController: UITableViewDataSource, UITableViewDelegate { func tableView(_ tableView: UITableView, heightForRowAt indexPath: IndexPath) -> CGFloat { return 70 } - }