Merge pull request 'Data import and export' (#6) from development into main

Reviewed-on: #6

.gitea/workflows/android_build.yml

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

lib/pages/settings_page.dart

@@ -17,90 +17,55 @@ 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();
-  }
-
   @override
   Widget build(BuildContext context) {
-    final titlePadding = Theme.of(context).listTileTheme.contentPadding!;
-    checkStoragePermission();
     return Scaffold(
       appBar: AppBar(title: Text(AppLocalizations.of(context)!.settings)),
-      body: Center(
+      body: SizedBox(
-        child: SizedBox(
         width: MediaQuery.of(context).size.width * 0.9,
         child: Column(
-            crossAxisAlignment: CrossAxisAlignment.start,
+          crossAxisAlignment: CrossAxisAlignment.center,
           children: [
-              Padding(
+            Text(
-                padding: titlePadding,
-                child: Text(
               AppLocalizations.of(context)!.appData,
               style: Theme.of(context).textTheme.titleLarge,
             ),
+            ElevatedButton(
+              onPressed: () => onActivateJsonImportPressed(),
+              child: Text(AppLocalizations.of(context)!.import),
             ),
-              SizedBox(height: tileSpacing),
+            ElevatedButton(
-              ListTile(
+              onPressed: () => onActivateJsonExportPressed(),
-                title: Text('Grant storage permisson'),
+              child: Text(AppLocalizations.of(context)!.export),
-                subtitle: 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: () => 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 {
-    if (!await PermissionService.storagePermissionStatus.isGranted) return;
+    if (!await checkStoragePermission) return;
+
     Storage.exportToJsonFile().then(showExportInfo);
   }
 
   void onActivateJsonImportPressed() async {
-    if (!await PermissionService.storagePermissionStatus.isGranted) return;
+    if (!await checkStoragePermission) return;
     Storage.importFromJsonFile().then(showImportInfo);
   }
 
-  Future<void> checkStoragePermission() async {
+  Future<bool> get checkStoragePermission async {
-    PermissionService.storagePermissionStatus.then((value) {
+    if (!(await PermissionService.requestStoragePermission).isGranted) {
-      storagePermissionIsGranted = value.isGranted;
+      if (mounted) {
-      if (context.mounted && value.isGranted != storagePermissionIsGranted) {
+        Notifying.showErrorSnackbar(
-        setState(() {});
+          context,
+          AppLocalizations.of(context)!.errorStoragePermisson,
+        );
+        return false;
       }
-    });
+    }
+    return true;
   }
 
   void showExportInfo(bool success) => Notifying.showSnackbar(
@@ -108,7 +73,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(
@@ -116,6 +81,6 @@ class _SettingsPageState extends State<SettingsPage> {
     text: success
         ? AppLocalizations.of(context)!.importSuccess
         : AppLocalizations.of(context)!.importFailed,
-    isError: !success,
+    isError: success,
   );
 }

lib/service/json_file_service.dart

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

lib/service/notifying.dart

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

lib/theme.dart

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