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.

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

solving dart analysis issues and adding show more/less #103

Open
wants to merge 8 commits into
base: master
Choose a base branch
from
2 changes: 1 addition & 1 deletion example/android/app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
additional functionality it is fine to subclass or reimplement
FlutterApplication and put your custom class here. -->
<application
android:name="io.flutter.app.FlutterApplication"
android:name="${applicationName}"
android:label="example"
android:icon="@mipmap/ic_launcher">
<activity
Expand Down
23 changes: 23 additions & 0 deletions example/lib/main.dart
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ class _MyAppState extends State<MyApp> {
basicStyle: TextStyle(fontSize: 22, color: Colors.black),
decoratedStyle: TextStyle(fontSize: 22, color: Colors.red),
textAlign: TextAlign.center,
decorateAtSign: true,
onTap: (text) {
print(text);
},
Expand All @@ -36,6 +37,7 @@ class _MyAppState extends State<MyApp> {
basicStyle: TextStyle(fontSize: 15, color: Colors.black),
decoratedStyle: TextStyle(fontSize: 15, color: Colors.blue),
keyboardType: TextInputType.multiline,
decorateAtSign: true,

/// Called when detection (word starts with #, or # and @) is being typed
onDetectionTyped: (text) {
Expand All @@ -48,6 +50,27 @@ class _MyAppState extends State<MyApp> {
},
maxLines: null,
),
SizedBox(
height: 24,
),
HashtagReadMoreText(
'Lorem ipsum dolor sit amet, consectetur adipiscing elit. '
'Morbi nulla nisl, ornare #interdum efficitur sed, luctus '
'sit amet ex. In #condimentum molestie leo, quis placerat '
'diam sodales id. @Aenean semper sagittis elit id dignissim.'
' Cras nec vulputate purus. Mauris vitae lacus sit amet dolor '
'scelerisque malesuada. #Vestibulum nunc arcu, ultricies vel '
'dapibus vel, consectetur in felis. Donec interdum est tempor '
'efficitur lacinia. Nam porttitor ante justo, ut pharetra '
'est convallis quis.',
basicStyle: TextStyle(fontSize: 15, color: Colors.black),
decoratedStyle: TextStyle(fontSize: 15, color: Colors.blue),
decorateAtSign: true,
textAlign: TextAlign.left,
onTap: (text) {
print(text);
},
),
],
),
),
Expand Down
109 changes: 60 additions & 49 deletions example/pubspec.lock
Original file line number Diff line number Diff line change
Expand Up @@ -5,51 +5,50 @@ packages:
dependency: transitive
description:
name: async
url: "https://pub.dartlang.org"
sha256: bfe67ef28df125b7dddcea62755991f807aa39a2492a23e1550161692950bbe0
url: "https://pub.dev"
source: hosted
version: "2.8.2"
version: "2.10.0"
boolean_selector:
dependency: transitive
description:
name: boolean_selector
url: "https://pub.dartlang.org"
sha256: "6cfb5af12253eaf2b368f07bacc5a80d1301a071c73360d746b7f2e32d762c66"
url: "https://pub.dev"
source: hosted
version: "2.1.0"
version: "2.1.1"
characters:
dependency: transitive
description:
name: characters
url: "https://pub.dartlang.org"
source: hosted
version: "1.2.0"
charcode:
dependency: transitive
description:
name: charcode
url: "https://pub.dartlang.org"
sha256: e6a326c8af69605aec75ed6c187d06b349707a27fbff8222ca9cc2cff167975c
url: "https://pub.dev"
source: hosted
version: "1.3.1"
version: "1.2.1"
clock:
dependency: transitive
description:
name: clock
url: "https://pub.dartlang.org"
sha256: cb6d7f03e1de671e34607e909a7213e31d7752be4fb66a86d29fe1eb14bfb5cf
url: "https://pub.dev"
source: hosted
version: "1.1.0"
version: "1.1.1"
collection:
dependency: transitive
description:
name: collection
url: "https://pub.dartlang.org"
sha256: cfc915e6923fe5ce6e153b0723c753045de46de1b4d63771530504004a45fae0
url: "https://pub.dev"
source: hosted
version: "1.15.0"
version: "1.17.0"
fake_async:
dependency: transitive
description:
name: fake_async
url: "https://pub.dartlang.org"
sha256: "511392330127add0b769b75a987850d136345d9227c6b94c96a04cf4a391bf78"
url: "https://pub.dev"
source: hosted
version: "1.2.0"
version: "1.3.1"
flutter:
dependency: "direct main"
description: flutter
Expand All @@ -67,34 +66,46 @@ packages:
relative: true
source: path
version: "2.1.0"
js:
dependency: transitive
description:
name: js
sha256: "5528c2f391ededb7775ec1daa69e65a2d61276f7552de2b5f7b8d34ee9fd4ab7"
url: "https://pub.dev"
source: hosted
version: "0.6.5"
matcher:
dependency: transitive
description:
name: matcher
url: "https://pub.dartlang.org"
sha256: "16db949ceee371e9b99d22f88fa3a73c4e59fd0afed0bd25fc336eb76c198b72"
url: "https://pub.dev"
source: hosted
version: "0.12.11"
version: "0.12.13"
material_color_utilities:
dependency: transitive
description:
name: material_color_utilities
url: "https://pub.dartlang.org"
sha256: d92141dc6fe1dad30722f9aa826c7fbc896d021d792f80678280601aff8cf724
url: "https://pub.dev"
source: hosted
version: "0.1.3"
version: "0.2.0"
meta:
dependency: transitive
description:
name: meta
url: "https://pub.dartlang.org"
sha256: "6c268b42ed578a53088d834796959e4a1814b5e9e164f147f580a386e5decf42"
url: "https://pub.dev"
source: hosted
version: "1.7.0"
version: "1.8.0"
path:
dependency: transitive
description:
name: path
url: "https://pub.dartlang.org"
sha256: db9d4f58c908a4ba5953fcee2ae317c94889433e5024c27ce74a37f94267945b
url: "https://pub.dev"
source: hosted
version: "1.8.0"
version: "1.8.2"
sky_engine:
dependency: transitive
description: flutter
Expand All @@ -104,57 +115,57 @@ packages:
dependency: transitive
description:
name: source_span
url: "https://pub.dartlang.org"
sha256: dd904f795d4b4f3b870833847c461801f6750a9fa8e61ea5ac53f9422b31f250
url: "https://pub.dev"
source: hosted
version: "1.8.1"
version: "1.9.1"
stack_trace:
dependency: transitive
description:
name: stack_trace
url: "https://pub.dartlang.org"
sha256: c3c7d8edb15bee7f0f74debd4b9c5f3c2ea86766fe4178eb2a18eb30a0bdaed5
url: "https://pub.dev"
source: hosted
version: "1.10.0"
version: "1.11.0"
stream_channel:
dependency: transitive
description:
name: stream_channel
url: "https://pub.dartlang.org"
sha256: "83615bee9045c1d322bbbd1ba209b7a749c2cbcdcb3fdd1df8eb488b3279c1c8"
url: "https://pub.dev"
source: hosted
version: "2.1.0"
version: "2.1.1"
string_scanner:
dependency: transitive
description:
name: string_scanner
url: "https://pub.dartlang.org"
sha256: "556692adab6cfa87322a115640c11f13cb77b3f076ddcc5d6ae3c20242bedcde"
url: "https://pub.dev"
source: hosted
version: "1.1.0"
version: "1.2.0"
term_glyph:
dependency: transitive
description:
name: term_glyph
url: "https://pub.dartlang.org"
sha256: a29248a84fbb7c79282b40b8c72a1209db169a2e0542bce341da992fe1bc7e84
url: "https://pub.dev"
source: hosted
version: "1.2.0"
version: "1.2.1"
test_api:
dependency: transitive
description:
name: test_api
url: "https://pub.dartlang.org"
sha256: ad540f65f92caa91bf21dfc8ffb8c589d6e4dc0c2267818b4cc2792857706206
url: "https://pub.dev"
source: hosted
version: "0.4.8"
typed_data:
dependency: transitive
description:
name: typed_data
url: "https://pub.dartlang.org"
source: hosted
version: "1.3.0"
version: "0.4.16"
vector_math:
dependency: transitive
description:
name: vector_math
url: "https://pub.dartlang.org"
sha256: "80b3257d1492ce4d091729e3a67a60407d227c27241d6927be0130c98e741803"
url: "https://pub.dev"
source: hosted
version: "2.1.1"
version: "2.1.4"
sdks:
dart: ">=2.14.0 <3.0.0"
dart: ">=2.18.0 <4.0.0"
2 changes: 1 addition & 1 deletion lib/detector/hashtag_regular_expression.dart
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
const _symbols = '·・ー_';
const _symbols = '·・ー_.';

