Improved snackbars
This commit is contained in:
@@ -1,4 +1,12 @@
|
||||
import 'package:flutter/material.dart';
|
||||
|
||||
final scaffoldMessengerGlobalKey = GlobalKey<ScaffoldMessengerState>();
|
||||
final searchScaffoldMessengerKey = GlobalKey<ScaffoldMessengerState>();
|
||||
class ScaffoldMessengerKeys {
|
||||
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
|
||||
/// 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
|
||||
// ignore_for_file: type=lint
|
||||
|
||||
@@ -6,14 +6,14 @@ import 'package:flutter/services.dart';
|
||||
import 'package:flutter_dotenv/flutter_dotenv.dart';
|
||||
import 'package:flutter_localizations/flutter_localizations.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:dynamic_color/dynamic_color.dart';
|
||||
import 'package:package_info_plus/package_info_plus.dart';
|
||||
import 'package:sentry_flutter/sentry_flutter.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_info.provider.dart';
|
||||
import 'package:linkdy/config/theme.dart';
|
||||
@@ -94,7 +94,7 @@ class MyApp extends ConsumerWidget {
|
||||
supportedLocales: AppLocaleUtils.supportedLocales,
|
||||
localizationsDelegates: GlobalMaterialLocalizations.delegates,
|
||||
debugShowCheckedModeBanner: false,
|
||||
scaffoldMessengerKey: scaffoldMessengerGlobalKey,
|
||||
scaffoldMessengerKey: ScaffoldMessengerKeys.root,
|
||||
routerConfig: ref.watch(routerProvider),
|
||||
);
|
||||
},
|
||||
|
||||
@@ -3,8 +3,9 @@ import 'package:flutter/material.dart';
|
||||
import 'package:go_router/go_router.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/constants/global_keys.dart';
|
||||
import 'package:linkdy/providers/server_instances.provider.dart';
|
||||
import 'package:linkdy/router/routes.dart';
|
||||
import 'package:linkdy/router/paths.dart';
|
||||
@@ -23,7 +24,7 @@ InterceptorsWrapper dioInterceptor(DioInterceptorRef ref) {
|
||||
GoRouter.of(rootNavigatorKey.currentContext!).pushReplacement(RoutesPaths.onboarding);
|
||||
ref.read(apiClientProvider.notifier).disconnectApiClient();
|
||||
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);
|
||||
},
|
||||
|
||||
@@ -6,7 +6,7 @@ part of 'dio_interceptor.provider.dart';
|
||||
// RiverpodGenerator
|
||||
// **************************************************************************
|
||||
|
||||
String _$dioInterceptorHash() => r'15186eb74bde12048a96b1d38f1c9308c9f435a8';
|
||||
String _$dioInterceptorHash() => r'16ba03ce5f4547c91566a38f348cf85df73fbfca';
|
||||
|
||||
/// See also [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:linkdy/constants/global_keys.dart';
|
||||
import 'package:riverpod_annotation/riverpod_annotation.dart';
|
||||
|
||||
import 'package:linkdy/screens/bookmarks/provider/bookmarks.provider.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/i18n/strings.g.dart';
|
||||
import 'package:linkdy/utils/process_modal.dart';
|
||||
@@ -101,7 +102,8 @@ class AddBookmark extends _$AddBookmark {
|
||||
ref.read(bookmarksProvider.notifier).refresh();
|
||||
ref.watch(routerProvider).pop();
|
||||
} else {
|
||||
ref.read(snackbarProvider.notifier).showSnacbkar(
|
||||
showSnackbar(
|
||||
key: ScaffoldMessengerKeys.addBookmark,
|
||||
label: t.bookmarks.addBookmark.errorSavingBookmark,
|
||||
color: Colors.red,
|
||||
);
|
||||
|
||||
@@ -175,7 +175,7 @@ final getTagsProvider =
|
||||
);
|
||||
|
||||
typedef GetTagsRef = AutoDisposeFutureProviderRef<ApiResponse<TagsResponse>>;
|
||||
String _$addBookmarkHash() => r'd6425004c3e755ec539ad28da3ef44349680b04b';
|
||||
String _$addBookmarkHash() => r'a350eee7aeed2fabae90966afadc609ee5eef895';
|
||||
|
||||
/// See also [AddBookmark].
|
||||
@ProviderFor(AddBookmark)
|
||||
|
||||
@@ -1,3 +1,4 @@
|
||||
import 'package:linkdy/constants/global_keys.dart';
|
||||
import 'package:riverpod_annotation/riverpod_annotation.dart';
|
||||
|
||||
import 'package:linkdy/screens/bookmarks/provider/common_functions.dart';
|
||||
@@ -90,6 +91,7 @@ class Bookmarks extends _$Bookmarks {
|
||||
|
||||
void deleteBookmark(Bookmark bookmark) async {
|
||||
final result = await BookmarkCommonFunctions.deleteBookmark<BookmarksModel>(
|
||||
scaffoldMessengerKey: ScaffoldMessengerKeys.bookmarks,
|
||||
ref: ref,
|
||||
bookmark: bookmark,
|
||||
apiClient: ref.read(apiClientProvider)!,
|
||||
@@ -102,6 +104,7 @@ class Bookmarks extends _$Bookmarks {
|
||||
|
||||
void markAsReadUnread(Bookmark bookmark) async {
|
||||
final result = await BookmarkCommonFunctions.markAsReadUnread<BookmarksModel>(
|
||||
scaffoldMessengerKey: ScaffoldMessengerKeys.bookmarks,
|
||||
ref: ref,
|
||||
bookmark: bookmark,
|
||||
apiClient: ref.read(apiClientProvider)!,
|
||||
@@ -114,6 +117,7 @@ class Bookmarks extends _$Bookmarks {
|
||||
|
||||
void archiveUnarchive(Bookmark bookmark) async {
|
||||
final result = await BookmarkCommonFunctions.archiveUnarchive<BookmarksModel>(
|
||||
scaffoldMessengerKey: ScaffoldMessengerKeys.bookmarks,
|
||||
ref: ref,
|
||||
bookmark: bookmark,
|
||||
apiClient: ref.read(apiClientProvider)!,
|
||||
|
||||
@@ -172,7 +172,7 @@ final bookmarksRequestLoadMoreProvider =
|
||||
);
|
||||
|
||||
typedef BookmarksRequestLoadMoreRef = AutoDisposeFutureProviderRef<void>;
|
||||
String _$bookmarksHash() => r'a2bd6f3226b5a1b9c19b536b31122fb5b449ff6a';
|
||||
String _$bookmarksHash() => r'84a236ccce48c0a0069ca2b754da59ff88b17ef2';
|
||||
|
||||
/// See also [Bookmarks].
|
||||
@ProviderFor(Bookmarks)
|
||||
|
||||
@@ -1,9 +1,9 @@
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:linkdy/providers/snackbar.provider.dart';
|
||||
import 'package:riverpod_annotation/riverpod_annotation.dart';
|
||||
|
||||
import 'package:linkdy/i18n/strings.g.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/services/api_client.dart';
|
||||
import 'package:linkdy/utils/process_modal.dart';
|
||||
@@ -13,7 +13,7 @@ class BookmarkCommonFunctions {
|
||||
required AutoDisposeNotifierProviderRef<T> ref,
|
||||
required Bookmark bookmark,
|
||||
required ApiClientService apiClient,
|
||||
GlobalKey<ScaffoldMessengerState>? scaffoldMessengerKey,
|
||||
required GlobalKey<ScaffoldMessengerState> scaffoldMessengerKey,
|
||||
}) async {
|
||||
final processModal = ProcessModal();
|
||||
processModal.open(t.bookmarks.bookmarkOptions.deletingBookmark);
|
||||
@@ -22,13 +22,13 @@ class BookmarkCommonFunctions {
|
||||
|
||||
processModal.close();
|
||||
if (result.successful == true) {
|
||||
ref.read(snackbarProvider.notifier).showSnacbkar(
|
||||
showSnackbar(
|
||||
key: scaffoldMessengerKey,
|
||||
label: t.bookmarks.bookmarkOptions.bookmarkDeleted,
|
||||
color: Colors.green,
|
||||
);
|
||||
} else {
|
||||
ref.read(snackbarProvider.notifier).showSnacbkar(
|
||||
showSnackbar(
|
||||
key: scaffoldMessengerKey,
|
||||
label: t.bookmarks.bookmarkOptions.bookmarkNotDeleted,
|
||||
color: Colors.red,
|
||||
@@ -41,7 +41,7 @@ class BookmarkCommonFunctions {
|
||||
required AutoDisposeNotifierProviderRef<T> ref,
|
||||
required Bookmark bookmark,
|
||||
required ApiClientService apiClient,
|
||||
GlobalKey<ScaffoldMessengerState>? scaffoldMessengerKey,
|
||||
required GlobalKey<ScaffoldMessengerState> scaffoldMessengerKey,
|
||||
}) async {
|
||||
final processModal = ProcessModal();
|
||||
processModal.open(
|
||||
@@ -63,7 +63,7 @@ class BookmarkCommonFunctions {
|
||||
|
||||
processModal.close();
|
||||
if (result.successful == true) {
|
||||
ref.read(snackbarProvider.notifier).showSnacbkar(
|
||||
showSnackbar(
|
||||
key: scaffoldMessengerKey,
|
||||
label: bookmark.unread == true
|
||||
? t.bookmarks.bookmarkOptions.markedAsReadSuccessfully
|
||||
@@ -72,7 +72,7 @@ class BookmarkCommonFunctions {
|
||||
);
|
||||
return result.content;
|
||||
} else {
|
||||
ref.read(snackbarProvider.notifier).showSnacbkar(
|
||||
showSnackbar(
|
||||
key: scaffoldMessengerKey,
|
||||
label: bookmark.unread == true
|
||||
? t.bookmarks.bookmarkOptions.bookmarkNotMarkedAsRead
|
||||
@@ -87,7 +87,7 @@ class BookmarkCommonFunctions {
|
||||
required AutoDisposeNotifierProviderRef<T> ref,
|
||||
required Bookmark bookmark,
|
||||
required ApiClientService apiClient,
|
||||
GlobalKey<ScaffoldMessengerState>? scaffoldMessengerKey,
|
||||
required GlobalKey<ScaffoldMessengerState> scaffoldMessengerKey,
|
||||
}) async {
|
||||
final processModal = ProcessModal();
|
||||
processModal.open(
|
||||
@@ -102,7 +102,7 @@ class BookmarkCommonFunctions {
|
||||
|
||||
processModal.close();
|
||||
if (result.successful == true) {
|
||||
ref.read(snackbarProvider.notifier).showSnacbkar(
|
||||
showSnackbar(
|
||||
key: scaffoldMessengerKey,
|
||||
label: bookmark.isArchived == true
|
||||
? t.bookmarks.bookmarkOptions.bookmarkUnrchivedSuccessfully
|
||||
@@ -110,7 +110,7 @@ class BookmarkCommonFunctions {
|
||||
color: Colors.green,
|
||||
);
|
||||
} else {
|
||||
ref.read(snackbarProvider.notifier).showSnacbkar(
|
||||
showSnackbar(
|
||||
key: scaffoldMessengerKey,
|
||||
label: bookmark.isArchived == true
|
||||
? t.bookmarks.bookmarkOptions.bookmarkNotUnrchived
|
||||
|
||||
@@ -104,7 +104,7 @@ class SearchBookmarks extends _$SearchBookmarks {
|
||||
ref: ref,
|
||||
bookmark: bookmark,
|
||||
apiClient: ref.read(apiClientProvider)!,
|
||||
scaffoldMessengerKey: searchScaffoldMessengerKey,
|
||||
scaffoldMessengerKey: ScaffoldMessengerKeys.search,
|
||||
);
|
||||
if (result == true) {
|
||||
state.bookmarks = state.bookmarks.where((b) => b.id != bookmark.id).toList();
|
||||
@@ -120,7 +120,7 @@ class SearchBookmarks extends _$SearchBookmarks {
|
||||
ref: ref,
|
||||
bookmark: bookmark,
|
||||
apiClient: ref.read(apiClientProvider)!,
|
||||
scaffoldMessengerKey: searchScaffoldMessengerKey,
|
||||
scaffoldMessengerKey: ScaffoldMessengerKeys.search,
|
||||
);
|
||||
if (result != null) {
|
||||
state.bookmarks = state.bookmarks.map((b) => b.id == result.id ? result : b).toList();
|
||||
@@ -136,7 +136,7 @@ class SearchBookmarks extends _$SearchBookmarks {
|
||||
ref: ref,
|
||||
bookmark: bookmark,
|
||||
apiClient: ref.read(apiClientProvider)!,
|
||||
scaffoldMessengerKey: searchScaffoldMessengerKey,
|
||||
scaffoldMessengerKey: ScaffoldMessengerKeys.search,
|
||||
);
|
||||
if (result == true) {
|
||||
// On this case the bookmark always will pass from unarchived to archived
|
||||
|
||||
@@ -174,7 +174,7 @@ final fetchSearchBookmarksLoadMoreProvider =
|
||||
);
|
||||
|
||||
typedef FetchSearchBookmarksLoadMoreRef = AutoDisposeFutureProviderRef<void>;
|
||||
String _$searchBookmarksHash() => r'5a5bc02d87a3eff3976a3bc6991c2208f4232fb4';
|
||||
String _$searchBookmarksHash() => r'c7c8394ae9ad71f8106a3b73100b88e09c154e13';
|
||||
|
||||
/// See also [SearchBookmarks].
|
||||
@ProviderFor(SearchBookmarks)
|
||||
|
||||
@@ -6,19 +6,22 @@ import 'package:linkdy/screens/bookmarks/provider/add_bookmark.provider.dart';
|
||||
import 'package:linkdy/widgets/section_label.dart';
|
||||
|
||||
import 'package:linkdy/i18n/strings.g.dart';
|
||||
import 'package:linkdy/constants/global_keys.dart';
|
||||
import 'package:linkdy/constants/enums.dart';
|
||||
|
||||
class AddBookmarkModal extends ConsumerWidget {
|
||||
final bool fullscreen;
|
||||
|
||||
const AddBookmarkModal({
|
||||
Key? key,
|
||||
super.key,
|
||||
required this.fullscreen,
|
||||
}) : super(key: key);
|
||||
});
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context, WidgetRef ref) {
|
||||
return Dialog.fullscreen(
|
||||
return ScaffoldMessenger(
|
||||
key: ScaffoldMessengerKeys.addBookmark,
|
||||
child: Dialog.fullscreen(
|
||||
child: Scaffold(
|
||||
body: NestedScrollView(
|
||||
headerSliverBuilder: (context, innerBoxIsScrolled) => [
|
||||
@@ -66,12 +69,13 @@ class AddBookmarkModal extends ConsumerWidget {
|
||||
),
|
||||
),
|
||||
),
|
||||
),
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
class _ModalContent extends ConsumerWidget {
|
||||
const _ModalContent({Key? key}) : super(key: key);
|
||||
const _ModalContent();
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context, WidgetRef ref) {
|
||||
|
||||
@@ -3,7 +3,6 @@ import 'dart:io';
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:flutter_riverpod/flutter_riverpod.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/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/widgets/error_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';
|
||||
|
||||
class BookmarksScreen extends ConsumerWidget {
|
||||
@@ -67,10 +67,10 @@ class BookmarksScreen extends ConsumerWidget {
|
||||
return false;
|
||||
}
|
||||
|
||||
return Scaffold(
|
||||
body: Stack(
|
||||
children: [
|
||||
NestedScrollView(
|
||||
return ScaffoldMessenger(
|
||||
key: ScaffoldMessengerKeys.bookmarks,
|
||||
child: Scaffold(
|
||||
body: NestedScrollView(
|
||||
headerSliverBuilder: (context, innerBoxIsScrolled) => [
|
||||
SliverOverlapAbsorber(
|
||||
handle: NestedScrollView.sliverOverlapAbsorberHandleFor(context),
|
||||
@@ -161,11 +161,10 @@ class BookmarksScreen extends ConsumerWidget {
|
||||
),
|
||||
),
|
||||
),
|
||||
SnackbarFloatingActionButton(
|
||||
floatingActionButton: FloatingActionButton(
|
||||
onPressed: openAddModal,
|
||||
child: const Icon(Icons.add_rounded),
|
||||
),
|
||||
],
|
||||
),
|
||||
);
|
||||
}
|
||||
|
||||
@@ -38,7 +38,7 @@ class SearchBookmarksModal extends ConsumerWidget {
|
||||
}
|
||||
|
||||
return ScaffoldMessenger(
|
||||
key: searchScaffoldMessengerKey,
|
||||
key: ScaffoldMessengerKeys.search,
|
||||
child: Dialog.fullscreen(
|
||||
child: Scaffold(
|
||||
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/constants/global_keys.dart';
|
||||
import 'package:linkdy/utils/snackbar.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/utils/api_base_url.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(serverInstancesProvider.notifier).saveNewInstance(serverInstance);
|
||||
} 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 {
|
||||
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;
|
||||
|
||||
@@ -6,7 +6,7 @@ part of 'connect.provider.dart';
|
||||
// RiverpodGenerator
|
||||
// **************************************************************************
|
||||
|
||||
String _$connectToServerHash() => r'a5225cddee0824ab2e6393da9d5c305e212bbfba';
|
||||
String _$connectToServerHash() => r'4c7d8eb1e2ed082e5ce2cde03f8afe343d7126b9';
|
||||
|
||||
/// See also [connectToServer].
|
||||
@ProviderFor(connectToServer)
|
||||
|
||||
@@ -7,12 +7,16 @@ import 'package:linkdy/screens/onboarding/ui/server_required.dart';
|
||||
import 'package:linkdy/screens/onboarding/ui/welcome.dart';
|
||||
import 'package:linkdy/widgets/system_overlay_style.dart';
|
||||
|
||||
import 'package:linkdy/constants/global_keys.dart';
|
||||
|
||||
class Onboarding extends ConsumerWidget {
|
||||
const Onboarding({Key? key}) : super(key: key);
|
||||
const Onboarding({super.key});
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context, WidgetRef ref) {
|
||||
return OverlayStyle(
|
||||
child: ScaffoldMessenger(
|
||||
key: ScaffoldMessengerKeys.onboarding,
|
||||
child: Scaffold(
|
||||
body: SafeArea(
|
||||
child: PageView(
|
||||
@@ -26,6 +30,7 @@ class Onboarding extends ConsumerWidget {
|
||||
),
|
||||
),
|
||||
),
|
||||
),
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,3 +1,4 @@
|
||||
import 'package:linkdy/constants/global_keys.dart';
|
||||
import 'package:riverpod_annotation/riverpod_annotation.dart';
|
||||
|
||||
import 'package:linkdy/screens/bookmarks/provider/favicon_loader.provider.dart';
|
||||
@@ -99,6 +100,7 @@ class TagBookmarks extends _$TagBookmarks {
|
||||
|
||||
void deleteBookmark(Bookmark bookmark) async {
|
||||
final result = await BookmarkCommonFunctions.deleteBookmark<TagBookmarksModel>(
|
||||
scaffoldMessengerKey: ScaffoldMessengerKeys.tagBookmarks,
|
||||
ref: ref,
|
||||
bookmark: bookmark,
|
||||
apiClient: ref.read(apiClientProvider)!,
|
||||
@@ -111,6 +113,7 @@ class TagBookmarks extends _$TagBookmarks {
|
||||
|
||||
void markAsReadUnread(Bookmark bookmark) async {
|
||||
final result = await BookmarkCommonFunctions.markAsReadUnread<TagBookmarksModel>(
|
||||
scaffoldMessengerKey: ScaffoldMessengerKeys.tagBookmarks,
|
||||
ref: ref,
|
||||
bookmark: bookmark,
|
||||
apiClient: ref.read(apiClientProvider)!,
|
||||
@@ -123,6 +126,7 @@ class TagBookmarks extends _$TagBookmarks {
|
||||
|
||||
void archiveUnarchive(Bookmark bookmark) async {
|
||||
final result = await BookmarkCommonFunctions.archiveUnarchive<TagBookmarksModel>(
|
||||
scaffoldMessengerKey: ScaffoldMessengerKeys.tagBookmarks,
|
||||
ref: ref,
|
||||
bookmark: bookmark,
|
||||
apiClient: ref.read(apiClientProvider)!,
|
||||
|
||||
@@ -206,7 +206,7 @@ final tagBookmarksRequestLoadMoreProvider =
|
||||
);
|
||||
|
||||
typedef TagBookmarksRequestLoadMoreRef = AutoDisposeFutureProviderRef<void>;
|
||||
String _$tagBookmarksHash() => r'5a183019775e04aa10f28c1492993f09445867a7';
|
||||
String _$tagBookmarksHash() => r'd5004cac68d86490b49fc6f722ec819267aedf17';
|
||||
|
||||
/// See also [TagBookmarks].
|
||||
@ProviderFor(TagBookmarks)
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:flutter_riverpod/flutter_riverpod.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/delete_bookmark_modal.dart';
|
||||
@@ -19,10 +20,10 @@ class TagBookmarksScreen extends ConsumerStatefulWidget {
|
||||
final Tag? tag;
|
||||
|
||||
const TagBookmarksScreen({
|
||||
Key? key,
|
||||
super.key,
|
||||
required this.tagId,
|
||||
this.tag,
|
||||
}) : super(key: key);
|
||||
});
|
||||
|
||||
@override
|
||||
TagBookmarksScreenState createState() => TagBookmarksScreenState();
|
||||
@@ -66,7 +67,9 @@ class TagBookmarksScreenState extends ConsumerState<TagBookmarksScreen> {
|
||||
return false;
|
||||
}
|
||||
|
||||
return Scaffold(
|
||||
return ScaffoldMessenger(
|
||||
key: ScaffoldMessengerKeys.tagBookmarks,
|
||||
child: Scaffold(
|
||||
body: NestedScrollView(
|
||||
headerSliverBuilder: (context, innerBoxIsScrolled) => [
|
||||
SliverOverlapAbsorber(
|
||||
@@ -118,8 +121,9 @@ class TagBookmarksScreenState extends ConsumerState<TagBookmarksScreen> {
|
||||
if (provider.bookmarks.isNotEmpty)
|
||||
SlidableAutoCloseBehavior(
|
||||
child: SliverList.builder(
|
||||
itemCount:
|
||||
provider.loadingMore == true ? provider.bookmarks.length + 1 : provider.bookmarks.length,
|
||||
itemCount: provider.loadingMore == true
|
||||
? provider.bookmarks.length + 1
|
||||
: provider.bookmarks.length,
|
||||
itemBuilder: (context, index) {
|
||||
if (provider.loadingMore == true && index == provider.bookmarks.length) {
|
||||
return const Padding(
|
||||
@@ -151,6 +155,7 @@ class TagBookmarksScreenState extends ConsumerState<TagBookmarksScreen> {
|
||||
),
|
||||
),
|
||||
),
|
||||
),
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,19 +1,19 @@
|
||||
import 'package:flutter/material.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/ui/add_tag_modal.dart';
|
||||
import 'package:linkdy/widgets/error_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/constants/global_keys.dart';
|
||||
import 'package:linkdy/providers/router.provider.dart';
|
||||
import 'package:linkdy/router/names.dart';
|
||||
import 'package:linkdy/i18n/strings.g.dart';
|
||||
|
||||
class TagsScreen extends ConsumerWidget {
|
||||
const TagsScreen({Key? key}) : super(key: key);
|
||||
const TagsScreen({super.key});
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context, WidgetRef ref) {
|
||||
@@ -28,10 +28,10 @@ class TagsScreen extends ConsumerWidget {
|
||||
);
|
||||
}
|
||||
|
||||
return Scaffold(
|
||||
body: Stack(
|
||||
children: [
|
||||
NestedScrollView(
|
||||
return ScaffoldMessenger(
|
||||
key: ScaffoldMessengerKeys.tags,
|
||||
child: Scaffold(
|
||||
body: NestedScrollView(
|
||||
headerSliverBuilder: (context, innerBoxIsScrolled) => [
|
||||
SliverOverlapAbsorber(
|
||||
handle: NestedScrollView.sliverOverlapAbsorberHandleFor(context),
|
||||
@@ -137,11 +137,10 @@ class TagsScreen extends ConsumerWidget {
|
||||
),
|
||||
),
|
||||
),
|
||||
SnackbarFloatingActionButton(
|
||||
floatingActionButton: FloatingActionButton(
|
||||
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/constants/global_keys.dart';
|
||||
import 'package:linkdy/models/data/bookmarks.dart';
|
||||
import 'package:linkdy/i18n/strings.g.dart';
|
||||
import 'package:linkdy/utils/copy_clipboard.dart';
|
||||
@@ -14,13 +15,15 @@ class WebViewScreen extends ConsumerWidget {
|
||||
final Bookmark bookmark;
|
||||
|
||||
const WebViewScreen({
|
||||
Key? key,
|
||||
super.key,
|
||||
required this.bookmark,
|
||||
}) : super(key: key);
|
||||
});
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context, WidgetRef ref) {
|
||||
return Scaffold(
|
||||
return ScaffoldMessenger(
|
||||
key: ScaffoldMessengerKeys.webview,
|
||||
child: Scaffold(
|
||||
appBar: AppBar(
|
||||
elevation: 3,
|
||||
title: Column(
|
||||
@@ -125,6 +128,7 @@ class WebViewScreen extends ConsumerWidget {
|
||||
),
|
||||
PopupMenuItem(
|
||||
onTap: () => copyToClipboard(
|
||||
key: ScaffoldMessengerKeys.webview,
|
||||
value: bookmark.url!,
|
||||
successMessage: t.webview.linkCopiedClipboard,
|
||||
),
|
||||
@@ -154,6 +158,7 @@ class WebViewScreen extends ConsumerWidget {
|
||||
],
|
||||
),
|
||||
),
|
||||
),
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,23 +1,18 @@
|
||||
// ignore_for_file: use_build_context_synchronously
|
||||
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:flutter/services.dart';
|
||||
|
||||
import 'package:linkdy/constants/global_keys.dart';
|
||||
|
||||
void copyToClipboard({
|
||||
required GlobalKey<ScaffoldMessengerState> key,
|
||||
required String value,
|
||||
required String successMessage,
|
||||
}) async {
|
||||
if (scaffoldMessengerGlobalKey.currentState != null) {
|
||||
await Clipboard.setData(
|
||||
ClipboardData(text: value),
|
||||
);
|
||||
scaffoldMessengerGlobalKey.currentState!.showSnackBar(
|
||||
key.currentState!.showSnackBar(
|
||||
SnackBar(
|
||||
content: Text(successMessage),
|
||||
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;
|
||||
|
||||
const Layout({
|
||||
Key? key,
|
||||
super.key,
|
||||
required this.state,
|
||||
required this.child,
|
||||
}) : super(key: key);
|
||||
});
|
||||
|
||||
@override
|
||||
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