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

Trying to Fix #46 #56

Merged
merged 34 commits into from
Feb 13, 2022
Merged
Changes from 1 commit
Commits
Show all changes
34 commits
Select commit Hold shift + click to select a range
34e1023
Trying to Fix #46
prateekmedia Feb 7, 2022
5384706
Add isDrawer parameter
prateekmedia Feb 7, 2022
817903f
Fix comma
prateekmedia Feb 7, 2022
4204e26
Made ViewSwitcher adaptive
prateekmedia Feb 8, 2022
b7bf94d
`ViewSwitcherStyle` is now `ViewSwitcherPolicy`
prateekmedia Feb 9, 2022
69218ab
Update dependencies
prateekmedia Feb 9, 2022
ff6ba2f
Update Headerbar logic
prateekmedia Feb 9, 2022
de1d892
Add selectionIndex and onSelected for ComboRow
prateekmedia Feb 10, 2022
3e0ead1
Add paddingTitle and paddingIcon parameter
prateekmedia Feb 10, 2022
a598fb5
Remove paddingTitle from ViewSwitcherTab
prateekmedia Feb 10, 2022
aaa09d1
Add new parameter's in text field
prateekmedia Feb 10, 2022
2abde04
Update TextField
prateekmedia Feb 10, 2022
2de7473
Unify demo screens, Improve flap example
prateekmedia Feb 10, 2022
ac5d9a1
Fix CI
prateekmedia Feb 11, 2022
9e9a3df
Fix Bare Urls lint
prateekmedia Feb 11, 2022
13bc7b2
Fix CI
prateekmedia Feb 11, 2022
9188b43
Add autoPositionWindowButtons parameter
prateekmedia Feb 11, 2022
0527546
Check if is desktop first for headerbar's bitsdojo
prateekmedia Feb 11, 2022
952c5db
Making it compatible with Mobile platforms
prateekmedia Feb 11, 2022
9ceaf30
Revert Previous changes, add SafeArea to scaffold
prateekmedia Feb 11, 2022
7659e84
autoWindowButtonPosition is false for about header
prateekmedia Feb 11, 2022
983aaf6
Add getAppwindow method
prateekmedia Feb 12, 2022
888e222
Fix getAppwindow
prateekmedia Feb 12, 2022
3bf3cbc
Add Example Markdown
prateekmedia Feb 12, 2022
51296eb
Remove getAppwindow method
prateekmedia Feb 12, 2022
0aab9f8
Add all window button support for nativeshell
prateekmedia Feb 12, 2022
68d92a3
Declare to support all platforms
prateekmedia Feb 12, 2022
5ffebdb
Fix no_trailing_punctuation lint
prateekmedia Feb 12, 2022
412729d
Update ComboRow
prateekmedia Feb 13, 2022
99b7ecc
Replace bitsdojo_window with libadwaita_bitsdojo
prateekmedia Feb 13, 2022
a0b48a2
Update docs, Remove Adw from AdwWindowButtonType
prateekmedia Feb 13, 2022
3ae17b9
Add AdwDefaultColors class
prateekmedia Feb 13, 2022
22ff7c9
Add libadwaita_searchbar example
prateekmedia Feb 13, 2022
3f17ccd
Update popver
prateekmedia Feb 13, 2022
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
Prev Previous commit
Next Next commit
Replace bitsdojo_window with libadwaita_bitsdojo
prateekmedia committed Feb 13, 2022
commit 99b7ecce7e980be62a2762c82e76242f2aab98f8
10 changes: 5 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
@@ -22,7 +22,7 @@ Libadwaita's widgets for Flutter. Following Gnome HIG and available on all platf
## Usage

