diff --git a/.idea/libraries/Dart_Packages.xml b/.idea/libraries/Dart_Packages.xml
index 9d9042e..555e605 100644
--- a/.idea/libraries/Dart_Packages.xml
+++ b/.idea/libraries/Dart_Packages.xml
@@ -5,798 +5,798 @@
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/.idea/libraries/Dart_SDK.xml b/.idea/libraries/Dart_SDK.xml
index 008f0f6..6ae284f 100644
--- a/.idea/libraries/Dart_SDK.xml
+++ b/.idea/libraries/Dart_SDK.xml
@@ -1,25 +1,25 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/Sources/dafl_project_flutter/lib/views/pages/main/p_conversation.dart b/Sources/dafl_project_flutter/lib/views/pages/main/p_conversation.dart
index 66b487e..adcf1e6 100644
--- a/Sources/dafl_project_flutter/lib/views/pages/main/p_conversation.dart
+++ b/Sources/dafl_project_flutter/lib/views/pages/main/p_conversation.dart
@@ -19,6 +19,7 @@ class _ConversationPageState extends State {
bool isNull = true;
final String receiver;
+
_ConversationPageState(this.receiver);
final messageTextField = TextEditingController();
@@ -124,7 +125,8 @@ class _ConversationPageState extends State {
ScrollController listScrollController = ScrollController();
return Scaffold(
- extendBodyBehindAppBar: true,
+ extendBodyBehindAppBar: false,
+ extendBody: false,
resizeToAvoidBottomInset: true,
appBar: AppBar(
elevation: 20,
@@ -173,9 +175,10 @@ class _ConversationPageState extends State {
),
),
body: SingleChildScrollView(
+ physics: const ScrollPhysics(),
child: Container(
color: const Color(0xFF141414),
- height: height * 0.92,
+ height: height * 0.85,
width: double.infinity,
child: Flexible(
child: StreamBuilder>(
@@ -187,10 +190,11 @@ class _ConversationPageState extends State {
snapshot.data ?? List.from([]);
return ListView.builder(
padding: EdgeInsets.all(10.0),
+ itemCount: listMessage.length,
itemBuilder: (context, index) =>
messageWidget(listMessage[index]),
- itemCount: listMessage.length,
- reverse: true,
+
+ reverse: false,
controller: listScrollController,
);
} else {
@@ -208,7 +212,7 @@ class _ConversationPageState extends State {
Container(
height: height * 0.08,
color: Colors.transparent,
- width: width * 0.9,
+ width: width * 0.8,
child: Container(
margin: const EdgeInsets.fromLTRB(10, 10, 10, 10),
decoration: BoxDecoration(