imporved app bar; added quick actions;

This commit is contained in:
Fabian Freund
2024-07-09 09:26:21 +02:00
parent 28197ef59f
commit a38f50488c
17 changed files with 446 additions and 169 deletions
@@ -1,16 +1,17 @@
import 'package:bang_navigator/features/web_view/domain/entities/web_view_page.dart';
import 'package:bang_navigator/features/web_view/domain/repositories/web_view.dart';
import 'package:bang_navigator/features/web_view/presentation/widgets/favicon.dart';
import 'package:bang_navigator/features/web_view/presentation/widgets/web_view.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:hooks_riverpod/hooks_riverpod.dart';
import 'package:text_scroll/text_scroll.dart';
class AppBarTitle extends HookConsumerWidget {
class AppBarTitle extends HookWidget {
final WebView activeWebView;
final void Function()? onTap;
const AppBarTitle({this.onTap, super.key});
const AppBarTitle({required this.activeWebView, this.onTap, super.key});
Icon _securityStatusIcon(BuildContext context, WebViewPage page) {
if (page.url.isScheme('http')) {
@@ -34,12 +35,7 @@ class AppBarTitle extends HookConsumerWidget {
}
@override
Widget build(BuildContext context, WidgetRef ref) {
final activeWebView = ref.watch(webViewTabControllerProvider);
if (activeWebView == null) {
return const SizedBox.shrink();
}
Widget build(BuildContext context) {
final page = useValueListenable(activeWebView.page);
final theme = Theme.of(context);
@@ -1,13 +1,8 @@
import 'package:bang_navigator/core/routing/routes.dart';
import 'package:bang_navigator/features/search_browser/domain/entities/modes.dart';
import 'package:bang_navigator/features/search_browser/domain/entities/sheet.dart';
import 'package:bang_navigator/features/search_browser/domain/services/create_tab.dart';
import 'package:bang_navigator/features/search_browser/presentation/widgets/error_container.dart';
import 'package:bang_navigator/features/settings/data/models/settings.dart';
import 'package:bang_navigator/features/settings/data/repositories/settings_repository.dart';
import 'package:flutter/material.dart';
import 'package:flutter_markdown/flutter_markdown.dart';
import 'package:flutter_material_design_icons/flutter_material_design_icons.dart';
import 'package:go_router/go_router.dart';
import 'package:hooks_riverpod/hooks_riverpod.dart';
@@ -21,16 +16,9 @@ class LandingAction extends HookConsumerWidget {
),
);
final showEarlyAccessFeatures = ref.watch(
settingsRepositoryProvider.select(
(value) => (value.valueOrNull ?? Settings.withDefaults())
.showEarlyAccessFeatures,
),
);
return Visibility(
visible: sessionTokenAvailable,
replacement: ErrorContainer(
visible: !sessionTokenAvailable,
child: ErrorContainer(
content: Markdown(
shrinkWrap: true,
onTapLink: (text, href, title) async {
@@ -43,40 +31,6 @@ class LandingAction extends HookConsumerWidget {
"You must provide a valid session in order to use Kagi's features.",
),
),
child: Wrap(
spacing: 8.0,
alignment: WrapAlignment.spaceEvenly,
children: [
OutlinedButton.icon(
onPressed: () {
ref.read(createTabStreamProvider.notifier).createTab(
CreateTab(preferredTool: KagiTool.search),
);
},
icon: const Icon(MdiIcons.searchWeb),
label: const Text('Search'),
),
OutlinedButton.icon(
onPressed: () {
ref.read(createTabStreamProvider.notifier).createTab(
CreateTab(preferredTool: KagiTool.summarizer),
);
},
icon: const Icon(MdiIcons.text),
label: const Text('Summarizer'),
),
if (showEarlyAccessFeatures)
OutlinedButton.icon(
onPressed: () {
ref.read(createTabStreamProvider.notifier).createTab(
CreateTab(preferredTool: KagiTool.assistant),
);
},
icon: const Icon(MdiIcons.brain),
label: const Text('Assistant'),
),
],
),
);
}
}
@@ -10,7 +10,6 @@ import 'package:bang_navigator/presentation/hooks/sync_page_tab.dart';
import 'package:expandable_page_view/expandable_page_view.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:hooks_riverpod/hooks_riverpod.dart';
typedef OnSubmitUri = void Function(Uri url);
@@ -18,10 +17,12 @@ typedef OnSubmitUri = void Function(Uri url);
class SharedContentSheet extends HookConsumerWidget {
final CreateTab parameter;
final OnSubmitUri onSubmit;
final void Function(KagiTool tool)? onActiveToolChanged;
const SharedContentSheet({
required this.parameter,
required this.onSubmit,
this.onActiveToolChanged,
super.key,
});
@override
@@ -37,11 +38,12 @@ class SharedContentSheet extends HookConsumerWidget {
() => (parameter.content != null)
? SharedContent.parse(parameter.content!)
: null,
[parameter],
);
final tabController = useTabController(
initialLength: KagiTool.values.length - (showEarlyAccessFeatures ? 0 : 1),
initialIndex: parameter.preferredTool?.index ??
final initialIndex = useMemoized(
() =>
parameter.preferredTool?.index ??
switch (sharedContent) {
SharedText(text: final text) =>
(showEarlyAccessFeatures && text.length > 25)
@@ -52,10 +54,32 @@ class SharedContentSheet extends HookConsumerWidget {
? KagiTool.assistant.index
: KagiTool.search.index,
},
[sharedContent],
);
final tabController = useTabController(
initialLength: KagiTool.values.length - (showEarlyAccessFeatures ? 0 : 1),
initialIndex: initialIndex,
);
final pageController = usePageController(initialPage: tabController.index);
useSyncPageWithTab(tabController, pageController);
useSyncPageWithTab(
tabController,
pageController,
onIndexChanged: (index) {
onActiveToolChanged?.call(KagiTool.values[index]);
},
);
useEffect(
() {
WidgetsBinding.instance.addPostFrameCallback((_) {
onActiveToolChanged?.call(KagiTool.values[initialIndex]);
});
return null;
},
[initialIndex],
);
return Column(
mainAxisSize: MainAxisSize.min,
@@ -63,17 +87,17 @@ class SharedContentSheet extends HookConsumerWidget {
TabBar(
controller: tabController,
tabs: [
const Tab(
icon: Icon(MdiIcons.searchWeb),
Tab(
icon: Icon(KagiTool.search.icon),
text: 'Search',
),
const Tab(
icon: Icon(MdiIcons.text),
Tab(
icon: Icon(KagiTool.summarizer.icon),
text: 'Summarize',
),
if (showEarlyAccessFeatures)
const Tab(
icon: Icon(MdiIcons.brain),
Tab(
icon: Icon(KagiTool.assistant.icon),
text: 'Assistant',
),
],
@@ -15,11 +15,9 @@ class TabsActionButton extends HookConsumerWidget {
return InkWell(
onTap: onTap,
child: Padding(
padding: const EdgeInsets.only(
left: 10.0,
top: 15.0,
right: 10.0,
bottom: 15.0,
padding: const EdgeInsets.symmetric(
horizontal: 8.0,
vertical: 15.0,
),
child: Container(
decoration: BoxDecoration(