MarianumMobile/Client
MarianumMobile/Client
5
1
Fork 0
Code Issues 34 Pull Requests Actions Packages Projects 1 Releases Wiki Activity

Fixed chatTextfield automatically expanding on multiline texts

Browse Source
This commit is contained in:
Elias Müller 2023-06-30 20:48:28 +02:00
parent 68ff20d0bb
commit 2c22147468
2 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
android/.idea/workspace.xml generated
View File

@ -4,7 +4,7 @@
<option name="autoReloadType" value="NONE" /> <option name="autoReloadType" value="NONE" />
</component> </component>
<component name="ChangeListManager"> <component name="ChangeListManager">
<list default="true" id="c83f8716-5b8f-42e3-8a0a-310c6aa6c284" name="Changes" comment=""> <list default="true" id="72986f2a-533c-4295-b134-94f1bb859c39" name="Changes" comment="">
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" /> <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
</list> </list>
<option name="SHOW_DIALOG" value="false" /> <option name="SHOW_DIALOG" value="false" />
@ -12,7 +12,7 @@
<option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" /> <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
<option name="LAST_RESOLUTION" value="IGNORE" /> <option name="LAST_RESOLUTION" value="IGNORE" />
</component> </component>
<component name="ExecutionTargetManager" SELECTED_TARGET="device_and_snapshot_combo_box_target[5200de3d4dd02295]" /> <component name="ExecutionTargetManager" SELECTED_TARGET="device_and_snapshot_combo_box_target[/home/elias/.android/avd/Nexus_10_API_30.avd]" />
<component name="ExternalProjectsData"> <component name="ExternalProjectsData">
<projectState path="$PROJECT_DIR$"> <projectState path="$PROJECT_DIR$">
<ProjectState /> <ProjectState />
@ -26,7 +26,7 @@
<component name="Git.Settings"> <component name="Git.Settings">
<option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$/.." /> <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$/.." />
</component> </component>
<component name="ProjectId" id="2RNyiLkzi5z5myPBTZFLmKM2DUY" /> <component name="ProjectId" id="2RhzDGWkhmK59xhfQCT6WWEHAem" />
<component name="ProjectLevelVcsManager" settingsEditedManually="true" /> <component name="ProjectLevelVcsManager" settingsEditedManually="true" />
<component name="ProjectViewState"> <component name="ProjectViewState">
<option name="hideEmptyMiddlePackages" value="true" /> <option name="hideEmptyMiddlePackages" value="true" />
@ -113,11 +113,11 @@
<component name="SpellCheckerSettings" RuntimeDictionaries="0" Folders="0" CustomDictionaries="0" DefaultDictionary="application-level" UseSingleDictionary="true" transferred="true" /> <component name="SpellCheckerSettings" RuntimeDictionaries="0" Folders="0" CustomDictionaries="0" DefaultDictionary="application-level" UseSingleDictionary="true" transferred="true" />
<component name="TaskManager"> <component name="TaskManager">
<task active="true" id="Default" summary="Default task"> <task active="true" id="Default" summary="Default task">
<changelist id="c83f8716-5b8f-42e3-8a0a-310c6aa6c284" name="Changes" comment="" /> <changelist id="72986f2a-533c-4295-b134-94f1bb859c39" name="Changes" comment="" />
<created>1687104959743</created> <created>1687716979568</created>
<option name="number" value="Default" /> <option name="number" value="Default" />
<option name="presentableId" value="Default" /> <option name="presentableId" value="Default" />
<updated>1687104959743</updated> <updated>1687716979568</updated>
</task> </task>
<servers /> <servers />
</component> </component>

10
lib/view/pages/talk/chatTextfield.dart
View File

@ -49,8 +49,6 @@ class _ChatTextfieldState extends State<ChatTextfield> {
shareType: 10, shareType: 10,
shareWith: widget.sendToToken, shareWith: widget.sendToToken,
path: "$shareFolder/$filename", path: "$shareFolder/$filename",
//referenceId: "eae2d4497f0e1ffa1c71e6d86f7a59a43fd49198e799cc08a8a0fa8205b99969",
//talkMetaData: "{\"messageType\":\"\"}"
)).then((value) => _query()); )).then((value) => _query());
}, },
), barrierDismissible: false); ), barrierDismissible: false);
@ -63,8 +61,7 @@ class _ChatTextfieldState extends State<ChatTextfield> {
Align( Align(
alignment: Alignment.bottomLeft, alignment: Alignment.bottomLeft,
child: Container( child: Container(
padding: const EdgeInsets.only(left: 10, bottom: 10, top: 10), padding: const EdgeInsets.only(left: 10, bottom: 1, top: 1, right: 10),
height: 60,
width: double.infinity, width: double.infinity,
color: Theme.of(context).colorScheme.secondary, color: Theme.of(context).colorScheme.secondary,
child: Row( child: Row(
@ -117,7 +114,8 @@ class _ChatTextfieldState extends State<ChatTextfield> {
child: TextField( child: TextField(
controller: _textBoxController, controller: _textBoxController,
readOnly: sending, readOnly: sending,
maxLines: 10, maxLines: 7,
minLines: 1,
decoration: InputDecoration( decoration: InputDecoration(
hintText: "Nachricht schreiben...", hintText: "Nachricht schreiben...",
hintStyle: TextStyle(color: Theme.of(context).colorScheme.onSecondary), hintStyle: TextStyle(color: Theme.of(context).colorScheme.onSecondary),
@ -127,6 +125,7 @@ class _ChatTextfieldState extends State<ChatTextfield> {
), ),
const SizedBox(width: 15), const SizedBox(width: 15),
FloatingActionButton( FloatingActionButton(
mini: true,
onPressed: (){ onPressed: (){
if(_textBoxController.text.isEmpty) return; if(_textBoxController.text.isEmpty) return;
setState(() { setState(() {
@ -145,7 +144,6 @@ class _ChatTextfieldState extends State<ChatTextfield> {
child: const Icon(Icons.send, color: Colors.white, size: 18), child: const Icon(Icons.send, color: Colors.white, size: 18),
), ),
], ],
), ),
), ),
), ),