Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions lib/core/commands/command_manager/command_manager.dart
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,15 @@ import 'package:paintroid/core/commands/command_implementation/graphic/color_cha
enum ActionType { UNDO, REDO }

class CommandManager {
CommandManager();

CommandManager({
this.onUndo,
});

final List<Command> _undoStack = [];
final List<Command> _redoStack = [];

final VoidCallback? onUndo;

void addGraphicCommand(GraphicCommand command) {
_undoStack.add(command);
}
Expand Down Expand Up @@ -92,6 +96,7 @@ class CommandManager {
void undo() {
final lastCommand = _undoStack.removeLast();
_redoStack.add(lastCommand);
onUndo?.call();
}

List<Command> get redoStack => _redoStack;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,18 @@
import 'package:riverpod_annotation/riverpod_annotation.dart';

import 'package:paintroid/core/commands/command_manager/command_manager.dart';
import 'package:paintroid/core/providers/state/workspace_state_notifier.dart';

part 'command_manager_provider.g.dart';

@Riverpod(keepAlive: true)
class CommandManagerProvider extends _$CommandManagerProvider {
@override
CommandManager build() {
return CommandManager();
return CommandManager(
onUndo: () {
ref.read(workspaceStateProvider.notifier).markUnsavedChanges();
},
);
}
}
124 changes: 110 additions & 14 deletions lib/core/providers/object/io_handler.dart
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,11 @@ import 'package:paintroid/ui/shared/dialogs/load_image_dialog.dart';
import 'package:paintroid/ui/shared/dialogs/save_image_dialog.dart';
import 'package:paintroid/ui/utils/toast_utils.dart';

import 'package:toast/toast.dart';
import 'package:paintroid/core/database/project_database.dart';
import 'package:paintroid/ui/shared/dialogs/overwrite_dialog.dart';
import 'package:paintroid/core/models/database/project.dart';

class IOHandler {
final Ref ref;

Expand All @@ -44,35 +49,74 @@ class IOHandler {
final isFileSaved = await workspaceStateNotifier
.performIOTask(() => _saveImageWith(imageMetaData));

if (!isFileSaved) {
workspaceStateNotifier.markUnsavedChanges();
return isFileSaved;
}

Future<bool> saveProject(BuildContext context) async {
ImageMetaData? imageData;

final project = ref.read(
workspaceStateProvider.select((state) => state.loadedProject),
);


if (project == null || project.name == '') {
imageData = await showSaveImageDialog(context, true);
} else {
workspaceStateNotifier.updateLastSavedCommandCount();
imageData = CatrobatImageMetaData(project.name);
}

return isFileSaved;
}
if (imageData == null) {
return false;
}

final catrobatImageData = imageData as CatrobatImageMetaData;

final db = await ref.read(ProjectDatabase.provider.future);
if (!context.mounted) return false;

if ((project == null || project.name == '') && !await _checkIfFileExistsAndConfirmOverwrite(context, catrobatImageData, db)) {
return false;
}

Future<File?> saveProject(ImageMetaData imageMetaData) async {
if (imageMetaData is! CatrobatImageMetaData) return null;
final workspaceStateNotifier = ref.read(workspaceStateProvider.notifier);
final savedFile = await workspaceStateNotifier
.performIOTask(() => _saveAsCatrobatImage(imageMetaData, true));
if (savedFile != null) workspaceStateNotifier.updateLastSavedCommandCount();
return savedFile;
final savedProject = await workspaceStateNotifier
.performIOTask(() => _saveAsCatrobatImage(catrobatImageData, true));
if (savedProject != null) {
String? imagePreview =
await getPreviewPath(catrobatImageData);
if (project == null || project.name == '') {
Project projectNew = Project(
name: catrobatImageData.name,
path: savedProject.path,
lastModified: DateTime.now(),
creationDate: DateTime.now(),
resolution: '',
format: catrobatImageData.format.name,
size: await savedProject.length(),
imagePreviewPath: imagePreview,
Comment on lines +92 to +97

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do we update these on update project?

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

for existing projects lastModified is updated when the project is opened, in landing_page.dart -> _loadProject line 106.

);

await db.projectDAO.insertProject(projectNew);
}
workspaceStateNotifier.updateLastSavedCommandCount();
return true;
}
return false;
}

/// Returns [true] if -
/// - There was no unsaved work, or
/// - The unsaved work was saved successfully
Future<bool> handleUnsavedChanges(BuildContext context, State state) async {
final workspaceStateNotifier = ref.read(workspaceStateProvider.notifier);
if (!workspaceStateNotifier.hasSavedLastWork) {
if (!workspaceStateNotifier.hasSavedLastWork || workspaceStateNotifier.hasUnsavedChanges) {
final shouldDiscard = await showDiscardChangesDialog(context);
if (shouldDiscard == null || !state.mounted) return false;
if (!shouldDiscard) {
if (!context.mounted) return false;
final didSave = await saveImage(context);

final didSave = await saveProject(context);
if (!didSave) return false;
}
}
Expand All @@ -81,7 +125,7 @@ class IOHandler {

/// Returns [true] if the image was loaded successfully
Future<bool> loadImage(
BuildContext context, State state, bool unsavedChanges) async {
BuildContext context, State state, { bool unsavedChanges = true }) async {
if (unsavedChanges) {
final shouldContinue = await handleUnsavedChanges(context, state);
if (!shouldContinue) return false;
Expand All @@ -105,6 +149,7 @@ class IOHandler {
Future<bool> newImage(BuildContext context, State state) async {
final shouldContinue = await handleUnsavedChanges(context, state);
if (!shouldContinue) return false;
ref.read(workspaceStateProvider.notifier).updateProject();
ref.read(canvasStateProvider.notifier)
..clearBackgroundImageAndResetDimensions()
..resetCanvasWithNewCommands([])
Expand Down Expand Up @@ -255,4 +300,55 @@ class IOHandler {
},
);
}

Future<bool> _showOverwriteDialog(BuildContext context) async {
return await showOverwriteDialog(context) ?? false;
}

Future<bool> _deleteFileAndAssociatedProject(CatrobatImageMetaData imageData,
ProjectDatabase db, IFileService fileService) async {
final fileName = '${imageData.name}.${imageData.format.extension}';

final result = await fileService.deleteFileInApplicationDirectory(fileName);
if (result is Err) {
Toast.show(
'Could not delete the file while overwriting!',
duration: Toast.lengthShort,
gravity: Toast.bottom,
);
return false;
}

final oldProject = await db.projectDAO.getProjectByName(imageData.name);
final oldProjectId = oldProject?.id;
if (oldProject != null && oldProjectId != null) {
await db.projectDAO.deleteProject(oldProjectId);
ref.invalidate(ProjectDatabase.provider);
}

return true;
}

Future<bool> _checkIfFileExistsAndConfirmOverwrite(
BuildContext context, CatrobatImageMetaData imageData, ProjectDatabase db) async {
final fileService = ref.watch(IFileService.provider);
final fileName = '${imageData.name}.${imageData.format.extension}';
final fileExists =
await fileService.checkIfFileExistsInApplicationDirectory(fileName);

if (context.mounted && fileExists) {
final overWriteCanceled = await _showOverwriteDialog(context);
if (overWriteCanceled) {
Toast.show(
'Project not saved!',
duration: Toast.lengthShort,
gravity: Toast.bottom,
);
return false;
}
return await _deleteFileAndAssociatedProject(imageData, db, fileService);
}

return true;
}
}
2 changes: 2 additions & 0 deletions lib/core/providers/state/workspace_state.dart
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import 'package:freezed_annotation/freezed_annotation.dart';
import 'package:paintroid/core/models/database/project.dart';

part 'workspace_state.freezed.dart';

Expand All @@ -10,5 +11,6 @@ class WorkspaceState with _$WorkspaceState {
required bool isPerformingIOTask,
required bool hasUnsavedChanges,
required int commandCountWhenLastSaved,
Project? loadedProject
}) = _WorkspaceState;
}
35 changes: 28 additions & 7 deletions lib/core/providers/state/workspace_state.freezed.dart

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 5 additions & 0 deletions lib/core/providers/state/workspace_state_notifier.dart
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import 'package:paintroid/core/commands/command_manager/command_manager_provider.dart';
import 'package:paintroid/core/providers/state/workspace_state.dart';
import 'package:riverpod_annotation/riverpod_annotation.dart';
import 'package:paintroid/core/models/database/project.dart';

part 'workspace_state_notifier.g.dart';

Expand All @@ -26,6 +27,10 @@ class WorkspaceStateProvider extends _$WorkspaceStateProvider {
state = state.copyWith(hasUnsavedChanges: true);
}

void updateProject({ Project? loadProject }) {
state = state.copyWith(loadedProject: loadProject);
}

void updateLastSavedCommandCount() {
state = state.copyWith(hasUnsavedChanges: false);
state = state.copyWith(
Expand Down
Loading
Loading