Skip to content

Commit 993a149

Browse files
LenkomotiveLenkomotive
committed
PAINTROID-785: Upgrade Project
- fix tests
1 parent 4b6a8f9 commit 993a149

File tree

16 files changed

+138
-118
lines changed

16 files changed

+138
-118
lines changed

‎lib/core/json_serialization/converter/paint_converter.dart‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
import 'dart:ui';
22

33
import 'package:json_annotation/json_annotation.dart';
4-
54
import 'package:paintroid/core/json_serialization/versioning/serializer_version.dart';
5+
import 'package:paintroid/core/utils/color_utils.dart';
66

77
class PaintConverter implements JsonConverter<Paint, Map<String, dynamic>> {
88
const PaintConverter();
@@ -34,7 +34,7 @@ class PaintConverter implements JsonConverter<Paint, Map<String, dynamic>> {
3434
Map<String, dynamic> json = <String, dynamic>{};
3535
if (SerializerVersion.PAINT_VERSION >= Version.v1) {
3636
json['version'] = SerializerVersion.PAINT_VERSION;
37-
json['color'] = paint.color.value;
37+
json['color'] = paint.color.toValue();
3838
json['strokeWidth'] = paint.strokeWidth;
3939
json['strokeCap'] = paint.strokeCap.index;
4040
json['isAntiAlias'] = paint.isAntiAlias;

‎lib/core/utils/color_utils.dart‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
import 'package:flutter/material.dart';
2+
3+
extension ColorUtils on Color {
4+
int toValue() {
5+
final alpha = (a * 255).toInt();
6+
final red = (r * 255).toInt();
7+
final green = (g * 255).toInt();
8+
final blue = (b * 255).toInt();
9+
return (alpha << 24) | (red << 16) | (green << 8) | blue;
10+
}
11+
}

‎lib/ui/pages/landing_page/landing_page.dart‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,6 @@
11
import 'package:flutter/material.dart';
2-
32
import 'package:flutter_riverpod/flutter_riverpod.dart';
43
import 'package:oxidized/oxidized.dart';
5-
import 'package:toast/toast.dart';
6-
74
import 'package:paintroid/core/database/project_database.dart';
85
import 'package:paintroid/core/models/database/project.dart';
96
import 'package:paintroid/core/providers/object/device_service.dart';
@@ -22,6 +19,7 @@ import 'package:paintroid/ui/pages/landing_page/components/project_overflow_menu
2219
import 'package:paintroid/ui/shared/icon_svg.dart';
2320
import 'package:paintroid/ui/theme/theme.dart';
2421
import 'package:paintroid/ui/utils/toast_utils.dart';
22+
import 'package:toast/toast.dart';
2523

2624
class LandingPage extends ConsumerStatefulWidget {
2725
final String title;
@@ -231,7 +229,9 @@ class _ProjectPreview extends StatelessWidget {
231229
child: ImagePreview(
232230
project: latestModifiedProject,
233231
imageService: imageService,
234-
color: PaintroidTheme.of(context).onSurfaceColor.withOpacity(0.5),
232+
color: PaintroidTheme.of(context)
233+
.onSurfaceColor
234+
.withValues(alpha: 0.5),
235235
),
236236
),
237237
),

‎lib/ui/pages/onboarding_page/onboarding_page.dart‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,14 @@
11
import 'package:flutter/material.dart';
22
import 'package:flutter/services.dart';
3-
4-
import 'package:shared_preferences/shared_preferences.dart';
5-
import 'package:smooth_page_indicator/smooth_page_indicator.dart';
6-
import 'package:toast/toast.dart';
7-
83
import 'package:paintroid/ui/pages/onboarding_page/screens/screen1.dart';
94
import 'package:paintroid/ui/pages/onboarding_page/screens/screen2.dart';
105
import 'package:paintroid/ui/pages/onboarding_page/screens/screen3.dart';
116
import 'package:paintroid/ui/pages/onboarding_page/screens/screen4.dart';
127
import 'package:paintroid/ui/pages/onboarding_page/screens/screen5.dart';
138
import 'package:paintroid/ui/theme/theme.dart';
9+
import 'package:shared_preferences/shared_preferences.dart';
10+
import 'package:smooth_page_indicator/smooth_page_indicator.dart';
11+
import 'package:toast/toast.dart';
1412

1513
class OnboardingPage extends StatefulWidget {
1614
final Widget? navigateTo;
@@ -114,8 +112,9 @@ class _OnboardingPageState extends State<OnboardingPage> {
114112
count: 5,
115113
controller: _controller,
116114
effect: SlideEffect(
117-
dotColor:
118-
PaintroidTheme.of(context).onSurfaceColor.withOpacity(0.2),
115+
dotColor: PaintroidTheme.of(context)
116+
.onSurfaceColor
117+
.withValues(alpha: 0.2),
119118
dotHeight: 8,
120119
dotWidth: 8,
121120
activeDotColor: PaintroidTheme.of(context).onSurfaceColor,

‎lib/ui/pages/workspace_page/workspace_page.dart‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ class _WorkspaceScreenState extends ConsumerState<WorkspacePage> {
4141
final workspaceStateNotifier = ref.watch(workspaceStateProvider.notifier);
4242
return PopScope(
4343
canPop: false,
44-
onPopInvoked: (didPop) async {
44+
onPopInvokedWithResult: (didPop, result) async {
4545
if (didPop) {
4646
return;
4747
}

‎lib/ui/shared/action_button.dart‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@ class ActionButton extends StatelessWidget {
2323
key: ValueKey(valueKey),
2424
icon: Icon(icon),
2525
onPressed: onPressed,
26-
disabledColor:
27-
PaintroidTheme.of(context).onSurfaceColor.withOpacity(0.4),
26+
disabledColor: PaintroidTheme.of(context).onSurfaceColor
27+
..withValues(alpha: 0.4),
2828
color: PaintroidTheme.of(context).onSurfaceColor,
2929
),
3030
);

‎lib/ui/theme/data/custom_colors.dart‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -44,20 +44,20 @@ abstract class CustomColors {
4444

4545
extension ToMaterialColor on Color {
4646
Map<int, Color> _toSwatch() => {
47-
50: withOpacity(0.1),
48-
100: withOpacity(0.2),
49-
200: withOpacity(0.3),
50-
300: withOpacity(0.4),
51-
400: withOpacity(0.5),
52-
500: withOpacity(0.6),
53-
600: withOpacity(0.7),
54-
700: withOpacity(0.8),
55-
800: withOpacity(0.9),
47+
50: withValues(alpha: 0.1),
48+
100: withValues(alpha: 0.2),
49+
200: withValues(alpha: 0.3),
50+
300: withValues(alpha: 0.4),
51+
400: withValues(alpha: 0.5),
52+
500: withValues(alpha: 0.6),
53+
600: withValues(alpha: 0.7),
54+
700: withValues(alpha: 0.8),
55+
800: withValues(alpha: 0.9),
5656
900: this,
5757
};
5858

5959
MaterialColor toMaterialColor() => MaterialColor(
60-
value,
60+
100,
6161
_toSwatch(),
6262
);
6363
}

‎lib/ui/theme/data/light_paintroid_theme_data.dart‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ class LightPaintroidThemeData extends PaintroidThemeData {
1616
foregroundColor: CustomColors.pureWhite,
1717
),
1818
sliderTheme: SliderThemeData(
19-
overlayColor: CustomColors.oceanBlue.withOpacity(.2),
19+
overlayColor: CustomColors.oceanBlue..withValues(alpha: 0.2),
2020
activeTrackColor: CustomColors.oceanBlue,
2121
inactiveTrackColor: Colors.grey,
2222
thumbColor: CustomColors.oceanBlue,

‎packages/colorpicker/lib/src/colorpicker.dart‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
import 'package:colorpicker/src/components/checkerboard_square.dart';
2-
import 'package:colorpicker/src/components/color_square.dart';
3-
import 'package:colorpicker/src/constants/colors.dart';
42
import 'package:colorpicker/src/components/color_comparison.dart';
3+
import 'package:colorpicker/src/components/color_square.dart';
54
import 'package:colorpicker/src/components/opacity_slider.dart';
5+
import 'package:colorpicker/src/constants/colors.dart';
66
import 'package:colorpicker/src/state/color_picker_state_provider.dart';
77
import 'package:flutter/material.dart';
88
import 'package:flutter_riverpod/flutter_riverpod.dart';
@@ -35,8 +35,8 @@ class ColorPicker extends ConsumerWidget {
3535
ColorComparison(
3636
currentColor: currentColor,
3737
newColor: colorPickerStateData.currentColor != null
38-
? colorPickerStateData.currentColor!.withOpacity(
39-
colorPickerStateData.currentOpacity,
38+
? colorPickerStateData.currentColor!.withValues(
39+
alpha: colorPickerStateData.currentOpacity,
4040
)
4141
: currentColor,
4242
),
@@ -79,7 +79,8 @@ class ColorPicker extends ConsumerWidget {
7979
onPressed: () {
8080
if (colorPickerStateData.currentColor != null) {
8181
onColorChanged(colorPickerStateData.currentColor!
82-
.withOpacity(colorPickerStateData.currentOpacity));
82+
.withValues(
83+
alpha: colorPickerStateData.currentOpacity));
8384
}
8485
Navigator.pop(context);
8586
},

‎packages/colorpicker/lib/src/components/opacity_slider.dart‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@ class OpacitySlider extends ConsumerWidget {
2828
decoration: BoxDecoration(
2929
gradient: LinearGradient(
3030
colors: [
31-
gradientColor.withOpacity(1.0),
32-
gradientColor.withOpacity(0.0),
31+
gradientColor..withValues(alpha: 1.0),
32+
gradientColor..withValues(alpha: 0.0),
3333
],
3434
begin: Alignment.centerLeft,
3535
end: Alignment.centerRight,

0 commit comments

Comments
 (0)