- This only provides widgets, for theming you should consider [adwaita](https://pub.dev/packages/adwaita) or [yaru](https://github.com/ubuntu/yaru.dart) package.
- If you want custom titlebar then you can follow the steps for that on [`bitsdojo_window`](https://pub.dev/packages/bitsdojo_window) package.
- If you want custom titlebar then you can follow the steps for that on [`libadwaita_bitsdojo`](https://pub.dev/packages/libadwaita_bitsdojo) package.
- Here is the list of widgets imported from libadwaita library : [widgets.dart](https://github.com/gtk-flutter/libadwaita/blob/main/lib/src/widgets/widgets.dart).

See the example app in the `example` folder for more info.
@@ -36,14 +36,14 @@ If you want to use default adwaita style window icons or icons using window_deco
| Widget | Docs |
| ------ | ---- |
| `AdwHeaderBar` | Default HeaderBar |
| `AdwHeaderBar.bitsdojo` | HeaderBar to be used with [`bitsdojo`](#bitsdojo_window) package |
| `AdwHeaderBar.bitsdojo` | HeaderBar to be used with [`bitsdojo`](#libadwaita_bitsdojo) package |
| `AdwHeaderBar.nativeshell` | HeaderBar to be used with [`nativeshell`](#nativeshell) package |

If you want to have a custom icon for window button then you have to use any one of the following HeaderBar's:
| Widget | Docs |
| ------ | ---- |
| `AdwHeaderBar.custom` | HeaderBar with custom icon |
| `AdwHeaderBar.customBitsdojo` | HeaderBar to be used with [`bitsdojo`](#bitsdojo_window) package with custom icon |
| `AdwHeaderBar.customBitsdojo` | HeaderBar to be used with [`bitsdojo`](#libadwaita_bitsdojo) package with custom icon |
| `AdwHeaderBar.customNativeshell` | HeaderBar to be used with [`nativeshell`](#nativeshell) package with custom icon |

## Relavant Links
@@ -62,14 +62,14 @@ For theming
#### [**`adwaita_icons`**](https://pub.dev/packages/adwaita_icons)
For Adwaita Icons

#### [**`bitsdojo_window`**](https://pub.dev/packages/bitsdojo_window)
#### [**`libadwaita_bitsdojo`**](https://pub.dev/packages/libadwaita_bitsdojo)
Can be used with
- `AdwHeaderBar.bitsdojo`
- `AdwHeaderBar.customBitsdojo`

Example:
```dart
import 'package:bitsdojo_window/bitsdojo_window.dart';
import 'package:libadwaita_bitsdojo/libadwaita_bitsdojo.dart';

AdwHeaderBar.bitsdojo(
...
6 changes: 3 additions & 3 deletions example/example.md
Original file line number Diff line number Diff line change
@@ -3,22 +3,22 @@
## Demo App
[Here]('https://github.com/gtk-flutter/libadwaita/tree/main/example') is a demo app made with libadwaita package.

## Minimal [`bitsdojo_window`](https://pub.dev/packages/bitsdojo_window) usage
## Minimal [`libadwaita_bitsdojo`](https://pub.dev/packages/libadwaita_bitsdojo) usage
```yaml
#pubspec.yaml
dependencies:
adwaita:
bitsdojo_window:
libadwaita:
libadwaita_bitsdojo:
```

```dart
// main.dart

import 'package:adwaita/adwaita.dart';
import 'package:bitsdojo_window/bitsdojo_window.dart';
import 'package:flutter/material.dart';
import 'package:libadwaita/libadwaita.dart';
import 'package:libadwaita_bitsdojo/libadwaita_bitsdojo.dart';

void main() => runApp(MyApp());

2 changes: 1 addition & 1 deletion example/lib/flap/flap_home_page.dart
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import 'package:bitsdojo_window/bitsdojo_window.dart';
import 'package:flutter/material.dart';
import 'package:libadwaita/libadwaita.dart';
import 'package:libadwaita_bitsdojo/libadwaita_bitsdojo.dart';

class FlapHomePage extends StatefulWidget {
const FlapHomePage({Key? key, required this.themeNotifier}) : super(key: key);
5 changes: 4 additions & 1 deletion example/lib/home_page.dart
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
import 'package:bitsdojo_window/bitsdojo_window.dart';
import 'package:example/pages/avatar_page.dart';
import 'package:example/pages/counter_page.dart';
import 'package:example/pages/flap_page.dart';
@@ -7,8 +6,12 @@ import 'package:example/pages/settings_page.dart';
import 'package:example/pages/style_classes_page.dart';
import 'package:example/pages/view_switcher_page.dart';
import 'package:example/pages/welcome.dart';

import 'package:flutter/material.dart';

import 'package:libadwaita/libadwaita.dart';
import 'package:libadwaita_bitsdojo/libadwaita_bitsdojo.dart';

import 'package:url_launcher/url_launcher.dart';

class MyHomePage extends StatefulWidget {
2 changes: 1 addition & 1 deletion example/lib/view_switcher/view_switcher_home_page.dart
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import 'package:bitsdojo_window/bitsdojo_window.dart';
import 'package:flutter/material.dart';
import 'package:libadwaita/libadwaita.dart';
import 'package:libadwaita_bitsdojo/libadwaita_bitsdojo.dart';

class ViewSwitcherHomePage extends StatefulWidget {
const ViewSwitcherHomePage({Key? key}) : super(key: key);
14 changes: 7 additions & 7 deletions example/pubspec.lock
Original file line number Diff line number Diff line change
@@ -22,13 +22,6 @@ packages:
url: "https://pub.dartlang.org"
source: hosted
version: "2.8.2"
bitsdojo_window:
dependency: "direct main"
description:
name: bitsdojo_window
url: "https://pub.dartlang.org"
source: hosted
version: "0.1.1+1"
bitsdojo_window_linux:
dependency: transitive
description:
@@ -184,6 +177,13 @@ packages:
relative: true
source: path
version: "1.0.0"
libadwaita_bitsdojo:
dependency: "direct main"
description:
name: libadwaita_bitsdojo
url: "https://pub.dartlang.org"
source: hosted
version: "0.5.0"
matcher:
dependency: transitive
description:
2 changes: 1 addition & 1 deletion example/pubspec.yaml
Original file line number Diff line number Diff line change
@@ -9,12 +9,12 @@ environment:

dependencies:
adwaita: "0.5.1"
bitsdojo_window: ">=0.1.1+1 <1.0.0"
desktop_multi_window: ">=0.0.1 <1.0.0"
flutter:
sdk: flutter
libadwaita:
path: ../
libadwaita_bitsdojo: ">=0.5.0 <1.0.0"

dev_dependencies:
flutter_test:
4 changes: 2 additions & 2 deletions lib/src/widgets/adw/header_bar.dart
Original file line number Diff line number Diff line change
@@ -81,7 +81,7 @@ class AdwHeaderBar extends StatefulWidget {
AdwHeaderBar.bitsdojo({
Key? key,

/// The appWindow object from bitsdojo_window package
/// The appWindow object from libadwaita_bitsdojo package
required dynamic appWindow,
Widget Function(
String name,
@@ -133,7 +133,7 @@ class AdwHeaderBar extends StatefulWidget {
AdwHeaderBar.customBitsdojo({
Key? key,

/// The appWindow object from bitsdojo_window package
/// The appWindow object from libadwaita_bitsdojo package
required dynamic appWindow,
this.start = const [],
this.title = const SizedBox(),