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

Jump to bottom

Support flutter 3.22 #4

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open

Support flutter 3.22 #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a0987ec
support padding as well
hatemragab May 1, 2021
c53e039
Support flutter 3.22
hatemragab May 31, 2024
5390ab6
Support flutter 3.22
hatemragab May 31, 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
139 changes: 91 additions & 48 deletions example/pubspec.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,58 +5,58 @@ packages:
dependency: transitive
description:
name: async
url: "https://pub.dartlang.org"
sha256: "947bfcf187f74dbc5e146c9eb9c0f10c9f8b30743e341481c1e2ed3ecc18c20c"
url: "https://pub.dev"
source: hosted
version: "2.5.0"
version: "2.11.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"
sha256: "04a925763edad70e8443c99234dc3328f442e811f1d8fd1a72f1c8ad0f69a605"
url: "https://pub.dev"
source: hosted
version: "1.1.0"
charcode:
dependency: transitive
description:
name: charcode
url: "https://pub.dartlang.org"
source: hosted
version: "1.2.0"
version: "1.3.0"
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: ee67cb0715911d28db6bf4af1026078bd6f0128b07a5f66fb2ed94ec6783c09a
url: "https://pub.dev"
source: hosted
version: "1.15.0"
version: "1.18.0"
cupertino_icons:
dependency: "direct main"
description:
name: cupertino_icons
url: "https://pub.dartlang.org"
sha256: caac504f942f41dfadcf45229ce8c47065b93919a12739f20d6173a883c5ec73
url: "https://pub.dev"
source: hosted
version: "1.0.2"
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,27 +67,62 @@ packages:
description: flutter
source: sdk
version: "0.0.0"
leak_tracker:
dependency: transitive
description:
name: leak_tracker
sha256: "7f0df31977cb2c0b88585095d168e689669a2cc9b97c309665e3386f3e9d341a"
url: "https://pub.dev"
source: hosted
version: "10.0.4"
leak_tracker_flutter_testing:
dependency: transitive
description:
name: leak_tracker_flutter_testing
sha256: "06e98f569d004c1315b991ded39924b21af84cf14cc94791b8aea337d25b57f8"
url: "https://pub.dev"
source: hosted
version: "3.0.3"
leak_tracker_testing:
dependency: transitive
description:
name: leak_tracker_testing
sha256: "6ba465d5d76e67ddf503e1161d1f4a6bc42306f9d66ca1e8f079a47290fb06d3"
url: "https://pub.dev"
source: hosted
version: "3.0.1"
matcher:
dependency: transitive
description:
name: matcher
url: "https://pub.dartlang.org"
sha256: d2323aa2060500f906aa31a895b4030b6da3ebdcc5619d14ce1aada65cd161cb
url: "https://pub.dev"
source: hosted
version: "0.12.16+1"
material_color_utilities:
dependency: transitive
description:
name: material_color_utilities
sha256: "0e0a020085b65b6083975e499759762399b4475f766c21668c4ecca34ea74e5a"
url: "https://pub.dev"
source: hosted
version: "0.12.10"
version: "0.8.0"
meta:
dependency: transitive
description:
name: meta
url: "https://pub.dartlang.org"
sha256: "7687075e408b093f36e6bbf6c91878cc0d4cd10f409506f7bc996f68220b9136"
url: "https://pub.dev"
source: hosted
version: "1.3.0"
version: "1.12.0"
path:
dependency: transitive
description:
name: path
url: "https://pub.dartlang.org"
sha256: "087ce49c3f0dc39180befefc60fdb4acd8f8620e5682fe2476afd0b3688bb4af"
url: "https://pub.dev"
source: hosted
version: "1.8.0"
version: "1.9.0"
sky_engine:
dependency: transitive
description: flutter
Expand All @@ -97,65 +132,73 @@ packages:
dependency: transitive
description:
name: source_span
url: "https://pub.dartlang.org"
sha256: "53e943d4206a5e30df338fd4c6e7a077e02254531b138a15aec3bd143c1a8b3c"
url: "https://pub.dev"
source: hosted
version: "1.8.0"
version: "1.10.0"
stack_trace:
dependency: transitive
description:
name: stack_trace
url: "https://pub.dartlang.org"
sha256: "73713990125a6d93122541237550ee3352a2d84baad52d375a4cad2eb9b7ce0b"
url: "https://pub.dev"
source: hosted
version: "1.10.0"
version: "1.11.1"
stream_channel:
dependency: transitive
description:
name: stream_channel
url: "https://pub.dartlang.org"
sha256: ba2aa5d8cc609d96bbb2899c28934f9e1af5cddbd60a827822ea467161eb54e7
url: "https://pub.dev"
source: hosted
version: "2.1.0"
version: "2.1.2"
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: "9955ae474176f7ac8ee4e989dadfb411a58c30415bcfb648fa04b2b8a03afa7f"
url: "https://pub.dev"
source: hosted
version: "0.2.19"
version: "0.7.0"
textless:
dependency: "direct main"
description:
path: ".."
relative: true
source: path
version: "6.6.6"
typed_data:
vector_math:
dependency: transitive
description:
name: typed_data
url: "https://pub.dartlang.org"
name: vector_math
sha256: "80b3257d1492ce4d091729e3a67a60407d227c27241d6927be0130c98e741803"
url: "https://pub.dev"
source: hosted
version: "1.3.0"
vector_math:
version: "2.1.4"
vm_service:
dependency: transitive
description:
name: vector_math
url: "https://pub.dartlang.org"
name: vm_service
sha256: "3923c89304b715fb1eb6423f017651664a03bf5f4b29983627c4da791f74a4ec"
url: "https://pub.dev"
source: hosted
version: "2.1.0"
version: "14.2.1"
sdks:
dart: ">=2.12.0 <3.0.0"
flutter: ">=1.17.0"
dart: ">=3.3.0 <4.0.0"
flutter: ">=3.18.0-18.0.pre.54"
38 changes: 22 additions & 16 deletions lib/textless.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
library textless;

