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

Updated to UniversalIO #90

Merged
merged 2 commits into from
Apr 11, 2024
Merged

Updated to UniversalIO #90

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
808ccd3
Updated to UniversalIO
NextdoorPsycho Mar 12, 2024
a3e9a9d
Optional Actions for those of us using it for CrossPlatform
NextdoorPsycho Mar 12, 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
2 changes: 1 addition & 1 deletion example/lib/main.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import 'dart:async';
import 'dart:convert';
import 'dart:io';
import 'package:universal_io/io.dart';

import 'package:adwaita/adwaita.dart';
import 'package:collection/collection.dart';
Expand Down
80 changes: 56 additions & 24 deletions example/pubspec.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,10 +61,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"
dbus:
dependency: transitive
description:
Expand Down Expand Up @@ -154,21 +154,37 @@ packages:
url: "https://pub.dev"
source: hosted
version: "4.0.0"
js:
leak_tracker:
dependency: transitive
description:
name: js
sha256: f2c445dce49627136094980615a031419f7f3eb393237e4ecd97ac15dea343f3
name: leak_tracker
sha256: "78eb209deea09858f5269f5a5b02be4049535f568c07b275096836f01ea323fa"
url: "https://pub.dev"
source: hosted
version: "0.6.7"
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"
libadwaita:
dependency: "direct main"
description:
path: ".."
relative: true
source: path
version: "2.0.1"
version: "2.0.2"
libadwaita_core:
dependency: transitive
description:
Expand All @@ -189,26 +205,26 @@ packages:
dependency: transitive
description:
name: matcher
sha256: "6501fbd55da300384b768785b83e5ce66991266cec21af89ab9ae7f5ce1c4cbb"
sha256: d2323aa2060500f906aa31a895b4030b6da3ebdcc5619d14ce1aada65cd161cb
url: "https://pub.dev"
source: hosted
version: "0.12.15"
version: "0.12.16+1"
material_color_utilities:
dependency: transitive
description:
name: material_color_utilities
sha256: d92141dc6fe1dad30722f9aa826c7fbc896d021d792f80678280601aff8cf724
sha256: "0e0a020085b65b6083975e499759762399b4475f766c21668c4ecca34ea74e5a"
url: "https://pub.dev"
source: hosted
version: "0.2.0"
version: "0.8.0"
meta:
dependency: transitive
description:
name: meta
sha256: "3c74dbf8763d36539f114c799d8a2d87343b5067e9d796ca22b5eb8437090ee3"
sha256: d584fa6707a52763a52446f02cc621b077888fb63b93bbcb1143a7be5a0c0c04
url: "https://pub.dev"
source: hosted
version: "1.9.1"
version: "1.11.0"
package_info_plus:
dependency: transitive
description:
Expand All @@ -229,10 +245,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_parsing:
dependency: transitive
description:
Expand Down Expand Up @@ -298,26 +314,26 @@ 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"
stack_trace:
dependency: transitive
description:
name: stack_trace
sha256: c3c7d8edb15bee7f0f74debd4b9c5f3c2ea86766fe4178eb2a18eb30a0bdaed5
sha256: "73713990125a6d93122541237550ee3352a2d84baad52d375a4cad2eb9b7ce0b"
url: "https://pub.dev"
source: hosted
version: "1.11.0"
version: "1.11.1"
stream_channel:
dependency: transitive
description:
name: stream_channel
sha256: "83615bee9045c1d322bbbd1ba209b7a749c2cbcdcb3fdd1df8eb488b3279c1c8"
sha256: ba2aa5d8cc609d96bbb2899c28934f9e1af5cddbd60a827822ea467161eb54e7
url: "https://pub.dev"
source: hosted
version: "2.1.1"
version: "2.1.2"
string_scanner:
dependency: transitive
description:
Expand All @@ -338,10 +354,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"
typed_data:
dependency: transitive
description:
Expand All @@ -350,6 +366,14 @@ packages:
url: "https://pub.dev"
source: hosted
version: "1.3.1"
universal_io:
dependency: transitive
description:
name: universal_io
sha256: "1722b2dcc462b4b2f3ee7d188dad008b6eb4c40bbd03a3de451d82c78bba9aad"
url: "https://pub.dev"
source: hosted
version: "2.2.2"
url_launcher:
dependency: transitive
description:
Expand Down Expand Up @@ -454,6 +478,14 @@ packages:
url: "https://pub.dev"
source: hosted
version: "3.0.1"
vm_service:
dependency: transitive
description:
name: vm_service
sha256: b3d56ff4341b8f182b96aceb2fa20e3dcb336b9f867bc0eafc0de10f1048e957
url: "https://pub.dev"
source: hosted
version: "13.0.0"
win32:
dependency: transitive
description:
Expand Down Expand Up @@ -487,5 +519,5 @@ packages:
source: hosted
version: "6.3.0"
sdks:
dart: ">=3.0.0-0 <4.0.0"
dart: ">=3.2.0-0 <4.0.0"
flutter: ">=3.7.0-0"
69 changes: 24 additions & 45 deletions lib/src/widgets/adw/header_bar.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
import 'dart:io';

import 'package:dbus/dbus.dart';
import 'package:flutter/foundation.dart';
import 'package:flutter/material.dart';
import 'package:gsettings/gsettings.dart';
import 'package:libadwaita/src/utils/colors.dart';
import 'package:libadwaita/src/widgets/widgets.dart';
import 'package:libadwaita_core/libadwaita_core.dart';
import 'package:universal_io/io.dart';

