MrBlake/MrbWebLibre
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

added fading scroll; widget refactorings

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