Skip to content

Updates deprecated tags #429

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 9, 2024
Merged

Updates deprecated tags #429

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions frontend/lib/components/ListViewCard.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -255,7 +254,7 @@ class _ListViewCardState extends State<ListViewCard> {
: 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(
Expand Down
8 changes: 4 additions & 4 deletions frontend/lib/components/deckTheme.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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),
Expand All @@ -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),
Expand Down
6 changes: 3 additions & 3 deletions frontend/lib/components/drawer.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ class _DeckDrawerState extends State<DeckDrawer> {
alignment: AlignmentDirectional.centerStart,
child: Text(
"Me",
style: Theme.of(context).textTheme.caption,
style: Theme.of(context).textTheme.bodySmall,
textAlign: TextAlign.start,
),
),
Expand Down Expand Up @@ -115,7 +115,7 @@ class _DeckDrawerState extends State<DeckDrawer> {
alignment: AlignmentDirectional.centerStart,
child: Text(
"Management",
style: Theme.of(context).textTheme.caption,
style: Theme.of(context).textTheme.bodySmall,
textAlign: TextAlign.start,
),
),
Expand Down Expand Up @@ -187,7 +187,7 @@ class _DeckDrawerState extends State<DeckDrawer> {
alignment: AlignmentDirectional.centerStart,
child: Text(
"Utils",
style: Theme.of(context).textTheme.caption,
style: Theme.of(context).textTheme.bodySmall,
textAlign: TextAlign.start,
),
),
Expand Down
2 changes: 1 addition & 1 deletion frontend/lib/components/participationCard.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -694,7 +694,7 @@ class _ParticipationCardState extends State<ParticipationCard> {
value: _currentMember,
style: Theme.of(context)
.textTheme
.subtitle2,
.titleSmall,
selectedItemBuilder:
(BuildContext context) {
return members.map((e) {
Expand Down
27 changes: 0 additions & 27 deletions frontend/lib/generated_plugin_registrant.dart
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion frontend/lib/routes/company/banner/CompanyBanner.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down
2 changes: 1 addition & 1 deletion frontend/lib/routes/company/banner/CompanyStatusDropdownButton.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down
4 changes: 2 additions & 2 deletions frontend/lib/routes/speaker/banner/SpeakerBanner.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand All @@ -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(
Expand Down
2 changes: 1 addition & 1 deletion frontend/lib/routes/speaker/banner/SpeakerStatusDropdownButton.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down