admin/linkding-ios
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

Improved favicons load

Browse Source
This commit is contained in:
Juan Gilsanz Polo
2025-04-03 22:05:30 +02:00
parent 63aca1f3a5
commit f330c2f6b5
11 changed files with 24 additions and 197 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/constants/urls.dart
View File

@@ -5,4 +5,6 @@ class Urls {
static const playStoreLink = "https://play.google.com/store/apps/details?id=com.jgeek00.linkdy&pcampaignid=web_share";
static const linkdingRepo = "https://github.com/sissbruecker/linkding";
static const support = "https://appsupport.jgeek00.com";
static gstatic(url) =>
"https://t2.gstatic.com/faviconV2?client=SOCIAL&type=FAVICON&fallback_opts=TYPE,SIZE,URL&url=${url}&size=16";
}

5
lib/providers/app_status.provider.dart
View File

@@ -2,7 +2,6 @@ import 'package:flutter/material.dart';
import 'package:flutter/scheduler.dart';
import 'package:riverpod_annotation/riverpod_annotation.dart';
import 'package:linkdy/screens/bookmarks/provider/favicon_loader.provider.dart';
import 'package:linkdy/constants/shared_preferences_keys.dart';
import 'package:linkdy/providers/shared_preferences.provider.dart';
import 'package:linkdy/constants/enums.dart';
@@ -59,7 +58,6 @@ class AppStatus extends _$AppStatus {
void setShowFavicon(bool value) {
state.showFavicon = value;
ref.read(sharedPreferencesProvider).setBool(SharedPreferencesKeys.showFavicon, value);
ref.read(faviconStoreProvider.notifier).clearFavicons();
ref.notifyListeners();
}
@@ -89,8 +87,5 @@ ThemeMode selectedTheme(SelectedThemeRef ref) {
case SelectedTheme.dark:
return ThemeMode.dark;
default:
return ThemeMode.light;
}
}

4
lib/screens/bookmarks/provider/bookmarks.provider.dart
View File

