Message Boxes

lib/opaque.dart

@@ -1391,6 +1391,7 @@ ThemeData mkThemeData(Settings opaque) {
         caption: TextStyle(color: opaque.current().mainTextColor()),
         button: TextStyle(color: opaque.current().mainTextColor()),
         overline: TextStyle(color: opaque.current().mainTextColor())),
-    textSelectionTheme: TextSelectionThemeData(cursorColor: opaque.current().defaultButtonActiveColor()),
+    textSelectionTheme: TextSelectionThemeData(
+        cursorColor: opaque.current().defaultButtonActiveColor(), selectionColor: opaque.current().defaultButtonActiveColor(), selectionHandleColor: opaque.current().defaultButtonActiveColor()),
   );
 }

lib/views/messageview.dart

@@ -1,5 +1,6 @@
 import 'dart:convert';
 
+import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 import 'package:cwtch/views/peersettingsview.dart';
 import 'package:cwtch/widgets/DropdownContacts.dart';
@@ -114,37 +115,34 @@ class _MessageViewState extends State<MessageView> {
   Widget _buildComposeBox() {
     return Container(
       color: Provider.of<Settings>(context).theme.backgroundMainColor(),
+      padding: EdgeInsets.all(2),
+      margin: EdgeInsets.all(2),
       height: 100,
-      padding: EdgeInsets.all(8.0),
       child: Row(
         children: <Widget>[
           Expanded(
-              child: TextField(
-            key: Key('txtCompose'),
-            controller: ctrlrCompose,
-            focusNode: focusNode,
-            textInputAction: TextInputAction.send,
-            onSubmitted: _sendMessage,
-          )),
-          Column(children: [
-            SizedBox(
-                width: 100,
-                height: 50,
-                child: Padding(
-                    padding: EdgeInsets.fromLTRB(2, 2, 2, 2),
-                    child: ElevatedButton(
-                      child: Icon(Icons.send, size: 24, color: Provider.of<Settings>(context).theme.mainTextColor()),
-                      style: ButtonStyle(
-                        fixedSize: MaterialStateProperty.all(Size(86, 50)),
-                        backgroundColor: MaterialStateProperty.all(Provider.of<Settings>(context).theme.defaultButtonColor()),
+            child: Container(
+                decoration: BoxDecoration(border: Border(top: BorderSide(color: Provider.of<Settings>(context).theme.defaultButtonActiveColor()))),
+                child: TextFormField(
+                    key: Key('txtCompose'),
+                    controller: ctrlrCompose,
+                    focusNode: focusNode,
+                    textInputAction: TextInputAction.send,
+                    decoration: InputDecoration(
+                      enabledBorder: InputBorder.none,
+                      focusedBorder: InputBorder.none,
+                      enabled: true,
+                      prefixIcon: IconButton(
+                          icon: Icon(Icons.insert_invitation, size: 24, color: Provider.of<Settings>(context).theme.mainTextColor()),
+                          tooltip: "Send a contact or group invite",
+                          onPressed: () => _modalSendInvitation(context)),
+                      suffixIcon: IconButton(
+                        icon: Icon(Icons.send, size: 24, color: Provider.of<Settings>(context).theme.mainTextColor()),
+                        tooltip: "Send Message",
+                        onPressed: _sendMessage,
                       ),
-                      onPressed: _sendMessage,
                     ))),
-            SizedBox(
-                width: 86,
-                height: 40,
-                child: IconButton(icon: Icon(Icons.insert_invitation, size: 12, color: Provider.of<Settings>(context).theme.mainTextColor()), onPressed: () => _modalSendInvitation(context))),
-          ])
+          ),
         ],
       ),
     );

lib/widgets/messagelist.dart

@@ -15,7 +15,7 @@ class _MessageListState extends State<MessageList> {
 
   @override
   Widget build(BuildContext outerContext) {
-    return Card(
+    return Container(
         child: Scrollbar(
             isAlwaysShown: true,
             controller: ctrlr1,