Skip to content

Commit

Permalink
update deps and readme (#199)
Browse files Browse the repository at this point in the history
  • Loading branch information
Feichtmeier authored Dec 18, 2021
1 parent 1479aaf commit 2fc9051
Show file tree
Hide file tree
Showing 7 changed files with 59 additions and 14 deletions.
Binary file added .github/images/screenshot_dark.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added .github/images/screenshot_light.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed .github/images/wip.gif
Binary file not shown.
53 changes: 49 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,10 @@

The goal of this project is to build a feature complete settings app for the Ubuntu desktop with the Flutter UI toolkit.

![](.github/images/wip.gif)
![Light Screenshot](.github/images/screenshot_light.png)
![Dark Screenshot](.github/images/screenshot_dark.png)

Packages that we already use or plan to use are:
Mentionable packages that we use and want to thank are:

- [gsettings.dart](https://github.com/canonical/gsettings.dart)
- [bluez.dart](https://github.com/canonical/bluez.dart)
Expand All @@ -15,19 +16,63 @@ Packages that we already use or plan to use are:
- [dbus.dart](https://github.com/canonical/dbus.dart)
- [upower.dart](https://github.com/canonical/upower.dart)
- [udisks.dart](https://github.com/canonical/udisks.dart)
- [filesystem_picker](https://github.com/andyduke/filesystem_picker)
- [flex_color_picker](https://github.com/rydmike/flex_color_picker)


# Alpha Releases / Download

Currently the app is in a very raw alpha state and many pages are still missing.
However if you want you can download, extract and then run alpha releases [from the releases page](https://github.com/Feichtmeier/settings/releases).

# Building

The following steps are needed to run the app from the source code.

## Install Flutter

Either with

```bash
sudo snap install flutter --classic
```

Or with

```bash
sudo apt install git curl cmake meson make clang libgtk-3-dev pkg-config
mkdir ~/development
cd ~/development
git clone https://github.com/flutter/flutter.git -b master
echo 'export PATH="$PATH:$HOME/development/flutter/bin"' >> ~/.bashrc
source ~/.bashrc
```

## Enable flutter linux desktop support

```bash
flutter config --enable-linux-desktop
```

## Install libhandy

```bash
sudo apt install libhandy-1-dev
```

# TODO

- [X] use real yaru icons - thanks to @Jupi007
- [X] responsive layout
- [X] [MVVM software architecture](https://en.wikipedia.org/wiki/Model%E2%80%93view%E2%80%93viewmodel)
- [X] [MVVM software architecture](https://en.wikipedia.org/wiki/Model%E2%80%93view%E2%80%93viewmodel) - thanks to @jpnurmi
- [X] search
- [X] WIFI page - WIP
- [ ] Ethernet page
- [ ] Cellular Network page
- [X] Bluetooth page - WIP
- [X] Wallpaper page
- [X] Appearance page
- [X] Multi-Tasking page
- [X] Notifications page
- [ ] Search page
- [ ] Apps page
Expand All @@ -48,4 +93,4 @@ Packages that we already use or plan to use are:
- [ ] Preferred apps page
- [ ] Date and time page
- [ ] Wacom page
- [X] Info page
- [X] Info page
6 changes: 3 additions & 3 deletions lib/main.dart
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import 'package:settings/view/app_theme.dart';
import 'package:settings/view/pages/page_items.dart';
import 'package:udisks/udisks.dart';
import 'package:upower/upower.dart';
import 'package:yaru/yaru.dart' as yaru;
import 'package:yaru/yaru.dart';
import 'package:yaru_icons/widgets/yaru_icons.dart';
import 'package:yaru_widgets/yaru_widgets.dart';

Expand Down Expand Up @@ -90,8 +90,8 @@ class UbuntuSettingsApp extends StatelessWidget {
);
},
},
theme: yaru.lightTheme,
darkTheme: yaru.darkTheme,
theme: yaruLight,
darkTheme: yaruDark,
themeMode: context.watch<AppTheme>().value,
supportedLocales: AppLocalizations.supportedLocales,
localizationsDelegates: AppLocalizations.localizationsDelegates,
Expand Down
6 changes: 3 additions & 3 deletions lib/view/pages/power/battery_section.dart
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import 'package:provider/provider.dart';
import 'package:settings/view/pages/power/battery_model.dart';
import 'package:settings/view/pages/power/battery_widgets.dart';
import 'package:upower/upower.dart';
import 'package:yaru/yaru.dart' as yaru;
import 'package:yaru/yaru.dart';
import 'package:yaru_widgets/yaru_widgets.dart';

class BatterySection extends StatefulWidget {
Expand Down Expand Up @@ -40,9 +40,9 @@ class _BatterySectionState extends State<BatterySection> {
child: LinearProgressIndicator(
value: model.percentage / 100.0,
color: model.percentage > 80.0
? yaru.Colors.green
? YaruColors.green
: model.percentage < 30.0
? Colors.red
? YaruColors.red
: Colors.amber),
),
Padding(
Expand Down
8 changes: 4 additions & 4 deletions pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -30,15 +30,15 @@ dependencies:
open_file: ^3.2.1
path_provider: ^2.0.5
pdf: ^3.6.0
provider: ^5.0.0
provider: ^6.0.1
rive: ^0.7.28
safe_change_notifier: ^0.0.1
safe_change_notifier: ^0.1.0
scrollable_positioned_list: ^0.2.0-nullsafety.0
udisks: ^0.3.0
upower:
git:
url: https://github.com/canonical/upower.dart
yaru: ^0.1.7
yaru: ^0.2.0
yaru_icons: ^0.0.7
yaru_widgets:
git:
Expand All @@ -52,7 +52,7 @@ dev_dependencies:
flutter_lints: ^1.0.0
flutter_test:
sdk: flutter
mockingjay: ^0.1.1
mockingjay: ^0.2.0
mockito: ^5.0.16

flutter:
Expand Down

0 comments on commit 2fc9051

Please sign in to comment.