Skip to content
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

Jump to bottom

feat: multiple colors on the editor #45

Merged
merged 3 commits into from
Mar 5, 2024
Merged

feat: multiple colors on the editor #45

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
944f56a
multiple colors
erickzanardo Mar 4, 2024
a65b016
missing tests
erickzanardo Mar 4, 2024
fc17570
suggestions
erickzanardo Mar 4, 2024
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
52 changes: 38 additions & 14 deletions packages/flame_mini_sprite/example/pubspec.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ packages:
path: ".."
relative: true
source: path
version: "0.0.1+2"
version: "0.0.2"
flutter:
dependency: "direct main"
description: flutter
Expand All @@ -98,6 +98,30 @@ packages:
description: flutter
source: sdk
version: "0.0.0"
leak_tracker:
dependency: transitive
description:
name: leak_tracker
sha256: "78eb209deea09858f5269f5a5b02be4049535f568c07b275096836f01ea323fa"
url: "https://pub.dev"
source: hosted
version: "10.0.0"
leak_tracker_flutter_testing:
dependency: transitive
description:
name: leak_tracker_flutter_testing
sha256: b46c5e37c19120a8a01918cfaf293547f47269f7cb4b0058f21531c2465d6ef0
url: "https://pub.dev"
source: hosted
version: "2.0.1"
leak_tracker_testing:
dependency: transitive
description:
name: leak_tracker_testing
sha256: a597f72a664dbd293f3bfc51f9ba69816f84dcd403cdac7066cb3f6003f3ab47
url: "https://pub.dev"
source: hosted
version: "2.0.1"
lints:
dependency: transitive
description:
Expand All @@ -110,26 +134,26 @@ packages:
dependency: transitive
description:
name: matcher
sha256: "1803e76e6653768d64ed8ff2e1e67bea3ad4b923eb5c56a295c3e634bad5960e"
sha256: d2323aa2060500f906aa31a895b4030b6da3ebdcc5619d14ce1aada65cd161cb
url: "https://pub.dev"
source: hosted
version: "0.12.16"
version: "0.12.16+1"
material_color_utilities:
dependency: transitive
description:
name: material_color_utilities
sha256: "9528f2f296073ff54cb9fee677df673ace1218163c3bc7628093e7eed5203d41"
sha256: "0e0a020085b65b6083975e499759762399b4475f766c21668c4ecca34ea74e5a"
url: "https://pub.dev"
source: hosted
version: "0.5.0"
version: "0.8.0"
meta:
dependency: transitive
description:
name: meta
sha256: a6e590c838b18133bb482a2745ad77c5bb7715fb0451209e1a7567d416678b8e
sha256: d584fa6707a52763a52446f02cc621b077888fb63b93bbcb1143a7be5a0c0c04
url: "https://pub.dev"
source: hosted
version: "1.10.0"
version: "1.11.0"
mini_sprite:
dependency: "direct main"
description:
Expand All @@ -149,10 +173,10 @@ packages:
dependency: transitive
description:
name: path
sha256: "8829d8a55c13fc0e37127c29fedf290c102f4e40ae94ada574091fe0ff96c917"
sha256: "087ce49c3f0dc39180befefc60fdb4acd8f8620e5682fe2476afd0b3688bb4af"
url: "https://pub.dev"
source: hosted
version: "1.8.3"
version: "1.9.0"
sky_engine:
dependency: transitive
description: flutter
Expand Down Expand Up @@ -214,14 +238,14 @@ packages:
url: "https://pub.dev"
source: hosted
version: "2.1.4"
web:
vm_service:
dependency: transitive
description:
name: web
sha256: afe077240a270dcfd2aafe77602b4113645af95d0ad31128cc02bce5ac5d5152
name: vm_service
sha256: b3d56ff4341b8f182b96aceb2fa20e3dcb336b9f867bc0eafc0de10f1048e957
url: "https://pub.dev"
source: hosted
version: "0.3.0"
version: "13.0.0"
sdks:
dart: ">=3.2.0-194.0.dev <4.0.0"
dart: ">=3.2.0-0 <4.0.0"
flutter: ">=3.13.0"
58 changes: 37 additions & 21 deletions packages/flame_mini_sprite/pubspec.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,10 +77,10 @@ packages:
dependency: transitive
description:
name: coverage
sha256: "17cf9a839208acaed741b1f00ac87cd1fde00548198ba57205cca45c749cb379"
sha256: "8acabb8306b57a409bf4c83522065672ee13179297a6bb0cb9ead73948df7c76"
url: "https://pub.dev"
source: hosted
version: "1.3.2"
version: "1.7.2"
crypto:
dependency: transitive
description:
Expand Down Expand Up @@ -187,6 +187,30 @@ packages:
url: "https://pub.dev"
source: hosted
version: "0.6.4"
leak_tracker:
dependency: transitive
description:
name: leak_tracker
sha256: "78eb209deea09858f5269f5a5b02be4049535f568c07b275096836f01ea323fa"
url: "https://pub.dev"
source: hosted
version: "10.0.0"
leak_tracker_flutter_testing:
dependency: transitive
description:
name: leak_tracker_flutter_testing
sha256: b46c5e37c19120a8a01918cfaf293547f47269f7cb4b0058f21531c2465d6ef0
url: "https://pub.dev"
source: hosted
version: "2.0.1"
leak_tracker_testing:
dependency: transitive
description:
name: leak_tracker_testing
sha256: a597f72a664dbd293f3bfc51f9ba69816f84dcd403cdac7066cb3f6003f3ab47
url: "https://pub.dev"
source: hosted
version: "2.0.1"
logging:
dependency: transitive
description:
Expand All @@ -199,26 +223,26 @@ packages:
dependency: transitive
description:
name: matcher
sha256: "1803e76e6653768d64ed8ff2e1e67bea3ad4b923eb5c56a295c3e634bad5960e"
sha256: d2323aa2060500f906aa31a895b4030b6da3ebdcc5619d14ce1aada65cd161cb
url: "https://pub.dev"
source: hosted
version: "0.12.16"
version: "0.12.16+1"
material_color_utilities:
dependency: transitive
description:
name: material_color_utilities
sha256: "9528f2f296073ff54cb9fee677df673ace1218163c3bc7628093e7eed5203d41"
sha256: "0e0a020085b65b6083975e499759762399b4475f766c21668c4ecca34ea74e5a"
url: "https://pub.dev"
source: hosted
version: "0.5.0"
version: "0.8.0"
meta:
dependency: transitive
description:
name: meta
sha256: a6e590c838b18133bb482a2745ad77c5bb7715fb0451209e1a7567d416678b8e
sha256: d584fa6707a52763a52446f02cc621b077888fb63b93bbcb1143a7be5a0c0c04
url: "https://pub.dev"
source: hosted
version: "1.10.0"
version: "1.11.0"
mime:
dependency: transitive
description:
Expand Down Expand Up @@ -262,10 +286,10 @@ packages:
dependency: transitive
description:
name: path
sha256: "8829d8a55c13fc0e37127c29fedf290c102f4e40ae94ada574091fe0ff96c917"
sha256: "087ce49c3f0dc39180befefc60fdb4acd8f8620e5682fe2476afd0b3688bb4af"
url: "https://pub.dev"
source: hosted
version: "1.8.3"
version: "1.9.0"
pool:
dependency: transitive
description:
Expand Down Expand Up @@ -427,10 +451,10 @@ packages:
dependency: transitive
description:
name: vm_service
sha256: e686ae49284939abc06972e25f634ccdb5007d5664c4dfa1995002e8b6aa27a9
sha256: b3d56ff4341b8f182b96aceb2fa20e3dcb336b9f867bc0eafc0de10f1048e957
url: "https://pub.dev"
source: hosted
version: "8.3.0"
version: "13.0.0"
watcher:
dependency: transitive
description:
Expand All @@ -439,14 +463,6 @@ packages:
url: "https://pub.dev"
source: hosted
version: "1.0.1"
web:
dependency: transitive
description:
name: web
sha256: afe077240a270dcfd2aafe77602b4113645af95d0ad31128cc02bce5ac5d5152
url: "https://pub.dev"
source: hosted
version: "0.3.0"
web_socket_channel:
dependency: transitive
description:
Expand All @@ -472,5 +488,5 @@ packages:
source: hosted
version: "3.1.1"
sdks:
dart: ">=3.2.0-194.0.dev <4.0.0"
dart: ">=3.2.0-0 <4.0.0"
flutter: ">=3.13.0"
41 changes: 29 additions & 12 deletions packages/mini_sprite_editor/lib/config/cubit/config_cubit.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,16 +11,26 @@ class ConfigCubit extends HydratedCubit<ConfigState> {
emit(state.copyWith(themeMode: mode));
}