@@ -4,7 +4,6 @@ import 'package:riverpod_annotation/riverpod_annotation.dart';
import 'package:linkdy/screens/webview/ui/webview.dart';
import 'package:linkdy/screens/bookmarks/provider/common_functions.dart';
import 'package:linkdy/screens/bookmarks/provider/favicon_loader.provider.dart';
import 'package:linkdy/screens/bookmarks/model/bookmarks.model.dart';
import 'package:linkdy/config/sizes.dart';
@@ -35,7 +34,6 @@ FutureOr<void> bookmarksRequest(
);
if (result.successful == true) {
ref.read(faviconStoreProvider.notifier).loadFavicons(result.content!.results!);
ref.read(bookmarksProvider).bookmarks = result.content!.results!;
ref.read(bookmarksProvider).maxNumber = result.content!.count!;
ref.read(bookmarksProvider).currentPage = 0;
@@ -65,7 +63,7 @@ FutureOr<void> bookmarksRequestLoadMore(BookmarksRequestLoadMoreRef ref) async {
);
if (result.successful == true) {
ref.read(faviconStoreProvider.notifier).loadFavicons(result.content!.results!);
// ref.read(faviconStoreProvider.notifier).loadFavicons(result.content!.results!);
provider.bookmarks = [...provider.bookmarks, ...result.content!.results!];
provider.maxNumber = result.content!.count!;
provider.currentPage = provider.currentPage + 1;

94
lib/screens/bookmarks/provider/favicon_loader.provider.dart
View File

@@ -1,94 +0,0 @@
import 'package:flutter/foundation.dart';
import 'package:favicon/favicon.dart';
import 'package:riverpod_annotation/riverpod_annotation.dart';
import 'package:linkdy/screens/bookmarks/model/favicon_loader.model.dart';
import 'package:linkdy/models/favicon_item.dart';
import 'package:linkdy/models/data/bookmarks.dart';
part 'favicon_loader.provider.g.dart';
// @riverpod
// FutureOr<FaviconItem?> fetchFavicon(FetchFaviconRef ref, String bookmarkUrl) async {
// final exists = ref.watch(faviconStoreProvider).favicons.where((favicon) => favicon.url == bookmarkUrl).toList();
// if (exists.isNotEmpty) {
// return exists[0];
// }
// final faviconResult = await FaviconFinder.getBest(bookmarkUrl);
// if (faviconResult == null) {
// return null;
// }
// final result = await http.get(Uri.parse(faviconResult.url));
// if (result.statusCode == 200) {
// final faviconItem = FaviconItem(
// url: bookmarkUrl,
// favicon: faviconResult.url.contains("svg") ? result.body : base64.encode(result.bodyBytes),
// isSvg: faviconResult.url.contains("svg"),
// );
// ref.read(faviconStoreProvider).favicons.add(faviconItem);
// return faviconItem;
// } else {
// return null;
// }
// }
@Riverpod(keepAlive: true)
class FaviconStore extends _$FaviconStore {
@override
FaviconLoaderModel build() {
return FaviconLoaderModel(
favicons: [],
);
}
void clearFavicons() {
state.favicons = [];
}
void loadFavicons(List<Bookmark> bookmarks) async {
if (state.loadingFavicons == true) return;
state.loadingFavicons = true;
ref.notifyListeners();
final mappedSaved = state.favicons.map((e) => e.url);
final notExist = bookmarks.map((b) => b.url!).where((b) => !mappedSaved.contains(b)).toList();
final favicons = await compute(
(message) => Future.wait(
message.map(
(e) {
try {
return FaviconFinder.getBest(e);
} catch (_) {
return Future.delayed(Duration.zero);
}
},
),
),
notExist,
);
final faviconUrls = favicons
.asMap()
.entries
.map(
(e) => e.value != null
? FaviconItem(
url: notExist[e.key],
favicon: e.value!.url,
isSvg: e.value!.url.contains('svg'),
)
: null,
)
.toList();
faviconUrls.removeWhere((v) => v == null);
state.favicons = [...state.favicons, ...List<FaviconItem>.from(faviconUrls)];
state.loadingFavicons = false;
ref.notifyListeners();
}
}

25
lib/screens/bookmarks/provider/favicon_loader.provider.g.dart
View File

@@ -1,25 +0,0 @@
// GENERATED CODE - DO NOT MODIFY BY HAND
part of 'favicon_loader.provider.dart';
// **************************************************************************
// RiverpodGenerator
// **************************************************************************
String _$faviconStoreHash() => r'5575f5daff34748e6cae0143c8633cbbe19b6009';
/// See also [FaviconStore].
@ProviderFor(FaviconStore)
final faviconStoreProvider =
NotifierProvider<FaviconStore, FaviconLoaderModel>.internal(
FaviconStore.new,
name: r'faviconStoreProvider',
debugGetCreateSourceHash:
const bool.fromEnvironment('dart.vm.product') ? null : _$faviconStoreHash,
dependencies: null,
allTransitiveDependencies: null,
);
typedef _$FaviconStore = Notifier<FaviconLoaderModel>;
// ignore_for_file: type=lint
// ignore_for_file: subtype_of_sealed_class, invalid_use_of_internal_member, invalid_use_of_visible_for_testing_member

4
lib/screens/bookmarks/provider/search_bookmarks.provider.dart
View File

@@ -3,7 +3,6 @@ import 'package:go_router/go_router.dart';
import 'package:riverpod_annotation/riverpod_annotation.dart';
import 'package:linkdy/screens/webview/ui/webview.dart';
import 'package:linkdy/screens/bookmarks/provider/favicon_loader.provider.dart';
import 'package:linkdy/screens/bookmarks/provider/bookmarks.provider.dart';
import 'package:linkdy/screens/bookmarks/provider/common_functions.dart';
import 'package:linkdy/screens/bookmarks/model/search_bookmarks.model.dart';
@@ -31,7 +30,7 @@ FutureOr<void> fetchSearchBookmarks(FetchSearchBookmarksRef ref, int limit) asyn
);
if (result.successful == true) {
ref.read(faviconStoreProvider.notifier).loadFavicons(result.content!.results!);
// ref.read(faviconStoreProvider.notifier).loadFavicons(result.content!.results!);
ref.read(searchBookmarksProvider).bookmarks = result.content!.results!;
ref.read(searchBookmarksProvider).maxNumber = result.content!.count!;
ref.read(searchBookmarksProvider).currentPage = 0;
@@ -56,7 +55,6 @@ FutureOr<void> fetchSearchBookmarksLoadMore(FetchSearchBookmarksLoadMoreRef ref)
);
if (result.successful == true) {
ref.read(faviconStoreProvider.notifier).loadFavicons(result.content!.results!);
provider.bookmarks = [...provider.bookmarks, ...result.content!.results!];
provider.maxNumber = result.content!.count!;
provider.currentPage = provider.currentPage + 1;

2
lib/screens/bookmarks/ui/bookmarks.dart
View File

@@ -3,7 +3,7 @@ import 'package:hooks_riverpod/hooks_riverpod.dart';
import 'package:linkdy/screens/bookmarks/ui/visualization_modal.dart';
import 'package:linkdy/screens/bookmarks/provider/bookmarks.provider.dart';
import 'package:linkdy/screens/bookmarks/ui/bookmark_item.dart';
import 'package:linkdy/widgets/bookmark_item.dart';
import 'package:linkdy/screens/bookmarks/ui/bookmark_form_modal.dart';
import 'package:linkdy/screens/bookmarks/ui/delete_bookmark_modal.dart';
import 'package:linkdy/screens/bookmarks/ui/search_bookmarks.dart';

2
lib/screens/bookmarks/ui/search_bookmarks.dart
View File

@@ -3,7 +3,7 @@ import 'package:flutter_riverpod/flutter_riverpod.dart';
import 'package:linkdy/screens/bookmarks/provider/search_bookmarks.provider.dart';
import 'package:linkdy/screens/bookmarks/ui/bookmark_form_modal.dart';
import 'package:linkdy/screens/bookmarks/ui/bookmark_item.dart';
import 'package:linkdy/widgets/bookmark_item.dart';
import 'package:linkdy/screens/bookmarks/ui/delete_bookmark_modal.dart';
import 'package:linkdy/widgets/enter_search_term_screen.dart';
import 'package:linkdy/widgets/no_data_screen.dart';

8
lib/screens/filtered_bookmarks/provider/filtered_bookmarks.provider.dart
View File

@@ -3,7 +3,6 @@ import 'package:go_router/go_router.dart';
import 'package:riverpod_annotation/riverpod_annotation.dart';
import 'package:linkdy/screens/webview/ui/webview.dart';
import 'package:linkdy/screens/bookmarks/provider/favicon_loader.provider.dart';
import 'package:linkdy/screens/bookmarks/provider/common_functions.dart';
import 'package:linkdy/screens/bookmarks/provider/bookmarks.provider.dart';
import 'package:linkdy/screens/filtered_bookmarks/model/filtered_bookmarks.model.dart';
@@ -36,7 +35,7 @@ FutureOr<void> tagBookmarksRequest(TagBookmarksRequestRef ref, Tag? tag, String?
);
if (bookmarksResult.successful == true) {
ref.read(faviconStoreProvider.notifier).loadFavicons(bookmarksResult.content!.results!);
// ref.read(faviconStoreProvider.notifier).loadFavicons(bookmarksResult.content!.results!);
ref.read(filteredBookmarksProvider).bookmarks = bookmarksResult.content!.results!;
ref.read(filteredBookmarksProvider).maxNumber = bookmarksResult.content!.count!;
if (tag == null) ref.read(filteredBookmarksProvider).tag = tagResult!.content!;
@@ -63,7 +62,6 @@ FutureOr<void> tagBookmarksRequestLoadMore(FilteredBookmarksRequestLoadMoreRef r
);
if (result.successful == true) {
ref.read(faviconStoreProvider.notifier).loadFavicons(result.content!.results!);
provider.bookmarks = [...provider.bookmarks, ...result.content!.results!];
provider.maxNumber = result.content!.count!;
provider.currentPage = provider.currentPage + 1;
@@ -85,7 +83,7 @@ FutureOr<void> filteredBookmarksRequest(FilteredBookmarksRequestRef ref, Filtere
);
if (bookmarksResult.successful == true) {
ref.read(faviconStoreProvider.notifier).loadFavicons(bookmarksResult.content!.results!);
// ref.read(faviconStoreProvider.notifier).loadFavicons(bookmarksResult.content!.results!);
ref.read(filteredBookmarksProvider).bookmarks = bookmarksResult.content!.results!;
ref.read(filteredBookmarksProvider).maxNumber = bookmarksResult.content!.count!;
ref.read(filteredBookmarksProvider).currentPage = 0;
@@ -117,7 +115,7 @@ FutureOr<void> filteredBookmarksRequestLoadMore(TagBookmarksRequestLoadMoreRef r
);
if (result.successful == true) {
ref.read(faviconStoreProvider.notifier).loadFavicons(result.content!.results!);
// ref.read(faviconStoreProvider.notifier).loadFavicons(result.content!.results!);
provider.bookmarks = [...provider.bookmarks, ...result.content!.results!];
provider.maxNumber = result.content!.count!;
provider.currentPage = provider.currentPage + 1;

2
lib/screens/filtered_bookmarks/ui/filtered_bookmarks.dart
View File

@@ -3,7 +3,7 @@ import 'package:flutter_hooks/flutter_hooks.dart';
import 'package:hooks_riverpod/hooks_riverpod.dart';
import 'package:linkdy/screens/bookmarks/ui/bookmark_form_modal.dart';
import 'package:linkdy/screens/bookmarks/ui/bookmark_item.dart';
import 'package:linkdy/widgets/bookmark_item.dart';
import 'package:linkdy/screens/bookmarks/ui/delete_bookmark_modal.dart';
import 'package:linkdy/screens/filtered_bookmarks/provider/filtered_bookmarks.provider.dart';
import 'package:linkdy/widgets/error_screen.dart';

53
lib/screens/bookmarks/ui/bookmark_item.dart → lib/widgets/bookmark_item.dart
View File

@@ -1,16 +1,14 @@
import 'package:flutter/material.dart';
import 'package:flutter_riverpod/flutter_riverpod.dart';
import 'package:linkdy/constants/urls.dart';
import 'package:share_plus/share_plus.dart';
import 'package:skeletonizer/skeletonizer.dart';
import 'package:flutter_svg/flutter_svg.dart';
import 'package:linkdy/screens/bookmarks/provider/favicon_loader.provider.dart';
import 'package:super_context_menu/super_context_menu.dart';
import 'package:linkdy/i18n/strings.g.dart';
import 'package:linkdy/models/data/bookmarks.dart';
import 'package:linkdy/providers/app_status.provider.dart';
import 'package:linkdy/utils/date_to_string.dart';
import 'package:super_context_menu/super_context_menu.dart';
// Wait until the context menu close animation animation finishes
Duration _durationTime = const Duration(milliseconds: 150);
@@ -136,48 +134,8 @@ class BookmarkItem extends ConsumerWidget {
if (ref.watch(appStatusProvider).showFavicon == true)
Padding(
padding: const EdgeInsets.only(right: 8),
child: ref.watch(faviconStoreProvider).loadingFavicons == true
? ClipRRect(
borderRadius: BorderRadius.circular(4),
child: Skeletonizer(
enabled: true,
ignoreContainers: true,
child: Container(
width: 16,
height: 16,
color: Colors.black,
),
),
)
: Builder(
builder: (context) {
final faviconItem = ref
.watch(faviconStoreProvider)
.favicons
.where((f) => f.url == bookmark.url!)
.toList();
if (faviconItem.isEmpty) return const SizedBox();
if (faviconItem[0].isSvg == true) {
return SvgPicture.network(
faviconItem[0].favicon,
width: 16,
height: 16,
placeholderBuilder: (context) => ClipRRect(
borderRadius: BorderRadius.circular(4),
child: Skeletonizer(
enabled: true,
ignoreContainers: true,
child: Container(
width: 16,
height: 16,
color: Colors.black,
),
),
),
);
} else {
return Image.network(
faviconItem[0].favicon,
child: Image.network(
Urls.gstatic(bookmark.url),
width: 16,
height: 16,
loadingBuilder: (context, child, loadingProgress) {
@@ -197,9 +155,6 @@ class BookmarkItem extends ConsumerWidget {
}
return child;
},
);
}
},
),
),
Expanded(