diff --git a/DooRiBon/DooRiBon/Resources/Assets.xcassets/iconBoardAimActiveImg.imageset/Contents.json b/DooRiBon/DooRiBon/Resources/Assets.xcassets/iconBoardAimActiveImg.imageset/Contents.json new file mode 100644 index 0000000..736917e --- /dev/null +++ b/DooRiBon/DooRiBon/Resources/Assets.xcassets/iconBoardAimActiveImg.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "iconBoardAimActiveImg.png", + "scale" : "1x", + "idiom" : "universal" + }, + { + "idiom" : "universal", + "filename" : "iconBoardAimActiveImg@2x.png", + "scale" : "2x" + }, + { + "filename" : "iconBoardAimActiveImg@3x.png", + "idiom" : "universal", + "scale" : "3x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/DooRiBon/DooRiBon/Resources/Assets.xcassets/iconBoardAimActiveImg.imageset/iconBoardAimActiveImg.png b/DooRiBon/DooRiBon/Resources/Assets.xcassets/iconBoardAimActiveImg.imageset/iconBoardAimActiveImg.png new file mode 100644 index 0000000..624ab39 Binary files /dev/null and b/DooRiBon/DooRiBon/Resources/Assets.xcassets/iconBoardAimActiveImg.imageset/iconBoardAimActiveImg.png differ diff --git a/DooRiBon/DooRiBon/Resources/Assets.xcassets/iconBoardAimActiveImg.imageset/iconBoardAimActiveImg@2x.png b/DooRiBon/DooRiBon/Resources/Assets.xcassets/iconBoardAimActiveImg.imageset/iconBoardAimActiveImg@2x.png new file mode 100644 index 0000000..2446f79 Binary files /dev/null and b/DooRiBon/DooRiBon/Resources/Assets.xcassets/iconBoardAimActiveImg.imageset/iconBoardAimActiveImg@2x.png differ diff --git a/DooRiBon/DooRiBon/Resources/Assets.xcassets/iconBoardAimActiveImg.imageset/iconBoardAimActiveImg@3x.png b/DooRiBon/DooRiBon/Resources/Assets.xcassets/iconBoardAimActiveImg.imageset/iconBoardAimActiveImg@3x.png new file mode 100644 index 0000000..f73fb31 Binary files /dev/null and b/DooRiBon/DooRiBon/Resources/Assets.xcassets/iconBoardAimActiveImg.imageset/iconBoardAimActiveImg@3x.png differ diff --git a/DooRiBon/DooRiBon/Resources/Assets.xcassets/iconBoardCheckActiveImg.imageset/Contents.json b/DooRiBon/DooRiBon/Resources/Assets.xcassets/iconBoardCheckActiveImg.imageset/Contents.json new file mode 100644 index 0000000..2f8d9e3 --- /dev/null +++ b/DooRiBon/DooRiBon/Resources/Assets.xcassets/iconBoardCheckActiveImg.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "scale" : "1x", + "idiom" : "universal", + "filename" : "iconBoardCheckActiveImg.png" + }, + { + "filename" : "iconBoardCheckActiveImg@2x.png", + "scale" : "2x", + "idiom" : "universal" + }, + { + "scale" : "3x", + "idiom" : "universal", + "filename" : "iconBoardCheckActiveImg@3x.png" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/DooRiBon/DooRiBon/Resources/Assets.xcassets/iconBoardCheckActiveImg.imageset/iconBoardCheckActiveImg.png b/DooRiBon/DooRiBon/Resources/Assets.xcassets/iconBoardCheckActiveImg.imageset/iconBoardCheckActiveImg.png new file mode 100644 index 0000000..7157fe8 Binary files /dev/null and b/DooRiBon/DooRiBon/Resources/Assets.xcassets/iconBoardCheckActiveImg.imageset/iconBoardCheckActiveImg.png differ diff --git a/DooRiBon/DooRiBon/Resources/Assets.xcassets/iconBoardCheckActiveImg.imageset/iconBoardCheckActiveImg@2x.png b/DooRiBon/DooRiBon/Resources/Assets.xcassets/iconBoardCheckActiveImg.imageset/iconBoardCheckActiveImg@2x.png new file mode 100644 index 0000000..55019d6 Binary files /dev/null and b/DooRiBon/DooRiBon/Resources/Assets.xcassets/iconBoardCheckActiveImg.imageset/iconBoardCheckActiveImg@2x.png differ diff --git a/DooRiBon/DooRiBon/Resources/Assets.xcassets/iconBoardCheckActiveImg.imageset/iconBoardCheckActiveImg@3x.png b/DooRiBon/DooRiBon/Resources/Assets.xcassets/iconBoardCheckActiveImg.imageset/iconBoardCheckActiveImg@3x.png new file mode 100644 index 0000000..8bd85f6 Binary files /dev/null and b/DooRiBon/DooRiBon/Resources/Assets.xcassets/iconBoardCheckActiveImg.imageset/iconBoardCheckActiveImg@3x.png differ diff --git a/DooRiBon/DooRiBon/Resources/Assets.xcassets/iconBoardGoalActiveImg.imageset/Contents.json b/DooRiBon/DooRiBon/Resources/Assets.xcassets/iconBoardGoalActiveImg.imageset/Contents.json new file mode 100644 index 0000000..ce59e5b --- /dev/null +++ b/DooRiBon/DooRiBon/Resources/Assets.xcassets/iconBoardGoalActiveImg.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "filename" : "iconBoardGoalActiveImg.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "idiom" : "universal", + "filename" : "iconBoardGoalActiveImg@2x.png", + "scale" : "2x" + }, + { + "filename" : "iconBoardGoalActiveImg@3x.png", + "scale" : "3x", + "idiom" : "universal" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/DooRiBon/DooRiBon/Resources/Assets.xcassets/iconBoardGoalActiveImg.imageset/iconBoardGoalActiveImg.png b/DooRiBon/DooRiBon/Resources/Assets.xcassets/iconBoardGoalActiveImg.imageset/iconBoardGoalActiveImg.png new file mode 100644 index 0000000..5bc0b4d Binary files /dev/null and b/DooRiBon/DooRiBon/Resources/Assets.xcassets/iconBoardGoalActiveImg.imageset/iconBoardGoalActiveImg.png differ diff --git a/DooRiBon/DooRiBon/Resources/Assets.xcassets/iconBoardGoalActiveImg.imageset/iconBoardGoalActiveImg@2x.png b/DooRiBon/DooRiBon/Resources/Assets.xcassets/iconBoardGoalActiveImg.imageset/iconBoardGoalActiveImg@2x.png new file mode 100644 index 0000000..cfae8e0 Binary files /dev/null and b/DooRiBon/DooRiBon/Resources/Assets.xcassets/iconBoardGoalActiveImg.imageset/iconBoardGoalActiveImg@2x.png differ diff --git a/DooRiBon/DooRiBon/Resources/Assets.xcassets/iconBoardGoalActiveImg.imageset/iconBoardGoalActiveImg@3x.png b/DooRiBon/DooRiBon/Resources/Assets.xcassets/iconBoardGoalActiveImg.imageset/iconBoardGoalActiveImg@3x.png new file mode 100644 index 0000000..1b8a4db Binary files /dev/null and b/DooRiBon/DooRiBon/Resources/Assets.xcassets/iconBoardGoalActiveImg.imageset/iconBoardGoalActiveImg@3x.png differ diff --git a/DooRiBon/DooRiBon/Resources/Assets.xcassets/iconBoardRoleActiveImg.imageset/Contents.json b/DooRiBon/DooRiBon/Resources/Assets.xcassets/iconBoardRoleActiveImg.imageset/Contents.json new file mode 100644 index 0000000..6599d5e --- /dev/null +++ b/DooRiBon/DooRiBon/Resources/Assets.xcassets/iconBoardRoleActiveImg.imageset/Contents.json @@ -0,0 +1,23 @@ +{ + "images" : [ + { + "idiom" : "universal", + "filename" : "iconBoardRoleActiveImg.png", + "scale" : "1x" + }, + { + "idiom" : "universal", + "filename" : "iconBoardRoleActiveImg@2x.png", + "scale" : "2x" + }, + { + "scale" : "3x", + "idiom" : "universal", + "filename" : "iconBoardRoleActiveImg@3x.png" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/DooRiBon/DooRiBon/Resources/Assets.xcassets/iconBoardRoleActiveImg.imageset/iconBoardRoleActiveImg.png b/DooRiBon/DooRiBon/Resources/Assets.xcassets/iconBoardRoleActiveImg.imageset/iconBoardRoleActiveImg.png new file mode 100644 index 0000000..960f66c Binary files /dev/null and b/DooRiBon/DooRiBon/Resources/Assets.xcassets/iconBoardRoleActiveImg.imageset/iconBoardRoleActiveImg.png differ diff --git a/DooRiBon/DooRiBon/Resources/Assets.xcassets/iconBoardRoleActiveImg.imageset/iconBoardRoleActiveImg@2x.png b/DooRiBon/DooRiBon/Resources/Assets.xcassets/iconBoardRoleActiveImg.imageset/iconBoardRoleActiveImg@2x.png new file mode 100644 index 0000000..0694357 Binary files /dev/null and b/DooRiBon/DooRiBon/Resources/Assets.xcassets/iconBoardRoleActiveImg.imageset/iconBoardRoleActiveImg@2x.png differ diff --git a/DooRiBon/DooRiBon/Resources/Assets.xcassets/iconBoardRoleActiveImg.imageset/iconBoardRoleActiveImg@3x.png b/DooRiBon/DooRiBon/Resources/Assets.xcassets/iconBoardRoleActiveImg.imageset/iconBoardRoleActiveImg@3x.png new file mode 100644 index 0000000..d694710 Binary files /dev/null and b/DooRiBon/DooRiBon/Resources/Assets.xcassets/iconBoardRoleActiveImg.imageset/iconBoardRoleActiveImg@3x.png differ diff --git a/DooRiBon/DooRiBon/Sources/Base/Board/BoardViewController.swift b/DooRiBon/DooRiBon/Sources/Base/Board/BoardViewController.swift index 1cec291..79341f8 100644 --- a/DooRiBon/DooRiBon/Sources/Base/Board/BoardViewController.swift +++ b/DooRiBon/DooRiBon/Sources/Base/Board/BoardViewController.swift @@ -10,6 +10,7 @@ import UIKit struct BoardPopupData { var title: String var description: String + var illust: String } // 태그 @@ -58,10 +59,13 @@ class BoardViewController: UIViewController { description: "이번 여행에서 꼭 확인해야\n하는 것들을 미리 공유해요") ] let popupData = [ - BoardPopupData(title: "여행 목표", description: "이번 여행의 목표를 함께 공유하세요!"), - BoardPopupData(title: "꼭 알아줘", description: "이번 여행에 함께하는 사람들에게\n나에 대해 꼭 알리고 싶은 것을 작성해주세요!"), - BoardPopupData(title: "역할 분담", description: "이번 여행에서 나는 이런 역할을 담당할게!"), - BoardPopupData(title: "체크리스트", description: "준비는 철저하게! 필요한 것을 미리 체크하세요"), + BoardPopupData(title: "여행 목표", description: "이번 여행의 목표를 함께 공유하세요!", illust: "iconBoardGoalActiveImg"), + BoardPopupData(title: "꼭 알아줘", description: """ + 이번 여행에 함께하는 사람들에게 + 나에 대해 꼭 알리고 싶은 것을 작성해주세요! + """, illust: "iconBoardAimActiveImg"), + BoardPopupData(title: "역할 분담", description: "이번 여행에서 나는 이런 역할을 담당할게!", illust: "iconBoardRoleActiveImg"), + BoardPopupData(title: "체크리스트", description: "준비는 철저하게! 필요한 것을 미리 체크하세요", illust: "iconBoardCheckActiveImg"), ] private var selectedData: DummyDataModel? { @@ -368,6 +372,8 @@ extension BoardViewController: UITableViewDelegate, BoardSectionHeaderViewDelega boardPopupView .setTitle(popupData[selectedTagIndex].title) .setDescription(popupData[selectedTagIndex].description) + .setIllust(popupData[selectedTagIndex].illust) + .present { event in if event == .confirm { self.postTripBoard(contents: self.contents, groupId: self.thisID, tag: description) @@ -402,6 +408,7 @@ extension BoardViewController: UITableViewDelegate, BoardSectionHeaderViewDelega boardPopupView .setTitle(self.popupData[self.selectedTagIndex].title) .setDescription(self.popupData[self.selectedTagIndex].description) + .setIllust(self.popupData[self.selectedTagIndex].illust) .setTextView(boardData.content) .present { event in if event == .confirm { diff --git a/DooRiBon/DooRiBon/Sources/Base/Board/Cells/BoardNoDataTableViewCell.xib b/DooRiBon/DooRiBon/Sources/Base/Board/Cells/BoardNoDataTableViewCell.xib index 9db6a40..a9768aa 100644 --- a/DooRiBon/DooRiBon/Sources/Base/Board/Cells/BoardNoDataTableViewCell.xib +++ b/DooRiBon/DooRiBon/Sources/Base/Board/Cells/BoardNoDataTableViewCell.xib @@ -33,13 +33,13 @@ -