class HeaderBarStyle {
const HeaderBarStyle({
Expand Down Expand Up @@ -53,32 +52,32 @@ class AdwHeaderBar extends StatefulWidget {
this.start = const [],
this.end = const [],
this.style = const HeaderBarStyle(),
required AdwActions actions,
AdwActions? actions,
AdwControls? controls,
}) : closeBtn = controls != null
? controls.closeBtn?.call(actions.onClose)
? controls.closeBtn?.call(actions?.onClose)
: AdwWindowButton(
nativeControls: style.nativeControls,
buttonType: WindowButtonType.close,
onPressed: actions.onClose,
onPressed: actions?.onClose,
),
maximizeBtn = controls != null
? controls.maximizeBtn?.call(actions.onMaximize)
? controls.maximizeBtn?.call(actions?.onMaximize)
: AdwWindowButton(
nativeControls: style.nativeControls,
buttonType: WindowButtonType.maximize,
onPressed: actions.onMaximize,
onPressed: actions?.onMaximize,
),
minimizeBtn = controls != null
? controls.minimizeBtn?.call(actions.onMinimize)
? controls.minimizeBtn?.call(actions?.onMinimize)
: AdwWindowButton(
nativeControls: style.nativeControls,
buttonType: WindowButtonType.minimize,
onPressed: actions.onMinimize,
onPressed: actions?.onMinimize,
),
onHeaderDrag = actions.onHeaderDrag,
onDoubleTap = actions.onDoubleTap,
onRightClick = actions.onRightClick;
onHeaderDrag = actions?.onHeaderDrag,
onDoubleTap = actions?.onDoubleTap,
onRightClick = actions?.onRightClick;

/// The leading widget for the headerbar
final List<Widget> start;
Expand Down Expand Up @@ -112,19 +111,13 @@ class AdwHeaderBar extends StatefulWidget {
}

class _AdwHeaderBarState extends State<AdwHeaderBar> {
bool get hasWindowControls =>
widget.closeBtn != null ||
widget.minimizeBtn != null ||
widget.maximizeBtn != null;
bool get hasWindowControls => widget.closeBtn != null || widget.minimizeBtn != null || widget.maximizeBtn != null;

late ValueNotifier<List<String>?> separator =
!widget.style.autoPositionWindowButtons ||
!kIsWeb &&
(Platform.isLinux || Platform.isWindows || Platform.isMacOS)
? ValueNotifier(
['', 'minimize,maximize,close'],
)
: ValueNotifier(null);
late ValueNotifier<List<String>?> separator = !widget.style.autoPositionWindowButtons || !kIsWeb && (Platform.isLinux || Platform.isWindows || Platform.isMacOS)
? ValueNotifier(
['', 'minimize,maximize,close'],
)
: ValueNotifier(null);

@override
void initState() {
Expand All @@ -138,10 +131,7 @@ class _AdwHeaderBarState extends State<AdwHeaderBar> {
(e) => e
.split(',')
.where(
(element) =>
element == 'close' ||
element == 'maximize' ||
element == 'minimize',
(element) => element == 'close' || element == 'maximize' || element == 'minimize',
)
.join(','),
);
Expand All @@ -156,8 +146,7 @@ class _AdwHeaderBarState extends State<AdwHeaderBar> {

WidgetsBinding.instance.addPostFrameCallback((_) async {
try {
final buttonLayout =
await schema.get('button-layout') as DBusString?;
final buttonLayout = await schema.get('button-layout') as DBusString?;
if (buttonLayout != null) {
updateSep(buttonLayout.value);
}
Expand Down Expand Up @@ -187,9 +176,7 @@ class _AdwHeaderBarState extends State<AdwHeaderBar> {
alignment: Alignment.topCenter,
child: Container(
decoration: BoxDecoration(
color: !widget.style.isTransparent
? Theme.of(context).appBarTheme.backgroundColor
: null,
color: !widget.style.isTransparent ? Theme.of(context).appBarTheme.backgroundColor : null,
border: !widget.style.isTransparent
? Border(
bottom: BorderSide(color: context.borderColor),
Expand All @@ -215,15 +202,11 @@ class _AdwHeaderBarState extends State<AdwHeaderBar> {
leading: Row(
mainAxisSize: MainAxisSize.min,
children: [
if (hasWindowControls &&
sep != null &&
sep[0].split(',').isNotEmpty) ...[
if (hasWindowControls && sep != null && sep[0].split(',').isNotEmpty) ...[
SizedBox(width: widget.style.titlebarSpace),
for (var i in sep[0].split(','))
if (windowButtons[i] != null) windowButtons[i]!,
if (!widget.style.nativeControls ||
!kIsWeb && Platform.isLinux)
SizedBox(width: widget.style.titlebarSpace),
if (!widget.style.nativeControls || !kIsWeb && Platform.isLinux) SizedBox(width: widget.style.titlebarSpace),
],
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you please format this file with line characters as 80, see this for more:
https://dart.dev/tools/linter-rules/lines_longer_than_80_chars

...widget.start.map(
(e) => Padding(
Expand All @@ -243,15 +226,11 @@ class _AdwHeaderBarState extends State<AdwHeaderBar> {
child: e,
),
),
if (hasWindowControls &&
sep != null &&
sep[1].split(',').isNotEmpty) ...[
if (hasWindowControls && sep != null && sep[1].split(',').isNotEmpty) ...[
SizedBox(width: widget.style.titlebarSpace),
for (var i in sep[1].split(','))
if (windowButtons[i] != null) windowButtons[i]!,
if (!widget.style.nativeControls ||
!kIsWeb && Platform.isLinux)
SizedBox(width: widget.style.titlebarSpace),
if (!widget.style.nativeControls || !kIsWeb && Platform.isLinux) SizedBox(width: widget.style.titlebarSpace),
],
],
),
Expand Down
Loading
Loading