added fading scroll; widget refactorings

This commit is contained in:
Fabian Freund
2024-08-28 15:52:21 +02:00
parent 7fedbe260c
commit 7708f46f15
11 changed files with 622 additions and 571 deletions
@@ -10,7 +10,7 @@ FutureOr<bool> widgetPinnable(WidgetPinnableRef ref) async {
return await HomeWidget.isRequestPinWidgetSupported() ?? false; return await HomeWidget.isRequestPinWidgetSupported() ?? false;
} }
@riverpod @Riverpod()
Raw<Stream<ReceivedParameter>> appWidgetLaunchStream( Raw<Stream<ReceivedParameter>> appWidgetLaunchStream(
AppWidgetLaunchStreamRef ref, AppWidgetLaunchStreamRef ref,
) { ) {
@@ -22,7 +22,7 @@ final widgetPinnableProvider = FutureProvider<bool>.internal(
typedef WidgetPinnableRef = FutureProviderRef<bool>; typedef WidgetPinnableRef = FutureProviderRef<bool>;
String _$appWidgetLaunchStreamHash() => String _$appWidgetLaunchStreamHash() =>
r'1cda869c62e270be74efcb9b052bc498cfbd98a5'; r'8c5e21346d492f89f546b4e32135a283719e70e1';
/// See also [appWidgetLaunchStream]. /// See also [appWidgetLaunchStream].
@ProviderFor(appWidgetLaunchStream) @ProviderFor(appWidgetLaunchStream)
@@ -1,3 +1,4 @@
import 'package:fading_scroll/fading_scroll.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter_hooks/flutter_hooks.dart'; import 'package:flutter_hooks/flutter_hooks.dart';
import 'package:go_router/go_router.dart'; import 'package:go_router/go_router.dart';
@@ -26,7 +27,11 @@ class BangCategoriesScreen extends HookConsumerWidget {
), ),
body: categoriesAsync.when( body: categoriesAsync.when(
data: (categories) { data: (categories) {
return FadingScroll(
fadingSize: 25,
builder: (context, controller) {
return SingleChildScrollView( return SingleChildScrollView(
controller: controller,
child: HookBuilder( child: HookBuilder(
builder: (context) { builder: (context) {
final expanded = useState(<String>{}); final expanded = useState(<String>{});
@@ -77,6 +82,8 @@ class BangCategoriesScreen extends HookConsumerWidget {
), ),
); );
}, },
);
},
error: (error, stackTrace) => Center( error: (error, stackTrace) => Center(
child: FailureWidget( child: FailureWidget(
title: 'Failed to load Bang Categories', title: 'Failed to load Bang Categories',
@@ -1,5 +1,6 @@
import 'dart:async'; import 'dart:async';
import 'package:fading_scroll/fading_scroll.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter_hooks/flutter_hooks.dart'; import 'package:flutter_hooks/flutter_hooks.dart';
import 'package:go_router/go_router.dart'; import 'package:go_router/go_router.dart';
@@ -61,7 +62,11 @@ class BangSearchScreen extends HookConsumerWidget {
), ),
body: resultsAsync.when( body: resultsAsync.when(
skipLoadingOnReload: true, skipLoadingOnReload: true,
data: (bangs) => ListView.builder( data: (bangs) => FadingScroll(
fadingSize: 25,
builder: (context, controller) {
return ListView.builder(
controller: controller,
itemCount: bangs.length, itemCount: bangs.length,
itemBuilder: (context, index) { itemBuilder: (context, index) {
final bang = bangs[index]; final bang = bangs[index];
@@ -82,6 +87,8 @@ class BangSearchScreen extends HookConsumerWidget {
}, },
); );
}, },
);
},
), ),
error: (error, stackTrace) => Center( error: (error, stackTrace) => Center(
child: FailureWidget( child: FailureWidget(
@@ -1,3 +1,4 @@
import 'package:fading_scroll/fading_scroll.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:go_router/go_router.dart'; import 'package:go_router/go_router.dart';
import 'package:hooks_riverpod/hooks_riverpod.dart'; import 'package:hooks_riverpod/hooks_riverpod.dart';
@@ -29,7 +30,11 @@ class ChatArchiveListScreen extends HookConsumerWidget {
enabled: chatsAsync.isLoading, enabled: chatsAsync.isLoading,
child: chatsAsync.when( child: chatsAsync.when(
data: (chats) { data: (chats) {
return FadingScroll(
fadingSize: 25,
builder: (context, controller) {
return ListView.builder( return ListView.builder(
controller: controller,
itemCount: chats.length, itemCount: chats.length,
itemBuilder: (context, index) { itemBuilder: (context, index) {
final chat = chats[index]; final chat = chats[index];
@@ -41,7 +46,10 @@ class ChatArchiveListScreen extends HookConsumerWidget {
: null, : null,
onTap: () async { onTap: () async {
await context.push( await context.push(
ChatArchiveDetailRoute(fileName: chat.fileName).location, ChatArchiveDetailRoute(fileName: chat.fileName)
.location,
);
},
); );
}, },
); );
@@ -1,5 +1,6 @@
import 'dart:async'; import 'dart:async';
import 'package:fading_scroll/fading_scroll.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter_hooks/flutter_hooks.dart'; import 'package:flutter_hooks/flutter_hooks.dart';
import 'package:flutter_markdown/flutter_markdown.dart'; import 'package:flutter_markdown/flutter_markdown.dart';
@@ -60,7 +61,11 @@ class ChatArchiveSearchScreen extends HookConsumerWidget {
), ),
body: resultsAsync.when( body: resultsAsync.when(
skipLoadingOnReload: true, skipLoadingOnReload: true,
data: (chats) => ListView.builder( data: (chats) => FadingScroll(
fadingSize: 25,
builder: (context, controller) {
return ListView.builder(
controller: controller,
itemCount: chats.length, itemCount: chats.length,
itemBuilder: (context, index) { itemBuilder: (context, index) {
final chat = chats[index]; final chat = chats[index];
@@ -71,7 +76,8 @@ class ChatArchiveSearchScreen extends HookConsumerWidget {
child: InkWell( child: InkWell(
onTap: () async { onTap: () async {
await context.push( await context.push(
ChatArchiveDetailRoute(fileName: chat.fileName).location, ChatArchiveDetailRoute(fileName: chat.fileName)
.location,
); );
}, },
child: Padding( child: Padding(
@@ -86,7 +92,9 @@ class ChatArchiveSearchScreen extends HookConsumerWidget {
data: '## ${chat.title}', data: '## ${chat.title}',
), ),
if (chatEntity.dateTime != null) if (chatEntity.dateTime != null)
Text(chatEntity.dateTime!.formatWithMinutePrecision()), Text(
chatEntity.dateTime!.formatWithMinutePrecision(),
),
const SizedBox(height: 8.0), const SizedBox(height: 8.0),
Markdown( Markdown(
shrinkWrap: true, shrinkWrap: true,
@@ -99,6 +107,8 @@ class ChatArchiveSearchScreen extends HookConsumerWidget {
), ),
); );
}, },
);
},
), ),
error: (error, stackTrace) => Center( error: (error, stackTrace) => Center(
child: FailureWidget( child: FailureWidget(
@@ -1,17 +1,15 @@
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter_hooks/flutter_hooks.dart';
import 'package:flutter_material_design_icons/flutter_material_design_icons.dart'; import 'package:flutter_material_design_icons/flutter_material_design_icons.dart';
import 'package:lensai/features/web_view/domain/entities/web_view_page.dart'; import 'package:lensai/features/web_view/domain/entities/web_view_page.dart';
import 'package:lensai/features/web_view/presentation/widgets/favicon.dart'; import 'package:lensai/features/web_view/presentation/widgets/favicon.dart';
import 'package:lensai/features/web_view/presentation/widgets/web_view.dart';
import 'package:text_scroll/text_scroll.dart'; import 'package:text_scroll/text_scroll.dart';
class AppBarTitle extends HookWidget { class AppBarTitle extends StatelessWidget {
final WebView activeWebView; final WebViewPage page;
final void Function()? onTap; final void Function()? onTap;
const AppBarTitle({required this.activeWebView, this.onTap, super.key}); const AppBarTitle({required this.page, this.onTap, super.key});
Icon _securityStatusIcon(BuildContext context, WebViewPage page) { Icon _securityStatusIcon(BuildContext context, WebViewPage page) {
if (page.url.isScheme('http')) { if (page.url.isScheme('http')) {
@@ -36,8 +34,6 @@ class AppBarTitle extends HookWidget {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
final page = useValueListenable(activeWebView.page);
final theme = Theme.of(context); final theme = Theme.of(context);
return GestureDetector( return GestureDetector(
onTap: onTap, onTap: onTap,
@@ -1,3 +1,4 @@
import 'package:fading_scroll/fading_scroll.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter/services.dart' show rootBundle; import 'package:flutter/services.dart' show rootBundle;
import 'package:flutter_markdown/flutter_markdown.dart'; import 'package:flutter_markdown/flutter_markdown.dart';
@@ -22,19 +23,27 @@ class LandingContent extends HookConsumerWidget {
() async => rootBundle.loadString('assets/landing/changelog.md'), () async => rootBundle.loadString('assets/landing/changelog.md'),
); );
return FadingScroll(
fadingSize: 25,
builder: (context, controller) {
return SingleChildScrollView( return SingleChildScrollView(
controller: controller,
child: Column( child: Column(
children: [ children: [
Text( Text(
'Lensai', 'Lensai',
style: textTheme.titleLarge?.copyWith(fontWeight: FontWeight.bold), style:
textTheme.titleLarge?.copyWith(fontWeight: FontWeight.bold),
textAlign: TextAlign.center, textAlign: TextAlign.center,
), ),
Text( Padding(
padding: const EdgeInsets.symmetric(horizontal: 16.0),
child: Text(
'The Privacy-Focused & AI-Powered Research Browser with Kagi integration', 'The Privacy-Focused & AI-Powered Research Browser with Kagi integration',
style: textTheme.titleMedium, style: textTheme.titleMedium,
textAlign: TextAlign.center, textAlign: TextAlign.center,
), ),
),
FractionallySizedBox( FractionallySizedBox(
widthFactor: 0.5, widthFactor: 0.5,
child: Image.asset('assets/icon/icon.png'), child: Image.asset('assets/icon/icon.png'),
@@ -90,7 +99,8 @@ class LandingContent extends HookConsumerWidget {
child: FilledButton.tonalIcon( child: FilledButton.tonalIcon(
onPressed: () async { onPressed: () async {
await ref await ref
.read(appInitializationServiceProvider.notifier) .read(
appInitializationServiceProvider.notifier)
.reinitialize(); .reinitialize();
}, },
style: OutlinedButton.styleFrom( style: OutlinedButton.styleFrom(
@@ -120,7 +130,8 @@ class LandingContent extends HookConsumerWidget {
), ),
Text( Text(
'Changelog', 'Changelog',
style: textTheme.titleLarge?.copyWith(fontWeight: FontWeight.bold), style:
textTheme.titleLarge?.copyWith(fontWeight: FontWeight.bold),
textAlign: TextAlign.center, textAlign: TextAlign.center,
), ),
Markdown( Markdown(
@@ -132,5 +143,7 @@ class LandingContent extends HookConsumerWidget {
], ],
), ),
); );
},
);
} }
} }
@@ -1,3 +1,4 @@
import 'package:fading_scroll/fading_scroll.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter_hooks/flutter_hooks.dart'; import 'package:flutter_hooks/flutter_hooks.dart';
import 'package:flutter_markdown/flutter_markdown.dart'; import 'package:flutter_markdown/flutter_markdown.dart';
@@ -82,7 +83,11 @@ class SettingsScreen extends HookConsumerWidget {
return Scaffold( return Scaffold(
appBar: AppBar(title: const Text('Settings')), appBar: AppBar(title: const Text('Settings')),
body: ListView( body: FadingScroll(
fadingSize: 25,
builder: (context, controller) {
return ListView(
controller: controller,
children: [ children: [
_buildSection(theme, 'Kagi'), _buildSection(theme, 'Kagi'),
Padding( Padding(
@@ -137,8 +142,8 @@ class SettingsScreen extends HookConsumerWidget {
value: settings.showEarlyAccessFeatures, value: settings.showEarlyAccessFeatures,
onChanged: (value) async { onChanged: (value) async {
await ref.read(saveSettingsControllerProvider.notifier).save( await ref.read(saveSettingsControllerProvider.notifier).save(
(currentSettings) => (currentSettings) => currentSettings.copyWith
currentSettings.copyWith.showEarlyAccessFeatures(value), .showEarlyAccessFeatures(value),
); );
}, },
), ),
@@ -147,7 +152,8 @@ class SettingsScreen extends HookConsumerWidget {
), ),
_buildSection(theme, 'General'), _buildSection(theme, 'General'),
Padding( Padding(
padding: const EdgeInsets.symmetric(horizontal: 16.0, vertical: 8), padding:
const EdgeInsets.symmetric(horizontal: 16.0, vertical: 8),
child: Column( child: Column(
mainAxisSize: MainAxisSize.min, mainAxisSize: MainAxisSize.min,
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
@@ -180,8 +186,8 @@ class SettingsScreen extends HookConsumerWidget {
await ref await ref
.read(saveSettingsControllerProvider.notifier) .read(saveSettingsControllerProvider.notifier)
.save( .save(
(currentSettings) => (currentSettings) => currentSettings.copyWith
currentSettings.copyWith.themeMode(value.first), .themeMode(value.first),
); );
}, },
), ),
@@ -292,7 +298,8 @@ class SettingsScreen extends HookConsumerWidget {
), ),
], ],
selected: { selected: {
if (settings.quickAction != null) settings.quickAction!, if (settings.quickAction != null)
settings.quickAction!,
}, },
onSelectionChanged: (value) async { onSelectionChanged: (value) async {
await ref await ref
@@ -336,8 +343,8 @@ class SettingsScreen extends HookConsumerWidget {
value: settings.enableContentBlocking, value: settings.enableContentBlocking,
onChanged: (value) async { onChanged: (value) async {
await ref.read(saveSettingsControllerProvider.notifier).save( await ref.read(saveSettingsControllerProvider.notifier).save(
(currentSettings) => (currentSettings) => currentSettings.copyWith
currentSettings.copyWith.enableContentBlocking(value), .enableContentBlocking(value),
); );
}, },
), ),
@@ -347,7 +354,8 @@ class SettingsScreen extends HookConsumerWidget {
enableHostLists: settings.enableHostList, enableHostLists: settings.enableHostList,
source: HostSource.stevenBlackUnified, source: HostSource.stevenBlackUnified,
title: 'StevenBlack: Unified', title: 'StevenBlack: Unified',
subtitle: 'Blocks domains containing adware, malware and trackers.', subtitle:
'Blocks domains containing adware, malware and trackers.',
), ),
HostListTile( HostListTile(
enableContentBlocking: settings.enableContentBlocking, enableContentBlocking: settings.enableContentBlocking,
@@ -453,6 +461,8 @@ class SettingsScreen extends HookConsumerWidget {
subtitle: 'Automatically syncs every 7 days', subtitle: 'Automatically syncs every 7 days',
), ),
], ],
);
},
), ),
); );
} }
@@ -47,7 +47,7 @@ final _sharingIntentTransformer =
}, },
); );
@riverpod @Riverpod()
Raw<Stream<ReceivedParameter>> sharingIntentStream(SharingIntentStreamRef ref) { Raw<Stream<ReceivedParameter>> sharingIntentStream(SharingIntentStreamRef ref) {
final initialStream = FlutterSharingIntent.instance final initialStream = FlutterSharingIntent.instance
// ignore: discarded_futures // ignore: discarded_futures
@@ -7,7 +7,7 @@ part of 'sharing_intent.dart';
// ************************************************************************** // **************************************************************************
String _$sharingIntentStreamHash() => String _$sharingIntentStreamHash() =>
r'e396c15da84d6e726f9e77996ef9d2422f6269e1'; r'ce060aadf885ab0a14d90acfe986447ecb05f4f9';
/// See also [sharingIntentStream]. /// See also [sharingIntentStream].
@ProviderFor(sharingIntentStream) @ProviderFor(sharingIntentStream)