Skip to content

Commit

Permalink
Merge pull request #603 from HaonRekcef/fix-deprecated
Browse files Browse the repository at this point in the history
  • Loading branch information
veloce authored Mar 15, 2024
2 parents 099eba2 + e81d33a commit 5d8d02b
Show file tree
Hide file tree
Showing 5 changed files with 8 additions and 9 deletions.
8 changes: 4 additions & 4 deletions lib/src/view/engine/engine_gauge.dart
Original file line number Diff line number Diff line change
Expand Up @@ -52,17 +52,17 @@ class EngineGauge extends ConsumerWidget {
Theme.of(context).platform == TargetPlatform.iOS
? _kEvalGaugeBackgroundColor
: brightness == Brightness.dark
? lighten(Theme.of(context).colorScheme.background, .07)
: lighten(Theme.of(context).colorScheme.onBackground, .17);
? lighten(Theme.of(context).colorScheme.surface, .07)
: lighten(Theme.of(context).colorScheme.onSurface, .17);

static Color valueColor(BuildContext context, Brightness brightness) =>
Theme.of(context).platform == TargetPlatform.iOS
? brightness == Brightness.dark
? _kEvalGaugeValueColorDarkBg
: _kEvalGaugeValueColorLightBg
: brightness == Brightness.dark
? darken(Theme.of(context).colorScheme.onBackground, .03)
: darken(Theme.of(context).colorScheme.background, .01);
? darken(Theme.of(context).colorScheme.onSurface, .03)
: darken(Theme.of(context).colorScheme.surface, .01);

@override
Widget build(BuildContext context, WidgetRef ref) {
Expand Down
2 changes: 1 addition & 1 deletion lib/src/view/play/time_control_modal.dart
Original file line number Diff line number Diff line change
Expand Up @@ -183,7 +183,7 @@ class _ChoiceChip extends StatelessWidget {
color: Theme.of(context).platform == TargetPlatform.iOS
? CupertinoColors.secondarySystemGroupedBackground
.resolveFrom(context)
: Theme.of(context).colorScheme.surfaceVariant,
: Theme.of(context).colorScheme.tertiary.withOpacity(0.15),
borderRadius: const BorderRadius.all(Radius.circular(5.0)),
border: selected
? Border.fromBorderSide(
Expand Down
3 changes: 1 addition & 2 deletions lib/src/view/puzzle/puzzle_dashboard_widget.dart
Original file line number Diff line number Diff line change
Expand Up @@ -143,8 +143,7 @@ class PuzzleChart extends StatelessWidget {

@override
Widget build(BuildContext context) {
final radarColor =
Theme.of(context).colorScheme.onBackground.withOpacity(0.5);
final radarColor = Theme.of(context).colorScheme.onSurface.withOpacity(0.5);
final chartColor = Theme.of(context).colorScheme.tertiary;
return RadarChart(
RadarChartData(
Expand Down
2 changes: 1 addition & 1 deletion lib/src/widgets/board_table.dart
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ class BoardTable extends ConsumerWidget {
color: Theme.of(context).platform == TargetPlatform.iOS
? CupertinoColors.secondarySystemBackground
.resolveFrom(context)
: Theme.of(context).colorScheme.background,
: Theme.of(context).colorScheme.surface,
borderRadius:
const BorderRadius.all(Radius.circular(10.0)),
),
Expand Down
2 changes: 1 addition & 1 deletion lib/src/widgets/feedback.dart
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ class ConnectivityBanner extends ConsumerWidget {
height: 45,
color: theme.platform == TargetPlatform.iOS
? cupertinoTheme.barBackgroundColor
: theme.colorScheme.surfaceVariant,
: theme.colorScheme.tertiary.withOpacity(0.15),
child: Padding(
padding: const EdgeInsets.symmetric(horizontal: 8.0),
child: Row(
Expand Down

0 comments on commit 5d8d02b

Please sign in to comment.