-
Notifications
You must be signed in to change notification settings - Fork 2
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Browse files
Browse the repository at this point in the history
…detail Feat/#115 Bookmark Detail
- Loading branch information
Showing
14 changed files
with
238 additions
and
26 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
16 changes: 16 additions & 0 deletions
16
.../src/main/java/com/rollthedice/backend/domain/bookmark/dto/response/BookmarkResponse.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,16 @@ | ||
| package com.rollthedice.backend.domain.bookmark.dto.response; | ||
|
|
||
| import lombok.AllArgsConstructor; | ||
| import lombok.Builder; | ||
| import lombok.Getter; | ||
| import lombok.NoArgsConstructor; | ||
|
|
||
| @Getter | ||
| @Builder | ||
| @NoArgsConstructor | ||
| @AllArgsConstructor | ||
| public class BookmarkResponse { | ||
| private Long id; | ||
| private Boolean isBookmarked; | ||
|
|
||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
91 changes: 91 additions & 0 deletions
91
iOS/RollTheDice/RollTheDice/Source/View/Debate/ChatList/ChatListView.swift
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,91 @@ | ||
| // | ||
| // ChatListView.swift | ||
| // RollTheDice | ||
| // | ||
| // Created by Subeen on 4/30/24. | ||
| // | ||
|
|
||
| import SwiftUI | ||
|
|
||
| struct ChatListView: View { | ||
|
|
||
| @EnvironmentObject var pathModel: PathModel | ||
|
|
||
| var body: some View { | ||
| ZStack { | ||
| Color.backgroundDark.ignoresSafeArea(.all) | ||
| ScrollView { | ||
| VStack(alignment: .leading, spacing: 44) { | ||
| recentNewsView | ||
| debateChatListView | ||
| } | ||
| .padding(.horizontal, 120) | ||
| } | ||
| .scrollIndicators(.hidden) | ||
| } | ||
| } | ||
|
|
||
| @ViewBuilder | ||
| var recentNewsView: some View { | ||
| VStack(alignment: .leading) { | ||
| Text("최근 본 뉴스") | ||
| .foregroundStyle(.basicWhite) | ||
| .font(.pretendardBold32) | ||
| HStack { | ||
| RecentNewsCardView() | ||
| Spacer() | ||
| RecentNewsCardView() | ||
| Spacer() | ||
| RecentNewsCardView() | ||
| } | ||
| } | ||
| } | ||
|
|
||
| @ViewBuilder | ||
| var debateChatListView: some View { | ||
| VStack(alignment: .leading, spacing: 26) { | ||
| Text("채팅방") | ||
| .foregroundStyle(.basicWhite) | ||
| .font(.pretendardBold32) | ||
| debateChatCellView | ||
| debateChatCellView | ||
| debateChatCellView | ||
| } | ||
| } | ||
|
|
||
| var debateChatCellView: some View { | ||
| HStack { | ||
| HStack(alignment: .center, spacing: 16) { | ||
| Text("🏛️") | ||
| .padding(.leading, 26) | ||
| .font(.pretendardBold32) | ||
| Text("경제 기사 경제 기사저제목목제목 제목") | ||
| .foregroundStyle(.gray07) | ||
| .font(.pretendardBold24) | ||
| .padding(.vertical, 24) | ||
|
|
||
| Spacer() | ||
| Image(.chevronRight) | ||
| } | ||
| .background(.gray01) | ||
| .clipShape(RoundedRectangle(cornerRadius: 8)) | ||
| .padding(.trailing, 16) | ||
|
|
||
| //TODO: 버튼 영역 수정하기 | ||
| Button { | ||
| pathModel.paths.append(.debateSummaryView) | ||
| } label: { | ||
| Image(.chevronLeft) | ||
| // .background(.gray01) | ||
|
|
||
| } | ||
| .frame(width: 80, height: 80) | ||
| .background(.gray01) | ||
| .clipShape(RoundedRectangle(cornerRadius: 8)) | ||
| } | ||
| } | ||
| } | ||
|
|
||
| #Preview { | ||
| ChatListView() | ||
| } |
59 changes: 59 additions & 0 deletions
59
iOS/RollTheDice/RollTheDice/Source/View/Debate/ChatList/RecentNewsCardView.swift
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,59 @@ | ||
| // | ||
| // RecentNewsCardView.swift | ||
| // RollTheDice | ||
| // | ||
| // Created by Subeen on 4/30/24. | ||
| // | ||
|
|
||
| import SwiftUI | ||
|
|
||
| struct RecentNewsCardView: View { | ||
| var body: some View { | ||
| HStack { | ||
| titleView | ||
| } | ||
| // .frame(width: 260, height: 244) | ||
| .clipShape(RoundedRectangle(cornerRadius: 8)) | ||
| } | ||
|
|
||
| var titleView: some View { | ||
| ZStack { | ||
| VStack(alignment: .center, spacing: 20) { | ||
| Image(.chevronLeft) | ||
| Text("제목ahrhrhra제목 제목 미젝ㅁㄱㅈ 메좀ㄱㅈ게조깆거ㅣㅓ린러.ㄴ릴") | ||
| .multilineTextAlignment(.center) | ||
| .foregroundStyle(.gray07) | ||
| .font(.pretendardBold24) | ||
| .frame(width: 240, height: 96) | ||
| .padding(.horizontal, 10) | ||
| .padding(.vertical, 30) | ||
| .background(.gray01) | ||
| .clipShape(RoundedRectangle(cornerRadius: 2)) | ||
| .overlay { | ||
| RoundedRectangle(cornerRadius: 2) | ||
| .stroke(Color.gray05, lineWidth: 1.0) | ||
| } | ||
| .shadow(color: .basicBlack.opacity(0.1), radius: 2) | ||
| Button { | ||
|
|
||
| } label: { | ||
| Text("토론 시작하기") | ||
| .foregroundStyle(.basicWhite) | ||
| .font(.pretendardRegular14) | ||
| .padding(.horizontal, 38) | ||
| .padding(.vertical, 10) | ||
| .background(.primary01) | ||
| .clipShape(RoundedRectangle(cornerRadius: 16)) | ||
| } | ||
| } | ||
| } | ||
| .padding(.horizontal, 20) | ||
| .padding(.top, 24) | ||
| .padding(.bottom, 32) | ||
| .background(.gray02) | ||
| } | ||
| } | ||
|
|
||
| #Preview { | ||
| RecentNewsCardView() | ||
| } |
Oops, something went wrong.