Improved snackbars
This commit is contained in:
@@ -1,4 +1,12 @@
|
|||||||
import 'package:flutter/material.dart';
|
import 'package:flutter/material.dart';
|
||||||
|
|
||||||
final scaffoldMessengerGlobalKey = GlobalKey<ScaffoldMessengerState>();
|
class ScaffoldMessengerKeys {
|
||||||
final searchScaffoldMessengerKey = GlobalKey<ScaffoldMessengerState>();
|
static final root = GlobalKey<ScaffoldMessengerState>();
|
||||||
|
static final onboarding = GlobalKey<ScaffoldMessengerState>();
|
||||||
|
static final bookmarks = GlobalKey<ScaffoldMessengerState>();
|
||||||
|
static final search = GlobalKey<ScaffoldMessengerState>();
|
||||||
|
static final tags = GlobalKey<ScaffoldMessengerState>();
|
||||||
|
static final addBookmark = GlobalKey<ScaffoldMessengerState>();
|
||||||
|
static final tagBookmarks = GlobalKey<ScaffoldMessengerState>();
|
||||||
|
static final webview = GlobalKey<ScaffoldMessengerState>();
|
||||||
|
}
|
||||||
|
|||||||
@@ -6,7 +6,7 @@
|
|||||||
/// Locales: 2
|
/// Locales: 2
|
||||||
/// Strings: 290 (145 per locale)
|
/// Strings: 290 (145 per locale)
|
||||||
///
|
///
|
||||||
/// Built on 2024-02-26 at 21:31 UTC
|
/// Built on 2024-02-27 at 00:35 UTC
|
||||||
|
|
||||||
// coverage:ignore-file
|
// coverage:ignore-file
|
||||||
// ignore_for_file: type=lint
|
// ignore_for_file: type=lint
|
||||||
|
|||||||
@@ -6,14 +6,14 @@ import 'package:flutter/services.dart';
|
|||||||
import 'package:flutter_dotenv/flutter_dotenv.dart';
|
import 'package:flutter_dotenv/flutter_dotenv.dart';
|
||||||
import 'package:flutter_localizations/flutter_localizations.dart';
|
import 'package:flutter_localizations/flutter_localizations.dart';
|
||||||
import 'package:flutter_riverpod/flutter_riverpod.dart';
|
import 'package:flutter_riverpod/flutter_riverpod.dart';
|
||||||
import 'package:linkdy/constants/global_keys.dart';
|
|
||||||
import 'package:linkdy/providers/temporary_directory.provider.dart';
|
|
||||||
import 'package:path_provider/path_provider.dart';
|
import 'package:path_provider/path_provider.dart';
|
||||||
import 'package:dynamic_color/dynamic_color.dart';
|
import 'package:dynamic_color/dynamic_color.dart';
|
||||||
import 'package:package_info_plus/package_info_plus.dart';
|
import 'package:package_info_plus/package_info_plus.dart';
|
||||||
import 'package:sentry_flutter/sentry_flutter.dart';
|
import 'package:sentry_flutter/sentry_flutter.dart';
|
||||||
import 'package:shared_preferences/shared_preferences.dart';
|
import 'package:shared_preferences/shared_preferences.dart';
|
||||||
|
|
||||||
|
import 'package:linkdy/constants/global_keys.dart';
|
||||||
|
import 'package:linkdy/providers/temporary_directory.provider.dart';
|
||||||
import 'package:linkdy/providers/app_status.provider.dart';
|
import 'package:linkdy/providers/app_status.provider.dart';
|
||||||
import 'package:linkdy/providers/app_info.provider.dart';
|
import 'package:linkdy/providers/app_info.provider.dart';
|
||||||
import 'package:linkdy/config/theme.dart';
|
import 'package:linkdy/config/theme.dart';
|
||||||
@@ -94,7 +94,7 @@ class MyApp extends ConsumerWidget {
|
|||||||
supportedLocales: AppLocaleUtils.supportedLocales,
|
supportedLocales: AppLocaleUtils.supportedLocales,
|
||||||
localizationsDelegates: GlobalMaterialLocalizations.delegates,
|
localizationsDelegates: GlobalMaterialLocalizations.delegates,
|
||||||
debugShowCheckedModeBanner: false,
|
debugShowCheckedModeBanner: false,
|
||||||
scaffoldMessengerKey: scaffoldMessengerGlobalKey,
|
scaffoldMessengerKey: ScaffoldMessengerKeys.root,
|
||||||
routerConfig: ref.watch(routerProvider),
|
routerConfig: ref.watch(routerProvider),
|
||||||
);
|
);
|
||||||
},
|
},
|
||||||
|
|||||||
@@ -3,8 +3,9 @@ import 'package:flutter/material.dart';
|
|||||||
import 'package:go_router/go_router.dart';
|
import 'package:go_router/go_router.dart';
|
||||||
import 'package:riverpod_annotation/riverpod_annotation.dart';
|
import 'package:riverpod_annotation/riverpod_annotation.dart';
|
||||||
|
|
||||||
import 'package:linkdy/providers/snackbar.provider.dart';
|
import 'package:linkdy/utils/snackbar.dart';
|
||||||
import 'package:linkdy/i18n/strings.g.dart';
|
import 'package:linkdy/i18n/strings.g.dart';
|
||||||
|
import 'package:linkdy/constants/global_keys.dart';
|
||||||
import 'package:linkdy/providers/server_instances.provider.dart';
|
import 'package:linkdy/providers/server_instances.provider.dart';
|
||||||
import 'package:linkdy/router/routes.dart';
|
import 'package:linkdy/router/routes.dart';
|
||||||
import 'package:linkdy/router/paths.dart';
|
import 'package:linkdy/router/paths.dart';
|
||||||
@@ -23,7 +24,7 @@ InterceptorsWrapper dioInterceptor(DioInterceptorRef ref) {
|
|||||||
GoRouter.of(rootNavigatorKey.currentContext!).pushReplacement(RoutesPaths.onboarding);
|
GoRouter.of(rootNavigatorKey.currentContext!).pushReplacement(RoutesPaths.onboarding);
|
||||||
ref.read(apiClientProvider.notifier).disconnectApiClient();
|
ref.read(apiClientProvider.notifier).disconnectApiClient();
|
||||||
ref.read(serverInstancesProvider.notifier).removeServerInstances();
|
ref.read(serverInstancesProvider.notifier).removeServerInstances();
|
||||||
ref.read(snackbarProvider.notifier).showSnacbkar(label: t.generic.authTokenNotValid, color: Colors.red);
|
showSnackbar(key: ScaffoldMessengerKeys.root, label: t.generic.authTokenNotValid, color: Colors.red);
|
||||||
}
|
}
|
||||||
handler.next(error);
|
handler.next(error);
|
||||||
},
|
},
|
||||||
|
|||||||
@@ -6,7 +6,7 @@ part of 'dio_interceptor.provider.dart';
|
|||||||
// RiverpodGenerator
|
// RiverpodGenerator
|
||||||
// **************************************************************************
|
// **************************************************************************
|
||||||
|
|
||||||
String _$dioInterceptorHash() => r'15186eb74bde12048a96b1d38f1c9308c9f435a8';
|
String _$dioInterceptorHash() => r'16ba03ce5f4547c91566a38f348cf85df73fbfca';
|
||||||
|
|
||||||
/// See also [dioInterceptor].
|
/// See also [dioInterceptor].
|
||||||
@ProviderFor(dioInterceptor)
|
@ProviderFor(dioInterceptor)
|
||||||
|
|||||||
@@ -1,42 +0,0 @@
|
|||||||
import 'package:flutter/material.dart';
|
|
||||||
import 'package:riverpod_annotation/riverpod_annotation.dart';
|
|
||||||
|
|
||||||
import 'package:linkdy/constants/global_keys.dart';
|
|
||||||
import 'package:linkdy/models/providers_models/snackbar_status.model.dart';
|
|
||||||
|
|
||||||
part 'snackbar.provider.g.dart';
|
|
||||||
|
|
||||||
@Riverpod(keepAlive: true)
|
|
||||||
class Snackbar extends _$Snackbar {
|
|
||||||
@override
|
|
||||||
SnackbarStatusModel build() {
|
|
||||||
return SnackbarStatusModel();
|
|
||||||
}
|
|
||||||
|
|
||||||
void showSnacbkar({
|
|
||||||
required String label,
|
|
||||||
required Color color,
|
|
||||||
Color? labelColor,
|
|
||||||
GlobalKey<ScaffoldMessengerState>? key,
|
|
||||||
}) async {
|
|
||||||
final GlobalKey<ScaffoldMessengerState> scaffoldKey = key ?? scaffoldMessengerGlobalKey;
|
|
||||||
if (state.visible == true) {
|
|
||||||
scaffoldKey.currentState?.clearSnackBars();
|
|
||||||
await Future.delayed(const Duration(milliseconds: 500));
|
|
||||||
}
|
|
||||||
state.visible = true;
|
|
||||||
ref.notifyListeners();
|
|
||||||
|
|
||||||
final snackBar = SnackBar(
|
|
||||||
content: Text(
|
|
||||||
label,
|
|
||||||
style: TextStyle(color: labelColor ?? Colors.white),
|
|
||||||
),
|
|
||||||
backgroundColor: color,
|
|
||||||
);
|
|
||||||
scaffoldKey.currentState?.showSnackBar(snackBar).closed.then((value) {
|
|
||||||
state.visible = false;
|
|
||||||
ref.notifyListeners();
|
|
||||||
});
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,25 +0,0 @@
|
|||||||
// GENERATED CODE - DO NOT MODIFY BY HAND
|
|
||||||
|
|
||||||
part of 'snackbar.provider.dart';
|
|
||||||
|
|
||||||
// **************************************************************************
|
|
||||||
// RiverpodGenerator
|
|
||||||
// **************************************************************************
|
|
||||||
|
|
||||||
String _$snackbarHash() => r'2522a7ebc0bdd891cea5cb342bd1ff2419473a00';
|
|
||||||
|
|
||||||
/// See also [Snackbar].
|
|
||||||
@ProviderFor(Snackbar)
|
|
||||||
final snackbarProvider =
|
|
||||||
NotifierProvider<Snackbar, SnackbarStatusModel>.internal(
|
|
||||||
Snackbar.new,
|
|
||||||
name: r'snackbarProvider',
|
|
||||||
debugGetCreateSourceHash:
|
|
||||||
const bool.fromEnvironment('dart.vm.product') ? null : _$snackbarHash,
|
|
||||||
dependencies: null,
|
|
||||||
allTransitiveDependencies: null,
|
|
||||||
);
|
|
||||||
|
|
||||||
typedef _$Snackbar = Notifier<SnackbarStatusModel>;
|
|
||||||
// ignore_for_file: type=lint
|
|
||||||
// ignore_for_file: subtype_of_sealed_class, invalid_use_of_internal_member, invalid_use_of_visible_for_testing_member
|
|
||||||
@@ -1,10 +1,11 @@
|
|||||||
import 'package:flutter/material.dart';
|
import 'package:flutter/material.dart';
|
||||||
|
import 'package:linkdy/constants/global_keys.dart';
|
||||||
import 'package:riverpod_annotation/riverpod_annotation.dart';
|
import 'package:riverpod_annotation/riverpod_annotation.dart';
|
||||||
|
|
||||||
import 'package:linkdy/screens/bookmarks/provider/bookmarks.provider.dart';
|
import 'package:linkdy/screens/bookmarks/provider/bookmarks.provider.dart';
|
||||||
import 'package:linkdy/screens/bookmarks/model/add_link.model.dart';
|
import 'package:linkdy/screens/bookmarks/model/add_link.model.dart';
|
||||||
|
|
||||||
import 'package:linkdy/providers/snackbar.provider.dart';
|
import 'package:linkdy/utils/snackbar.dart';
|
||||||
import 'package:linkdy/models/data/tags.dart';
|
import 'package:linkdy/models/data/tags.dart';
|
||||||
import 'package:linkdy/i18n/strings.g.dart';
|
import 'package:linkdy/i18n/strings.g.dart';
|
||||||
import 'package:linkdy/utils/process_modal.dart';
|
import 'package:linkdy/utils/process_modal.dart';
|
||||||
@@ -101,10 +102,11 @@ class AddBookmark extends _$AddBookmark {
|
|||||||
ref.read(bookmarksProvider.notifier).refresh();
|
ref.read(bookmarksProvider.notifier).refresh();
|
||||||
ref.watch(routerProvider).pop();
|
ref.watch(routerProvider).pop();
|
||||||
} else {
|
} else {
|
||||||
ref.read(snackbarProvider.notifier).showSnacbkar(
|
showSnackbar(
|
||||||
label: t.bookmarks.addBookmark.errorSavingBookmark,
|
key: ScaffoldMessengerKeys.addBookmark,
|
||||||
color: Colors.red,
|
label: t.bookmarks.addBookmark.errorSavingBookmark,
|
||||||
);
|
color: Colors.red,
|
||||||
|
);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -175,7 +175,7 @@ final getTagsProvider =
|
|||||||
);
|
);
|
||||||
|
|
||||||
typedef GetTagsRef = AutoDisposeFutureProviderRef<ApiResponse<TagsResponse>>;
|
typedef GetTagsRef = AutoDisposeFutureProviderRef<ApiResponse<TagsResponse>>;
|
||||||
String _$addBookmarkHash() => r'd6425004c3e755ec539ad28da3ef44349680b04b';
|
String _$addBookmarkHash() => r'a350eee7aeed2fabae90966afadc609ee5eef895';
|
||||||
|
|
||||||
/// See also [AddBookmark].
|
/// See also [AddBookmark].
|
||||||
@ProviderFor(AddBookmark)
|
@ProviderFor(AddBookmark)
|
||||||
|
|||||||
@@ -1,3 +1,4 @@
|
|||||||
|
import 'package:linkdy/constants/global_keys.dart';
|
||||||
import 'package:riverpod_annotation/riverpod_annotation.dart';
|
import 'package:riverpod_annotation/riverpod_annotation.dart';
|
||||||
|
|
||||||
import 'package:linkdy/screens/bookmarks/provider/common_functions.dart';
|
import 'package:linkdy/screens/bookmarks/provider/common_functions.dart';
|
||||||
@@ -90,6 +91,7 @@ class Bookmarks extends _$Bookmarks {
|
|||||||
|
|
||||||
void deleteBookmark(Bookmark bookmark) async {
|
void deleteBookmark(Bookmark bookmark) async {
|
||||||
final result = await BookmarkCommonFunctions.deleteBookmark<BookmarksModel>(
|
final result = await BookmarkCommonFunctions.deleteBookmark<BookmarksModel>(
|
||||||
|
scaffoldMessengerKey: ScaffoldMessengerKeys.bookmarks,
|
||||||
ref: ref,
|
ref: ref,
|
||||||
bookmark: bookmark,
|
bookmark: bookmark,
|
||||||
apiClient: ref.read(apiClientProvider)!,
|
apiClient: ref.read(apiClientProvider)!,
|
||||||
@@ -102,6 +104,7 @@ class Bookmarks extends _$Bookmarks {
|
|||||||
|
|
||||||
void markAsReadUnread(Bookmark bookmark) async {
|
void markAsReadUnread(Bookmark bookmark) async {
|
||||||
final result = await BookmarkCommonFunctions.markAsReadUnread<BookmarksModel>(
|
final result = await BookmarkCommonFunctions.markAsReadUnread<BookmarksModel>(
|
||||||
|
scaffoldMessengerKey: ScaffoldMessengerKeys.bookmarks,
|
||||||
ref: ref,
|
ref: ref,
|
||||||
bookmark: bookmark,
|
bookmark: bookmark,
|
||||||
apiClient: ref.read(apiClientProvider)!,
|
apiClient: ref.read(apiClientProvider)!,
|
||||||
@@ -114,6 +117,7 @@ class Bookmarks extends _$Bookmarks {
|
|||||||
|
|
||||||
void archiveUnarchive(Bookmark bookmark) async {
|
void archiveUnarchive(Bookmark bookmark) async {
|
||||||
final result = await BookmarkCommonFunctions.archiveUnarchive<BookmarksModel>(
|
final result = await BookmarkCommonFunctions.archiveUnarchive<BookmarksModel>(
|
||||||
|
scaffoldMessengerKey: ScaffoldMessengerKeys.bookmarks,
|
||||||
ref: ref,
|
ref: ref,
|
||||||
bookmark: bookmark,
|
bookmark: bookmark,
|
||||||
apiClient: ref.read(apiClientProvider)!,
|
apiClient: ref.read(apiClientProvider)!,
|
||||||
|
|||||||
@@ -172,7 +172,7 @@ final bookmarksRequestLoadMoreProvider =
|
|||||||
);
|
);
|
||||||
|
|
||||||
typedef BookmarksRequestLoadMoreRef = AutoDisposeFutureProviderRef<void>;
|
typedef BookmarksRequestLoadMoreRef = AutoDisposeFutureProviderRef<void>;
|
||||||
String _$bookmarksHash() => r'a2bd6f3226b5a1b9c19b536b31122fb5b449ff6a';
|
String _$bookmarksHash() => r'84a236ccce48c0a0069ca2b754da59ff88b17ef2';
|
||||||
|
|
||||||
/// See also [Bookmarks].
|
/// See also [Bookmarks].
|
||||||
@ProviderFor(Bookmarks)
|
@ProviderFor(Bookmarks)
|
||||||
|
|||||||
@@ -1,9 +1,9 @@
|
|||||||
import 'package:flutter/material.dart';
|
import 'package:flutter/material.dart';
|
||||||
import 'package:linkdy/providers/snackbar.provider.dart';
|
|
||||||
import 'package:riverpod_annotation/riverpod_annotation.dart';
|
import 'package:riverpod_annotation/riverpod_annotation.dart';
|
||||||
|
|
||||||
import 'package:linkdy/i18n/strings.g.dart';
|
import 'package:linkdy/i18n/strings.g.dart';
|
||||||
import 'package:linkdy/models/data/bookmarks.dart';
|
import 'package:linkdy/models/data/bookmarks.dart';
|
||||||
|
import 'package:linkdy/utils/snackbar.dart';
|
||||||
import 'package:linkdy/models/data/set_bookmark_data.dart';
|
import 'package:linkdy/models/data/set_bookmark_data.dart';
|
||||||
import 'package:linkdy/services/api_client.dart';
|
import 'package:linkdy/services/api_client.dart';
|
||||||
import 'package:linkdy/utils/process_modal.dart';
|
import 'package:linkdy/utils/process_modal.dart';
|
||||||
@@ -13,7 +13,7 @@ class BookmarkCommonFunctions {
|
|||||||
required AutoDisposeNotifierProviderRef<T> ref,
|
required AutoDisposeNotifierProviderRef<T> ref,
|
||||||
required Bookmark bookmark,
|
required Bookmark bookmark,
|
||||||
required ApiClientService apiClient,
|
required ApiClientService apiClient,
|
||||||
GlobalKey<ScaffoldMessengerState>? scaffoldMessengerKey,
|
required GlobalKey<ScaffoldMessengerState> scaffoldMessengerKey,
|
||||||
}) async {
|
}) async {
|
||||||
final processModal = ProcessModal();
|
final processModal = ProcessModal();
|
||||||
processModal.open(t.bookmarks.bookmarkOptions.deletingBookmark);
|
processModal.open(t.bookmarks.bookmarkOptions.deletingBookmark);
|
||||||
@@ -22,17 +22,17 @@ class BookmarkCommonFunctions {
|
|||||||
|
|
||||||
processModal.close();
|
processModal.close();
|
||||||
if (result.successful == true) {
|
if (result.successful == true) {
|
||||||
ref.read(snackbarProvider.notifier).showSnacbkar(
|
showSnackbar(
|
||||||
key: scaffoldMessengerKey,
|
key: scaffoldMessengerKey,
|
||||||
label: t.bookmarks.bookmarkOptions.bookmarkDeleted,
|
label: t.bookmarks.bookmarkOptions.bookmarkDeleted,
|
||||||
color: Colors.green,
|
color: Colors.green,
|
||||||
);
|
);
|
||||||
} else {
|
} else {
|
||||||
ref.read(snackbarProvider.notifier).showSnacbkar(
|
showSnackbar(
|
||||||
key: scaffoldMessengerKey,
|
key: scaffoldMessengerKey,
|
||||||
label: t.bookmarks.bookmarkOptions.bookmarkNotDeleted,
|
label: t.bookmarks.bookmarkOptions.bookmarkNotDeleted,
|
||||||
color: Colors.red,
|
color: Colors.red,
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
return result.successful;
|
return result.successful;
|
||||||
}
|
}
|
||||||
@@ -41,7 +41,7 @@ class BookmarkCommonFunctions {
|
|||||||
required AutoDisposeNotifierProviderRef<T> ref,
|
required AutoDisposeNotifierProviderRef<T> ref,
|
||||||
required Bookmark bookmark,
|
required Bookmark bookmark,
|
||||||
required ApiClientService apiClient,
|
required ApiClientService apiClient,
|
||||||
GlobalKey<ScaffoldMessengerState>? scaffoldMessengerKey,
|
required GlobalKey<ScaffoldMessengerState> scaffoldMessengerKey,
|
||||||
}) async {
|
}) async {
|
||||||
final processModal = ProcessModal();
|
final processModal = ProcessModal();
|
||||||
processModal.open(
|
processModal.open(
|
||||||
@@ -63,22 +63,22 @@ class BookmarkCommonFunctions {
|
|||||||
|
|
||||||
processModal.close();
|
processModal.close();
|
||||||
if (result.successful == true) {
|
if (result.successful == true) {
|
||||||
ref.read(snackbarProvider.notifier).showSnacbkar(
|
showSnackbar(
|
||||||
key: scaffoldMessengerKey,
|
key: scaffoldMessengerKey,
|
||||||
label: bookmark.unread == true
|
label: bookmark.unread == true
|
||||||
? t.bookmarks.bookmarkOptions.markedAsReadSuccessfully
|
? t.bookmarks.bookmarkOptions.markedAsReadSuccessfully
|
||||||
: t.bookmarks.bookmarkOptions.markedAsUnreadSuccessfully,
|
: t.bookmarks.bookmarkOptions.markedAsUnreadSuccessfully,
|
||||||
color: Colors.green,
|
color: Colors.green,
|
||||||
);
|
);
|
||||||
return result.content;
|
return result.content;
|
||||||
} else {
|
} else {
|
||||||
ref.read(snackbarProvider.notifier).showSnacbkar(
|
showSnackbar(
|
||||||
key: scaffoldMessengerKey,
|
key: scaffoldMessengerKey,
|
||||||
label: bookmark.unread == true
|
label: bookmark.unread == true
|
||||||
? t.bookmarks.bookmarkOptions.bookmarkNotMarkedAsRead
|
? t.bookmarks.bookmarkOptions.bookmarkNotMarkedAsRead
|
||||||
: t.bookmarks.bookmarkOptions.bookmarkNotMarkedAsUnread,
|
: t.bookmarks.bookmarkOptions.bookmarkNotMarkedAsUnread,
|
||||||
color: Colors.red,
|
color: Colors.red,
|
||||||
);
|
);
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -87,7 +87,7 @@ class BookmarkCommonFunctions {
|
|||||||
required AutoDisposeNotifierProviderRef<T> ref,
|
required AutoDisposeNotifierProviderRef<T> ref,
|
||||||
required Bookmark bookmark,
|
required Bookmark bookmark,
|
||||||
required ApiClientService apiClient,
|
required ApiClientService apiClient,
|
||||||
GlobalKey<ScaffoldMessengerState>? scaffoldMessengerKey,
|
required GlobalKey<ScaffoldMessengerState> scaffoldMessengerKey,
|
||||||
}) async {
|
}) async {
|
||||||
final processModal = ProcessModal();
|
final processModal = ProcessModal();
|
||||||
processModal.open(
|
processModal.open(
|
||||||
@@ -102,21 +102,21 @@ class BookmarkCommonFunctions {
|
|||||||
|
|
||||||
processModal.close();
|
processModal.close();
|
||||||
if (result.successful == true) {
|
if (result.successful == true) {
|
||||||
ref.read(snackbarProvider.notifier).showSnacbkar(
|
showSnackbar(
|
||||||
key: scaffoldMessengerKey,
|
key: scaffoldMessengerKey,
|
||||||
label: bookmark.isArchived == true
|
label: bookmark.isArchived == true
|
||||||
? t.bookmarks.bookmarkOptions.bookmarkUnrchivedSuccessfully
|
? t.bookmarks.bookmarkOptions.bookmarkUnrchivedSuccessfully
|
||||||
: t.bookmarks.bookmarkOptions.bookmarkArchivedSuccessfully,
|
: t.bookmarks.bookmarkOptions.bookmarkArchivedSuccessfully,
|
||||||
color: Colors.green,
|
color: Colors.green,
|
||||||
);
|
);
|
||||||
} else {
|
} else {
|
||||||
ref.read(snackbarProvider.notifier).showSnacbkar(
|
showSnackbar(
|
||||||
key: scaffoldMessengerKey,
|
key: scaffoldMessengerKey,
|
||||||
label: bookmark.isArchived == true
|
label: bookmark.isArchived == true
|
||||||
? t.bookmarks.bookmarkOptions.bookmarkNotUnrchived
|
? t.bookmarks.bookmarkOptions.bookmarkNotUnrchived
|
||||||
: t.bookmarks.bookmarkOptions.bookmarkNotArchived,
|
: t.bookmarks.bookmarkOptions.bookmarkNotArchived,
|
||||||
color: Colors.red,
|
color: Colors.red,
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
return result.successful;
|
return result.successful;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -104,7 +104,7 @@ class SearchBookmarks extends _$SearchBookmarks {
|
|||||||
ref: ref,
|
ref: ref,
|
||||||
bookmark: bookmark,
|
bookmark: bookmark,
|
||||||
apiClient: ref.read(apiClientProvider)!,
|
apiClient: ref.read(apiClientProvider)!,
|
||||||
scaffoldMessengerKey: searchScaffoldMessengerKey,
|
scaffoldMessengerKey: ScaffoldMessengerKeys.search,
|
||||||
);
|
);
|
||||||
if (result == true) {
|
if (result == true) {
|
||||||
state.bookmarks = state.bookmarks.where((b) => b.id != bookmark.id).toList();
|
state.bookmarks = state.bookmarks.where((b) => b.id != bookmark.id).toList();
|
||||||
@@ -120,7 +120,7 @@ class SearchBookmarks extends _$SearchBookmarks {
|
|||||||
ref: ref,
|
ref: ref,
|
||||||
bookmark: bookmark,
|
bookmark: bookmark,
|
||||||
apiClient: ref.read(apiClientProvider)!,
|
apiClient: ref.read(apiClientProvider)!,
|
||||||
scaffoldMessengerKey: searchScaffoldMessengerKey,
|
scaffoldMessengerKey: ScaffoldMessengerKeys.search,
|
||||||
);
|
);
|
||||||
if (result != null) {
|
if (result != null) {
|
||||||
state.bookmarks = state.bookmarks.map((b) => b.id == result.id ? result : b).toList();
|
state.bookmarks = state.bookmarks.map((b) => b.id == result.id ? result : b).toList();
|
||||||
@@ -136,7 +136,7 @@ class SearchBookmarks extends _$SearchBookmarks {
|
|||||||
ref: ref,
|
ref: ref,
|
||||||
bookmark: bookmark,
|
bookmark: bookmark,
|
||||||
apiClient: ref.read(apiClientProvider)!,
|
apiClient: ref.read(apiClientProvider)!,
|
||||||
scaffoldMessengerKey: searchScaffoldMessengerKey,
|
scaffoldMessengerKey: ScaffoldMessengerKeys.search,
|
||||||
);
|
);
|
||||||
if (result == true) {
|
if (result == true) {
|
||||||
// On this case the bookmark always will pass from unarchived to archived
|
// On this case the bookmark always will pass from unarchived to archived
|
||||||
|
|||||||
@@ -174,7 +174,7 @@ final fetchSearchBookmarksLoadMoreProvider =
|
|||||||
);
|
);
|
||||||
|
|
||||||
typedef FetchSearchBookmarksLoadMoreRef = AutoDisposeFutureProviderRef<void>;
|
typedef FetchSearchBookmarksLoadMoreRef = AutoDisposeFutureProviderRef<void>;
|
||||||
String _$searchBookmarksHash() => r'5a5bc02d87a3eff3976a3bc6991c2208f4232fb4';
|
String _$searchBookmarksHash() => r'c7c8394ae9ad71f8106a3b73100b88e09c154e13';
|
||||||
|
|
||||||
/// See also [SearchBookmarks].
|
/// See also [SearchBookmarks].
|
||||||
@ProviderFor(SearchBookmarks)
|
@ProviderFor(SearchBookmarks)
|
||||||
|
|||||||
@@ -6,61 +6,65 @@ import 'package:linkdy/screens/bookmarks/provider/add_bookmark.provider.dart';
|
|||||||
import 'package:linkdy/widgets/section_label.dart';
|
import 'package:linkdy/widgets/section_label.dart';
|
||||||
|
|
||||||
import 'package:linkdy/i18n/strings.g.dart';
|
import 'package:linkdy/i18n/strings.g.dart';
|
||||||
|
import 'package:linkdy/constants/global_keys.dart';
|
||||||
import 'package:linkdy/constants/enums.dart';
|
import 'package:linkdy/constants/enums.dart';
|
||||||
|
|
||||||
class AddBookmarkModal extends ConsumerWidget {
|
class AddBookmarkModal extends ConsumerWidget {
|
||||||
final bool fullscreen;
|
final bool fullscreen;
|
||||||
|
|
||||||
const AddBookmarkModal({
|
const AddBookmarkModal({
|
||||||
Key? key,
|
super.key,
|
||||||
required this.fullscreen,
|
required this.fullscreen,
|
||||||
}) : super(key: key);
|
});
|
||||||
|
|
||||||
@override
|
@override
|
||||||
Widget build(BuildContext context, WidgetRef ref) {
|
Widget build(BuildContext context, WidgetRef ref) {
|
||||||
return Dialog.fullscreen(
|
return ScaffoldMessenger(
|
||||||
child: Scaffold(
|
key: ScaffoldMessengerKeys.addBookmark,
|
||||||
body: NestedScrollView(
|
child: Dialog.fullscreen(
|
||||||
headerSliverBuilder: (context, innerBoxIsScrolled) => [
|
child: Scaffold(
|
||||||
SliverOverlapAbsorber(
|
body: NestedScrollView(
|
||||||
handle: NestedScrollView.sliverOverlapAbsorberHandleFor(context),
|
headerSliverBuilder: (context, innerBoxIsScrolled) => [
|
||||||
sliver: SliverAppBar.large(
|
SliverOverlapAbsorber(
|
||||||
pinned: true,
|
handle: NestedScrollView.sliverOverlapAbsorberHandleFor(context),
|
||||||
floating: true,
|
sliver: SliverAppBar.large(
|
||||||
centerTitle: false,
|
pinned: true,
|
||||||
forceElevated: innerBoxIsScrolled,
|
floating: true,
|
||||||
leading: CloseButton(
|
centerTitle: false,
|
||||||
onPressed: () => Navigator.pop(context),
|
forceElevated: innerBoxIsScrolled,
|
||||||
|
leading: CloseButton(
|
||||||
|
onPressed: () => Navigator.pop(context),
|
||||||
|
),
|
||||||
|
title: Text(t.bookmarks.addBookmark.addBookmark),
|
||||||
|
actions: [
|
||||||
|
IconButton(
|
||||||
|
onPressed: ref.watch(addBookmarkProvider).checkBookmark != null
|
||||||
|
? () => ref.read(addBookmarkProvider.notifier).addBookmark()
|
||||||
|
: null,
|
||||||
|
icon: const Icon(Icons.save_rounded),
|
||||||
|
tooltip: t.generic.save,
|
||||||
|
),
|
||||||
|
const SizedBox(width: 8),
|
||||||
|
],
|
||||||
),
|
),
|
||||||
title: Text(t.bookmarks.addBookmark.addBookmark),
|
|
||||||
actions: [
|
|
||||||
IconButton(
|
|
||||||
onPressed: ref.watch(addBookmarkProvider).checkBookmark != null
|
|
||||||
? () => ref.read(addBookmarkProvider.notifier).addBookmark()
|
|
||||||
: null,
|
|
||||||
icon: const Icon(Icons.save_rounded),
|
|
||||||
tooltip: t.generic.save,
|
|
||||||
),
|
|
||||||
const SizedBox(width: 8),
|
|
||||||
],
|
|
||||||
),
|
),
|
||||||
),
|
],
|
||||||
],
|
body: SafeArea(
|
||||||
body: SafeArea(
|
top: false,
|
||||||
top: false,
|
bottom: true,
|
||||||
bottom: true,
|
child: Builder(
|
||||||
child: Builder(
|
builder: (context) => CustomScrollView(
|
||||||
builder: (context) => CustomScrollView(
|
slivers: [
|
||||||
slivers: [
|
SliverOverlapInjector(
|
||||||
SliverOverlapInjector(
|
handle: NestedScrollView.sliverOverlapAbsorberHandleFor(context),
|
||||||
handle: NestedScrollView.sliverOverlapAbsorberHandleFor(context),
|
),
|
||||||
),
|
SliverList.list(
|
||||||
SliverList.list(
|
children: const [
|
||||||
children: const [
|
_ModalContent(),
|
||||||
_ModalContent(),
|
],
|
||||||
],
|
),
|
||||||
),
|
],
|
||||||
],
|
),
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
@@ -71,7 +75,7 @@ class AddBookmarkModal extends ConsumerWidget {
|
|||||||
}
|
}
|
||||||
|
|
||||||
class _ModalContent extends ConsumerWidget {
|
class _ModalContent extends ConsumerWidget {
|
||||||
const _ModalContent({Key? key}) : super(key: key);
|
const _ModalContent();
|
||||||
|
|
||||||
@override
|
@override
|
||||||
Widget build(BuildContext context, WidgetRef ref) {
|
Widget build(BuildContext context, WidgetRef ref) {
|
||||||
|
|||||||
@@ -3,7 +3,6 @@ import 'dart:io';
|
|||||||
import 'package:flutter/material.dart';
|
import 'package:flutter/material.dart';
|
||||||
import 'package:flutter_riverpod/flutter_riverpod.dart';
|
import 'package:flutter_riverpod/flutter_riverpod.dart';
|
||||||
import 'package:flutter_slidable/flutter_slidable.dart';
|
import 'package:flutter_slidable/flutter_slidable.dart';
|
||||||
import 'package:linkdy/constants/enums.dart';
|
|
||||||
|
|
||||||
import 'package:linkdy/screens/bookmarks/provider/bookmarks.provider.dart';
|
import 'package:linkdy/screens/bookmarks/provider/bookmarks.provider.dart';
|
||||||
import 'package:linkdy/screens/bookmarks/ui/bookmark_item.dart';
|
import 'package:linkdy/screens/bookmarks/ui/bookmark_item.dart';
|
||||||
@@ -12,8 +11,9 @@ import 'package:linkdy/screens/bookmarks/ui/delete_bookmark_modal.dart';
|
|||||||
import 'package:linkdy/screens/bookmarks/ui/search_bookmarks.dart';
|
import 'package:linkdy/screens/bookmarks/ui/search_bookmarks.dart';
|
||||||
import 'package:linkdy/widgets/error_screen.dart';
|
import 'package:linkdy/widgets/error_screen.dart';
|
||||||
import 'package:linkdy/widgets/no_data_screen.dart';
|
import 'package:linkdy/widgets/no_data_screen.dart';
|
||||||
import 'package:linkdy/widgets/snackbar_fab.dart';
|
|
||||||
|
|
||||||
|
import 'package:linkdy/constants/enums.dart';
|
||||||
|
import 'package:linkdy/constants/global_keys.dart';
|
||||||
import 'package:linkdy/i18n/strings.g.dart';
|
import 'package:linkdy/i18n/strings.g.dart';
|
||||||
|
|
||||||
class BookmarksScreen extends ConsumerWidget {
|
class BookmarksScreen extends ConsumerWidget {
|
||||||
@@ -67,105 +67,104 @@ class BookmarksScreen extends ConsumerWidget {
|
|||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
return Scaffold(
|
return ScaffoldMessenger(
|
||||||
body: Stack(
|
key: ScaffoldMessengerKeys.bookmarks,
|
||||||
children: [
|
child: Scaffold(
|
||||||
NestedScrollView(
|
body: NestedScrollView(
|
||||||
headerSliverBuilder: (context, innerBoxIsScrolled) => [
|
headerSliverBuilder: (context, innerBoxIsScrolled) => [
|
||||||
SliverOverlapAbsorber(
|
SliverOverlapAbsorber(
|
||||||
handle: NestedScrollView.sliverOverlapAbsorberHandleFor(context),
|
handle: NestedScrollView.sliverOverlapAbsorberHandleFor(context),
|
||||||
sliver: SliverAppBar.large(
|
sliver: SliverAppBar.large(
|
||||||
pinned: true,
|
pinned: true,
|
||||||
floating: true,
|
floating: true,
|
||||||
centerTitle: false,
|
centerTitle: false,
|
||||||
forceElevated: innerBoxIsScrolled,
|
forceElevated: innerBoxIsScrolled,
|
||||||
title: Text(t.bookmarks.bookmarks),
|
title: Text(t.bookmarks.bookmarks),
|
||||||
actions: [
|
actions: [
|
||||||
IconButton(
|
IconButton(
|
||||||
onPressed: openSearchModal,
|
onPressed: openSearchModal,
|
||||||
icon: const Icon(Icons.search_rounded),
|
icon: const Icon(Icons.search_rounded),
|
||||||
tooltip: t.bookmarks.search.searchBookmarks,
|
tooltip: t.bookmarks.search.searchBookmarks,
|
||||||
),
|
),
|
||||||
const SizedBox(width: 8),
|
const SizedBox(width: 8),
|
||||||
],
|
],
|
||||||
),
|
|
||||||
),
|
),
|
||||||
],
|
),
|
||||||
body: SafeArea(
|
],
|
||||||
top: false,
|
body: SafeArea(
|
||||||
bottom: false,
|
top: false,
|
||||||
child: Builder(
|
bottom: false,
|
||||||
builder: (context) => RefreshIndicator(
|
child: Builder(
|
||||||
displacement: 120,
|
builder: (context) => RefreshIndicator(
|
||||||
onRefresh: () => ref.read(bookmarksProvider.notifier).refresh(),
|
displacement: 120,
|
||||||
child: NotificationListener(
|
onRefresh: () => ref.read(bookmarksProvider.notifier).refresh(),
|
||||||
onNotification: scrollListener,
|
child: NotificationListener(
|
||||||
child: CustomScrollView(
|
onNotification: scrollListener,
|
||||||
slivers: [
|
child: CustomScrollView(
|
||||||
SliverOverlapInjector(
|
slivers: [
|
||||||
handle: NestedScrollView.sliverOverlapAbsorberHandleFor(context),
|
SliverOverlapInjector(
|
||||||
|
handle: NestedScrollView.sliverOverlapAbsorberHandleFor(context),
|
||||||
|
),
|
||||||
|
if (bookmarks.inialLoadStatus == LoadStatus.loading)
|
||||||
|
const SliverFillRemaining(
|
||||||
|
child: Center(child: CircularProgressIndicator()),
|
||||||
),
|
),
|
||||||
if (bookmarks.inialLoadStatus == LoadStatus.loading)
|
if (bookmarks.inialLoadStatus == LoadStatus.error)
|
||||||
const SliverFillRemaining(
|
SliverFillRemaining(
|
||||||
child: Center(child: CircularProgressIndicator()),
|
child: ErrorScreen(
|
||||||
|
error: t.bookmarks.cannotLoadBookmarks,
|
||||||
),
|
),
|
||||||
if (bookmarks.inialLoadStatus == LoadStatus.error)
|
),
|
||||||
SliverFillRemaining(
|
if (bookmarks.bookmarks.isEmpty)
|
||||||
child: ErrorScreen(
|
SliverFillRemaining(
|
||||||
error: t.bookmarks.cannotLoadBookmarks,
|
child: NoDataScreen(
|
||||||
),
|
message: t.bookmarks.noBookmarksAdded,
|
||||||
),
|
),
|
||||||
if (bookmarks.bookmarks.isEmpty)
|
),
|
||||||
SliverFillRemaining(
|
if (bookmarks.bookmarks.isNotEmpty)
|
||||||
child: NoDataScreen(
|
SlidableAutoCloseBehavior(
|
||||||
message: t.bookmarks.noBookmarksAdded,
|
child: SliverList.builder(
|
||||||
),
|
itemCount: bookmarks.bookmarks.length + 1,
|
||||||
),
|
itemBuilder: (context, index) {
|
||||||
if (bookmarks.bookmarks.isNotEmpty)
|
// index == bookmarks.value!.content!.results!.length -> itemCount + 1
|
||||||
SlidableAutoCloseBehavior(
|
if (index == bookmarks.bookmarks.length) {
|
||||||
child: SliverList.builder(
|
if (bookmarks.loadingMore) {
|
||||||
itemCount: bookmarks.bookmarks.length + 1,
|
return const SizedBox(
|
||||||
itemBuilder: (context, index) {
|
height: 80,
|
||||||
// index == bookmarks.value!.content!.results!.length -> itemCount + 1
|
child: Center(
|
||||||
if (index == bookmarks.bookmarks.length) {
|
child: CircularProgressIndicator(),
|
||||||
if (bookmarks.loadingMore) {
|
|
||||||
return const SizedBox(
|
|
||||||
height: 80,
|
|
||||||
child: Center(
|
|
||||||
child: CircularProgressIndicator(),
|
|
||||||
),
|
|
||||||
);
|
|
||||||
}
|
|
||||||
// Bottom gap for FAB
|
|
||||||
return const SizedBox(height: 80);
|
|
||||||
}
|
|
||||||
return BookmarkItem(
|
|
||||||
bookmark: bookmarks.bookmarks[index],
|
|
||||||
onReadUnread: ref.read(bookmarksProvider.notifier).markAsReadUnread,
|
|
||||||
onDelete: (bookmark) => showDialog(
|
|
||||||
context: context,
|
|
||||||
builder: (context) => DeleteBookmarkModal(
|
|
||||||
bookmark: bookmark,
|
|
||||||
onDelete: ref.read(bookmarksProvider.notifier).deleteBookmark,
|
|
||||||
),
|
),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
// Bottom gap for FAB
|
||||||
|
return const SizedBox(height: 80);
|
||||||
|
}
|
||||||
|
return BookmarkItem(
|
||||||
|
bookmark: bookmarks.bookmarks[index],
|
||||||
|
onReadUnread: ref.read(bookmarksProvider.notifier).markAsReadUnread,
|
||||||
|
onDelete: (bookmark) => showDialog(
|
||||||
|
context: context,
|
||||||
|
builder: (context) => DeleteBookmarkModal(
|
||||||
|
bookmark: bookmark,
|
||||||
|
onDelete: ref.read(bookmarksProvider.notifier).deleteBookmark,
|
||||||
),
|
),
|
||||||
onArchiveUnarchive: ref.read(bookmarksProvider.notifier).archiveUnarchive,
|
),
|
||||||
);
|
onArchiveUnarchive: ref.read(bookmarksProvider.notifier).archiveUnarchive,
|
||||||
},
|
);
|
||||||
),
|
},
|
||||||
),
|
),
|
||||||
],
|
),
|
||||||
),
|
],
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
SnackbarFloatingActionButton(
|
),
|
||||||
onPressed: openAddModal,
|
floatingActionButton: FloatingActionButton(
|
||||||
child: const Icon(Icons.add_rounded),
|
onPressed: openAddModal,
|
||||||
),
|
child: const Icon(Icons.add_rounded),
|
||||||
],
|
),
|
||||||
),
|
),
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -38,7 +38,7 @@ class SearchBookmarksModal extends ConsumerWidget {
|
|||||||
}
|
}
|
||||||
|
|
||||||
return ScaffoldMessenger(
|
return ScaffoldMessenger(
|
||||||
key: searchScaffoldMessengerKey,
|
key: ScaffoldMessengerKeys.search,
|
||||||
child: Dialog.fullscreen(
|
child: Dialog.fullscreen(
|
||||||
child: Scaffold(
|
child: Scaffold(
|
||||||
appBar: AppBar(
|
appBar: AppBar(
|
||||||
|
|||||||
@@ -5,8 +5,9 @@ import 'package:riverpod_annotation/riverpod_annotation.dart';
|
|||||||
|
|
||||||
import 'package:linkdy/screens/onboarding/model/connect.model.dart';
|
import 'package:linkdy/screens/onboarding/model/connect.model.dart';
|
||||||
|
|
||||||
|
import 'package:linkdy/constants/global_keys.dart';
|
||||||
|
import 'package:linkdy/utils/snackbar.dart';
|
||||||
import 'package:linkdy/providers/dio_interceptor.provider.dart';
|
import 'package:linkdy/providers/dio_interceptor.provider.dart';
|
||||||
import 'package:linkdy/providers/snackbar.provider.dart';
|
|
||||||
import 'package:linkdy/providers/server_instances.provider.dart';
|
import 'package:linkdy/providers/server_instances.provider.dart';
|
||||||
import 'package:linkdy/utils/api_base_url.dart';
|
import 'package:linkdy/utils/api_base_url.dart';
|
||||||
import 'package:linkdy/i18n/strings.g.dart';
|
import 'package:linkdy/i18n/strings.g.dart';
|
||||||
@@ -155,9 +156,17 @@ FutureOr<bool> connectToServer(ConnectToServerRef ref) async {
|
|||||||
ref.read(apiClientProvider.notifier).setApiClient(apiClient);
|
ref.read(apiClientProvider.notifier).setApiClient(apiClient);
|
||||||
ref.read(serverInstancesProvider.notifier).saveNewInstance(serverInstance);
|
ref.read(serverInstancesProvider.notifier).saveNewInstance(serverInstance);
|
||||||
} else if (result == AuthResult.invalidToken) {
|
} else if (result == AuthResult.invalidToken) {
|
||||||
ref.read(snackbarProvider.notifier).showSnacbkar(label: t.onboarding.invalidToken, color: Colors.red);
|
showSnackbar(
|
||||||
|
key: ScaffoldMessengerKeys.onboarding,
|
||||||
|
label: t.onboarding.invalidToken,
|
||||||
|
color: Colors.red,
|
||||||
|
);
|
||||||
} else {
|
} else {
|
||||||
ref.read(snackbarProvider.notifier).showSnacbkar(label: t.onboarding.cannotConnectToServer, color: Colors.red);
|
showSnackbar(
|
||||||
|
key: ScaffoldMessengerKeys.onboarding,
|
||||||
|
label: t.onboarding.cannotConnectToServer,
|
||||||
|
color: Colors.red,
|
||||||
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
return false;
|
return false;
|
||||||
|
|||||||
@@ -6,7 +6,7 @@ part of 'connect.provider.dart';
|
|||||||
// RiverpodGenerator
|
// RiverpodGenerator
|
||||||
// **************************************************************************
|
// **************************************************************************
|
||||||
|
|
||||||
String _$connectToServerHash() => r'a5225cddee0824ab2e6393da9d5c305e212bbfba';
|
String _$connectToServerHash() => r'4c7d8eb1e2ed082e5ce2cde03f8afe343d7126b9';
|
||||||
|
|
||||||
/// See also [connectToServer].
|
/// See also [connectToServer].
|
||||||
@ProviderFor(connectToServer)
|
@ProviderFor(connectToServer)
|
||||||
|
|||||||
@@ -7,22 +7,27 @@ import 'package:linkdy/screens/onboarding/ui/server_required.dart';
|
|||||||
import 'package:linkdy/screens/onboarding/ui/welcome.dart';
|
import 'package:linkdy/screens/onboarding/ui/welcome.dart';
|
||||||
import 'package:linkdy/widgets/system_overlay_style.dart';
|
import 'package:linkdy/widgets/system_overlay_style.dart';
|
||||||
|
|
||||||
|
import 'package:linkdy/constants/global_keys.dart';
|
||||||
|
|
||||||
class Onboarding extends ConsumerWidget {
|
class Onboarding extends ConsumerWidget {
|
||||||
const Onboarding({Key? key}) : super(key: key);
|
const Onboarding({super.key});
|
||||||
|
|
||||||
@override
|
@override
|
||||||
Widget build(BuildContext context, WidgetRef ref) {
|
Widget build(BuildContext context, WidgetRef ref) {
|
||||||
return OverlayStyle(
|
return OverlayStyle(
|
||||||
child: Scaffold(
|
child: ScaffoldMessenger(
|
||||||
body: SafeArea(
|
key: ScaffoldMessengerKeys.onboarding,
|
||||||
child: PageView(
|
child: Scaffold(
|
||||||
controller: ref.watch(onboardingProvider).pageController,
|
body: SafeArea(
|
||||||
physics: const NeverScrollableScrollPhysics(),
|
child: PageView(
|
||||||
children: const [
|
controller: ref.watch(onboardingProvider).pageController,
|
||||||
OnboardingWelcome(),
|
physics: const NeverScrollableScrollPhysics(),
|
||||||
OnboardingServerRequired(),
|
children: const [
|
||||||
OnboardingConnect(),
|
OnboardingWelcome(),
|
||||||
],
|
OnboardingServerRequired(),
|
||||||
|
OnboardingConnect(),
|
||||||
|
],
|
||||||
|
),
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
|
|||||||
@@ -1,3 +1,4 @@
|
|||||||
|
import 'package:linkdy/constants/global_keys.dart';
|
||||||
import 'package:riverpod_annotation/riverpod_annotation.dart';
|
import 'package:riverpod_annotation/riverpod_annotation.dart';
|
||||||
|
|
||||||
import 'package:linkdy/screens/bookmarks/provider/favicon_loader.provider.dart';
|
import 'package:linkdy/screens/bookmarks/provider/favicon_loader.provider.dart';
|
||||||
@@ -99,6 +100,7 @@ class TagBookmarks extends _$TagBookmarks {
|
|||||||
|
|
||||||
void deleteBookmark(Bookmark bookmark) async {
|
void deleteBookmark(Bookmark bookmark) async {
|
||||||
final result = await BookmarkCommonFunctions.deleteBookmark<TagBookmarksModel>(
|
final result = await BookmarkCommonFunctions.deleteBookmark<TagBookmarksModel>(
|
||||||
|
scaffoldMessengerKey: ScaffoldMessengerKeys.tagBookmarks,
|
||||||
ref: ref,
|
ref: ref,
|
||||||
bookmark: bookmark,
|
bookmark: bookmark,
|
||||||
apiClient: ref.read(apiClientProvider)!,
|
apiClient: ref.read(apiClientProvider)!,
|
||||||
@@ -111,6 +113,7 @@ class TagBookmarks extends _$TagBookmarks {
|
|||||||
|
|
||||||
void markAsReadUnread(Bookmark bookmark) async {
|
void markAsReadUnread(Bookmark bookmark) async {
|
||||||
final result = await BookmarkCommonFunctions.markAsReadUnread<TagBookmarksModel>(
|
final result = await BookmarkCommonFunctions.markAsReadUnread<TagBookmarksModel>(
|
||||||
|
scaffoldMessengerKey: ScaffoldMessengerKeys.tagBookmarks,
|
||||||
ref: ref,
|
ref: ref,
|
||||||
bookmark: bookmark,
|
bookmark: bookmark,
|
||||||
apiClient: ref.read(apiClientProvider)!,
|
apiClient: ref.read(apiClientProvider)!,
|
||||||
@@ -123,6 +126,7 @@ class TagBookmarks extends _$TagBookmarks {
|
|||||||
|
|
||||||
void archiveUnarchive(Bookmark bookmark) async {
|
void archiveUnarchive(Bookmark bookmark) async {
|
||||||
final result = await BookmarkCommonFunctions.archiveUnarchive<TagBookmarksModel>(
|
final result = await BookmarkCommonFunctions.archiveUnarchive<TagBookmarksModel>(
|
||||||
|
scaffoldMessengerKey: ScaffoldMessengerKeys.tagBookmarks,
|
||||||
ref: ref,
|
ref: ref,
|
||||||
bookmark: bookmark,
|
bookmark: bookmark,
|
||||||
apiClient: ref.read(apiClientProvider)!,
|
apiClient: ref.read(apiClientProvider)!,
|
||||||
|
|||||||
@@ -206,7 +206,7 @@ final tagBookmarksRequestLoadMoreProvider =
|
|||||||
);
|
);
|
||||||
|
|
||||||
typedef TagBookmarksRequestLoadMoreRef = AutoDisposeFutureProviderRef<void>;
|
typedef TagBookmarksRequestLoadMoreRef = AutoDisposeFutureProviderRef<void>;
|
||||||
String _$tagBookmarksHash() => r'5a183019775e04aa10f28c1492993f09445867a7';
|
String _$tagBookmarksHash() => r'd5004cac68d86490b49fc6f722ec819267aedf17';
|
||||||
|
|
||||||
/// See also [TagBookmarks].
|
/// See also [TagBookmarks].
|
||||||
@ProviderFor(TagBookmarks)
|
@ProviderFor(TagBookmarks)
|
||||||
|
|||||||
@@ -1,6 +1,7 @@
|
|||||||
import 'package:flutter/material.dart';
|
import 'package:flutter/material.dart';
|
||||||
import 'package:flutter_riverpod/flutter_riverpod.dart';
|
import 'package:flutter_riverpod/flutter_riverpod.dart';
|
||||||
import 'package:flutter_slidable/flutter_slidable.dart';
|
import 'package:flutter_slidable/flutter_slidable.dart';
|
||||||
|
import 'package:linkdy/constants/global_keys.dart';
|
||||||
|
|
||||||
import 'package:linkdy/screens/bookmarks/ui/bookmark_item.dart';
|
import 'package:linkdy/screens/bookmarks/ui/bookmark_item.dart';
|
||||||
import 'package:linkdy/screens/bookmarks/ui/delete_bookmark_modal.dart';
|
import 'package:linkdy/screens/bookmarks/ui/delete_bookmark_modal.dart';
|
||||||
@@ -19,10 +20,10 @@ class TagBookmarksScreen extends ConsumerStatefulWidget {
|
|||||||
final Tag? tag;
|
final Tag? tag;
|
||||||
|
|
||||||
const TagBookmarksScreen({
|
const TagBookmarksScreen({
|
||||||
Key? key,
|
super.key,
|
||||||
required this.tagId,
|
required this.tagId,
|
||||||
this.tag,
|
this.tag,
|
||||||
}) : super(key: key);
|
});
|
||||||
|
|
||||||
@override
|
@override
|
||||||
TagBookmarksScreenState createState() => TagBookmarksScreenState();
|
TagBookmarksScreenState createState() => TagBookmarksScreenState();
|
||||||
@@ -66,85 +67,89 @@ class TagBookmarksScreenState extends ConsumerState<TagBookmarksScreen> {
|
|||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
return Scaffold(
|
return ScaffoldMessenger(
|
||||||
body: NestedScrollView(
|
key: ScaffoldMessengerKeys.tagBookmarks,
|
||||||
headerSliverBuilder: (context, innerBoxIsScrolled) => [
|
child: Scaffold(
|
||||||
SliverOverlapAbsorber(
|
body: NestedScrollView(
|
||||||
handle: NestedScrollView.sliverOverlapAbsorberHandleFor(context),
|
headerSliverBuilder: (context, innerBoxIsScrolled) => [
|
||||||
sliver: SliverAppBar.large(
|
SliverOverlapAbsorber(
|
||||||
pinned: true,
|
handle: NestedScrollView.sliverOverlapAbsorberHandleFor(context),
|
||||||
floating: true,
|
sliver: SliverAppBar.large(
|
||||||
centerTitle: false,
|
pinned: true,
|
||||||
forceElevated: innerBoxIsScrolled,
|
floating: true,
|
||||||
title: Text(
|
centerTitle: false,
|
||||||
widget.tag != null
|
forceElevated: innerBoxIsScrolled,
|
||||||
? "#${widget.tag!.name}"
|
title: Text(
|
||||||
: provider.tag != null
|
widget.tag != null
|
||||||
? "#${provider.tag!.name}"
|
? "#${widget.tag!.name}"
|
||||||
: '',
|
: provider.tag != null
|
||||||
|
? "#${provider.tag!.name}"
|
||||||
|
: '',
|
||||||
|
),
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
),
|
],
|
||||||
],
|
body: SafeArea(
|
||||||
body: SafeArea(
|
top: false,
|
||||||
top: false,
|
child: Builder(
|
||||||
child: Builder(
|
builder: (context) => RefreshIndicator(
|
||||||
builder: (context) => RefreshIndicator(
|
displacement: 120,
|
||||||
displacement: 120,
|
onRefresh: () => ref.read(tagBookmarksProvider.notifier).refresh(),
|
||||||
onRefresh: () => ref.read(tagBookmarksProvider.notifier).refresh(),
|
child: NotificationListener(
|
||||||
child: NotificationListener(
|
onNotification: scrollListener,
|
||||||
onNotification: scrollListener,
|
child: CustomScrollView(
|
||||||
child: CustomScrollView(
|
slivers: [
|
||||||
slivers: [
|
SliverOverlapInjector(
|
||||||
SliverOverlapInjector(
|
handle: NestedScrollView.sliverOverlapAbsorberHandleFor(context),
|
||||||
handle: NestedScrollView.sliverOverlapAbsorberHandleFor(context),
|
|
||||||
),
|
|
||||||
if (provider.initialLoadStatus == LoadStatus.loading)
|
|
||||||
const SliverFillRemaining(
|
|
||||||
child: Center(child: CircularProgressIndicator()),
|
|
||||||
),
|
),
|
||||||
if (provider.initialLoadStatus == LoadStatus.error)
|
if (provider.initialLoadStatus == LoadStatus.loading)
|
||||||
SliverFillRemaining(
|
const SliverFillRemaining(
|
||||||
child: ErrorScreen(
|
child: Center(child: CircularProgressIndicator()),
|
||||||
error: t.bookmarks.cannotLoadBookmarks,
|
|
||||||
),
|
),
|
||||||
),
|
if (provider.initialLoadStatus == LoadStatus.error)
|
||||||
if (provider.bookmarks.isEmpty)
|
SliverFillRemaining(
|
||||||
SliverFillRemaining(
|
child: ErrorScreen(
|
||||||
child: NoDataScreen(
|
error: t.bookmarks.cannotLoadBookmarks,
|
||||||
message: t.tags.tagBookmarks.noBookmarksWithThisTag,
|
),
|
||||||
),
|
),
|
||||||
),
|
if (provider.bookmarks.isEmpty)
|
||||||
if (provider.bookmarks.isNotEmpty)
|
SliverFillRemaining(
|
||||||
SlidableAutoCloseBehavior(
|
child: NoDataScreen(
|
||||||
child: SliverList.builder(
|
message: t.tags.tagBookmarks.noBookmarksWithThisTag,
|
||||||
itemCount:
|
),
|
||||||
provider.loadingMore == true ? provider.bookmarks.length + 1 : provider.bookmarks.length,
|
),
|
||||||
itemBuilder: (context, index) {
|
if (provider.bookmarks.isNotEmpty)
|
||||||
if (provider.loadingMore == true && index == provider.bookmarks.length) {
|
SlidableAutoCloseBehavior(
|
||||||
return const Padding(
|
child: SliverList.builder(
|
||||||
padding: EdgeInsets.all(16),
|
itemCount: provider.loadingMore == true
|
||||||
child: Center(
|
? provider.bookmarks.length + 1
|
||||||
child: CircularProgressIndicator(),
|
: provider.bookmarks.length,
|
||||||
|
itemBuilder: (context, index) {
|
||||||
|
if (provider.loadingMore == true && index == provider.bookmarks.length) {
|
||||||
|
return const Padding(
|
||||||
|
padding: EdgeInsets.all(16),
|
||||||
|
child: Center(
|
||||||
|
child: CircularProgressIndicator(),
|
||||||
|
),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
return BookmarkItem(
|
||||||
|
bookmark: provider.bookmarks[index],
|
||||||
|
onReadUnread: ref.read(tagBookmarksProvider.notifier).markAsReadUnread,
|
||||||
|
onDelete: (bookmark) => showDialog(
|
||||||
|
context: context,
|
||||||
|
builder: (context) => DeleteBookmarkModal(
|
||||||
|
bookmark: bookmark,
|
||||||
|
onDelete: ref.read(tagBookmarksProvider.notifier).deleteBookmark,
|
||||||
|
),
|
||||||
),
|
),
|
||||||
|
onArchiveUnarchive: ref.read(tagBookmarksProvider.notifier).archiveUnarchive,
|
||||||
);
|
);
|
||||||
}
|
},
|
||||||
return BookmarkItem(
|
),
|
||||||
bookmark: provider.bookmarks[index],
|
|
||||||
onReadUnread: ref.read(tagBookmarksProvider.notifier).markAsReadUnread,
|
|
||||||
onDelete: (bookmark) => showDialog(
|
|
||||||
context: context,
|
|
||||||
builder: (context) => DeleteBookmarkModal(
|
|
||||||
bookmark: bookmark,
|
|
||||||
onDelete: ref.read(tagBookmarksProvider.notifier).deleteBookmark,
|
|
||||||
),
|
|
||||||
),
|
|
||||||
onArchiveUnarchive: ref.read(tagBookmarksProvider.notifier).archiveUnarchive,
|
|
||||||
);
|
|
||||||
},
|
|
||||||
),
|
),
|
||||||
),
|
],
|
||||||
],
|
),
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
|
|||||||
@@ -1,19 +1,19 @@
|
|||||||
import 'package:flutter/material.dart';
|
import 'package:flutter/material.dart';
|
||||||
import 'package:flutter_riverpod/flutter_riverpod.dart';
|
import 'package:flutter_riverpod/flutter_riverpod.dart';
|
||||||
import 'package:linkdy/providers/router.provider.dart';
|
|
||||||
import 'package:linkdy/router/names.dart';
|
|
||||||
|
|
||||||
import 'package:linkdy/screens/tags/provider/tags.provider.dart';
|
import 'package:linkdy/screens/tags/provider/tags.provider.dart';
|
||||||
import 'package:linkdy/screens/tags/ui/add_tag_modal.dart';
|
import 'package:linkdy/screens/tags/ui/add_tag_modal.dart';
|
||||||
import 'package:linkdy/widgets/error_screen.dart';
|
import 'package:linkdy/widgets/error_screen.dart';
|
||||||
import 'package:linkdy/widgets/no_data_screen.dart';
|
import 'package:linkdy/widgets/no_data_screen.dart';
|
||||||
import 'package:linkdy/widgets/snackbar_fab.dart';
|
|
||||||
|
|
||||||
import 'package:linkdy/utils/date_to_string.dart';
|
import 'package:linkdy/utils/date_to_string.dart';
|
||||||
|
import 'package:linkdy/constants/global_keys.dart';
|
||||||
|
import 'package:linkdy/providers/router.provider.dart';
|
||||||
|
import 'package:linkdy/router/names.dart';
|
||||||
import 'package:linkdy/i18n/strings.g.dart';
|
import 'package:linkdy/i18n/strings.g.dart';
|
||||||
|
|
||||||
class TagsScreen extends ConsumerWidget {
|
class TagsScreen extends ConsumerWidget {
|
||||||
const TagsScreen({Key? key}) : super(key: key);
|
const TagsScreen({super.key});
|
||||||
|
|
||||||
@override
|
@override
|
||||||
Widget build(BuildContext context, WidgetRef ref) {
|
Widget build(BuildContext context, WidgetRef ref) {
|
||||||
@@ -28,120 +28,119 @@ class TagsScreen extends ConsumerWidget {
|
|||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
return Scaffold(
|
return ScaffoldMessenger(
|
||||||
body: Stack(
|
key: ScaffoldMessengerKeys.tags,
|
||||||
children: [
|
child: Scaffold(
|
||||||
NestedScrollView(
|
body: NestedScrollView(
|
||||||
headerSliverBuilder: (context, innerBoxIsScrolled) => [
|
headerSliverBuilder: (context, innerBoxIsScrolled) => [
|
||||||
SliverOverlapAbsorber(
|
SliverOverlapAbsorber(
|
||||||
handle: NestedScrollView.sliverOverlapAbsorberHandleFor(context),
|
handle: NestedScrollView.sliverOverlapAbsorberHandleFor(context),
|
||||||
sliver: SliverAppBar.large(
|
sliver: SliverAppBar.large(
|
||||||
pinned: true,
|
pinned: true,
|
||||||
floating: true,
|
floating: true,
|
||||||
centerTitle: false,
|
centerTitle: false,
|
||||||
forceElevated: innerBoxIsScrolled,
|
forceElevated: innerBoxIsScrolled,
|
||||||
title: Text(t.tags.tags),
|
title: Text(t.tags.tags),
|
||||||
),
|
|
||||||
),
|
),
|
||||||
],
|
),
|
||||||
body: SafeArea(
|
],
|
||||||
top: false,
|
body: SafeArea(
|
||||||
bottom: false,
|
top: false,
|
||||||
child: Builder(
|
bottom: false,
|
||||||
builder: (context) => RefreshIndicator(
|
child: Builder(
|
||||||
displacement: 120,
|
builder: (context) => RefreshIndicator(
|
||||||
onRefresh: () => ref.refresh(tagsRequestProvider.future),
|
displacement: 120,
|
||||||
child: CustomScrollView(
|
onRefresh: () => ref.refresh(tagsRequestProvider.future),
|
||||||
slivers: [
|
child: CustomScrollView(
|
||||||
SliverOverlapInjector(
|
slivers: [
|
||||||
handle: NestedScrollView.sliverOverlapAbsorberHandleFor(context),
|
SliverOverlapInjector(
|
||||||
|
handle: NestedScrollView.sliverOverlapAbsorberHandleFor(context),
|
||||||
|
),
|
||||||
|
if (tags.isLoading && !tags.isRefreshing)
|
||||||
|
const SliverFillRemaining(
|
||||||
|
child: Center(child: CircularProgressIndicator()),
|
||||||
),
|
),
|
||||||
if (tags.isLoading && !tags.isRefreshing)
|
if (tags.value != null && tags.value!.successful == false)
|
||||||
const SliverFillRemaining(
|
SliverFillRemaining(
|
||||||
child: Center(child: CircularProgressIndicator()),
|
child: ErrorScreen(
|
||||||
|
error: t.bookmarks.cannotLoadBookmarks,
|
||||||
),
|
),
|
||||||
if (tags.value != null && tags.value!.successful == false)
|
),
|
||||||
SliverFillRemaining(
|
if (tags.value != null && tags.value!.successful == true && tags.value!.content!.results!.isEmpty)
|
||||||
child: ErrorScreen(
|
SliverFillRemaining(
|
||||||
error: t.bookmarks.cannotLoadBookmarks,
|
child: NoDataScreen(
|
||||||
),
|
message: t.bookmarks.noBookmarksAdded,
|
||||||
),
|
),
|
||||||
if (tags.value != null && tags.value!.successful == true && tags.value!.content!.results!.isEmpty)
|
),
|
||||||
SliverFillRemaining(
|
if (tags.value != null &&
|
||||||
child: NoDataScreen(
|
tags.value!.successful == true &&
|
||||||
message: t.bookmarks.noBookmarksAdded,
|
tags.value!.content!.results!.isNotEmpty)
|
||||||
),
|
SliverList.builder(
|
||||||
),
|
itemCount: tags.value!.content!.results!.length + 1,
|
||||||
if (tags.value != null &&
|
itemBuilder: (context, index) {
|
||||||
tags.value!.successful == true &&
|
// index == bookmarks.value!.content!.results!.length -> itemCount + 1
|
||||||
tags.value!.content!.results!.isNotEmpty)
|
if (index == tags.value!.content!.results!.length) {
|
||||||
SliverList.builder(
|
// Bottom gap for FAB
|
||||||
itemCount: tags.value!.content!.results!.length + 1,
|
return const SizedBox(height: 80);
|
||||||
itemBuilder: (context, index) {
|
}
|
||||||
// index == bookmarks.value!.content!.results!.length -> itemCount + 1
|
final tag = tags.value?.content?.results?[index];
|
||||||
if (index == tags.value!.content!.results!.length) {
|
return InkWell(
|
||||||
// Bottom gap for FAB
|
onTap: () => ref.watch(routerProvider).pushNamed(
|
||||||
return const SizedBox(height: 80);
|
RoutesNames.tagBookmarks,
|
||||||
}
|
extra: tag,
|
||||||
final tag = tags.value?.content?.results?[index];
|
pathParameters: {'id': tag.id!.toString()},
|
||||||
return InkWell(
|
),
|
||||||
onTap: () => ref.watch(routerProvider).pushNamed(
|
child: Container(
|
||||||
RoutesNames.tagBookmarks,
|
width: double.maxFinite,
|
||||||
extra: tag,
|
padding: const EdgeInsets.symmetric(horizontal: 16, vertical: 8),
|
||||||
pathParameters: {'id': tag.id!.toString()},
|
child: Column(
|
||||||
),
|
crossAxisAlignment: CrossAxisAlignment.start,
|
||||||
child: Container(
|
children: [
|
||||||
width: double.maxFinite,
|
Row(
|
||||||
padding: const EdgeInsets.symmetric(horizontal: 16, vertical: 8),
|
children: [
|
||||||
child: Column(
|
Icon(
|
||||||
crossAxisAlignment: CrossAxisAlignment.start,
|
Icons.label_rounded,
|
||||||
children: [
|
size: 16,
|
||||||
Row(
|
color: Theme.of(context).colorScheme.onSurfaceVariant.withOpacity(0.7),
|
||||||
children: [
|
),
|
||||||
Icon(
|
const SizedBox(width: 8),
|
||||||
Icons.label_rounded,
|
Flexible(
|
||||||
size: 16,
|
child: Text(
|
||||||
color: Theme.of(context).colorScheme.onSurfaceVariant.withOpacity(0.7),
|
tag!.name!,
|
||||||
),
|
overflow: TextOverflow.ellipsis,
|
||||||
const SizedBox(width: 8),
|
style: TextStyle(
|
||||||
Flexible(
|
fontSize: 16,
|
||||||
child: Text(
|
fontWeight: FontWeight.w500,
|
||||||
tag!.name!,
|
color: Theme.of(context).colorScheme.onSurface,
|
||||||
overflow: TextOverflow.ellipsis,
|
|
||||||
style: TextStyle(
|
|
||||||
fontSize: 16,
|
|
||||||
fontWeight: FontWeight.w500,
|
|
||||||
color: Theme.of(context).colorScheme.onSurface,
|
|
||||||
),
|
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
],
|
|
||||||
),
|
|
||||||
const SizedBox(height: 4),
|
|
||||||
Text(
|
|
||||||
t.tags.created(created: dateToString(tag.dateAdded!)),
|
|
||||||
style: TextStyle(
|
|
||||||
fontSize: 14,
|
|
||||||
color: Theme.of(context).colorScheme.onSurfaceVariant,
|
|
||||||
),
|
),
|
||||||
|
],
|
||||||
|
),
|
||||||
|
const SizedBox(height: 4),
|
||||||
|
Text(
|
||||||
|
t.tags.created(created: dateToString(tag.dateAdded!)),
|
||||||
|
style: TextStyle(
|
||||||
|
fontSize: 14,
|
||||||
|
color: Theme.of(context).colorScheme.onSurfaceVariant,
|
||||||
),
|
),
|
||||||
],
|
),
|
||||||
),
|
],
|
||||||
),
|
),
|
||||||
);
|
),
|
||||||
},
|
);
|
||||||
),
|
},
|
||||||
],
|
),
|
||||||
),
|
],
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
SnackbarFloatingActionButton(
|
),
|
||||||
onPressed: openAddModal,
|
floatingActionButton: FloatingActionButton(
|
||||||
child: const Icon(Icons.add_rounded),
|
onPressed: openAddModal,
|
||||||
),
|
child: const Icon(Icons.add_rounded),
|
||||||
],
|
),
|
||||||
),
|
),
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -5,6 +5,7 @@ import 'package:share_plus/share_plus.dart';
|
|||||||
|
|
||||||
import 'package:linkdy/screens/webview/provider/webview.provider.dart';
|
import 'package:linkdy/screens/webview/provider/webview.provider.dart';
|
||||||
|
|
||||||
|
import 'package:linkdy/constants/global_keys.dart';
|
||||||
import 'package:linkdy/models/data/bookmarks.dart';
|
import 'package:linkdy/models/data/bookmarks.dart';
|
||||||
import 'package:linkdy/i18n/strings.g.dart';
|
import 'package:linkdy/i18n/strings.g.dart';
|
||||||
import 'package:linkdy/utils/copy_clipboard.dart';
|
import 'package:linkdy/utils/copy_clipboard.dart';
|
||||||
@@ -14,144 +15,148 @@ class WebViewScreen extends ConsumerWidget {
|
|||||||
final Bookmark bookmark;
|
final Bookmark bookmark;
|
||||||
|
|
||||||
const WebViewScreen({
|
const WebViewScreen({
|
||||||
Key? key,
|
super.key,
|
||||||
required this.bookmark,
|
required this.bookmark,
|
||||||
}) : super(key: key);
|
});
|
||||||
|
|
||||||
@override
|
@override
|
||||||
Widget build(BuildContext context, WidgetRef ref) {
|
Widget build(BuildContext context, WidgetRef ref) {
|
||||||
return Scaffold(
|
return ScaffoldMessenger(
|
||||||
appBar: AppBar(
|
key: ScaffoldMessengerKeys.webview,
|
||||||
elevation: 3,
|
child: Scaffold(
|
||||||
title: Column(
|
appBar: AppBar(
|
||||||
crossAxisAlignment: CrossAxisAlignment.start,
|
elevation: 3,
|
||||||
children: [
|
title: Column(
|
||||||
Text(
|
crossAxisAlignment: CrossAxisAlignment.start,
|
||||||
bookmark.title != "" ? bookmark.title! : bookmark.websiteTitle!,
|
children: [
|
||||||
style: const TextStyle(fontSize: 14),
|
Text(
|
||||||
),
|
bookmark.title != "" ? bookmark.title! : bookmark.websiteTitle!,
|
||||||
const SizedBox(height: 4),
|
style: const TextStyle(fontSize: 14),
|
||||||
Text(
|
|
||||||
bookmark.url!,
|
|
||||||
style: TextStyle(
|
|
||||||
fontSize: 12,
|
|
||||||
color: Theme.of(context).colorScheme.onSurfaceVariant,
|
|
||||||
),
|
),
|
||||||
),
|
const SizedBox(height: 4),
|
||||||
],
|
Text(
|
||||||
),
|
bookmark.url!,
|
||||||
bottom: PreferredSize(
|
style: TextStyle(
|
||||||
preferredSize: const Size(double.maxFinite, 0),
|
fontSize: 12,
|
||||||
child: ref.watch(webViewProvider).loadProgress < 100
|
color: Theme.of(context).colorScheme.onSurfaceVariant,
|
||||||
? const LinearProgressIndicator()
|
|
||||||
: const SizedBox(
|
|
||||||
height: 4,
|
|
||||||
),
|
),
|
||||||
|
),
|
||||||
|
],
|
||||||
|
),
|
||||||
|
bottom: PreferredSize(
|
||||||
|
preferredSize: const Size(double.maxFinite, 0),
|
||||||
|
child: ref.watch(webViewProvider).loadProgress < 100
|
||||||
|
? const LinearProgressIndicator()
|
||||||
|
: const SizedBox(
|
||||||
|
height: 4,
|
||||||
|
),
|
||||||
|
),
|
||||||
),
|
),
|
||||||
),
|
body: SafeArea(
|
||||||
body: SafeArea(
|
child: Column(
|
||||||
child: Column(
|
children: [
|
||||||
children: [
|
Expanded(
|
||||||
Expanded(
|
child: InAppWebView(
|
||||||
child: InAppWebView(
|
initialUrlRequest: URLRequest(url: WebUri.uri(Uri.parse(bookmark.url!))),
|
||||||
initialUrlRequest: URLRequest(url: WebUri.uri(Uri.parse(bookmark.url!))),
|
onWebViewCreated: (controller) {
|
||||||
onWebViewCreated: (controller) {
|
ref.read(webViewProvider).inAppWebViewController = controller;
|
||||||
ref.read(webViewProvider).inAppWebViewController = controller;
|
},
|
||||||
},
|
onPermissionRequest: (controller, request) async {
|
||||||
onPermissionRequest: (controller, request) async {
|
return PermissionResponse(
|
||||||
return PermissionResponse(
|
resources: request.resources,
|
||||||
resources: request.resources,
|
action: PermissionResponseAction.DENY,
|
||||||
action: PermissionResponseAction.DENY,
|
);
|
||||||
);
|
},
|
||||||
},
|
onProgressChanged: (controller, progress) {
|
||||||
onProgressChanged: (controller, progress) {
|
ref.read(webViewProvider.notifier).setLoadProgress(progress);
|
||||||
ref.read(webViewProvider.notifier).setLoadProgress(progress);
|
},
|
||||||
},
|
initialSettings: InAppWebViewSettings(
|
||||||
initialSettings: InAppWebViewSettings(
|
cacheEnabled: false,
|
||||||
cacheEnabled: false,
|
isInspectable: false,
|
||||||
isInspectable: false,
|
),
|
||||||
|
onUpdateVisitedHistory: (controller, url, androidIsReload) {
|
||||||
|
controller.canGoBack().then(
|
||||||
|
(value) => context.mounted ? ref.read(webViewProvider.notifier).setCanGoBack(value) : null,
|
||||||
|
);
|
||||||
|
controller.canGoForward().then(
|
||||||
|
(value) => context.mounted ? ref.read(webViewProvider.notifier).setCanGoForward(value) : null,
|
||||||
|
);
|
||||||
|
},
|
||||||
),
|
),
|
||||||
onUpdateVisitedHistory: (controller, url, androidIsReload) {
|
|
||||||
controller.canGoBack().then(
|
|
||||||
(value) => context.mounted ? ref.read(webViewProvider.notifier).setCanGoBack(value) : null,
|
|
||||||
);
|
|
||||||
controller.canGoForward().then(
|
|
||||||
(value) => context.mounted ? ref.read(webViewProvider.notifier).setCanGoForward(value) : null,
|
|
||||||
);
|
|
||||||
},
|
|
||||||
),
|
),
|
||||||
),
|
Padding(
|
||||||
Padding(
|
padding: const EdgeInsets.all(8.0),
|
||||||
padding: const EdgeInsets.all(8.0),
|
child: Row(
|
||||||
child: Row(
|
mainAxisAlignment: MainAxisAlignment.spaceBetween,
|
||||||
mainAxisAlignment: MainAxisAlignment.spaceBetween,
|
children: [
|
||||||
children: [
|
Row(
|
||||||
Row(
|
children: [
|
||||||
children: [
|
IconButton(
|
||||||
IconButton(
|
onPressed: ref.watch(webViewProvider).canGoBack == true
|
||||||
onPressed: ref.watch(webViewProvider).canGoBack == true
|
? () => ref.watch(webViewProvider).inAppWebViewController?.goBack()
|
||||||
? () => ref.watch(webViewProvider).inAppWebViewController?.goBack()
|
: null,
|
||||||
: null,
|
icon: const Icon(Icons.arrow_back_rounded),
|
||||||
icon: const Icon(Icons.arrow_back_rounded),
|
tooltip: t.webview.goForward,
|
||||||
tooltip: t.webview.goForward,
|
|
||||||
),
|
|
||||||
const SizedBox(width: 8),
|
|
||||||
IconButton(
|
|
||||||
onPressed: ref.watch(webViewProvider).canGoForward == true
|
|
||||||
? () => ref.watch(webViewProvider).inAppWebViewController?.goForward()
|
|
||||||
: null,
|
|
||||||
icon: const Icon(Icons.arrow_forward_rounded),
|
|
||||||
tooltip: t.webview.goForward,
|
|
||||||
),
|
|
||||||
const SizedBox(width: 16),
|
|
||||||
IconButton(
|
|
||||||
onPressed: () => ref.watch(webViewProvider).inAppWebViewController?.reload(),
|
|
||||||
icon: const Icon(Icons.refresh_rounded),
|
|
||||||
tooltip: t.webview.reload,
|
|
||||||
),
|
|
||||||
],
|
|
||||||
),
|
|
||||||
PopupMenuButton(
|
|
||||||
itemBuilder: (context) => [
|
|
||||||
PopupMenuItem(
|
|
||||||
onTap: () => Share.shareUri(Uri.parse(bookmark.url!)),
|
|
||||||
child: Row(
|
|
||||||
children: [
|
|
||||||
const Icon(Icons.share_rounded),
|
|
||||||
const SizedBox(width: 12),
|
|
||||||
Flexible(child: Text(t.webview.share)),
|
|
||||||
],
|
|
||||||
),
|
),
|
||||||
),
|
const SizedBox(width: 8),
|
||||||
PopupMenuItem(
|
IconButton(
|
||||||
onTap: () => copyToClipboard(
|
onPressed: ref.watch(webViewProvider).canGoForward == true
|
||||||
value: bookmark.url!,
|
? () => ref.watch(webViewProvider).inAppWebViewController?.goForward()
|
||||||
successMessage: t.webview.linkCopiedClipboard,
|
: null,
|
||||||
|
icon: const Icon(Icons.arrow_forward_rounded),
|
||||||
|
tooltip: t.webview.goForward,
|
||||||
),
|
),
|
||||||
child: Row(
|
const SizedBox(width: 16),
|
||||||
children: [
|
IconButton(
|
||||||
const Icon(Icons.copy_rounded),
|
onPressed: () => ref.watch(webViewProvider).inAppWebViewController?.reload(),
|
||||||
const SizedBox(width: 12),
|
icon: const Icon(Icons.refresh_rounded),
|
||||||
Flexible(child: Text(t.webview.copyLinkClipboard)),
|
tooltip: t.webview.reload,
|
||||||
],
|
|
||||||
),
|
),
|
||||||
),
|
],
|
||||||
PopupMenuItem(
|
),
|
||||||
onTap: () => openUrl(bookmark.url!),
|
PopupMenuButton(
|
||||||
child: Row(
|
itemBuilder: (context) => [
|
||||||
children: [
|
PopupMenuItem(
|
||||||
const Icon(Icons.open_in_browser_rounded),
|
onTap: () => Share.shareUri(Uri.parse(bookmark.url!)),
|
||||||
const SizedBox(width: 12),
|
child: Row(
|
||||||
Flexible(child: Text(t.webview.openInSystemBrowser)),
|
children: [
|
||||||
],
|
const Icon(Icons.share_rounded),
|
||||||
|
const SizedBox(width: 12),
|
||||||
|
Flexible(child: Text(t.webview.share)),
|
||||||
|
],
|
||||||
|
),
|
||||||
),
|
),
|
||||||
),
|
PopupMenuItem(
|
||||||
],
|
onTap: () => copyToClipboard(
|
||||||
),
|
key: ScaffoldMessengerKeys.webview,
|
||||||
],
|
value: bookmark.url!,
|
||||||
|
successMessage: t.webview.linkCopiedClipboard,
|
||||||
|
),
|
||||||
|
child: Row(
|
||||||
|
children: [
|
||||||
|
const Icon(Icons.copy_rounded),
|
||||||
|
const SizedBox(width: 12),
|
||||||
|
Flexible(child: Text(t.webview.copyLinkClipboard)),
|
||||||
|
],
|
||||||
|
),
|
||||||
|
),
|
||||||
|
PopupMenuItem(
|
||||||
|
onTap: () => openUrl(bookmark.url!),
|
||||||
|
child: Row(
|
||||||
|
children: [
|
||||||
|
const Icon(Icons.open_in_browser_rounded),
|
||||||
|
const SizedBox(width: 12),
|
||||||
|
Flexible(child: Text(t.webview.openInSystemBrowser)),
|
||||||
|
],
|
||||||
|
),
|
||||||
|
),
|
||||||
|
],
|
||||||
|
),
|
||||||
|
],
|
||||||
|
),
|
||||||
),
|
),
|
||||||
),
|
],
|
||||||
],
|
),
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
);
|
);
|
||||||
|
|||||||
@@ -1,23 +1,18 @@
|
|||||||
// ignore_for_file: use_build_context_synchronously
|
|
||||||
|
|
||||||
import 'package:flutter/material.dart';
|
import 'package:flutter/material.dart';
|
||||||
import 'package:flutter/services.dart';
|
import 'package:flutter/services.dart';
|
||||||
|
|
||||||
import 'package:linkdy/constants/global_keys.dart';
|
|
||||||
|
|
||||||
void copyToClipboard({
|
void copyToClipboard({
|
||||||
|
required GlobalKey<ScaffoldMessengerState> key,
|
||||||
required String value,
|
required String value,
|
||||||
required String successMessage,
|
required String successMessage,
|
||||||
}) async {
|
}) async {
|
||||||
if (scaffoldMessengerGlobalKey.currentState != null) {
|
await Clipboard.setData(
|
||||||
await Clipboard.setData(
|
ClipboardData(text: value),
|
||||||
ClipboardData(text: value),
|
);
|
||||||
);
|
key.currentState!.showSnackBar(
|
||||||
scaffoldMessengerGlobalKey.currentState!.showSnackBar(
|
SnackBar(
|
||||||
SnackBar(
|
content: Text(successMessage),
|
||||||
content: Text(successMessage),
|
backgroundColor: Colors.green,
|
||||||
backgroundColor: Colors.green,
|
),
|
||||||
),
|
);
|
||||||
);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|||||||
17
lib/utils/snackbar.dart
Normal file
17
lib/utils/snackbar.dart
Normal file
@@ -0,0 +1,17 @@
|
|||||||
|
import 'package:flutter/material.dart';
|
||||||
|
|
||||||
|
void showSnackbar({
|
||||||
|
required GlobalKey<ScaffoldMessengerState> key,
|
||||||
|
required String label,
|
||||||
|
required Color color,
|
||||||
|
Color? labelColor,
|
||||||
|
}) {
|
||||||
|
final snackBar = SnackBar(
|
||||||
|
content: Text(
|
||||||
|
label,
|
||||||
|
style: TextStyle(color: labelColor ?? Colors.white),
|
||||||
|
),
|
||||||
|
backgroundColor: color,
|
||||||
|
);
|
||||||
|
key.currentState?.showSnackBar(snackBar);
|
||||||
|
}
|
||||||
@@ -12,10 +12,10 @@ class Layout extends ConsumerWidget {
|
|||||||
final Widget child;
|
final Widget child;
|
||||||
|
|
||||||
const Layout({
|
const Layout({
|
||||||
Key? key,
|
super.key,
|
||||||
required this.state,
|
required this.state,
|
||||||
required this.child,
|
required this.child,
|
||||||
}) : super(key: key);
|
});
|
||||||
|
|
||||||
@override
|
@override
|
||||||
Widget build(BuildContext context, WidgetRef ref) {
|
Widget build(BuildContext context, WidgetRef ref) {
|
||||||
|
|||||||
@@ -1,29 +0,0 @@
|
|||||||
import 'package:flutter/material.dart';
|
|
||||||
import 'package:flutter_riverpod/flutter_riverpod.dart';
|
|
||||||
|
|
||||||
import 'package:linkdy/providers/snackbar.provider.dart';
|
|
||||||
|
|
||||||
class SnackbarFloatingActionButton extends ConsumerWidget {
|
|
||||||
final Widget child;
|
|
||||||
final void Function() onPressed;
|
|
||||||
|
|
||||||
const SnackbarFloatingActionButton({
|
|
||||||
Key? key,
|
|
||||||
required this.onPressed,
|
|
||||||
required this.child,
|
|
||||||
}) : super(key: key);
|
|
||||||
|
|
||||||
@override
|
|
||||||
Widget build(BuildContext context, WidgetRef ref) {
|
|
||||||
return AnimatedPositioned(
|
|
||||||
bottom: ref.watch(snackbarProvider).visible == true ? 70 : 20,
|
|
||||||
right: 20,
|
|
||||||
duration: const Duration(milliseconds: 200),
|
|
||||||
curve: Curves.ease,
|
|
||||||
child: FloatingActionButton(
|
|
||||||
onPressed: onPressed,
|
|
||||||
child: child,
|
|
||||||
),
|
|
||||||
);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
Reference in New Issue
Block a user