This commit is contained in:
Ryan Pandya 2023-06-08 02:51:47 -04:00
parent e18abcdcb8
commit bbbe05ed3e
6 changed files with 6 additions and 25 deletions

View File

@ -4,7 +4,6 @@ import 'package:flutter/material.dart';
import 'package:ltx_flutter/appwrite/auth_api.dart'; import 'package:ltx_flutter/appwrite/auth_api.dart';
import 'package:ltx_flutter/constants/constants.dart'; import 'package:ltx_flutter/constants/constants.dart';
import 'package:intl/intl.dart'; import 'package:intl/intl.dart';
import 'package:ltx_flutter/constants/constants.dart';
class DatabaseAPI extends ChangeNotifier { class DatabaseAPI extends ChangeNotifier {
Client client = Client(); Client client = Client();

View File

@ -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:flutter/material.dart';
import 'package:provider/provider.dart';
import 'package:intl/intl.dart'; import 'package:intl/intl.dart';
import 'package:appwrite/models.dart';
import 'package:timezone/timezone.dart' as tz; import 'package:timezone/timezone.dart' as tz;
import 'package:timezone/data/latest.dart' as tz; import 'package:timezone/data/latest.dart' as tz;

View File

@ -82,7 +82,7 @@ class CategoryRow extends StatelessWidget {
child: Row( child: Row(
children: [ children: [
Container( Container(
constraints: BoxConstraints(maxHeight: 100, maxWidth: 70), constraints: BoxConstraints(maxHeight: 100),
color: category.backgroundColor, color: category.backgroundColor,
child: SizedBox.expand( child: SizedBox.expand(
child: Center( child: Center(

View File

@ -1,14 +1,8 @@
import 'package:ltx_flutter/appwrite/categories_api.dart';
import 'package:ltx_flutter/appwrite/database_api.dart'; import 'package:ltx_flutter/appwrite/database_api.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:provider/provider.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/day_view.dart';
import 'today_views/infinity_view.dart'; import 'today_views/infinity_view.dart';
import '../helpers.dart';
class TodayPage extends StatefulWidget { class TodayPage extends StatefulWidget {
const TodayPage({Key? key}) : super(key: key); const TodayPage({Key? key}) : super(key: key);

View File

@ -2,11 +2,7 @@ import 'package:ltx_flutter/appwrite/categories_api.dart';
import 'package:ltx_flutter/appwrite/database_api.dart'; import 'package:ltx_flutter/appwrite/database_api.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:provider/provider.dart'; import 'package:provider/provider.dart';
import 'package:intl/intl.dart';
import 'package:appwrite/models.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'; import 'package:ltx_flutter/helpers.dart';
class DayView extends StatefulWidget { class DayView extends StatefulWidget {
@ -25,7 +21,7 @@ class _DayViewState extends State<DayView> {
late CategoriesAPI categories; late CategoriesAPI categories;
late List<Document> entries = []; late List<Document> entries = [];
late Document? dayEntry = null; late Document? dayEntry;
late List<num> hours = []; late List<num> hours = [];
late num? mood = 0; late num? mood = 0;
late String comments = ""; late String comments = "";
@ -143,7 +139,7 @@ class _DayViewState extends State<DayView> {
Switch( Switch(
value: _editable, value: _editable,
onChanged: (value) => setState(() { onChanged: (value) => setState(() {
_editable = !_editable!; _editable = !_editable;
}), }),
), ),
], ],
@ -457,7 +453,6 @@ class _HourGeneratorState extends State<HourGenerator> {
edit || counter == 23 edit || counter == 23
? hourWidgets.addAll(remainingHours) ? hourWidgets.addAll(remainingHours)
: hourWidgets.addAll(remainingHoursConsolidated); : hourWidgets.addAll(remainingHoursConsolidated);
;
return hourWidgets; return hourWidgets;
} }

View File

@ -2,11 +2,7 @@ import 'package:ltx_flutter/appwrite/categories_api.dart';
import 'package:ltx_flutter/appwrite/database_api.dart'; import 'package:ltx_flutter/appwrite/database_api.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:provider/provider.dart'; import 'package:provider/provider.dart';
import 'package:intl/intl.dart';
import 'package:appwrite/models.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'; import 'package:ltx_flutter/helpers.dart';
class InfinityView extends StatefulWidget { class InfinityView extends StatefulWidget {
@ -37,7 +33,7 @@ class _InfinityViewState extends State<InfinityView> {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
return SingleChildScrollView( return SingleChildScrollView(
child: Container( child: SizedBox(
height: MediaQuery.of(context).size.height, height: MediaQuery.of(context).size.height,
child: GridView.builder( child: GridView.builder(
gridDelegate: gridDelegate:
@ -72,7 +68,7 @@ class _InfinityViewState extends State<InfinityView> {
try { try {
Category category = categories.lookUp(hour.toString()); Category category = categories.lookUp(hour.toString());
tooltip = category.name!; tooltip = category.name;
fgColor = category.foregroundColor; fgColor = category.foregroundColor;
bgColor = category.backgroundColor; bgColor = category.backgroundColor;
} catch (e) { } catch (e) {
@ -96,6 +92,7 @@ class _InfinityViewState extends State<InfinityView> {
); );
} }
} }
return null;
}), }),
), ),
); );