Skip to content

Commit c2ccf19

Browse files
authored
Merge pull request #70 from CodandoTV/fix/weird-scroll-behavior
Refactor TasksListWidget and update version
2 parents 7fddfbc + 2f4b35d commit c2ccf19

4 files changed

Lines changed: 17 additions & 17 deletions

File tree

‎lib/ui/components/widgets/checklist/checklist_full_widget.dart‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import 'package:todoapp/data/model/tasks_complete_status.dart';
55
import 'package:todoapp/ui/components/remove_task_dialog_builder.dart';
66
import 'package:todoapp/ui/components/tasks_view_model/tasks_viewmodel.dart';
77
import 'package:todoapp/ui/components/widgets/checklist/checklist_item_widget.dart';
8-
import 'package:todoapp/ui/components/widgets/task/taskslist/tasks_list_widget.dart';
8+
import 'package:todoapp/ui/components/widgets/tasks_list_widget.dart';
99
import 'package:todoapp/ui/l10n/app_localizations.dart';
1010
import 'package:todoapp/ui/todo_app_router_config.gr.dart';
1111
import 'package:todoapp/util/di/dependency_startup_launcher.dart';

lib/ui/components/widgets/task/taskslist/tasks_list_widget.dart renamed to lib/ui/components/widgets/tasks_list_widget.dart

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ class TasksListWidget extends StatelessWidget {
4949
),
5050
);
5151
} else {
52-
child = Column(
52+
Widget header = Column(
5353
crossAxisAlignment: CrossAxisAlignment.start,
5454
children: [
5555
ProgressWidget(
@@ -60,21 +60,21 @@ class TasksListWidget extends StatelessWidget {
6060
onClick: () {
6161
onCompleteButtonAction();
6262
},
63-
),
64-
Expanded(
65-
child: ReorderableListView.builder(
66-
onReorder: onReorder,
67-
padding: const EdgeInsets.only(
68-
bottom: 120.0,
69-
),
70-
itemBuilder: (context, index) => _buildTaskCellWidget(
71-
tasks[index],
72-
),
73-
itemCount: tasks.length,
74-
),
75-
),
63+
)
7664
],
7765
);
66+
67+
child = ReorderableListView.builder(
68+
header: header,
69+
onReorder: onReorder,
70+
padding: const EdgeInsets.only(
71+
bottom: 120.0,
72+
),
73+
itemBuilder: (context, index) => _buildTaskCellWidget(
74+
tasks[index],
75+
),
76+
itemCount: tasks.length,
77+
);
7878
}
7979

8080
return child;

‎lib/ui/screens/tasks/tasks_screen.dart‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import 'package:todoapp/ui/components/remove_task_dialog_builder.dart';
77
import 'package:todoapp/ui/components/tasks_view_model/tasks_screen_state.dart';
88
import 'package:todoapp/ui/components/tasks_view_model/tasks_viewmodel.dart';
99
import 'package:todoapp/ui/components/widgets/custom_app_bar_widget.dart';
10-
import 'package:todoapp/ui/components/widgets/task/taskslist/tasks_list_widget.dart';
10+
import 'package:todoapp/ui/components/widgets/tasks_list_widget.dart';
1111
import 'package:todoapp/ui/l10n/app_localizations.dart';
1212
import 'package:todoapp/ui/screens/tasks/tasks_screen_callbacks.dart';
1313
import 'package:todoapp/ui/todo_app_router_config.gr.dart';

‎pubspec.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ publish_to: 'none' # Remove this line if you wish to publish to pub.dev
1616
# https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html
1717
# In Windows, build-name is used as the major, minor, and patch parts
1818
# of the product and file versions while build-number is used as the build suffix.
19-
version: 1.2.2
19+
version: 1.2.3
2020

2121
environment:
2222
sdk: ^3.5.0

0 commit comments

Comments
 (0)