Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[FEAT] Compose 커스텀 갤러리 구현 #121

Merged
merged 16 commits into from
Aug 25, 2024
Merged

[FEAT] Compose 커스텀 갤러리 구현 #121

merged 16 commits into from
Aug 25, 2024

Conversation

SsongSik
Copy link
Collaborator

💻주요 작업 내용

커스텀 갤러리 구현

  1. 프로필 수정쪽에서 넘어온 갤러리
  2. 시야후기 작성에서 넘어온 갤러리
    두 가지 타입으로 분기하여 처리하였습니다.
    @minju1459 @BENDENG1 민주랑 균욱이형 쪽 코드랑 같이 있어서 내가 체크하긴 했지만 코드 병합할 때 충돌나면 바로 노티 주세요 !
KakaoTalk_Video_2024-08-25-16-57-45.mp4

SsongSik added 15 commits August 15, 2024 22:00
@SsongSik
[fix/#83] 커스텀 갤러리 구현중..
d23d72b
@SsongSik
[feat/#83] 커스텀 갤러리 진행중..
1dd79c3
@SsongSik
Merge remote-tracking branch 'origin/main' into feature/#83-custom-ph…
2c13be9 
…oto-list

# Conflicts:
#	buildSrc/build/kotlin/compileKotlin/cacheable/last-build.bin
#	buildSrc/build/kotlin/compileKotlin/local-state/build-history.bin
#	buildSrc/build/libs/buildSrc.jar
#	presentation/src/main/java/com/dpm/presentation/home/HomeActivity.kt
@SsongSik
[feat/#83] 커스텀 갤러리 구현 거의 끝...
f259ca3
@SsongSik
[feat/#83] 갤러리화면 상단뷰 추가
81f68b7
@SsongSik
Merge remote-tracking branch 'origin/main' into feature/#83-custom-ph…
31283b3 
…oto-list

# Conflicts:
#	app/src/main/AndroidManifest.xml
#	buildSrc/build/kotlin/compileKotlin/cacheable/last-build.bin
#	buildSrc/build/kotlin/compileKotlin/local-state/build-history.bin
#	buildSrc/build/libs/buildSrc.jar
@SsongSik
[feat/#83] 갤러리 상단바 구현
b8ad391
@SsongSik
[feat/#83] 이미지 다이얼로그, 갤러리 연결
b5cdac5
@SsongSik
[feat/#83] 이미지 타입 추가
1095ed7
@SsongSik
Merge remote-tracking branch 'origin/main' into feature/#83-custom-ph…
91710e4 
…oto-list

# Conflicts:
#	buildSrc/build/kotlin/buildSrcjar-classes.txt
#	buildSrc/build/kotlin/compileKotlin/cacheable/last-build.bin
#	buildSrc/build/kotlin/compileKotlin/local-state/build-history.bin
#	buildSrc/build/libs/buildSrc.jar
@SsongSik
[feat/#83] 갤러리뷰 완성
cb28d0d
@SsongSik
[feat/#83] 프로필 인텐트 타입 설정
aa49a1e
@SsongSik
[feat/#83] 프로필 타입 텍스트 UI 분기
c2e8748
@SsongSik
[feat/#83] 화면타입 타이틀텍스트 분기
7f2aea6
@SsongSik
[feat/#83] 선택된 이미지 스크린타입 UI 분기
7e3ffdb
@SsongSik SsongSik added this to the 2차 스프린트 개발 milestone Aug 25, 2024
@SsongSik SsongSik self-assigned this Aug 25, 2024
minju1459
minju1459 approved these changes Aug 25, 2024
View reviewed changes
Copy link
Collaborator

@minju1459 minju1459 left a comment

Choose a reason for hiding this comment

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

너무 너무 수고하셨습니다 ~~! 👍👍 병합 시 충돌나면 바로 노티 드릴게요 📝

Jokwanhee
Jokwanhee approved these changes Aug 25, 2024
View reviewed changes
Copy link
Member

@Jokwanhee Jokwanhee left a comment

Choose a reason for hiding this comment

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

고생하셨슴돠~ 빛성식✨✨

@SsongSik
Merge remote-tracking branch 'origin/main' into feature/#83-custom-ph…
191c06f 
…oto-list

# Conflicts:
#	buildSrc/build/kotlin/compileKotlin/cacheable/last-build.bin
#	buildSrc/build/kotlin/compileKotlin/local-state/build-history.bin
#	buildSrc/build/libs/buildSrc.jar
@SsongSik SsongSik merged commit 8829e50 into main Aug 25, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Jokwanhee Jokwanhee Jokwanhee approved these changes

@minju1459 minju1459 minju1459 approved these changes

@BENDENG1 BENDENG1 Awaiting requested review from BENDENG1

Assignees

@SsongSik SsongSik

Labels
🍽개발자_윤성식 윤성식 🎇Feature 기능 개발
Projects
None yet
Milestone
2차 스프린트 개발
Development

Successfully merging this pull request may close these issues.

[FEATURE] 커스텀 갤러리 구현
3 participants
@SsongSik @minju1459 @Jokwanhee