Skip to content
Merged
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
5 changes: 4 additions & 1 deletion analysis_options.yaml
Original file line number Diff line number Diff line change
@@ -1,9 +1,12 @@
include: package:flutter_lints/flutter.yaml
linter:
rules:
- always_use_package_imports
analyzer:
errors:
missing_enum_constant_in_switch: error
exhaustive_cases: error
exclude:
- lib/**.pb*.dart
- lib/data/*.g.dart
- test/**
- test/**
6 changes: 2 additions & 4 deletions lib/command/src/command_factory.dart
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,12 @@ import 'dart:ui';
import 'package:flutter_riverpod/flutter_riverpod.dart';
import 'package:paintroid/core/path_with_action_history.dart';

import 'implementation/command/graphic/draw_path_command.dart';
import 'package:paintroid/command/src/implementation/command/graphic/draw_path_command.dart';

class CommandFactory {
const CommandFactory();

static final provider = Provider((ref) => const CommandFactory());

DrawPathCommand createDrawPathCommand(
PathWithActionHistory path, Paint paint) =>
DrawPathCommand(path, paint);
DrawPathCommand createDrawPathCommand(PathWithActionHistory path, Paint paint) => DrawPathCommand(path, paint);
}
6 changes: 3 additions & 3 deletions lib/command/src/command_manager.dart
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ import 'dart:ui';

import 'package:flutter_riverpod/flutter_riverpod.dart';

import 'command.dart';
import 'graphic_command.dart';
import 'implementation/manager/sync_command_manager.dart';
import 'package:paintroid/command/src/command.dart';
import 'package:paintroid/command/src/graphic_command.dart';
import 'package:paintroid/command/src/implementation/manager/sync_command_manager.dart';

abstract class CommandManager {
static final provider = Provider<CommandManager>(
Expand Down
2 changes: 1 addition & 1 deletion lib/command/src/graphic_command.dart
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import 'dart:ui';

import 'command.dart';
import 'package:paintroid/command/src/command.dart';

abstract class GraphicCommand extends Command {
const GraphicCommand(this.paint);
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import 'dart:ui';

import '../../command.dart';
import '../../command_manager.dart';
import '../../graphic_command.dart';
import 'package:paintroid/command/src/command.dart';
import 'package:paintroid/command/src/command_manager.dart';
import 'package:paintroid/command/src/graphic_command.dart';

class SyncCommandManager implements CommandManager {
SyncCommandManager({required List<Command> commands}) : _history = commands;
Expand Down
2 changes: 1 addition & 1 deletion lib/data/project_dao.dart
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import 'package:floor/floor.dart';

import 'model/project.dart';
import 'package:paintroid/data/model/project.dart';

@dao
abstract class ProjectDAO {
Expand Down
4 changes: 2 additions & 2 deletions lib/io/src/service/image_service.dart
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ import 'package:oxidized/oxidized.dart';
import 'package:paintroid/core/failure.dart';
import 'package:paintroid/core/loggable_mixin.dart';

import '../failure/load_image_failure.dart';
import '../failure/save_image_failure.dart';
import 'package:paintroid/io/src/failure/load_image_failure.dart';
import 'package:paintroid/io/src/failure/save_image_failure.dart';

abstract class IImageService {
Future<Result<ui.Image, Failure>> import(Uint8List fileData);
Expand Down
4 changes: 2 additions & 2 deletions lib/io/src/ui/project_details_dialog.dart
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ import 'package:oxidized/oxidized.dart';
import 'package:paintroid/io/io.dart';
import 'package:paintroid/io/src/ui/delete_project_dialog.dart';

import '../../../data/model/project.dart';
import '../../../ui/color_schemes.dart';
import 'package:paintroid/data/model/project.dart';
import 'package:paintroid/ui/color_schemes.dart';

Future<bool?> showDetailsDialog(BuildContext context, Project project) =>
showGeneralDialog<bool>(
Expand Down
8 changes: 4 additions & 4 deletions lib/io/src/usecase/load_image_from_photo_library.dart
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@ import 'package:flutter_riverpod/flutter_riverpod.dart';
import 'package:oxidized/oxidized.dart';
import 'package:paintroid/core/failure.dart';

import '../failure/load_image_failure.dart';
import '../service/image_service.dart';
import '../service/permission_service.dart';
import '../service/photo_library_service.dart';
import 'package:paintroid/io/src/failure/load_image_failure.dart';
import 'package:paintroid/io/src/service/image_service.dart';
import 'package:paintroid/io/src/service/permission_service.dart';
import 'package:paintroid/io/src/service/photo_library_service.dart';

class LoadImageFromPhotoLibrary {
final IImageService imageService;
Expand Down
2 changes: 1 addition & 1 deletion lib/io/src/usecase/save_as_catrobat_image.dart
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import 'package:paintroid/io/io.dart'
IFileService,
SaveImageFailure;

import '../service/permission_service.dart';
import 'package:paintroid/io/src/service/permission_service.dart';

class SaveAsCatrobatImage with LoggableMixin {
final IFileService _fileService;
Expand Down
2 changes: 1 addition & 1 deletion lib/tool/src/brush_tool.dart
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import 'package:paintroid/command/command.dart';
import 'package:paintroid/core/graphic_factory.dart';
import 'package:paintroid/core/path_with_action_history.dart';

import 'tool.dart';
import 'package:paintroid/tool/src/tool.dart';

class BrushTool extends Tool with EquatableMixin {
BrushTool({
Expand Down
6 changes: 3 additions & 3 deletions lib/tool/src/tool_state.dart
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import 'package:flutter/foundation.dart';
import 'package:flutter_riverpod/flutter_riverpod.dart';

import 'brush_tool.dart';
import 'tool.dart';
import 'tool_state_notifier.dart';
import 'package:paintroid/tool/src/brush_tool.dart';
import 'package:paintroid/tool/src/tool.dart';
import 'package:paintroid/tool/src/tool_state_notifier.dart';

@immutable
class ToolState {
Expand Down
2 changes: 1 addition & 1 deletion lib/tool/src/tool_state_notifier.dart
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import 'dart:ui';

import 'package:flutter_riverpod/flutter_riverpod.dart';

import 'tool_state.dart';
import 'package:paintroid/tool/src/tool_state.dart';

class ToolStateNotifier extends StateNotifier<ToolState> {
ToolStateNotifier(super.state);
Expand Down
2 changes: 1 addition & 1 deletion lib/ui/bottom_control_navigation_bar.dart
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import 'package:flutter/material.dart';
import 'package:paintroid/core/app_localizations.dart';

import 'bottom_nav_bar_icon.dart';
import 'package:paintroid/ui/bottom_nav_bar_icon.dart';

class BottomControlNavigationBar extends StatelessWidget {
static const height = 64.0;
Expand Down
4 changes: 2 additions & 2 deletions lib/ui/bottom_nav_bar_container.dart
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import 'package:flutter/material.dart';

import 'color_schemes.dart';
import 'onboarding_page_bottom_nav_bar.dart';
import 'package:paintroid/ui/color_schemes.dart';
import 'package:paintroid/ui/onboarding_page_bottom_nav_bar.dart';

class BottomNavigationBarContainer extends StatelessWidget {
final List<BottomNavigationBarItem> navBarItems;
Expand Down
2 changes: 1 addition & 1 deletion lib/ui/io_handler.dart
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import 'package:paintroid/command/command.dart' show CommandManager;
import 'package:paintroid/io/io.dart';
import 'package:paintroid/workspace/workspace.dart';

import '../core/failure.dart';
import 'package:paintroid/core/failure.dart';

class IOHandler {
final Ref ref;
Expand Down
4 changes: 2 additions & 2 deletions lib/ui/landing_page.dart
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ import 'package:paintroid/ui/project_overflow_menu.dart';
import 'package:paintroid/workspace/src/state/canvas_state_notifier.dart';
import 'package:paintroid/workspace/src/state/workspace_state_notifier.dart';

import 'color_schemes.dart';
import 'io_handler.dart';
import 'package:paintroid/ui/color_schemes.dart';
import 'package:paintroid/ui/io_handler.dart';

class LandingPage extends ConsumerStatefulWidget {
final String title;
Expand Down
2 changes: 1 addition & 1 deletion lib/ui/onboarding_page.dart
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import 'package:paintroid/ui/onboarding_screens/screen5.dart';
import 'package:shared_preferences/shared_preferences.dart';
import 'package:smooth_page_indicator/smooth_page_indicator.dart';

import 'onboarding_screens/screen2.dart';
import 'package:paintroid/ui/onboarding_screens/screen2.dart';

class OnboardingPage extends StatefulWidget {
final Widget? navigateTo;
Expand Down
6 changes: 3 additions & 3 deletions lib/ui/overflow_menu.dart
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ import 'package:paintroid/core/app_localizations.dart';
import 'package:paintroid/ui/io_handler.dart';
import 'package:paintroid/workspace/workspace.dart';

import '../data/model/project.dart';
import '../data/project_database.dart';
import '../io/src/ui/save_image_dialog.dart';
import 'package:paintroid/data/model/project.dart';
import 'package:paintroid/data/project_database.dart';
import 'package:paintroid/io/src/ui/save_image_dialog.dart';

enum OverflowMenuOption {
fullscreen,
Expand Down
6 changes: 3 additions & 3 deletions lib/ui/pocket_paint.dart
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ import 'package:paintroid/io/io.dart';
import 'package:paintroid/ui/top_app_bar.dart';
import 'package:paintroid/workspace/workspace.dart';

import 'bottom_control_navigation_bar.dart';
import 'exit_fullscreen_button.dart';
import 'io_handler.dart';
import 'package:paintroid/ui/bottom_control_navigation_bar.dart';
import 'package:paintroid/ui/exit_fullscreen_button.dart';
import 'package:paintroid/ui/io_handler.dart';

class PocketPaint extends ConsumerStatefulWidget {
const PocketPaint({Key? key}) : super(key: key);
Expand Down
2 changes: 1 addition & 1 deletion lib/ui/project_overflow_menu.dart
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import 'package:paintroid/data/project_database.dart';
import 'package:paintroid/io/src/ui/delete_project_dialog.dart';
import 'package:paintroid/io/src/ui/project_details_dialog.dart';

import '../data/model/project.dart';
import 'package:paintroid/data/model/project.dart';

enum ProjectOverflowMenuOption {
deleteProject("Delete"),
Expand Down
2 changes: 1 addition & 1 deletion lib/ui/top_app_bar.dart
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import 'package:flutter/material.dart';

import 'overflow_menu.dart';
import 'package:paintroid/ui/overflow_menu.dart';

class TopAppBar extends AppBar {
TopAppBar({Key? key, required String title})
Expand Down