Skip to content

Commit

Permalink
wip: flash toast and not loging in
Browse files Browse the repository at this point in the history
  • Loading branch information
tusharlock10 committed Dec 4, 2023
1 parent 72832d7 commit f9e67e6
Show file tree
Hide file tree
Showing 5 changed files with 103 additions and 110 deletions.
1 change: 0 additions & 1 deletion analysis_options.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ analyzer:
- lib/firebase_options.dart
plugins:
- dart_code_metrics
strong-mode:

linter:
# The lint rules applied to this project can be customized in the
Expand Down
2 changes: 1 addition & 1 deletion lib/widgets/fast_image.dart
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ class FastImage extends StatelessWidget {
label: semanticText,
image: true,
child: ClipRRect(
borderRadius: borderRadius,
borderRadius: borderRadius ?? BorderRadius.zero,
child: greyedOut
? ColorFiltered(
colorFilter: const ColorFilter.mode(
Expand Down
124 changes: 59 additions & 65 deletions lib/widgets/toast.dart
Original file line number Diff line number Diff line change
Expand Up @@ -70,76 +70,70 @@ class _FlashBar extends HookWidget {
[],
);

return Flash.bar(
constraints: BoxConstraints(
maxWidth: MediaQuery.of(context).size.width - 40,
),
horizontalDismissDirection: HorizontalDismissDirection.horizontal,
boxShadows: [
BoxShadow(
color: getToastColor().withOpacity(0.2),
spreadRadius: 0,
blurRadius: 8,
offset: const Offset(-1, 5),
),
],
enableVerticalDrag: true,
useSafeArea: true,
position: FlashPosition.top,
return FlashBar(
controller: controller,
borderRadius: const BorderRadius.all(Radius.circular(6)),
child: Card(
clipBehavior: Clip.hardEdge,
margin: const EdgeInsets.all(0),
child: SizedBox(
height: 60,
child: Row(
children: [
Container(
width: 8,
color: getToastColor(),
// boxShadows: [
// BoxShadow(
// color: getToastColor().withOpacity(0.2),
// spreadRadius: 0,
// blurRadius: 8,
// offset: const Offset(-1, 5),
// ),
// ],
// margin: const EdgeInsets.symmetric(horizontal: 20),
// borderRadius: const BorderRadius.all(Radius.circular(6)),
position: FlashPosition.top,
// enableDrag: true,
// horizontalDismissDirection: HorizontalDismissDirection.horizontal,
// backgroundGradient: LinearGradient(colors: [getToastColor()]),
content: SizedBox(
height: 60,
child: Row(
children: [
Container(
width: 8,
color: getToastColor(),
),
const SizedBox(width: 12),
Container(
decoration: BoxDecoration(
borderRadius: const BorderRadius.all(Radius.circular(12)),
border: type != ToastType.info
? Border.all(width: 2, color: getToastColor())
: null,
),
const SizedBox(width: 12),
Container(
decoration: BoxDecoration(
borderRadius: const BorderRadius.all(Radius.circular(12)),
border: type != ToastType.info
? Border.all(width: 2, color: getToastColor())
: null,
),
height: 24,
width: 24,
child: Icon(
getToastIcon(),
size: type != ToastType.info ? 18 : 24,
color: getToastColor(),
),
height: 24,
width: 24,
child: Icon(
getToastIcon(),
size: type != ToastType.info ? 18 : 24,
color: getToastColor(),
),
const SizedBox(width: 12),
Expanded(
child: Column(
mainAxisAlignment: MainAxisAlignment.center,
crossAxisAlignment: CrossAxisAlignment.start,
mainAxisSize: MainAxisSize.max,
children: [
Text(
getToastMessage(),
style: textTheme.bodyMedium?.copyWith(fontSize: 18),
),
Text(
text,
maxLines: 1,
style: textTheme.bodyLarge?.copyWith(
fontSize: 14,
overflow: TextOverflow.ellipsis,
),
),
const SizedBox(width: 12),
Expanded(
child: Column(
mainAxisAlignment: MainAxisAlignment.center,
crossAxisAlignment: CrossAxisAlignment.start,
mainAxisSize: MainAxisSize.max,
children: [
Text(
getToastMessage(),
style: textTheme.bodyMedium?.copyWith(fontSize: 18),
),
Text(
text,
maxLines: 1,
style: textTheme.bodyLarge?.copyWith(
fontSize: 14,
overflow: TextOverflow.ellipsis,
),
],
),
),
],
),
const SizedBox(width: 12),
],
),
),
const SizedBox(width: 12),
],
),
),
);
Expand Down
80 changes: 40 additions & 40 deletions pubspec.lock
Original file line number Diff line number Diff line change
Expand Up @@ -173,26 +173,26 @@ packages:
dependency: "direct main"
description:
name: cached_network_image
sha256: fd3d0dc1d451f9a252b32d95d3f0c3c487bc41a75eba2e6097cb0b9c71491b15
sha256: f98972704692ba679db144261172a8e20feb145636c617af0eb4022132a6797f
url: "https://pub.dev"
source: hosted
version: "3.2.3"
version: "3.3.0"
cached_network_image_platform_interface:
dependency: transitive
description:
name: cached_network_image_platform_interface
sha256: bb2b8403b4ccdc60ef5f25c70dead1f3d32d24b9d6117cfc087f496b178594a7
sha256: "56aa42a7a01e3c9db8456d9f3f999931f1e05535b5a424271e9a38cabf066613"
url: "https://pub.dev"
source: hosted
version: "2.0.0"
version: "3.0.0"
cached_network_image_web:
dependency: transitive
description:
name: cached_network_image_web
sha256: b8eb814ebfcb4dea049680f8c1ffb2df399e4d03bf7a352c775e26fa06e02fa0
sha256: "759b9a9f8f6ccbb66c185df805fac107f05730b1dab9c64626d1008cca532257"
url: "https://pub.dev"
source: hosted
version: "1.0.2"
version: "1.1.0"
characters:
dependency: transitive
description:
Expand Down Expand Up @@ -237,10 +237,10 @@ packages:
dependency: transitive
description:
name: collection
sha256: "4a07be6cb69c84d677a6c3096fcf960cc3285a8330b4603e0d463d15d9bd934c"
sha256: ee67cb0715911d28db6bf4af1026078bd6f0128b07a5f66fb2ed94ec6783c09a
url: "https://pub.dev"
source: hosted
version: "1.17.1"
version: "1.18.0"
community_material_icon:
dependency: "direct main"
description:
Expand Down Expand Up @@ -525,10 +525,10 @@ packages:
dependency: "direct main"
description:
name: flash
sha256: "183a2aa1e8a11ec181e37665688b84aa52454805cf374b18dae9d5c2cf204f37"
sha256: "1bb5a53158d7834ce0db8b15a0b948ee369698e59c907b751035c3a787f347ac"
url: "https://pub.dev"
source: hosted
version: "2.0.4"
version: "3.1.0"
flutter:
dependency: "direct main"
description: flutter
Expand All @@ -538,18 +538,18 @@ packages:
dependency: "direct main"
description:
name: flutter_blurhash
sha256: "05001537bd3fac7644fa6558b09ec8c0a3f2eba78c0765f88912882b1331a5c6"
sha256: "5e67678e479ac639069d7af1e133f4a4702311491188ff3e0227486430db0c06"
url: "https://pub.dev"
source: hosted
version: "0.7.0"
version: "0.8.2"
flutter_cache_manager:
dependency: transitive
description:
name: flutter_cache_manager
sha256: "32cd900555219333326a2d0653aaaf8671264c29befa65bbd9856d204a4c9fb3"
sha256: "8207f27539deb83732fdda03e259349046a39a4c767269285f449ade355d54ba"
url: "https://pub.dev"
source: hosted
version: "3.3.0"
version: "3.3.1"
flutter_displaymode:
dependency: "direct main"
description:
Expand Down Expand Up @@ -884,26 +884,26 @@ packages:
dependency: transitive
description:
name: matcher
sha256: "6501fbd55da300384b768785b83e5ce66991266cec21af89ab9ae7f5ce1c4cbb"
sha256: "1803e76e6653768d64ed8ff2e1e67bea3ad4b923eb5c56a295c3e634bad5960e"
url: "https://pub.dev"
source: hosted
version: "0.12.15"
version: "0.12.16"
material_color_utilities:
dependency: transitive
description:
name: material_color_utilities
sha256: d92141dc6fe1dad30722f9aa826c7fbc896d021d792f80678280601aff8cf724
sha256: "9528f2f296073ff54cb9fee677df673ace1218163c3bc7628093e7eed5203d41"
url: "https://pub.dev"
source: hosted
version: "0.2.0"
version: "0.5.0"
meta:
dependency: transitive
description:
name: meta
sha256: "3c74dbf8763d36539f114c799d8a2d87343b5067e9d796ca22b5eb8437090ee3"
sha256: a6e590c838b18133bb482a2745ad77c5bb7715fb0451209e1a7567d416678b8e
url: "https://pub.dev"
source: hosted
version: "1.9.1"
version: "1.10.0"
mime:
dependency: "direct main"
description:
Expand All @@ -916,10 +916,10 @@ packages:
dependency: transitive
description:
name: octo_image
sha256: "107f3ed1330006a3bea63615e81cf637433f5135a52466c7caa0e7152bca9143"
sha256: "45b40f99622f11901238e18d48f5f12ea36426d8eced9f4cbf58479c7aa2430d"
url: "https://pub.dev"
source: hosted
version: "1.0.2"
version: "2.0.0"
overlay_support:
dependency: "direct main"
description:
Expand Down Expand Up @@ -1024,14 +1024,6 @@ packages:
url: "https://pub.dev"
source: hosted
version: "2.1.6"
pedantic:
dependency: transitive
description:
name: pedantic
sha256: "67fc27ed9639506c856c840ccce7594d0bdcd91bc8d53d6e52359449a1d50602"
url: "https://pub.dev"
source: hosted
version: "1.11.1"
petitparser:
dependency: transitive
description:
Expand Down Expand Up @@ -1177,10 +1169,10 @@ packages:
dependency: transitive
description:
name: source_span
sha256: dd904f795d4b4f3b870833847c461801f6750a9fa8e61ea5ac53f9422b31f250
sha256: "53e943d4206a5e30df338fd4c6e7a077e02254531b138a15aec3bd143c1a8b3c"
url: "https://pub.dev"
source: hosted
version: "1.9.1"
version: "1.10.0"
sqflite:
dependency: transitive
description:
Expand All @@ -1201,10 +1193,10 @@ packages:
dependency: transitive
description:
name: stack_trace
sha256: c3c7d8edb15bee7f0f74debd4b9c5f3c2ea86766fe4178eb2a18eb30a0bdaed5
sha256: "73713990125a6d93122541237550ee3352a2d84baad52d375a4cad2eb9b7ce0b"
url: "https://pub.dev"
source: hosted
version: "1.11.0"
version: "1.11.1"
state_notifier:
dependency: transitive
description:
Expand All @@ -1217,10 +1209,10 @@ packages:
dependency: transitive
description:
name: stream_channel
sha256: "83615bee9045c1d322bbbd1ba209b7a749c2cbcdcb3fdd1df8eb488b3279c1c8"
sha256: ba2aa5d8cc609d96bbb2899c28934f9e1af5cddbd60a827822ea467161eb54e7
url: "https://pub.dev"
source: hosted
version: "2.1.1"
version: "2.1.2"
stream_transform:
dependency: transitive
description:
Expand Down Expand Up @@ -1289,10 +1281,10 @@ packages:
dependency: transitive
description:
name: test_api
sha256: eb6ac1540b26de412b3403a163d919ba86f6a973fe6cc50ae3541b80092fdcfb
sha256: "5c2f730018264d276c20e4f1503fd1308dfbbae39ec8ee63c5236311ac06954b"
url: "https://pub.dev"
source: hosted
version: "0.5.1"
version: "0.6.1"
time:
dependency: transitive
description:
Expand Down Expand Up @@ -1429,6 +1421,14 @@ packages:
url: "https://pub.dev"
source: hosted
version: "1.0.2"
web:
dependency: transitive
description:
name: web
sha256: afe077240a270dcfd2aafe77602b4113645af95d0ad31128cc02bce5ac5d5152
url: "https://pub.dev"
source: hosted
version: "0.3.0"
web_socket_channel:
dependency: transitive
description:
Expand Down Expand Up @@ -1478,5 +1478,5 @@ packages:
source: hosted
version: "3.1.2"
sdks:
dart: ">=3.0.0-417 <4.0.0"
flutter: ">=3.3.0"
dart: ">=3.2.0 <4.0.0"
flutter: ">=3.16.0"
6 changes: 3 additions & 3 deletions pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -49,13 +49,13 @@ dependencies:
responsive_framework: ^1.0.0
dartx: ^1.1.0
timer_builder: ^2.0.0
cached_network_image: ^3.2.1
cached_network_image: ^3.3.0
pointycastle: ^3.6.0
encrypt: ^5.0.1
flutter_hooks: ^0.18.5
hooks_riverpod: ^2.3.6
dotted_border: ^2.0.0+2
flash: 2.0.4
flash: 3.1.0
freezed_annotation: 2.2.0
fl_chart: ^0.62.0
flutter_feather_icons: ^2.0.0+1
Expand All @@ -68,7 +68,7 @@ dependencies:
mime: ^1.0.2
community_material_icon: ^5.9.55
badges: ^3.0.3
flutter_blurhash: ^0.7.0
flutter_blurhash: ^0.8.2
go_router: ^7.0.0
substring_highlight: ^1.0.33
path_provider: ^2.0.11
Expand Down

0 comments on commit f9e67e6

Please sign in to comment.