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/YAF-000] 온보딩 Lottie Animation을 적용합니다. #41

Merged
merged 16 commits into from
Jan 16, 2025

Conversation

MoonsuKang
Copy link
Member

Related issue 🛠

closed #39

어떤 변경사항이 있었나요?

  • 🐞 BugFix Something isn't working
  • 🎨 Design Markup & styling
  • 📃 Docs Documentation writing and editing (README.md, etc.)
  • ✨ Feature Feature
  • 🔨 Refactor Code refactoring
  • ⚙️ Setting Development environment setup
  • ✅ Test Test related (Junit, etc.)

CheckPoint ✅

PR이 다음 요구 사항을 충족하는지 확인하세요.

  • PR 컨벤션에 맞게 작성했습니다. (필수)
  • merge할 브랜치의 위치를 확인해 주세요(main❌/develop⭕) (필수)
  • Approve된 PR은 assigner가 머지하고, 수정 요청이 온 경우 수정 후 다시 push를 합니다. (필수)
  • BugFix의 경우, 버그의 원인을 파악하였습니다. (선택)

Work Description ✏️

  • Lottie Animation 적용.
  • GIF 적용
  • topbar, bottombar 일부 속성 분기
testmama.mp4
test1231231.mp4

Uncompleted Tasks 😅

  • Task1

To Reviewers 📢

  • LottieAnimation Composable func 를 ContentScale, scaleX/scaleY 조정 가능하도록 구현했는데 확인한 번 해주시면 감사하겠슴다~
  • ExplainScreen에서는 GIF를 적용했습니다. 디자이너 측에서 Lottie로 하면 예기치 못한 동작이 발생한다고 합니다😀

@MoonsuKang MoonsuKang added 📱 UI 사용자 인터페이스 관련 작업 👊 문수문수문수문수문수 labels Jan 16, 2025
@MoonsuKang MoonsuKang requested a review from DongChyeon January 16, 2025 09:39
@MoonsuKang MoonsuKang self-assigned this Jan 16, 2025
Copy link
Member

Choose a reason for hiding this comment

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

[p4]
온보딩 외에도 사용할 일이 있어서 core:ui 의 component에 배도 좋을 거 같아요

Copy link
Member

Choose a reason for hiding this comment

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

[p5]
LottieAnimation의 크기를 직접적으로 fillMaxWidth()로 조절하는 방법이 없는 거 같긴 한데... 없다면 무시하셔도 됩니다.

Comment on lines 50 to 61
scaleX = when (contentScale) {
ContentScale.Fit -> scaleXAdjustment
ContentScale.FillWidth -> 1.2f * scaleXAdjustment
ContentScale.FillHeight -> 1.5f * scaleXAdjustment
else -> scaleXAdjustment
},
scaleY = when (contentScale) {
ContentScale.Fit -> scaleYAdjustment
ContentScale.FillWidth -> 1.2f * scaleYAdjustment
ContentScale.FillHeight -> 1.5f * scaleYAdjustment
else -> scaleYAdjustment
},
Copy link
Member

Choose a reason for hiding this comment

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

[p4]

Suggested change
scaleX = when (contentScale) {
ContentScale.Fit -> scaleXAdjustment
ContentScale.FillWidth -> 1.2f * scaleXAdjustment
ContentScale.FillHeight -> 1.5f * scaleXAdjustment
else -> scaleXAdjustment
},
scaleY = when (contentScale) {
ContentScale.Fit -> scaleYAdjustment
ContentScale.FillWidth -> 1.2f * scaleYAdjustment
ContentScale.FillHeight -> 1.5f * scaleYAdjustment
else -> scaleYAdjustment
},
scaleX = getScaleFromContentScale(contentScale) * scaleXAdjustment,
scaleY = getScaleFromContentScale(contentScale) * scaleYAdjustment,

scale 비율을 계산하는 헬퍼 함수를 작성하는 것도 좋을 거 같아요

)
}
}
}
Copy link
Member

Choose a reason for hiding this comment

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

[p4]

Suggested change
}
}
private fun getScaleFromContentScale(contentScale: ContentScale): Float {
return when (contentScale) {
ContentScale.Fit -> 1f
ContentScale.FillWidth -> 1.2f
ContentScale.FillHeight -> 1.5f
else -> 1f
}
}

Copy link
Member

@DongChyeon DongChyeon left a comment

Choose a reason for hiding this comment

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

수고하셨습니다

@MoonsuKang MoonsuKang merged commit 935aae7 into develop Jan 16, 2025
1 check passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
👊 문수문수문수문수문수 📱 UI 사용자 인터페이스 관련 작업
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[UI] 온보딩 Lottie Animation을 적용합니다.
2 participants