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

#52 [feat] 행복루틴 엠티뷰 서버 연결 #59

Merged
merged 8 commits into from
Jan 17, 2024
Merged

#52 [feat] 행복루틴 엠티뷰 서버 연결 #59

merged 8 commits into from
Jan 17, 2024

Conversation

pump9918
Copy link
Collaborator

@pump9918 pump9918 commented Jan 15, 2024 •
edited
Loading

📑 Work Description

  • 행복루틴 엠티뷰 액티비티 연결
  • 인형 얼굴 이미지 조회 /api/v1/dolls/image/{type} GET API 연결

🛠️ Issue

📷 Screenshot

Screen_Recording_20240117_162827_Softie.mp4

💬 To Reviewers

@pump9918
#52 [ui] 카드 클릭 액티비티 연결
923cbd8
@pump9918
#52 [ui] type별 곰돌이 얼굴 변경
48ff4c1
@pump9918
Merge remote-tracking branch 'origin/develop' into feature/#52-fix-ha…
b654879 
…ppy-empty-view

# Conflicts:
#	app/src/main/java/com/sopetit/softie/ui/happyroutine/HappyRoutineFragment.kt
#	app/src/main/java/com/sopetit/softie/ui/main/MainActivity.kt
@pump9918
#52 [chore] CI 공백 수정
1dba939
@pump9918 pump9918 added UI ui 관련 작업 호연🐻‍❄️ 호연이가 작업함! labels Jan 15, 2024
@pump9918 pump9918 self-assigned this Jan 15, 2024
@pump9918 pump9918 changed the title [fix] 행복루틴 엠티뷰 액티비티 연결 #52 [fix] 행복루틴 엠티뷰 액티비티 연결 Jan 15, 2024
minemi00
minemi00 approved these changes Jan 15, 2024
View reviewed changes
Copy link
Member

@minemi00 minemi00 left a comment

Choose a reason for hiding this comment

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

곰돌이 얼굴까지.. 바꿔줘야할게 많네요 ㅜ 수고하셨습니다 !!

stellar-halo
stellar-halo approved these changes Jan 15, 2024
View reviewed changes
Copy link
Contributor

@stellar-halo stellar-halo left a comment

Choose a reason for hiding this comment

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

좋아요~ 제가 뷰 연결한 부분이 있어서 merge 후에 다시 pull 받고 수정부탁드릴게요!

app/src/main/java/com/sopetit/softie/domain/entity/HappyDoll.kt Outdated
Comment on lines 5 to 7
data class HappyDoll(
@DrawableRes val faceImageUrl: Int
)
Copy link
Contributor

Choose a reason for hiding this comment

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

HappyDoll ㅋㅋㅋㅋㅋㅋㅋ

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

작명센스가 영...

@pump9918 pump9918 closed this Jan 16, 2024
@stellar-halo stellar-halo reopened this Jan 16, 2024
@pump9918 pump9918 changed the title #52 [fix] 행복루틴 엠티뷰 액티비티 연결 #52 [fix] 행복루틴 엠티뷰 서버 연결 Jan 17, 2024
@pump9918 pump9918 requested a review from emjayMJkim January 17, 2024 07:26
emjayMJkim
emjayMJkim approved these changes Jan 17, 2024
View reviewed changes
Copy link
Member

@emjayMJkim emjayMJkim left a comment

Choose a reason for hiding this comment

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

수고하셨습니다! 이제 놓아줄 때가 된 것 같네요

@pump9918 pump9918 merged commit 5ebb953 into develop Jan 17, 2024
1 check passed
@pump9918 pump9918 deleted the feature/#52-fix-happy-empty-view branch January 17, 2024 07:32
@pump9918 pump9918 changed the title #52 [fix] 행복루틴 엠티뷰 서버 연결 #52 [feat] 행복루틴 엠티뷰 서버 연결 Jan 17, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@stellar-halo stellar-halo stellar-halo approved these changes

@emjayMJkim emjayMJkim emjayMJkim approved these changes

@minemi00 minemi00 minemi00 approved these changes

Assignees

@pump9918 pump9918

Labels
UI ui 관련 작업 호연🐻‍❄️ 호연이가 작업함!
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

[fix] 행복루틴 엠티뷰 액티비티 연결
4 participants
@pump9918 @stellar-halo @emjayMJkim @minemi00