From 2d1256eb273e3d3624e63866668bc91ef0f329e6 Mon Sep 17 00:00:00 2001 From: Abhishek Shroff Date: Tue, 24 Dec 2024 12:30:15 +0530 Subject: [PATCH] [client] Upgrade offtheline --- .../libphylum/actions/action_resource_copy.dart | 4 ++-- .../actions/action_resource_delete.dart | 4 ++-- .../libphylum/actions/action_resource_mkdir.dart | 4 ++-- .../libphylum/actions/action_resource_move.dart | 8 +++----- .../libphylum/actions/action_resource_share.dart | 8 +++----- .../actions/action_resource_upload.dart | 4 ++-- .../libphylum/actions/bookmark_add_action.dart | 4 ++-- .../actions/bookmark_remove_action.dart | 4 ++-- client/lib/libphylum/actions/deserializers.dart | 16 ++++++++-------- client/pubspec.lock | 4 ++-- client/pubspec.yaml | 4 ++-- 11 files changed, 30 insertions(+), 34 deletions(-) diff --git a/client/lib/libphylum/actions/action_resource_copy.dart b/client/lib/libphylum/actions/action_resource_copy.dart index a7262f1b..b1b44fe1 100644 --- a/client/lib/libphylum/actions/action_resource_copy.dart +++ b/client/lib/libphylum/actions/action_resource_copy.dart @@ -7,9 +7,9 @@ import 'package:phylum/libphylum/db/db.dart'; import 'package:phylum/libphylum/phylum_api_types.dart'; class ResourceCopyAction extends PhylumAction with JsonApiAction, ResourceCreateAction, ResourceBindAction { - static const actionName = 'resourceCopy'; + static const kActionName = 'resourceCopy'; @override - String get name => actionName; + String get actionName => kActionName; @override String get method => 'POST'; diff --git a/client/lib/libphylum/actions/action_resource_delete.dart b/client/lib/libphylum/actions/action_resource_delete.dart index 7cd6818c..a193eb8a 100644 --- a/client/lib/libphylum/actions/action_resource_delete.dart +++ b/client/lib/libphylum/actions/action_resource_delete.dart @@ -7,9 +7,9 @@ import 'package:phylum/libphylum/db/db.dart'; import 'package:phylum/libphylum/phylum_api_types.dart'; class ResourceDeleteAction extends PhylumAction with JsonApiAction { - static const actionName = 'resourceDelete'; + static const kActionName = 'resourceDelete'; @override - String get name => actionName; + String get actionName => kActionName; @override String get method => 'DELETE'; diff --git a/client/lib/libphylum/actions/action_resource_mkdir.dart b/client/lib/libphylum/actions/action_resource_mkdir.dart index 46ab1fbb..1c632a86 100644 --- a/client/lib/libphylum/actions/action_resource_mkdir.dart +++ b/client/lib/libphylum/actions/action_resource_mkdir.dart @@ -6,9 +6,9 @@ import 'package:phylum/libphylum/actions/action_resource_create.dart'; import 'package:phylum/libphylum/phylum_api_types.dart'; class ResourceMkdirAction extends PhylumAction with JsonApiAction, ResourceCreateAction, ResourceBindAction { - static const actionName = 'resourceMkdir'; + static const kActionName = 'resourceMkdir'; @override - String get name => actionName; + String get actionName => kActionName; @override String get method => 'POST'; diff --git a/client/lib/libphylum/actions/action_resource_move.dart b/client/lib/libphylum/actions/action_resource_move.dart index a6bfebba..d96b94c7 100644 --- a/client/lib/libphylum/actions/action_resource_move.dart +++ b/client/lib/libphylum/actions/action_resource_move.dart @@ -5,13 +5,12 @@ import 'package:offtheline/offtheline.dart'; import 'package:phylum/libphylum/actions/action_resource_bind.dart'; import 'package:phylum/libphylum/actions/action_resource_create.dart'; import 'package:phylum/libphylum/db/db.dart'; -import 'package:phylum/libphylum/phylum_account.dart'; import 'package:phylum/libphylum/phylum_api_types.dart'; class ResourceMoveAction extends PhylumAction with JsonApiAction, ResourceBindAction { - static const actionName = 'resourceMove'; + static const kActionName = 'resourceMove'; @override - String get name => actionName; + String get actionName => kActionName; @override String get method => 'POST'; @@ -65,8 +64,7 @@ class ResourceMoveAction extends PhylumAction with JsonApiAction, ResourceBindAc } @override - Future initialize(PhylumAccount account) { - super.initialize(account); + Future initialize() { return account.resourceRepository.trackServerData(resourceId); } diff --git a/client/lib/libphylum/actions/action_resource_share.dart b/client/lib/libphylum/actions/action_resource_share.dart index 7f4c8d90..3fc742d4 100644 --- a/client/lib/libphylum/actions/action_resource_share.dart +++ b/client/lib/libphylum/actions/action_resource_share.dart @@ -4,14 +4,13 @@ import 'dart:convert'; import 'package:drift/drift.dart'; import 'package:offtheline/offtheline.dart'; import 'package:phylum/libphylum/actions/action_resource_create.dart'; -import 'package:phylum/libphylum/phylum_account.dart'; import 'package:phylum/libphylum/phylum_api_types.dart'; import 'package:phylum/util/permissions.dart'; class ResourceShareAction extends PhylumAction with JsonApiAction { - static const actionName = 'resourceShare'; + static const kActionName = 'resourceShare'; @override - String get name => actionName; + String get actionName => kActionName; @override String get method => 'POST'; @@ -65,8 +64,7 @@ class ResourceShareAction extends PhylumAction with JsonApiAction { } @override - Future initialize(PhylumAccount account) { - super.initialize(account); + Future initialize() { return account.resourceRepository.trackServerData(resourceId); } diff --git a/client/lib/libphylum/actions/action_resource_upload.dart b/client/lib/libphylum/actions/action_resource_upload.dart index 037501f3..f609590f 100644 --- a/client/lib/libphylum/actions/action_resource_upload.dart +++ b/client/lib/libphylum/actions/action_resource_upload.dart @@ -11,9 +11,9 @@ import 'package:phylum/libphylum/phylum_api_types.dart'; import 'package:phylum/libphylum/util/uuid.dart'; class ResourceUploadAction extends PhylumAction with FileUploadApiAction, ResourceCreateAction, ResourceBindAction { - static const actionName = 'resourceUpload'; + static const kActionName = 'resourceUpload'; @override - String get name => actionName; + String get actionName => kActionName; @override String get method => 'PUT'; diff --git a/client/lib/libphylum/actions/bookmark_add_action.dart b/client/lib/libphylum/actions/bookmark_add_action.dart index 28070f5f..67cc1d50 100644 --- a/client/lib/libphylum/actions/bookmark_add_action.dart +++ b/client/lib/libphylum/actions/bookmark_add_action.dart @@ -6,9 +6,9 @@ import 'package:phylum/libphylum/db/db.dart'; import 'package:phylum/libphylum/phylum_api_types.dart'; class BookmarkAddAction extends PhylumAction with JsonApiAction, BookmarkAction { - static const actionName = 'bookmarkAdd'; + static const kActionName = 'bookmarkAdd'; @override - String get name => actionName; + String get actionName => kActionName; @override String get method => 'POST'; diff --git a/client/lib/libphylum/actions/bookmark_remove_action.dart b/client/lib/libphylum/actions/bookmark_remove_action.dart index ed621412..861151eb 100644 --- a/client/lib/libphylum/actions/bookmark_remove_action.dart +++ b/client/lib/libphylum/actions/bookmark_remove_action.dart @@ -7,9 +7,9 @@ import 'package:phylum/libphylum/db/db.dart'; import 'package:phylum/libphylum/phylum_api_types.dart'; class BookmarkRemoveAction extends PhylumAction with JsonApiAction, BookmarkAction { - static const actionName = 'bookmarkRemove'; + static const kActionName = 'bookmarkRemove'; @override - String get name => actionName; + String get actionName => kActionName; @override String get method => 'POST'; diff --git a/client/lib/libphylum/actions/deserializers.dart b/client/lib/libphylum/actions/deserializers.dart index 25c255d2..1a196478 100644 --- a/client/lib/libphylum/actions/deserializers.dart +++ b/client/lib/libphylum/actions/deserializers.dart @@ -8,12 +8,12 @@ import 'package:phylum/libphylum/actions/bookmark_add_action.dart'; import 'package:phylum/libphylum/actions/bookmark_remove_action.dart'; const actionDeserializers = { - BookmarkAddAction.actionName: BookmarkAddAction.fromMap, - BookmarkRemoveAction.actionName: BookmarkRemoveAction.fromMap, - ResourceCopyAction.actionName: ResourceCopyAction.fromMap, - ResourceDeleteAction.actionName: ResourceDeleteAction.fromMap, - ResourceMkdirAction.actionName: ResourceMkdirAction.fromMap, - ResourceMoveAction.actionName: ResourceMoveAction.fromMap, - ResourceShareAction.actionName: ResourceShareAction.fromMap, - ResourceUploadAction.actionName: ResourceUploadAction.fromMap, + BookmarkAddAction.kActionName: BookmarkAddAction.fromMap, + BookmarkRemoveAction.kActionName: BookmarkRemoveAction.fromMap, + ResourceCopyAction.kActionName: ResourceCopyAction.fromMap, + ResourceDeleteAction.kActionName: ResourceDeleteAction.fromMap, + ResourceMkdirAction.kActionName: ResourceMkdirAction.fromMap, + ResourceMoveAction.kActionName: ResourceMoveAction.fromMap, + ResourceShareAction.kActionName: ResourceShareAction.fromMap, + ResourceUploadAction.kActionName: ResourceUploadAction.fromMap, }; diff --git a/client/pubspec.lock b/client/pubspec.lock index 1f1f17c4..51207a0c 100644 --- a/client/pubspec.lock +++ b/client/pubspec.lock @@ -585,8 +585,8 @@ packages: dependency: "direct main" description: path: "." - ref: "2c70c1c6b6a368b4ea17b7222d7698ee3cbbb1dc" - resolved-ref: "2c70c1c6b6a368b4ea17b7222d7698ee3cbbb1dc" + ref: "5e418dd95d1803a501936883ab6f21ded1867da8" + resolved-ref: "5e418dd95d1803a501936883ab6f21ded1867da8" url: "https://codeberg.org/shroff/offtheline.git" source: git version: "0.16.0" diff --git a/client/pubspec.yaml b/client/pubspec.yaml index a95ea389..490bdc8f 100644 --- a/client/pubspec.yaml +++ b/client/pubspec.yaml @@ -23,7 +23,7 @@ dependencies: offtheline: git: url: https://codeberg.org/shroff/offtheline.git - ref: 2c70c1c6b6a368b4ea17b7222d7698ee3cbbb1dc + ref: 5e418dd95d1803a501936883ab6f21ded1867da8 open_file: path: path_provider: @@ -41,6 +41,6 @@ dev_dependencies: flutter_lints: ^5.0.0 drift_dev: ^2.19.1 build_runner: ^2.4.12 - + flutter: uses-material-design: true \ No newline at end of file