Skip to content

Commit b51cb25

Browse files
authored
Merge pull request #429 from sinfo/fix/removeDeprecated
Updates deprecated tags
2 parents cbf9c70 + e60f8e5 commit b51cb25

File tree

9 files changed

+14
-42
lines changed

9 files changed

+14
-42
lines changed

frontend/lib/components/ListViewCard.dart

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ import 'package:collection/collection.dart';
1717
import 'package:frontend/services/companyService.dart';
1818
import 'package:frontend/services/speakerService.dart';
1919
import 'package:provider/provider.dart';
20-
import 'package:flutter/foundation.dart';
2120

2221
class ListViewCard extends StatefulWidget {
2322
final Member? member;
@@ -255,7 +254,7 @@ class _ListViewCardState extends State<ListViewCard> {
255254
: Colors.black,
256255
),
257256
value: steps[0],
258-
style: Theme.of(context).textTheme.subtitle2,
257+
style: Theme.of(context).textTheme.titleSmall,
259258
selectedItemBuilder: (BuildContext context) {
260259
return steps.map((e) {
261260
return Container(

frontend/lib/components/deckTheme.dart

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@ class LightTheme extends BaseTheme {
1818
tabBarTheme: TabBarTheme(labelColor: Colors.black),
1919
primarySwatch: Colors.indigo,
2020
primaryColor: Colors.indigo,
21-
backgroundColor: const Color(0xFFE5E5E5),
21+
// backgroundColor: const Color(0xFFE5E5E5),
2222
//secondary: Color.fromRGBO(92, 127, 242, 1)
23-
colorScheme: ColorScheme.fromSwatch(primarySwatch: Colors.indigo)
23+
colorScheme: ColorScheme.fromSwatch(primarySwatch: Colors.indigo, backgroundColor: const Color(0xFFE5E5E5))
2424
.copyWith(secondary: Colors.grey,
2525
brightness: Brightness.light,),
2626
cardColor: Color.fromRGBO(241, 241, 241, 1),
@@ -40,8 +40,8 @@ class DarkTheme extends BaseTheme {
4040
disabledColor: Colors.grey,
4141
primarySwatch: Colors.grey,
4242
primaryColor: Colors.black,
43-
backgroundColor: Colors.white,
44-
colorScheme: ColorScheme.fromSwatch(primarySwatch: Colors.grey)
43+
// backgroundColor: Colors.white,
44+
colorScheme: ColorScheme.fromSwatch(primarySwatch: Colors.grey, backgroundColor: Colors.white)
4545
.copyWith(secondary: Colors.white,
4646
brightness: Brightness.dark,),
4747
cardColor: Color.fromRGBO(0, 0, 0, 0.6),

frontend/lib/components/drawer.dart

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ class _DeckDrawerState extends State<DeckDrawer> {
4848
alignment: AlignmentDirectional.centerStart,
4949
child: Text(
5050
"Me",
51-
style: Theme.of(context).textTheme.caption,
51+
style: Theme.of(context).textTheme.bodySmall,
5252
textAlign: TextAlign.start,
5353
),
5454
),
@@ -115,7 +115,7 @@ class _DeckDrawerState extends State<DeckDrawer> {
115115
alignment: AlignmentDirectional.centerStart,
116116
child: Text(
117117
"Management",
118-
style: Theme.of(context).textTheme.caption,
118+
style: Theme.of(context).textTheme.bodySmall,
119119
textAlign: TextAlign.start,
120120
),
121121
),
@@ -187,7 +187,7 @@ class _DeckDrawerState extends State<DeckDrawer> {
187187
alignment: AlignmentDirectional.centerStart,
188188
child: Text(
189189
"Utils",
190-
style: Theme.of(context).textTheme.caption,
190+
style: Theme.of(context).textTheme.bodySmall,
191191
textAlign: TextAlign.start,
192192
),
193193
),

frontend/lib/components/participationCard.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -694,7 +694,7 @@ class _ParticipationCardState extends State<ParticipationCard> {
694694
value: _currentMember,
695695
style: Theme.of(context)
696696
.textTheme
697-
.subtitle2,
697+
.titleSmall,
698698
selectedItemBuilder:
699699
(BuildContext context) {
700700
return members.map((e) {

frontend/lib/generated_plugin_registrant.dart

Lines changed: 0 additions & 27 deletions
This file was deleted.

frontend/lib/routes/company/banner/CompanyBanner.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ class CompanyBanner extends StatelessWidget {
133133
company.name,
134134
style: TextStyle(
135135
overflow: TextOverflow.ellipsis,
136-
).merge(Theme.of(context).textTheme.headline5),
136+
).merge(Theme.of(context).textTheme.headlineSmall),
137137
),
138138
IconButton(
139139
onPressed: () => Clipboard.setData(

frontend/lib/routes/company/banner/CompanyStatusDropdownButton.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ class CompanyStatusDropdownButton extends StatelessWidget {
3333
decoration: BoxDecoration(color: STATUSCOLOR[companyStatus]),
3434
),
3535
value: steps[0],
36-
style: Theme.of(context).textTheme.subtitle2,
36+
style: Theme.of(context).textTheme.titleSmall,
3737
selectedItemBuilder: (BuildContext context) {
3838
return steps.map((e) {
3939
return Align(

frontend/lib/routes/speaker/banner/SpeakerBanner.dart

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ class SpeakerBanner extends StatelessWidget {
133133
speaker.name,
134134
style: TextStyle(
135135
overflow: TextOverflow.ellipsis,
136-
).merge(Theme.of(context).textTheme.headline5),
136+
).merge(Theme.of(context).textTheme.headlineSmall),
137137
),
138138
IconButton(
139139
onPressed: () => Clipboard.setData(ClipboardData(text: speaker.name)).then((_) => ScaffoldMessenger.of(context).showSnackBar(
@@ -148,7 +148,7 @@ class SpeakerBanner extends StatelessWidget {
148148
speaker.title!,
149149
style: TextStyle(
150150
overflow: TextOverflow.ellipsis,
151-
).merge(Theme.of(context).textTheme.subtitle1),
151+
).merge(Theme.of(context).textTheme.titleMedium),
152152
),
153153
if (isLatestEvent && hasParticipation)
154154
SpeakerStatusDropdownButton(

frontend/lib/routes/speaker/banner/SpeakerStatusDropdownButton.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ class SpeakerStatusDropdownButton extends StatelessWidget {
3333
decoration: BoxDecoration(color: STATUSCOLOR[speakerStatus]),
3434
),
3535
value: steps[0],
36-
style: Theme.of(context).textTheme.subtitle2,
36+
style: Theme.of(context).textTheme.titleSmall,
3737
selectedItemBuilder: (BuildContext context) {
3838
return steps.map((e) {
3939
return Align(

0 commit comments

Comments
 (0)