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.

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

[ui] 행복루틴 진행 뷰 #53

Merged
merged 20 commits into from
Jan 15, 2024
Merged

Conversation

pump9918
Copy link
Collaborator

📑 Work Description

  • 행복 루틴 진행 뷰

🛠️ Issue

📷 Screenshot

Screen_recording_20240115_035740.mp4

💬 To Reviewers

# Conflicts:
#	app/src/main/java/com/sopetit/softie/domain/entity/HappyCard.kt
#	app/src/main/java/com/sopetit/softie/ui/happyroutine/adddetail/HappyDetailActivity.kt
#	app/src/main/java/com/sopetit/softie/ui/happyroutine/adddetail/HappyDetailCardPagerAdapter.kt
#	app/src/main/java/com/sopetit/softie/ui/happyroutine/adddetail/HappyDetailCardViewModel.kt
#	app/src/main/res/layout/activity_happy_add_detail.xml
#	app/src/main/res/layout/item_happy_add_detail_card.xml
#	app/src/main/res/values/strings.xml
@pump9918 pump9918 self-assigned this Jan 14, 2024
@pump9918 pump9918 added UI ui 관련 작업 호연🐻‍❄️ 호연이가 작업함! labels Jan 14, 2024
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.

드디어 끝이 보이네요!!! 장하다!

@@ -20,7 +20,7 @@
<activity
android:name=".ui.main.MainActivity"
android:exported="false"
android:screenOrientation="portrait" />
android:screenOrientation="portrait"></activity>
Copy link
Contributor

Choose a reason for hiding this comment

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

/>로 바꿔주세요!

android:name=".ui.dailyroutine.dailyroutineadd.DailyRoutineAddActivity"
android:name=".ui.happyroutine.addlist.HappyAddListActivity"
android:exported="false"
android:screenOrientation="portrait"></activity>
Copy link
Contributor

Choose a reason for hiding this comment

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

/>로 바꿔주세요~

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

아직도 이런 실수를 반복하다니, 박호연 좀 혼나야할듯;

}
}

private fun moveToIng() {
private fun moveToProgress() {
Copy link
Contributor

Choose a reason for hiding this comment

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

ㅎㅎ 최고~

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.

늦은시간까지 고생하셨습니다!!!

private fun setCardEnter() {
with(binding) {
clHappyProgressCardFront.setOnClickListener {
setCardFlip(clHappyProgressCardFront, clHappyProgressCardBack)
Copy link
Member

Choose a reason for hiding this comment

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

setCardFilp이 카드 뒤집히는? 역할을 해주는건가요??

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

네넵 VISIBLE 처리로 카드가 뒤집히는 것처럼 보이게 해놓은 거예요!

@pump9918 pump9918 merged commit 9af81e6 into develop Jan 15, 2024
1 check passed
@pump9918 pump9918 deleted the feature/#48-ui-happy-progress-view branch January 15, 2024 02:31
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
UI ui 관련 작업 호연🐻‍❄️ 호연이가 작업함!
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[ui] 행복루틴 진행 뷰
3 participants