merge conflict clean things

This commit is contained in:
julian 2023-07-26 16:10:27 -06:00
parent bf309d4902
commit 2f5a18b615

View file

@ -241,9 +241,10 @@ class _MonkeyViewState extends ConsumerState<MonkeyView> {
width: 15,
),
SvgPicture.asset(Assets.svg.monkey),
const SizedBox(
width: 12,
),Text(
const SizedBox(
width: 12,
),
Text(
"MonKey",
style: STextStyles.navBarTitle(context),
),
@ -253,8 +254,8 @@ class _MonkeyViewState extends ConsumerState<MonkeyView> {
trailing: Padding(
padding: const EdgeInsets.all(8.0),
child: MouseRegion(
cursor: SystemMouseCursors.click,
child: GestureDetector(
cursor: SystemMouseCursors.click,
child: GestureDetector(
onTap: () {
showDialog<dynamic>(
context: context,
@ -268,28 +269,28 @@ class _MonkeyViewState extends ConsumerState<MonkeyView> {
);
});
},
child: Row(
children: [
SvgPicture.asset(
Assets.svg.circleQuestion,
child: Row(
children: [
SvgPicture.asset(
Assets.svg.circleQuestion,
color: Colors.blue[800],
),
const 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],
),
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,
isCompactHeight: true,
@ -315,7 +316,6 @@ class _MonkeyViewState extends ConsumerState<MonkeyView> {
child: AppBarIconButton(
icon: SvgPicture.asset(
Assets.svg.circleQuestion,
),
onPressed: () {
showDialog<dynamic>(