6 Commits

Author SHA1 Message Date
cad43c7664 added app settings api 2026-01-23 17:02:57 +01:00
5c44574949 created settings model 2026-01-23 16:49:26 +01:00
336be6cb72 visually changed settings page
Some checks failed
Flutter APK Build / Build Flutter APK (pull_request) Has been cancelled
2026-01-23 16:41:53 +01:00
214ae08bb9 fixed wrong return value 2026-01-23 16:41:41 +01:00
100b86d3f9 added list tile content padding 2026-01-23 16:41:29 +01:00
ff1b102047 fixed visual bug 2026-01-23 16:41:16 +01:00
8 changed files with 156 additions and 46 deletions

View File

@@ -7,6 +7,7 @@ import 'pages/collections_list_page.dart';
import 'pages/search_page.dart'; import 'pages/search_page.dart';
import 'pages/settings_page.dart'; import 'pages/settings_page.dart';
import 'service/search_provider.dart'; import 'service/search_provider.dart';
import 'service/settings_provider.dart';
import 'service/shared_link_provider.dart'; import 'service/shared_link_provider.dart';
import 'service/storage.dart'; import 'service/storage.dart';
import 'service/share_intent_service.dart'; import 'service/share_intent_service.dart';
@@ -20,6 +21,7 @@ void main() async {
providers: [ providers: [
ChangeNotifierProvider(create: (_) => SharedLinkProvider()), ChangeNotifierProvider(create: (_) => SharedLinkProvider()),
ChangeNotifierProvider(create: (_) => SearchProvider()), ChangeNotifierProvider(create: (_) => SearchProvider()),
ChangeNotifierProvider(create: (_) => SettingsProvider()),
], ],
child: const MapsBookmarks(), child: const MapsBookmarks(),
), ),

29
lib/model/settings.dart Normal file
View File

@@ -0,0 +1,29 @@
import '../assets/constants.dart' as constants;
class Settings {
final String exportDirectoryPath;
Settings._({required this.exportDirectoryPath});
Map<String, dynamic> toJson() {
return {'exportDirectoryPath': exportDirectoryPath};
}
factory Settings.fromJson(Map<String, dynamic> json) {
return Settings._(
exportDirectoryPath: json['exportDirectoryPath'] as String,
);
}
factory Settings.defaults() {
return Settings._(
exportDirectoryPath: constants.defaultAndroidExportDirectory,
);
}
Settings copyWith({String? exportDirectoryPath}) {
return Settings._(
exportDirectoryPath: exportDirectoryPath ?? this.exportDirectoryPath,
);
}
}

View File

