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

refactor page info

Browse Source
This commit is contained in:
Fabian Freund
2025-08-01 20:51:16 +02:00
parent a3d0eadac3
commit f6c68b8431
4 changed files with 77 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/lib/presentation/widgets/website_feed_tile.dart
+5 -8
View File
@@ -24,24 +24,21 @@ import 'package:hooks_riverpod/hooks_riverpod.dart';
import 'package:nullability/nullability.dart';
import 'package:skeletonizer/skeletonizer.dart';
import 'package:weblibre/core/routing/routes.dart';
import 'package:weblibre/data/models/web_page_info.dart';
import 'package:weblibre/features/geckoview/domain/entities/states/tab.dart';
import 'package:weblibre/presentation/controllers/website_title.dart';
import 'package:weblibre/presentation/widgets/rounded_text.dart';
class WebsiteFeedTile extends HookConsumerWidget {
final Uri url;
final WebPageInfo? precachedInfo;
final TabState initialTabState;
const WebsiteFeedTile(this.url, {this.precachedInfo, super.key});
const WebsiteFeedTile(this.initialTabState, {super.key});
@override
Widget build(BuildContext context, WidgetRef ref) {
final pageInfoAsync = ref.watch(
completePageInfoProvider(url, precachedInfo),
);
final pageInfoAsync = ref.watch(completePageInfoProvider(initialTabState));
return Skeletonizer(
enabled: pageInfoAsync.isLoading && precachedInfo?.feeds == null,
enabled: pageInfoAsync.isLoading && initialTabState.feeds == null,
child: pageInfoAsync.when(
skipLoadingOnReload: true,
data: (info) {
app/lib/presentation/widgets/website_title_tile.dart
+21 -28
View File
@@ -19,25 +19,23 @@
*/
import 'package:flutter/material.dart';
import 'package:hooks_riverpod/hooks_riverpod.dart';
import 'package:nullability/nullability.dart';
import 'package:skeletonizer/skeletonizer.dart';
import 'package:weblibre/data/models/web_page_info.dart';
import 'package:weblibre/features/geckoview/domain/entities/states/tab.dart';
import 'package:weblibre/presentation/controllers/website_title.dart';
import 'package:weblibre/presentation/widgets/failure_widget.dart';
class WebsiteTitleTile extends HookConsumerWidget {
final Uri url;
final WebPageInfo? precachedInfo;
final TabState initialTabState;
const WebsiteTitleTile(this.url, {this.precachedInfo, super.key});
const WebsiteTitleTile(this.initialTabState, {super.key});
@override
Widget build(BuildContext context, WidgetRef ref) {
final pageInfoAsync = ref.watch(
completePageInfoProvider(url, precachedInfo),
);
final pageInfoAsync = ref.watch(completePageInfoProvider(initialTabState));
return Skeletonizer(
enabled: pageInfoAsync.isLoading && precachedInfo == null,
enabled: pageInfoAsync.isLoading,
child: pageInfoAsync.when(
skipLoadingOnReload: true,
data: (info) {
@@ -49,36 +47,31 @@ class WebsiteTitleTile extends HookConsumerWidget {
),
contentPadding: EdgeInsets.zero,
title: Text(
info.title ?? 'Unknown Title',
info.title.whenNotEmpty ?? 'Untitled',
maxLines: 6,
overflow: TextOverflow.ellipsis,
),
subtitle: Text(url.authority),
subtitle: Text(initialTabState.url.authority),
);
},
error: (error, stackTrace) {
return FailureWidget(
title: error.toString(),
onRetry: () =>
ref.refresh(pageInfoProvider(url, isImageRequest: false)),
onRetry: () => ref.refresh(
pageInfoProvider(initialTabState.url, isImageRequest: false),
),
);
},
loading: () => (precachedInfo != null)
? ListTile(
leading: RawImage(
image: precachedInfo!.favicon?.image.value,
height: 24,
width: 24,
),
contentPadding: EdgeInsets.zero,
title: Text(precachedInfo!.title ?? 'Unknown Title'),
subtitle: Text(url.authority),
)
: const ListTile(
contentPadding: EdgeInsets.zero,
title: Bone.text(),
subtitle: Bone.text(),
),
loading: () => ListTile(
leading: RawImage(
image: initialTabState.favicon?.image.value,
height: 24,
width: 24,
),
contentPadding: EdgeInsets.zero,
title: Text(initialTabState.title.whenNotEmpty ?? 'Untitled'),
subtitle: Text(initialTabState.url.authority),
),
),
);
}