ember/fluffychat
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

chore: wrap construct notification in safe area (#2328)

Browse source
This commit is contained in:
ggurdin 2025-04-02 16:33:33 -04:00 • committed by GitHub
parent 5831860355
commit 2a7dba6f7f
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 117 additions and 112 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

136
lib/pangea/chat/utils/unlocked_morphs_snackbar.dart
View file

@ -128,81 +128,83 @@ class ConstructNotificationOverlayState
@override
Widget build(BuildContext context) {
return Material(
type: MaterialType.transparency,
child: SizeTransition(
sizeFactor: _animation!,
axisAlignment: -1.0,
child: Container(
padding: const EdgeInsets.symmetric(vertical: 16.0),
decoration: BoxDecoration(
color: Theme.of(context).colorScheme.surface,
border: Border(
bottom: BorderSide(
color: Theme.of(context).colorScheme.onSurface.withAlpha(50),
return SafeArea(
child: Material(
type: MaterialType.transparency,
child: SizeTransition(
sizeFactor: _animation!,
axisAlignment: -1.0,
child: Container(
padding: const EdgeInsets.symmetric(vertical: 16.0),
decoration: BoxDecoration(
color: Theme.of(context).colorScheme.surface,
border: Border(
bottom: BorderSide(
color: Theme.of(context).colorScheme.onSurface.withAlpha(50),
),
),
),
),
child: Row(
children: [
const SizedBox(
width: 50.0,
height: 50.0,
),
Expanded(
child: Wrap(
spacing: 16.0,
alignment: WrapAlignment.center,
crossAxisAlignment: WrapCrossAlignment.center,
children: [
Text(
L10n.of(context).youUnlocked,
style: TextStyle(
fontSize:
FluffyThemes.isColumnMode(context) ? 32.0 : 16.0,
color: Theme.of(context).colorScheme.onSurface,
fontWeight: FontWeight.bold,
child: Row(
children: [
const SizedBox(
width: 50.0,
height: 50.0,
),
Expanded(
child: Wrap(
spacing: 16.0,
alignment: WrapAlignment.center,
crossAxisAlignment: WrapCrossAlignment.center,
children: [
Text(
L10n.of(context).youUnlocked,
style: TextStyle(
fontSize:
FluffyThemes.isColumnMode(context) ? 32.0 : 16.0,
color: Theme.of(context).colorScheme.onSurface,
fontWeight: FontWeight.bold,
),
),
),
Row(
mainAxisSize: MainAxisSize.min,
spacing: 16.0,
children: [
Flexible(
child: Text(
widget.copy ?? widget.construct.lemma,
style: TextStyle(
fontSize: FluffyThemes.isColumnMode(context)
? 32.0
: 16.0,
color: AppConfig.gold,
fontWeight: FontWeight.bold,
Row(
mainAxisSize: MainAxisSize.min,
spacing: 16.0,
children: [
Flexible(
child: Text(
widget.copy ?? widget.construct.lemma,
style: TextStyle(
fontSize: FluffyThemes.isColumnMode(context)
? 32.0
: 16.0,
color: AppConfig.gold,
fontWeight: FontWeight.bold,
),
overflow: TextOverflow.ellipsis,
),
overflow: TextOverflow.ellipsis,
),
),
MorphIcon(
morphFeature: MorphFeaturesEnumExtension.fromString(
widget.construct.category,
MorphIcon(
morphFeature: MorphFeaturesEnumExtension.fromString(
widget.construct.category,
),
morphTag: widget.construct.lemma,
),
morphTag: widget.construct.lemma,
),
],
),
],
),
),
Container(
alignment: Alignment.center,
width: 50.0,
child: IconButton(
icon: const Icon(
Icons.close,
],
),
],
),
onPressed: _close,
),
),
],
Container(
alignment: Alignment.center,
width: 50.0,
child: IconButton(
icon: const Icon(
Icons.close,
),
onPressed: _close,
),
),
],
),
),
),
),

93
lib/pangea/toolbar/widgets/word_zoom/lemma_meaning_widget.dart
View file

@ -153,57 +153,60 @@ class LemmaMeaningWidgetState extends State<LemmaMeaningWidget> {
if (_editMode) {
_controller.text = _lemmaInfo?.meaning ?? "";
return Column(
mainAxisSize: MainAxisSize.min,
children: [
Text(
"${L10n.of(context).pangeaBotIsFallible} ${L10n.of(context).whatIsMeaning(_lemma, widget.constructUse.category)}",
textAlign: TextAlign.center,
style: const TextStyle(fontStyle: FontStyle.italic),
),
const SizedBox(height: 10),
Padding(
padding: const EdgeInsets.symmetric(horizontal: 16.0),
child: TextField(
minLines: 1,
maxLines: 3,
controller: _controller,
decoration: InputDecoration(
hintText: _lemmaInfo?.meaning,
return Material(
type: MaterialType.transparency,
child: Column(
mainAxisSize: MainAxisSize.min,
children: [
Text(
"${L10n.of(context).pangeaBotIsFallible} ${L10n.of(context).whatIsMeaning(_lemma, widget.constructUse.category)}",
textAlign: TextAlign.center,
style: const TextStyle(fontStyle: FontStyle.italic),
),
const SizedBox(height: 10),
Padding(
padding: const EdgeInsets.symmetric(horizontal: 16.0),
child: TextField(
minLines: 1,
maxLines: 3,
controller: _controller,
decoration: InputDecoration(
hintText: _lemmaInfo?.meaning,
),
),
),
),
const SizedBox(height: 10),
Row(
mainAxisAlignment: MainAxisAlignment.center,
children: [
ElevatedButton(
onPressed: () => _toggleEditMode(false),
style: ElevatedButton.styleFrom(
shape: RoundedRectangleBorder(
borderRadius: BorderRadius.circular(10.0),
const SizedBox(height: 10),
Row(
mainAxisAlignment: MainAxisAlignment.center,
children: [
ElevatedButton(
onPressed: () => _toggleEditMode(false),
style: ElevatedButton.styleFrom(
shape: RoundedRectangleBorder(
borderRadius: BorderRadius.circular(10.0),
),
padding: const EdgeInsets.symmetric(horizontal: 10),
),
padding: const EdgeInsets.symmetric(horizontal: 10),
child: Text(L10n.of(context).cancel),
),
child: Text(L10n.of(context).cancel),
),
const SizedBox(width: 10),
ElevatedButton(
onPressed: () => _controller.text != _lemmaInfo?.meaning &&
_controller.text.isNotEmpty
? editLemmaMeaning(_controller.text)
: null,
style: ElevatedButton.styleFrom(
shape: RoundedRectangleBorder(
borderRadius: BorderRadius.circular(10.0),
const SizedBox(width: 10),
ElevatedButton(
onPressed: () => _controller.text != _lemmaInfo?.meaning &&
_controller.text.isNotEmpty
? editLemmaMeaning(_controller.text)
: null,
style: ElevatedButton.styleFrom(
shape: RoundedRectangleBorder(
borderRadius: BorderRadius.circular(10.0),
),
padding: const EdgeInsets.symmetric(horizontal: 10),
),
padding: const EdgeInsets.symmetric(horizontal: 10),
child: Text(L10n.of(context).saveChanges),
),
child: Text(L10n.of(context).saveChanges),
),
],
),
],
],
),
],
),
);
}