@@ -17,55 +17,89 @@ class SettingsPage extends StatefulWidget {
} }
class _SettingsPageState extends State<SettingsPage> { class _SettingsPageState extends State<SettingsPage> {
bool storagePermissionIsGranted = false;
final tileSpacing = 16.0;
@override
void initState() {
PermissionService.storagePermissionStatus.then((value) {
storagePermissionIsGranted = value.isGranted;
if (context.mounted) setState(() {});
});
super.initState();
}
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
final titlePadding = Theme.of(context).listTileTheme.contentPadding!;
checkStoragePermission;
return Scaffold( return Scaffold(
appBar: AppBar(title: Text(AppLocalizations.of(context)!.settings)), appBar: AppBar(title: Text(AppLocalizations.of(context)!.settings)),
body: SizedBox( body: Center(
child: SizedBox(
width: MediaQuery.of(context).size.width * 0.9, width: MediaQuery.of(context).size.width * 0.9,
child: Column( child: Column(
crossAxisAlignment: CrossAxisAlignment.center, crossAxisAlignment: CrossAxisAlignment.start,
children: [ children: [
Text( Padding(
padding: titlePadding,
child: Text(
AppLocalizations.of(context)!.appData, AppLocalizations.of(context)!.appData,
style: Theme.of(context).textTheme.titleLarge, style: Theme.of(context).textTheme.titleLarge,
), ),
ElevatedButton(
onPressed: () => onActivateJsonImportPressed(),
child: Text(AppLocalizations.of(context)!.import),
), ),
ElevatedButton( SizedBox(height: tileSpacing),
onPressed: () => onActivateJsonExportPressed(), ListTile(
child: Text(AppLocalizations.of(context)!.export), title: Text('Grant storage permisson'),
subtitle: Text(
'For app-data settings to work, you need to grant the app permissions to manage internal storage.',
),
onTap: () => PermissionService.requestStoragePermission,
trailing: Icon(Icons.arrow_forward_ios_rounded),
enabled: !storagePermissionIsGranted,
),
SizedBox(height: tileSpacing),
ListTile(
title: Text(AppLocalizations.of(context)!.import),
subtitle: Text('Import app-data from a json file.'),
onTap: () => onActivateJsonImportPressed(),
trailing: Icon(Icons.arrow_forward_ios_rounded),
enabled: storagePermissionIsGranted,
),
SizedBox(height: tileSpacing),
ListTile(
title: Text(AppLocalizations.of(context)!.export),
subtitle: Text(
'Export app-data to a json file in the selected directory.',
),
onTap: () => onActivateJsonExportPressed(),
trailing: Icon(Icons.arrow_forward_ios_rounded),
enabled: storagePermissionIsGranted,
), ),
], ],
), ),
), ),
),
); );
} }
void onActivateJsonExportPressed() async { void onActivateJsonExportPressed() async {
if (!await checkStoragePermission) return; if (!await PermissionService.storagePermissionStatus.isGranted) return;
Storage.exportToJsonFile().then(showExportInfo); Storage.exportToJsonFile().then(showExportInfo);
} }
void onActivateJsonImportPressed() async { void onActivateJsonImportPressed() async {
if (!await checkStoragePermission) return; if (!await PermissionService.storagePermissionStatus.isGranted) return;
Storage.importFromJsonFile().then(showImportInfo); Storage.importFromJsonFile().then(showImportInfo);
} }
Future<bool> get checkStoragePermission async { Future<void> get checkStoragePermission async {
if (!(await PermissionService.requestStoragePermission).isGranted) { PermissionService.storagePermissionStatus.then((value) {
if (mounted) { storagePermissionIsGranted = value.isGranted;
Notifying.showErrorSnackbar( if (context.mounted && value.isGranted != storagePermissionIsGranted) {
context, setState(() {});
AppLocalizations.of(context)!.errorStoragePermisson,
);
return false;
} }
} });
return true;
} }
void showExportInfo(bool success) => Notifying.showSnackbar( void showExportInfo(bool success) => Notifying.showSnackbar(
@@ -73,7 +107,7 @@ class _SettingsPageState extends State<SettingsPage> {
text: success text: success
? AppLocalizations.of(context)!.exportSuccess ? AppLocalizations.of(context)!.exportSuccess
: AppLocalizations.of(context)!.exportFailed, : AppLocalizations.of(context)!.exportFailed,
isError: success, isError: !success,
); );
void showImportInfo(bool success) => Notifying.showSnackbar( void showImportInfo(bool success) => Notifying.showSnackbar(
@@ -81,6 +115,6 @@ class _SettingsPageState extends State<SettingsPage> {
text: success text: success
? AppLocalizations.of(context)!.importSuccess ? AppLocalizations.of(context)!.importSuccess
: AppLocalizations.of(context)!.importFailed, : AppLocalizations.of(context)!.importFailed,
isError: success, isError: !success,
); );
} }

View File

@@ -32,7 +32,7 @@ class JsonFileService {
} catch (e) { } catch (e) {
return false; return false;
} }
return false; return true;
} }
static Future<({List<Collection> collections, List<Bookmark> bookmarks})> static Future<({List<Collection> collections, List<Bookmark> bookmarks})>

View File

