From f2bfba0c88ced8bea8bf740f01415b3e4ab7e833 Mon Sep 17 00:00:00 2001 From: Sirius Date: Mon, 11 Dec 2023 15:14:42 +0530 Subject: [PATCH] Lint errors rectified --- .gitignore | 1 + lib/src/routes/router_config.dart | 4 +- .../screens/amenityHead/amenity_event.dart | 2 +- .../screens/amenityHead/amenity_profile.dart | 2 +- .../screens/amenityHead/amenityhead_home.dart | 2 +- lib/src/screens/baseUser/home/bottom_nav.dart | 1 - lib/src/screens/baseUser/home/home.dart | 2 +- .../newReservation/event_booking.dart | 27 ++-- .../newReservation/group_booking.dart | 38 +++--- .../newReservation/group_creation.dart | 124 ++++++++++-------- .../baseUser/teams/chat/chat_bubble.dart | 18 ++- .../baseUser/teams/chat/chat_screen.dart | 10 +- .../screens/baseUser/teams/teams_detail.dart | 115 ++++++++-------- .../{404_screen.dart => error_screen.dart} | 8 +- lib/src/screens/splash/splash_screen.dart | 2 +- lib/src/services/providers.dart | 1 - ...orageManager.dart => storage_manager.dart} | 8 +- .../state/amenityhead/amenityhead_state.dart | 2 +- lib/src/state/bookings/booking_state.dart | 2 +- lib/src/state/events/events_state.dart | 2 +- lib/src/state/teams/team_state.dart | 3 +- lib/src/state/user/user_state.dart | 2 +- lib/src/utils/api/amenity_api.dart | 2 +- lib/src/utils/api/booking_api.dart | 2 +- lib/src/utils/api/team_api.dart | 2 +- lib/src/utils/api/user_api.dart | 2 +- lib/src/utils/helpers/http_helper.dart | 12 +- 27 files changed, 210 insertions(+), 186 deletions(-) rename lib/src/screens/error/{404_screen.dart => error_screen.dart} (63%) rename lib/src/services/{storageManager.dart => storage_manager.dart} (88%) diff --git a/.gitignore b/.gitignore index ff36da7..a649f54 100644 --- a/.gitignore +++ b/.gitignore @@ -16,6 +16,7 @@ migrate_working_dir/ *.iws .idea/ test.dart +.github/ # The .vscode folder contains launch configuration and tasks you configure in # VS Code which you may wish to be included in version control, so this line # is commented out by default. diff --git a/lib/src/routes/router_config.dart b/lib/src/routes/router_config.dart index b5631b4..4a781f8 100644 --- a/lib/src/routes/router_config.dart +++ b/lib/src/routes/router_config.dart @@ -1,4 +1,4 @@ -import 'package:book_my_spot_frontend/src/screens/error/404_screen.dart'; +import 'package:book_my_spot_frontend/src/screens/error/error_screen.dart'; import 'package:book_my_spot_frontend/src/screens/amenityHead/amenity_eventteams.dart'; import 'package:book_my_spot_frontend/src/screens/amenityHead/amenityhead_home.dart'; import 'package:book_my_spot_frontend/src/screens/baseUser/teams/chat/chat_screen.dart'; @@ -290,7 +290,7 @@ final router = GoRouter( GoRoute( path: "/grpcreate/:fallBack", pageBuilder: (context, state) { - final fallBack = '/' + state.pathParameters["fallBack"]!; + final fallBack = '/${state.pathParameters["fallBack"]!}'; return CustomTransitionPage( key: state.pageKey, transitionDuration: const Duration(milliseconds: 750), diff --git a/lib/src/screens/amenityHead/amenity_event.dart b/lib/src/screens/amenityHead/amenity_event.dart index 17eb430..7e618d6 100644 --- a/lib/src/screens/amenityHead/amenity_event.dart +++ b/lib/src/screens/amenityHead/amenity_event.dart @@ -1,5 +1,5 @@ import 'package:book_my_spot_frontend/src/screens/amenityHead/amenityhead_home.dart'; -import 'package:book_my_spot_frontend/src/services/storageManager.dart'; +import 'package:book_my_spot_frontend/src/services/storage_manager.dart'; import 'package:book_my_spot_frontend/src/utils/api/amenity_api.dart'; import 'package:book_my_spot_frontend/src/utils/errors/amenity/amenity_exception.dart'; import 'package:flutter/material.dart'; diff --git a/lib/src/screens/amenityHead/amenity_profile.dart b/lib/src/screens/amenityHead/amenity_profile.dart index c3c662b..d302cae 100644 --- a/lib/src/screens/amenityHead/amenity_profile.dart +++ b/lib/src/screens/amenityHead/amenity_profile.dart @@ -1,4 +1,4 @@ -import 'package:book_my_spot_frontend/src/services/storageManager.dart'; +import 'package:book_my_spot_frontend/src/services/storage_manager.dart'; import 'package:flutter/material.dart'; import 'package:go_router/go_router.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; diff --git a/lib/src/screens/amenityHead/amenityhead_home.dart b/lib/src/screens/amenityHead/amenityhead_home.dart index ad480ca..27ee53c 100644 --- a/lib/src/screens/amenityHead/amenityhead_home.dart +++ b/lib/src/screens/amenityHead/amenityhead_home.dart @@ -3,7 +3,7 @@ import 'package:book_my_spot_frontend/src/screens/amenityHead/amenity_event.dart import 'package:book_my_spot_frontend/src/screens/amenityHead/events_list.dart'; import 'package:book_my_spot_frontend/src/screens/amenityHead/amenity_profile.dart'; import 'package:book_my_spot_frontend/src/screens/loading/loading_widget.dart'; -import 'package:book_my_spot_frontend/src/services/storageManager.dart'; +import 'package:book_my_spot_frontend/src/services/storage_manager.dart'; import 'package:book_my_spot_frontend/src/state/amenityhead/amenityhead_state.dart'; import 'package:book_my_spot_frontend/src/utils/api/amenity_api.dart'; import 'package:flutter/material.dart'; diff --git a/lib/src/screens/baseUser/home/bottom_nav.dart b/lib/src/screens/baseUser/home/bottom_nav.dart index 199d7dd..10ff843 100644 --- a/lib/src/screens/baseUser/home/bottom_nav.dart +++ b/lib/src/screens/baseUser/home/bottom_nav.dart @@ -1,4 +1,3 @@ -import 'package:book_my_spot_frontend/src/screens/baseUser/home/custompainter_bottomnav.dart'; import 'package:book_my_spot_frontend/src/state/navbar/navbar_state.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:flutter/material.dart'; diff --git a/lib/src/screens/baseUser/home/home.dart b/lib/src/screens/baseUser/home/home.dart index e5ceb23..2189d95 100644 --- a/lib/src/screens/baseUser/home/home.dart +++ b/lib/src/screens/baseUser/home/home.dart @@ -12,7 +12,7 @@ import 'package:go_router/go_router.dart'; import 'package:google_fonts/google_fonts.dart'; import 'package:table_calendar/table_calendar.dart'; import 'package:flutter/material.dart'; -import '../../../services/storageManager.dart'; +import '../../../services/storage_manager.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; class HomeScreen extends ConsumerStatefulWidget { diff --git a/lib/src/screens/baseUser/newReservation/event_booking.dart b/lib/src/screens/baseUser/newReservation/event_booking.dart index b9fa0cb..86559d3 100644 --- a/lib/src/screens/baseUser/newReservation/event_booking.dart +++ b/lib/src/screens/baseUser/newReservation/event_booking.dart @@ -1,6 +1,8 @@ +// ignore_for_file: unused_result + import 'package:book_my_spot_frontend/src/screens/baseUser/newReservation/make_reservation.dart'; import 'package:book_my_spot_frontend/src/services/providers.dart'; -import 'package:book_my_spot_frontend/src/services/storageManager.dart'; +import 'package:book_my_spot_frontend/src/services/storage_manager.dart'; import 'package:book_my_spot_frontend/src/state/navbar/navbar_state.dart'; import 'package:flutter/material.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; @@ -57,7 +59,7 @@ class EventBookingPage extends ConsumerWidget { const EdgeInsets.only(left: 16.0, right: 16), child: ListTile( onTap: () async { - var post_data = { + var postData = { "id": StorageManager.getToken().toString(), "team_id": data[index]["id"].toString(), "name": data[index]["name"].toString(), @@ -66,26 +68,31 @@ class EventBookingPage extends ConsumerWidget { .toString(), }; var response = await http.post( - Uri.parse(using + "event/register"), - body: post_data); + Uri.parse("${using}event/register"), + body: postData); if (response.statusCode == 500) { SnackBar snackBar = const SnackBar( content: Text("You are not an admin!")); - ScaffoldMessenger.of(context) - .showSnackBar(snackBar); + if (context.mounted) { + ScaffoldMessenger.of(context) + .showSnackBar(snackBar); + } } else { SnackBar snackBar = SnackBar( content: Text( "Registration for Team ${data[index]["name"]} succesfull")); - ScaffoldMessenger.of(context) - .showSnackBar(snackBar); + if (context.mounted) { + ScaffoldMessenger.of(context) + .showSnackBar(snackBar); + } + ref.refresh(currentIndexProvider); ref.refresh(finalTeamsProvider); ref.refresh(eventsProvider); - context.go("/"); + Future.microtask(() => context.go("/")); } - print(post_data); + debugPrint(postData.toString()); }, tileColor: const Color.fromRGBO(217, 217, 217, 0.3), diff --git a/lib/src/screens/baseUser/newReservation/group_booking.dart b/lib/src/screens/baseUser/newReservation/group_booking.dart index 25def8e..2c204b0 100644 --- a/lib/src/screens/baseUser/newReservation/group_booking.dart +++ b/lib/src/screens/baseUser/newReservation/group_booking.dart @@ -1,8 +1,10 @@ +// ignore_for_file: unused_result + import 'dart:convert'; import 'package:book_my_spot_frontend/src/screens/baseUser/newReservation/check_slots.dart'; import 'package:book_my_spot_frontend/src/screens/baseUser/newReservation/confirm_booking.dart'; import 'package:book_my_spot_frontend/src/screens/baseUser/newReservation/group_creation.dart'; -import 'package:book_my_spot_frontend/src/services/storageManager.dart'; +import 'package:book_my_spot_frontend/src/services/storage_manager.dart'; import 'package:book_my_spot_frontend/src/state/bookings/booking_state.dart'; import 'package:book_my_spot_frontend/src/state/navbar/navbar_state.dart'; import 'package:flutter/material.dart'; @@ -20,10 +22,10 @@ class GroupBookingFinalPage extends ConsumerWidget { @override Widget build(BuildContext context, WidgetRef ref) { - final grp_name = ref.watch(groupNameProvider); + final groupName = ref.watch(groupNameProvider); final date = ref.watch(selectedDateProvider); final data = ref.watch(slotsProviderAmenity); - var initial_post_data = { + var initialPostData = { "date": "${date.year}-${date.month}-${date.day}", "amenity_id": data[0]["amenity_id"].toString(), "start_time": data[ref.read(indexProvider)]["start_time"].toString(), @@ -59,30 +61,30 @@ class GroupBookingFinalPage extends ConsumerWidget { i < ref.read(groupselectedProvider.notifier).state.length; i++) { var id = ref.read(groupselectedProvider)[i]["id"]; - print(id); + debugPrint(id); grpMembers.add(id); } - print(grpMembers); + debugPrint(grpMembers.toString()); grpMembers.add(StorageManager.getToken().toString()); - var grp_data = { - "name": grp_name, + var groupData = { + "name": groupName, "id": jsonEncode(grpMembers).toString(), }; - print(grp_data); - var grp_response = await http - .post(Uri.parse(using + "group/add"), body: grp_data); - var grp_id = jsonDecode(grp_response.body.toString()); - print(data); - initial_post_data["group_id"] = grp_id.toString(); + debugPrint(groupData.toString()); + var groupResponse = await http + .post(Uri.parse("${using}group/add"), body: groupData); + var grpId = jsonDecode(groupResponse.body.toString()); + debugPrint(data.toString()); + initialPostData["group_id"] = grpId.toString(); var response = await http.post( - Uri.parse(using + "booking/group/bookSlot"), - body: initial_post_data); + Uri.parse("${using}booking/group/bookSlot"), + body: initialPostData); if (response.statusCode == 200) { ref.refresh(groupNameProvider); ref.refresh(groupselectedProvider); ref.refresh(userBookingsProvider); ref.refresh(currentIndexProvider); - context.go("/"); + Future.microtask(() => context.go("/")); } }, child: const Padding( @@ -102,12 +104,12 @@ class GroupBookingFinalPage extends ConsumerWidget { children: [ TextField( decoration: - InputDecoration(label: Center(child: Text("Enter group name"))), + const InputDecoration(label: Center(child: Text("Enter group name"))), onChanged: (value) { ref.read(groupNameProvider.notifier).state = value; }, ), - SizedBox( + const SizedBox( height: 30, ), ], diff --git a/lib/src/screens/baseUser/newReservation/group_creation.dart b/lib/src/screens/baseUser/newReservation/group_creation.dart index 1da403c..efd9935 100644 --- a/lib/src/screens/baseUser/newReservation/group_creation.dart +++ b/lib/src/screens/baseUser/newReservation/group_creation.dart @@ -1,3 +1,5 @@ +// ignore_for_file: unused_result + import 'dart:convert'; import 'package:book_my_spot_frontend/src/state/teams/team_state.dart'; import 'package:book_my_spot_frontend/src/utils/api/team_api.dart'; @@ -5,7 +7,7 @@ import 'package:book_my_spot_frontend/src/utils/errors/team/team_errors.dart'; import 'package:book_my_spot_frontend/src/utils/helpers/response_helper.dart'; import 'package:flutter_spinkit/flutter_spinkit.dart'; import 'package:book_my_spot_frontend/src/screens/baseUser/teams/teams_page.dart'; -import 'package:book_my_spot_frontend/src/services/storageManager.dart'; +import 'package:book_my_spot_frontend/src/services/storage_manager.dart'; import 'package:flutter/material.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; import '../../../constants/constants.dart'; @@ -31,7 +33,7 @@ final itemsProvider = StateProvider>((ref) { }); final usersAllProvider = FutureProvider((ref) async { - var response = await http.get(Uri.parse(using + "user")); + var response = await http.get(Uri.parse("${using}user")); var data = jsonDecode(response.body.toString()); for (int i = 0; i < data.length; i++) { var entry = {}; @@ -46,6 +48,7 @@ final usersAllProvider = FutureProvider((ref) async { return data; }); +// ignore: must_be_immutable class GroupCreatePage extends ConsumerStatefulWidget { GroupCreatePage(this.fallbackRoute, {super.key}); String fallbackRoute; @@ -108,10 +111,10 @@ class _GroupCreatePageState extends ConsumerState { .contains("teamDetails")) { var id = ref.watch(teamIDProvider); var response = await http - .get(Uri.parse(using + "team/i?id=$id")); + .get(Uri.parse("${using}team/i?id=$id")); var data = jsonDecode(response.body.toString()); - var team_name = data[0]["name"]; - var team_id = data[0]["id"]; + var teamName = data[0]["name"]; + var teamId = data[0]["id"]; for (int i = 0; i < ref @@ -120,61 +123,57 @@ class _GroupCreatePageState extends ConsumerState { .length; i++) { var entry = ref.watch(groupselectedProvider)[i]; - var member_id = entry["id"]; + var memberId = entry["id"]; var admin = entry["admin"]; - var post_data = { + var postData = { "id": StorageManager.getToken().toString(), - "name": team_name, - "member_id": member_id, + "name": teamName, + "member_id": memberId, "admin": admin, - "team_id": team_id.toString() + "team_id": teamId.toString() }; var response = await http.post( - Uri.parse(using + "team/add"), - body: post_data); + Uri.parse("${using}team/add"), + body: postData); var data = jsonDecode(response.body.toString()); - print(data); + debugPrint(data); } ref.refresh(groupselectedProvider); await ref.watch(teamsProvider.notifier).getTeams(ref); - context.go("/teamDetails$id"); + Future.microtask(() => context.go("/teamDetails$id")); } else if (widget.fallbackRoute.contains("/home")) { - TextEditingController _textFieldController = + TextEditingController textFieldController = TextEditingController(); showAdaptiveDialog( context: context, builder: (context) { return AlertDialog( - title: Text('Enter Team Name'), + title: const Text('Enter Team Name'), content: TextField( - controller: _textFieldController, - decoration: InputDecoration( + controller: textFieldController, + decoration: const InputDecoration( hintText: "Team name here"), ), actions: [ ElevatedButton( - child: Text('CANCEL'), + child: const Text('CANCEL'), onPressed: () { Navigator.pop(context); }, ), ElevatedButton( - child: Text('OK'), + child: const Text('OK'), onPressed: () async { - SnackBar snackBar = SnackBar( - content: Text( - "Please enter a non empty team name")); try { Response response = await TeamAPIEndpoint.createTeam( - _textFieldController.text); + textFieldController.text); try { if (ref - .read(groupselectedProvider) - .length != - 0) { + .read(groupselectedProvider) + .isNotEmpty) { if (response.statusCode == 200) { for (int i = 0; i < @@ -185,43 +184,52 @@ class _GroupCreatePageState extends ConsumerState { i++) { var entry = ref.watch( groupselectedProvider)[i]; - var member_id = entry["id"]; + var memberId = entry["id"]; var admin = entry["admin"]; - var post_data = { + var postData = { "id": StorageManager.getToken() .toString(), "team_id": response.data.toString(), "name": - _textFieldController.text, - "member_id": member_id, + textFieldController.text, + "member_id": memberId, "admin": admin, }; - print(post_data); - var responses = await http.post( + debugPrint(postData.toString()); + await http.post( Uri.parse( - using + "team/add"), - body: post_data); + "${using}team/add"), + body: postData); + } + Future.microtask( + () => context.go("/")); + if (context.mounted) { + Navigator.pop(context); } - context.go("/"); - Navigator.pop(context); } else { SnackBar snackBar = const SnackBar( content: Text( "Error occoured while creating team!")); - ScaffoldMessenger.of(context) - .showSnackBar(snackBar); + if (context.mounted) { + ScaffoldMessenger.of(context) + .showSnackBar(snackBar); + } } } else { SnackBar snackBar = const SnackBar( content: Text( "Please selct atleast one member before proceeding!")); - ScaffoldMessenger.of(context) - .showSnackBar(snackBar); + if (context.mounted) { + ScaffoldMessenger.of(context) + .showSnackBar(snackBar); + } } - } catch (e) {} + } catch (e) { + debugPrint(e.toString()); + } } on TeamException catch (e) { e.handleError(ref); } @@ -256,20 +264,20 @@ class _GroupCreatePageState extends ConsumerState { suffixIcon: Icon(Icons.search), ), onChanged: (value) { - var all_players = ref.read(itemsProvider); - List filtered_players = []; + var allPlayers = ref.read(itemsProvider); + List filteredPlayers = []; if (value.isEmpty) { - filtered_players = all_players; + filteredPlayers = allPlayers; } else { - filtered_players = all_players + filteredPlayers = allPlayers .where((element) => element["name"] .toLowerCase() .contains(value.toLowerCase())) .toList(); } ref.read(filtereditemsProvider.notifier).state = - filtered_players; + filteredPlayers; }, ), ), @@ -278,10 +286,9 @@ class _GroupCreatePageState extends ConsumerState { ), Visibility( visible: ref - .watch(groupselectedProvider.notifier) - .state - .length != - 0, + .watch(groupselectedProvider.notifier) + .state + .isNotEmpty, child: Wrap( direction: Axis.horizontal, children: [ @@ -326,6 +333,7 @@ class _GroupCreatePageState extends ConsumerState { shape: BoxShape.circle, ), child: Image.network( + // ignore: prefer_interpolation_to_compose_strings "https://channeli.in" + ref .read(groupselectedProvider @@ -393,13 +401,13 @@ class _GroupCreatePageState extends ConsumerState { return Visibility( visible: true, child: Dialog( - child: Container( + child: SizedBox( height: 100, child: Column( mainAxisAlignment: MainAxisAlignment.spaceEvenly, children: [ - Text("Select Role"), + const Text("Select Role"), Row( mainAxisAlignment: MainAxisAlignment @@ -451,7 +459,8 @@ class _GroupCreatePageState extends ConsumerState { .pop(); setState(() {}); }, - child: Text("Admin")), + child: const Text( + "Admin")), ElevatedButton( onPressed: () { var entry = {}; @@ -498,7 +507,8 @@ class _GroupCreatePageState extends ConsumerState { Navigator.of(context) .pop(); }, - child: Text("Member")) + child: const Text( + "Member")) ], ) ], @@ -509,7 +519,6 @@ class _GroupCreatePageState extends ConsumerState { ); } }, - leading: Column( mainAxisAlignment: MainAxisAlignment.start, children: [ @@ -531,6 +540,7 @@ class _GroupCreatePageState extends ConsumerState { shape: BoxShape.circle, ), child: Image.network( + // ignore: prefer_interpolation_to_compose_strings "https://channeli.in" + ref.watch(filtereditemsProvider)[ index]["dp"], @@ -557,7 +567,7 @@ class _GroupCreatePageState extends ConsumerState { )); }, error: (error, stackTrace) { - return SizedBox(); + return const SizedBox(); }, loading: () { return const SpinKitFadingCircle( diff --git a/lib/src/screens/baseUser/teams/chat/chat_bubble.dart b/lib/src/screens/baseUser/teams/chat/chat_bubble.dart index f87c041..46b9f84 100644 --- a/lib/src/screens/baseUser/teams/chat/chat_bubble.dart +++ b/lib/src/screens/baseUser/teams/chat/chat_bubble.dart @@ -1,4 +1,3 @@ -import 'package:book_my_spot_frontend/src/services/storageManager.dart'; import 'package:flutter/material.dart'; class ChatBubble extends StatelessWidget { @@ -30,25 +29,32 @@ class ChatBubble extends StatelessWidget { child: DecoratedBox( // chat bubble decoration decoration: BoxDecoration( - color: isCurrentUser ? const Color.fromARGB(168, 35, 187, 233) : Colors.grey[300], + color: isCurrentUser + ? const Color.fromARGB(168, 35, 187, 233) + : Colors.grey[300], borderRadius: BorderRadius.circular(16), ), child: Padding( padding: const EdgeInsets.all(12), child: SizedBox( - width: 0.7*MediaQuery.of(context).size.width, + width: 0.7 * MediaQuery.of(context).size.width, child: Column( children: [ Align( - alignment: Alignment.topLeft, - child: Text(sender , style: const TextStyle(fontSize: 10),)), + alignment: Alignment.topLeft, + child: Text( + sender, + style: const TextStyle(fontSize: 10), + )), Text( text, ), Align( alignment: Alignment.bottomRight, child: Text( - "${timeStamp.day}/${timeStamp.month}/${timeStamp.year} ${timeStamp.hour} ${timeStamp.minute}" , style: TextStyle(fontSize: 10),), + "${timeStamp.day}/${timeStamp.month}/${timeStamp.year} ${timeStamp.hour} ${timeStamp.minute}", + style: const TextStyle(fontSize: 10), + ), ) ], ), diff --git a/lib/src/screens/baseUser/teams/chat/chat_screen.dart b/lib/src/screens/baseUser/teams/chat/chat_screen.dart index 5967376..0f279a7 100644 --- a/lib/src/screens/baseUser/teams/chat/chat_screen.dart +++ b/lib/src/screens/baseUser/teams/chat/chat_screen.dart @@ -8,9 +8,8 @@ import 'package:flutter/material.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:go_router/go_router.dart'; import 'package:book_my_spot_frontend/src/constants/constants.dart'; -import 'package:flutter_chat_types/flutter_chat_types.dart' as types; -import 'package:flutter_chat_ui/flutter_chat_ui.dart'; +// ignore: must_be_immutable class ChatPage extends ConsumerStatefulWidget { ChatPage(this.id, {super.key}); String id; @@ -37,7 +36,7 @@ class _ChatPageState extends ConsumerState { @override void initState() { channel = - WebSocketChannel.connect(Uri.parse("ws://${iP}/ws/chat/${widget.id}")); + WebSocketChannel.connect(Uri.parse("ws://$iP/ws/chat/${widget.id}")); super.initState(); } @@ -88,8 +87,9 @@ class _ChatPageState extends ConsumerState { builder: (context, snapshot) { if (snapshot.connectionState == ConnectionState.active) { final chats = jsonDecode(snapshot.data.toString()); - for (int i = 0; i < chats.length; i++) + for (int i = 0; i < chats.length; i++) { chats[i] = jsonDecode(chats[i].toString()); + } User? user = ref.watch(userProvider); return Expanded( child: Align( @@ -105,7 +105,7 @@ class _ChatPageState extends ConsumerState { reverse: true, itemCount: chats.length, separatorBuilder: (context, index) { - return SizedBox( + return const SizedBox( height: 20, ); }, diff --git a/lib/src/screens/baseUser/teams/teams_detail.dart b/lib/src/screens/baseUser/teams/teams_detail.dart index f76adad..677ef4b 100644 --- a/lib/src/screens/baseUser/teams/teams_detail.dart +++ b/lib/src/screens/baseUser/teams/teams_detail.dart @@ -1,7 +1,9 @@ +// ignore_for_file: unused_result + import 'package:auto_size_text/auto_size_text.dart'; import 'package:book_my_spot_frontend/src/models/team.dart'; import 'package:book_my_spot_frontend/src/screens/baseUser/teams/teams_page.dart'; -import 'package:book_my_spot_frontend/src/services/storageManager.dart'; +import 'package:book_my_spot_frontend/src/services/storage_manager.dart'; import 'package:book_my_spot_frontend/src/state/teams/team_state.dart'; import 'package:book_my_spot_frontend/src/state/user/user_state.dart'; import 'package:book_my_spot_frontend/src/utils/api/team_api.dart'; @@ -18,6 +20,7 @@ final teamidChatProvider = StateProvider((ref) { bool isAdmin = false; +// ignore: must_be_immutable class TeamDetails extends ConsumerStatefulWidget { TeamDetails(this.id, {super.key}); String? id; @@ -35,7 +38,7 @@ class _TeamDetailsState extends ConsumerState { } @override - void didChangeDependencies(){ + void didChangeDependencies() { widget.team = ref.watch(teamsProvider.notifier).getTeamDetails(int.parse(widget.id!)); for (int i = 0; i < widget.team!.admins.length; i++) { @@ -50,10 +53,8 @@ class _TeamDetailsState extends ConsumerState { @override Widget build(BuildContext context) { - if(widget.team == null){ - widget.team = + widget.team ??= ref.watch(teamsProvider.notifier).getTeamDetails(int.parse(widget.id!)); - } return Scaffold( appBar: AppBar( toolbarHeight: MediaQuery.of(context).size.height / 12, @@ -63,10 +64,8 @@ class _TeamDetailsState extends ConsumerState { ref.refresh(teamIDProvider); context.go("/"); }, - icon: Icon( - Icons.arrow_back_ios, - color: Theme.of(context).iconTheme.color - )), + icon: Icon(Icons.arrow_back_ios, + color: Theme.of(context).iconTheme.color)), title: Text(widget.team!.name, style: Theme.of(context).textTheme.headlineLarge), actions: [ @@ -96,8 +95,7 @@ class _TeamDetailsState extends ConsumerState { } e.errorHandler(ref); } catch (e) { - print( - "Unknown error occoured!" + e.toString()); + debugPrint("Unknown error occoured!$e"); } }, child: const Text("Yes")) @@ -106,12 +104,18 @@ class _TeamDetailsState extends ConsumerState { }, ); }, - child: const Text("Leave" , style: TextStyle(color: Colors.black),)), + child: const Text( + "Leave", + style: TextStyle(color: Colors.black), + )), TextButton( onPressed: () { context.go("/chat/${widget.team!.id}"); }, - child: const Text("Chat" , style: TextStyle(color: Colors.black),)) + child: const Text( + "Chat", + style: TextStyle(color: Colors.black), + )) ], ), body: Column(children: [ @@ -153,45 +157,46 @@ class _TeamDetailsState extends ConsumerState { padding: const EdgeInsets.all(18.0), child: SizedBox( width: MediaQuery.of(context).size.width, - child: isAdmin ? ElevatedButton( - onPressed: () async { - await showAdaptiveDialog( - context: context, - builder: (context) { - return AlertDialog.adaptive( - content: Text("Are you sure?"), - actions: [ - ElevatedButton( - onPressed: () { - context.pop(); - }, - child: const Text("No")), - ElevatedButton( - onPressed: () async { - User? user = ref.watch(userProvider); - try { - await TeamAPIEndpoint.deleteTeam( - widget.team!, user!.token); - if (context.mounted) { - context.go("/"); - } - } on TeamException catch (e) { - e.handleError(ref); - } - }, - child: const Text("Yes")) - ], - ); - }, - ); - }, - style: ElevatedButton.styleFrom( - side: const BorderSide(width: 2, color: Colors.red), - backgroundColor: Colors.white), - child: Text("Delete this team", - style: Theme.of(context).textTheme.labelLarge), - ) : const SizedBox() - ), + child: isAdmin + ? ElevatedButton( + onPressed: () async { + await showAdaptiveDialog( + context: context, + builder: (context) { + return AlertDialog.adaptive( + content: const Text("Are you sure?"), + actions: [ + ElevatedButton( + onPressed: () { + context.pop(); + }, + child: const Text("No")), + ElevatedButton( + onPressed: () async { + User? user = ref.watch(userProvider); + try { + await TeamAPIEndpoint.deleteTeam( + widget.team!, user!.token); + if (context.mounted) { + context.go("/"); + } + } on TeamException catch (e) { + e.handleError(ref); + } + }, + child: const Text("Yes")) + ], + ); + }, + ); + }, + style: ElevatedButton.styleFrom( + side: const BorderSide(width: 2, color: Colors.red), + backgroundColor: Colors.white), + child: Text("Delete this team", + style: Theme.of(context).textTheme.labelLarge), + ) + : const SizedBox()), ), const SizedBox( height: 15, @@ -213,10 +218,8 @@ class _TeamDetailsState extends ConsumerState { } setState(() {}); }, - icon: Icon( - Icons.add, - color: Theme.of(context).iconTheme.color - )), + icon: Icon(Icons.add, + color: Theme.of(context).iconTheme.color)), ) : const SizedBox() ], diff --git a/lib/src/screens/error/404_screen.dart b/lib/src/screens/error/error_screen.dart similarity index 63% rename from lib/src/screens/error/404_screen.dart rename to lib/src/screens/error/error_screen.dart index c87a313..e12b53e 100644 --- a/lib/src/screens/error/404_screen.dart +++ b/lib/src/screens/error/error_screen.dart @@ -5,8 +5,10 @@ class GoRouteNotFoundPage extends StatelessWidget { @override Widget build(BuildContext context) { - return Scaffold( - body: Center(child: Text("Oops , we didn't find that page!"),), + return const Scaffold( + body: Center( + child: Text("Oops , we didn't find that page!"), + ), ); } -} \ No newline at end of file +} diff --git a/lib/src/screens/splash/splash_screen.dart b/lib/src/screens/splash/splash_screen.dart index c7ac149..c67251b 100644 --- a/lib/src/screens/splash/splash_screen.dart +++ b/lib/src/screens/splash/splash_screen.dart @@ -4,7 +4,7 @@ import 'package:book_my_spot_frontend/src/state/user/user_state.dart'; import 'package:go_router/go_router.dart'; import 'package:flutter/material.dart'; import 'package:google_fonts/google_fonts.dart'; -import 'package:book_my_spot_frontend/src/services/storageManager.dart'; +import 'package:book_my_spot_frontend/src/services/storage_manager.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; class LoadingScreen extends ConsumerStatefulWidget { diff --git a/lib/src/services/providers.dart b/lib/src/services/providers.dart index da7ade3..552bc7e 100644 --- a/lib/src/services/providers.dart +++ b/lib/src/services/providers.dart @@ -21,7 +21,6 @@ final initialdataProvider = FutureProvider((ref) async { Uri uri = ref.watch(uriProvider); if (!uri.toString().contains("channeli")) { var response = await http.get(uri); - print(response.statusCode); if (response.statusCode == 200) { String token = jsonDecode(response.body).toString(); return token; diff --git a/lib/src/services/storageManager.dart b/lib/src/services/storage_manager.dart similarity index 88% rename from lib/src/services/storageManager.dart rename to lib/src/services/storage_manager.dart index 6d815f2..fa345bb 100644 --- a/lib/src/services/storageManager.dart +++ b/lib/src/services/storage_manager.dart @@ -7,9 +7,7 @@ class StorageManager { final box = GetStorage(); box.write("token", null); String? token = box.read("token"); - if (token == null) { - print("TOKEN IS NULL"); - } + if (token == null) {} } static void saveToken(token) async { @@ -31,9 +29,7 @@ class StorageManager { final box = GetStorage(); box.write("admintoken", null); String? token = box.read("admintoken"); - if (token == null) { - print("TOKEN IS NULL"); - } + if (token == null) {} } static void saveAdminToken(token) { diff --git a/lib/src/state/amenityhead/amenityhead_state.dart b/lib/src/state/amenityhead/amenityhead_state.dart index d147320..69f9e39 100644 --- a/lib/src/state/amenityhead/amenityhead_state.dart +++ b/lib/src/state/amenityhead/amenityhead_state.dart @@ -25,7 +25,7 @@ class AmenityHeadNotifier extends StateNotifier> { List amenityBookings = []; for (int i = 0; i < data.length; i++) { Booking booking = Booking(); - print(data[i]); + debugPrint(data[i]); booking = await booking.bookingFromJson(data[i]); amenityBookings.add(booking); } diff --git a/lib/src/state/bookings/booking_state.dart b/lib/src/state/bookings/booking_state.dart index 0657ef7..037d470 100644 --- a/lib/src/state/bookings/booking_state.dart +++ b/lib/src/state/bookings/booking_state.dart @@ -56,7 +56,7 @@ class BookingNotifier extends StateNotifier> { if (booking.id != bookingId) booking ]; } on UserException catch (e) { - print("ERROR HANDLING IN PLACE"); + debugPrint("ERROR HANDLING IN PLACE"); if (context.mounted) { e.errorHandler(ref); } diff --git a/lib/src/state/events/events_state.dart b/lib/src/state/events/events_state.dart index dd628c6..cbf2f64 100644 --- a/lib/src/state/events/events_state.dart +++ b/lib/src/state/events/events_state.dart @@ -1,5 +1,5 @@ import 'package:book_my_spot_frontend/src/models/event.dart'; -import 'package:book_my_spot_frontend/src/services/storageManager.dart'; +import 'package:book_my_spot_frontend/src/services/storage_manager.dart'; import 'package:book_my_spot_frontend/src/utils/enums/request_groups.dart'; import 'package:book_my_spot_frontend/src/utils/enums/request_types.dart'; import 'package:book_my_spot_frontend/src/utils/helpers/http_helper.dart'; diff --git a/lib/src/state/teams/team_state.dart b/lib/src/state/teams/team_state.dart index 04dcd96..67d22c3 100644 --- a/lib/src/state/teams/team_state.dart +++ b/lib/src/state/teams/team_state.dart @@ -38,6 +38,7 @@ class TeamNotifier extends StateNotifier> { return userTeams; } on TeamException catch (e) { e.handleError(ref); + return null; } } @@ -85,9 +86,7 @@ class TeamNotifier extends StateNotifier> { if (team.id == teamId) { User user = User(uid); user = await user.userFromJSON(); - print(team.members.length); team.members.add(user); - print(team.members.length); teams.add(team); } else { teams.add(team); diff --git a/lib/src/state/user/user_state.dart b/lib/src/state/user/user_state.dart index 6838773..9d0bca7 100644 --- a/lib/src/state/user/user_state.dart +++ b/lib/src/state/user/user_state.dart @@ -4,7 +4,7 @@ import 'package:book_my_spot_frontend/src/utils/helpers/http_helper.dart'; import 'package:book_my_spot_frontend/src/utils/helpers/response_helper.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; import 'package:book_my_spot_frontend/src/models/user.dart'; -import 'package:book_my_spot_frontend/src/services/storageManager.dart'; +import 'package:book_my_spot_frontend/src/services/storage_manager.dart'; class UserNotifier extends StateNotifier> { UserNotifier() : super([]); diff --git a/lib/src/utils/api/amenity_api.dart b/lib/src/utils/api/amenity_api.dart index c802c81..3f21b58 100644 --- a/lib/src/utils/api/amenity_api.dart +++ b/lib/src/utils/api/amenity_api.dart @@ -1,5 +1,5 @@ import 'package:book_my_spot_frontend/src/models/moduser.dart'; -import 'package:book_my_spot_frontend/src/services/storageManager.dart'; +import 'package:book_my_spot_frontend/src/services/storage_manager.dart'; import 'package:book_my_spot_frontend/src/state/amenityhead/amenityhead_state.dart'; import 'package:book_my_spot_frontend/src/utils/enums/error_types.dart'; import 'package:book_my_spot_frontend/src/utils/enums/request_groups.dart'; diff --git a/lib/src/utils/api/booking_api.dart b/lib/src/utils/api/booking_api.dart index 82ee96c..c4c2161 100644 --- a/lib/src/utils/api/booking_api.dart +++ b/lib/src/utils/api/booking_api.dart @@ -7,7 +7,7 @@ import 'package:book_my_spot_frontend/src/utils/errors/user/user_errors.dart'; import 'package:book_my_spot_frontend/src/utils/helpers/http_helper.dart'; import 'package:flutter/material.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; -import 'package:book_my_spot_frontend/src/services/storageManager.dart'; +import 'package:book_my_spot_frontend/src/services/storage_manager.dart'; import 'package:book_my_spot_frontend/src/utils/helpers/response_helper.dart'; class BookingAPIEndpoint { diff --git a/lib/src/utils/api/team_api.dart b/lib/src/utils/api/team_api.dart index a643cbb..2527cf4 100644 --- a/lib/src/utils/api/team_api.dart +++ b/lib/src/utils/api/team_api.dart @@ -1,5 +1,5 @@ import 'package:book_my_spot_frontend/src/models/team.dart'; -import 'package:book_my_spot_frontend/src/services/storageManager.dart'; +import 'package:book_my_spot_frontend/src/services/storage_manager.dart'; import 'package:book_my_spot_frontend/src/utils/enums/error_types.dart'; import 'package:book_my_spot_frontend/src/utils/enums/request_groups.dart'; import 'package:book_my_spot_frontend/src/utils/enums/request_types.dart'; diff --git a/lib/src/utils/api/user_api.dart b/lib/src/utils/api/user_api.dart index 3eb7edb..72a12f8 100644 --- a/lib/src/utils/api/user_api.dart +++ b/lib/src/utils/api/user_api.dart @@ -4,7 +4,7 @@ import 'package:book_my_spot_frontend/src/state/user/user_state.dart'; import 'package:book_my_spot_frontend/src/utils/enums/error_types.dart'; import 'package:book_my_spot_frontend/src/utils/errors/user/user_errors.dart'; import 'package:book_my_spot_frontend/src/utils/helpers/response_helper.dart'; -import 'package:book_my_spot_frontend/src/services/storageManager.dart'; +import 'package:book_my_spot_frontend/src/services/storage_manager.dart'; import 'package:book_my_spot_frontend/src/utils/errors/auth/auth_errors.dart'; import 'package:flutter/material.dart'; import 'package:flutter_riverpod/flutter_riverpod.dart'; diff --git a/lib/src/utils/helpers/http_helper.dart b/lib/src/utils/helpers/http_helper.dart index f3ecc7f..6334788 100644 --- a/lib/src/utils/helpers/http_helper.dart +++ b/lib/src/utils/helpers/http_helper.dart @@ -12,22 +12,22 @@ class HttpHelper { late Uri url; switch (type) { case RequestGroup.amenity: - url = Uri.parse(using + "amenity/" + suffix); + url = Uri.parse("${using}amenity/$suffix"); break; case RequestGroup.booking: - url = Uri.parse(using + "booking/" + suffix); + url = Uri.parse("${using}booking/$suffix"); break; case RequestGroup.event: - url = Uri.parse(using + "event/" + suffix); + url = Uri.parse("${using}event/$suffix"); break; case RequestGroup.group: - url = Uri.parse(using + "group/" + suffix); + url = Uri.parse("${using}group/$suffix"); break; case RequestGroup.team: - url = Uri.parse(using + "team/" + suffix); + url = Uri.parse("${using}team/$suffix"); break; case RequestGroup.user: - url = Uri.parse(using + "user/" + suffix); + url = Uri.parse("${using}user/$suffix"); break; case RequestGroup.other: url = Uri.parse(using + suffix);