Skip to content

[FEAT/#99] 공고 뷰 / 스크랩 연동#131

Merged
arinming merged 25 commits intodevelopfrom
feat/#99-scrap-add-api
Jul 18, 2024
Merged

[FEAT/#99] 공고 뷰 / 스크랩 연동#131
arinming merged 25 commits intodevelopfrom
feat/#99-scrap-add-api

Conversation

@arinming
Copy link
Copy Markdown
Contributor

⛳️ Work Description

  • 스크랩 추가
  • 스크랩 삭제
  • 다이얼로그 구현

📸 Screenshot

99.mp4

📢 To Reviewers

  • 두찜맛있겠다

arinming added 24 commits July 17, 2024 05:33
…-api

# Conflicts:
#	app/src/main/java/com/terning/point/di/DataSourceModule.kt
#	app/src/main/java/com/terning/point/di/RepositoryModule.kt
#	app/src/main/java/com/terning/point/di/ServiceModule.kt
…-api

# Conflicts:
#	app/src/main/java/com/terning/point/di/RepositoryModule.kt
#	app/src/main/java/com/terning/point/di/ServiceModule.kt
#	data/src/main/java/com/terning/data/dto/response/SearchViewsResponseDto.kt
…-api

# Conflicts:
#	app/src/main/java/com/terning/point/di/AuthInterceptor.kt
#	app/src/main/java/com/terning/point/di/DataSourceModule.kt
#	app/src/main/java/com/terning/point/di/RepositoryModule.kt
#	app/src/main/java/com/terning/point/di/ServiceModule.kt
#	feature/src/main/java/com/terning/feature/main/MainNavigator.kt
…-api

# Conflicts:
#	app/src/main/java/com/terning/point/di/AuthInterceptor.kt
#	app/src/main/java/com/terning/point/di/DataSourceModule.kt
#	app/src/main/java/com/terning/point/di/RepositoryModule.kt
#	app/src/main/java/com/terning/point/di/ServiceModule.kt
#	data/src/main/java/com/terning/data/service/InternService.kt
#	feature/src/main/java/com/terning/feature/intern/InternRoute.kt
#	feature/src/main/java/com/terning/feature/intern/InternViewModel.kt
#	feature/src/main/java/com/terning/feature/main/MainNavigator.kt
#	feature/src/main/java/com/terning/feature/search/search/component/SearchIntern.kt
…-api

# Conflicts:
#	app/src/main/java/com/terning/point/di/DataSourceModule.kt
#	app/src/main/java/com/terning/point/di/RepositoryModule.kt
#	app/src/main/java/com/terning/point/di/ServiceModule.kt
…-api

# Conflicts:
#	data/src/main/java/com/terning/data/repositoryimpl/SearchRepositoryImpl.kt
#	domain/src/main/java/com/terning/domain/repository/SearchRepository.kt
#	feature/src/main/java/com/terning/feature/search/search/SearchRoute.kt
#	feature/src/main/java/com/terning/feature/search/search/component/SearchInternList.kt
#	feature/src/main/java/com/terning/feature/search/search/model/SearchScrapsListState.kt
#	feature/src/main/java/com/terning/feature/search/search/model/SearchViewsListState.kt
@arinming arinming added FEAT ✨ 새로운 기능 구현 아린💛 아린 labels Jul 18, 2024
@arinming arinming requested review from boiledeggg and leeeyubin July 18, 2024 10:51
@arinming arinming self-assigned this Jul 18, 2024
@arinming arinming linked an issue Jul 18, 2024 that may be closed by this pull request
2 tasks
Copy link
Copy Markdown
Member

@boiledeggg boiledeggg left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

엄청나네요!! 잘 써먹어보도록 하겠습니당!!

Copy link
Copy Markdown
Member

@leeeyubin leeeyubin left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

이제 진짜 얼마 안 남았다!!! 아린언니 화이팅!!!

Comment on lines 49 to +50
modifier = Modifier
.size(width = 300.dp, height = 412.dp)
.size(width = 300.dp, height = 472.dp)
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ㅜㅜ,,,,언젠가 지울 수 있길,,,

Comment on lines 72 to +73
internshipAnnouncementId = 1,
title = "sadsa",
title = "안녕안녕안녕안녕안녕안녕안녕안녕안녕안녕안녕안녕안녕안녕안녕안녕안녕안녕안녕안녕",
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

이건 몬가용 ㅋㅋㅋ

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

3줄 뷰 확인용으로,.,.흑흡 석준오빠가 구현하면서 없애줄거예용ㅇ

Comment on lines +61 to +64
).onSuccess {
_scrapState.update {
it.copy(isScrap = UiState.Success(true))
}
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

it을 response처럼 명시해주면 더 좋을 것 같아요!

Comment on lines +234 to +250
onButtonClick = {
if (state.isPaletteOpen) {
viewModel.updatePaletteOpen(false)
viewModel.postScrap(announcementId, selectedColorIndex)
viewModel.updateColorChange(false)
viewModel.updateScrapDialogVisible(false)
} else {
if (state.isColorChange) {
viewModel.postScrap(announcementId, selectedColorIndex)
viewModel.updateColorChange(false)
} else {
viewModel.postScrap(announcementId, 0)
}
viewModel.updateScrapDialogVisible(false)
}
},
modifier = Modifier.padding(bottom = 8.dp)
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

if~else문이 많이 반복되는 것 같은데 시간 되면 함수로 빼줘도 좋을 것 같아요!

@arinming arinming merged commit ea5e24b into develop Jul 18, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

FEAT ✨ 새로운 기능 구현 아린💛 아린

Projects

Status: Done

Development

Successfully merging this pull request may close these issues.

[FEAT] 공고 뷰 / 스크랩 추가 연동

3 participants