const _numbers = '0-90-9';

Expand Down
18 changes: 9 additions & 9 deletions lib/functions.dart
Original file line number Diff line number Diff line change
Expand Up @@ -37,20 +37,20 @@ List<String> extractHashTags(String value) {
/// Returns textSpan with decorated tagged text
///
/// Used in [HashTagText]
TextSpan getHashTagTextSpan({
required TextStyle decoratedStyle,
required TextStyle basicStyle,
required String source,
Function(String)? onTap,
bool decorateAtSign = false,
}) {
TextSpan getHashTagTextSpan(
{required TextStyle decoratedStyle,
required TextStyle basicStyle,
required String source,
Function(String)? onTap,
bool decorateAtSign = false,
List<InlineSpan>? children}) {
final decorations = Detector(
decoratedStyle: decoratedStyle,
textStyle: basicStyle,
decorateAtSign: decorateAtSign)
.getDetections(source);
if (decorations.isEmpty) {
return TextSpan(text: source, style: basicStyle);
return TextSpan(text: source, style: basicStyle, children: children);
} else {
decorations.sort();
final span = decorations
Expand All @@ -77,6 +77,6 @@ TextSpan getHashTagTextSpan({
.values
.toList();

return TextSpan(children: span);
return TextSpan(children: [...span, ...(children ?? [])]);
}
}
1 change: 1 addition & 0 deletions lib/hashtagable.dart
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,6 @@ library hashtagable;
export 'detector/detector.dart';
export 'detector/hashtag_regular_expression.dart';
export 'functions.dart';
export 'widgets/hashtag_read_more_text.dart';
export 'widgets/hashtag_text.dart';
export 'widgets/hashtag_text_field.dart';
9 changes: 2 additions & 7 deletions lib/widgets/hashtag_editable_text.dart
Original file line number Diff line number Diff line change
Expand Up @@ -31,12 +31,7 @@ class HashTagEditableText extends EditableText {
bool obscureText = false,
bool readOnly = false,
bool forceLine = true,
ToolbarOptions toolbarOptions = const ToolbarOptions(
copy: true,
cut: true,
paste: true,
selectAll: true,
),
EditableTextContextMenuBuilder? contextMenuBuilder,
bool autocorrect = true,
SmartDashesType? smartDashesType,
SmartQuotesType? smartQuotesType,
Expand Down Expand Up @@ -95,7 +90,7 @@ class HashTagEditableText extends EditableText {
obscureText: obscureText,
readOnly: readOnly,
forceLine: forceLine,
toolbarOptions: toolbarOptions,
contextMenuBuilder: contextMenuBuilder,
autocorrect: autocorrect,
smartDashesType: smartDashesType,
smartQuotesType: smartQuotesType,
Expand Down
Loading