Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"editor.codeActionsOnSave": {
"source.fixAll": true,
"source.organizeImports": true
"source.fixAll": "explicit",
"source.organizeImports": "explicit"
},
"explorer.fileNesting.enabled": true,
"explorer.fileNesting.expand": false,
Expand Down
102 changes: 63 additions & 39 deletions example/pubspec.lock
Original file line number Diff line number Diff line change
Expand Up @@ -13,42 +13,42 @@ packages:
dependency: transitive
description:
name: async
sha256: bfe67ef28df125b7dddcea62755991f807aa39a2492a23e1550161692950bbe0
sha256: "758e6d74e971c3e5aceb4110bfd6698efc7f501675bcfe0c775459a8140750eb"
url: "https://pub.dev"
source: hosted
version: "2.10.0"
version: "2.13.0"
boolean_selector:
dependency: transitive
description:
name: boolean_selector
sha256: "6cfb5af12253eaf2b368f07bacc5a80d1301a071c73360d746b7f2e32d762c66"
sha256: "8aab1771e1243a5063b8b0ff68042d67334e3feab9e95b9490f9a6ebf73b42ea"
url: "https://pub.dev"
source: hosted
version: "2.1.1"
version: "2.1.2"
characters:
dependency: transitive
description:
name: characters
sha256: e6a326c8af69605aec75ed6c187d06b349707a27fbff8222ca9cc2cff167975c
sha256: f71061c654a3380576a52b451dd5532377954cf9dbd272a78fc8479606670803
url: "https://pub.dev"
source: hosted
version: "1.2.1"
version: "1.4.0"
clock:
dependency: transitive
description:
name: clock
sha256: cb6d7f03e1de671e34607e909a7213e31d7752be4fb66a86d29fe1eb14bfb5cf
sha256: fddb70d9b5277016c77a80201021d40a2247104d9f4aa7bab7157b7e3f05b84b
url: "https://pub.dev"
source: hosted
version: "1.1.1"
version: "1.1.2"
collection:
dependency: transitive
description:
name: collection
sha256: cfc915e6923fe5ce6e153b0723c753045de46de1b4d63771530504004a45fae0
sha256: "2f5709ae4d3d59dd8f7cd309b4e023046b57d8a6c82130785d2b0e5868084e76"
url: "https://pub.dev"
source: hosted
version: "1.17.0"
version: "1.19.1"
crypto:
dependency: transitive
description:
Expand All @@ -61,10 +61,10 @@ packages:
dependency: transitive
description:
name: fake_async
sha256: "511392330127add0b769b75a987850d136345d9227c6b94c96a04cf4a391bf78"
sha256: "5368f224a74523e8d2e7399ea1638b37aecfca824a3cc4dfdf77bf1fa905ac44"
url: "https://pub.dev"
source: hosted
version: "1.3.1"
version: "1.3.3"
flutter:
dependency: "direct main"
description: flutter
Expand All @@ -83,46 +83,62 @@ packages:
url: "https://pub.dev"
source: hosted
version: "4.0.15"
js:
leak_tracker:
dependency: transitive
description:
name: js
sha256: "5528c2f391ededb7775ec1daa69e65a2d61276f7552de2b5f7b8d34ee9fd4ab7"
name: leak_tracker
sha256: "6bb818ecbdffe216e81182c2f0714a2e62b593f4a4f13098713ff1685dfb6ab0"
url: "https://pub.dev"
source: hosted
version: "0.6.5"
version: "10.0.9"
leak_tracker_flutter_testing:
dependency: transitive
description:
name: leak_tracker_flutter_testing
sha256: f8b613e7e6a13ec79cfdc0e97638fddb3ab848452eff057653abd3edba760573
url: "https://pub.dev"
source: hosted
version: "3.0.9"
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
sha256: "16db949ceee371e9b99d22f88fa3a73c4e59fd0afed0bd25fc336eb76c198b72"
sha256: dc58c723c3c24bf8d3e2d3ad3f2f9d7bd9cf43ec6feaa64181775e60190153f2
url: "https://pub.dev"
source: hosted
version: "0.12.13"
version: "0.12.17"
material_color_utilities:
dependency: transitive
description:
name: material_color_utilities
sha256: d92141dc6fe1dad30722f9aa826c7fbc896d021d792f80678280601aff8cf724
sha256: f7142bb1154231d7ea5f96bc7bde4bda2a0945d2806bb11670e30b850d56bdec
url: "https://pub.dev"
source: hosted
version: "0.2.0"
version: "0.11.1"
meta:
dependency: transitive
description:
name: meta
sha256: "6c268b42ed578a53088d834796959e4a1814b5e9e164f147f580a386e5decf42"
sha256: e3641ec5d63ebf0d9b41bd43201a66e3fc79a65db5f61fc181f04cd27aab950c
url: "https://pub.dev"
source: hosted
version: "1.8.0"
version: "1.16.0"
path:
dependency: transitive
description:
name: path
sha256: db9d4f58c908a4ba5953fcee2ae317c94889433e5024c27ce74a37f94267945b
sha256: "75cca69d1490965be98c73ceaea117e8a04dd21217b37b292c9ddbec0d955bc5"
url: "https://pub.dev"
source: hosted
version: "1.8.2"
version: "1.9.1"
petitparser:
dependency: transitive
description:
Expand All @@ -135,23 +151,23 @@ packages:
dependency: transitive
description: flutter
source: sdk
version: "0.0.99"
version: "0.0.0"
source_span:
dependency: transitive
description:
name: source_span
sha256: dd904f795d4b4f3b870833847c461801f6750a9fa8e61ea5ac53f9422b31f250
sha256: "254ee5351d6cb365c859e20ee823c3bb479bf4a293c22d17a9f1bf144ce86f7c"
url: "https://pub.dev"
source: hosted
version: "1.9.1"
version: "1.10.1"
stack_trace:
dependency: transitive
description:
name: stack_trace
sha256: c3c7d8edb15bee7f0f74debd4b9c5f3c2ea86766fe4178eb2a18eb30a0bdaed5
sha256: "8b27215b45d22309b5cddda1aa2b19bdfec9df0e765f2de506401c071d38d1b1"
url: "https://pub.dev"
source: hosted
version: "1.11.0"
version: "1.12.1"
statusbarz:
dependency: "direct main"
description:
Expand All @@ -163,34 +179,34 @@ packages:
dependency: transitive
description:
name: stream_channel
sha256: "83615bee9045c1d322bbbd1ba209b7a749c2cbcdcb3fdd1df8eb488b3279c1c8"
sha256: "969e04c80b8bcdf826f8f16579c7b14d780458bd97f56d107d3950fdbeef059d"
url: "https://pub.dev"
source: hosted
version: "2.1.1"
version: "2.1.4"
string_scanner:
dependency: transitive
description:
name: string_scanner
sha256: "556692adab6cfa87322a115640c11f13cb77b3f076ddcc5d6ae3c20242bedcde"
sha256: "921cd31725b72fe181906c6a94d987c78e3b98c2e205b397ea399d4054872b43"
url: "https://pub.dev"
source: hosted
version: "1.2.0"
version: "1.4.1"
term_glyph:
dependency: transitive
description:
name: term_glyph
sha256: a29248a84fbb7c79282b40b8c72a1209db169a2e0542bce341da992fe1bc7e84
sha256: "7f554798625ea768a7518313e58f83891c7f5024f88e46e7182a4558850a4b8e"
url: "https://pub.dev"
source: hosted
version: "1.2.1"
version: "1.2.2"
test_api:
dependency: transitive
description:
name: test_api
sha256: ad540f65f92caa91bf21dfc8ffb8c589d6e4dc0c2267818b4cc2792857706206
sha256: fb31f383e2ee25fbbfe06b40fe21e1e458d14080e3c67e7ba0acfde4df4e0bbd
url: "https://pub.dev"
source: hosted
version: "0.4.16"
version: "0.7.4"
typed_data:
dependency: transitive
description:
Expand All @@ -207,6 +223,14 @@ packages:
url: "https://pub.dev"
source: hosted
version: "2.1.4"
vm_service:
dependency: transitive
description:
name: vm_service
sha256: ddfa8d30d89985b96407efce8acbdd124701f96741f2d981ca860662f1c0dc02
url: "https://pub.dev"
source: hosted
version: "15.0.0"
xml:
dependency: transitive
description:
Expand All @@ -216,5 +240,5 @@ packages:
source: hosted
version: "6.1.0"
sdks:
dart: ">=2.18.0 <4.0.0"
flutter: ">=1.17.0"
dart: ">=3.7.0-0 <4.0.0"
flutter: ">=3.18.0-18.0.pre.54"
19 changes: 18 additions & 1 deletion lib/src/statusbarz.dart
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import 'package:flutter/material.dart';
import 'package:flutter/rendering.dart';
import 'package:flutter/services.dart';
import 'package:image/image.dart' as img;
import 'package:image/image.dart';
import 'package:statusbarz/src/statusbarz_exception.dart';
import 'package:statusbarz/src/statusbarz_observer.dart';
import 'package:statusbarz/src/statusbarz_theme.dart';
Expand Down Expand Up @@ -115,7 +116,7 @@ class Statusbarz {
for (var yCoord = 0; yCoord < statusHeight.toInt(); yCoord++) {
for (var xCoord = 0; xCoord < bitmap!.width; xCoord++) {
final pixel = bitmap.getPixel(xCoord, yCoord);
luminance += pixel.luminance;
luminance += _getLuminance(pixel);
pixels++;
}
}
Expand All @@ -141,4 +142,20 @@ class Statusbarz {
void setLightStatusBar() {
SystemChrome.setSystemUIOverlayStyle(theme.lightStatusBar);
}

/// Calculate the luminance of a pixel.
double _getLuminance(Pixel pixel) {
// Extract ARGB values
final red = pixel.r;
final green = pixel.g;
final blue = pixel.b;

// Normalize the color values to [0, 1]
final r = red / 255.0;
final g = green / 255.0;
final b = blue / 255.0;

// Calculate luminance
return 0.2126 * r + 0.7152 * g + 0.0722 * b;
}
}
10 changes: 8 additions & 2 deletions lib/src/statusbarz_capturer.dart
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
// ignore_for_file: comment_references

import 'package:flutter/foundation.dart';
import 'package:flutter/material.dart';
import 'package:statusbarz/statusbarz.dart';

Expand All @@ -23,10 +24,10 @@ import 'package:statusbarz/statusbarz.dart';
class StatusbarzCapturer extends StatelessWidget {
/// {@macro statusbarz_capturer}
const StatusbarzCapturer({
Key? key,
super.key,
required this.child,
this.theme,
}) : super(key: key);
});

