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

Large header settings

Browse Source
This commit is contained in:
Juan Gilsanz Polo
2024-06-11 18:45:02 +02:00
parent 84d08ae9a0
commit bfaa8bf356
7 changed files with 334 additions and 235 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -4,9 +4,9 @@
/// To regenerate, run: `dart run slang`
///
/// Locales: 3
/// Strings: 582 (194 per locale)
/// Strings: 591 (197 per locale)
///
/// Built on 2024-06-11 at 12:16 UTC
/// Built on 2024-06-11 at 16:25 UTC
// coverage:ignore-file
// ignore_for_file: type=lint
@@ -502,6 +502,9 @@ class _StringsSettingsGeneralSettingsEn {
String get internalBrowser => 'App internal browser';
String get browserCustomTab => 'Browser custom tab';
String get systemBrowser => 'System browser';
String get tags => 'Tags';
String get defaultTags => 'Default tags';
String get defaultTagsDescription => 'Define a list of tags that will be added by default when creating a bookmark';
}
// Path: settings.generalSettings.disconnectModal
@@ -892,6 +895,9 @@ class _StringsSettingsGeneralSettingsEs implements _StringsSettingsGeneralSettin
@override String get internalBrowser => 'Navegador interno de la app';
@override String get browserCustomTab => 'Pestaña personalizada del navegador';
@override String get systemBrowser => 'Navegador del sistema';
@override String get tags => 'Etiquetas';
@override String get defaultTags => 'Etiquetas por defecto';
@override String get defaultTagsDescription => 'Define una lista de etiquetas que se añadirán por defecto al crear un marcador';
}
// Path: settings.generalSettings.disconnectModal
@@ -1282,6 +1288,9 @@ class _StringsSettingsGeneralSettingsTr implements _StringsSettingsGeneralSettin
@override String get internalBrowser => 'App internal browser';
@override String get browserCustomTab => 'Browser custom tab';
@override String get systemBrowser => 'System browser';
@override String get tags => 'Tags';
@override String get defaultTags => 'Default tags';
@override String get defaultTagsDescription => 'Define a list of tags that will be added by default when creating a bookmark';
}
// Path: settings.generalSettings.disconnectModal
@@ -1477,6 +1486,9 @@ extension on Translations {
case 'settings.generalSettings.internalBrowser': return 'App internal browser';
case 'settings.generalSettings.browserCustomTab': return 'Browser custom tab';
case 'settings.generalSettings.systemBrowser': return 'System browser';
case 'settings.generalSettings.tags': return 'Tags';
case 'settings.generalSettings.defaultTags': return 'Default tags';
case 'settings.generalSettings.defaultTagsDescription': return 'Define a list of tags that will be added by default when creating a bookmark';
case 'webview.goBack': return 'Go back';
case 'webview.goForward': return 'Go forward';
case 'webview.reload': return 'Reload';
@@ -1679,6 +1691,9 @@ extension on _StringsEs {
case 'settings.generalSettings.internalBrowser': return 'Navegador interno de la app';
case 'settings.generalSettings.browserCustomTab': return 'Pestaña personalizada del navegador';
case 'settings.generalSettings.systemBrowser': return 'Navegador del sistema';
case 'settings.generalSettings.tags': return 'Etiquetas';
case 'settings.generalSettings.defaultTags': return 'Etiquetas por defecto';
case 'settings.generalSettings.defaultTagsDescription': return 'Define una lista de etiquetas que se añadirán por defecto al crear un marcador';
case 'webview.goBack': return 'Ir atrás';
case 'webview.goForward': return 'Ir adelante';
case 'webview.reload': return 'Recargar';
@@ -1881,6 +1896,9 @@ extension on _StringsTr {
case 'settings.generalSettings.internalBrowser': return 'App internal browser';
case 'settings.generalSettings.browserCustomTab': return 'Browser custom tab';
case 'settings.generalSettings.systemBrowser': return 'System browser';
case 'settings.generalSettings.tags': return 'Tags';
case 'settings.generalSettings.defaultTags': return 'Default tags';
case 'settings.generalSettings.defaultTagsDescription': return 'Define a list of tags that will be added by default when creating a bookmark';
case 'webview.goBack': return 'Geri dön';
case 'webview.goForward': return 'İleri git';
case 'webview.reload': return 'Yenile';

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

@@ -202,7 +202,10 @@
"openLinksWith": "Open links with...",
"internalBrowser": "App internal browser",
"browserCustomTab": "Browser custom tab",
"systemBrowser": "System browser"
"systemBrowser": "System browser",
"tags": "Tags",
"defaultTags": "Default tags",
"defaultTagsDescription": "Define a list of tags that will be added by default when creating a bookmark"
}
},
"webview": {

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

@@ -202,7 +202,10 @@
"openLinksWith": "Abrir enlaces con...",
"internalBrowser": "Navegador interno de la app",
"browserCustomTab": "Pestaña personalizada del navegador",
"systemBrowser": "Navegador del sistema"
"systemBrowser": "Navegador del sistema",
"tags": "Etiquetas",
"defaultTags": "Etiquetas por defecto",
"defaultTagsDescription": "Define una lista de etiquetas que se añadirán por defecto al crear un marcador"
}
},
"webview": {

5
lib/i18n/strings_tr.i18n.json
View File

@@ -202,7 +202,10 @@
"openLinksWith": "Open links with...",
"internalBrowser": "App internal browser",
"browserCustomTab": "Browser custom tab",
"systemBrowser": "System browser"
"systemBrowser": "System browser",
"tags": "Tags",
"defaultTags": "Default tags",
"defaultTagsDescription": "Define a list of tags that will be added by default when creating a bookmark"
}
},
"webview": {

41
lib/screens/settings/ui/customization/customization.dart
View File

@@ -16,17 +16,34 @@ import 'package:linkdy/i18n/strings.g.dart';
import 'package:linkdy/providers/app_status.provider.dart';
class Customization extends ConsumerWidget {
const Customization({Key? key}) : super(key: key);
const Customization({super.key});
@override
Widget build(BuildContext context, WidgetRef ref) {
return Scaffold(
appBar: AppBar(
title: Text(t.settings.customization.customization),
body: NestedScrollView(
headerSliverBuilder: (context, innerBoxIsScrolled) => [
SliverOverlapAbsorber(
handle: NestedScrollView.sliverOverlapAbsorberHandleFor(context),
sliver: SliverAppBar.large(
pinned: true,
floating: true,
centerTitle: false,
forceElevated: innerBoxIsScrolled,
title: Text(t.settings.customization.customization),
),
),
],
body: SafeArea(
child: ListView(
top: false,
bottom: false,
child: Builder(
builder: (context) => CustomScrollView(
slivers: [
SliverOverlapInjector(
handle: NestedScrollView.sliverOverlapAbsorberHandleFor(context),
),
SliverList.list(
children: [
SectionLabel(
label: t.settings.customization.theme,
@@ -50,16 +67,20 @@ class Customization extends ConsumerWidget {
value: 1,
selected: ref.watch(appStatusProvider).selectedTheme.index,
label: t.settings.customization.light,
onChanged: (value) => ref.read(appStatusProvider.notifier).setTheme(SelectedTheme.values[value]),
disabled: ref.watch(appStatusProvider).selectedTheme == SelectedTheme.system ? true : false,
onChanged: (value) =>
ref.read(appStatusProvider.notifier).setTheme(SelectedTheme.values[value]),
disabled:
ref.watch(appStatusProvider).selectedTheme == SelectedTheme.system ? true : false,
),
ThemeModeButton(
icon: Icons.dark_mode,
value: 2,
selected: ref.watch(appStatusProvider).selectedTheme.index,
label: t.settings.customization.dark,
onChanged: (value) => ref.read(appStatusProvider.notifier).setTheme(SelectedTheme.values[value]),
disabled: ref.watch(appStatusProvider).selectedTheme == SelectedTheme.system ? true : false,
onChanged: (value) =>
ref.read(appStatusProvider.notifier).setTheme(SelectedTheme.values[value]),
disabled:
ref.watch(appStatusProvider).selectedTheme == SelectedTheme.system ? true : false,
),
],
),
@@ -148,6 +169,10 @@ class Customization extends ConsumerWidget {
),
],
),
],
),
),
),
),
);
}

41
lib/screens/settings/ui/general_settings/general_settings.dart
View File

@@ -1,14 +1,14 @@
import 'package:flutter/material.dart';
import 'package:flutter_riverpod/flutter_riverpod.dart';
import 'package:linkdy/constants/enums.dart';
import 'package:linkdy/i18n/strings.g.dart';
import 'package:linkdy/screens/settings/ui/general_settings/browser_mode_selection_modal.dart';
import 'package:linkdy/screens/settings/ui/general_settings/disconnect_modal.dart';
import 'package:linkdy/providers/app_status.provider.dart';
import 'package:linkdy/widgets/section_label.dart';
import 'package:linkdy/i18n/strings.g.dart';
import 'package:linkdy/providers/app_status.provider.dart';
import 'package:linkdy/constants/enums.dart';
class GeneralSettings extends ConsumerWidget {
const GeneralSettings({super.key});
@@ -33,10 +33,29 @@ class GeneralSettings extends ConsumerWidget {
}
return Scaffold(
appBar: AppBar(
body: NestedScrollView(
headerSliverBuilder: (context, innerBoxIsScrolled) => [
SliverOverlapAbsorber(
handle: NestedScrollView.sliverOverlapAbsorberHandleFor(context),
sliver: SliverAppBar.large(
pinned: true,
floating: true,
centerTitle: false,
forceElevated: innerBoxIsScrolled,
title: Text(t.settings.generalSettings.generalSettings),
),
body: ListView(
),
],
body: SafeArea(
top: false,
bottom: false,
child: Builder(
builder: (context) => CustomScrollView(
slivers: [
SliverOverlapInjector(
handle: NestedScrollView.sliverOverlapAbsorberHandleFor(context),
),
SliverList.list(
children: [
SectionLabel(label: t.settings.generalSettings.bookmarks),
SwitchListTile(
@@ -50,6 +69,11 @@ class GeneralSettings extends ConsumerWidget {
subtitle: Text(browserLabel()),
onTap: openBrowserSelectionSheet,
),
SectionLabel(label: t.settings.generalSettings.tags),
ListTile(
title: Text(t.settings.generalSettings.defaultTags),
subtitle: Text(t.settings.generalSettings.defaultTagsDescription),
),
const Padding(
padding: EdgeInsets.symmetric(vertical: 16),
child: Divider(),
@@ -75,6 +99,11 @@ class GeneralSettings extends ConsumerWidget {
),
],
),
],
),
),
),
),
);
}
}

34
lib/screens/settings/ui/settings.dart
View File

@@ -12,7 +12,6 @@ import 'package:linkdy/widgets/section_label.dart';
import 'package:linkdy/widgets/custom_list_tile.dart';
import 'package:linkdy/widgets/custom_settings_tile.dart';
import 'package:linkdy/providers/router.provider.dart';
import 'package:linkdy/providers/app_info.provider.dart';
import 'package:linkdy/utils/open_url.dart';
import 'package:linkdy/constants/strings.dart';
@@ -51,11 +50,29 @@ class _List extends ConsumerWidget {
@override
Widget build(BuildContext context, WidgetRef ref) {
return Scaffold(
appBar: AppBar(
leading: BackButton(onPressed: () => ref.read(routerProvider).pop()),
body: NestedScrollView(
headerSliverBuilder: (context, innerBoxIsScrolled) => [
SliverOverlapAbsorber(
handle: NestedScrollView.sliverOverlapAbsorberHandleFor(context),
sliver: SliverAppBar.large(
pinned: true,
floating: true,
centerTitle: false,
forceElevated: innerBoxIsScrolled,
title: Text(t.settings.settings),
),
body: ListView(
),
],
body: SafeArea(
top: false,
bottom: false,
child: Builder(
builder: (context) => CustomScrollView(
slivers: [
SliverOverlapInjector(
handle: NestedScrollView.sliverOverlapAbsorberHandleFor(context),
),
SliverList.list(
children: [
SectionLabel(label: t.settings.appSettings),
_SettingsTile(
@@ -123,6 +140,11 @@ class _List extends ConsumerWidget {
),
],
),
],
),
),
),
),
);
}
}
@@ -131,7 +153,6 @@ class _SettingsTile extends ConsumerWidget {
final String title;
final String subtitle;
final IconData icon;
final Widget? trailing;
final Widget screenToNavigate;
final int thisItem;
final bool twoColumns;
@@ -140,7 +161,6 @@ class _SettingsTile extends ConsumerWidget {
required this.title,
required this.subtitle,
required this.icon,
this.trailing,
required this.screenToNavigate,
required this.thisItem,
required this.twoColumns,
@@ -153,7 +173,6 @@ class _SettingsTile extends ConsumerWidget {
title: title,
subtitle: subtitle,
icon: icon,
trailing: trailing,
thisItem: thisItem,
selectedItem: ref.watch(settingsProvider).selectedScreen,
onTap: () {
@@ -166,7 +185,6 @@ class _SettingsTile extends ConsumerWidget {
title: title,
subtitle: subtitle,
icon: icon,
trailing: trailing,
onTap: () {
Navigator.of(context, rootNavigator: true).push(MaterialPageRoute(builder: (context) => screenToNavigate));
},