GitLab/fluffychat
2
0
Fork 0
mirror of https://gitlab.com/famedly/fluffychat.git synced 2025-01-12 02:32:54 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'krille/add-missing-safearea' into 'main'

Browse Source 
fix: Add missing safearea

See merge request ChristianPauly/fluffychat-flutter!256
This commit is contained in:
Christian Pauly 2020-11-07 09:31:08 +00:00
commit 867b05adf1
1 changed files with 437 additions and 427 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
lib/views/chat.dart
View File

@ -577,7 +577,8 @@ class _ChatState extends State<_Chat> {
width: double.infinity,
fit: BoxFit.cover,
),
Column(
SafeArea(
child: Column(
children: <Widget>[
ConnectionStatusHeader(),
Expanded(
@ -648,8 +649,8 @@ class _ChatState extends State<_Chat> {
? Alignment.topRight
: Alignment.topLeft,
child: Container(
padding:
EdgeInsets.symmetric(horizontal: 4),
padding: EdgeInsets.symmetric(
horizontal: 4),
decoration: BoxDecoration(
color: Theme.of(context)
.scaffoldBackgroundColor
@ -662,8 +663,8 @@ class _ChatState extends State<_Chat> {
maxLines: 1,
overflow: TextOverflow.ellipsis,
style: TextStyle(
color:
Theme.of(context).primaryColor,
color: Theme.of(context)
.primaryColor,
),
),
),
@ -723,7 +724,8 @@ class _ChatState extends State<_Chat> {
);
}
},
scrollToEventId: (String eventId) =>
scrollToEventId:
(String eventId) =>
_scrollToEventId(eventId,
context: context),
longPressSelect:
@ -757,7 +759,8 @@ class _ChatState extends State<_Chat> {
}
var emojis = List<String>.from(AppEmojis.emojis);
final allReactionEvents = selectedEvents.first
.aggregatedEvents(timeline, RelationshipTypes.Reaction)
.aggregatedEvents(
timeline, RelationshipTypes.Reaction)
?.where((event) =>
event.senderId == event.room.client.userID &&
event.type == 'm.reaction');
@ -828,7 +831,8 @@ class _ChatState extends State<_Chat> {
color: Theme.of(context).secondaryHeaderColor,
thickness: 1,
),
room.canSendDefaultMessages && room.membership == Membership.join
room.canSendDefaultMessages &&
room.membership == Membership.join
? Container(
decoration: BoxDecoration(
color: Theme.of(context).backgroundColor,
@ -862,7 +866,8 @@ class _ChatState extends State<_Chat> {
onPressed: () => replyAction(),
child: Row(
children: <Widget>[
Text(L10n.of(context).reply),
Text(
L10n.of(context).reply),
Icon(Icons
.keyboard_arrow_right),
],
@ -916,8 +921,8 @@ class _ChatState extends State<_Chat> {
foregroundColor: Colors.white,
child: Icon(Icons.attachment),
),
title:
Text(L10n.of(context).sendFile),
title: Text(
L10n.of(context).sendFile),
contentPadding: EdgeInsets.all(0),
),
),
@ -939,13 +944,15 @@ class _ChatState extends State<_Chat> {
value: 'camera',
child: ListTile(
leading: CircleAvatar(
backgroundColor: Colors.purple,
backgroundColor:
Colors.purple,
foregroundColor: Colors.white,
child: Icon(Icons.camera_alt),
),
title: Text(
L10n.of(context).openCamera),
contentPadding: EdgeInsets.all(0),
title: Text(L10n.of(context)
.openCamera),
contentPadding:
EdgeInsets.all(0),
),
),
if (PlatformInfos.isMobile)
@ -959,7 +966,8 @@ class _ChatState extends State<_Chat> {
),
title: Text(L10n.of(context)
.voiceMessage),
contentPadding: EdgeInsets.all(0),
contentPadding:
EdgeInsets.all(0),
),
),
],
@ -1022,7 +1030,8 @@ class _ChatState extends State<_Chat> {
),
),
),
if (PlatformInfos.isMobile && inputText.isEmpty)
if (PlatformInfos.isMobile &&
inputText.isEmpty)
Container(
height: 56,
alignment: Alignment.center,
@ -1048,6 +1057,7 @@ class _ChatState extends State<_Chat> {
: Container(),
],
),
),
],
),
);