ThatOneJackalGuy/OpenContacts
1
0
Fork 0
Code Issues 3 Pull requests Projects 1 Releases 2 Packages Wiki Activity Actions

Improve design of attachment buttons

Browse source
This commit is contained in:
Nutcake 2023-05-21 18:43:01 +02:00
parent 2987603b7a
commit 358e8490bc
2 changed files with 129 additions and 141 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

72
lib/widgets/messages/message_attachment_list.dart
View file

@ -21,6 +21,7 @@ class _MessageAttachmentListState extends State<MessageAttachmentList> {
final List<(FileType, File)> _loadedFiles = []; final List<(FileType, File)> _loadedFiles = [];
final ScrollController _scrollController = ScrollController(); final ScrollController _scrollController = ScrollController();
bool _showShadow = true; bool _showShadow = true;
bool _popupIsOpen = false;
@override @override
void initState() { void initState() {
@ -121,22 +122,20 @@ class _MessageAttachmentListState extends State<MessageAttachmentList> {
), ),
), ),
), ),
PopupMenuButton<DocumentType>( AnimatedSwitcher(
offset: const Offset(0, -64), duration: const Duration(milliseconds: 200),
constraints: const BoxConstraints.tightFor(width: 48 * 3, height: 64), switchInCurve: Curves.decelerate,
shadowColor: Colors.transparent, transitionBuilder: (child, animation) => FadeTransition(
position: PopupMenuPosition.over, opacity: animation,
color: Colors.transparent, child: SizeTransition(
enableFeedback: true, sizeFactor: animation,
padding: EdgeInsets.zero, axis: Axis.horizontal,
surfaceTintColor: Colors.transparent, //position: Tween<Offset>(begin: const Offset(1, 0), end: const Offset(0, 0)).animate(animation),
iconSize: 24, child: child,
itemBuilder: (context) => ),
[ ),
PopupMenuItem( child: _popupIsOpen ? Row(
padding: EdgeInsets.zero, key: const ValueKey("popup-buttons"),
child: Row(
mainAxisAlignment: MainAxisAlignment.end,
children: [ children: [
IconButton( IconButton(
iconSize: 24, iconSize: 24,
@ -167,9 +166,7 @@ class _MessageAttachmentListState extends State<MessageAttachmentList> {
.whereNotNull()); .whereNotNull());
}); });
} }
if (context.mounted) {
Navigator.of(context).pop();
}
}, },
icon: const Icon(Icons.image,), icon: const Icon(Icons.image,),
), ),
@ -200,9 +197,6 @@ class _MessageAttachmentListState extends State<MessageAttachmentList> {
_loadedFiles.add((FileType.image, picture)); _loadedFiles.add((FileType.image, picture));
await widget.onChange(_loadedFiles); await widget.onChange(_loadedFiles);
} }
if (context.mounted) {
Navigator.of(context).pop();
}
}, },
icon: const Icon(Icons.camera,), icon: const Icon(Icons.camera,),
), ),
@ -235,32 +229,24 @@ class _MessageAttachmentListState extends State<MessageAttachmentList> {
.whereNotNull()); .whereNotNull());
}); });
} }
if (context.mounted) {
Navigator.of(context).pop();
}
}, },
icon: const Icon(Icons.file_present_rounded,), icon: const Icon(Icons.file_present_rounded,),
), ),
], ],
) : const SizedBox.shrink(),
), ),
), Container(
], color: Theme.of(context).colorScheme.surface,
icon: Container( child: IconButton(onPressed: () {
decoration: BoxDecoration( setState(() {
borderRadius: BorderRadius.circular(64), _popupIsOpen = !_popupIsOpen;
border: Border.all( });
color: Theme }, icon: AnimatedRotation(
.of(context) duration: const Duration(milliseconds: 200),
.colorScheme turns: _popupIsOpen ? 3/8 : 0,
.primary, child: const Icon(Icons.add),
), )),
), )
child: Icon(
Icons.add,
color: Theme.of(context).colorScheme.onSurface,
),
),
),
], ],
); );
} }

10
lib/widgets/messages/message_input_bar.dart
View file

@ -270,7 +270,7 @@ class _MessageInputBarState extends State<MessageInputBar> {
}); });
} }
}, },
icon: const Icon(Icons.camera_alt), icon: const Icon(Icons.camera),
label: const Text("Camera"), label: const Text("Camera"),
), ),
TextButton.icon( TextButton.icon(
@ -393,11 +393,13 @@ class _MessageInputBarState extends State<MessageInputBar> {
hintText: _isRecording ? "" : "Message ${widget.recipient hintText: _isRecording ? "" : "Message ${widget.recipient
.username}...", .username}...",
hintMaxLines: 1, hintMaxLines: 1,
contentPadding: const EdgeInsets.symmetric(horizontal: 16, vertical: 12), contentPadding: const EdgeInsets.symmetric(horizontal: 16, vertical: 12),
fillColor: Colors.black38,
filled: true,
border: OutlineInputBorder( border: OutlineInputBorder(
borderRadius: BorderRadius.circular(24) borderSide: BorderSide.none,
), borderRadius: BorderRadius.circular(24),
)
), ),
), ),
AnimatedSwitcher( AnimatedSwitcher(