Skip to content

Commit cd2a1b8

Browse files
committed
fix: use more SW-standard icons
1 parent c2bd570 commit cd2a1b8

5 files changed

Lines changed: 34 additions & 17 deletions

File tree

lib/pages/cakepay/cakepay_order_view.dart

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ import 'package:decimal/decimal.dart';
44
import 'package:flutter/material.dart';
55
import 'package:flutter/services.dart';
66
import 'package:flutter_riverpod/flutter_riverpod.dart';
7+
import 'package:flutter_svg/svg.dart';
78

89
import '../../app_config.dart';
910
import '../../notifications/show_flush_bar.dart';
@@ -558,9 +559,10 @@ class _CakePayOrderViewState extends ConsumerState<CakePayOrderView> {
558559
children: [
559560
Row(
560561
children: [
561-
Icon(
562-
Icons.check_circle,
563-
size: 20,
562+
SvgPicture.asset(
563+
Assets.svg.checkCircle,
564+
width: 20,
565+
height: 20,
564566
color: Theme.of(
565567
context,
566568
).extension<StackColors>()!.accentColorGreen,
@@ -622,9 +624,10 @@ class _CakePayOrderViewState extends ConsumerState<CakePayOrderView> {
622624
RoundedWhiteContainer(
623625
child: Row(
624626
children: [
625-
Icon(
626-
Icons.cancel,
627-
size: 20,
627+
SvgPicture.asset(
628+
Assets.svg.circleX,
629+
width: 20,
630+
height: 20,
628631
color: Theme.of(
629632
context,
630633
).extension<StackColors>()!.textSubtitle1,

lib/pages/cakepay/cakepay_orders_view.dart

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
11
import 'package:flutter/material.dart';
22
import 'package:flutter_riverpod/flutter_riverpod.dart';
3+
import 'package:flutter_svg/svg.dart';
34

45
import '../../providers/global/cakepay_orders_provider.dart';
56
import '../../themes/stack_colors.dart';
7+
import '../../utilities/assets.dart';
68
import '../../utilities/text_styles.dart';
79
import '../../utilities/util.dart';
810
import '../../widgets/background.dart';
@@ -135,8 +137,10 @@ class _CakePayOrdersViewState extends ConsumerState<CakePayOrdersView> {
135137
),
136138
),
137139
SizedBox(width: isDesktop ? 16 : 8),
138-
Icon(
139-
Icons.chevron_right,
140+
SvgPicture.asset(
141+
Assets.svg.chevronRight,
142+
width: 24,
143+
height: 24,
140144
color: Theme.of(
141145
context,
142146
).extension<StackColors>()!.textSubtitle1,

lib/pages/shopinbit/shopinbit_payment_view.dart

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ import '../../widgets/desktop/desktop_dialog.dart';
2222
import '../../widgets/desktop/desktop_dialog_close_button.dart';
2323
import '../../widgets/desktop/primary_button.dart';
2424
import '../../widgets/desktop/secondary_button.dart';
25+
import '../../widgets/icon_widgets/copy_icon.dart';
2526
import '../../widgets/loading_indicator.dart';
2627
import '../../widgets/rounded_white_container.dart';
2728
import 'shopinbit_payment_shared.dart';
@@ -342,9 +343,9 @@ class _ShopInBitPaymentViewState extends ConsumerState<ShopInBitPaymentView> {
342343
),
343344
),
344345
const SizedBox(width: 8),
345-
Icon(
346-
Icons.copy,
347-
size: 14,
346+
CopyIcon(
347+
width: 14,
348+
height: 14,
348349
color: Theme.of(
349350
context,
350351
).extension<StackColors>()!.accentColorBlue,
@@ -437,9 +438,10 @@ class _ShopInBitPaymentViewState extends ConsumerState<ShopInBitPaymentView> {
437438
if (hasWallet)
438439
Text("PAY NOW", style: STextStyles.link2(context))
439440
else
440-
Icon(
441-
Icons.info_outline,
442-
size: 18,
441+
SvgPicture.asset(
442+
Assets.svg.circleInfo,
443+
width: 18,
444+
height: 18,
443445
color: Theme.of(
444446
context,
445447
).extension<StackColors>()!.textSubtitle2,

lib/pages/shopinbit/shopinbit_setup_view.dart

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ import '../../utilities/text_styles.dart';
1111
import '../../widgets/background.dart';
1212
import '../../widgets/custom_buttons/app_bar_icon_button.dart';
1313
import '../../widgets/desktop/primary_button.dart';
14+
import '../../widgets/icon_widgets/copy_icon.dart';
1415
import '../../widgets/rounded_white_container.dart';
1516
import '../../widgets/textfields/adaptive_text_field.dart';
1617
import 'shopinbit_step_2.dart';
@@ -141,7 +142,10 @@ class _ShopInBitSetupViewState extends ConsumerState<ShopInBitSetupView> {
141142
),
142143
),
143144
IconButton(
144-
icon: const Icon(Icons.copy, size: 20),
145+
icon: const CopyIcon(
146+
width: 20,
147+
height: 20,
148+
),
145149
onPressed: () {
146150
Clipboard.setData(
147151
ClipboardData(text: key),

lib/pages/shopinbit/shopinbit_ticket_detail.dart

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ import 'dart:convert';
33

44
import 'package:flutter/material.dart';
55
import 'package:flutter_riverpod/flutter_riverpod.dart';
6+
import 'package:flutter_svg/svg.dart';
67
import 'package:intl/intl.dart';
78

89
import '../../models/shopinbit/shopinbit_order_model.dart';
@@ -12,6 +13,7 @@ import '../../providers/global/shopin_bit_orders_provider.dart';
1213
import '../../providers/global/shopin_bit_service_provider.dart';
1314
import '../../services/shopinbit/shopinbit_orders_service.dart';
1415
import '../../themes/stack_colors.dart';
16+
import '../../utilities/assets.dart';
1517
import '../../utilities/text_styles.dart';
1618
import '../../utilities/util.dart';
1719
import '../../widgets/background.dart';
@@ -509,8 +511,10 @@ class _ShopInBitTicketDetailState extends ConsumerState<ShopInBitTicketDetail> {
509511
if (!Util.isDesktop)
510512
IconButton(
511513
onPressed: _sendMessage,
512-
icon: Icon(
513-
Icons.send,
514+
icon: SvgPicture.asset(
515+
Assets.svg.send,
516+
width: 24,
517+
height: 24,
514518
color: Theme.of(
515519
context,
516520
).extension<StackColors>()!.accentColorBlue,

0 commit comments

Comments
 (0)