Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add: Hide Trailing on message typing #93

Closed
wants to merge 2 commits into from
Closed

Add: Hide Trailing on message typing #93

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6c1df1f
Added the possibility to hide the leading and trailing on text typing
x3rud Apr 30, 2024
459e49f
Added the possibility to hide the trailing on text typing
x3rud Apr 30, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
50 changes: 41 additions & 9 deletions example/pubspec.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ packages:
path: ".."
relative: true
source: path
version: "0.0.19"
version: "0.0.20"
fake_async:
dependency: transitive
description:
Expand Down Expand Up @@ -207,6 +207,30 @@ packages:
url: "https://pub.dev"
source: hosted
version: "0.18.1"
leak_tracker:
dependency: transitive
description:
name: leak_tracker
sha256: "78eb209deea09858f5269f5a5b02be4049535f568c07b275096836f01ea323fa"
url: "https://pub.dev"
source: hosted
version: "10.0.0"
leak_tracker_flutter_testing:
dependency: transitive
description:
name: leak_tracker_flutter_testing
sha256: b46c5e37c19120a8a01918cfaf293547f47269f7cb4b0058f21531c2465d6ef0
url: "https://pub.dev"
source: hosted
version: "2.0.1"
leak_tracker_testing:
dependency: transitive
description:
name: leak_tracker_testing
sha256: a597f72a664dbd293f3bfc51f9ba69816f84dcd403cdac7066cb3f6003f3ab47
url: "https://pub.dev"
source: hosted
version: "2.0.1"
lints:
dependency: transitive
description:
Expand All @@ -227,26 +251,26 @@ packages:
dependency: transitive
description:
name: matcher
sha256: "1803e76e6653768d64ed8ff2e1e67bea3ad4b923eb5c56a295c3e634bad5960e"
sha256: d2323aa2060500f906aa31a895b4030b6da3ebdcc5619d14ce1aada65cd161cb
url: "https://pub.dev"
source: hosted
version: "0.12.16"
version: "0.12.16+1"
material_color_utilities:
dependency: transitive
description:
name: material_color_utilities
sha256: "9528f2f296073ff54cb9fee677df673ace1218163c3bc7628093e7eed5203d41"
sha256: "0e0a020085b65b6083975e499759762399b4475f766c21668c4ecca34ea74e5a"
url: "https://pub.dev"
source: hosted
version: "0.5.0"
version: "0.8.0"
meta:
dependency: transitive
description:
name: meta
sha256: a6e590c838b18133bb482a2745ad77c5bb7715fb0451209e1a7567d416678b8e
sha256: d584fa6707a52763a52446f02cc621b077888fb63b93bbcb1143a7be5a0c0c04
url: "https://pub.dev"
source: hosted
version: "1.10.0"
version: "1.11.0"
octo_image:
dependency: transitive
description:
Expand All @@ -259,10 +283,10 @@ packages:
dependency: transitive
description:
name: path
sha256: "8829d8a55c13fc0e37127c29fedf290c102f4e40ae94ada574091fe0ff96c917"
sha256: "087ce49c3f0dc39180befefc60fdb4acd8f8620e5682fe2476afd0b3688bb4af"
url: "https://pub.dev"
source: hosted
version: "1.8.3"
version: "1.9.0"
path_provider:
dependency: transitive
description:
Expand Down Expand Up @@ -548,6 +572,14 @@ packages:
url: "https://pub.dev"
source: hosted
version: "2.1.3"
vm_service:
dependency: transitive
description:
name: vm_service
sha256: b3d56ff4341b8f182b96aceb2fa20e3dcb336b9f867bc0eafc0de10f1048e957
url: "https://pub.dev"
source: hosted
version: "13.0.0"
web:
dependency: transitive
description:
Expand Down
8 changes: 6 additions & 2 deletions lib/src/models/input_options.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,8 @@ class InputOptions {
this.inputTextStyle,
this.inputToolbarStyle,
this.inputMaxLines = 5,
this.showTraillingBeforeSend = false,
this.showTrailingBeforeSend = false,
this.hideTrailingOnType = false,
this.inputToolbarPadding = const EdgeInsets.all(8.0),
this.inputToolbarMargin = const EdgeInsets.only(top: 8.0),
this.cursorStyle = const CursorStyle(),
Expand Down Expand Up @@ -94,7 +95,10 @@ class InputOptions {
final int inputMaxLines;

/// If [trailing] should be shown before or after the send button
final bool showTraillingBeforeSend;
final bool showTrailingBeforeSend;

/// Hides the Trailing icon on typing
final bool hideTrailingOnType;

/// Padding of the overall container of the input
final EdgeInsets? inputToolbarPadding;
Expand Down
11 changes: 7 additions & 4 deletions lib/src/widgets/input_toolbar/input_toolbar.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,17 +115,19 @@ class InputToolbarState extends State<InputToolbar>
),
),
if (widget.inputOptions.trailing != null &&
widget.inputOptions.showTraillingBeforeSend)
widget.inputOptions.showTrailingBeforeSend &&
(!widget.inputOptions.hideTrailingOnType || textController.text.isEmpty))
...widget.inputOptions.trailing!,
if (widget.inputOptions.alwaysShowSend ||
textController.text.isNotEmpty)
widget.inputOptions.sendButtonBuilder != null
? widget.inputOptions.sendButtonBuilder!(_sendMessage)
: defaultSendButton(color: Theme.of(context).primaryColor)(
_sendMessage,
),
_sendMessage,
),
if (widget.inputOptions.trailing != null &&
!widget.inputOptions.showTraillingBeforeSend)
!widget.inputOptions.showTrailingBeforeSend &&
(!widget.inputOptions.hideTrailingOnType || textController.text.isEmpty))
...widget.inputOptions.trailing!,
],
),
Expand Down Expand Up @@ -237,4 +239,5 @@ class InputToolbarState extends State<InputToolbar>
}
}
}

}
48 changes: 40 additions & 8 deletions pubspec.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -200,6 +200,30 @@ packages:
url: "https://pub.dev"
source: hosted
version: "0.18.1"
leak_tracker:
dependency: transitive
description:
name: leak_tracker
sha256: "78eb209deea09858f5269f5a5b02be4049535f568c07b275096836f01ea323fa"
url: "https://pub.dev"
source: hosted
version: "10.0.0"
leak_tracker_flutter_testing:
dependency: transitive
description:
name: leak_tracker_flutter_testing
sha256: b46c5e37c19120a8a01918cfaf293547f47269f7cb4b0058f21531c2465d6ef0
url: "https://pub.dev"
source: hosted
version: "2.0.1"
leak_tracker_testing:
dependency: transitive
description:
name: leak_tracker_testing
sha256: a597f72a664dbd293f3bfc51f9ba69816f84dcd403cdac7066cb3f6003f3ab47
url: "https://pub.dev"
source: hosted
version: "2.0.1"
lints:
dependency: transitive
description:
Expand All @@ -220,26 +244,26 @@ packages:
dependency: transitive
description:
name: matcher
sha256: "1803e76e6653768d64ed8ff2e1e67bea3ad4b923eb5c56a295c3e634bad5960e"
sha256: d2323aa2060500f906aa31a895b4030b6da3ebdcc5619d14ce1aada65cd161cb
url: "https://pub.dev"
source: hosted
version: "0.12.16"
version: "0.12.16+1"
material_color_utilities:
dependency: transitive
description:
name: material_color_utilities
sha256: "9528f2f296073ff54cb9fee677df673ace1218163c3bc7628093e7eed5203d41"
sha256: "0e0a020085b65b6083975e499759762399b4475f766c21668c4ecca34ea74e5a"
url: "https://pub.dev"
source: hosted
version: "0.5.0"
version: "0.8.0"
meta:
dependency: transitive
description:
name: meta
sha256: a6e590c838b18133bb482a2745ad77c5bb7715fb0451209e1a7567d416678b8e
sha256: d584fa6707a52763a52446f02cc621b077888fb63b93bbcb1143a7be5a0c0c04
url: "https://pub.dev"
source: hosted
version: "1.10.0"
version: "1.11.0"
octo_image:
dependency: transitive
description:
Expand All @@ -252,10 +276,10 @@ packages:
dependency: transitive
description:
name: path
sha256: "8829d8a55c13fc0e37127c29fedf290c102f4e40ae94ada574091fe0ff96c917"
sha256: "087ce49c3f0dc39180befefc60fdb4acd8f8620e5682fe2476afd0b3688bb4af"
url: "https://pub.dev"
source: hosted
version: "1.8.3"
version: "1.9.0"
path_provider:
dependency: transitive
description:
Expand Down Expand Up @@ -541,6 +565,14 @@ packages:
url: "https://pub.dev"
source: hosted
version: "2.1.3"
vm_service:
dependency: transitive
description:
name: vm_service
sha256: b3d56ff4341b8f182b96aceb2fa20e3dcb336b9f867bc0eafc0de10f1048e957
url: "https://pub.dev"
source: hosted
version: "13.0.0"
web:
dependency: transitive
description:
Expand Down