@@ -12,7 +12,7 @@ class Notifying {
ScaffoldMessenger.of(context).hideCurrentSnackBar(); ScaffoldMessenger.of(context).hideCurrentSnackBar();
ScaffoldMessenger.of(context).showSnackBar( ScaffoldMessenger.of(context).showSnackBar(
SnackBar( SnackBar(
backgroundColor: Theme.of(context).colorScheme.error, backgroundColor: isError ? Theme.of(context).colorScheme.error : null,
content: SizedBox( content: SizedBox(
height: 30, height: 30,
child: Row( child: Row(
@@ -29,7 +29,7 @@ class Notifying {
ScaffoldMessenger.of(context).hideCurrentSnackBar(), ScaffoldMessenger.of(context).hideCurrentSnackBar(),
icon: Icon( icon: Icon(
Icons.close_rounded, Icons.close_rounded,
color: Theme.of(context).colorScheme.onError, color: isError ? Theme.of(context).colorScheme.onError : null,
), ),
), ),
], ],

View File

@@ -0,0 +1,20 @@
import 'package:flutter/material.dart';
import '../model/settings.dart';
import 'storage.dart';
class SettingsProvider extends ChangeNotifier {
SettingsProvider() : _settings = Storage.loadSettings();
Settings _settings;
Settings get settings => _settings;
void setExportDirectoryPath(String path, {bool silent = false}) {
_settings = _settings.copyWith(exportDirectoryPath: path);
_saveSettings();
if (!silent) notifyListeners();
}
void _saveSettings() => Storage.saveSettings(_settings);
}

View File

@@ -4,22 +4,46 @@ import 'package:shared_preferences/shared_preferences.dart';
import '../model/bookmark.dart'; import '../model/bookmark.dart';
import '../model/collection.dart'; import '../model/collection.dart';
import '../model/settings.dart';
import 'json_file_service.dart'; import 'json_file_service.dart';
class Storage { class Storage {
static const String _bookmarksKey = 'bookmarks'; static const String _bookmarksKey = 'bookmarks';
static const String _collectionsKey = 'collections'; static const String _collectionsKey = 'collections';
static SharedPreferencesWithCache? _prefsWithCache; static SharedPreferencesWithCache? _prefsWithCache;
static const String _settingsKey = 'settings';
static const String _statsKey = 'stats'; static const String _statsKey = 'stats';
static Future<void> initialize() async { static Future<void> initialize() async {
_prefsWithCache = await SharedPreferencesWithCache.create( _prefsWithCache = await SharedPreferencesWithCache.create(
cacheOptions: const SharedPreferencesWithCacheOptions( cacheOptions: const SharedPreferencesWithCacheOptions(
allowList: <String>{_collectionsKey, _bookmarksKey, _statsKey}, allowList: <String>{
_collectionsKey,
_bookmarksKey,
_statsKey,
_settingsKey,
},
), ),
); );
} }
static Settings loadSettings() {
final jsonString = _prefs.getString(_settingsKey);
if (jsonString != null) {
final json = jsonDecode(jsonString) as Map<String, dynamic>;
return Settings.fromJson(json);
} else {
final settings = Settings.defaults();
saveSettings(settings);
return settings;
}
}
static Future<void> saveSettings(Settings settings) {
final json = jsonEncode(settings.toJson());
return _prefs.setString(_settingsKey, json);
}
static List<Collection> loadCollections() { static List<Collection> loadCollections() {
final jsonString = _prefs.getString(_collectionsKey) ?? '[]'; final jsonString = _prefs.getString(_collectionsKey) ?? '[]';
final jsonList = jsonDecode(jsonString) as List; final jsonList = jsonDecode(jsonString) as List;
@@ -156,15 +180,6 @@ class Storage {
await _prefs.setString(_statsKey, jsonEncode(stats)); await _prefs.setString(_statsKey, jsonEncode(stats));
} }
static SharedPreferencesWithCache get _prefs {
if (_prefsWithCache == null) {
throw StateError(
'BookmarkStorage not initialized. Call initialize() first.',
);
}
return _prefsWithCache!;
}
static Future<bool> exportToJsonFile() => JsonFileService.exportToJson( static Future<bool> exportToJsonFile() => JsonFileService.exportToJson(
collections: loadCollections(), collections: loadCollections(),
bookmarks: loadBookmarks(), bookmarks: loadBookmarks(),
@@ -180,4 +195,13 @@ class Storage {
} }
return false; return false;
} }
static SharedPreferencesWithCache get _prefs {
if (_prefsWithCache == null) {
throw StateError(
'BookmarkStorage not initialized. Call initialize() first.',
);
}
return _prefsWithCache!;
}
} }

View File

@@ -22,5 +22,6 @@ ThemeData _baseTheme(ColorScheme scheme) =>
shape: RoundedRectangleBorder( shape: RoundedRectangleBorder(
borderRadius: BorderRadiusGeometry.circular(12), borderRadius: BorderRadiusGeometry.circular(12),
), ),
contentPadding: EdgeInsetsDirectional.only(start: 16.0, end: 24.0),
), ),
); );