mirror of
https://github.com/krille-chan/fluffychat
synced 2024-10-05 13:52:46 +00:00
build: Update to flutter 3.22.0
This commit is contained in:
parent
ff54610e5b
commit
3cc9d04e9f
31 changed files with 76 additions and 71 deletions
8
.github/workflows/integrate.yaml
vendored
8
.github/workflows/integrate.yaml
vendored
|
@ -15,6 +15,10 @@ jobs:
|
||||||
flutter-version: ${{ env.FLUTTER_VERSION }}
|
flutter-version: ${{ env.FLUTTER_VERSION }}
|
||||||
cache: true
|
cache: true
|
||||||
- run: flutter pub get
|
- run: flutter pub get
|
||||||
|
- name: workaround for https://github.com/flutter/flutter/issues/148333
|
||||||
|
run: |
|
||||||
|
flutter gen-l10n
|
||||||
|
flutter pub get
|
||||||
- name: Check formatting
|
- name: Check formatting
|
||||||
run: dart format lib/ test/ --set-exit-if-changed
|
run: dart format lib/ test/ --set-exit-if-changed
|
||||||
- name: Check import formatting
|
- name: Check import formatting
|
||||||
|
@ -24,6 +28,10 @@ jobs:
|
||||||
- run: flutter analyze
|
- run: flutter analyze
|
||||||
- name: Apply google services patch
|
- name: Apply google services patch
|
||||||
run: git apply ./scripts/enable-android-google-services.patch
|
run: git apply ./scripts/enable-android-google-services.patch
|
||||||
|
- name: workaround for https://github.com/flutter/flutter/issues/148333
|
||||||
|
run: |
|
||||||
|
flutter gen-l10n
|
||||||
|
flutter pub get
|
||||||
- run: flutter analyze
|
- run: flutter analyze
|
||||||
- run: flutter test
|
- run: flutter test
|
||||||
|
|
||||||
|
|
2
.github/workflows/versions.env
vendored
2
.github/workflows/versions.env
vendored
|
@ -1,2 +1,2 @@
|
||||||
FLUTTER_VERSION=3.19.6
|
FLUTTER_VERSION=3.22.0
|
||||||
JAVA_VERSION=17
|
JAVA_VERSION=17
|
||||||
|
|
|
@ -89,7 +89,7 @@ abstract class FluffyThemes {
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
textSelectionTheme: TextSelectionThemeData(
|
textSelectionTheme: TextSelectionThemeData(
|
||||||
selectionColor: colorScheme.onBackground.withAlpha(128),
|
selectionColor: colorScheme.onSurface.withAlpha(128),
|
||||||
selectionHandleColor: colorScheme.secondary,
|
selectionHandleColor: colorScheme.secondary,
|
||||||
),
|
),
|
||||||
inputDecorationTheme: InputDecorationTheme(
|
inputDecorationTheme: InputDecorationTheme(
|
||||||
|
@ -106,13 +106,13 @@ abstract class FluffyThemes {
|
||||||
? Colors.grey.withAlpha(64)
|
? Colors.grey.withAlpha(64)
|
||||||
: null,
|
: null,
|
||||||
surfaceTintColor:
|
surfaceTintColor:
|
||||||
FluffyThemes.isColumnMode(context) ? colorScheme.background : null,
|
FluffyThemes.isColumnMode(context) ? colorScheme.surface : null,
|
||||||
systemOverlayStyle: SystemUiOverlayStyle(
|
systemOverlayStyle: SystemUiOverlayStyle(
|
||||||
statusBarColor: Colors.transparent,
|
statusBarColor: Colors.transparent,
|
||||||
statusBarIconBrightness: brightness.reversed,
|
statusBarIconBrightness: brightness.reversed,
|
||||||
statusBarBrightness: brightness,
|
statusBarBrightness: brightness,
|
||||||
systemNavigationBarIconBrightness: brightness.reversed,
|
systemNavigationBarIconBrightness: brightness.reversed,
|
||||||
systemNavigationBarColor: colorScheme.background,
|
systemNavigationBarColor: colorScheme.surface,
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
textButtonTheme: TextButtonThemeData(
|
textButtonTheme: TextButtonThemeData(
|
||||||
|
|
|
@ -59,11 +59,11 @@ class ChatEmojiPicker extends StatelessWidget {
|
||||||
),
|
),
|
||||||
skinToneConfig: SkinToneConfig(
|
skinToneConfig: SkinToneConfig(
|
||||||
dialogBackgroundColor: Color.lerp(
|
dialogBackgroundColor: Color.lerp(
|
||||||
theme.colorScheme.background,
|
theme.colorScheme.surface,
|
||||||
theme.colorScheme.primaryContainer,
|
theme.colorScheme.primaryContainer,
|
||||||
0.75,
|
0.75,
|
||||||
)!,
|
)!,
|
||||||
indicatorColor: theme.colorScheme.onBackground,
|
indicatorColor: theme.colorScheme.onSurface,
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
|
|
|
@ -303,7 +303,7 @@ class ChatView extends StatelessWidget {
|
||||||
clipBehavior: Clip.hardEdge,
|
clipBehavior: Clip.hardEdge,
|
||||||
color: Theme.of(context)
|
color: Theme.of(context)
|
||||||
.colorScheme
|
.colorScheme
|
||||||
.surfaceVariant,
|
.surfaceContainerHighest,
|
||||||
borderRadius: const BorderRadius.all(
|
borderRadius: const BorderRadius.all(
|
||||||
Radius.circular(24),
|
Radius.circular(24),
|
||||||
),
|
),
|
||||||
|
|
|
@ -77,7 +77,7 @@ class Message extends StatelessWidget {
|
||||||
final client = Matrix.of(context).client;
|
final client = Matrix.of(context).client;
|
||||||
final ownMessage = event.senderId == client.userID;
|
final ownMessage = event.senderId == client.userID;
|
||||||
final alignment = ownMessage ? Alignment.topRight : Alignment.topLeft;
|
final alignment = ownMessage ? Alignment.topRight : Alignment.topLeft;
|
||||||
var color = Theme.of(context).colorScheme.surfaceVariant;
|
var color = Theme.of(context).colorScheme.surfaceContainerHighest;
|
||||||
final displayTime = event.type == EventTypes.RoomCreate ||
|
final displayTime = event.type == EventTypes.RoomCreate ||
|
||||||
nextEvent == null ||
|
nextEvent == null ||
|
||||||
!event.originServerTs.sameEnvironment(nextEvent!.originServerTs);
|
!event.originServerTs.sameEnvironment(nextEvent!.originServerTs);
|
||||||
|
@ -101,7 +101,7 @@ class Message extends StatelessWidget {
|
||||||
|
|
||||||
final textColor = ownMessage
|
final textColor = ownMessage
|
||||||
? Theme.of(context).colorScheme.onPrimary
|
? Theme.of(context).colorScheme.onPrimary
|
||||||
: Theme.of(context).colorScheme.onBackground;
|
: Theme.of(context).colorScheme.onSurface;
|
||||||
final rowMainAxisAlignment =
|
final rowMainAxisAlignment =
|
||||||
ownMessage ? MainAxisAlignment.end : MainAxisAlignment.start;
|
ownMessage ? MainAxisAlignment.end : MainAxisAlignment.start;
|
||||||
|
|
||||||
|
@ -413,11 +413,8 @@ class Message extends StatelessWidget {
|
||||||
child: Center(
|
child: Center(
|
||||||
child: Material(
|
child: Material(
|
||||||
color: displayTime
|
color: displayTime
|
||||||
? Theme.of(context).colorScheme.background
|
? Theme.of(context).colorScheme.surface
|
||||||
: Theme.of(context)
|
: Theme.of(context).colorScheme.surface.withOpacity(0.33),
|
||||||
.colorScheme
|
|
||||||
.background
|
|
||||||
.withOpacity(0.33),
|
|
||||||
borderRadius:
|
borderRadius:
|
||||||
BorderRadius.circular(AppConfig.borderRadius / 2),
|
BorderRadius.circular(AppConfig.borderRadius / 2),
|
||||||
clipBehavior: Clip.antiAlias,
|
clipBehavior: Clip.antiAlias,
|
||||||
|
|
|
@ -111,7 +111,7 @@ class _Reaction extends StatelessWidget {
|
||||||
final textColor = Theme.of(context).brightness == Brightness.dark
|
final textColor = Theme.of(context).brightness == Brightness.dark
|
||||||
? Colors.white
|
? Colors.white
|
||||||
: Colors.black;
|
: Colors.black;
|
||||||
final color = Theme.of(context).colorScheme.background;
|
final color = Theme.of(context).colorScheme.surface;
|
||||||
Widget content;
|
Widget content;
|
||||||
if (reactionKey.startsWith('mxc://')) {
|
if (reactionKey.startsWith('mxc://')) {
|
||||||
content = Row(
|
content = Row(
|
||||||
|
|
|
@ -39,7 +39,7 @@ class ReplyContent extends StatelessWidget {
|
||||||
color: backgroundColor ??
|
color: backgroundColor ??
|
||||||
Theme.of(context)
|
Theme.of(context)
|
||||||
.colorScheme
|
.colorScheme
|
||||||
.background
|
.surface
|
||||||
.withOpacity(ownMessage ? 0.2 : 0.33),
|
.withOpacity(ownMessage ? 0.2 : 0.33),
|
||||||
borderRadius: borderRadius,
|
borderRadius: borderRadius,
|
||||||
child: Row(
|
child: Row(
|
||||||
|
@ -82,7 +82,7 @@ class ReplyContent extends StatelessWidget {
|
||||||
style: TextStyle(
|
style: TextStyle(
|
||||||
color: ownMessage
|
color: ownMessage
|
||||||
? Theme.of(context).colorScheme.onPrimary
|
? Theme.of(context).colorScheme.onPrimary
|
||||||
: Theme.of(context).colorScheme.onBackground,
|
: Theme.of(context).colorScheme.onSurface,
|
||||||
fontSize: fontSize,
|
fontSize: fontSize,
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
|
|
|
@ -18,7 +18,7 @@ class StateMessage extends StatelessWidget {
|
||||||
child: Container(
|
child: Container(
|
||||||
padding: const EdgeInsets.all(8),
|
padding: const EdgeInsets.all(8),
|
||||||
decoration: BoxDecoration(
|
decoration: BoxDecoration(
|
||||||
color: Theme.of(context).colorScheme.background,
|
color: Theme.of(context).colorScheme.surface,
|
||||||
borderRadius: BorderRadius.circular(AppConfig.borderRadius / 2),
|
borderRadius: BorderRadius.circular(AppConfig.borderRadius / 2),
|
||||||
),
|
),
|
||||||
child: Text(
|
child: Text(
|
||||||
|
|
|
@ -39,7 +39,7 @@ class VerificationRequestContent extends StatelessWidget {
|
||||||
color: Theme.of(context).dividerColor,
|
color: Theme.of(context).dividerColor,
|
||||||
),
|
),
|
||||||
borderRadius: BorderRadius.circular(AppConfig.borderRadius),
|
borderRadius: BorderRadius.circular(AppConfig.borderRadius),
|
||||||
color: Theme.of(context).colorScheme.background,
|
color: Theme.of(context).colorScheme.surface,
|
||||||
),
|
),
|
||||||
child: Row(
|
child: Row(
|
||||||
mainAxisSize: MainAxisSize.min,
|
mainAxisSize: MainAxisSize.min,
|
||||||
|
|
|
@ -123,8 +123,7 @@ class EventVideoPlayerState extends State<EventVideoPlayer> {
|
||||||
Center(
|
Center(
|
||||||
child: IconButton(
|
child: IconButton(
|
||||||
style: IconButton.styleFrom(
|
style: IconButton.styleFrom(
|
||||||
backgroundColor:
|
backgroundColor: Theme.of(context).colorScheme.surface,
|
||||||
Theme.of(context).colorScheme.background,
|
|
||||||
),
|
),
|
||||||
icon: _isDownloading
|
icon: _isDownloading
|
||||||
? const SizedBox(
|
? const SizedBox(
|
||||||
|
|
|
@ -50,7 +50,7 @@ class SeenByRow extends StatelessWidget {
|
||||||
width: 16,
|
width: 16,
|
||||||
height: 16,
|
height: 16,
|
||||||
child: Material(
|
child: Material(
|
||||||
color: Theme.of(context).colorScheme.background,
|
color: Theme.of(context).colorScheme.surface,
|
||||||
borderRadius: BorderRadius.circular(32),
|
borderRadius: BorderRadius.circular(32),
|
||||||
child: Center(
|
child: Center(
|
||||||
child: Text(
|
child: Text(
|
||||||
|
|
|
@ -72,7 +72,7 @@ class TypingIndicators extends StatelessWidget {
|
||||||
Padding(
|
Padding(
|
||||||
padding: const EdgeInsets.only(top: topPadding),
|
padding: const EdgeInsets.only(top: topPadding),
|
||||||
child: Material(
|
child: Material(
|
||||||
color: Theme.of(context).colorScheme.surfaceVariant,
|
color: Theme.of(context).colorScheme.surfaceContainerHighest,
|
||||||
borderRadius: const BorderRadius.only(
|
borderRadius: const BorderRadius.only(
|
||||||
topLeft: Radius.circular(2),
|
topLeft: Radius.circular(2),
|
||||||
topRight: Radius.circular(AppConfig.borderRadius),
|
topRight: Radius.circular(AppConfig.borderRadius),
|
||||||
|
|
|
@ -163,7 +163,7 @@ class ChatDetailsView extends StatelessWidget {
|
||||||
style: TextButton.styleFrom(
|
style: TextButton.styleFrom(
|
||||||
foregroundColor: Theme.of(context)
|
foregroundColor: Theme.of(context)
|
||||||
.colorScheme
|
.colorScheme
|
||||||
.onBackground,
|
.onSurface,
|
||||||
),
|
),
|
||||||
label: Text(
|
label: Text(
|
||||||
room.isDirectChat
|
room.isDirectChat
|
||||||
|
|
|
@ -189,9 +189,9 @@ class ChatListView extends StatelessWidget {
|
||||||
labelBehavior:
|
labelBehavior:
|
||||||
NavigationDestinationLabelBehavior.alwaysShow,
|
NavigationDestinationLabelBehavior.alwaysShow,
|
||||||
shadowColor:
|
shadowColor:
|
||||||
Theme.of(context).colorScheme.onBackground,
|
Theme.of(context).colorScheme.onSurface,
|
||||||
surfaceTintColor:
|
surfaceTintColor:
|
||||||
Theme.of(context).colorScheme.background,
|
Theme.of(context).colorScheme.surface,
|
||||||
selectedIndex: controller.selectedIndex,
|
selectedIndex: controller.selectedIndex,
|
||||||
onDestinationSelected:
|
onDestinationSelected:
|
||||||
controller.onDestinationSelected,
|
controller.onDestinationSelected,
|
||||||
|
|
|
@ -67,7 +67,7 @@ class _NaviRailItemState extends State<NaviRailItem> {
|
||||||
borderRadius: borderRadius,
|
borderRadius: borderRadius,
|
||||||
color: widget.isSelected
|
color: widget.isSelected
|
||||||
? Theme.of(context).colorScheme.primaryContainer
|
? Theme.of(context).colorScheme.primaryContainer
|
||||||
: Theme.of(context).colorScheme.background,
|
: Theme.of(context).colorScheme.surface,
|
||||||
child: Tooltip(
|
child: Tooltip(
|
||||||
message: widget.toolTip,
|
message: widget.toolTip,
|
||||||
child: InkWell(
|
child: InkWell(
|
||||||
|
|
|
@ -307,7 +307,7 @@ class _SpaceViewState extends State<SpaceView> {
|
||||||
MatrixLocals(L10n.of(context)!),
|
MatrixLocals(L10n.of(context)!),
|
||||||
);
|
);
|
||||||
return Material(
|
return Material(
|
||||||
color: Theme.of(context).colorScheme.background,
|
color: Theme.of(context).colorScheme.surface,
|
||||||
child: ListTile(
|
child: ListTile(
|
||||||
leading: Avatar(
|
leading: Avatar(
|
||||||
mxContent: rootSpace.avatar,
|
mxContent: rootSpace.avatar,
|
||||||
|
@ -545,7 +545,7 @@ class _SpaceViewState extends State<SpaceView> {
|
||||||
: L10n.of(context)!.enterRoom),
|
: L10n.of(context)!.enterRoom),
|
||||||
maxLines: 1,
|
maxLines: 1,
|
||||||
style: TextStyle(
|
style: TextStyle(
|
||||||
color: Theme.of(context).colorScheme.onBackground,
|
color: Theme.of(context).colorScheme.onSurface,
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
trailing: isSpace
|
trailing: isSpace
|
||||||
|
|
|
@ -125,7 +125,7 @@ class PresenceAvatar extends StatelessWidget {
|
||||||
final statusMsgBubbleElevation =
|
final statusMsgBubbleElevation =
|
||||||
Theme.of(context).appBarTheme.scrolledUnderElevation ?? 4;
|
Theme.of(context).appBarTheme.scrolledUnderElevation ?? 4;
|
||||||
final statusMsgBubbleShadowColor =
|
final statusMsgBubbleShadowColor =
|
||||||
Theme.of(context).colorScheme.onBackground;
|
Theme.of(context).colorScheme.onSurface;
|
||||||
final statusMsgBubbleColor = Colors.white.withAlpha(245);
|
final statusMsgBubbleColor = Colors.white.withAlpha(245);
|
||||||
return Padding(
|
return Padding(
|
||||||
padding: const EdgeInsets.symmetric(horizontal: 8.0),
|
padding: const EdgeInsets.symmetric(horizontal: 8.0),
|
||||||
|
|
|
@ -92,8 +92,8 @@ class HomeserverAppBar extends StatelessWidget {
|
||||||
)
|
)
|
||||||
: null,
|
: null,
|
||||||
fillColor: FluffyThemes.isColumnMode(context)
|
fillColor: FluffyThemes.isColumnMode(context)
|
||||||
? Theme.of(context).colorScheme.background
|
? Theme.of(context).colorScheme.surface
|
||||||
: Theme.of(context).colorScheme.surfaceVariant,
|
: Theme.of(context).colorScheme.surfaceContainerHighest,
|
||||||
prefixText: '${L10n.of(context)!.homeserver}: ',
|
prefixText: '${L10n.of(context)!.homeserver}: ',
|
||||||
hintText: L10n.of(context)!.enterYourHomeserver,
|
hintText: L10n.of(context)!.enterYourHomeserver,
|
||||||
suffixIcon: const Icon(Icons.search),
|
suffixIcon: const Icon(Icons.search),
|
||||||
|
|
|
@ -32,7 +32,7 @@ class HomeserverPickerView extends StatelessWidget {
|
||||||
appBar: AppBar(
|
appBar: AppBar(
|
||||||
titleSpacing: 12,
|
titleSpacing: 12,
|
||||||
automaticallyImplyLeading: false,
|
automaticallyImplyLeading: false,
|
||||||
surfaceTintColor: Theme.of(context).colorScheme.background,
|
surfaceTintColor: Theme.of(context).colorScheme.surface,
|
||||||
title: HomeserverAppBar(controller: controller),
|
title: HomeserverAppBar(controller: controller),
|
||||||
),
|
),
|
||||||
body: Column(
|
body: Column(
|
||||||
|
@ -207,9 +207,9 @@ class _LoginButton extends StatelessWidget {
|
||||||
shape: RoundedRectangleBorder(
|
shape: RoundedRectangleBorder(
|
||||||
borderRadius: BorderRadius.circular(99),
|
borderRadius: BorderRadius.circular(99),
|
||||||
),
|
),
|
||||||
foregroundColor: Theme.of(context).colorScheme.onBackground,
|
foregroundColor: Theme.of(context).colorScheme.onSurface,
|
||||||
backgroundColor: withBorder
|
backgroundColor: withBorder
|
||||||
? Theme.of(context).colorScheme.background
|
? Theme.of(context).colorScheme.surface
|
||||||
: Colors.transparent,
|
: Colors.transparent,
|
||||||
),
|
),
|
||||||
onPressed: onPressed,
|
onPressed: onPressed,
|
||||||
|
|
|
@ -23,8 +23,8 @@ class LoginView extends StatelessWidget {
|
||||||
final titleParts = title.split(homeserver);
|
final titleParts = title.split(homeserver);
|
||||||
|
|
||||||
final textFieldFillColor = FluffyThemes.isColumnMode(context)
|
final textFieldFillColor = FluffyThemes.isColumnMode(context)
|
||||||
? Theme.of(context).colorScheme.background
|
? Theme.of(context).colorScheme.surface
|
||||||
: Theme.of(context).colorScheme.surfaceVariant;
|
: Theme.of(context).colorScheme.surfaceContainerHighest;
|
||||||
|
|
||||||
return LoginScaffold(
|
return LoginScaffold(
|
||||||
enforceMobileMode: Matrix.of(context).client.isLogged(),
|
enforceMobileMode: Matrix.of(context).client.isLogged(),
|
||||||
|
|
|
@ -105,12 +105,12 @@ class NewGroupView extends StatelessWidget {
|
||||||
SwitchListTile.adaptive(
|
SwitchListTile.adaptive(
|
||||||
secondary: Icon(
|
secondary: Icon(
|
||||||
Icons.lock_outlined,
|
Icons.lock_outlined,
|
||||||
color: Theme.of(context).colorScheme.onBackground,
|
color: Theme.of(context).colorScheme.onSurface,
|
||||||
),
|
),
|
||||||
title: Text(
|
title: Text(
|
||||||
L10n.of(context)!.enableEncryption,
|
L10n.of(context)!.enableEncryption,
|
||||||
style: TextStyle(
|
style: TextStyle(
|
||||||
color: Theme.of(context).colorScheme.onBackground,
|
color: Theme.of(context).colorScheme.onSurface,
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
value: !controller.publicGroup,
|
value: !controller.publicGroup,
|
||||||
|
|
|
@ -37,7 +37,7 @@ class SettingsView extends StatelessWidget {
|
||||||
],
|
],
|
||||||
),
|
),
|
||||||
body: ListTileTheme(
|
body: ListTileTheme(
|
||||||
iconColor: Theme.of(context).colorScheme.onBackground,
|
iconColor: Theme.of(context).colorScheme.onSurface,
|
||||||
child: ListView(
|
child: ListView(
|
||||||
key: const Key('SettingsListViewContent'),
|
key: const Key('SettingsListViewContent'),
|
||||||
children: <Widget>[
|
children: <Widget>[
|
||||||
|
@ -103,7 +103,7 @@ class SettingsView extends StatelessWidget {
|
||||||
),
|
),
|
||||||
style: TextButton.styleFrom(
|
style: TextButton.styleFrom(
|
||||||
foregroundColor:
|
foregroundColor:
|
||||||
Theme.of(context).colorScheme.onBackground,
|
Theme.of(context).colorScheme.onSurface,
|
||||||
),
|
),
|
||||||
label: Text(
|
label: Text(
|
||||||
displayname,
|
displayname,
|
||||||
|
|
|
@ -23,7 +23,7 @@ class SettingsPasswordView extends StatelessWidget {
|
||||||
],
|
],
|
||||||
),
|
),
|
||||||
body: ListTileTheme(
|
body: ListTileTheme(
|
||||||
iconColor: Theme.of(context).colorScheme.onBackground,
|
iconColor: Theme.of(context).colorScheme.onSurface,
|
||||||
child: MaxWidthBody(
|
child: MaxWidthBody(
|
||||||
child: Padding(
|
child: Padding(
|
||||||
padding: const EdgeInsets.all(16.0),
|
padding: const EdgeInsets.all(16.0),
|
||||||
|
|
|
@ -21,7 +21,7 @@ class SettingsSecurityView extends StatelessWidget {
|
||||||
return Scaffold(
|
return Scaffold(
|
||||||
appBar: AppBar(title: Text(L10n.of(context)!.security)),
|
appBar: AppBar(title: Text(L10n.of(context)!.security)),
|
||||||
body: ListTileTheme(
|
body: ListTileTheme(
|
||||||
iconColor: Theme.of(context).colorScheme.onBackground,
|
iconColor: Theme.of(context).colorScheme.onSurface,
|
||||||
child: MaxWidthBody(
|
child: MaxWidthBody(
|
||||||
child: FutureBuilder(
|
child: FutureBuilder(
|
||||||
future: Matrix.of(context)
|
future: Matrix.of(context)
|
||||||
|
|
|
@ -90,7 +90,7 @@ class SettingsStyleView extends StatelessWidget {
|
||||||
size: 16,
|
size: 16,
|
||||||
color: Theme.of(context)
|
color: Theme.of(context)
|
||||||
.colorScheme
|
.colorScheme
|
||||||
.onBackground,
|
.onSurface,
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
Text(
|
Text(
|
||||||
|
@ -99,7 +99,7 @@ class SettingsStyleView extends StatelessWidget {
|
||||||
style: TextStyle(
|
style: TextStyle(
|
||||||
color: Theme.of(context)
|
color: Theme.of(context)
|
||||||
.colorScheme
|
.colorScheme
|
||||||
.onBackground,
|
.onSurface,
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
],
|
],
|
||||||
|
|
|
@ -119,7 +119,8 @@ class UserBottomSheetView extends StatelessWidget {
|
||||||
Padding(
|
Padding(
|
||||||
padding: const EdgeInsets.all(12.0),
|
padding: const EdgeInsets.all(12.0),
|
||||||
child: Material(
|
child: Material(
|
||||||
color: Theme.of(context).colorScheme.surfaceVariant,
|
color:
|
||||||
|
Theme.of(context).colorScheme.surfaceContainerHighest,
|
||||||
borderRadius:
|
borderRadius:
|
||||||
BorderRadius.circular(AppConfig.borderRadius),
|
BorderRadius.circular(AppConfig.borderRadius),
|
||||||
child: ListTile(
|
child: ListTile(
|
||||||
|
@ -136,7 +137,7 @@ class UserBottomSheetView extends StatelessWidget {
|
||||||
TextButton.icon(
|
TextButton.icon(
|
||||||
style: TextButton.styleFrom(
|
style: TextButton.styleFrom(
|
||||||
backgroundColor:
|
backgroundColor:
|
||||||
Theme.of(context).colorScheme.background,
|
Theme.of(context).colorScheme.surface,
|
||||||
foregroundColor:
|
foregroundColor:
|
||||||
Theme.of(context).colorScheme.primary,
|
Theme.of(context).colorScheme.primary,
|
||||||
),
|
),
|
||||||
|
@ -205,7 +206,7 @@ class UserBottomSheetView extends StatelessWidget {
|
||||||
),
|
),
|
||||||
style: TextButton.styleFrom(
|
style: TextButton.styleFrom(
|
||||||
foregroundColor:
|
foregroundColor:
|
||||||
Theme.of(context).colorScheme.onBackground,
|
Theme.of(context).colorScheme.onSurface,
|
||||||
),
|
),
|
||||||
label: Text(
|
label: Text(
|
||||||
displayname,
|
displayname,
|
||||||
|
|
|
@ -99,7 +99,7 @@ class Avatar extends StatelessWidget {
|
||||||
height: 16,
|
height: 16,
|
||||||
decoration: BoxDecoration(
|
decoration: BoxDecoration(
|
||||||
color: presenceBackgroundColor ??
|
color: presenceBackgroundColor ??
|
||||||
Theme.of(context).colorScheme.background,
|
Theme.of(context).colorScheme.surface,
|
||||||
borderRadius: BorderRadius.circular(32),
|
borderRadius: BorderRadius.circular(32),
|
||||||
),
|
),
|
||||||
alignment: Alignment.center,
|
alignment: Alignment.center,
|
||||||
|
@ -111,7 +111,7 @@ class Avatar extends StatelessWidget {
|
||||||
borderRadius: BorderRadius.circular(16),
|
borderRadius: BorderRadius.circular(16),
|
||||||
border: Border.all(
|
border: Border.all(
|
||||||
width: 1,
|
width: 1,
|
||||||
color: Theme.of(context).colorScheme.background,
|
color: Theme.of(context).colorScheme.surface,
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
|
|
|
@ -42,11 +42,11 @@ class LoginScaffold extends StatelessWidget {
|
||||||
body: body,
|
body: body,
|
||||||
backgroundColor: isMobileMode
|
backgroundColor: isMobileMode
|
||||||
? null
|
? null
|
||||||
: Theme.of(context).colorScheme.background.withOpacity(0.8),
|
: Theme.of(context).colorScheme.surface.withOpacity(0.8),
|
||||||
bottomNavigationBar: isMobileMode
|
bottomNavigationBar: isMobileMode
|
||||||
? Material(
|
? Material(
|
||||||
elevation: 4,
|
elevation: 4,
|
||||||
shadowColor: Theme.of(context).colorScheme.onBackground,
|
shadowColor: Theme.of(context).colorScheme.onSurface,
|
||||||
child: const _PrivacyButtons(
|
child: const _PrivacyButtons(
|
||||||
mainAxisAlignment: MainAxisAlignment.center,
|
mainAxisAlignment: MainAxisAlignment.center,
|
||||||
),
|
),
|
||||||
|
|
|
@ -37,7 +37,7 @@ class UnreadRoomsBadge extends StatelessWidget {
|
||||||
badgeColor: Theme.of(context).colorScheme.primary,
|
badgeColor: Theme.of(context).colorScheme.primary,
|
||||||
elevation: 4,
|
elevation: 4,
|
||||||
borderSide: BorderSide(
|
borderSide: BorderSide(
|
||||||
color: Theme.of(context).colorScheme.background,
|
color: Theme.of(context).colorScheme.surface,
|
||||||
width: 2,
|
width: 2,
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
|
|
36
pubspec.lock
36
pubspec.lock
|
@ -1017,10 +1017,10 @@ packages:
|
||||||
dependency: "direct main"
|
dependency: "direct main"
|
||||||
description:
|
description:
|
||||||
name: intl
|
name: intl
|
||||||
sha256: "3bc132a9dbce73a7e4a21a17d06e1878839ffbf975568bc875c60537824b0c4d"
|
sha256: d6f56758b7d3014a48af9701c085700aac781a92a87a62b1333b46d8879661cf
|
||||||
url: "https://pub.dev"
|
url: "https://pub.dev"
|
||||||
source: hosted
|
source: hosted
|
||||||
version: "0.18.1"
|
version: "0.19.0"
|
||||||
io:
|
io:
|
||||||
dependency: transitive
|
dependency: transitive
|
||||||
description:
|
description:
|
||||||
|
@ -1090,26 +1090,26 @@ packages:
|
||||||
dependency: transitive
|
dependency: transitive
|
||||||
description:
|
description:
|
||||||
name: leak_tracker
|
name: leak_tracker
|
||||||
sha256: "78eb209deea09858f5269f5a5b02be4049535f568c07b275096836f01ea323fa"
|
sha256: "7f0df31977cb2c0b88585095d168e689669a2cc9b97c309665e3386f3e9d341a"
|
||||||
url: "https://pub.dev"
|
url: "https://pub.dev"
|
||||||
source: hosted
|
source: hosted
|
||||||
version: "10.0.0"
|
version: "10.0.4"
|
||||||
leak_tracker_flutter_testing:
|
leak_tracker_flutter_testing:
|
||||||
dependency: transitive
|
dependency: transitive
|
||||||
description:
|
description:
|
||||||
name: leak_tracker_flutter_testing
|
name: leak_tracker_flutter_testing
|
||||||
sha256: b46c5e37c19120a8a01918cfaf293547f47269f7cb4b0058f21531c2465d6ef0
|
sha256: "06e98f569d004c1315b991ded39924b21af84cf14cc94791b8aea337d25b57f8"
|
||||||
url: "https://pub.dev"
|
url: "https://pub.dev"
|
||||||
source: hosted
|
source: hosted
|
||||||
version: "2.0.1"
|
version: "3.0.3"
|
||||||
leak_tracker_testing:
|
leak_tracker_testing:
|
||||||
dependency: transitive
|
dependency: transitive
|
||||||
description:
|
description:
|
||||||
name: leak_tracker_testing
|
name: leak_tracker_testing
|
||||||
sha256: a597f72a664dbd293f3bfc51f9ba69816f84dcd403cdac7066cb3f6003f3ab47
|
sha256: "6ba465d5d76e67ddf503e1161d1f4a6bc42306f9d66ca1e8f079a47290fb06d3"
|
||||||
url: "https://pub.dev"
|
url: "https://pub.dev"
|
||||||
source: hosted
|
source: hosted
|
||||||
version: "2.0.1"
|
version: "3.0.1"
|
||||||
license_checker:
|
license_checker:
|
||||||
dependency: "direct dev"
|
dependency: "direct dev"
|
||||||
description:
|
description:
|
||||||
|
@ -1218,10 +1218,10 @@ packages:
|
||||||
dependency: transitive
|
dependency: transitive
|
||||||
description:
|
description:
|
||||||
name: meta
|
name: meta
|
||||||
sha256: d584fa6707a52763a52446f02cc621b077888fb63b93bbcb1143a7be5a0c0c04
|
sha256: "7687075e408b093f36e6bbf6c91878cc0d4cd10f409506f7bc996f68220b9136"
|
||||||
url: "https://pub.dev"
|
url: "https://pub.dev"
|
||||||
source: hosted
|
source: hosted
|
||||||
version: "1.11.0"
|
version: "1.12.0"
|
||||||
mgrs_dart:
|
mgrs_dart:
|
||||||
dependency: transitive
|
dependency: transitive
|
||||||
description:
|
description:
|
||||||
|
@ -1983,26 +1983,26 @@ packages:
|
||||||
dependency: transitive
|
dependency: transitive
|
||||||
description:
|
description:
|
||||||
name: test
|
name: test
|
||||||
sha256: a1f7595805820fcc05e5c52e3a231aedd0b72972cb333e8c738a8b1239448b6f
|
sha256: "7ee446762c2c50b3bd4ea96fe13ffac69919352bd3b4b17bac3f3465edc58073"
|
||||||
url: "https://pub.dev"
|
url: "https://pub.dev"
|
||||||
source: hosted
|
source: hosted
|
||||||
version: "1.24.9"
|
version: "1.25.2"
|
||||||
test_api:
|
test_api:
|
||||||
dependency: transitive
|
dependency: transitive
|
||||||
description:
|
description:
|
||||||
name: test_api
|
name: test_api
|
||||||
sha256: "5c2f730018264d276c20e4f1503fd1308dfbbae39ec8ee63c5236311ac06954b"
|
sha256: "9955ae474176f7ac8ee4e989dadfb411a58c30415bcfb648fa04b2b8a03afa7f"
|
||||||
url: "https://pub.dev"
|
url: "https://pub.dev"
|
||||||
source: hosted
|
source: hosted
|
||||||
version: "0.6.1"
|
version: "0.7.0"
|
||||||
test_core:
|
test_core:
|
||||||
dependency: transitive
|
dependency: transitive
|
||||||
description:
|
description:
|
||||||
name: test_core
|
name: test_core
|
||||||
sha256: a757b14fc47507060a162cc2530d9a4a2f92f5100a952c7443b5cad5ef5b106a
|
sha256: "2bc4b4ecddd75309300d8096f781c0e3280ca1ef85beda558d33fcbedc2eead4"
|
||||||
url: "https://pub.dev"
|
url: "https://pub.dev"
|
||||||
source: hosted
|
source: hosted
|
||||||
version: "0.5.9"
|
version: "0.6.0"
|
||||||
timezone:
|
timezone:
|
||||||
dependency: transitive
|
dependency: transitive
|
||||||
description:
|
description:
|
||||||
|
@ -2295,10 +2295,10 @@ packages:
|
||||||
dependency: transitive
|
dependency: transitive
|
||||||
description:
|
description:
|
||||||
name: vm_service
|
name: vm_service
|
||||||
sha256: b3d56ff4341b8f182b96aceb2fa20e3dcb336b9f867bc0eafc0de10f1048e957
|
sha256: "3923c89304b715fb1eb6423f017651664a03bf5f4b29983627c4da791f74a4ec"
|
||||||
url: "https://pub.dev"
|
url: "https://pub.dev"
|
||||||
source: hosted
|
source: hosted
|
||||||
version: "13.0.0"
|
version: "14.2.1"
|
||||||
wakelock_plus:
|
wakelock_plus:
|
||||||
dependency: "direct main"
|
dependency: "direct main"
|
||||||
description:
|
description:
|
||||||
|
|
Loading…
Reference in a new issue