2ndbeam/fluffychat-fork
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

refactor: Migrate to flutter 2

Browse source
This commit is contained in:
Christian Pauly 2021-03-04 12:28:06 +01:00
commit b0ada828aa
39 changed files with 257 additions and 315 deletions
Download patch file Download diff file Expand all files Collapse all files

26
lib/views/chat.dart
View file

@ -636,24 +636,24 @@ class _ChatState extends State<Chat> {
},
itemBuilder: (_) => [
PopupMenuItem(
child: Text(L10n.of(context).copy),
value: 'copy',
child: Text(L10n.of(context).copy),
),
if (canRedactSelectedEvents)
PopupMenuItem(
value: 'redact',
child: Text(
L10n.of(context).redactMessage,
style: TextStyle(color: Colors.orange),
),
value: 'redact',
),
if (selectedEvents.length == 1)
PopupMenuItem(
value: 'report',
child: Text(
L10n.of(context).reportMessage,
style: TextStyle(color: Colors.red),
),
value: 'report',
),
],
),
@ -672,12 +672,12 @@ class _ChatState extends State<Chat> {
? Padding(
padding: const EdgeInsets.only(bottom: 56.0),
child: FloatingActionButton(
child: Icon(Icons.arrow_downward_outlined,
color: Theme.of(context).primaryColor),
onPressed: () => _scrollController.jumpTo(0),
foregroundColor: Theme.of(context).textTheme.bodyText2.color,
backgroundColor: Theme.of(context).scaffoldBackgroundColor,
mini: true,
child: Icon(Icons.arrow_downward_outlined,
color: Theme.of(context).primaryColor),
),
)
: null,
@ -756,6 +756,7 @@ class _ChatState extends State<Chat> {
)
: _canLoadMore
? TextButton(
onPressed: requestHistory,
child: Text(
L10n.of(context).loadMore,
style: TextStyle(
@ -766,7 +767,6 @@ class _ChatState extends State<Chat> {
TextDecoration.underline,
),
),
onPressed: requestHistory,
)
: Container()
: i == 0
@ -790,6 +790,11 @@ class _ChatState extends State<Chat> {
client.userID
? Alignment.topRight
: Alignment.topLeft,
padding: EdgeInsets.only(
left: 8,
right: 8,
bottom: 8,
),
child: Container(
padding: EdgeInsets.symmetric(
horizontal: 4),
@ -810,11 +815,6 @@ class _ChatState extends State<Chat> {
),
),
),
padding: EdgeInsets.only(
left: 8,
right: 8,
bottom: 8,
),
);
},
)
@ -942,14 +942,14 @@ class _ChatState extends State<Chat> {
itemBuilder: (c, i) => i == emojis.length
? InkWell(
borderRadius: BorderRadius.circular(8),
onTap: () => _pickEmojiAction(
context, allReactionEvents),
child: Container(
width: 56,
height: 56,
alignment: Alignment.center,
child: Icon(Icons.add_outlined),
),
onTap: () => _pickEmojiAction(
context, allReactionEvents),
)
: InkWell(
borderRadius: BorderRadius.circular(8),