Skip to content

PAINTROID-737 Add pipette tool to the colorpicker package #138

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Amit-Matth wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

PAINTROID-737 Add pipette tool to the colorpicker package #138

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 3 additions & 1 deletion lib/ui/pages/workspace_page/components/bottom_bar/bottom_nav_bar.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import 'package:colorpicker/colorpicker.dart';

import 'package:paintroid/core/enums/tool_types.dart';
import 'package:paintroid/core/localization/app_localizations.dart';
import 'package:paintroid/core/providers/state/canvas_state_provider.dart';
import 'package:paintroid/core/providers/state/paint_provider.dart';
import 'package:paintroid/core/providers/state/tool_options_visibility_state_provider.dart';
import 'package:paintroid/core/providers/state/toolbox_state_provider.dart';
Expand Down Expand Up @@ -139,14 +140,15 @@ void _showColorPicker(BuildContext context, WidgetRef ref) {
if (initialColor.a == 0) {
initialColor = initialColor.withValues(alpha: 1.0);
}

final snapshot = ref.read(canvasStateProvider).cachedImage;
showDialog(
context: context,
builder: (BuildContext dialogContext) {
return Dialog(
clipBehavior: Clip.antiAlias,
child: ColorPicker(
currentColor: initialColor,
snapshotImage: snapshot,
onColorChanged: (newColor) {
ref.read(paintProvider.notifier).updateColor(newColor);
},
Expand Down
38 changes: 35 additions & 3 deletions packages/colorpicker/lib/src/colorpicker.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
import 'dart:ui' as ui;
import 'package:flutter/material.dart';

import 'package:colorpicker/src/pages/pipette_page.dart';
import 'package:colorpicker/src/components/pipette_tool_button.dart';
import 'package:colorpicker/src/components/color_comparison.dart';
import 'package:colorpicker/src/components/opacity_slider.dart';
import 'package:colorpicker/src/components/recent_colors_section_widget.dart';
Expand All @@ -16,10 +19,12 @@ class ColorPicker extends ConsumerStatefulWidget {
super.key,
required this.currentColor,
required this.onColorChanged,
this.snapshotImage,
});

final Color currentColor;
final void Function(Color) onColorChanged;
final ui.Image? snapshotImage;

@override
ConsumerState<ColorPicker> createState() => _ColorPickerState();
Expand Down Expand Up @@ -112,9 +117,36 @@ class _ColorPickerState extends ConsumerState<ColorPicker>
child: Column(
mainAxisSize: MainAxisSize.min,
children: [
ColorComparison(
currentColor: widget.currentColor,
newColor: displayColor,
Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
crossAxisAlignment: CrossAxisAlignment.start,
children: [
ColorComparison(
currentColor: widget.currentColor,
newColor: displayColor,
),
Padding(
padding: const EdgeInsets.only(top: 0.0),
child: PipetteToolButton(
onTap: () async {
if (widget.snapshotImage != null) {
final pickedColor = await Navigator.push<Color>(
context,
MaterialPageRoute(
builder: (context) => PipettePage(
snapshot: widget.snapshotImage!,
initialColor: displayColor,
),
),
);
if (pickedColor != null) {
_handleColorAndOpacityChange(pickedColor);
}
}
},
),
),
],
),
RecentColorsSectionWidget(
onColorSelected: _handleColorAndOpacityChange),
Expand Down
50 changes: 50 additions & 0 deletions packages/colorpicker/lib/src/components/pipette_tool_button.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
import 'package:flutter/material.dart';

class PipetteToolButton extends StatelessWidget {
const PipetteToolButton({super.key, this.onTap});

final VoidCallback? onTap;

@override
Widget build(BuildContext context) {
return InkWell(
onTap: onTap,
child: Container(
height: 50.0,
width: 148.0,
padding: const EdgeInsets.symmetric(horizontal: 10.0, vertical: 4.0),
decoration: BoxDecoration(
color: const Color.fromARGB(255, 204, 204, 204),
borderRadius: const BorderRadius.all(Radius.circular(6.0)),
boxShadow: [
BoxShadow(
color: Colors.black.withValues(alpha: 0.2),
offset: const Offset(0, 1),
blurRadius: 1.0,
),
],
),
child: const Row(
mainAxisAlignment: MainAxisAlignment.center,
children: [
Spacer(),
Icon(
Icons.auto_fix_normal,
color: Colors.black,
size: 20,
),
Spacer(),
Text(
'PIPETTE',
style: TextStyle(
color: Colors.black,
fontWeight: FontWeight.w500,
),
),
Spacer(),
],
),
),
);
}
}
41 changes: 41 additions & 0 deletions packages/colorpicker/lib/src/components/top_bar.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
import 'package:colorpicker/src/constants/colorpicker_colors.dart';
import 'package:flutter/material.dart';
import 'package:flutter_riverpod/flutter_riverpod.dart';

class TopBar extends ConsumerWidget {
const TopBar({
super.key,
required this.color,
});

final Color color;

@override
Widget build(BuildContext context, WidgetRef ref) {
return AppBar(
backgroundColor: ColorPickerColors.oceanBlue,
title: Container(
height: 36.0,
width: 36.0,
decoration: BoxDecoration(
color: color,
borderRadius: BorderRadius.circular(2.0),
border: Border.all(
color: Colors.white,
width: 0.4,
),
),
),
centerTitle: true,
actions: [
IconButton(
icon: const Icon(Icons.check),
onPressed: () {
Navigator.pop(context, true);
},
),
const SizedBox(width: 10.0),
],
);
}
}
Loading
Loading