Skip to content

Commit 77327fa

Browse files
FeichtmeierFeichtmeier
committed
Use YaruBanner and YaruSafeImage (#62)
1 parent 602b7e5 commit 77327fa

21 files changed

+35
-213
lines changed

Diff for: ‎.github/assets/01.png

-94.2 KB
Binary file not shown.

Diff for: ‎.github/assets/02.png

-143 KB
Binary file not shown.

Diff for: ‎.github/assets/03.png

-94.3 KB
Binary file not shown.

Diff for: ‎.github/assets/04.png

-72.1 KB
Binary file not shown.

Diff for: ‎.github/assets/05.png

-55.4 KB
Binary file not shown.

Diff for: ‎.github/assets/06.png

-134 KB
Binary file not shown.

Diff for: ‎.github/assets/dialog.png

124 KB
Loading

Diff for: ‎.github/assets/screenshot.png

95.3 KB
Loading

Diff for: ‎README.md

+3-6
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,9 @@
22

33
An alternative software store for the Ubuntu Desktop made with Flutter.
44

5-
![1](.github/assets/01.png)
6-
![2](.github/assets/02.png)
7-
![3](.github/assets/03.png)
8-
![4](.github/assets/04.png)
9-
![5](.github/assets/05.png)
10-
![6](.github/assets/06.png)
5+
![1](.github/assets/screenshot.png)
6+
![2](.github/assets/dialog.png)
7+
118

129
## Goals
1310

Diff for: ‎lib/store_app/common/app_banner.dart

-148
This file was deleted.

Diff for: ‎lib/store_app/common/safe_image.dart

-34
This file was deleted.

Diff for: ‎lib/store_app/common/snap_content.dart

+4-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
import 'package:flutter/material.dart';
22
import 'package:software/l10n/l10n.dart';
33
import 'package:software/store_app/common/link.dart';
4-
import 'package:software/store_app/common/safe_image.dart';
54
import 'package:yaru_icons/yaru_icons.dart';
65
import 'package:yaru_widgets/yaru_widgets.dart';
76

@@ -46,17 +45,19 @@ class SnapContent extends StatelessWidget {
4645
children: [
4746
InkWell(
4847
onTap: () => Navigator.of(context).pop(),
49-
child: SafeImage(
48+
child: YaruSafeImage(
5049
url: url,
5150
fit: BoxFit.contain,
5251
filterQuality: FilterQuality.medium,
52+
fallBackIconData: YaruIcons.image,
5353
),
5454
)
5555
],
5656
),
5757
),
58-
child: SafeImage(
58+
child: YaruSafeImage(
5959
url: url,
60+
fallBackIconData: YaruIcons.image,
6061
),
6162
)
6263
],

Diff for: ‎lib/store_app/common/snap_page_header.dart

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
import 'package:flutter/material.dart';
22
import 'package:software/l10n/l10n.dart';
3-
import 'package:software/store_app/common/safe_image.dart';
43
import 'package:yaru_icons/yaru_icons.dart';
54
import 'package:yaru_widgets/yaru_widgets.dart';
65

