Skip to content
This repository was archived by the owner on Apr 3, 2025. It is now read-only.

Commit 781727a

Browse files
committed
fix(uiux): remove fading edge on horizontal scrollviews
1 parent 7c8e17e commit 781727a

File tree

12 files changed

+56
-64
lines changed

12 files changed

+56
-64
lines changed

lib/main.dart

-1
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,6 @@ class LunaBIOS extends StatelessWidget {
8181
supportedLocales: context.supportedLocales,
8282
locale: context.locale,
8383
builder: DevicePreview.appBuilder,
84-
useInheritedMediaQuery: true,
8584
darkTheme: theme.activeTheme(),
8685
theme: theme.activeTheme(),
8786
title: 'LunaSea',

lib/modules/lidarr/routes/catalogue.dart

+5-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,11 @@ class _State extends State<LidarrCatalogue>
3030
Future<void> loadCallback() async {
3131
if (mounted) setState(() => _results = []);
3232
final _api = LidarrAPI.from(LunaProfile.current);
33-
if (mounted) setState(() => {_future = _api.getAllArtists()});
33+
if (mounted) {
34+
setState(() {
35+
_future = _api.getAllArtists();
36+
});
37+
}
3438
}
3539

3640
void _refreshState() => setState(() {});

lib/modules/lidarr/routes/edit_artist.dart

+5-1
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,11 @@ class _State extends State<ArtistEditRoute> with LunaScrollControllerMixin {
4646
bottomNavigationBar: _bottomActionBar(),
4747
);
4848

49-
Future<void> _refresh() async => setState(() => {_future = _fetch()});
49+
Future<void> _refresh() async {
50+
setState(() {
51+
_future = _fetch();
52+
});
53+
}
5054

5155
Future<bool> _fetch() async {
5256
final _api = LidarrAPI.from(LunaProfile.current);

lib/modules/lidarr/routes/search_results.dart

+3-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,9 @@ class _State extends State<ArtistAlbumReleasesRoute>
2727
Future<void> loadCallback() async {
2828
if (mounted) setState(() => _results = []);
2929
final _api = LidarrAPI.from(LunaProfile.current);
30-
setState(() => {_future = _api.getReleases(widget.albumId)});
30+
setState(() {
31+
_future = _api.getReleases(widget.albumId);
32+
});
3133
//Clear the search filter using a microtask
3234
Future.microtask(
3335
() => context.read<LidarrState>().searchReleasesFilter = '');

lib/modules/nzbget/routes/statistics.dart

+6-2
Original file line numberDiff line numberDiff line change
@@ -40,11 +40,15 @@ class _State extends State<StatisticsRoute> with LunaScrollControllerMixin {
4040
}
4141

4242
Future<void> _fetchStatistics(NZBGetAPI api) async {
43-
return await api.getStatistics().then((stats) => {_statistics = stats});
43+
return await api.getStatistics().then((stats) {
44+
_statistics = stats;
45+
});
4446
}
4547

4648
Future<void> _fetchLogs(NZBGetAPI api) async {
47-
return await api.getLogs().then((logs) => {_logs = logs});
49+
return await api.getLogs().then((logs) {
50+
_logs = logs;
51+
});
4852
}
4953

5054
@override

lib/modules/sonarr/routes/upcoming/route.dart

+7-7
Original file line numberDiff line numberDiff line change
@@ -100,13 +100,13 @@ class _State extends State<SonarrUpcomingRoute>
100100
List<List<Widget>> _episodeWidgets = [];
101101
_episodeMap.keys.toList()
102102
..sort()
103-
..forEach((key) => {
104-
_episodeWidgets.add(_buildDay(
105-
(_episodeMap[key]!['date'] as String?),
106-
(_episodeMap[key]!['entries'] as List).cast<SonarrCalendar>(),
107-
series,
108-
)),
109-
});
103+
..forEach((key) {
104+
_episodeWidgets.add(_buildDay(
105+
(_episodeMap[key]!['date'] as String?),
106+
(_episodeMap[key]!['entries'] as List).cast<SonarrCalendar>(),
107+
series,
108+
));
109+
});
110110
// Return the list
111111
return LunaListView(
112112
controller: SonarrNavigationBar.scrollControllers[1],

lib/vendor.dart

-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ export 'dart:typed_data';
77
export 'package:dio/dio.dart';
88
export 'package:easy_localization/easy_localization.dart';
99
export 'package:expandable/expandable.dart';
10-
export 'package:fading_edge_scrollview/fading_edge_scrollview.dart';
1110
export 'package:flash/flash.dart';
1211
export 'package:flutter_riverpod/flutter_riverpod.dart';
1312
export 'package:go_router/go_router.dart';

lib/widgets/ui/appbar.dart

+5-8
Original file line numberDiff line numberDiff line change
@@ -282,14 +282,11 @@ class _State extends State<LunaAppBar> {
282282
mainAxisSize: MainAxisSize.min,
283283
children: [
284284
Flexible(
285-
child: FadingEdgeScrollView.fromSingleChildScrollView(
286-
child: SingleChildScrollView(
287-
controller: ScrollController(),
288-
scrollDirection: Axis.horizontal,
289-
child: Text(
290-
widget.title!,
291-
style: const TextStyle(fontSize: LunaUI.FONT_SIZE_H1),
292-
),
285+
child: SingleChildScrollView(
286+
scrollDirection: Axis.horizontal,
287+
child: Text(
288+
widget.title!,
289+
style: const TextStyle(fontSize: LunaUI.FONT_SIZE_H1),
293290
),
294291
),
295292
),

lib/widgets/ui/block/block.dart

+3-6
Original file line numberDiff line numberDiff line change
@@ -388,12 +388,9 @@ class LunaBlock extends StatelessWidget {
388388
required Widget child,
389389
Axis scrollDirection = Axis.horizontal,
390390
}) {
391-
return FadingEdgeScrollView.fromSingleChildScrollView(
392-
child: SingleChildScrollView(
393-
controller: ScrollController(),
394-
scrollDirection: scrollDirection,
395-
child: child,
396-
),
391+
return SingleChildScrollView(
392+
scrollDirection: scrollDirection,
393+
child: child,
397394
);
398395
}
399396
}

lib/widgets/ui/block/grid_block.dart

+22-27
Original file line numberDiff line numberDiff line change
@@ -138,22 +138,19 @@ class LunaGridBlock extends StatelessWidget {
138138
Widget _title() {
139139
return Container(
140140
child: Padding(
141-
child: FadingEdgeScrollView.fromSingleChildScrollView(
142-
child: SingleChildScrollView(
143-
controller: ScrollController(),
144-
scrollDirection: Axis.horizontal,
145-
child: RichText(
146-
text: TextSpan(
147-
style: const TextStyle(
148-
fontSize: LunaUI.FONT_SIZE_H3,
149-
color: LunaColours.white,
150-
fontWeight: LunaUI.FONT_WEIGHT_BOLD,
151-
),
152-
text: title,
141+
child: SingleChildScrollView(
142+
scrollDirection: Axis.horizontal,
143+
child: RichText(
144+
text: TextSpan(
145+
style: const TextStyle(
146+
fontSize: LunaUI.FONT_SIZE_H3,
147+
color: LunaColours.white,
148+
fontWeight: LunaUI.FONT_WEIGHT_BOLD,
153149
),
154-
overflow: TextOverflow.visible,
155-
softWrap: false,
150+
text: title,
156151
),
152+
overflow: TextOverflow.visible,
153+
softWrap: false,
157154
),
158155
),
159156
padding: LunaUI.MARGIN_DEFAULT_HORIZONTAL,
@@ -166,21 +163,19 @@ class LunaGridBlock extends StatelessWidget {
166163
Widget _subtitle() {
167164
return Container(
168165
child: Padding(
169-
child: FadingEdgeScrollView.fromSingleChildScrollView(
170-
child: SingleChildScrollView(
171-
controller: ScrollController(),
172-
scrollDirection: Axis.horizontal,
173-
child: RichText(
174-
text: TextSpan(
175-
style: const TextStyle(
176-
fontSize: LunaUI.FONT_SIZE_H3,
177-
color: LunaColours.grey,
178-
),
179-
children: [subtitle],
166+
child: SingleChildScrollView(
167+
controller: ScrollController(),
168+
scrollDirection: Axis.horizontal,
169+
child: RichText(
170+
text: TextSpan(
171+
style: const TextStyle(
172+
fontSize: LunaUI.FONT_SIZE_H3,
173+
color: LunaColours.grey,
180174
),
181-
overflow: TextOverflow.visible,
182-
softWrap: false,
175+
children: [subtitle],
183176
),
177+
overflow: TextOverflow.visible,
178+
softWrap: false,
184179
),
185180
),
186181
padding: LunaUI.MARGIN_DEFAULT_HORIZONTAL,

pubspec.lock

-8
Original file line numberDiff line numberDiff line change
@@ -369,14 +369,6 @@ packages:
369369
url: "https://pub.dev"
370370
source: hosted
371371
version: "5.0.1"
372-
fading_edge_scrollview:
373-
dependency: "direct main"
374-
description:
375-
name: fading_edge_scrollview
376-
sha256: c25c2231652ce774cc31824d0112f11f653881f43d7f5302c05af11942052031
377-
url: "https://pub.dev"
378-
source: hosted
379-
version: "3.0.0"
380372
fake_async:
381373
dependency: transitive
382374
description:

pubspec.yaml

-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ dependencies:
2020
email_validator: ^2.1.17
2121
encrypt: ^5.0.1
2222
expandable: ^5.0.1
23-
fading_edge_scrollview: ^3.0.0
2423
file_picker: ^5.2.6
2524
firebase_auth: ^4.3.0
2625
firebase_core: ^2.8.0

0 commit comments

Comments
 (0)