From bbbe05ed3ef8270431ca542ffe473f53e479d2f3 Mon Sep 17 00:00:00 2001 From: Ryan Pandya Date: Thu, 8 Jun 2023 02:51:47 -0400 Subject: [PATCH] dart fix --- ltx_flutter/lib/appwrite/database_api.dart | 1 - ltx_flutter/lib/helpers.dart | 4 ---- ltx_flutter/lib/pages/categories_page.dart | 2 +- ltx_flutter/lib/pages/today_page.dart | 6 ------ ltx_flutter/lib/pages/today_views/day_view.dart | 9 ++------- ltx_flutter/lib/pages/today_views/infinity_view.dart | 9 +++------ 6 files changed, 6 insertions(+), 25 deletions(-) diff --git a/ltx_flutter/lib/appwrite/database_api.dart b/ltx_flutter/lib/appwrite/database_api.dart index 340f59f..f5a15c7 100644 --- a/ltx_flutter/lib/appwrite/database_api.dart +++ b/ltx_flutter/lib/appwrite/database_api.dart @@ -4,7 +4,6 @@ import 'package:flutter/material.dart'; import 'package:ltx_flutter/appwrite/auth_api.dart'; import 'package:ltx_flutter/constants/constants.dart'; import 'package:intl/intl.dart'; -import 'package:ltx_flutter/constants/constants.dart'; class DatabaseAPI extends ChangeNotifier { Client client = Client(); diff --git a/ltx_flutter/lib/helpers.dart b/ltx_flutter/lib/helpers.dart index e70b267..c7d9ad7 100644 --- a/ltx_flutter/lib/helpers.dart +++ b/ltx_flutter/lib/helpers.dart @@ -1,9 +1,5 @@ -import 'package:ltx_flutter/appwrite/categories_api.dart'; -import 'package:ltx_flutter/appwrite/database_api.dart'; import 'package:flutter/material.dart'; -import 'package:provider/provider.dart'; import 'package:intl/intl.dart'; -import 'package:appwrite/models.dart'; import 'package:timezone/timezone.dart' as tz; import 'package:timezone/data/latest.dart' as tz; diff --git a/ltx_flutter/lib/pages/categories_page.dart b/ltx_flutter/lib/pages/categories_page.dart index 9e6da97..8cc6179 100644 --- a/ltx_flutter/lib/pages/categories_page.dart +++ b/ltx_flutter/lib/pages/categories_page.dart @@ -82,7 +82,7 @@ class CategoryRow extends StatelessWidget { child: Row( children: [ Container( - constraints: BoxConstraints(maxHeight: 100, maxWidth: 70), + constraints: BoxConstraints(maxHeight: 100), color: category.backgroundColor, child: SizedBox.expand( child: Center( diff --git a/ltx_flutter/lib/pages/today_page.dart b/ltx_flutter/lib/pages/today_page.dart index 099dd30..5c15942 100644 --- a/ltx_flutter/lib/pages/today_page.dart +++ b/ltx_flutter/lib/pages/today_page.dart @@ -1,14 +1,8 @@ -import 'package:ltx_flutter/appwrite/categories_api.dart'; import 'package:ltx_flutter/appwrite/database_api.dart'; import 'package:flutter/material.dart'; import 'package:provider/provider.dart'; -import 'package:intl/intl.dart'; -import 'package:appwrite/models.dart'; -import 'package:timezone/timezone.dart' as tz; -import 'package:timezone/data/latest.dart' as tz; import 'today_views/day_view.dart'; import 'today_views/infinity_view.dart'; -import '../helpers.dart'; class TodayPage extends StatefulWidget { const TodayPage({Key? key}) : super(key: key); diff --git a/ltx_flutter/lib/pages/today_views/day_view.dart b/ltx_flutter/lib/pages/today_views/day_view.dart index 06bf18e..58e4f53 100644 --- a/ltx_flutter/lib/pages/today_views/day_view.dart +++ b/ltx_flutter/lib/pages/today_views/day_view.dart @@ -2,11 +2,7 @@ import 'package:ltx_flutter/appwrite/categories_api.dart'; import 'package:ltx_flutter/appwrite/database_api.dart'; import 'package:flutter/material.dart'; import 'package:provider/provider.dart'; -import 'package:intl/intl.dart'; import 'package:appwrite/models.dart'; -import 'package:timezone/timezone.dart' as tz; -import 'package:timezone/data/latest.dart' as tz; -import 'package:ltx_flutter/pages/today_page.dart'; import 'package:ltx_flutter/helpers.dart'; class DayView extends StatefulWidget { @@ -25,7 +21,7 @@ class _DayViewState extends State { late CategoriesAPI categories; late List entries = []; - late Document? dayEntry = null; + late Document? dayEntry; late List hours = []; late num? mood = 0; late String comments = ""; @@ -143,7 +139,7 @@ class _DayViewState extends State { Switch( value: _editable, onChanged: (value) => setState(() { - _editable = !_editable!; + _editable = !_editable; }), ), ], @@ -457,7 +453,6 @@ class _HourGeneratorState extends State { edit || counter == 23 ? hourWidgets.addAll(remainingHours) : hourWidgets.addAll(remainingHoursConsolidated); - ; return hourWidgets; } diff --git a/ltx_flutter/lib/pages/today_views/infinity_view.dart b/ltx_flutter/lib/pages/today_views/infinity_view.dart index e396b25..64edb7a 100644 --- a/ltx_flutter/lib/pages/today_views/infinity_view.dart +++ b/ltx_flutter/lib/pages/today_views/infinity_view.dart @@ -2,11 +2,7 @@ import 'package:ltx_flutter/appwrite/categories_api.dart'; import 'package:ltx_flutter/appwrite/database_api.dart'; import 'package:flutter/material.dart'; import 'package:provider/provider.dart'; -import 'package:intl/intl.dart'; import 'package:appwrite/models.dart'; -import 'package:timezone/timezone.dart' as tz; -import 'package:timezone/data/latest.dart' as tz; -import 'package:ltx_flutter/pages/today_page.dart'; import 'package:ltx_flutter/helpers.dart'; class InfinityView extends StatefulWidget { @@ -37,7 +33,7 @@ class _InfinityViewState extends State { @override Widget build(BuildContext context) { return SingleChildScrollView( - child: Container( + child: SizedBox( height: MediaQuery.of(context).size.height, child: GridView.builder( gridDelegate: @@ -72,7 +68,7 @@ class _InfinityViewState extends State { try { Category category = categories.lookUp(hour.toString()); - tooltip = category.name!; + tooltip = category.name; fgColor = category.foregroundColor; bgColor = category.backgroundColor; } catch (e) { @@ -96,6 +92,7 @@ class _InfinityViewState extends State { ); } } + return null; }), ), );