Merge branch 'krille/upgrade-to-flutter-17' into 'master'
Fix deprecations See merge request ChristianPauly/fluffychat-flutter!37
This commit is contained in:
commit
05ea1290b6
|
@ -80,7 +80,7 @@ class _RecordingDialogState extends State<RecordingDialog> {
|
|||
child: Text(
|
||||
I18n.of(context).cancel.toUpperCase(),
|
||||
style: TextStyle(
|
||||
color: Theme.of(context).textTheme.body1.color.withAlpha(150),
|
||||
color: Theme.of(context).textTheme.bodyText2.color.withAlpha(150),
|
||||
),
|
||||
),
|
||||
onPressed: () => Navigator.of(context).pop(),
|
||||
|
|
|
@ -58,7 +58,7 @@ class Message extends StatelessWidget {
|
|||
|
||||
if (event.messageType == MessageTypes.Image) {
|
||||
color = Theme.of(context).scaffoldBackgroundColor.withOpacity(0.66);
|
||||
textColor = Theme.of(context).textTheme.body1.color;
|
||||
textColor = Theme.of(context).textTheme.bodyText2.color;
|
||||
} else if (ownMessage) {
|
||||
color = event.status == -1
|
||||
? Colors.redAccent
|
||||
|
|
|
@ -24,7 +24,7 @@ class StateMessage extends StatelessWidget {
|
|||
event.getLocalizedBody(I18n.of(context)),
|
||||
textAlign: TextAlign.center,
|
||||
style: TextStyle(
|
||||
color: Theme.of(context).textTheme.body1.color,
|
||||
color: Theme.of(context).textTheme.bodyText2.color,
|
||||
decoration: event.redacted ? TextDecoration.lineThrough : null,
|
||||
),
|
||||
),
|
||||
|
|
|
@ -46,7 +46,7 @@ class ReplyContent extends StatelessWidget {
|
|||
style: TextStyle(
|
||||
color: lightText
|
||||
? Colors.white
|
||||
: Theme.of(context).textTheme.body1.color),
|
||||
: Theme.of(context).textTheme.bodyText2.color),
|
||||
),
|
||||
],
|
||||
),
|
||||
|
|
|
@ -33,7 +33,7 @@ final ThemeData lightTheme = ThemeData(
|
|||
brightness: Brightness.light,
|
||||
color: Colors.white,
|
||||
textTheme: TextTheme(
|
||||
title: TextStyle(
|
||||
headline6: TextStyle(
|
||||
color: Colors.black,
|
||||
fontSize: 20,
|
||||
),
|
||||
|
@ -68,7 +68,7 @@ final ThemeData darkTheme = ThemeData.dark().copyWith(
|
|||
brightness: Brightness.dark,
|
||||
color: Color(0xff1D1D1D),
|
||||
textTheme: TextTheme(
|
||||
title: TextStyle(
|
||||
headline6: TextStyle(
|
||||
color: Colors.white,
|
||||
fontSize: 20,
|
||||
),
|
||||
|
@ -103,7 +103,7 @@ final ThemeData amoledTheme = ThemeData.dark().copyWith(
|
|||
brightness: Brightness.dark,
|
||||
color: Color(0xff1D1D1D),
|
||||
textTheme: TextTheme(
|
||||
title: TextStyle(
|
||||
headline6: TextStyle(
|
||||
color: Colors.white,
|
||||
fontSize: 20,
|
||||
),
|
||||
|
|
|
@ -407,7 +407,7 @@ class _ChatState extends State<_Chat> {
|
|||
child: Icon(Icons.arrow_downward,
|
||||
color: Theme.of(context).primaryColor),
|
||||
onPressed: () => _scrollController.jumpTo(0),
|
||||
foregroundColor: Theme.of(context).textTheme.body1.color,
|
||||
foregroundColor: Theme.of(context).textTheme.bodyText2.color,
|
||||
backgroundColor: Theme.of(context).scaffoldBackgroundColor,
|
||||
mini: true,
|
||||
),
|
||||
|
|
|
@ -186,8 +186,11 @@ class _ChatDetailsState extends State<ChatDetails> {
|
|||
],
|
||||
title: Text(widget.room.getLocalizedDisplayname(I18n.of(context)),
|
||||
style: TextStyle(
|
||||
color:
|
||||
Theme.of(context).appBarTheme.textTheme.title.color)),
|
||||
color: Theme.of(context)
|
||||
.appBarTheme
|
||||
.textTheme
|
||||
.headline6
|
||||
.color)),
|
||||
backgroundColor: Theme.of(context).appBarTheme.color,
|
||||
flexibleSpace: FlexibleSpaceBar(
|
||||
background: ContentBanner(widget.room.avatar,
|
||||
|
@ -223,7 +226,7 @@ class _ChatDetailsState extends State<ChatDetails> {
|
|||
linkStyle: TextStyle(color: Colors.blueAccent),
|
||||
textStyle: TextStyle(
|
||||
fontSize: 14,
|
||||
color: Theme.of(context).textTheme.body1.color,
|
||||
color: Theme.of(context).textTheme.bodyText2.color,
|
||||
),
|
||||
),
|
||||
onTap: widget.room.canSendEvent("m.room.topic")
|
||||
|
|
|
@ -112,7 +112,8 @@ class _ChatEncryptionSettingsState extends State<ChatEncryptionSettings> {
|
|||
.keys["ed25519:${deviceKeys[i].deviceId}"]
|
||||
.beautified,
|
||||
style: TextStyle(
|
||||
color: Theme.of(context).textTheme.body1.color),
|
||||
color:
|
||||
Theme.of(context).textTheme.bodyText2.color),
|
||||
),
|
||||
value: deviceKeys[i].verified,
|
||||
onChanged: (bool newVal) {
|
||||
|
|
|
@ -149,7 +149,11 @@ class _SettingsState extends State<Settings> {
|
|||
title: Text(
|
||||
I18n.of(context).settings,
|
||||
style: TextStyle(
|
||||
color: Theme.of(context).appBarTheme.textTheme.title.color),
|
||||
color: Theme.of(context)
|
||||
.appBarTheme
|
||||
.textTheme
|
||||
.headline6
|
||||
.color),
|
||||
),
|
||||
background: ContentBanner(
|
||||
profile?.avatarUrl,
|
||||
|
|
Loading…
Reference in a new issue