From e60f8e5687746e97ab2535627d9af36eea19ea4b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Rom=C3=A3o?= Date: Tue, 9 Apr 2024 11:23:29 +0100 Subject: [PATCH] updates deprecated tags --- frontend/lib/components/ListViewCard.dart | 3 +-- frontend/lib/components/deckTheme.dart | 8 +++--- frontend/lib/components/drawer.dart | 6 ++--- .../lib/components/participationCard.dart | 2 +- frontend/lib/generated_plugin_registrant.dart | 27 ------------------- .../routes/company/banner/CompanyBanner.dart | 2 +- .../banner/CompanyStatusDropdownButton.dart | 2 +- .../routes/speaker/banner/SpeakerBanner.dart | 4 +-- .../banner/SpeakerStatusDropdownButton.dart | 2 +- 9 files changed, 14 insertions(+), 42 deletions(-) delete mode 100644 frontend/lib/generated_plugin_registrant.dart diff --git a/frontend/lib/components/ListViewCard.dart b/frontend/lib/components/ListViewCard.dart index 3808adeb..a09c7e04 100644 --- a/frontend/lib/components/ListViewCard.dart +++ b/frontend/lib/components/ListViewCard.dart @@ -17,7 +17,6 @@ import 'package:collection/collection.dart'; import 'package:frontend/services/companyService.dart'; import 'package:frontend/services/speakerService.dart'; import 'package:provider/provider.dart'; -import 'package:flutter/foundation.dart'; class ListViewCard extends StatefulWidget { final Member? member; @@ -255,7 +254,7 @@ class _ListViewCardState extends State { : Colors.black, ), value: steps[0], - style: Theme.of(context).textTheme.subtitle2, + style: Theme.of(context).textTheme.titleSmall, selectedItemBuilder: (BuildContext context) { return steps.map((e) { return Container( diff --git a/frontend/lib/components/deckTheme.dart b/frontend/lib/components/deckTheme.dart index b88ffdd4..a27fbf66 100644 --- a/frontend/lib/components/deckTheme.dart +++ b/frontend/lib/components/deckTheme.dart @@ -18,9 +18,9 @@ class LightTheme extends BaseTheme { tabBarTheme: TabBarTheme(labelColor: Colors.black), primarySwatch: Colors.indigo, primaryColor: Colors.indigo, - backgroundColor: const Color(0xFFE5E5E5), + // backgroundColor: const Color(0xFFE5E5E5), //secondary: Color.fromRGBO(92, 127, 242, 1) - colorScheme: ColorScheme.fromSwatch(primarySwatch: Colors.indigo) + colorScheme: ColorScheme.fromSwatch(primarySwatch: Colors.indigo, backgroundColor: const Color(0xFFE5E5E5)) .copyWith(secondary: Colors.grey, brightness: Brightness.light,), cardColor: Color.fromRGBO(241, 241, 241, 1), @@ -40,8 +40,8 @@ class DarkTheme extends BaseTheme { disabledColor: Colors.grey, primarySwatch: Colors.grey, primaryColor: Colors.black, - backgroundColor: Colors.white, - colorScheme: ColorScheme.fromSwatch(primarySwatch: Colors.grey) + // backgroundColor: Colors.white, + colorScheme: ColorScheme.fromSwatch(primarySwatch: Colors.grey, backgroundColor: Colors.white) .copyWith(secondary: Colors.white, brightness: Brightness.dark,), cardColor: Color.fromRGBO(0, 0, 0, 0.6), diff --git a/frontend/lib/components/drawer.dart b/frontend/lib/components/drawer.dart index aba06d29..cc0d9799 100644 --- a/frontend/lib/components/drawer.dart +++ b/frontend/lib/components/drawer.dart @@ -48,7 +48,7 @@ class _DeckDrawerState extends State { alignment: AlignmentDirectional.centerStart, child: Text( "Me", - style: Theme.of(context).textTheme.caption, + style: Theme.of(context).textTheme.bodySmall, textAlign: TextAlign.start, ), ), @@ -115,7 +115,7 @@ class _DeckDrawerState extends State { alignment: AlignmentDirectional.centerStart, child: Text( "Management", - style: Theme.of(context).textTheme.caption, + style: Theme.of(context).textTheme.bodySmall, textAlign: TextAlign.start, ), ), @@ -187,7 +187,7 @@ class _DeckDrawerState extends State { alignment: AlignmentDirectional.centerStart, child: Text( "Utils", - style: Theme.of(context).textTheme.caption, + style: Theme.of(context).textTheme.bodySmall, textAlign: TextAlign.start, ), ), diff --git a/frontend/lib/components/participationCard.dart b/frontend/lib/components/participationCard.dart index 9ef0850a..7bc67f03 100644 --- a/frontend/lib/components/participationCard.dart +++ b/frontend/lib/components/participationCard.dart @@ -694,7 +694,7 @@ class _ParticipationCardState extends State { value: _currentMember, style: Theme.of(context) .textTheme - .subtitle2, + .titleSmall, selectedItemBuilder: (BuildContext context) { return members.map((e) { diff --git a/frontend/lib/generated_plugin_registrant.dart b/frontend/lib/generated_plugin_registrant.dart deleted file mode 100644 index 5d048660..00000000 --- a/frontend/lib/generated_plugin_registrant.dart +++ /dev/null @@ -1,27 +0,0 @@ -// -// Generated file. Do not edit. -// - -// ignore_for_file: directives_ordering -// ignore_for_file: lines_longer_than_80_chars -// ignore_for_file: depend_on_referenced_packages - -import 'package:file_picker/_internal/file_picker_web.dart'; -import 'package:flutter_dropzone_web/flutter_dropzone_plugin.dart'; -import 'package:google_sign_in_web/google_sign_in_web.dart'; -import 'package:image_picker_for_web/image_picker_for_web.dart'; -import 'package:shared_preferences_web/shared_preferences_web.dart'; -import 'package:url_launcher_web/url_launcher_web.dart'; - -import 'package:flutter_web_plugins/flutter_web_plugins.dart'; - -// ignore: public_member_api_docs -void registerPlugins(Registrar registrar) { - FilePickerWeb.registerWith(registrar); - FlutterDropzonePlugin.registerWith(registrar); - GoogleSignInPlugin.registerWith(registrar); - ImagePickerPlugin.registerWith(registrar); - SharedPreferencesPlugin.registerWith(registrar); - UrlLauncherPlugin.registerWith(registrar); - registrar.registerMessageHandler(); -} diff --git a/frontend/lib/routes/company/banner/CompanyBanner.dart b/frontend/lib/routes/company/banner/CompanyBanner.dart index a9557df1..2ab6c7d0 100644 --- a/frontend/lib/routes/company/banner/CompanyBanner.dart +++ b/frontend/lib/routes/company/banner/CompanyBanner.dart @@ -133,7 +133,7 @@ class CompanyBanner extends StatelessWidget { company.name, style: TextStyle( overflow: TextOverflow.ellipsis, - ).merge(Theme.of(context).textTheme.headline5), + ).merge(Theme.of(context).textTheme.headlineSmall), ), IconButton( onPressed: () => Clipboard.setData( diff --git a/frontend/lib/routes/company/banner/CompanyStatusDropdownButton.dart b/frontend/lib/routes/company/banner/CompanyStatusDropdownButton.dart index a4aae2e1..b8c09e3a 100644 --- a/frontend/lib/routes/company/banner/CompanyStatusDropdownButton.dart +++ b/frontend/lib/routes/company/banner/CompanyStatusDropdownButton.dart @@ -33,7 +33,7 @@ class CompanyStatusDropdownButton extends StatelessWidget { decoration: BoxDecoration(color: STATUSCOLOR[companyStatus]), ), value: steps[0], - style: Theme.of(context).textTheme.subtitle2, + style: Theme.of(context).textTheme.titleSmall, selectedItemBuilder: (BuildContext context) { return steps.map((e) { return Align( diff --git a/frontend/lib/routes/speaker/banner/SpeakerBanner.dart b/frontend/lib/routes/speaker/banner/SpeakerBanner.dart index 825a1456..9630745c 100644 --- a/frontend/lib/routes/speaker/banner/SpeakerBanner.dart +++ b/frontend/lib/routes/speaker/banner/SpeakerBanner.dart @@ -133,7 +133,7 @@ class SpeakerBanner extends StatelessWidget { speaker.name, style: TextStyle( overflow: TextOverflow.ellipsis, - ).merge(Theme.of(context).textTheme.headline5), + ).merge(Theme.of(context).textTheme.headlineSmall), ), IconButton( onPressed: () => Clipboard.setData(ClipboardData(text: speaker.name)).then((_) => ScaffoldMessenger.of(context).showSnackBar( @@ -148,7 +148,7 @@ class SpeakerBanner extends StatelessWidget { speaker.title!, style: TextStyle( overflow: TextOverflow.ellipsis, - ).merge(Theme.of(context).textTheme.subtitle1), + ).merge(Theme.of(context).textTheme.titleMedium), ), if (isLatestEvent && hasParticipation) SpeakerStatusDropdownButton( diff --git a/frontend/lib/routes/speaker/banner/SpeakerStatusDropdownButton.dart b/frontend/lib/routes/speaker/banner/SpeakerStatusDropdownButton.dart index 26216450..67b8ad1d 100644 --- a/frontend/lib/routes/speaker/banner/SpeakerStatusDropdownButton.dart +++ b/frontend/lib/routes/speaker/banner/SpeakerStatusDropdownButton.dart @@ -33,7 +33,7 @@ class SpeakerStatusDropdownButton extends StatelessWidget { decoration: BoxDecoration(color: STATUSCOLOR[speakerStatus]), ), value: steps[0], - style: Theme.of(context).textTheme.subtitle2, + style: Theme.of(context).textTheme.titleSmall, selectedItemBuilder: (BuildContext context) { return steps.map((e) { return Align(