openharmony/arkui_ace_engine
1
0
Fork 0
mirror of https://gitee.com/openharmony/arkui_ace_engine synced 2024-11-23 07:01:24 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

!48126 Swiper导航点动效优化

Browse Source 
Merge pull request !48126 from xuzhidan/swiper_indicator_ux
This commit is contained in:
openharmony_ci 2024-11-12 06:55:25 +00:00 committed by Gitee
commit b1cfebd7b9
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
3 changed files with 41 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
frameworks/core/components_ng/pattern/swiper_indicator/dot_indicator/dot_indicator_modifier.cpp
View File

@ -48,6 +48,15 @@ constexpr float LOOP_OPACITY_DURATION_PERCENT = 0.25f;
constexpr uint8_t TARGET_ALPHA = 255;
constexpr int32_t BLACK_POINT_DURATION = 400;
constexpr float DEFAULT_MINIMUM_AMPLITUDE_PX = 1.0f;
constexpr int32_t LONG_POINT_STEP_TWO = 2;
constexpr int32_t LONG_POINT_STEP_THREE = 3;
constexpr int32_t LONG_POINT_STEP_FOUR = 4;
// velocity:0, mass:1, stiffness:81, damping:11
const auto LONG_POINT_DEFAULT_CURVE = AceType::MakeRefPtr<InterpolatingSpring>(0, 1, 81, 11);
const auto LONG_POINT_STEP_TWO_CURVE = AceType::MakeRefPtr<InterpolatingSpring>(0, 1, 108, 16);
const auto LONG_POINT_STEP_THREE_CURVE = AceType::MakeRefPtr<InterpolatingSpring>(0, 1, 128, 18);
const auto LONG_POINT_STEP_FOUR_CURVE = AceType::MakeRefPtr<InterpolatingSpring>(0, 1, 128, 20);
const auto LONG_POINT_STEP_FIVE_CURVE = AceType::MakeRefPtr<InterpolatingSpring>(0, 1, 148, 28);
} // namespace
void DotIndicatorModifier::onDraw(DrawingContext& context)
@ -540,8 +549,7 @@ void DotIndicatorModifier::UpdateAllPointCenterXAnimation(GestureState gestureSt
optionHead.SetDuration(animationDuration_);
AnimationOption optionTail;
// velocity:0, mass:1, stiffness:81, damping:11
optionTail.SetCurve(AceType::MakeRefPtr<InterpolatingSpring>(0, 1, 81, 11));
optionTail.SetCurve(GetTailCurve());
optionTail.SetDuration(animationDuration_);
AnimationOption optionLeft = optionTail;
AnimationOption optionRight = optionHead;
@ -751,6 +759,28 @@ float DotIndicatorModifier::CalculateMinimumAmplitudeRatio(
return std::max(minimumAmplitudeRatio, InterpolatingSpring::DEFAULT_INTERPOLATING_SPRING_AMPLITUDE_RATIO);
}
RefPtr<InterpolatingSpring> DotIndicatorModifier::GetTailCurve()
{
auto step = std::abs(currentIndex_ - currentIndexActual_);
if (step == LONG_POINT_STEP_TWO) {
return LONG_POINT_STEP_TWO_CURVE;
}
if (step == LONG_POINT_STEP_THREE) {
return LONG_POINT_STEP_THREE_CURVE;
}
if (step == LONG_POINT_STEP_FOUR) {
return LONG_POINT_STEP_FOUR_CURVE;
}
if (step > LONG_POINT_STEP_FOUR) {
return LONG_POINT_STEP_FIVE_CURVE;
}
return LONG_POINT_DEFAULT_CURVE;
}
void DotIndicatorModifier::PlayLongPointAnimation(const std::vector<std::pair<float, float>>& longPointCenterX,
GestureState gestureState, TouchBottomTypeLoop touchBottomTypeLoop,
const LinearVector<float>& vectorBlackPointCenterX, bool isNormal)
@ -770,8 +800,7 @@ void DotIndicatorModifier::PlayLongPointAnimation(const std::vector<std::pair<fl
optionHead.SetDuration(animationDuration_);
AnimationOption optionTail;
// velocity:0, mass:1, stiffness:81, damping:11
auto interpolatingSpring = AceType::MakeRefPtr<InterpolatingSpring>(0, 1, 81, 11);
auto interpolatingSpring = GetTailCurve();
if (isNormal) {
interpolatingSpring->UpdateMinimumAmplitudeRatio(
CalculateMinimumAmplitudeRatio(longPointCenterX, gestureState));

7
frameworks/core/components_ng/pattern/swiper_indicator/dot_indicator/dot_indicator_modifier.h
View File

@ -182,6 +182,11 @@ public:
currentIndex_ = index;
}
void SetCurrentIndexActual(int32_t currentIndexActual)
{
currentIndexActual_ = currentIndexActual;
}
void SetNormalToHoverIndex(const std::optional<int32_t>& normalToHoverIndex)
{
normalToHoverIndex_ = normalToHoverIndex;
@ -319,6 +324,7 @@ protected:
int32_t GetLoopOpacityDuration() const;
float CalculateMinimumAmplitudeRatio(
const std::vector<std::pair<float, float>>& longPointCenterX, GestureState gestureState) const;
RefPtr<InterpolatingSpring> GetTailCurve();
RefPtr<AnimatablePropertyColor> backgroundColor_;
RefPtr<AnimatablePropertyVectorFloat> vectorBlackPointCenterX_;
@ -356,6 +362,7 @@ protected:
bool indicatorMask_ = false;
bool isCustomSize_ = false;
int32_t currentIndex_ = 0;
int32_t currentIndexActual_ = 0;
int32_t animationDuration_ = 0;
OffsetF offset_;
float itemWidth_ = 0.0f;

1
frameworks/core/components_ng/pattern/swiper_indicator/dot_indicator/dot_indicator_paint_method.cpp
View File

@ -68,6 +68,7 @@ void DotIndicatorPaintMethod::UpdateContentModifier(PaintWrapper* paintWrapper)
IsCustomSizeValue_ = paintProperty->GetIsCustomSizeValue(false);
dotIndicatorModifier_->SetAxis(axis_);
dotIndicatorModifier_->SetCurrentIndex(currentIndex_);
dotIndicatorModifier_->SetCurrentIndexActual(currentIndexActual_);
dotIndicatorModifier_->SetUnselectedColor(paintProperty->GetColorValue(swiperTheme->GetColor()));
dotIndicatorModifier_->SetSelectedColor(paintProperty->GetSelectedColorValue(swiperTheme->GetSelectedColor()));
dotIndicatorModifier_->SetIndicatorMask(paintProperty->GetIndicatorMaskValue(false));