Skip to content

Bugfixes (1. Null-safety casting issue; 2. Hiding last item when using dividers) #5

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

Open
feedrdev wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Bugfixes (1. Null-safety casting issue; 2. Hiding last item when using dividers) #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6954366
Fixes an issue of hiding the last item when a dividerBuilder is non-n…
feedrdev Sep 22, 2020
391a2c5
Merge commit '84d1cd9496159adb6ac2760a3b57b341d0db3e49' into bugfix/l…
feedrdev Oct 12, 2021
4c70b47
fixes the incompatible cast crash introduced by null-migration
feedrdev Oct 15, 2021
48dbbe1
generated file added to gitignore
feedrdev Oct 15, 2021
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
1 change: 1 addition & 0 deletions example/.gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,7 @@ build/
**/ios/Flutter/app.flx
**/ios/Flutter/app.zip
**/ios/Flutter/flutter_assets/
**/ios/Flutter/flutter_export_environment.sh
**/ios/ServiceDefinitions.json
**/ios/Runner/GeneratedPluginRegistrant.*

Expand Down
14 changes: 0 additions & 14 deletions example/ios/Flutter/flutter_export_environment.sh
View file
Open in desktop

This file was deleted.

33 changes: 17 additions & 16 deletions lib/easy_listview.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,6 @@ class EasyListView extends StatefulWidget {
enum ItemType { header, footer, loadMore, data, dividerData }

class EasyListViewState extends State<EasyListView> {

bool get isNested => widget.headerSliverBuilder != null;

@override
Expand Down Expand Up @@ -91,21 +90,23 @@ class EasyListViewState extends State<EasyListView> {
_buildList() {
var headerCount = _headerCount();
var totalItemCount = _dataItemCount() + headerCount + _footerCount();
ScrollView listView = widget.isSliverMode
ScrollView listView = widget.isSliverMode
? CustomScrollView(
slivers: List.generate(
totalItemCount, (index) => _itemBuilder(context, index)),
) : ListView.builder(
physics: isNested ? null : widget.physics,
controller: isNested ? null : widget.controller,
padding: widget.padding,
itemCount: totalItemCount,
itemBuilder: _itemBuilder,
);

List<Widget?> children = widget.scrollbarEnable ? [Scrollbar(child: listView)] : [listView];
if (widget.foregroundWidget != null) children.add(widget.foregroundWidget);
return Stack(children: children as List<Widget>);
slivers: List.generate(
totalItemCount, (index) => _itemBuilder(context, index)),
)
: ListView.builder(
physics: isNested ? null : widget.physics,
controller: isNested ? null : widget.controller,
padding: widget.padding,
itemCount: totalItemCount,
itemBuilder: _itemBuilder,
);

List<Widget> children =
widget.scrollbarEnable ? [Scrollbar(child: listView)] : [listView];
if (widget.foregroundWidget != null) children.add(widget.foregroundWidget!);
return Stack(children: children);
}

ItemType _itemType(itemIndex, totalItemCount) {
Expand Down Expand Up @@ -155,7 +156,7 @@ class EasyListViewState extends State<EasyListView> {
int _footerCount() => (_hasFooter() || widget.loadMore) ? 1 : 0;

int _dataItemCount() =>
_hasDivider() ? widget.itemCount * 2 - 1 : widget.itemCount;
_hasDivider() ? widget.itemCount * 2 : widget.itemCount;

bool _hasDivider() => widget.dividerBuilder != null;

Expand Down
8 changes: 4 additions & 4 deletions pubspec.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ packages:
name: async
url: "https://pub.dartlang.org"
source: hosted
version: "2.6.1"
version: "2.8.1"
boolean_selector:
dependency: transitive
description:
Expand All @@ -28,7 +28,7 @@ packages:
name: charcode
url: "https://pub.dartlang.org"
source: hosted
version: "1.2.0"
version: "1.3.1"
clock:
dependency: transitive
description:
Expand Down Expand Up @@ -73,7 +73,7 @@ packages:
name: meta
url: "https://pub.dartlang.org"
source: hosted
version: "1.3.0"
version: "1.7.0"
path:
dependency: transitive
description:
Expand Down Expand Up @@ -127,7 +127,7 @@ packages:
name: test_api
url: "https://pub.dartlang.org"
source: hosted
version: "0.3.0"
version: "0.4.2"
typed_data:
dependency: transitive
description:
Expand Down