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] 합동 세미나 기능 구현 Main branch로 머지 #47

Merged
merged 288 commits into from
May 25, 2024
Merged

[feat] 합동 세미나 기능 구현 Main branch로 머지 #47

merged 288 commits into from
May 25, 2024

Conversation

jihyunniiii
Copy link
Contributor

Related issue 🛠

Work Description ✏️

  • 합동 세미나 기능 구현 Main branch로 머지

Screenshot 📸

N/A

Uncompleted Tasks 😅

  • N/A

To Reviewers 📢

ㅋㅋ ㅜㅜ

t1nm1ksun and others added 30 commits May 15, 2024 14:35
@t1nm1ksun
test: 컴포즈화면 연동 테스트
ef2d6c2
@t1nm1ksun
Merge remote-tracking branch 'origin/develop' into feat-view1
86cb55e
@t1nm1ksun
[add]: Color,Font 추가
7e276a7
@t1nm1ksun
[init] #12 기존 색상 삭제, 중복 폰트 속성 삭제
b910b4f
@Hyobeen-Park
[chore] #8 중복된 dependencies 삭제 및 패키지 구조 수정
3c818f0
@Hyobeen-Park
[mod] #8 BindingActivity, BindingFragment 적용
f4a3fab
@Hyobeen-Park
[chore] #8 nav_graph 네이밍 수정
9005bce
@Hyobeen-Park
[feat] #8 바텀 네비게이션 메뉴 추가
57dc6f9
@Hyobeen-Park
[feat] #8 바텀 네비게이션 UI 구현
2953f10
@t1nm1ksun
[init] #11 탑 앱바 제작 및 화면 전환 구현
d1882fc
@t1nm1ksun
[delete] 미사용 import문 삭제
6c51a91
@t1nm1ksun
[init] #11 indicator 커스텀
d10b147
@t1nm1ksun
[init] #11 divider 속성값으로 지정
3ace800
@t1nm1ksun
[chore] #11 주석 제거
689e687
@t1nm1ksun
[init] #14 피그마 아이콘 추가 완료
e5e374c
@t1nm1ksun
[chore] #14 ktlintFormat
c886d37
@Hyobeen-Park
[feat] #8 현재 fragment에 따른 바텀 네비게이션 visibility 설정
fdd9e9d
@Hyobeen-Park
[mod] #8 홈 아이콘 수정
14cf20d
@Hyobeen-Park
Merge remote-tracking branch 'origin/develop' into init-single-activi…
452c89d 
…ty-architecture
@Hyobeen-Park
[chore] #8 코드 정리
3cca8b1
@t1nm1ksun
[chore] #11 string.xml 사용처 명시
05e1325
@t1nm1ksun
[add] #14 안드전용 아이콘 추가
88589aa
@t1nm1ksun
[chore] #11 주석 제거
9d110a2
@t1nm1ksun
[chore] #14 누락 아이콘 추가
682e585
@t1nm1ksun
[chore] #14 error svg -> png
ab38b54
@t1nm1ksun
[chore] #13 불필요 ktlint설정 삭제
908ebed
@t1nm1ksun
[chore] #14 ic->img
b2dd771
@t1nm1ksun
[chore] #13 needless blank line 삭제
2c86f23
@t1nm1ksun
Update build.gradle.kts
300c7a3
@t1nm1ksun
[chore] #13 스트링 추출
a4a88c3
Hyobeen-Park and others added 21 commits May 24, 2024 15:57
@Hyobeen-Park
Merge pull request #37 from NOW-SOPT-APP4-KREAM/mod-just-drop-chips
831e956 
[feat] 추천뷰 하단 칩 수정
@jihyunniiii
[chore] #38 img 네이밍 변경
9dad5e3
@t1nm1ksun
[feat] #17 view1 광고 페이저 인디케이터 구현
3d3f4ed
@t1nm1ksun
.
dc35700
@t1nm1ksun
Merge branch 'feat-view1-delete-scrap-compose' of https://github.com/…
086f362 
…NOW-SOPT-APP4-KREAM/KREAM-Android into feat-view1-delete-scrap-compose
@Hyobeen-Park
[chore] #41 폰트 수정
b221149
@t1nm1ksun
[feat] #39 린트에 맞게 수정
aec3254
@t1nm1ksun
Merge pull request #40 from NOW-SOPT-APP4-KREAM/feat-view1-delete-scr…
c0326f6 
…ap-compose

[feat] 발매 정보 뷰 인디케이터 구현
@Hyobeen-Park
Merge pull request #42 from NOW-SOPT-APP4-KREAM/chore-change-font
fb25bdf 
[chore] 폰트 수정
@t1nm1ksun
[chore] #43 화면간 서버 싱크 맞추기
61b1461
@t1nm1ksun
[chore] #43 RecommendFragment onResume 수정
c2223b9
@t1nm1ksun
Merge pull request #44 from NOW-SOPT-APP4-KREAM/chore-server-sync
551c3cf 
[chore] 서버 싱크 맞추기
@jihyunniiii
[chore] #38 폴더링 변경
71e3f36
@jihyunniiii
[delete] #38 dummy 제거
2ea3a2d
@jihyunniiii
[delete] #38 dummy 제거
cd4614a
@jihyunniiii
Merge branch 'develop' into docs-readme
c092f87 
# Conflicts:
#	app/src/main/java/org/sopt/kream/presentation/ui/main/home/release/ReleaseAdvertisementViewPager.kt
@jihyunniiii
[chore] #38 conflict 해결
d1bbd08
@jihyunniiii
[chore] #38 ktlintFormat
a868b86
@jihyunniiii
[docd] #38 update README.md
87fcb94
@jihyunniiii
Merge pull request #45 from NOW-SOPT-APP4-KREAM/docs-readme
9a39d9f
@jihyunniiii
[docs] #38 Update README.md
9fa55d7
@jihyunniiii jihyunniiii added this to the 뷰 연결 및 QA milestone May 25, 2024
@jihyunniiii jihyunniiii self-assigned this May 25, 2024
Hyobeen-Park
Hyobeen-Park approved these changes May 25, 2024
View reviewed changes
Copy link
Contributor

@Hyobeen-Park Hyobeen-Park left a comment

Choose a reason for hiding this comment

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

❤️

t1nm1ksun
t1nm1ksun approved these changes May 25, 2024
View reviewed changes
Copy link
Contributor

@t1nm1ksun t1nm1ksun left a comment

Choose a reason for hiding this comment

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

인간미까지...
없는게 뭐야 이사람!

@jihyunniiii jihyunniiii merged commit 78ce5a8 into main May 25, 2024
1 check passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@t1nm1ksun t1nm1ksun t1nm1ksun approved these changes

@Hyobeen-Park Hyobeen-Park Hyobeen-Park approved these changes

Assignees

@jihyunniiii jihyunniiii

Labels
⚡️ feat ⚡️ 🐸 지현 🐸
Projects
KREAM-Android
Status: Done
Milestone
뷰 연결 및 QA
Development

Successfully merging this pull request may close these issues.
3 participants
@jihyunniiii @Hyobeen-Park @t1nm1ksun