void setFilledColor(Color color) {
emit(state.copyWith(filledColor: color));
void setBackgroundColor(Color color) {
emit(state.copyWith(backgroundColor: color));
}

void setUnfilledColor(Color color) {
emit(state.copyWith(unfilledColor: color));
void setColor(int index, Color color) {
final colors = List<Color>.from(state.colors);
colors[index] = color;
emit(state.copyWith(colors: colors));
}

void setBackgroundColor(Color color) {
emit(state.copyWith(backgroundColor: color));
void addColor(Color color) {
emit(state.copyWith(colors: List<Color>.from(state.colors)..add(color)));
}

void removeColor(int index) {
emit(
state.copyWith(
colors: List<Color>.from(state.colors)..removeAt(index),
),
);
}

void setGridSize(int value) {
Expand All @@ -35,10 +45,20 @@ class ConfigCubit extends HydratedCubit<ConfigState> {
orElse: () => ThemeMode.system,
);

final oldFilledValue = json['filled_color'];
final oldUnfilledValue = json['unfilled_color'];

late List<Color> colors;

if (oldFilledValue != null && oldUnfilledValue != null) {
colors = [Color(oldFilledValue as int), Color(oldUnfilledValue as int)];
} else {
colors = (json['colors'] as List).map((e) => Color(e as int)).toList();
}

return ConfigState(
themeMode: themeMode,
filledColor: Color(json['filled_color'] as int),
unfilledColor: Color(json['unfilled_color'] as int),
colors: colors,
backgroundColor: Color(json['background_color'] as int),
mapGridSize: json['map_grid_size'] as int,
);
Expand All @@ -48,12 +68,9 @@ class ConfigCubit extends HydratedCubit<ConfigState> {
Map<String, dynamic>? toJson(ConfigState state) {
return <String, dynamic>{
'theme_mode': state.themeMode.name,
'filled_color': state.filledColor.value,
'unfilled_color': state.unfilledColor.value,
'colors': state.colors.map((e) => e.value).toList(),
'background_color': state.backgroundColor.value,
'map_grid_size': state.mapGridSize,
};
}

List<Color> palette() => [state.filledColor, state.unfilledColor];
}
20 changes: 7 additions & 13 deletions packages/mini_sprite_editor/lib/config/cubit/config_state.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,38 +3,33 @@ part of 'config_cubit.dart';
class ConfigState extends Equatable {
const ConfigState({
required this.themeMode,
required this.filledColor,
required this.unfilledColor,
required this.colors,
required this.backgroundColor,
required this.mapGridSize,
});

const ConfigState.initial()
: this(
themeMode: ThemeMode.system,
filledColor: Colors.white,
unfilledColor: Colors.transparent,
backgroundColor: Colors.black,
colors: const [Colors.black, Colors.white],
backgroundColor: Colors.transparent,
mapGridSize: 16,
);

final ThemeMode themeMode;
final Color filledColor;
final List<Color> colors;
final Color backgroundColor;
final Color unfilledColor;
final int mapGridSize;

ConfigState copyWith({
ThemeMode? themeMode,
Color? filledColor,
Color? unfilledColor,
List<Color>? colors,
Color? backgroundColor,
int? mapGridSize,
}) {
return ConfigState(
themeMode: themeMode ?? this.themeMode,
filledColor: filledColor ?? this.filledColor,
unfilledColor: unfilledColor ?? this.unfilledColor,
colors: colors ?? this.colors,
backgroundColor: backgroundColor ?? this.backgroundColor,
mapGridSize: mapGridSize ?? this.mapGridSize,
);
Expand All @@ -43,8 +38,7 @@ class ConfigState extends Equatable {
@override
List<Object?> get props => [
themeMode,
filledColor,
unfilledColor,
colors,
backgroundColor,
mapGridSize,
];
Expand Down
Loading
Loading