24 Commits

Author SHA1 Message Date
b3aee85a84 Merge pull request 'development' (#12) from development into main
All checks were successful
Flutter APK Build / Build Flutter APK (push) Successful in 6m42s
Reviewed-on: #12
2026-01-27 14:29:08 +01:00
a984269c15 Merge branch 'main' into development 2026-01-27 14:29:01 +01:00
600ff26016 added action bar for selected bookmark item 2026-01-27 14:16:43 +01:00
9c85d565a9 changed listtile theme 2026-01-27 13:52:14 +01:00
446ef9a57a fixed settings page not updating on storage permission granted
All checks were successful
Flutter APK Build / Build Flutter APK (push) Successful in 6m42s
2026-01-23 18:26:08 +01:00
6103d0b679 Merge branch 'development'
Some checks failed
Flutter APK Build / Build Flutter APK (push) Has been cancelled
2026-01-23 18:24:29 +01:00
5fd690197a fixed workflow running on pull request 2026-01-23 18:21:41 +01:00
31c0ade243 fixed settings page not refreshing on granting storage permission
Some checks failed
Flutter APK Build / Build Flutter APK (pull_request) Has been cancelled
2026-01-23 18:18:25 +01:00
8ec264cebe Merge pull request 'settings-feature' (#7) from settings-feature into main
Some checks failed
Flutter APK Build / Build Flutter APK (push) Has been cancelled
Reviewed-on: #7
2026-01-23 18:04:38 +01:00
83bfdf322b added persisted app settings
Some checks failed
Flutter APK Build / Build Flutter APK (pull_request) Has been cancelled
2026-01-23 18:03:46 +01:00
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
d51f3d4ba7 Merge pull request 'Data import and export' (#6) from development into main
All checks were successful
Flutter APK Build / Build Flutter APK (push) Successful in 7m54s
Reviewed-on: #6
2026-01-22 18:47:02 +01:00
b4016e6e5b localized dialog
All checks were successful
Flutter APK Build / Build Flutter APK (pull_request) Successful in 7m28s
2026-01-22 18:23:05 +01:00
eae4a853e9 removed unnecessary code 2026-01-22 18:20:08 +01:00
8eb4cadc85 Merge pull request 'Json export and import feature' (#5) from json-export-feature into development
Reviewed-on: #5
2026-01-22 18:12:01 +01:00
06a76afc42 Merge pull request 'Theme changes' (#4) from development into main
All checks were successful
Flutter APK Build / Build Flutter APK (push) Successful in 6m46s
Reviewed-on: #4
2026-01-21 16:38:03 +01:00
dca8c64555 Merge pull request 'small theme changes' (#3) from development into main
All checks were successful
Flutter APK Build / Build Flutter APK (push) Successful in 6m48s
Reviewed-on: #3
2026-01-21 15:05:11 +01:00
1aaea5f6d9 Merge pull request '[fix] Added basic locatlization' (#2) from development into main
All checks were successful
Flutter APK Build / Calculate Version (push) Successful in 13s
Flutter APK Build / Build Flutter APK (push) Successful in 6m34s
Flutter APK Build / Create Release (push) Has been skipped
Reviewed-on: #2
2026-01-21 14:12:41 +01:00
3a54a077f3 Merge pull request '[fix] added bookmark count number to collections page' (#1) from development into main
All checks were successful
Flutter APK Build / Calculate Version (push) Successful in 15s
Flutter APK Build / Build Flutter APK (push) Successful in 6m37s
Flutter APK Build / Create Release (push) Has been skipped
Reviewed-on: #1
2026-01-21 13:20:49 +01:00
14 changed files with 437 additions and 133 deletions

View File

@@ -4,9 +4,6 @@ on:
push:
branches:
- main
pull_request:
branches:
- main
workflow_dispatch:

View File

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

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

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

View File

@@ -9,6 +9,7 @@ import '../service/notifying.dart';
import '../service/shared_link_provider.dart';
import '../service/storage.dart';
import '../service/url_launcher.dart';
import '../widgets/collection_page_widgets/list_item_actions_widget.dart';
import '../widgets/create_bookmark_dialog.dart';
class CollectionPage extends StatefulWidget {
@@ -22,6 +23,7 @@ class CollectionPage extends StatefulWidget {
class _CollectionPageState extends State<CollectionPage> {
MapsLinkMetadata? selectedMapsLink;
int selectedBookmarkId = -1;
@override
void initState() {
@@ -52,29 +54,46 @@ class _CollectionPageState extends State<CollectionPage> {
).whenComplete(() => setState(() {}));
},
),
);
).whenComplete(deselectBookmark);
void onBookmarkSaved(Bookmark bookmark) {
Storage.addOrUpdateBookmark(bookmark);
setState(() {});
context.read<SharedLinkProvider>().removeCurrentMapsLink();
Provider.of<SharedLinkProvider>(
context,
listen: false,
).removeCurrentMapsLink();
}
Widget bookmarksListItemBuilder(BuildContext context, Bookmark bookmark) {
final selected = selectedBookmarkId == bookmark.id;
return ListTile(
title: Text(bookmark.name),
onTap: () => launchUrlFromString(bookmark.link).then((errorCode) {
selected: selected,
onTap: () {
if (selected) {
onCancelSelectionPressed();
setState(() {});
} else if (selectedBookmarkId != -1 && !selected) {
selectedBookmarkId = bookmark.id;
setState(() {});
} else {
launchUrlFromString(bookmark.link).then((errorCode) {
if (context.mounted) {
return Notifying.showUrlErrorSnackbar(context, errorCode);
}
});
}
},
onLongPress: () => setState(() {
selectedBookmarkId = bookmark.id;
}),
onLongPress: () => editBookmark(bookmark),
);
}
@override
Widget build(BuildContext context) {
SharedLinkProvider provider = context.watch<SharedLinkProvider>();
SharedLinkProvider provider = Provider.of<SharedLinkProvider>(context);
selectedMapsLink = provider.currentMapsLinkMetadata;
if (BookmarksProvider.selectedCollectionId == null) {
@@ -87,11 +106,18 @@ class _CollectionPageState extends State<CollectionPage> {
(c) => c.id == BookmarksProvider.selectedCollectionId,
);
return Scaffold(
return PopScope(
canPop: selectedBookmarkId == -1,
onPopInvokedWithResult: (didPop, result) {
if (didPop == false) deselectBookmark();
},
child: Scaffold(
appBar: AppBar(
title: selectedMapsLink != null
? Text(
AppLocalizations.of(context)!.addToCollection(collection.name),
AppLocalizations.of(
context,
)!.addToCollection(collection.name),
)
: Text(collection.name),
actions: [
@@ -102,6 +128,17 @@ class _CollectionPageState extends State<CollectionPage> {
),
],
),
bottomNavigationBar: selectedBookmarkId > 0
? ListItemActionsWidget(
onDeletePressed: onDeleteBookmarkPressed,
onCancelPressed: onCancelSelectionPressed,
onEditPressed: () => editBookmark(
bookmarks.firstWhere(
(element) => element.id == selectedBookmarkId,
),
),
)
: null,
body: Center(
child: SizedBox(
width: MediaQuery.of(context).size.width * 0.9,
@@ -117,6 +154,21 @@ class _CollectionPageState extends State<CollectionPage> {
onPressed: onAddButtonPressed,
child: Icon(selectedMapsLink != null ? Icons.save : Icons.add),
),
),
);
}
void onCancelSelectionPressed() => deselectBookmark();
void onDeleteBookmarkPressed() {
Storage.deleteBookmarkById(
selectedBookmarkId,
).whenComplete(() => setState(() {}));
deselectBookmark();
}
void deselectBookmark() {
selectedBookmarkId = -1;
setState(() {});
}
}

View File

@@ -87,7 +87,8 @@ class _CollectionsListPageState extends State<CollectionsListPage> {
final collections = Storage.loadCollections();
bookmarkCountMap = Storage.loadPerCollectionBookmarkCount();
addingNewBookmark =
context.watch<SharedLinkProvider>().currentMapsLinkMetadata != null;
Provider.of<SharedLinkProvider>(context).currentMapsLinkMetadata !=
null;
return Scaffold(
appBar: AppBar(
title: addingNewBookmark
@@ -96,8 +97,10 @@ class _CollectionsListPageState extends State<CollectionsListPage> {
actions: [
if (addingNewBookmark)
TextButton(
onPressed: () =>
context.read<SharedLinkProvider>().removeCurrentMapsLink(),
onPressed: () => Provider.of<SharedLinkProvider>(
context,
listen: false,
).removeCurrentMapsLink(),
child: Text(AppLocalizations.of(context)!.cancel),
)
else

View File

@@ -2,10 +2,12 @@ import 'dart:async';
import 'package:flutter/material.dart';
import 'package:permission_handler/permission_handler.dart';
import 'package:provider/provider.dart';
import '../l10n/app_localizations.dart';
import '../service/notifying.dart';
import '../service/permission_service.dart';
import '../service/settings_provider.dart';
import '../service/storage.dart';
class SettingsPage extends StatefulWidget {
@@ -17,55 +19,158 @@ class SettingsPage extends StatefulWidget {
}
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();
}
// TODO: Localize
@override
Widget build(BuildContext context) {
final titlePadding = Theme.of(context).listTileTheme.contentPadding!;
checkStoragePermission();
final alwaysExportEnabled = context
.watch<SettingsProvider>()
.settings
.alwaysExportEnabled;
return Scaffold(
appBar: AppBar(title: Text(AppLocalizations.of(context)!.settings)),
body: SizedBox(
body: Center(
child: SizedBox(
width: MediaQuery.of(context).size.width * 0.9,
child: Column(
crossAxisAlignment: CrossAxisAlignment.center,
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Text(
Padding(
padding: titlePadding,
child: Text(
AppLocalizations.of(context)!.appData,
style: Theme.of(context).textTheme.titleLarge,
),
ElevatedButton(
onPressed: () => onActivateJsonImportPressed(),
child: Text(AppLocalizations.of(context)!.import),
),
ElevatedButton(
onPressed: () => onActivateJsonExportPressed(),
child: Text(AppLocalizations.of(context)!.export),
SizedBox(height: tileSpacing),
ListTile(
title: Text('Grant storage permisson'),
subtitle: storagePermissionIsGranted
? Text('Storage permission granted')
: Text(
'For app-data settings to work, you need to grant the app permissions to manage internal storage.',
),
onTap: () => PermissionService.requestStoragePermission
.whenComplete(() => checkStoragePermission()),
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: () => onJsonImportPressed(),
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: () => onJsonExportPressed(),
trailing: Icon(Icons.arrow_forward_ios_rounded),
enabled: storagePermissionIsGranted,
),
SizedBox(height: tileSpacing),
ListTile(
title: Text('Always save to file'),
subtitle: Text(
'Export app data to a directory, every time you make a change',
),
onTap: () => onAlwaysSaveToJsonPressed(),
trailing: Checkbox(
value: alwaysExportEnabled,
onChanged: (value) {
onAlwaysSaveToJsonPressed();
},
),
enabled: storagePermissionIsGranted,
),
if (alwaysExportEnabled) SizedBox(height: tileSpacing),
if (alwaysExportEnabled)
ListTile(
title: Text('Change export directory'),
subtitle: Text(
context
.watch<SettingsProvider>()
.settings
.exportDirectoryPath,
),
onTap: () => onChangeExportDirectoryPressed(),
trailing: Icon(Icons.arrow_forward_ios_rounded),
enabled: storagePermissionIsGranted,
),
],
),
),
),
);
}
void onActivateJsonExportPressed() async {
if (!await checkStoragePermission) return;
void onJsonExportPressed() async {
if (!await checkStoragePermission()) return;
Storage.exportToJsonFile().then(showExportInfo);
}
void onActivateJsonImportPressed() async {
if (!await checkStoragePermission) return;
void onJsonImportPressed() async {
if (!await checkStoragePermission()) return;
Storage.importFromJsonFile().then(showImportInfo);
}
Future<bool> get checkStoragePermission async {
if (!(await PermissionService.requestStoragePermission).isGranted) {
if (mounted) {
Notifying.showErrorSnackbar(
context,
AppLocalizations.of(context)!.errorStoragePermisson,
void onAlwaysSaveToJsonPressed() async {
if (context.read<SettingsProvider>().settings.alwaysExportEnabled) {
context.read<SettingsProvider>().setExportDirectoryPath('', silent: true);
context.read<SettingsProvider>().setAlwaysExportEnabled(false);
return;
}
if (!await PermissionService.storagePermissionStatus.isGranted) return;
final dir = await Storage.selectDirectoryPath();
if (dir.isEmpty || !context.mounted) return;
// ignore: use_build_context_synchronously
context.read<SettingsProvider>().setExportDirectoryPath(dir, silent: true);
// ignore: use_build_context_synchronously
Storage.saveDataToFile().whenComplete(
// ignore: use_build_context_synchronously
() => context.read<SettingsProvider>().setAlwaysExportEnabled(true),
);
return false;
}
void onChangeExportDirectoryPressed() async {
if (!await PermissionService.storagePermissionStatus.isGranted) return;
final dir = await Storage.selectDirectoryPath();
if (dir.isEmpty || !context.mounted) return;
// ignore: use_build_context_synchronously
context.read<SettingsProvider>().setExportDirectoryPath(dir);
}
return true;
Future<bool> checkStoragePermission() async {
PermissionService.storagePermissionStatus.then((value) {
if (context.mounted && value.isGranted != storagePermissionIsGranted) {
storagePermissionIsGranted = value.isGranted;
setState(() {});
}
});
return storagePermissionIsGranted;
}
void showExportInfo(bool success) => Notifying.showSnackbar(
@@ -73,7 +178,7 @@ class _SettingsPageState extends State<SettingsPage> {
text: success
? AppLocalizations.of(context)!.exportSuccess
: AppLocalizations.of(context)!.exportFailed,
isError: success,
isError: !success,
);
void showImportInfo(bool success) => Notifying.showSnackbar(
@@ -81,6 +186,6 @@ class _SettingsPageState extends State<SettingsPage> {
text: success
? AppLocalizations.of(context)!.importSuccess
: AppLocalizations.of(context)!.importFailed,
isError: success,
isError: !success,
);
}

View File

@@ -14,25 +14,14 @@ class JsonFileService {
required List<Bookmark> bookmarks,
}) async {
try {
final dir = await _directoryPath;
final dir = await selectDirectoryPath();
if (dir.isEmpty) return false;
final data = {
'collections': collections.map((c) => c.toJson()).toList(),
'bookmarks': bookmarks.map((b) => b.toJson()).toList(),
};
final json = jsonEncode(data).codeUnits;
final file = XFile.fromData(
Uint8List.fromList(json),
mimeType: 'application/json',
name: constants.jsonFileName,
);
file.saveTo('$dir/${constants.jsonFileName}');
saveDataToFile(collections, bookmarks, dir);
} catch (e) {
return false;
}
return false;
return true;
}
static Future<({List<Collection> collections, List<Bookmark> bookmarks})>
@@ -65,7 +54,31 @@ class JsonFileService {
}
}
static Future<String> get _directoryPath async {
static Future<bool> saveDataToFile(
List<Collection> collections,
List<Bookmark> bookmarks,
String directory,
) async {
try {
final data = jsonEncode({
'collections': collections.map((c) => c.toJson()).toList(),
'bookmarks': bookmarks.map((b) => b.toJson()).toList(),
}).codeUnits;
final file = XFile.fromData(
Uint8List.fromList(data),
mimeType: 'application/json',
name: constants.jsonFileName,
);
file.saveTo('$directory/${constants.jsonFileName}');
} catch (e) {
return false;
}
return true;
}
static Future<String> selectDirectoryPath() async {
if (Platform.isAndroid) {
return await getDirectoryPath(
initialDirectory: constants.defaultAndroidExportDirectory,

View File

@@ -1,15 +1,9 @@
// service/maps_launcher_service.dart
import 'dart:io' show Platform;
import 'package:android_intent_plus/android_intent.dart';
class MapsLauncherService {
/// Opens a URL in Google Maps app
/// Falls back to browser if Maps app is not installed
static Future<bool> openInGoogleMaps(String url) async {
if (!Platform.isAndroid) {
// Handle iOS or other platforms if needed
return false;
}
if (!Platform.isAndroid) return false;
try {
// Try to open in Google Maps app
@@ -28,36 +22,16 @@ class MapsLauncherService {
await browserIntent.launch();
return true;
} catch (e) {
print('Failed to open maps link: $e');
return false;
}
}
}
/// Opens navigation to specific coordinates
static Future<bool> navigateToCoordinates(
String latitude,
String longitude,
) async {
final url = 'google.navigation:q=$latitude,$longitude';
return openInGoogleMaps(url);
}
/// Opens a search query in Google Maps
static Future<bool> searchInMaps(String query) async {
final encodedQuery = Uri.encodeComponent(query);
final url = 'geo:0,0?q=$encodedQuery';
return openInGoogleMaps(url);
}
/// Shares a Google Maps link or location via Android share sheet
static Future<bool> shareLocation({
required String text,
String? subject,
}) async {
if (!Platform.isAndroid) {
return false;
}
if (!Platform.isAndroid) return false;
try {
final intent = AndroidIntent(
@@ -72,7 +46,6 @@ class MapsLauncherService {
await intent.launch();
return true;
} catch (e) {
print('Failed to share location: $e');
return false;
}
}

View File

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

View File

@@ -0,0 +1,24 @@
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);
Storage.saveSettings(_settings);
if (!silent) notifyListeners();
}
void setAlwaysExportEnabled(bool enabled, {bool silent = false}) {
_settings = _settings.copyWith(alwaysExportEnabled: enabled);
Storage.saveSettings(_settings);
if (!silent) notifyListeners();
}
}

View File

@@ -4,22 +4,49 @@ import 'package:shared_preferences/shared_preferences.dart';
import '../model/bookmark.dart';
import '../model/collection.dart';
import '../model/settings.dart';
import 'json_file_service.dart';
class Storage {
static const String _bookmarksKey = 'bookmarks';
static const String _collectionsKey = 'collections';
static SharedPreferencesWithCache? _prefsWithCache;
static const String _settingsKey = 'settings';
static const String _statsKey = 'stats';
static Settings _currentSettings = Settings.defaults();
static Future<void> initialize() async {
_prefsWithCache = await SharedPreferencesWithCache.create(
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>;
_currentSettings = Settings.fromJson(json);
return _currentSettings;
} else {
final settings = Settings.defaults();
saveSettings(settings);
return settings;
}
}
static Future<void> saveSettings(Settings settings) {
final json = jsonEncode(settings.toJson());
_currentSettings = settings;
return _prefs.setString(_settingsKey, json);
}
static List<Collection> loadCollections() {
final jsonString = _prefs.getString(_collectionsKey) ?? '[]';
final jsonList = jsonDecode(jsonString) as List;
@@ -39,11 +66,13 @@ class Storage {
static Future<void> saveCollections(List<Collection> collections) async {
final jsonList = collections.map((c) => c.toJson()).toList();
await _prefs.setString(_collectionsKey, jsonEncode(jsonList));
if (_currentSettings.alwaysExportEnabled) saveDataToFile();
}
static Future<void> saveBookmarks(List<Bookmark> bookmarks) async {
final jsonList = bookmarks.map((b) => b.toJson()).toList();
await _prefs.setString(_bookmarksKey, jsonEncode(jsonList));
if (_currentSettings.alwaysExportEnabled) saveDataToFile();
}
static List<Bookmark> loadBookmarksForCollection(int collectionId) {
@@ -156,15 +185,6 @@ class Storage {
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(
collections: loadCollections(),
bookmarks: loadBookmarks(),
@@ -180,4 +200,22 @@ class Storage {
}
return false;
}
static Future<String> selectDirectoryPath() =>
JsonFileService.selectDirectoryPath();
static Future<bool> saveDataToFile() => JsonFileService.saveDataToFile(
loadCollections(),
loadBookmarks(),
_currentSettings.exportDirectoryPath,
);
static SharedPreferencesWithCache get _prefs {
if (_prefsWithCache == null) {
throw StateError(
'BookmarkStorage not initialized. Call initialize() first.',
);
}
return _prefsWithCache!;
}
}

View File

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

View File

@@ -0,0 +1,53 @@
import 'package:flutter/material.dart';
class ListItemActionsWidget extends StatelessWidget {
final VoidCallback _onDeletePressed;
final VoidCallback _onCancelPressed;
final VoidCallback _onEditPressed;
const ListItemActionsWidget({
super.key,
required void Function() onDeletePressed,
required void Function() onCancelPressed,
required void Function() onEditPressed,
}) : _onEditPressed = onEditPressed,
_onCancelPressed = onCancelPressed,
_onDeletePressed = onDeletePressed;
@override
Widget build(BuildContext context) {
return Container(
padding: EdgeInsetsGeometry.fromLTRB(
10,
10,
10,
MediaQuery.of(context).viewPadding.bottom,
),
color: Theme.of(context).colorScheme.surfaceContainer,
child: Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
crossAxisAlignment: CrossAxisAlignment.start,
children: [
IconButton(
onPressed: _onCancelPressed,
icon: const Icon(Icons.close_rounded),
),
Row(
mainAxisAlignment: MainAxisAlignment.end,
mainAxisSize: MainAxisSize.min,
children: [
IconButton(
onPressed: _onDeletePressed,
icon: const Icon(Icons.delete_forever_rounded),
),
IconButton(
onPressed: _onEditPressed,
icon: const Icon(Icons.edit_rounded),
),
],
),
],
),
);
}
}

View File

@@ -1,6 +1,8 @@
import 'package:flutter/material.dart' show TextButton, Theme;
import 'package:flutter/widgets.dart';
import '../../l10n/app_localizations.dart';
class EditDialogTitle extends StatelessWidget {
const EditDialogTitle({
super.key,
@@ -15,11 +17,10 @@ class EditDialogTitle extends StatelessWidget {
return Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
// TODO: Localize
if (dialogType == DialogType.bookmark)
Text('Create Bookmark')
Text(AppLocalizations.of(context)!.createBookmark)
else
Text('Create Collection'),
Text(AppLocalizations.of(context)!.createCollection),
if (onDeletePressed != null)
TextButton(
@@ -28,7 +29,7 @@ class EditDialogTitle extends StatelessWidget {
Navigator.of(context).pop();
},
child: Text(
'Delete',
AppLocalizations.of(context)!.delete,
style: TextStyle(color: Theme.of(context).colorScheme.error),
),
),