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

Improved webview

Browse Source
This commit is contained in:
Juan Gilsanz Polo
2024-02-22 22:11:41 +01:00
parent 83fe30408f
commit 8d85b80b09
15 changed files with 465 additions and 430 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
android/app/src/main/AndroidManifest.xml
View File

@@ -5,6 +5,9 @@
android:label="Linkdy"
android:name="${applicationName}"
android:icon="@mipmap/ic_launcher">
<meta-data
android:name="flutterEmbedding"
android:value="2" />
<activity
android:name=".MainActivity"
android:exported="true"

368
lib/i18n/strings.g.dart
View File

@@ -4,9 +4,9 @@
/// To regenerate, run: `dart run slang`
///
/// Locales: 2
/// Strings: 54 (27 per locale)
/// Strings: 58 (29 per locale)
///
/// Built on 2024-02-22 at 17:42 UTC
/// Built on 2024-02-22 at 21:08 UTC
// coverage:ignore-file
// ignore_for_file: type=lint
@@ -28,17 +28,12 @@ enum AppLocale with BaseAppLocale<AppLocale, Translations> {
en(languageCode: 'en', build: Translations.build),
es(languageCode: 'es', build: _StringsEs.build);
const AppLocale(
{required this.languageCode, this.scriptCode, this.countryCode, required this.build}); // ignore: unused_element
const AppLocale({required this.languageCode, this.scriptCode, this.countryCode, required this.build}); // ignore: unused_element
@override
final String languageCode;
@override
final String? scriptCode;
@override
final String? countryCode;
@override
final TranslationBuilder<AppLocale, Translations> build;
@override final String languageCode;
@override final String? scriptCode;
@override final String? countryCode;
@override final TranslationBuilder<AppLocale, Translations> build;
/// Gets current instance managed by [LocaleSettings].
Translations get translations => LocaleSettings.instance.translationMap[this]!;
@@ -73,8 +68,7 @@ Translations get t => LocaleSettings.instance.currentTranslations;
class TranslationProvider extends BaseTranslationProvider<AppLocale, Translations> {
TranslationProvider({required super.child}) : super(settings: LocaleSettings.instance);
static InheritedLocaleData<AppLocale, Translations> of(BuildContext context) =>
InheritedLocaleData.of<AppLocale, Translations>(context);
static InheritedLocaleData<AppLocale, Translations> of(BuildContext context) => InheritedLocaleData.of<AppLocale, Translations>(context);
}
/// Method B shorthand via [BuildContext] extension method.
@@ -95,18 +89,12 @@ class LocaleSettings extends BaseFlutterLocaleSettings<AppLocale, Translations>
// static aliases (checkout base methods for documentation)
static AppLocale get currentLocale => instance.currentLocale;
static Stream<AppLocale> getLocaleStream() => instance.getLocaleStream();
static AppLocale setLocale(AppLocale locale, {bool? listenToDeviceLocale = false}) =>
instance.setLocale(locale, listenToDeviceLocale: listenToDeviceLocale);
static AppLocale setLocaleRaw(String rawLocale, {bool? listenToDeviceLocale = false}) =>
instance.setLocaleRaw(rawLocale, listenToDeviceLocale: listenToDeviceLocale);
static AppLocale setLocale(AppLocale locale, {bool? listenToDeviceLocale = false}) => instance.setLocale(locale, listenToDeviceLocale: listenToDeviceLocale);
static AppLocale setLocaleRaw(String rawLocale, {bool? listenToDeviceLocale = false}) => instance.setLocaleRaw(rawLocale, listenToDeviceLocale: listenToDeviceLocale);
static AppLocale useDeviceLocale() => instance.useDeviceLocale();
@Deprecated('Use [AppLocaleUtils.supportedLocales]')
static List<Locale> get supportedLocales => instance.supportedLocales;
@Deprecated('Use [AppLocaleUtils.supportedLocalesRaw]')
static List<String> get supportedLocalesRaw => instance.supportedLocalesRaw;
static void setPluralResolver(
{String? language, AppLocale? locale, PluralResolver? cardinalResolver, PluralResolver? ordinalResolver}) =>
instance.setPluralResolver(
@Deprecated('Use [AppLocaleUtils.supportedLocales]') static List<Locale> get supportedLocales => instance.supportedLocales;
@Deprecated('Use [AppLocaleUtils.supportedLocalesRaw]') static List<String> get supportedLocalesRaw => instance.supportedLocalesRaw;
static void setPluralResolver({String? language, AppLocale? locale, PluralResolver? cardinalResolver, PluralResolver? ordinalResolver}) => instance.setPluralResolver(
language: language,
locale: locale,
cardinalResolver: cardinalResolver,
@@ -122,8 +110,7 @@ class AppLocaleUtils extends BaseAppLocaleUtils<AppLocale, Translations> {
// static aliases (checkout base methods for documentation)
static AppLocale parse(String rawLocale) => instance.parse(rawLocale);
static AppLocale parseLocaleParts({required String languageCode, String? scriptCode, String? countryCode}) =>
instance.parseLocaleParts(languageCode: languageCode, scriptCode: scriptCode, countryCode: countryCode);
static AppLocale parseLocaleParts({required String languageCode, String? scriptCode, String? countryCode}) => instance.parseLocaleParts(languageCode: languageCode, scriptCode: scriptCode, countryCode: countryCode);
static AppLocale findDeviceLocale() => instance.findDeviceLocale();
static List<Locale> get supportedLocales => instance.supportedLocales;
static List<String> get supportedLocalesRaw => instance.supportedLocalesRaw;
@@ -153,11 +140,10 @@ class Translations implements BaseTranslations<AppLocale, Translations> {
}
/// Metadata for the translations of <en>.
@override
final TranslationMetadata<AppLocale, Translations> $meta;
@override final TranslationMetadata<AppLocale, Translations> $meta;
/// Access flat map
dynamic operator [](String key) => $meta.getTranslation(key);
dynamic operator[](String key) => $meta.getTranslation(key);
late final Translations _root = this; // ignore: unused_field
@@ -166,6 +152,7 @@ class Translations implements BaseTranslations<AppLocale, Translations> {
late final _StringsLinksEn links = _StringsLinksEn._(_root);
late final _StringsSearchEn search = _StringsSearchEn._(_root);
late final _StringsSettingsEn settings = _StringsSettingsEn._(_root);
late final _StringsWebviewEn webview = _StringsWebviewEn._(_root);
}
// Path: onboarding
@@ -181,8 +168,7 @@ class _StringsOnboardingEn {
String get next => 'Next';
String get previous => 'Previous';
String get serverRequired => 'Servidor requerido';
String get serverRequiredDescription =>
'Linkdy it\'s not an standalone app, it requires the Linkding server to work.\nIn order to use this application, you must deploy Linkding on your home server, VPS or any other computer.';
String get serverRequiredDescription => 'Linkdy it\'s not an standalone app, it requires the Linkding server to work.\nIn order to use this application, you must deploy Linkding on your home server, VPS or any other computer.';
String get installationInstructions => 'Check the installation instructions on the official GitHub repository.';
String get serverRunningConfirmation => 'I confirm that I have an instance of the Linkding server already running.';
String get createConnection => 'Create a connection';
@@ -231,6 +217,17 @@ class _StringsSettingsEn {
String get disconnectFromServer => 'Disconnect from server';
}
// Path: webview
class _StringsWebviewEn {
_StringsWebviewEn._(this._root);
final Translations _root; // ignore: unused_field
// Translations
String get goBack => 'Go back';
String get goForward => 'Go forward';
}
// Path: links.dates
class _StringsLinksDatesEn {
_StringsLinksDatesEn._(this._root);
@@ -258,134 +255,103 @@ class _StringsEs implements Translations {
}
/// Metadata for the translations of <es>.
@override
final TranslationMetadata<AppLocale, Translations> $meta;
@override final TranslationMetadata<AppLocale, Translations> $meta;
/// Access flat map
@override
dynamic operator [](String key) => $meta.getTranslation(key);
@override dynamic operator[](String key) => $meta.getTranslation(key);
@override
late final _StringsEs _root = this; // ignore: unused_field
@override late final _StringsEs _root = this; // ignore: unused_field
// Translations
@override
late final _StringsOnboardingEs onboarding = _StringsOnboardingEs._(_root);
@override
late final _StringsLinksEs links = _StringsLinksEs._(_root);
@override
late final _StringsSearchEs search = _StringsSearchEs._(_root);
@override
late final _StringsSettingsEs settings = _StringsSettingsEs._(_root);
@override late final _StringsOnboardingEs onboarding = _StringsOnboardingEs._(_root);
@override late final _StringsLinksEs links = _StringsLinksEs._(_root);
@override late final _StringsSearchEs search = _StringsSearchEs._(_root);
@override late final _StringsSettingsEs settings = _StringsSettingsEs._(_root);
@override late final _StringsWebviewEs webview = _StringsWebviewEs._(_root);
}
// Path: onboarding
class _StringsOnboardingEs implements _StringsOnboardingEn {
_StringsOnboardingEs._(this._root);
@override
final _StringsEs _root; // ignore: unused_field
@override final _StringsEs _root; // ignore: unused_field
// Translations
@override
String get title => 'Bienvenido a Linkdy';
@override
String get subtitle => 'Una aplicación para gestionar tus enlaces favoritos.';
@override
String get start => 'Comenzar';
@override
String get next => 'Siguiente';
@override
String get previous => 'Anterior';
@override
String get serverRequired => 'Servidor requerido';
@override
String get serverRequiredDescription =>
'Linkdy no es una aplicación independiente, requiere el servidor Linkding para funcionar.\nPara utilizar esta aplicación, debe instalar Linkding en su servidor doméstico, VPS o cualquier otro ordenador.';
@override
String get installationInstructions => 'Mira las instrucciones de instalación en el repositorio oficial en GitHub.';
@override
String get serverRunningConfirmation =>
'Confirmo que tengo una instancia del servidor Linkding ya en funcionamiento.';
@override
String get createConnection => 'Crear una conexión';
@override
String get createConnectionSubtitle =>
'Introduce todos los detalles requeridos para crear una conexión con el servidor';
@override
String get ipAddressOrDomain => 'Dirección IP o dominio';
@override
String get port => 'Puerto';
@override
String get token => 'Token';
@override
String get required => 'Requerido';
@override
String get serverDetails => 'Detalles del servidor';
@override
String get authentication => 'Autenticación';
@override
String get testConnectionUrl => 'Probar URL de conexión';
@override
String get connect => 'Conectar';
@override
String get connecting => 'Conectando...';
@override
String get cannotConnectToServer => 'No se puede conectar con el servidor.';
@override String get title => 'Bienvenido a Linkdy';
@override String get subtitle => 'Una aplicación para gestionar tus enlaces favoritos.';
@override String get start => 'Comenzar';
@override String get next => 'Siguiente';
@override String get previous => 'Anterior';
@override String get serverRequired => 'Servidor requerido';
@override String get serverRequiredDescription => 'Linkdy no es una aplicación independiente, requiere el servidor Linkding para funcionar.\nPara utilizar esta aplicación, debe instalar Linkding en su servidor doméstico, VPS o cualquier otro ordenador.';
@override String get installationInstructions => 'Mira las instrucciones de instalación en el repositorio oficial en GitHub.';
@override String get serverRunningConfirmation => 'Confirmo que tengo una instancia del servidor Linkding ya en funcionamiento.';
@override String get createConnection => 'Crear una conexión';
@override String get createConnectionSubtitle => 'Introduce todos los detalles requeridos para crear una conexión con el servidor';
@override String get ipAddressOrDomain => 'Dirección IP o dominio';
@override String get port => 'Puerto';
@override String get token => 'Token';
@override String get required => 'Requerido';
@override String get serverDetails => 'Detalles del servidor';
@override String get authentication => 'Autenticación';
@override String get testConnectionUrl => 'Probar URL de conexión';
@override String get connect => 'Conectar';
@override String get connecting => 'Conectando...';
@override String get cannotConnectToServer => 'No se puede conectar con el servidor.';
}
// Path: links
class _StringsLinksEs implements _StringsLinksEn {
_StringsLinksEs._(this._root);
@override
final _StringsEs _root; // ignore: unused_field
@override final _StringsEs _root; // ignore: unused_field
// Translations
@override
String get links => 'Enlaces';
@override
late final _StringsLinksDatesEs dates = _StringsLinksDatesEs._(_root);
@override String get links => 'Enlaces';
@override late final _StringsLinksDatesEs dates = _StringsLinksDatesEs._(_root);
}
// Path: search
class _StringsSearchEs implements _StringsSearchEn {
_StringsSearchEs._(this._root);
@override
final _StringsEs _root; // ignore: unused_field
@override final _StringsEs _root; // ignore: unused_field
// Translations
@override
String get search => 'Buscar';
@override String get search => 'Buscar';
}
// Path: settings
class _StringsSettingsEs implements _StringsSettingsEn {
_StringsSettingsEs._(this._root);
@override
final _StringsEs _root; // ignore: unused_field
@override final _StringsEs _root; // ignore: unused_field
// Translations
@override
String get settings => 'Ajustes';
@override
String get disconnectFromServer => 'Desconectar del servidor';
@override String get settings => 'Ajustes';
@override String get disconnectFromServer => 'Desconectar del servidor';
}
// Path: webview
class _StringsWebviewEs implements _StringsWebviewEn {
_StringsWebviewEs._(this._root);
@override final _StringsEs _root; // ignore: unused_field
// Translations
@override String get goBack => 'Ir atrás';
@override String get goForward => 'Ir adelante';
}
// Path: links.dates
class _StringsLinksDatesEs implements _StringsLinksDatesEn {
_StringsLinksDatesEs._(this._root);
@override
final _StringsEs _root; // ignore: unused_field
@override final _StringsEs _root; // ignore: unused_field
// Translations
@override
String todayAt({required Object time}) => 'Hoy, ${time}';
@override
String yesterdayAt({required Object time}) => 'Ayer, ${time}';
@override String todayAt({required Object time}) => 'Hoy, ${time}';
@override String yesterdayAt({required Object time}) => 'Ayer, ${time}';
}
/// Flat map(s) containing all translations.
@@ -394,62 +360,36 @@ class _StringsLinksDatesEs implements _StringsLinksDatesEn {
extension on Translations {
dynamic _flatMapFunction(String path) {
switch (path) {
case 'onboarding.title':
return 'Welcome to Linkdy';
case 'onboarding.subtitle':
return 'An application to manage your bookmarks.';
case 'onboarding.start':
return 'Start';
case 'onboarding.next':
return 'Next';
case 'onboarding.previous':
return 'Previous';
case 'onboarding.serverRequired':
return 'Servidor requerido';
case 'onboarding.serverRequiredDescription':
return 'Linkdy it\'s not an standalone app, it requires the Linkding server to work.\nIn order to use this application, you must deploy Linkding on your home server, VPS or any other computer.';
case 'onboarding.installationInstructions':
return 'Check the installation instructions on the official GitHub repository.';
case 'onboarding.serverRunningConfirmation':
return 'I confirm that I have an instance of the Linkding server already running.';
case 'onboarding.createConnection':
return 'Create a connection';
case 'onboarding.createConnectionSubtitle':
return 'Enter all the required details to create a connection to your server.';
case 'onboarding.ipAddressOrDomain':
return 'IP address or domain';
case 'onboarding.port':
return 'Port';
case 'onboarding.token':
return 'Token';
case 'onboarding.required':
return 'Required';
case 'onboarding.serverDetails':
return 'Server details';
case 'onboarding.authentication':
return 'Authentication';
case 'onboarding.testConnectionUrl':
return 'Test connection url';
case 'onboarding.connect':
return 'Connect';
case 'onboarding.connecting':
return 'Connecting...';
case 'onboarding.cannotConnectToServer':
return 'Cannot connect to the server.';
case 'links.links':
return 'Links';
case 'links.dates.todayAt':
return ({required Object time}) => 'Today, ${time}';
case 'links.dates.yesterdayAt':
return ({required Object time}) => 'Yesterday, ${time}';
case 'search.search':
return 'Search';
case 'settings.settings':
return 'Settings';
case 'settings.disconnectFromServer':
return 'Disconnect from server';
default:
return null;
case 'onboarding.title': return 'Welcome to Linkdy';
case 'onboarding.subtitle': return 'An application to manage your bookmarks.';
case 'onboarding.start': return 'Start';
case 'onboarding.next': return 'Next';
case 'onboarding.previous': return 'Previous';
case 'onboarding.serverRequired': return 'Servidor requerido';
case 'onboarding.serverRequiredDescription': return 'Linkdy it\'s not an standalone app, it requires the Linkding server to work.\nIn order to use this application, you must deploy Linkding on your home server, VPS or any other computer.';
case 'onboarding.installationInstructions': return 'Check the installation instructions on the official GitHub repository.';
case 'onboarding.serverRunningConfirmation': return 'I confirm that I have an instance of the Linkding server already running.';
case 'onboarding.createConnection': return 'Create a connection';
case 'onboarding.createConnectionSubtitle': return 'Enter all the required details to create a connection to your server.';
case 'onboarding.ipAddressOrDomain': return 'IP address or domain';
case 'onboarding.port': return 'Port';
case 'onboarding.token': return 'Token';
case 'onboarding.required': return 'Required';
case 'onboarding.serverDetails': return 'Server details';
case 'onboarding.authentication': return 'Authentication';
case 'onboarding.testConnectionUrl': return 'Test connection url';
case 'onboarding.connect': return 'Connect';
case 'onboarding.connecting': return 'Connecting...';
case 'onboarding.cannotConnectToServer': return 'Cannot connect to the server.';
case 'links.links': return 'Links';
case 'links.dates.todayAt': return ({required Object time}) => 'Today, ${time}';
case 'links.dates.yesterdayAt': return ({required Object time}) => 'Yesterday, ${time}';
case 'search.search': return 'Search';
case 'settings.settings': return 'Settings';
case 'settings.disconnectFromServer': return 'Disconnect from server';
case 'webview.goBack': return 'Go back';
case 'webview.goForward': return 'Go forward';
default: return null;
}
}
}
@@ -457,62 +397,36 @@ extension on Translations {
extension on _StringsEs {
dynamic _flatMapFunction(String path) {
switch (path) {
case 'onboarding.title':
return 'Bienvenido a Linkdy';
case 'onboarding.subtitle':
return 'Una aplicación para gestionar tus enlaces favoritos.';
case 'onboarding.start':
return 'Comenzar';
case 'onboarding.next':
return 'Siguiente';
case 'onboarding.previous':
return 'Anterior';
case 'onboarding.serverRequired':
return 'Servidor requerido';
case 'onboarding.serverRequiredDescription':
return 'Linkdy no es una aplicación independiente, requiere el servidor Linkding para funcionar.\nPara utilizar esta aplicación, debe instalar Linkding en su servidor doméstico, VPS o cualquier otro ordenador.';
case 'onboarding.installationInstructions':
return 'Mira las instrucciones de instalación en el repositorio oficial en GitHub.';
case 'onboarding.serverRunningConfirmation':
return 'Confirmo que tengo una instancia del servidor Linkding ya en funcionamiento.';
case 'onboarding.createConnection':
return 'Crear una conexión';
case 'onboarding.createConnectionSubtitle':
return 'Introduce todos los detalles requeridos para crear una conexión con el servidor';
case 'onboarding.ipAddressOrDomain':
return 'Dirección IP o dominio';
case 'onboarding.port':
return 'Puerto';
case 'onboarding.token':
return 'Token';
case 'onboarding.required':
return 'Requerido';
case 'onboarding.serverDetails':
return 'Detalles del servidor';
case 'onboarding.authentication':
return 'Autenticación';
case 'onboarding.testConnectionUrl':
return 'Probar URL de conexión';
case 'onboarding.connect':
return 'Conectar';
case 'onboarding.connecting':
return 'Conectando...';
case 'onboarding.cannotConnectToServer':
return 'No se puede conectar con el servidor.';
case 'links.links':
return 'Enlaces';
case 'links.dates.todayAt':
return ({required Object time}) => 'Hoy, ${time}';
case 'links.dates.yesterdayAt':
return ({required Object time}) => 'Ayer, ${time}';
case 'search.search':
return 'Buscar';
case 'settings.settings':
return 'Ajustes';
case 'settings.disconnectFromServer':
return 'Desconectar del servidor';
default:
return null;
case 'onboarding.title': return 'Bienvenido a Linkdy';
case 'onboarding.subtitle': return 'Una aplicación para gestionar tus enlaces favoritos.';
case 'onboarding.start': return 'Comenzar';
case 'onboarding.next': return 'Siguiente';
case 'onboarding.previous': return 'Anterior';
case 'onboarding.serverRequired': return 'Servidor requerido';
case 'onboarding.serverRequiredDescription': return 'Linkdy no es una aplicación independiente, requiere el servidor Linkding para funcionar.\nPara utilizar esta aplicación, debe instalar Linkding en su servidor doméstico, VPS o cualquier otro ordenador.';
case 'onboarding.installationInstructions': return 'Mira las instrucciones de instalación en el repositorio oficial en GitHub.';
case 'onboarding.serverRunningConfirmation': return 'Confirmo que tengo una instancia del servidor Linkding ya en funcionamiento.';
case 'onboarding.createConnection': return 'Crear una conexión';
case 'onboarding.createConnectionSubtitle': return 'Introduce todos los detalles requeridos para crear una conexión con el servidor';
case 'onboarding.ipAddressOrDomain': return 'Dirección IP o dominio';
case 'onboarding.port': return 'Puerto';
case 'onboarding.token': return 'Token';
case 'onboarding.required': return 'Requerido';
case 'onboarding.serverDetails': return 'Detalles del servidor';
case 'onboarding.authentication': return 'Autenticación';
case 'onboarding.testConnectionUrl': return 'Probar URL de conexión';
case 'onboarding.connect': return 'Conectar';
case 'onboarding.connecting': return 'Conectando...';
case 'onboarding.cannotConnectToServer': return 'No se puede conectar con el servidor.';
case 'links.links': return 'Enlaces';
case 'links.dates.todayAt': return ({required Object time}) => 'Hoy, ${time}';
case 'links.dates.yesterdayAt': return ({required Object time}) => 'Ayer, ${time}';
case 'search.search': return 'Buscar';
case 'settings.settings': return 'Ajustes';
case 'settings.disconnectFromServer': return 'Desconectar del servidor';
case 'webview.goBack': return 'Ir atrás';
case 'webview.goForward': return 'Ir adelante';
default: return null;
}
}
}

4
lib/i18n/strings_en.i18n.json
View File

@@ -35,5 +35,9 @@
"settings": {
"settings": "Settings",
"disconnectFromServer": "Disconnect from server"
},
"webview": {
"goBack": "Go back",
"goForward": "Go forward"
}
}

4
lib/i18n/strings_es.i18n.json
View File

@@ -35,5 +35,9 @@
"settings": {
"settings": "Ajustes",
"disconnectFromServer": "Desconectar del servidor"
},
"webview": {
"goBack": "Ir atrás",
"goForward": "Ir adelante"
}
}

8
lib/router/routes.dart
View File

@@ -21,6 +21,10 @@ final List<RouteBase> appRoutes = [
path: RoutesPaths.onboarding,
builder: (context, state) => const Onboarding(),
),
GoRoute(
path: RoutesPaths.webview,
builder: (context, state) => WebView(bookmark: state.extra as Bookmark),
),
StatefulShellRoute.indexedStack(
builder: (context, state, navigationShell) => Layout(
navigationShell: navigationShell,
@@ -34,10 +38,6 @@ final List<RouteBase> appRoutes = [
path: RoutesPaths.links,
builder: (context, state) => const Links(),
),
GoRoute(
path: RoutesPaths.webview,
builder: (context, state) => WebView(bookmark: state.extra as Bookmark),
),
],
),
StatefulShellBranch(

4
lib/screens/onboarding/model/onboarding.model.dart
View File

@@ -2,11 +2,11 @@ import 'package:flutter/material.dart';
class OnboardingModel {
final PageController pageController;
final bool confirmServerRunning;
bool confirmServerRunning;
OnboardingModel({
required this.pageController,
required this.confirmServerRunning,
this.confirmServerRunning = false,
});
OnboardingModel toggleConfirmServerRunning(bool newValue) => OnboardingModel(

3
lib/screens/onboarding/provider/onboarding.provider.dart
View File

@@ -30,6 +30,7 @@ class Onboarding extends _$Onboarding {
}
void confirmServerRunning() {
state = state.toggleConfirmServerRunning(!state.confirmServerRunning);
state.confirmServerRunning = !state.confirmServerRunning;
ref.notifyListeners();
}
}

2
lib/screens/onboarding/provider/onboarding.provider.g.dart
View File

@@ -6,7 +6,7 @@ part of 'onboarding.provider.dart';
// RiverpodGenerator
// **************************************************************************
String _$onboardingHash() => r'5c876d53acbca92ab15630516099700609aa4f89';
String _$onboardingHash() => r'06f4c2d233d6babdd1d8fef05e5a6285e19ec453';
/// See also [Onboarding].
@ProviderFor(Onboarding)

12
lib/screens/webview/model/webview.model.dart
View File

@@ -1,9 +1,15 @@
import 'package:webview_flutter/webview_flutter.dart';
import 'package:flutter_inappwebview/flutter_inappwebview.dart';
class WebViewModel {
final WebViewController webViewController;
InAppWebViewController? inAppWebViewController;
int loadProgress;
bool canGoBack;
bool canGoForward;
WebViewModel({
required this.webViewController,
this.inAppWebViewController,
this.loadProgress = 0,
this.canGoBack = false,
this.canGoForward = false,
});
}

38
lib/screens/webview/provider/webview.provider.dart
View File

@@ -1,5 +1,5 @@
import 'package:flutter_inappwebview/flutter_inappwebview.dart';
import 'package:riverpod_annotation/riverpod_annotation.dart';
import 'package:webview_flutter/webview_flutter.dart';
import 'package:linkdy/screens/webview/model/webview.model.dart';
@@ -9,25 +9,25 @@ part 'webview.provider.g.dart';
class WebView extends _$WebView {
@override
WebViewModel build() {
return WebViewModel(
webViewController: WebViewController(
onPermissionRequest: (request) => request.deny(),
)
..setJavaScriptMode(JavaScriptMode.unrestricted)
..setNavigationDelegate(
NavigationDelegate(
onProgress: (int progress) {
// Update loading bar.
},
onPageStarted: (String url) {},
onPageFinished: (String url) {},
onWebResourceError: (WebResourceError error) {},
),
),
);
return WebViewModel();
}
void initialize(String url) {
state.webViewController.loadRequest(Uri.parse(url));
void initializeController(InAppWebViewController controller) {
state.inAppWebViewController = controller;
}
void setLoadProgress(int progress) {
state.loadProgress = progress;
ref.notifyListeners();
}
void setCanGoBack(bool value) {
state.canGoBack = value;
ref.notifyListeners();
}
void setCanGoForward(bool value) {
state.canGoForward = value;
ref.notifyListeners();
}
}

2
lib/screens/webview/provider/webview.provider.g.dart
View File

@@ -6,7 +6,7 @@ part of 'webview.provider.dart';
// RiverpodGenerator
// **************************************************************************
String _$webViewHash() => r'9eb114ec97e04b92aa1e2ec9fc8948b1443c948c';
String _$webViewHash() => r'55d815688ade5764e1b2b4c862f81df45d98ae3b';
/// See also [WebView].
@ProviderFor(WebView)

97
lib/screens/webview/ui/webview.dart
View File

@@ -1,9 +1,11 @@
import 'package:flutter/material.dart';
import 'package:flutter_inappwebview/flutter_inappwebview.dart';
import 'package:flutter_riverpod/flutter_riverpod.dart';
import 'package:linkdy/models/data/bookmarks.dart';
import 'package:linkdy/screens/webview/provider/webview.provider.dart';
import 'package:webview_flutter/webview_flutter.dart';
import 'package:linkdy/models/data/bookmarks.dart';
import 'package:linkdy/i18n/strings.g.dart';
class WebView extends ConsumerWidget {
final Bookmark bookmark;
@@ -15,17 +17,92 @@ class WebView extends ConsumerWidget {
@override
Widget build(BuildContext context, WidgetRef ref) {
WidgetsBinding.instance.addPostFrameCallback((_) {
ref.read(webViewProvider.notifier).initialize(bookmark.url!);
});
final webViewController = ref.watch(webViewProvider).webViewController;
return Scaffold(
appBar: AppBar(
title: Text(bookmark.title != "" ? bookmark.title! : bookmark.websiteTitle!),
elevation: 3,
title: Column(
children: [
Text(
bookmark.title != "" ? bookmark.title! : bookmark.websiteTitle!,
style: const TextStyle(fontSize: 14),
),
const SizedBox(height: 4),
Text(
bookmark.url!,
style: TextStyle(
fontSize: 12,
color: Theme.of(context).colorScheme.onSurfaceVariant,
),
),
],
),
bottom: PreferredSize(
preferredSize: const Size(double.maxFinite, 0),
child: ref.watch(webViewProvider).loadProgress < 100
? LinearProgressIndicator(
value: ref.watch(webViewProvider).loadProgress.toDouble(),
)
: const SizedBox(
height: 4,
),
),
),
body: SafeArea(
child: Column(
children: [
Expanded(
child: InAppWebView(
initialUrlRequest: URLRequest(url: WebUri.uri(Uri.parse(bookmark.url!))),
onWebViewCreated: (controller) {
ref.read(webViewProvider).inAppWebViewController = controller;
},
onPermissionRequest: (controller, request) async {
return PermissionResponse(
resources: request.resources,
action: PermissionResponseAction.DENY,
);
},
onProgressChanged: (controller, progress) {
ref.read(webViewProvider.notifier).setLoadProgress(progress);
},
initialSettings: InAppWebViewSettings(
allowContentAccess: false,
allowFileAccess: false,
applePayAPIEnabled: false,
cacheEnabled: false,
isInspectable: false,
),
onUpdateVisitedHistory: (controller, url, androidIsReload) {
controller.canGoBack().then((value) => ref.read(webViewProvider.notifier).setCanGoBack(value));
controller.canGoForward().then((value) => ref.read(webViewProvider.notifier).setCanGoForward(value));
},
),
),
Padding(
padding: const EdgeInsets.all(8.0),
child: Row(
children: [
IconButton(
onPressed: ref.watch(webViewProvider).canGoBack == true
? () => ref.watch(webViewProvider).inAppWebViewController?.goBack()
: null,
icon: const Icon(Icons.arrow_back_rounded),
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,
),
],
),
),
],
),
),
body: webViewController != null ? WebViewWidget(controller: ref.watch(webViewProvider).webViewController!) : null,
);
}
}

2
macos/Flutter/GeneratedPluginRegistrant.swift
View File

@@ -6,11 +6,13 @@ import FlutterMacOS
import Foundation
import dynamic_color
import flutter_inappwebview_macos
import shared_preferences_foundation
import url_launcher_macos
func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) {
DynamicColorPlugin.register(with: registry.registrar(forPlugin: "DynamicColorPlugin"))
InAppWebViewFlutterPlugin.register(with: registry.registrar(forPlugin: "InAppWebViewFlutterPlugin"))
SharedPreferencesPlugin.register(with: registry.registrar(forPlugin: "SharedPreferencesPlugin"))
UrlLauncherPlugin.register(with: registry.registrar(forPlugin: "UrlLauncherPlugin"))
}

98
pubspec.lock
View File

@@ -358,6 +358,62 @@ packages:
url: "https://pub.dev"
source: hosted
version: "2.0.0"
flutter_inappwebview:
dependency: "direct main"
description:
name: flutter_inappwebview
sha256: "3e9a443a18ecef966fb930c3a76ca5ab6a7aafc0c7b5e14a4a850cf107b09959"
url: "https://pub.dev"
source: hosted
version: "6.0.0"
flutter_inappwebview_android:
dependency: transitive
description:
name: flutter_inappwebview_android
sha256: d247f6ed417f1f8c364612fa05a2ecba7f775c8d0c044c1d3b9ee33a6515c421
url: "https://pub.dev"
source: hosted
version: "1.0.13"
flutter_inappwebview_internal_annotations:
dependency: transitive
description:
name: flutter_inappwebview_internal_annotations
sha256: "5f80fd30e208ddded7dbbcd0d569e7995f9f63d45ea3f548d8dd4c0b473fb4c8"
url: "https://pub.dev"
source: hosted
version: "1.1.1"
flutter_inappwebview_ios:
dependency: transitive
description:
name: flutter_inappwebview_ios
sha256: f363577208b97b10b319cd0c428555cd8493e88b468019a8c5635a0e4312bd0f
url: "https://pub.dev"
source: hosted
version: "1.0.13"
flutter_inappwebview_macos:
dependency: transitive
description:
name: flutter_inappwebview_macos
sha256: b55b9e506c549ce88e26580351d2c71d54f4825901666bd6cfa4be9415bb2636
url: "https://pub.dev"
source: hosted
version: "1.0.11"
flutter_inappwebview_platform_interface:
dependency: transitive
description:
name: flutter_inappwebview_platform_interface
sha256: "545fd4c25a07d2775f7d5af05a979b2cac4fbf79393b0a7f5d33ba39ba4f6187"
url: "https://pub.dev"
source: hosted
version: "1.0.10"
flutter_inappwebview_web:
dependency: transitive
description:
name: flutter_inappwebview_web
sha256: d8c680abfb6fec71609a700199635d38a744df0febd5544c5a020bd73de8ee07
url: "https://pub.dev"
source: hosted
version: "1.0.8"
flutter_lints:
dependency: "direct dev"
description:
@@ -375,10 +431,10 @@ packages:
dependency: "direct dev"
description:
name: flutter_native_splash
sha256: "45e2c0986d749c070509e03d6c7ad6c8bd1f7b1dad7d11dd8750a5e4fe3e2c0b"
sha256: "558f10070f03ee71f850a78f7136ab239a67636a294a44a06b6b7345178edb1e"
url: "https://pub.dev"
source: hosted
version: "2.3.11"
version: "2.3.10"
flutter_riverpod:
dependency: "direct main"
description:
@@ -513,10 +569,10 @@ packages:
dependency: transitive
description:
name: js
sha256: c1b2e9b5ea78c45e1a0788d29606ba27dc5f71f019f32ca5140f61ef071838cf
sha256: f2c445dce49627136094980615a031419f7f3eb393237e4ecd97ac15dea343f3
url: "https://pub.dev"
source: hosted
version: "0.7.1"
version: "0.6.7"
json2yaml:
dependency: transitive
description:
@@ -1082,38 +1138,6 @@ packages:
url: "https://pub.dev"
source: hosted
version: "2.4.0"
webview_flutter:
dependency: "direct main"
description:
name: webview_flutter
sha256: "25e1b6e839e8cbfbd708abc6f85ed09d1727e24e08e08c6b8590d7c65c9a8932"
url: "https://pub.dev"
source: hosted
version: "4.7.0"
webview_flutter_android:
dependency: transitive
description:
name: webview_flutter_android
sha256: "3e5f4e9d818086b0d01a66fb1ff9cc72ab0cc58c71980e3d3661c5685ea0efb0"
url: "https://pub.dev"
source: hosted
version: "3.15.0"
webview_flutter_platform_interface:
dependency: transitive
description:
name: webview_flutter_platform_interface
sha256: d937581d6e558908d7ae3dc1989c4f87b786891ab47bb9df7de548a151779d8d
url: "https://pub.dev"
source: hosted
version: "2.10.0"
webview_flutter_wkwebview:
dependency: transitive
description:
name: webview_flutter_wkwebview
sha256: "9bf168bccdf179ce90450b5f37e36fe263f591c9338828d6bf09b6f8d0f57f86"
url: "https://pub.dev"
source: hosted
version: "3.12.0"
win32:
dependency: transitive
description:
@@ -1148,4 +1172,4 @@ packages:
version: "3.1.2"
sdks:
dart: ">=3.2.6 <4.0.0"
flutter: ">=3.16.6"
flutter: ">=3.16.0"

2
pubspec.yaml
View File

@@ -47,7 +47,7 @@ dependencies:
slang_flutter: ^3.29.0
flutter_svg: ^2.0.9
flutter_custom_tabs: ^2.0.0+1
webview_flutter: ^4.7.0
flutter_inappwebview: ^6.0.0
dev_dependencies:
build_runner: ^2.4.8