IntenseFinance/simplex-chat
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

updates

Browse Source
This commit is contained in:
Muhammad Hamza 2021-10-15 11:43:25 +05:00
parent 6af87aa69c
commit c464724bc8
3 changed files with 27 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
packages/simplex_app/lib/views/conversation/contact_detail_conversation.dart
View File

@ -12,7 +12,7 @@ class ContactDetailsConversation extends StatelessWidget {
return Scaffold( return Scaffold(
appBar: AppBar( appBar: AppBar(
centerTitle: true, centerTitle: true,
title: Text(contact.name), title: Text(contact.name!),
), ),
body: Padding( body: Padding(
padding: const EdgeInsets.symmetric(horizontal: 20.0, vertical: 12.0), padding: const EdgeInsets.symmetric(horizontal: 20.0, vertical: 12.0),
@ -26,7 +26,7 @@ class ContactDetailsConversation extends StatelessWidget {
), ),
const SizedBox(height: 15.0), const SizedBox(height: 15.0),
const Text('Display Name', style: kMediumHeadingStyle), const Text('Display Name', style: kMediumHeadingStyle),
Text(contact.name), Text(contact.name!),
], ],
), ),
), ),

26
packages/simplex_app/lib/views/conversation/conversation_view.dart
View File

@ -104,7 +104,14 @@ class _ConversationViewState extends State<ConversationView> {
_chatMessages.add(MessageBubble( _chatMessages.add(MessageBubble(
isUser: false, isUser: false,
// ignore: avoid_dynamic_calls // ignore: avoid_dynamic_calls
sender: widget.data.name, sender: widget.data.isGroup
// ignore: avoid_dynamic_calls
? widget.data.members.length == 0
? 'some person'
// ignore: avoid_dynamic_calls
: widget.data.members[0]
// ignore: avoid_dynamic_calls
: widget.data.name,
text: 'Hey there! How is it going?', text: 'Hey there! How is it going?',
)); ));
}); });
@ -137,6 +144,7 @@ class _ConversationViewState extends State<ConversationView> {
child: Row( child: Row(
mainAxisSize: MainAxisSize.min, mainAxisSize: MainAxisSize.min,
children: [ children: [
const SizedBox(width: 10.0),
Expanded( Expanded(
child: SizedBox( child: SizedBox(
height: 45.0, height: 45.0,
@ -155,16 +163,19 @@ class _ConversationViewState extends State<ConversationView> {
hintStyle: Theme.of(context).textTheme.caption, hintStyle: Theme.of(context).textTheme.caption,
fillColor: Colors.grey[200], fillColor: Colors.grey[200],
filled: true, filled: true,
enabledBorder: const OutlineInputBorder( enabledBorder: OutlineInputBorder(
borderSide: BorderSide(color: Colors.transparent), borderRadius: BorderRadius.circular(360),
borderSide:
const BorderSide(color: Colors.transparent),
), ),
focusedBorder: const OutlineInputBorder( focusedBorder: OutlineInputBorder(
borderSide: BorderSide(color: Colors.transparent), borderRadius: BorderRadius.circular(360),
borderSide:
const BorderSide(color: Colors.transparent),
), ),
), ),
), ),
)), )),
const SizedBox(width: 4.0),
IconButton( IconButton(
onPressed: () { onPressed: () {
if (_messageFieldController.text.isNotEmpty) { if (_messageFieldController.text.isNotEmpty) {
@ -185,6 +196,9 @@ class _ConversationViewState extends State<ConversationView> {
], ],
), ),
), ),
SizedBox(
height: MediaQuery.of(context).size.height * 0.02,
)
], ],
), ),
), ),

10
packages/simplex_app/lib/views/conversation/group_detail_conversation.dart
View File

@ -27,7 +27,7 @@ class _GroupDetailsConversationState extends State<GroupDetailsConversation> {
// getting all members of group // getting all members of group
void _getMembers() { void _getMembers() {
setState(() { setState(() {
_members = List.from(widget.group.members); _members = List.from(widget.group.members!);
}); });
} }
@ -64,7 +64,7 @@ class _GroupDetailsConversationState extends State<GroupDetailsConversation> {
return Scaffold( return Scaffold(
appBar: AppBar( appBar: AppBar(
centerTitle: true, centerTitle: true,
title: Text(widget.group.name), title: Text(widget.group.name!),
), ),
body: SingleChildScrollView( body: SingleChildScrollView(
child: Padding( child: Padding(
@ -77,12 +77,12 @@ class _GroupDetailsConversationState extends State<GroupDetailsConversation> {
radius: 70, radius: 70,
backgroundImage: widget.group.photo == '' backgroundImage: widget.group.photo == ''
? const AssetImage('assets/dp.png') as ImageProvider ? const AssetImage('assets/dp.png') as ImageProvider
: FileImage(File(widget.group.photo)), : FileImage(File(widget.group.photo!)),
), ),
), ),
const SizedBox(height: 25.0), const SizedBox(height: 25.0),
const Text('Group Name', style: kMediumHeadingStyle), const Text('Group Name', style: kMediumHeadingStyle),
Text(widget.group.name), Text(widget.group.name!),
const Divider(), const Divider(),
ListTile( ListTile(
leading: const Icon(Icons.person_add), leading: const Icon(Icons.person_add),
@ -137,7 +137,7 @@ class _GroupDetailsConversationState extends State<GroupDetailsConversation> {
leading: const CircleAvatar( leading: const CircleAvatar(
backgroundImage: AssetImage('assets/dp.png'), backgroundImage: AssetImage('assets/dp.png'),
), ),
title: Text(_contactsList[index].name), title: Text(_contactsList[index].name!),
onTap: () { onTap: () {
setState(() { setState(() {
_newMembers.add(_contactsList[index].name); _newMembers.add(_contactsList[index].name);