/// The child widget
final Widget child;
Expand All @@ -36,6 +37,11 @@ class StatusbarzCapturer extends StatelessWidget {

@override
Widget build(BuildContext context) {
if (kIsWeb) {
// On web, we don't need to capture the status bar color
// as it is not applicable.
return child;
}
if (theme != null) Statusbarz.instance.setTheme(theme!);

return RepaintBoundary(
Expand Down
12 changes: 6 additions & 6 deletions lib/src/statusbarz_observer.dart
Original file line number Diff line number Diff line change
Expand Up @@ -26,12 +26,12 @@ class StatusbarzObserver extends NavigatorObserver {

void _handleRouteRemoved(Route<dynamic>? route) {
if (route is ModalRoute) {
final status = route.animation!.status;
final status = route.animation?.status;

if (status != AnimationStatus.dismissed) {
/// Assures there are not duplicate listeners
route.animation!.removeStatusListener(_routeRemovedListener);
route.animation!.addStatusListener(_routeRemovedListener);
route.animation?.removeStatusListener(_routeRemovedListener);
route.animation?.addStatusListener(_routeRemovedListener);

return;
}
Expand All @@ -42,12 +42,12 @@ class StatusbarzObserver extends NavigatorObserver {

void _handleRouteAdded(Route<dynamic>? route) {
if (route is ModalRoute) {
final status = route.animation!.status;
final status = route.animation?.status;

if (status != AnimationStatus.completed) {
/// Assures there are not duplicate listeners
route.animation!.removeStatusListener(_routeAddedListener);
route.animation!.addStatusListener(_routeAddedListener);
route.animation?.removeStatusListener(_routeAddedListener);
route.animation?.addStatusListener(_routeAddedListener);

return;
}
Expand Down
Loading