Merge remote-tracking branch 'origin_SW/add-monkey' into add-monkey

# Conflicts:
#	lib/pages/monkey/monkey_view.dart
This commit is contained in:
julian 2023-07-26 16:09:10 -06:00
commit bf309d4902

View file

@ -240,18 +240,22 @@ class _MonkeyViewState extends ConsumerState<MonkeyView> {
const SizedBox( const SizedBox(
width: 15, width: 15,
), ),
Text( SvgPicture.asset(Assets.svg.monkey),
const SizedBox(
width: 12,
),Text(
"MonKey", "MonKey",
style: STextStyles.navBarTitle(context), style: STextStyles.navBarTitle(context),
), ),
], ],
), ),
), ),
trailing: AspectRatio( trailing: Padding(
aspectRatio: 1, padding: const EdgeInsets.all(8.0),
child: AppBarIconButton( child: MouseRegion(
icon: SvgPicture.asset(Assets.svg.circleQuestion), cursor: SystemMouseCursors.click,
onPressed: () { child: GestureDetector(
onTap: () {
showDialog<dynamic>( showDialog<dynamic>(
context: context, context: context,
useSafeArea: false, useSafeArea: false,
@ -263,7 +267,29 @@ class _MonkeyViewState extends ConsumerState<MonkeyView> {
"A MonKey is a visual representation of your Banano address.", "A MonKey is a visual representation of your Banano address.",
); );
}); });
}), },
child: Row(
children: [
SvgPicture.asset(
Assets.svg.circleQuestion,
color: Colors.blue[800],
),
SizedBox(
width: 6,
),
Padding(
padding: const EdgeInsets.only(bottom: 8.0),
child: Text(
"What is MonKey?",
style: STextStyles.desktopTextSmall(context)
.copyWith(
color: Colors.blue[800],
),
),
),
],
),
),),
), ),
useSpacers: false, useSpacers: false,
isCompactHeight: true, isCompactHeight: true,
@ -289,9 +315,7 @@ class _MonkeyViewState extends ConsumerState<MonkeyView> {
child: AppBarIconButton( child: AppBarIconButton(
icon: SvgPicture.asset( icon: SvgPicture.asset(
Assets.svg.circleQuestion, Assets.svg.circleQuestion,
color: Theme.of(context)
.extension<StackColors>()!
.infoItemText,
), ),
onPressed: () { onPressed: () {
showDialog<dynamic>( showDialog<dynamic>(