From b0ce231cf118af6f3e253e39e08dea796e6cd9c3 Mon Sep 17 00:00:00 2001 From: julian Date: Mon, 26 Sep 2022 15:36:01 -0600 Subject: [PATCH 1/8] bch testnet default node fix --- lib/utilities/default_nodes.dart | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/utilities/default_nodes.dart b/lib/utilities/default_nodes.dart index 142ba4dfa..84dd9da35 100644 --- a/lib/utilities/default_nodes.dart +++ b/lib/utilities/default_nodes.dart @@ -146,10 +146,10 @@ abstract class DefaultNodes { host: "testnet.hsmiths.com", port: 53012, name: defaultName, - id: _nodeId(Coin.bitcoincash), + id: _nodeId(Coin.bitcoincashTestnet), useSSL: true, enabled: true, - coinName: Coin.bitcoincash.name, + coinName: Coin.bitcoincashTestnet.name, isFailover: true, isDown: false, ); From a11b33694e584962c9c47213c8b710c33db3949b Mon Sep 17 00:00:00 2001 From: julian Date: Thu, 29 Sep 2022 12:05:11 -0600 Subject: [PATCH 2/8] background color fix --- lib/pages/exchange_view/confirm_change_now_send.dart | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/pages/exchange_view/confirm_change_now_send.dart b/lib/pages/exchange_view/confirm_change_now_send.dart index 6fd6c8a08..ffd089428 100644 --- a/lib/pages/exchange_view/confirm_change_now_send.dart +++ b/lib/pages/exchange_view/confirm_change_now_send.dart @@ -132,6 +132,7 @@ class _ConfirmChangeNowSendViewState final managerProvider = ref.watch(walletsChangeNotifierProvider .select((value) => value.getManagerProvider(walletId))); return Scaffold( + backgroundColor: Theme.of(context).extension()!.background, appBar: AppBar( backgroundColor: Theme.of(context).extension()!.background, leading: AppBarBackButton( From 1bdb673504cb6e5f0f18087b7d65509aab9ae77a Mon Sep 17 00:00:00 2001 From: julian Date: Thu, 29 Sep 2022 12:15:09 -0600 Subject: [PATCH 3/8] address book copy icon size increase --- .../subviews/contact_details_view.dart | 32 +++++++++++-------- .../subviews/contact_popup.dart | 6 ++-- 2 files changed, 21 insertions(+), 17 deletions(-) diff --git a/lib/pages/address_book_views/subviews/contact_details_view.dart b/lib/pages/address_book_views/subviews/contact_details_view.dart index 6538af0dc..c0c10b3b1 100644 --- a/lib/pages/address_book_views/subviews/contact_details_view.dart +++ b/lib/pages/address_book_views/subviews/contact_details_view.dart @@ -393,13 +393,15 @@ class _ContactDetailsViewState extends ConsumerState { color: Theme.of(context) .extension()! .textFieldDefaultBG, - padding: const EdgeInsets.all(4), - child: SvgPicture.asset(Assets.svg.pencil, - width: 12, - height: 12, - color: Theme.of(context) - .extension()! - .accentColorDark), + padding: const EdgeInsets.all(6), + child: SvgPicture.asset( + Assets.svg.pencil, + width: 14, + height: 14, + color: Theme.of(context) + .extension()! + .accentColorDark, + ), ), ), const SizedBox( @@ -421,13 +423,15 @@ class _ContactDetailsViewState extends ConsumerState { color: Theme.of(context) .extension()! .textFieldDefaultBG, - padding: const EdgeInsets.all(4), - child: SvgPicture.asset(Assets.svg.copy, - width: 12, - height: 12, - color: Theme.of(context) - .extension()! - .accentColorDark), + padding: const EdgeInsets.all(6), + child: SvgPicture.asset( + Assets.svg.copy, + width: 16, + height: 16, + color: Theme.of(context) + .extension()! + .accentColorDark, + ), ), ), ], diff --git a/lib/pages/address_book_views/subviews/contact_popup.dart b/lib/pages/address_book_views/subviews/contact_popup.dart index a14581c0a..11f1911d5 100644 --- a/lib/pages/address_book_views/subviews/contact_popup.dart +++ b/lib/pages/address_book_views/subviews/contact_popup.dart @@ -268,11 +268,11 @@ class ContactPopUp extends ConsumerWidget { color: Theme.of(context) .extension()! .textFieldDefaultBG, - padding: const EdgeInsets.all(4), + padding: const EdgeInsets.all(6), child: SvgPicture.asset( Assets.svg.copy, - width: 12, - height: 12, + width: 16, + height: 16, color: Theme.of(context) .extension()! .accentColorDark), From 13e0356ca564cf0fcf420d20ef6f139629d3b69a Mon Sep 17 00:00:00 2001 From: julian Date: Thu, 29 Sep 2022 15:55:10 -0600 Subject: [PATCH 4/8] desktop settings icon and additional textstyle --- assets/svg/box-auto.svg | 11 +++++++++++ lib/utilities/assets.dart | 1 + lib/utilities/text_styles.dart | 19 +++++++++++++++++++ pubspec.yaml | 1 + 4 files changed, 32 insertions(+) create mode 100644 assets/svg/box-auto.svg diff --git a/assets/svg/box-auto.svg b/assets/svg/box-auto.svg new file mode 100644 index 000000000..1dd771fb1 --- /dev/null +++ b/assets/svg/box-auto.svg @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/lib/utilities/assets.dart b/lib/utilities/assets.dart index 002bf452c..a328c6689 100644 --- a/lib/utilities/assets.dart +++ b/lib/utilities/assets.dart @@ -52,6 +52,7 @@ class _SVG { "assets/svg/${Theme.of(context).extension()!.themeType.name}/tx-exchange-icon-failed.svg"; String get drd => "assets/svg/drd-icon.svg"; + String get boxAuto => "assets/svg/box-auto.svg"; String get plus => "assets/svg/plus.svg"; String get gear => "assets/svg/gear.svg"; String get bell => "assets/svg/bell.svg"; diff --git a/lib/utilities/text_styles.dart b/lib/utilities/text_styles.dart index 7c6aa2aaf..21a1ee488 100644 --- a/lib/utilities/text_styles.dart +++ b/lib/utilities/text_styles.dart @@ -698,6 +698,25 @@ class STextStyles { } } + static TextStyle desktopTextExtraExtraSmall(BuildContext context) { + switch (_theme(context).themeType) { + case ThemeType.light: + return GoogleFonts.inter( + color: _theme(context).textSubtitle1, + fontWeight: FontWeight.w500, + fontSize: 14, + height: 21 / 14, + ); + case ThemeType.dark: + return GoogleFonts.inter( + color: _theme(context).textSubtitle1, + fontWeight: FontWeight.w500, + fontSize: 14, + height: 21 / 14, + ); + } + } + static TextStyle desktopButtonSmallSecondaryEnabled(BuildContext context) { switch (_theme(context).themeType) { case ThemeType.light: diff --git a/pubspec.yaml b/pubspec.yaml index 22021e7cb..57486e005 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -307,6 +307,7 @@ flutter: - assets/svg/exchange-3.svg - assets/svg/message-question-1.svg - assets/svg/drd-icon.svg + - assets/svg/box-auto.svg # An image asset can refer to one or more resolution-specific "variants", see # https://flutter.dev/assets-and-images/#resolution-aware. From ec54d9fe8cf12b2192390f7f758706bbb054daec Mon Sep 17 00:00:00 2001 From: ryleedavis Date: Mon, 3 Oct 2022 11:14:37 -0600 Subject: [PATCH 5/8] added settings indicator icon --- lib/pages_desktop_specific/home/settings_view/settings_view.dart | 0 lib/utilities/assets.dart | 1 + pubspec.yaml | 1 + 3 files changed, 2 insertions(+) create mode 100644 lib/pages_desktop_specific/home/settings_view/settings_view.dart diff --git a/lib/pages_desktop_specific/home/settings_view/settings_view.dart b/lib/pages_desktop_specific/home/settings_view/settings_view.dart new file mode 100644 index 000000000..e69de29bb diff --git a/lib/utilities/assets.dart b/lib/utilities/assets.dart index a328c6689..38ff4b355 100644 --- a/lib/utilities/assets.dart +++ b/lib/utilities/assets.dart @@ -51,6 +51,7 @@ class _SVG { String txExchangeFailed(BuildContext context) => "assets/svg/${Theme.of(context).extension()!.themeType.name}/tx-exchange-icon-failed.svg"; + String get polygon => "assets/svg/Polygon 1.svg"; String get drd => "assets/svg/drd-icon.svg"; String get boxAuto => "assets/svg/box-auto.svg"; String get plus => "assets/svg/plus.svg"; diff --git a/pubspec.yaml b/pubspec.yaml index 57486e005..0bd68b7cc 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -285,6 +285,7 @@ flutter: - assets/svg/tx-icon-anonymize.svg - assets/svg/tx-icon-anonymize-pending.svg - assets/svg/tx-icon-anonymize-failed.svg + - assets/svg/Polygon 1.svg # coin icons - assets/svg/coin_icons/Bitcoin.svg - assets/svg/coin_icons/Bitcoincash.svg From a4e2078184b58db044b8d82765f2688a18890454 Mon Sep 17 00:00:00 2001 From: ryleedavis Date: Mon, 3 Oct 2022 11:16:12 -0600 Subject: [PATCH 6/8] created settings view page --- .../home/settings_view/settings_view.dart | 20 +++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/lib/pages_desktop_specific/home/settings_view/settings_view.dart b/lib/pages_desktop_specific/home/settings_view/settings_view.dart index e69de29bb..c308f2962 100644 --- a/lib/pages_desktop_specific/home/settings_view/settings_view.dart +++ b/lib/pages_desktop_specific/home/settings_view/settings_view.dart @@ -0,0 +1,20 @@ +import 'package:flutter/cupertino.dart'; +import 'package:flutter_riverpod/flutter_riverpod.dart'; + +class SettingsView extends ConsumerStatefulWidget { + const SettingsView({Key? key}) : super(key: key); + + static const String routeName = "/settingsView"; + + @override + ConsumerState createState() => _SettingsView(); +} + +class _SettingsView extends ConsumerState { + @override + Widget build(BuildContext context) { + debugPrint("BUILD: $runtimeType"); + // TODO: implement build + throw UnimplementedError(); + } +} From c17710285056edcb88920822d3ea11923df7746a Mon Sep 17 00:00:00 2001 From: ryleedavis Date: Mon, 3 Oct 2022 11:58:19 -0600 Subject: [PATCH 7/8] updated indicator name --- lib/utilities/assets.dart | 2 +- pubspec.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/utilities/assets.dart b/lib/utilities/assets.dart index 38ff4b355..8b064e147 100644 --- a/lib/utilities/assets.dart +++ b/lib/utilities/assets.dart @@ -51,7 +51,7 @@ class _SVG { String txExchangeFailed(BuildContext context) => "assets/svg/${Theme.of(context).extension()!.themeType.name}/tx-exchange-icon-failed.svg"; - String get polygon => "assets/svg/Polygon 1.svg"; + String get polygon => "assets/svg/Polygon.svg"; String get drd => "assets/svg/drd-icon.svg"; String get boxAuto => "assets/svg/box-auto.svg"; String get plus => "assets/svg/plus.svg"; diff --git a/pubspec.yaml b/pubspec.yaml index 0bd68b7cc..ecf2d99e0 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -285,7 +285,7 @@ flutter: - assets/svg/tx-icon-anonymize.svg - assets/svg/tx-icon-anonymize-pending.svg - assets/svg/tx-icon-anonymize-failed.svg - - assets/svg/Polygon 1.svg + - assets/svg/Polygon.svg # coin icons - assets/svg/coin_icons/Bitcoin.svg - assets/svg/coin_icons/Bitcoincash.svg From 885112ad67727993594dc1cf715cd371b9bc5aeb Mon Sep 17 00:00:00 2001 From: ryleedavis Date: Mon, 3 Oct 2022 14:19:30 -0600 Subject: [PATCH 8/8] Polygon.svg --- assets/svg/Polygon.svg | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 assets/svg/Polygon.svg diff --git a/assets/svg/Polygon.svg b/assets/svg/Polygon.svg new file mode 100644 index 000000000..b79ac9bc3 --- /dev/null +++ b/assets/svg/Polygon.svg @@ -0,0 +1,3 @@ + + +