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

feat: add fade support w/ viewportFraction #8

Merged
merged 2 commits into from
Aug 9, 2018
Merged

feat: add fade support w/ viewportFraction #8

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a23a6fb
feat: add fade support w/ viewportFraction
jogboms Aug 8, 2018
2288149
Merge pull request #1 from jogboms/feat-fade-support
jogboms Aug 8, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
54 changes: 37 additions & 17 deletions lib/src/swiper.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,9 @@ class Swiper extends StatefulWidget {
// This value is valid when viewportFraction is set and < 1.0
final double scale;

// This value is valid when viewportFraction is set and < 1.0
final double fade;

Swiper({
@required this.itemBuilder,
@required this.itemCount,
Expand Down Expand Up @@ -130,6 +133,7 @@ class Swiper extends StatefulWidget {
this.itemWidth,
this.outer: false,
this.scale: 1.0,
this.fade: 1.0,
}) : super(key: key);

factory Swiper.children({
Expand Down Expand Up @@ -423,6 +427,7 @@ class _SwiperState extends _SwiperTimerMixin {
containerWidth: widget.containerWidth,
containerHeight: widget.containerHeight,
viewportFraction: widget.viewportFraction,
fade: widget.fade,
scale: widget.scale,
itemCount: widget.itemCount,
itemBuilder: itemBuilder,
Expand All @@ -440,6 +445,7 @@ class _SwiperState extends _SwiperTimerMixin {
containerHeight: widget.containerHeight,
viewportFraction: widget.viewportFraction,
scale: widget.scale,
fade: widget.fade,
itemCount: widget.itemCount,
itemBuilder: itemBuilder,
index: _activeIndex,
Expand Down Expand Up @@ -676,6 +682,7 @@ class _StackSwiper extends _SubSwiper {
class _NoneLoopPageViewSwiper extends _PageViewSwiper {
_NoneLoopPageViewSwiper(
{double scale,
double fade,
ScrollPhysics physics,
Axis scrollDirection,
double viewportFraction,
Expand All @@ -691,6 +698,7 @@ class _NoneLoopPageViewSwiper extends _PageViewSwiper {
SwiperController controller})
: super(
scale: scale,
fade: fade,
physics: physics,
scrollDirection: scrollDirection,
viewportFraction: viewportFraction,
Expand All @@ -712,6 +720,7 @@ class _NoneLoopPageViewSwiper extends _PageViewSwiper {
}

class _PageViewSwiper extends _SubSwiper {
final double fade;
final double scale;
final double viewportFraction;
final ScrollPhysics physics;
Expand All @@ -721,6 +730,7 @@ class _PageViewSwiper extends _SubSwiper {

_PageViewSwiper(
{this.scale,
this.fade,
bool loop,
this.physics,
this.scrollDirection,
Expand Down Expand Up @@ -1322,24 +1332,34 @@ class _NoneloopPageViewState extends State<_PageViewSwiper> {

Widget _buildAnimationItem(BuildContext context, int index) {
return new AnimatedBuilder(
animation: _pageController,
builder: (BuildContext context, Widget w) {
int newIndex = _calcIndex(index);
double page = _page();
double scale = 1.0 -
widget.curve.transform((page - newIndex).abs().clamp(0.0, 1.0)) *
(1.0 - widget.scale);

int renderIndex = newIndex % widget.itemCount;
if (renderIndex < 0) {
renderIndex += widget.itemCount;
}
animation: _pageController,
builder: (BuildContext context, Widget w) {
int newIndex = _calcIndex(index);
double page = _page();
double fade = 1.0 -
widget.curve.transform((page - newIndex).abs().clamp(0.0, 1.0)) *
(1.0 - widget.fade);
double scale = 1.0 -
widget.curve.transform((page - newIndex).abs().clamp(0.0, 1.0)) *
(1.0 - widget.scale);

int renderIndex = newIndex % widget.itemCount;
if (renderIndex < 0) {
renderIndex += widget.itemCount;
}

return new Transform.scale(
return new Opacity(
opacity: fade,
child: new Transform.scale(
scale: scale,
child: widget.itemBuilder(context, renderIndex),
);
});
child: widget.itemBuilder(
context,
renderIndex,
),
),
);
},
);
}

@override
Expand Down Expand Up @@ -1424,7 +1444,7 @@ class _NoneloopPageViewState extends State<_PageViewSwiper> {
}

IndexedWidgetBuilder itemBuilder;
if (widget.scale != null) {
if (widget.scale != null || widget.fade != null) {
itemBuilder = _buildAnimationItem;
} else {
itemBuilder = widget.itemBuilder;
Expand Down