desktop wallet keys and net info button highlight

This commit is contained in:
julian 2022-11-15 12:16:12 -06:00
parent d326c10f42
commit a48975940d
3 changed files with 39 additions and 26 deletions

View file

@ -292,13 +292,13 @@ class _DesktopWalletViewState extends ConsumerState<DesktopWalletView> {
eventBus: eventBus,
),
const SizedBox(
width: 32,
width: 2,
),
WalletKeysButton(
walletId: walletId,
),
const SizedBox(
width: 32,
width: 12,
),
],
),

View file

@ -98,25 +98,26 @@ class _NetworkInfoButtonState extends ConsumerState<NetworkInfoButton> {
Widget _buildNetworkIcon(WalletSyncStatus status, BuildContext context) {
const size = 24.0;
final color = _getColor(status, context);
switch (status) {
case WalletSyncStatus.unableToSync:
return SvgPicture.asset(
Assets.svg.radioProblem,
color: Theme.of(context).extension<StackColors>()!.accentColorRed,
color: color,
width: size,
height: size,
);
case WalletSyncStatus.synced:
return SvgPicture.asset(
Assets.svg.radio,
color: Theme.of(context).extension<StackColors>()!.accentColorGreen,
color: color,
width: size,
height: size,
);
case WalletSyncStatus.syncing:
return SvgPicture.asset(
Assets.svg.radioSyncing,
color: Theme.of(context).extension<StackColors>()!.accentColorYellow,
color: color,
width: size,
height: size,
);
@ -125,35 +126,46 @@ class _NetworkInfoButtonState extends ConsumerState<NetworkInfoButton> {
Widget _buildText(WalletSyncStatus status, BuildContext context) {
String label;
Color color;
switch (status) {
case WalletSyncStatus.unableToSync:
label = "Unable to sync";
color = Theme.of(context).extension<StackColors>()!.accentColorRed;
break;
case WalletSyncStatus.synced:
label = "Synchronised";
color = Theme.of(context).extension<StackColors>()!.accentColorGreen;
break;
case WalletSyncStatus.syncing:
label = "Synchronising";
color = Theme.of(context).extension<StackColors>()!.accentColorYellow;
break;
}
return Text(
label,
style: STextStyles.desktopMenuItemSelected(context).copyWith(
color: color,
color: _getColor(status, context),
),
);
}
Color _getColor(WalletSyncStatus status, BuildContext context) {
switch (status) {
case WalletSyncStatus.unableToSync:
return Theme.of(context).extension<StackColors>()!.accentColorRed;
case WalletSyncStatus.synced:
return Theme.of(context).extension<StackColors>()!.accentColorGreen;
case WalletSyncStatus.syncing:
return Theme.of(context).extension<StackColors>()!.accentColorYellow;
}
}
@override
Widget build(BuildContext context) {
return GestureDetector(
onTap: () {
return RawMaterialButton(
hoverColor: _getColor(_currentSyncStatus, context).withOpacity(0.1),
shape: RoundedRectangleBorder(
borderRadius: BorderRadius.circular(1000),
),
onPressed: () {
if (Util.isDesktop) {
// showDialog<void>(
// context: context,
@ -265,8 +277,11 @@ class _NetworkInfoButtonState extends ConsumerState<NetworkInfoButton> {
);
}
},
child: Container(
color: Colors.transparent,
child: Padding(
padding: const EdgeInsets.symmetric(
vertical: 16,
horizontal: 32,
),
child: Row(
children: [
_buildNetworkIcon(_currentSyncStatus, context),

View file

@ -16,8 +16,11 @@ class WalletKeysButton extends StatelessWidget {
@override
Widget build(BuildContext context) {
return GestureDetector(
onTap: () {
return RawMaterialButton(
shape: RoundedRectangleBorder(
borderRadius: BorderRadius.circular(1000),
),
onPressed: () {
showDialog<void>(
context: context,
barrierDismissible: false,
@ -36,17 +39,12 @@ class WalletKeysButton extends StatelessWidget {
},
),
);
// showDialog<void>(
// context: context,
// barrierDismissible: false,
// builder: (context) => UnlockWalletKeysDesktop(
// walletId: walletId,
// ),
// );
},
child: Container(
color: Colors.transparent,
child: Padding(
padding: const EdgeInsets.symmetric(
vertical: 19,
horizontal: 32,
),
child: Row(
children: [
SvgPicture.asset(