Skip to content

Commit e3d667c

Browse files
committed
tonal verified icon everywhere and translate button harmonised
1 parent 875e5a2 commit e3d667c

File tree

7 files changed

+23
-15
lines changed

7 files changed

+23
-15
lines changed

lib/client/login_webview.dart

-2
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,9 @@
11
import 'dart:convert';
22

33
import 'package:flutter/material.dart';
4-
import 'package:logging/logging.dart';
54
import 'package:quacker/constants.dart';
65
import 'package:quacker/database/entities.dart';
76
import 'package:quacker/database/repository.dart';
8-
import 'package:quacker/generated/l10n.dart';
97
import 'package:webview_cookie_manager/webview_cookie_manager.dart';
108
import 'package:webview_flutter/webview_flutter.dart';
119

lib/home/_saved.dart

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
import 'dart:convert';
22

3+
import 'package:dynamic_color/dynamic_color.dart';
34
import 'package:flutter/material.dart';
45
import 'package:flutter_triple/flutter_triple.dart';
56

@@ -126,7 +127,8 @@ class SavedTweetTooLarge extends StatelessWidget {
126127
crossAxisAlignment: CrossAxisAlignment.start,
127128
children: [
128129
ListTile(
129-
leading: const Icon(Icons.error_outline, color: Colors.red),
130+
leading:
131+
Icon(Icons.error_outline, color: Colors.red.harmonizeWith(Theme.of(context).colorScheme.primary)),
130132
title: Text(L10n.current.oops_something_went_wrong),
131133
subtitle: Text(L10n.current.saved_tweet_too_large),
132134
),

lib/profile/profile.dart

+3-1
Original file line numberDiff line numberDiff line change
@@ -421,7 +421,9 @@ class _ProfileScreenBodyState extends State<ProfileScreenBody> with TickerProvid
421421
return InkWell(
422422
child: Text(displayUrl,
423423
style: textStyle.copyWith(
424-
color: Colors.blue)),
424+
color: Theme.of(context)
425+
.colorScheme
426+
.primary)),
425427
onTap: () => openUri(expandedUrl),
426428
);
427429
}),

lib/tweet/_card.dart

+3-2
Original file line numberDiff line numberDiff line change
@@ -126,8 +126,9 @@ class TweetCard extends StatelessWidget {
126126
height: 24,
127127
child: LinearProgressIndicator(
128128
value: choicePercent / 100,
129-
color:
130-
theme.brightness == Brightness.light ? Colors.blue.withOpacity(0.3) : Colors.blue.withOpacity(0.7)),
129+
color: theme.brightness == Brightness.light
130+
? Theme.of(context).colorScheme.primary.withOpacity(0.3)
131+
: Theme.of(context).colorScheme.primary.withOpacity(0.7)),
131132
),
132133
Container(
133134
alignment: Alignment.centerLeft,

lib/tweet/tweet.dart

+9-5
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
import 'package:auto_direction/auto_direction.dart';
22
import 'package:dart_twitter_api/twitter_api.dart';
3+
import 'package:dynamic_color/dynamic_color.dart';
34
import 'package:flutter/material.dart';
45
import 'package:flutter/widgets.dart';
56
import 'package:quacker/client/client.dart';
@@ -435,7 +436,8 @@ class TweetTileState extends State<TweetTile> with SingleTickerProviderStateMixi
435436
Widget translateButton;
436437
switch (_translationStatus) {
437438
case TranslationStatus.original:
438-
translateButton = _createFooterIconButton(Icons.translate, Colors.blue, null, () async => onClickTranslate());
439+
translateButton = _createFooterIconButton(Icons.translate,
440+
Colors.blue.harmonizeWith(Theme.of(context).colorScheme.primary), null, () async => onClickTranslate());
439441
break;
440442
case TranslationStatus.translating:
441443
translateButton = const Padding(
@@ -444,11 +446,12 @@ class TweetTileState extends State<TweetTile> with SingleTickerProviderStateMixi
444446
);
445447
break;
446448
case TranslationStatus.translationFailed:
447-
translateButton = _createFooterIconButton(Icons.translate, Colors.red, null, () async => onClickTranslate());
449+
translateButton = _createFooterIconButton(Icons.translate,
450+
Colors.red.harmonizeWith(Theme.of(context).colorScheme.primary), null, () async => onClickTranslate());
448451
break;
449452
case TranslationStatus.translated:
450-
translateButton =
451-
_createFooterIconButton(Icons.translate, Colors.green, null, () async => onClickShowOriginal());
453+
translateButton = _createFooterIconButton(Icons.translate,
454+
Colors.green.harmonizeWith(Theme.of(context).colorScheme.primary), null, () async => onClickShowOriginal());
452455
break;
453456
}
454457

@@ -506,7 +509,8 @@ class TweetTileState extends State<TweetTile> with SingleTickerProviderStateMixi
506509
overflow: TextOverflow.ellipsis,
507510
style: const TextStyle(fontWeight: FontWeight.w500))),
508511
if (tweet.user!.verified ?? false) const SizedBox(width: 4),
509-
if (tweet.user!.verified ?? false) Icon(Icons.verified, size: 18, color: Colors.blue)
512+
if (tweet.user!.verified ?? false)
513+
Icon(Icons.verified, size: 18, color: Theme.of(context).colorScheme.primary)
510514
],
511515
),
512516
),

lib/ui/errors.dart

+4-2
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ import 'dart:async';
22
import 'dart:io';
33

44
import 'package:async_button_builder/async_button_builder.dart';
5+
import 'package:dynamic_color/dynamic_color.dart';
56

67
import 'package:flutter/material.dart';
78
import 'package:flutter/services.dart';
@@ -177,7 +178,7 @@ class InlineErrorWidget extends FritterErrorWidget {
177178
children: [
178179
Container(
179180
margin: const EdgeInsets.only(right: 8),
180-
child: const Icon(Icons.error_outline, color: Colors.red),
181+
child: Icon(Icons.error_outline, color: Colors.red.harmonizeWith(Theme.of(context).colorScheme.primary)),
181182
),
182183
Text('$error', textAlign: TextAlign.center, style: TextStyle(color: Theme.of(context).hintColor)),
183184
],
@@ -269,7 +270,8 @@ class FullPageErrorWidget extends FritterErrorWidget {
269270
children: [
270271
Container(
271272
margin: const EdgeInsets.only(bottom: 16),
272-
child: const Icon(Icons.error_outline, color: Colors.red, size: 36),
273+
child: Icon(Icons.error_outline,
274+
color: Colors.red.harmonizeWith(Theme.of(context).colorScheme.primary), size: 36),
273275
),
274276
Text(
275277
L10n.of(context).oops_something_went_wrong,

lib/user.dart

+1-2
Original file line numberDiff line numberDiff line change
@@ -85,8 +85,7 @@ class UserTile extends StatelessWidget {
8585
children: [
8686
Flexible(child: Text(user.name, maxLines: 1, overflow: TextOverflow.ellipsis)),
8787
if (user.verified) const SizedBox(width: 6),
88-
if (user.verified)
89-
Icon(Icons.verified, size: 14, color: Colors.blue.harmonizeWith(Theme.of(context).colorScheme.primary))
88+
if (user.verified) Icon(Icons.verified, size: 14, color: Theme.of(context).colorScheme.primary)
9089
],
9190
),
9291
subtitle: Text('@${user.screenName}', maxLines: 1, overflow: TextOverflow.ellipsis),

0 commit comments

Comments
 (0)