Created add link form
This commit is contained in:
@@ -1,6 +1,8 @@
|
|||||||
class Regexps {
|
class Regexps {
|
||||||
static final url =
|
static final url =
|
||||||
RegExp(r'/https?:\/\/(?:www\.)?([-a-zA-Z0-9@:%._\+~#=]{2,256}\.[a-z]{2,6}\b)*(\/[\/\d\w\.-]*)*(?:[\?])*(.+)*/gi');
|
RegExp(r'/https?:\/\/(?:www\.)?([-a-zA-Z0-9@:%._\+~#=]{2,256}\.[a-z]{2,6}\b)*(\/[\/\d\w\.-]*)*(?:[\?])*(.+)*/gi');
|
||||||
|
static final urlWithoutProtocol =
|
||||||
|
RegExp(r'[-a-zA-Z0-9@:%._\+~#=]{1,256}\.[a-zA-Z0-9()]{1,6}\b([-a-zA-Z0-9()@:%_\+.~#?&//=]*)');
|
||||||
static final ipAddress = RegExp(r'^((25[0-5]|(2[0-4]|1\d|[1-9]|)\d)(\.(?!$)|$)){4}$');
|
static final ipAddress = RegExp(r'^((25[0-5]|(2[0-4]|1\d|[1-9]|)\d)(\.(?!$)|$)){4}$');
|
||||||
static final domain = RegExp(r'^(([a-z0-9|-]+\.)*[a-z0-9|-]+\.[a-z]+)$');
|
static final domain = RegExp(r'^(([a-z0-9|-]+\.)*[a-z0-9|-]+\.[a-z]+)$');
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -4,9 +4,9 @@
|
|||||||
/// To regenerate, run: `dart run slang`
|
/// To regenerate, run: `dart run slang`
|
||||||
///
|
///
|
||||||
/// Locales: 2
|
/// Locales: 2
|
||||||
/// Strings: 130 (65 per locale)
|
/// Strings: 150 (75 per locale)
|
||||||
///
|
///
|
||||||
/// Built on 2024-02-23 at 00:40 UTC
|
/// Built on 2024-02-23 at 14:24 UTC
|
||||||
|
|
||||||
// coverage:ignore-file
|
// coverage:ignore-file
|
||||||
// ignore_for_file: type=lint
|
// ignore_for_file: type=lint
|
||||||
@@ -166,6 +166,8 @@ class _StringsGenericEn {
|
|||||||
// Translations
|
// Translations
|
||||||
String get confirm => 'Confirm';
|
String get confirm => 'Confirm';
|
||||||
String get cancel => 'Cancel';
|
String get cancel => 'Cancel';
|
||||||
|
String get next => 'Next';
|
||||||
|
String get save => 'Save';
|
||||||
}
|
}
|
||||||
|
|
||||||
// Path: onboarding
|
// Path: onboarding
|
||||||
@@ -207,6 +209,7 @@ class _StringsLinksEn {
|
|||||||
// Translations
|
// Translations
|
||||||
String get links => 'Links';
|
String get links => 'Links';
|
||||||
late final _StringsLinksDatesEn dates = _StringsLinksDatesEn._(_root);
|
late final _StringsLinksDatesEn dates = _StringsLinksDatesEn._(_root);
|
||||||
|
late final _StringsLinksAddLinkEn addLink = _StringsLinksAddLinkEn._(_root);
|
||||||
}
|
}
|
||||||
|
|
||||||
// Path: search
|
// Path: search
|
||||||
@@ -284,6 +287,23 @@ class _StringsLinksDatesEn {
|
|||||||
String yesterdayAt({required Object time}) => 'Yesterday, ${time}';
|
String yesterdayAt({required Object time}) => 'Yesterday, ${time}';
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Path: links.addLink
|
||||||
|
class _StringsLinksAddLinkEn {
|
||||||
|
_StringsLinksAddLinkEn._(this._root);
|
||||||
|
|
||||||
|
final Translations _root; // ignore: unused_field
|
||||||
|
|
||||||
|
// Translations
|
||||||
|
String get addLink => 'Add new link';
|
||||||
|
String get url => 'URL';
|
||||||
|
String get checkingUrl => 'Checking URL...';
|
||||||
|
String get title => 'Title';
|
||||||
|
String get description => 'Description';
|
||||||
|
String get markAsUnread => 'Mark as unread';
|
||||||
|
String get notes => 'Notes';
|
||||||
|
String get addNotes => 'Add notes';
|
||||||
|
}
|
||||||
|
|
||||||
// Path: settings.customization
|
// Path: settings.customization
|
||||||
class _StringsSettingsCustomizationEn {
|
class _StringsSettingsCustomizationEn {
|
||||||
_StringsSettingsCustomizationEn._(this._root);
|
_StringsSettingsCustomizationEn._(this._root);
|
||||||
@@ -367,6 +387,8 @@ class _StringsGenericEs implements _StringsGenericEn {
|
|||||||
// Translations
|
// Translations
|
||||||
@override String get confirm => 'Confirmar';
|
@override String get confirm => 'Confirmar';
|
||||||
@override String get cancel => 'Cancelar';
|
@override String get cancel => 'Cancelar';
|
||||||
|
@override String get next => 'Siguiente';
|
||||||
|
@override String get save => 'Guardar';
|
||||||
}
|
}
|
||||||
|
|
||||||
// Path: onboarding
|
// Path: onboarding
|
||||||
@@ -408,6 +430,7 @@ class _StringsLinksEs implements _StringsLinksEn {
|
|||||||
// Translations
|
// Translations
|
||||||
@override String get links => 'Enlaces';
|
@override String get links => 'Enlaces';
|
||||||
@override late final _StringsLinksDatesEs dates = _StringsLinksDatesEs._(_root);
|
@override late final _StringsLinksDatesEs dates = _StringsLinksDatesEs._(_root);
|
||||||
|
@override late final _StringsLinksAddLinkEs addLink = _StringsLinksAddLinkEs._(_root);
|
||||||
}
|
}
|
||||||
|
|
||||||
// Path: search
|
// Path: search
|
||||||
@@ -485,6 +508,23 @@ class _StringsLinksDatesEs implements _StringsLinksDatesEn {
|
|||||||
@override String yesterdayAt({required Object time}) => 'Ayer, ${time}';
|
@override String yesterdayAt({required Object time}) => 'Ayer, ${time}';
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Path: links.addLink
|
||||||
|
class _StringsLinksAddLinkEs implements _StringsLinksAddLinkEn {
|
||||||
|
_StringsLinksAddLinkEs._(this._root);
|
||||||
|
|
||||||
|
@override final _StringsEs _root; // ignore: unused_field
|
||||||
|
|
||||||
|
// Translations
|
||||||
|
@override String get addLink => 'Añadir nuevo enlace';
|
||||||
|
@override String get url => 'URL';
|
||||||
|
@override String get checkingUrl => 'Comprobando URL...';
|
||||||
|
@override String get title => 'Title';
|
||||||
|
@override String get description => 'Description';
|
||||||
|
@override String get markAsUnread => 'Marcar como no leído';
|
||||||
|
@override String get notes => 'Notas';
|
||||||
|
@override String get addNotes => 'Añadir notas';
|
||||||
|
}
|
||||||
|
|
||||||
// Path: settings.customization
|
// Path: settings.customization
|
||||||
class _StringsSettingsCustomizationEs implements _StringsSettingsCustomizationEn {
|
class _StringsSettingsCustomizationEs implements _StringsSettingsCustomizationEn {
|
||||||
_StringsSettingsCustomizationEs._(this._root);
|
_StringsSettingsCustomizationEs._(this._root);
|
||||||
@@ -534,6 +574,8 @@ extension on Translations {
|
|||||||
switch (path) {
|
switch (path) {
|
||||||
case 'generic.confirm': return 'Confirm';
|
case 'generic.confirm': return 'Confirm';
|
||||||
case 'generic.cancel': return 'Cancel';
|
case 'generic.cancel': return 'Cancel';
|
||||||
|
case 'generic.next': return 'Next';
|
||||||
|
case 'generic.save': return 'Save';
|
||||||
case 'onboarding.title': return 'Welcome to Linkdy';
|
case 'onboarding.title': return 'Welcome to Linkdy';
|
||||||
case 'onboarding.subtitle': return 'An application to manage your bookmarks.';
|
case 'onboarding.subtitle': return 'An application to manage your bookmarks.';
|
||||||
case 'onboarding.start': return 'Start';
|
case 'onboarding.start': return 'Start';
|
||||||
@@ -558,6 +600,14 @@ extension on Translations {
|
|||||||
case 'links.links': return 'Links';
|
case 'links.links': return 'Links';
|
||||||
case 'links.dates.todayAt': return ({required Object time}) => 'Today, ${time}';
|
case 'links.dates.todayAt': return ({required Object time}) => 'Today, ${time}';
|
||||||
case 'links.dates.yesterdayAt': return ({required Object time}) => 'Yesterday, ${time}';
|
case 'links.dates.yesterdayAt': return ({required Object time}) => 'Yesterday, ${time}';
|
||||||
|
case 'links.addLink.addLink': return 'Add new link';
|
||||||
|
case 'links.addLink.url': return 'URL';
|
||||||
|
case 'links.addLink.checkingUrl': return 'Checking URL...';
|
||||||
|
case 'links.addLink.title': return 'Title';
|
||||||
|
case 'links.addLink.description': return 'Description';
|
||||||
|
case 'links.addLink.markAsUnread': return 'Mark as unread';
|
||||||
|
case 'links.addLink.notes': return 'Notes';
|
||||||
|
case 'links.addLink.addNotes': return 'Add notes';
|
||||||
case 'search.search': return 'Search';
|
case 'search.search': return 'Search';
|
||||||
case 'settings.settings': return 'Settings';
|
case 'settings.settings': return 'Settings';
|
||||||
case 'settings.appSettings': return 'App settings';
|
case 'settings.appSettings': return 'App settings';
|
||||||
@@ -607,6 +657,8 @@ extension on _StringsEs {
|
|||||||
switch (path) {
|
switch (path) {
|
||||||
case 'generic.confirm': return 'Confirmar';
|
case 'generic.confirm': return 'Confirmar';
|
||||||
case 'generic.cancel': return 'Cancelar';
|
case 'generic.cancel': return 'Cancelar';
|
||||||
|
case 'generic.next': return 'Siguiente';
|
||||||
|
case 'generic.save': return 'Guardar';
|
||||||
case 'onboarding.title': return 'Bienvenido a Linkdy';
|
case 'onboarding.title': return 'Bienvenido a Linkdy';
|
||||||
case 'onboarding.subtitle': return 'Una aplicación para gestionar tus enlaces favoritos.';
|
case 'onboarding.subtitle': return 'Una aplicación para gestionar tus enlaces favoritos.';
|
||||||
case 'onboarding.start': return 'Comenzar';
|
case 'onboarding.start': return 'Comenzar';
|
||||||
@@ -631,6 +683,14 @@ extension on _StringsEs {
|
|||||||
case 'links.links': return 'Enlaces';
|
case 'links.links': return 'Enlaces';
|
||||||
case 'links.dates.todayAt': return ({required Object time}) => 'Hoy, ${time}';
|
case 'links.dates.todayAt': return ({required Object time}) => 'Hoy, ${time}';
|
||||||
case 'links.dates.yesterdayAt': return ({required Object time}) => 'Ayer, ${time}';
|
case 'links.dates.yesterdayAt': return ({required Object time}) => 'Ayer, ${time}';
|
||||||
|
case 'links.addLink.addLink': return 'Añadir nuevo enlace';
|
||||||
|
case 'links.addLink.url': return 'URL';
|
||||||
|
case 'links.addLink.checkingUrl': return 'Comprobando URL...';
|
||||||
|
case 'links.addLink.title': return 'Title';
|
||||||
|
case 'links.addLink.description': return 'Description';
|
||||||
|
case 'links.addLink.markAsUnread': return 'Marcar como no leído';
|
||||||
|
case 'links.addLink.notes': return 'Notas';
|
||||||
|
case 'links.addLink.addNotes': return 'Añadir notas';
|
||||||
case 'search.search': return 'Buscar';
|
case 'search.search': return 'Buscar';
|
||||||
case 'settings.settings': return 'Ajustes';
|
case 'settings.settings': return 'Ajustes';
|
||||||
case 'settings.appSettings': return 'Ajustes de la aplicación';
|
case 'settings.appSettings': return 'Ajustes de la aplicación';
|
||||||
|
|||||||
@@ -1,7 +1,9 @@
|
|||||||
{
|
{
|
||||||
"generic": {
|
"generic": {
|
||||||
"confirm": "Confirm",
|
"confirm": "Confirm",
|
||||||
"cancel": "Cancel"
|
"cancel": "Cancel",
|
||||||
|
"next": "Next",
|
||||||
|
"save": "Save"
|
||||||
},
|
},
|
||||||
"onboarding": {
|
"onboarding": {
|
||||||
"title": "Welcome to Linkdy",
|
"title": "Welcome to Linkdy",
|
||||||
@@ -31,6 +33,16 @@
|
|||||||
"dates": {
|
"dates": {
|
||||||
"todayAt": "Today, $time",
|
"todayAt": "Today, $time",
|
||||||
"yesterdayAt": "Yesterday, $time"
|
"yesterdayAt": "Yesterday, $time"
|
||||||
|
},
|
||||||
|
"addLink": {
|
||||||
|
"addLink": "Add new link",
|
||||||
|
"url": "URL",
|
||||||
|
"checkingUrl": "Checking URL...",
|
||||||
|
"title": "Title",
|
||||||
|
"description": "Description",
|
||||||
|
"markAsUnread": "Mark as unread",
|
||||||
|
"notes": "Notes",
|
||||||
|
"addNotes": "Add notes"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"search": {
|
"search": {
|
||||||
|
|||||||
@@ -1,7 +1,9 @@
|
|||||||
{
|
{
|
||||||
"generic": {
|
"generic": {
|
||||||
"confirm": "Confirmar",
|
"confirm": "Confirmar",
|
||||||
"cancel": "Cancelar"
|
"cancel": "Cancelar",
|
||||||
|
"next": "Siguiente",
|
||||||
|
"save": "Guardar"
|
||||||
},
|
},
|
||||||
"onboarding": {
|
"onboarding": {
|
||||||
"title": "Bienvenido a Linkdy",
|
"title": "Bienvenido a Linkdy",
|
||||||
@@ -31,6 +33,16 @@
|
|||||||
"dates": {
|
"dates": {
|
||||||
"todayAt": "Hoy, $time",
|
"todayAt": "Hoy, $time",
|
||||||
"yesterdayAt": "Ayer, $time"
|
"yesterdayAt": "Ayer, $time"
|
||||||
|
},
|
||||||
|
"addLink": {
|
||||||
|
"addLink": "Añadir nuevo enlace",
|
||||||
|
"url": "URL",
|
||||||
|
"checkingUrl": "Comprobando URL...",
|
||||||
|
"title": "Title",
|
||||||
|
"description": "Description",
|
||||||
|
"markAsUnread": "Marcar como no leído",
|
||||||
|
"notes": "Notas",
|
||||||
|
"addNotes": "Añadir notas"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"search": {
|
"search": {
|
||||||
|
|||||||
43
lib/models/data/check_bookmark.dart
Normal file
43
lib/models/data/check_bookmark.dart
Normal file
@@ -0,0 +1,43 @@
|
|||||||
|
class CheckBookmark {
|
||||||
|
final dynamic bookmark;
|
||||||
|
final Metadata? metadata;
|
||||||
|
|
||||||
|
CheckBookmark({
|
||||||
|
this.bookmark,
|
||||||
|
this.metadata,
|
||||||
|
});
|
||||||
|
|
||||||
|
factory CheckBookmark.fromJson(Map<String, dynamic> json) => CheckBookmark(
|
||||||
|
bookmark: json["bookmark"],
|
||||||
|
metadata: json["metadata"] == null ? null : Metadata.fromJson(json["metadata"]),
|
||||||
|
);
|
||||||
|
|
||||||
|
Map<String, dynamic> toJson() => {
|
||||||
|
"bookmark": bookmark,
|
||||||
|
"metadata": metadata?.toJson(),
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
class Metadata {
|
||||||
|
final String? url;
|
||||||
|
final String? title;
|
||||||
|
final String? description;
|
||||||
|
|
||||||
|
Metadata({
|
||||||
|
this.url,
|
||||||
|
this.title,
|
||||||
|
this.description,
|
||||||
|
});
|
||||||
|
|
||||||
|
factory Metadata.fromJson(Map<String, dynamic> json) => Metadata(
|
||||||
|
url: json["url"],
|
||||||
|
title: json["title"],
|
||||||
|
description: json["description"],
|
||||||
|
);
|
||||||
|
|
||||||
|
Map<String, dynamic> toJson() => {
|
||||||
|
"url": url,
|
||||||
|
"title": title,
|
||||||
|
"description": description,
|
||||||
|
};
|
||||||
|
}
|
||||||
29
lib/screens/links/model/add_link.model.dart
Normal file
29
lib/screens/links/model/add_link.model.dart
Normal file
@@ -0,0 +1,29 @@
|
|||||||
|
import 'package:expandable/expandable.dart';
|
||||||
|
import 'package:flutter/material.dart';
|
||||||
|
|
||||||
|
import 'package:linkdy/constants/enums.dart';
|
||||||
|
import 'package:linkdy/models/data/check_bookmark.dart';
|
||||||
|
|
||||||
|
class AddLinkModel {
|
||||||
|
final TextEditingController urlController;
|
||||||
|
String? urlError;
|
||||||
|
CheckBookmark? checkBookmark;
|
||||||
|
LoadStatus? checkBookmarkLoadStatus;
|
||||||
|
final TextEditingController titleController;
|
||||||
|
final TextEditingController descriptionController;
|
||||||
|
bool markAsUnread;
|
||||||
|
final TextEditingController notesController;
|
||||||
|
final ExpandableController expandableController;
|
||||||
|
|
||||||
|
AddLinkModel({
|
||||||
|
required this.urlController,
|
||||||
|
this.urlError,
|
||||||
|
this.checkBookmark,
|
||||||
|
this.checkBookmarkLoadStatus,
|
||||||
|
required this.titleController,
|
||||||
|
required this.descriptionController,
|
||||||
|
this.markAsUnread = false,
|
||||||
|
required this.notesController,
|
||||||
|
required this.expandableController,
|
||||||
|
});
|
||||||
|
}
|
||||||
66
lib/screens/links/provider/add_link.provider.dart
Normal file
66
lib/screens/links/provider/add_link.provider.dart
Normal file
@@ -0,0 +1,66 @@
|
|||||||
|
import 'package:expandable/expandable.dart';
|
||||||
|
import 'package:flutter/material.dart';
|
||||||
|
import 'package:riverpod_annotation/riverpod_annotation.dart';
|
||||||
|
|
||||||
|
import 'package:linkdy/screens/links/model/add_link.model.dart';
|
||||||
|
|
||||||
|
import 'package:linkdy/constants/enums.dart';
|
||||||
|
import 'package:linkdy/constants/regexp.dart';
|
||||||
|
import 'package:linkdy/models/api_response.dart';
|
||||||
|
import 'package:linkdy/models/data/check_bookmark.dart';
|
||||||
|
import 'package:linkdy/providers/api_client_provider.dart';
|
||||||
|
|
||||||
|
part 'add_link.provider.g.dart';
|
||||||
|
|
||||||
|
@riverpod
|
||||||
|
Future<ApiResponse<CheckBookmark>> checkBookmark(CheckBookmarkRef ref, String url) async {
|
||||||
|
final result = await ref.watch(apiClientProviderProvider)!.fetchCheckAddBookmark(url: url);
|
||||||
|
return result;
|
||||||
|
}
|
||||||
|
|
||||||
|
@riverpod
|
||||||
|
class AddLink extends _$AddLink {
|
||||||
|
@override
|
||||||
|
AddLinkModel build() {
|
||||||
|
return AddLinkModel(
|
||||||
|
urlController: TextEditingController(),
|
||||||
|
titleController: TextEditingController(),
|
||||||
|
descriptionController: TextEditingController(),
|
||||||
|
notesController: TextEditingController(),
|
||||||
|
expandableController: ExpandableController(),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
void validateUrl(String value) {
|
||||||
|
state.checkBookmark = null;
|
||||||
|
state.checkBookmarkLoadStatus = null;
|
||||||
|
if (Regexps.urlWithoutProtocol.hasMatch(value)) {
|
||||||
|
state.urlError = null;
|
||||||
|
ref.notifyListeners();
|
||||||
|
} else {
|
||||||
|
state.urlError = "Invalid URL";
|
||||||
|
ref.notifyListeners();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
void checkUrlDetails() async {
|
||||||
|
if (state.urlError == null && state.urlController.text != "") {
|
||||||
|
state.checkBookmarkLoadStatus = LoadStatus.loading;
|
||||||
|
state.checkBookmark = null;
|
||||||
|
ref.notifyListeners();
|
||||||
|
final result = await ref.read(checkBookmarkProvider(state.urlController.text).future);
|
||||||
|
if (result.successful == true) {
|
||||||
|
state.checkBookmark = result.content;
|
||||||
|
state.checkBookmarkLoadStatus = LoadStatus.loaded;
|
||||||
|
} else {
|
||||||
|
state.checkBookmarkLoadStatus = LoadStatus.error;
|
||||||
|
}
|
||||||
|
ref.notifyListeners();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
void updateMarkAsUnread(bool value) {
|
||||||
|
state.markAsUnread = value;
|
||||||
|
ref.notifyListeners();
|
||||||
|
}
|
||||||
|
}
|
||||||
179
lib/screens/links/provider/add_link.provider.g.dart
Normal file
179
lib/screens/links/provider/add_link.provider.g.dart
Normal file
@@ -0,0 +1,179 @@
|
|||||||
|
// GENERATED CODE - DO NOT MODIFY BY HAND
|
||||||
|
|
||||||
|
part of 'add_link.provider.dart';
|
||||||
|
|
||||||
|
// **************************************************************************
|
||||||
|
// RiverpodGenerator
|
||||||
|
// **************************************************************************
|
||||||
|
|
||||||
|
String _$checkBookmarkHash() => r'a4397a4497e3b7c8dec6027bb927371cc85e526c';
|
||||||
|
|
||||||
|
/// Copied from Dart SDK
|
||||||
|
class _SystemHash {
|
||||||
|
_SystemHash._();
|
||||||
|
|
||||||
|
static int combine(int hash, int value) {
|
||||||
|
// ignore: parameter_assignments
|
||||||
|
hash = 0x1fffffff & (hash + value);
|
||||||
|
// ignore: parameter_assignments
|
||||||
|
hash = 0x1fffffff & (hash + ((0x0007ffff & hash) << 10));
|
||||||
|
return hash ^ (hash >> 6);
|
||||||
|
}
|
||||||
|
|
||||||
|
static int finish(int hash) {
|
||||||
|
// ignore: parameter_assignments
|
||||||
|
hash = 0x1fffffff & (hash + ((0x03ffffff & hash) << 3));
|
||||||
|
// ignore: parameter_assignments
|
||||||
|
hash = hash ^ (hash >> 11);
|
||||||
|
return 0x1fffffff & (hash + ((0x00003fff & hash) << 15));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// See also [checkBookmark].
|
||||||
|
@ProviderFor(checkBookmark)
|
||||||
|
const checkBookmarkProvider = CheckBookmarkFamily();
|
||||||
|
|
||||||
|
/// See also [checkBookmark].
|
||||||
|
class CheckBookmarkFamily
|
||||||
|
extends Family<AsyncValue<ApiResponse<CheckBookmark>>> {
|
||||||
|
/// See also [checkBookmark].
|
||||||
|
const CheckBookmarkFamily();
|
||||||
|
|
||||||
|
/// See also [checkBookmark].
|
||||||
|
CheckBookmarkProvider call(
|
||||||
|
String url,
|
||||||
|
) {
|
||||||
|
return CheckBookmarkProvider(
|
||||||
|
url,
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
@override
|
||||||
|
CheckBookmarkProvider getProviderOverride(
|
||||||
|
covariant CheckBookmarkProvider provider,
|
||||||
|
) {
|
||||||
|
return call(
|
||||||
|
provider.url,
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
static const Iterable<ProviderOrFamily>? _dependencies = null;
|
||||||
|
|
||||||
|
@override
|
||||||
|
Iterable<ProviderOrFamily>? get dependencies => _dependencies;
|
||||||
|
|
||||||
|
static const Iterable<ProviderOrFamily>? _allTransitiveDependencies = null;
|
||||||
|
|
||||||
|
@override
|
||||||
|
Iterable<ProviderOrFamily>? get allTransitiveDependencies =>
|
||||||
|
_allTransitiveDependencies;
|
||||||
|
|
||||||
|
@override
|
||||||
|
String? get name => r'checkBookmarkProvider';
|
||||||
|
}
|
||||||
|
|
||||||
|
/// See also [checkBookmark].
|
||||||
|
class CheckBookmarkProvider
|
||||||
|
extends AutoDisposeFutureProvider<ApiResponse<CheckBookmark>> {
|
||||||
|
/// See also [checkBookmark].
|
||||||
|
CheckBookmarkProvider(
|
||||||
|
String url,
|
||||||
|
) : this._internal(
|
||||||
|
(ref) => checkBookmark(
|
||||||
|
ref as CheckBookmarkRef,
|
||||||
|
url,
|
||||||
|
),
|
||||||
|
from: checkBookmarkProvider,
|
||||||
|
name: r'checkBookmarkProvider',
|
||||||
|
debugGetCreateSourceHash:
|
||||||
|
const bool.fromEnvironment('dart.vm.product')
|
||||||
|
? null
|
||||||
|
: _$checkBookmarkHash,
|
||||||
|
dependencies: CheckBookmarkFamily._dependencies,
|
||||||
|
allTransitiveDependencies:
|
||||||
|
CheckBookmarkFamily._allTransitiveDependencies,
|
||||||
|
url: url,
|
||||||
|
);
|
||||||
|
|
||||||
|
CheckBookmarkProvider._internal(
|
||||||
|
super._createNotifier, {
|
||||||
|
required super.name,
|
||||||
|
required super.dependencies,
|
||||||
|
required super.allTransitiveDependencies,
|
||||||
|
required super.debugGetCreateSourceHash,
|
||||||
|
required super.from,
|
||||||
|
required this.url,
|
||||||
|
}) : super.internal();
|
||||||
|
|
||||||
|
final String url;
|
||||||
|
|
||||||
|
@override
|
||||||
|
Override overrideWith(
|
||||||
|
FutureOr<ApiResponse<CheckBookmark>> Function(CheckBookmarkRef provider)
|
||||||
|
create,
|
||||||
|
) {
|
||||||
|
return ProviderOverride(
|
||||||
|
origin: this,
|
||||||
|
override: CheckBookmarkProvider._internal(
|
||||||
|
(ref) => create(ref as CheckBookmarkRef),
|
||||||
|
from: from,
|
||||||
|
name: null,
|
||||||
|
dependencies: null,
|
||||||
|
allTransitiveDependencies: null,
|
||||||
|
debugGetCreateSourceHash: null,
|
||||||
|
url: url,
|
||||||
|
),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
@override
|
||||||
|
AutoDisposeFutureProviderElement<ApiResponse<CheckBookmark>> createElement() {
|
||||||
|
return _CheckBookmarkProviderElement(this);
|
||||||
|
}
|
||||||
|
|
||||||
|
@override
|
||||||
|
bool operator ==(Object other) {
|
||||||
|
return other is CheckBookmarkProvider && other.url == url;
|
||||||
|
}
|
||||||
|
|
||||||
|
@override
|
||||||
|
int get hashCode {
|
||||||
|
var hash = _SystemHash.combine(0, runtimeType.hashCode);
|
||||||
|
hash = _SystemHash.combine(hash, url.hashCode);
|
||||||
|
|
||||||
|
return _SystemHash.finish(hash);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
mixin CheckBookmarkRef
|
||||||
|
on AutoDisposeFutureProviderRef<ApiResponse<CheckBookmark>> {
|
||||||
|
/// The parameter `url` of this provider.
|
||||||
|
String get url;
|
||||||
|
}
|
||||||
|
|
||||||
|
class _CheckBookmarkProviderElement
|
||||||
|
extends AutoDisposeFutureProviderElement<ApiResponse<CheckBookmark>>
|
||||||
|
with CheckBookmarkRef {
|
||||||
|
_CheckBookmarkProviderElement(super.provider);
|
||||||
|
|
||||||
|
@override
|
||||||
|
String get url => (origin as CheckBookmarkProvider).url;
|
||||||
|
}
|
||||||
|
|
||||||
|
String _$addLinkHash() => r'd971275978e113b16d1bc34a2370d9d3feba60b5';
|
||||||
|
|
||||||
|
/// See also [AddLink].
|
||||||
|
@ProviderFor(AddLink)
|
||||||
|
final addLinkProvider =
|
||||||
|
AutoDisposeNotifierProvider<AddLink, AddLinkModel>.internal(
|
||||||
|
AddLink.new,
|
||||||
|
name: r'addLinkProvider',
|
||||||
|
debugGetCreateSourceHash:
|
||||||
|
const bool.fromEnvironment('dart.vm.product') ? null : _$addLinkHash,
|
||||||
|
dependencies: null,
|
||||||
|
allTransitiveDependencies: null,
|
||||||
|
);
|
||||||
|
|
||||||
|
typedef _$AddLink = AutoDisposeNotifier<AddLinkModel>;
|
||||||
|
// ignore_for_file: type=lint
|
||||||
|
// ignore_for_file: subtype_of_sealed_class, invalid_use_of_internal_member, invalid_use_of_visible_for_testing_member
|
||||||
261
lib/screens/links/ui/add_link_modal.dart
Normal file
261
lib/screens/links/ui/add_link_modal.dart
Normal file
@@ -0,0 +1,261 @@
|
|||||||
|
import 'package:expandable/expandable.dart';
|
||||||
|
import 'package:flutter/material.dart';
|
||||||
|
import 'package:flutter_riverpod/flutter_riverpod.dart';
|
||||||
|
|
||||||
|
import 'package:linkdy/screens/links/provider/add_link.provider.dart';
|
||||||
|
|
||||||
|
import 'package:linkdy/constants/enums.dart';
|
||||||
|
import 'package:linkdy/i18n/strings.g.dart';
|
||||||
|
|
||||||
|
class AddLinkModal extends ConsumerStatefulWidget {
|
||||||
|
const AddLinkModal({Key? key}) : super(key: key);
|
||||||
|
|
||||||
|
@override
|
||||||
|
AddLinkModalState createState() => AddLinkModalState();
|
||||||
|
}
|
||||||
|
|
||||||
|
class AddLinkModalState extends ConsumerState<AddLinkModal> with SingleTickerProviderStateMixin {
|
||||||
|
late AnimationController _animationController;
|
||||||
|
late Animation<double> _animation;
|
||||||
|
|
||||||
|
@override
|
||||||
|
void initState() {
|
||||||
|
_animationController = AnimationController(
|
||||||
|
duration: const Duration(milliseconds: 200),
|
||||||
|
vsync: this,
|
||||||
|
);
|
||||||
|
_animation = Tween(
|
||||||
|
begin: 0.0,
|
||||||
|
end: 0.5,
|
||||||
|
).animate(
|
||||||
|
CurvedAnimation(
|
||||||
|
parent: _animationController,
|
||||||
|
curve: Curves.easeInOut,
|
||||||
|
),
|
||||||
|
);
|
||||||
|
|
||||||
|
super.initState();
|
||||||
|
}
|
||||||
|
|
||||||
|
@override
|
||||||
|
Widget build(BuildContext context) {
|
||||||
|
final provider = ref.watch(addLinkProvider);
|
||||||
|
|
||||||
|
return Padding(
|
||||||
|
padding: MediaQuery.of(context).viewInsets,
|
||||||
|
child: Container(
|
||||||
|
decoration: BoxDecoration(
|
||||||
|
borderRadius: const BorderRadius.only(topLeft: Radius.circular(28), topRight: Radius.circular(28)),
|
||||||
|
color: Theme.of(context).dialogBackgroundColor,
|
||||||
|
),
|
||||||
|
child: SafeArea(
|
||||||
|
child: Column(
|
||||||
|
mainAxisSize: MainAxisSize.min,
|
||||||
|
children: [
|
||||||
|
Flexible(
|
||||||
|
child: SingleChildScrollView(
|
||||||
|
child: Column(
|
||||||
|
mainAxisSize: MainAxisSize.min,
|
||||||
|
children: [
|
||||||
|
const SizedBox(height: 24),
|
||||||
|
Icon(
|
||||||
|
Icons.add_rounded,
|
||||||
|
color: Theme.of(context).colorScheme.secondary,
|
||||||
|
size: 24,
|
||||||
|
),
|
||||||
|
const SizedBox(height: 16),
|
||||||
|
Text(
|
||||||
|
t.links.addLink.addLink,
|
||||||
|
textAlign: TextAlign.center,
|
||||||
|
style: const TextStyle(fontSize: 24),
|
||||||
|
),
|
||||||
|
const SizedBox(height: 24),
|
||||||
|
Padding(
|
||||||
|
padding: const EdgeInsets.symmetric(horizontal: 24),
|
||||||
|
child: TextFormField(
|
||||||
|
controller: provider.urlController,
|
||||||
|
onChanged: ref.read(addLinkProvider.notifier).validateUrl,
|
||||||
|
enabled: provider.checkBookmarkLoadStatus != LoadStatus.loading,
|
||||||
|
decoration: InputDecoration(
|
||||||
|
prefixIcon: const Icon(Icons.link_rounded),
|
||||||
|
border: const OutlineInputBorder(
|
||||||
|
borderRadius: BorderRadius.all(
|
||||||
|
Radius.circular(10),
|
||||||
|
),
|
||||||
|
),
|
||||||
|
errorText: provider.urlError,
|
||||||
|
labelText: t.links.addLink.url,
|
||||||
|
),
|
||||||
|
),
|
||||||
|
),
|
||||||
|
if (provider.checkBookmarkLoadStatus == LoadStatus.loading)
|
||||||
|
Padding(
|
||||||
|
padding: const EdgeInsets.only(top: 16),
|
||||||
|
child: Row(
|
||||||
|
mainAxisAlignment: MainAxisAlignment.center,
|
||||||
|
children: [
|
||||||
|
const SizedBox(
|
||||||
|
height: 12,
|
||||||
|
width: 12,
|
||||||
|
child: CircularProgressIndicator(
|
||||||
|
strokeWidth: 2,
|
||||||
|
),
|
||||||
|
),
|
||||||
|
const SizedBox(width: 8),
|
||||||
|
Text(t.links.addLink.checkingUrl),
|
||||||
|
],
|
||||||
|
),
|
||||||
|
),
|
||||||
|
if (provider.checkBookmark != null) ...[
|
||||||
|
const SizedBox(height: 24),
|
||||||
|
Padding(
|
||||||
|
padding: const EdgeInsets.symmetric(horizontal: 24),
|
||||||
|
child: TextFormField(
|
||||||
|
controller: provider.titleController,
|
||||||
|
// onChanged: ref.read(addLinkProvider.notifier).validateUrl,
|
||||||
|
// enabled: provider.checkBookmarkLoadStatus != LoadStatus.loading,
|
||||||
|
decoration: InputDecoration(
|
||||||
|
prefixIcon: const Icon(Icons.title_rounded),
|
||||||
|
border: const OutlineInputBorder(
|
||||||
|
borderRadius: BorderRadius.all(
|
||||||
|
Radius.circular(10),
|
||||||
|
),
|
||||||
|
),
|
||||||
|
errorText: provider.urlError,
|
||||||
|
labelText: t.links.addLink.title,
|
||||||
|
hintText: provider.checkBookmark?.metadata?.title,
|
||||||
|
floatingLabelBehavior: FloatingLabelBehavior.always,
|
||||||
|
),
|
||||||
|
),
|
||||||
|
),
|
||||||
|
const SizedBox(height: 24),
|
||||||
|
Padding(
|
||||||
|
padding: const EdgeInsets.symmetric(horizontal: 24),
|
||||||
|
child: TextFormField(
|
||||||
|
controller: provider.descriptionController,
|
||||||
|
// onChanged: ref.read(addLinkProvider.notifier).validateUrl,
|
||||||
|
// enabled: provider.checkBookmarkLoadStatus != LoadStatus.loading,
|
||||||
|
decoration: InputDecoration(
|
||||||
|
prefixIcon: const Icon(Icons.description_rounded),
|
||||||
|
border: const OutlineInputBorder(
|
||||||
|
borderRadius: BorderRadius.all(
|
||||||
|
Radius.circular(10),
|
||||||
|
),
|
||||||
|
),
|
||||||
|
errorText: provider.urlError,
|
||||||
|
labelText: t.links.addLink.description,
|
||||||
|
hintText: provider.checkBookmark?.metadata?.description,
|
||||||
|
floatingLabelBehavior: FloatingLabelBehavior.always,
|
||||||
|
),
|
||||||
|
),
|
||||||
|
),
|
||||||
|
const SizedBox(height: 16),
|
||||||
|
Padding(
|
||||||
|
padding: const EdgeInsets.symmetric(horizontal: 24),
|
||||||
|
child: ExpandablePanel(
|
||||||
|
controller: provider.expandableController,
|
||||||
|
collapsed: ListTile(
|
||||||
|
onTap: () {
|
||||||
|
_animationController.animateTo(provider.expandableController.expanded == true ? 0 : 1);
|
||||||
|
provider.expandableController.toggle();
|
||||||
|
},
|
||||||
|
title: Text(t.links.addLink.addNotes),
|
||||||
|
trailing: RotationTransition(
|
||||||
|
turns: _animation,
|
||||||
|
child: Icon(
|
||||||
|
Icons.expand_more_rounded,
|
||||||
|
size: 26,
|
||||||
|
color: Theme.of(context).colorScheme.secondary,
|
||||||
|
),
|
||||||
|
),
|
||||||
|
contentPadding: const EdgeInsets.all(0),
|
||||||
|
),
|
||||||
|
expanded: Column(
|
||||||
|
children: [
|
||||||
|
ListTile(
|
||||||
|
onTap: () {
|
||||||
|
_animationController.animateTo(
|
||||||
|
provider.expandableController.expanded == true ? 0 : 1,
|
||||||
|
);
|
||||||
|
provider.expandableController.toggle();
|
||||||
|
},
|
||||||
|
title: Text(t.links.addLink.addNotes),
|
||||||
|
trailing: RotationTransition(
|
||||||
|
turns: _animation,
|
||||||
|
child: Icon(
|
||||||
|
Icons.expand_more_rounded,
|
||||||
|
size: 26,
|
||||||
|
color: Theme.of(context).colorScheme.secondary,
|
||||||
|
),
|
||||||
|
),
|
||||||
|
contentPadding: const EdgeInsets.all(0),
|
||||||
|
),
|
||||||
|
const SizedBox(height: 8),
|
||||||
|
SizedBox(
|
||||||
|
height: 130,
|
||||||
|
child: TextFormField(
|
||||||
|
controller: provider.notesController,
|
||||||
|
decoration: InputDecoration(
|
||||||
|
prefixIcon: const Icon(Icons.note_rounded),
|
||||||
|
border: const OutlineInputBorder(
|
||||||
|
borderRadius: BorderRadius.all(
|
||||||
|
Radius.circular(10),
|
||||||
|
),
|
||||||
|
),
|
||||||
|
labelText: t.links.addLink.notes,
|
||||||
|
),
|
||||||
|
autocorrect: false,
|
||||||
|
expands: true,
|
||||||
|
minLines: null,
|
||||||
|
maxLines: null,
|
||||||
|
textAlignVertical: TextAlignVertical.top,
|
||||||
|
),
|
||||||
|
),
|
||||||
|
const SizedBox(height: 16),
|
||||||
|
],
|
||||||
|
),
|
||||||
|
),
|
||||||
|
),
|
||||||
|
SwitchListTile(
|
||||||
|
contentPadding: const EdgeInsets.symmetric(horizontal: 24, vertical: 0),
|
||||||
|
title: Text(t.links.addLink.markAsUnread),
|
||||||
|
value: provider.markAsUnread,
|
||||||
|
onChanged: ref.read(addLinkProvider.notifier).updateMarkAsUnread,
|
||||||
|
),
|
||||||
|
],
|
||||||
|
],
|
||||||
|
),
|
||||||
|
),
|
||||||
|
),
|
||||||
|
Padding(
|
||||||
|
padding: const EdgeInsets.all(24),
|
||||||
|
child: Row(
|
||||||
|
mainAxisAlignment: MainAxisAlignment.end,
|
||||||
|
children: [
|
||||||
|
TextButton(
|
||||||
|
onPressed: () => Navigator.pop(context),
|
||||||
|
child: Text(t.generic.cancel),
|
||||||
|
),
|
||||||
|
const SizedBox(width: 8),
|
||||||
|
if (provider.checkBookmark == null)
|
||||||
|
TextButton(
|
||||||
|
onPressed: provider.checkBookmarkLoadStatus != LoadStatus.loading
|
||||||
|
? ref.read(addLinkProvider.notifier).checkUrlDetails
|
||||||
|
: null,
|
||||||
|
child: Text(t.generic.next),
|
||||||
|
),
|
||||||
|
if (provider.checkBookmark != null)
|
||||||
|
TextButton(
|
||||||
|
onPressed: () => Navigator.pop(context),
|
||||||
|
child: Text(t.generic.confirm),
|
||||||
|
),
|
||||||
|
],
|
||||||
|
),
|
||||||
|
),
|
||||||
|
],
|
||||||
|
),
|
||||||
|
),
|
||||||
|
),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -3,6 +3,8 @@ import 'package:flutter_riverpod/flutter_riverpod.dart';
|
|||||||
|
|
||||||
import 'package:linkdy/screens/links/provider/links.provider.dart';
|
import 'package:linkdy/screens/links/provider/links.provider.dart';
|
||||||
|
|
||||||
|
import 'package:linkdy/screens/links/ui/add_link_modal.dart';
|
||||||
|
|
||||||
import 'package:linkdy/providers/router_provider.dart';
|
import 'package:linkdy/providers/router_provider.dart';
|
||||||
import 'package:linkdy/router/paths.dart';
|
import 'package:linkdy/router/paths.dart';
|
||||||
import 'package:linkdy/i18n/strings.g.dart';
|
import 'package:linkdy/i18n/strings.g.dart';
|
||||||
@@ -37,9 +39,18 @@ class Links extends ConsumerWidget {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
return Material(
|
void openAddModal() {
|
||||||
color: Colors.transparent,
|
showModalBottomSheet(
|
||||||
child: NestedScrollView(
|
useRootNavigator: true,
|
||||||
|
context: context,
|
||||||
|
isScrollControlled: true,
|
||||||
|
useSafeArea: true,
|
||||||
|
builder: (context) => const AddLinkModal(),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
return Scaffold(
|
||||||
|
body: NestedScrollView(
|
||||||
headerSliverBuilder: (context, innerBoxIsScrolled) => [
|
headerSliverBuilder: (context, innerBoxIsScrolled) => [
|
||||||
SliverOverlapAbsorber(
|
SliverOverlapAbsorber(
|
||||||
handle: NestedScrollView.sliverOverlapAbsorberHandleFor(context),
|
handle: NestedScrollView.sliverOverlapAbsorberHandleFor(context),
|
||||||
@@ -168,6 +179,10 @@ class Links extends ConsumerWidget {
|
|||||||
),
|
),
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
|
floatingActionButton: FloatingActionButton(
|
||||||
|
onPressed: openAddModal,
|
||||||
|
child: const Icon(Icons.add_rounded),
|
||||||
|
),
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -2,6 +2,7 @@ import 'package:dio/dio.dart';
|
|||||||
|
|
||||||
import 'package:linkdy/models/api_response.dart';
|
import 'package:linkdy/models/api_response.dart';
|
||||||
import 'package:linkdy/models/data/bookmarks.dart';
|
import 'package:linkdy/models/data/bookmarks.dart';
|
||||||
|
import 'package:linkdy/models/data/check_bookmark.dart';
|
||||||
import 'package:linkdy/models/server_instance.dart';
|
import 'package:linkdy/models/server_instance.dart';
|
||||||
|
|
||||||
class ApiClient {
|
class ApiClient {
|
||||||
@@ -40,4 +41,21 @@ class ApiClient {
|
|||||||
return const ApiResponse(successful: false);
|
return const ApiResponse(successful: false);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Future<ApiResponse<CheckBookmark>> fetchCheckAddBookmark({required String url}) async {
|
||||||
|
try {
|
||||||
|
final response = await dioInstance.get(
|
||||||
|
"/bookmarks/check",
|
||||||
|
queryParameters: {
|
||||||
|
"url": url,
|
||||||
|
},
|
||||||
|
);
|
||||||
|
return ApiResponse(
|
||||||
|
successful: true,
|
||||||
|
content: CheckBookmark.fromJson(response.data),
|
||||||
|
);
|
||||||
|
} catch (e, stackTrace) {
|
||||||
|
return const ApiResponse(successful: false);
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -289,6 +289,14 @@ packages:
|
|||||||
url: "https://pub.dev"
|
url: "https://pub.dev"
|
||||||
source: hosted
|
source: hosted
|
||||||
version: "1.6.9"
|
version: "1.6.9"
|
||||||
|
expandable:
|
||||||
|
dependency: "direct main"
|
||||||
|
description:
|
||||||
|
name: expandable
|
||||||
|
sha256: "9604d612d4d1146dafa96c6d8eec9c2ff0994658d6d09fed720ab788c7f5afc2"
|
||||||
|
url: "https://pub.dev"
|
||||||
|
source: hosted
|
||||||
|
version: "5.0.1"
|
||||||
fake_async:
|
fake_async:
|
||||||
dependency: transitive
|
dependency: transitive
|
||||||
description:
|
description:
|
||||||
|
|||||||
@@ -50,6 +50,7 @@ dependencies:
|
|||||||
flutter_inappwebview: ^6.0.0
|
flutter_inappwebview: ^6.0.0
|
||||||
share_plus: ^7.2.2
|
share_plus: ^7.2.2
|
||||||
package_info_plus: ^5.0.1
|
package_info_plus: ^5.0.1
|
||||||
|
expandable: ^5.0.1
|
||||||
|
|
||||||
dev_dependencies:
|
dev_dependencies:
|
||||||
build_runner: ^2.4.8
|
build_runner: ^2.4.8
|
||||||
|
|||||||
Reference in New Issue
Block a user