Skip to content

Commit

Permalink
feat: programmatically display WalletConnect tab
Browse files Browse the repository at this point in the history
  • Loading branch information
alienc0der committed Jun 21, 2023
1 parent 3749c49 commit a40427c
Show file tree
Hide file tree
Showing 3 changed files with 30 additions and 27 deletions.
15 changes: 0 additions & 15 deletions lib/utils/constants.dart
Expand Up @@ -207,18 +207,3 @@ const List<Tabs> kTabsWithTextTitles = [
Tabs.plasma,
Tabs.tokens,
];

const List<Tabs> kTabsWithIconTitles = [
Tabs.bridge,
Tabs.walletConnect,
Tabs.accelerator,
Tabs.help,
Tabs.notifications,
Tabs.settings,
Tabs.resyncWallet,
Tabs.lock,
];

const List<Tabs> kDisabledTabs = [
Tabs.resyncWallet,
];
16 changes: 15 additions & 1 deletion lib/utils/global.dart
Expand Up @@ -6,7 +6,6 @@ import 'package:zenon_syrius_wallet_flutter/utils/constants.dart';
import 'package:zenon_syrius_wallet_flutter/widgets/widgets.dart';
import 'package:znn_sdk_dart/znn_sdk_dart.dart';


ValueNotifier<String?> kLastWalletConnectUriNotifier = ValueNotifier(null);
String? kCurrentNode;
String? kSelectedAddress;
Expand Down Expand Up @@ -41,3 +40,18 @@ WalletNotification? kLastDismissedNotification;
int? kNumOfPillars;

bool kEmbeddedNodeRunning = false;

final List<Tabs> kTabsWithIconTitles = [
Tabs.bridge,
if (kWcProjectId.isNotEmpty) Tabs.walletConnect,
Tabs.accelerator,
Tabs.help,
Tabs.notifications,
Tabs.settings,
Tabs.resyncWallet,
Tabs.lock,
];

final List<Tabs> kDisabledTabs = [
Tabs.resyncWallet,
];
26 changes: 15 additions & 11 deletions lib/widgets/main_app_container.dart
Expand Up @@ -24,6 +24,7 @@ import 'package:zenon_syrius_wallet_flutter/utils/format_utils.dart';
import 'package:zenon_syrius_wallet_flutter/utils/global.dart';
import 'package:zenon_syrius_wallet_flutter/utils/notification_utils.dart';
import 'package:zenon_syrius_wallet_flutter/utils/notifiers/text_scaling_notifier.dart';
import 'package:zenon_syrius_wallet_flutter/utils/zts_utils.dart';
import 'package:zenon_syrius_wallet_flutter/widgets/tab_children_widgets/wallet_connect_tab_child.dart';
import 'package:zenon_syrius_wallet_flutter/widgets/widgets.dart';
import 'package:znn_sdk_dart/znn_sdk_dart.dart';
Expand Down Expand Up @@ -95,7 +96,9 @@ class _MainAppContainerState extends State<MainAppContainer>
windowManager.addListener(this);

ClipboardUtils.toggleClipboardWatcherStatus();

_netSyncStatusBloc.getDataPeriodically();

_transferTabChild = TransferTabChild(
navigateToBridgeTab: () {
_navigateTo(Tabs.bridge);
Expand Down Expand Up @@ -302,17 +305,18 @@ class _MainAppContainerState extends State<MainAppContainer>
: Theme.of(context).iconTheme.color,
),
),
Tab(
child: SvgPicture.asset(
'assets/svg/walletconnect-logo.svg',
width: 24.0,
fit: BoxFit.fitWidth,
colorFilter: _isTabSelected(Tabs.walletConnect)
? const ColorFilter.mode(AppColors.znnColor, BlendMode.srcIn)
: ColorFilter.mode(
Theme.of(context).iconTheme.color!, BlendMode.srcIn),
if (kWcProjectId.isNotEmpty)
Tab(
child: SvgPicture.asset(
'assets/svg/walletconnect-logo.svg',
width: 24.0,
fit: BoxFit.fitWidth,
colorFilter: _isTabSelected(Tabs.walletConnect)
? const ColorFilter.mode(AppColors.znnColor, BlendMode.srcIn)
: ColorFilter.mode(
Theme.of(context).iconTheme.color!, BlendMode.srcIn),
),
),
),
Tab(
child: Icon(
MaterialCommunityIcons.rocket,
Expand Down Expand Up @@ -467,7 +471,7 @@ class _MainAppContainerState extends State<MainAppContainer>
_navigateTo(Tabs.notifications),
),
const BridgeTabChild(),
const WalletConnectTabChild(),
if (kWcProjectId.isNotEmpty) const WalletConnectTabChild(),
AcceleratorTabChild(
onStepperNotificationSeeMorePressed: () =>
_navigateTo(Tabs.notifications),
Expand Down

0 comments on commit a40427c

Please sign in to comment.