import 'dart:ui';
import 'package:flutter/material.dart';
import 'package:flutter/cupertino.dart';

class ThemedText extends StatelessWidget {
const ThemedText({
Expand All @@ -24,7 +22,7 @@ class ThemedText extends StatelessWidget {
maxLines: extra?["maxLine"],
softWrap: extra?["softWrap"],
textAlign: extra?["textAlign"],
textScaleFactor: extra?["textScaleFactor"]);
textScaler: extra?["textScaleFactor"]);
}

ThemedText textless<T>(T v) =>
Expand Down Expand Up @@ -109,23 +107,31 @@ class ThemedText extends StatelessWidget {
ThemedText get alignEnd => textless({"textAlign": TextAlign.end});
}

extension PaddingOnNumb on num {
EdgeInsetsGeometry get pl => EdgeInsets.only(left: toDouble());
EdgeInsetsGeometry get pr => EdgeInsets.only(right: toDouble());
EdgeInsetsGeometry get pt => EdgeInsets.only(top: toDouble());
EdgeInsetsGeometry get pb => EdgeInsets.only(bottom: toDouble());
EdgeInsetsGeometry get p => EdgeInsets.all( toDouble());
}

extension ThemedTextStyle on ThemedText {}

extension TextLess on String {
ThemedText style(TextStyle style) =>
ThemedText(data: this, style: (t) => style);
ThemedText get text => ThemedText(data: this, style: (t) => TextStyle());
ThemedText get h1 => ThemedText(data: this, style: (t) => t.headline1!);
ThemedText get h2 => ThemedText(data: this, style: (t) => t.headline2!);
ThemedText get h3 => ThemedText(data: this, style: (t) => t.headline3!);
ThemedText get h4 => ThemedText(data: this, style: (t) => t.headline4!);
ThemedText get h5 => ThemedText(data: this, style: (t) => t.headline5!);
ThemedText get h6 => ThemedText(data: this, style: (t) => t.headline6!);
ThemedText get s1 => ThemedText(data: this, style: (t) => t.subtitle1!);
ThemedText get s2 => ThemedText(data: this, style: (t) => t.subtitle2!);
ThemedText get b1 => ThemedText(data: this, style: (t) => t.bodyText1!);
ThemedText get b2 => ThemedText(data: this, style: (t) => t.bodyText2!);
ThemedText get btn => ThemedText(data: this, style: (t) => t.button!);
ThemedText get cap => ThemedText(data: this, style: (t) => t.caption!);
ThemedText get ol => ThemedText(data: this, style: (t) => t.overline!);
ThemedText get h1 => ThemedText(data: this, style: (t) => t.displayLarge!);
ThemedText get h2 => ThemedText(data: this, style: (t) => t.displayMedium!);
ThemedText get h3 => ThemedText(data: this, style: (t) => t.displaySmall!);
ThemedText get h4 => ThemedText(data: this, style: (t) => t.headlineLarge!);
ThemedText get h5 => ThemedText(data: this, style: (t) => t.headlineMedium!);
ThemedText get h6 => ThemedText(data: this, style: (t) => t.headlineSmall!);
ThemedText get s1 => ThemedText(data: this, style: (t) => t.titleMedium!);
ThemedText get s2 => ThemedText(data: this, style: (t) => t.titleSmall!);
ThemedText get b1 => ThemedText(data: this, style: (t) => t.bodyLarge!);
ThemedText get b2 => ThemedText(data: this, style: (t) => t.bodyMedium!);
ThemedText get btn => ThemedText(data: this, style: (t) => t.labelLarge!);
ThemedText get cap => ThemedText(data: this, style: (t) => t.bodySmall!);
ThemedText get ol => ThemedText(data: this, style: (t) => t.labelSmall!);
}
Loading