Ecosystem/stack_wallet
1
0
Fork 0
mirror of https://github.com/cypherstack/stack_wallet.git synced 2024-12-23 03:49:22 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

desktop clean up

Browse source
This commit is contained in:
julian 2023-07-27 09:47:50 -06:00
parent 8b88890e05
commit 6ccd7a76a5
2 changed files with 99 additions and 49 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

141
lib/pages/monkey/monkey_view.dart
View file

@ -21,6 +21,8 @@ import 'package:stackwallet/widgets/background.dart';
import 'package:stackwallet/widgets/conditional_parent.dart'; import 'package:stackwallet/widgets/conditional_parent.dart';
import 'package:stackwallet/widgets/custom_buttons/app_bar_icon_button.dart'; import 'package:stackwallet/widgets/custom_buttons/app_bar_icon_button.dart';
import 'package:stackwallet/widgets/desktop/desktop_app_bar.dart'; import 'package:stackwallet/widgets/desktop/desktop_app_bar.dart';
import 'package:stackwallet/widgets/desktop/desktop_dialog.dart';
import 'package:stackwallet/widgets/desktop/desktop_dialog_close_button.dart';
import 'package:stackwallet/widgets/desktop/desktop_scaffold.dart'; import 'package:stackwallet/widgets/desktop/desktop_scaffold.dart';
import 'package:stackwallet/widgets/desktop/primary_button.dart'; import 'package:stackwallet/widgets/desktop/primary_button.dart';
import 'package:stackwallet/widgets/desktop/secondary_button.dart'; import 'package:stackwallet/widgets/desktop/secondary_button.dart';
@ -113,7 +115,6 @@ class _MonkeyViewState extends ConsumerState<MonkeyView> {
imageBytes ??= (manager.wallet as BananoWallet).getMonkeyImageBytes(); imageBytes ??= (manager.wallet as BananoWallet).getMonkeyImageBytes();
//edit for desktop
return Background( return Background(
child: ConditionalParent( child: ConditionalParent(
condition: isDesktop, condition: isDesktop,
@ -140,64 +141,116 @@ class _MonkeyViewState extends ConsumerState<MonkeyView> {
.extension<StackColors>()! .extension<StackColors>()!
.topNavIconPrimary, .topNavIconPrimary,
), ),
onPressed: () { onPressed: Navigator.of(context).pop,
if (mounted) {
Navigator.of(context).pop();
}
},
), ),
const SizedBox( const SizedBox(
width: 15, width: 15,
), ),
SvgPicture.asset(Assets.svg.monkey), SvgPicture.asset(
Assets.svg.monkey,
width: 32,
height: 32,
color: Theme.of(context)
.extension<StackColors>()!
.textSubtitle1,
),
const SizedBox( const SizedBox(
width: 12, width: 12,
), ),
Text( Text(
"MonKey", "MonKey",
style: STextStyles.navBarTitle(context), style: STextStyles.desktopH3(context),
), ),
], ],
), ),
), ),
trailing: Padding( trailing: RawMaterialButton(
padding: const EdgeInsets.all(8.0), shape: RoundedRectangleBorder(
child: MouseRegion( borderRadius: BorderRadius.circular(1000),
cursor: SystemMouseCursors.click, ),
child: GestureDetector( onPressed: () {
onTap: () { showDialog<void>(
showDialog<dynamic>( context: context,
context: context, useSafeArea: false,
useSafeArea: false, barrierDismissible: true,
barrierDismissible: true, builder: (context) {
builder: (context) { return DesktopDialog(
return const StackDialog( maxHeight: double.infinity,
title: "About MonKeys", child: Column(
message: children: [
"A MonKey is a visual representation of your Banano address.", Row(
); mainAxisAlignment: MainAxisAlignment.spaceBetween,
}); children: [
}, Padding(
child: Row( padding: const EdgeInsets.only(left: 32),
children: [ child: Text(
SvgPicture.asset( "About MonKeys",
Assets.svg.circleQuestion, style: STextStyles.desktopH3(context),
color: Colors.blue[800], ),
), ),
const SizedBox( const DesktopDialogCloseButton(),
width: 6, ],
),
Padding(
padding: const EdgeInsets.only(bottom: 8.0),
child: Text(
"What is MonKey?",
style: STextStyles.desktopTextSmall(context).copyWith(
color: Colors.blue[800],
), ),
), Text(
"A MonKey is a visual representation of your Banano address.",
style:
STextStyles.desktopTextMedium(context).copyWith(
color: Theme.of(context)
.extension<StackColors>()!
.textDark3,
),
),
Row(
mainAxisAlignment: MainAxisAlignment.end,
children: [
Padding(
padding: const EdgeInsets.all(
32,
),
child: PrimaryButton(
width: 272.5,
label: "OK",
onPressed: () {
Navigator.of(context).pop();
},
),
),
],
),
],
), ),
], );
), },
);
},
child: Padding(
padding: const EdgeInsets.symmetric(
vertical: 19,
horizontal: 32,
),
child: Row(
children: [
SvgPicture.asset(
Assets.svg.circleQuestion,
width: 20,
height: 20,
color: Theme.of(context)
.extension<StackColors>()!
.customTextButtonEnabledText,
),
const SizedBox(
width: 8,
),
Text(
"What is MonKey?",
style:
STextStyles.desktopMenuItemSelected(context).copyWith(
color: Theme.of(context)
.extension<StackColors>()!
.customTextButtonEnabledText,
),
)
],
), ),
), ),
), ),