@@ -47,7 +46,7 @@ class SnapPageHeader extends StatelessWidget {
4746
children: [
4847
SizedBox(
4948
height: 65,
50-
child: SafeImage(
49+
child: YaruSafeImage(
5150
url: iconUrl,
5251
fallBackIconData: YaruIcons.package_snap,
5352
),

Diff for: ‎lib/store_app/explore/search_page.dart

+4-3
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ import 'package:provider/provider.dart';
44
import 'package:snapd/snapd.dart';
55
import 'package:software/l10n/l10n.dart';
66
import 'package:software/snapx.dart';
7-
import 'package:software/store_app/common/app_banner.dart';
87
import 'package:software/store_app/common/constants.dart';
98
import 'package:software/store_app/common/snap_dialog.dart';
109
import 'package:software/store_app/explore/explore_model.dart';
@@ -52,7 +51,7 @@ class _SnapSearchPage extends StatelessWidget {
5251
shrinkWrap: true,
5352
children: [
5453
for (final snap in snapshot.data!)
55-
AppBanner(
54+
YaruBanner(
5655
name: snap.name,
5756
summary: snap.summary,
5857
url: snap.iconUrl,
@@ -63,6 +62,7 @@ class _SnapSearchPage extends StatelessWidget {
6362
huskSnapName: snap.name,
6463
),
6564
),
65+
fallbackIconData: YaruIcons.package_snap,
6666
)
6767
],
6868
)
@@ -93,7 +93,7 @@ class _PackageKitSearchPage extends StatelessWidget {
9393
shrinkWrap: true,
9494
children: [
9595
for (final id in snapshot.data!)
96-
AppBanner(
96+
YaruBanner(
9797
name: id.name,
9898
summary: id.version,
9999
icon: const Icon(
@@ -107,6 +107,7 @@ class _PackageKitSearchPage extends StatelessWidget {
107107
id,
108108
),
109109
),
110+
fallbackIconData: YaruIcons.package_deb,
110111
)
111112
],
112113
)

Diff for: ‎lib/store_app/explore/section_banner_grid.dart

+4-2
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,8 @@ import 'package:software/store_app/common/constants.dart';
55
import 'package:software/store_app/common/snap_dialog.dart';
66
import 'package:software/store_app/common/snap_section.dart';
77
import 'package:software/store_app/explore/explore_model.dart';
8-
import 'package:software/store_app/common/app_banner.dart';
8+
import 'package:yaru_icons/yaru_icons.dart';
9+
import 'package:yaru_widgets/yaru_widgets.dart';
910

1011
class SectionBannerGrid extends StatefulWidget {
1112
const SectionBannerGrid({
@@ -39,10 +40,11 @@ class _SectionBannerGridState extends State<SectionBannerGrid> {
3940
shrinkWrap: true,
4041
gridDelegate: kGridDelegate,
4142
children: sections.take(widget.amount).map((snap) {
42-
return AppBanner(
43+
return YaruBanner(
4344
name: snap.name,
4445
summary: snap.summary,
4546
url: snap.iconUrl,
47+
fallbackIconData: YaruIcons.package_snap,
4648
onTap: () => showDialog(
4749
context: context,
4850
builder: (context) => SnapDialog.create(

Diff for: ‎lib/store_app/explore/snap_banner_carousel.dart

+3-2
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@ import 'package:software/snapx.dart';
77
import 'package:software/store_app/common/snap_model.dart';
88
import 'package:software/store_app/common/snap_section.dart';
99
import 'package:software/store_app/explore/explore_model.dart';
10-
import 'package:software/store_app/common/app_banner.dart';
1110
import 'package:software/store_app/common/snap_dialog.dart';
1211
import 'package:software/services/color_generator.dart';
1312
import 'package:ubuntu_service/ubuntu_service.dart';
13+
import 'package:yaru_icons/yaru_icons.dart';
1414
import 'package:yaru_widgets/yaru_widgets.dart';
1515

1616
class SnapBannerCarousel extends StatefulWidget {
@@ -99,7 +99,7 @@ class _AppBannerCarouselItemState extends State<_AppBannerCarouselItem> {
9999
@override
100100
Widget build(BuildContext context) {
101101
final model = context.watch<SnapModel>();
102-
return AppBanner(
102+
return YaruBanner(
103103
watermark: true,
104104
name: widget.snap.name,
105105
summary: widget.snap.summary,
@@ -112,6 +112,7 @@ class _AppBannerCarouselItemState extends State<_AppBannerCarouselItem> {
112112
child: const SnapDialog(),
113113
),
114114
),
115+
fallbackIconData: YaruIcons.package_snap,
115116
);
116117
}
117118
}

Diff for: ‎lib/store_app/my_apps/my_packages_page.dart

+4-3
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
11
import 'package:flutter/material.dart';
22
import 'package:packagekit/packagekit.dart';
33
import 'package:provider/provider.dart';
4-
import 'package:software/store_app/common/app_banner.dart';
54
import 'package:software/store_app/common/constants.dart';
65
import 'package:software/store_app/my_apps/my_packages_model.dart';
76
import 'package:software/store_app/my_apps/package_dialog.dart';
87
import 'package:ubuntu_service/ubuntu_service.dart';
8+
import 'package:yaru_icons/yaru_icons.dart';
9+
import 'package:yaru_widgets/yaru_widgets.dart';
910

1011
class MyPackagesPage extends StatefulWidget {
1112
const MyPackagesPage({Key? key}) : super(key: key);
@@ -39,10 +40,10 @@ class _MyPackagesPageState extends State<MyPackagesPage> {
3940
itemCount: model.packages.length,
4041
itemBuilder: (context, index) {
4142
final package = model.packages[index];
42-
return AppBanner(
43+
return YaruBanner(
4344
name: package.name,
4445
summary: package.version,
45-
isSnap: false,
46+
fallbackIconData: YaruIcons.package_deb,
4647
onTap: () => showDialog(
4748
context: context,
4849
builder: (_) => PackageDialog.create(context, package),

Diff for: ‎lib/store_app/my_apps/my_snaps_page.dart

+4-2
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,12 @@ import 'package:provider/provider.dart';
33
import 'package:snapd/snapd.dart';
44
import 'package:software/services/app_change_service.dart';
55
import 'package:software/snapx.dart';
6-
import 'package:software/store_app/common/app_banner.dart';
76
import 'package:software/store_app/common/constants.dart';
87
import 'package:software/store_app/common/snap_dialog.dart';
98
import 'package:software/store_app/my_apps/my_snaps_model.dart';
109
import 'package:ubuntu_service/ubuntu_service.dart';
10+
import 'package:yaru_icons/yaru_icons.dart';
11+
import 'package:yaru_widgets/yaru_widgets.dart';
1112

1213
class MySnapsPage extends StatefulWidget {
1314
const MySnapsPage({Key? key}) : super(key: key);
@@ -60,10 +61,11 @@ class __MySnapsGridState extends State<_MySnapsGrid> {
6061
itemCount: widget.snaps.length,
6162
itemBuilder: (context, index) {
6263
final snap = widget.snaps.elementAt(index);
63-
return AppBanner(
64+
return YaruBanner(
6465
name: snap.name,
6566
summary: snap.summary,
6667
url: snap.iconUrl,
68+
fallbackIconData: YaruIcons.package_snap,
6769
onTap: () => showDialog(
6870
context: context,
6971
builder: (context) =>

0 commit comments

Comments
 (0)