Skip to content

Commit

Permalink
fix && update
Browse files Browse the repository at this point in the history
  • Loading branch information
@Leonavichus
Leonavichus committed Feb 18, 2023
1 parent b2f00e5 commit c643758
Show file tree
Hide file tree
Showing 6 changed files with 45 additions and 36 deletions.
2 changes: 1 addition & 1 deletion lib/app/modules/calendar.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@ class _CalendarPageState extends State<CalendarPage> {
),
Expanded(
child: Container(
margin: const EdgeInsets.only(top: 14),
margin: const EdgeInsets.only(top: 10),
decoration: BoxDecoration(
color: context.theme.colorScheme.secondaryContainer,
borderRadius: const BorderRadius.only(
Expand Down
7 changes: 4 additions & 3 deletions lib/app/widgets/task_type_list.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,10 +51,11 @@ class _TaskTypeListState extends State<TaskTypeList> {
: 'addArchive'.tr,
textAlign: TextAlign.center,
style:
context.theme.textTheme.titleLarge?.copyWith(
context.theme.textTheme.titleMedium?.copyWith(
color: Get.isDarkMode
? Colors.white
: Colors.black,
fontWeight: FontWeight.w600,
),
),
),
Expand All @@ -65,11 +66,11 @@ class _TaskTypeListState extends State<TaskTypeList> {
}
return ListView.builder(
physics: const AlwaysScrollableScrollPhysics(),
itemCount: listData.data?.length,
itemCount: task.length,
itemBuilder: (BuildContext context, int index) {
final taskList = task[index];
return Dismissible(
key: UniqueKey(),
key: ValueKey(taskList),
direction: DismissDirection.horizontal,
confirmDismiss: (DismissDirection direction) async {
return await showDialog(
Expand Down
13 changes: 7 additions & 6 deletions lib/app/widgets/todos_ce.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -183,12 +183,13 @@ class _TodosCeState extends State<TodosCe> {
style: context.theme.textTheme.bodyLarge,
),
trailing: Container(
width: 10,
height: 10,
decoration: BoxDecoration(
color: Color(tasks.taskColor),
shape: BoxShape.circle,
)),
width: 10,
height: 10,
decoration: BoxDecoration(
color: Color(tasks.taskColor),
shape: BoxShape.circle,
),
),
),
);
},
Expand Down
13 changes: 8 additions & 5 deletions lib/app/widgets/todos_list.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -68,8 +68,9 @@ class _TodosListState extends State<TodosList> {
widget.toggle == true
? 'copletedTask'.tr
: 'addTask'.tr,
style: context.theme.textTheme.titleLarge?.copyWith(
style: context.theme.textTheme.titleMedium?.copyWith(
color: Get.isDarkMode ? Colors.white : Colors.black,
fontWeight: FontWeight.w600,
),
),
],
Expand All @@ -81,11 +82,11 @@ class _TodosListState extends State<TodosList> {
builder: (context, innerState) {
return ListView.builder(
physics: const AlwaysScrollableScrollPhysics(),
itemCount: listData.data?.length,
itemCount: todos.length,
itemBuilder: (BuildContext context, int index) {
final todosList = todos[index];
return Dismissible(
key: ObjectKey(todosList),
key: ValueKey(todosList),
direction: DismissDirection.endToStart,
confirmDismiss: (DismissDirection direction) async {
return await showDialog(
Expand Down Expand Up @@ -258,8 +259,10 @@ class _TodosListState extends State<TodosList> {
style: context.theme
.textTheme.bodyLarge
?.copyWith(
color: Colors
.deepPurple),
color: Get.isDarkMode
? Colors.teal
: Colors.deepPurple,
),
)
: Container(),
],
Expand Down
35 changes: 18 additions & 17 deletions pubspec.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,18 +5,18 @@ packages:
dependency: transitive
description:
name: _fe_analyzer_shared
sha256: "0c80aeab9bc807ab10022cd3b2f4cf2ecdf231949dc1ddd9442406a003f19201"
sha256: "569ddca58d535e601dd1584afa117710abc999d036c0cd2c51777fb257df78e8"
url: "https://pub.dev"
source: hosted
version: "52.0.0"
version: "53.0.0"
analyzer:
dependency: transitive
description:
name: analyzer
sha256: cd8ee83568a77f3ae6b913a36093a1c9b1264e7cb7f834d9ddd2311dade9c1f4
sha256: "10927c4b7c7c88b1adbca278c3d5531db92e2f4b4abf04e2919a800af965f3f5"
url: "https://pub.dev"
source: hosted
version: "5.4.0"
version: "5.5.0"
archive:
dependency: transitive
description:
Expand All @@ -29,10 +29,10 @@ packages:
dependency: transitive
description:
name: args
sha256: "139d809800a412ebb26a3892da228b2d0ba36f0ef5d9a82166e5e52ec8d61611"
sha256: "4cab82a83ffef80b262ddedf47a0a8e56ee6fbf7fe21e6e768b02792034dd440"
url: "https://pub.dev"
source: hosted
version: "2.3.2"
version: "2.4.0"
async:
dependency: transitive
description:
Expand Down Expand Up @@ -77,10 +77,10 @@ packages:
dependency: transitive
description:
name: build_resolvers
sha256: "7c35a3a7868626257d8aee47b51c26b9dba11eaddf3431117ed2744951416aab"
sha256: db49b8609ef8c81cca2b310618c3017c00f03a92af44c04d310b907b2d692d95
url: "https://pub.dev"
source: hosted
version: "2.1.0"
version: "2.2.0"
build_runner:
dependency: "direct dev"
description:
Expand Down Expand Up @@ -411,11 +411,12 @@ packages:
flutter_typeahead:
dependency: "direct main"
description:
name: flutter_typeahead
sha256: "73eb76fa640ea630e2d957e7b469ab2b91e4da6c4950d6032fab7009275637b7"
url: "https://pub.dev"
source: hosted
version: "4.3.3"
path: "."
ref: master
resolved-ref: "52994f5d497084f38e38ce98b510416174767083"
url: "https://github.com/ivofernandes/flutter_typeahead.git"
source: git
version: "4.3.5"
flutter_web_plugins:
dependency: transitive
description: flutter
Expand Down Expand Up @@ -641,10 +642,10 @@ packages:
dependency: transitive
description:
name: path_provider_linux
sha256: ab0987bf95bc591da42dffb38c77398fc43309f0b9b894dcc5d6f40c4b26c379
sha256: "2e32f1640f07caef0d3cb993680f181c79e54a3827b997d5ee221490d131fbd9"
url: "https://pub.dev"
source: hosted
version: "2.1.7"
version: "2.1.8"
path_provider_platform_interface:
dependency: transitive
description:
Expand Down Expand Up @@ -878,10 +879,10 @@ packages:
dependency: transitive
description:
name: universal_io
sha256: "79f78ddad839ee3aae3ec7c01eb4575faf0d5c860f8e5223bc9f9c17f7f03cef"
sha256: "06866290206d196064fd61df4c7aea1ffe9a4e7c4ccaa8fcded42dd41948005d"
url: "https://pub.dev"
source: hosted
version: "2.0.4"
version: "2.2.0"
vector_math:
dependency: transitive
description:
Expand Down
11 changes: 7 additions & 4 deletions pubspec.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ description: A new Flutter project.

publish_to: 'none'

version: 1.2.9+19
version: 1.3.0+20

environment:
sdk: ">=2.19.2 <3.0.0"
Expand All @@ -18,11 +18,14 @@ dependencies:
intl: ^0.17.0
swipe: ^0.0.1
iconsax: ^0.0.8
path_provider: ^2.0.11
path_provider: ^2.0.12
table_calendar: ^3.0.8
flutter_typeahead: ^4.1.1
flutter_typeahead:
git:
url: https://github.com/ivofernandes/flutter_typeahead.git
ref: master
isar_flutter_libs: ^3.0.5
flex_color_picker: ^3.0.2
flex_color_picker: ^3.1.0
flutter_easyloading: ^3.0.5
custom_navigation_bar: ^0.8.2
sleek_circular_slider: ^2.0.1
Expand Down

0 comments on commit c643758

Please sign in to comment.