7
lib/pages_desktop_specific/ordinals/desktop_ordinals_view.dart
View file

@ -16,17 +16,12 @@ import 'package:stackwallet/providers/providers.dart';
import 'package:stackwallet/services/mixins/ordinals_interface.dart'; import 'package:stackwallet/services/mixins/ordinals_interface.dart';
import 'package:stackwallet/themes/stack_colors.dart'; import 'package:stackwallet/themes/stack_colors.dart';
import 'package:stackwallet/utilities/assets.dart'; import 'package:stackwallet/utilities/assets.dart';
import 'package:stackwallet/utilities/constants.dart';
import 'package:stackwallet/utilities/show_loading.dart'; import 'package:stackwallet/utilities/show_loading.dart';
import 'package:stackwallet/utilities/text_styles.dart'; import 'package:stackwallet/utilities/text_styles.dart';
import 'package:stackwallet/utilities/util.dart';
import 'package:stackwallet/widgets/custom_buttons/app_bar_icon_button.dart'; import 'package:stackwallet/widgets/custom_buttons/app_bar_icon_button.dart';
import 'package:stackwallet/widgets/desktop/desktop_app_bar.dart'; import 'package:stackwallet/widgets/desktop/desktop_app_bar.dart';
import 'package:stackwallet/widgets/desktop/desktop_scaffold.dart'; import 'package:stackwallet/widgets/desktop/desktop_scaffold.dart';
import 'package:stackwallet/widgets/desktop/secondary_button.dart'; import 'package:stackwallet/widgets/desktop/secondary_button.dart';
import 'package:stackwallet/widgets/icon_widgets/x_icon.dart';
import 'package:stackwallet/widgets/stack_text_field.dart';
import 'package:stackwallet/widgets/textfield_icon_button.dart';
class DesktopOrdinalsView extends ConsumerStatefulWidget { class DesktopOrdinalsView extends ConsumerStatefulWidget {
const DesktopOrdinalsView({ const DesktopOrdinalsView({
@ -102,6 +97,8 @@ class _DesktopOrdinals extends ConsumerState<DesktopOrdinalsView> {
Assets.svg.ordinal, Assets.svg.ordinal,
width: 32, width: 32,
height: 32, height: 32,
color:
Theme.of(context).extension<StackColors>()!.textSubtitle1,
), ),
const SizedBox( const SizedBox(
width: 12, width: 12,