Skip to content
This repository was archived by the owner on Aug 14, 2023. It is now read-only.

chore: update character sizes to match rive files #402

Merged
merged 3 commits into from
Jan 20, 2023
Merged

chore: update character sizes to match rive files #402

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
679c683
chore: update character sizes to match rive files
Kirpal Jan 20, 2023
e07ccae
update rive files and character position
Kirpal Jan 20, 2023
5e323a4
Merge branch 'main' into chore/update-canvas-size
omartinma Jan 20, 2023
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
Binary file modified assets/animations/dash_desktop.riv
View file
Open in desktop
Binary file not shown.
Binary file modified assets/animations/dash_mobile.riv
View file
Open in desktop
Binary file not shown.
6 changes: 3 additions & 3 deletions lib/photo_booth/widgets/photobooth_body.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,11 +80,11 @@ class _PhotoboothBodyState extends State<PhotoboothBody> {
builder: (context, constraints) {
final double characterOffestY;
if (constraints.maxWidth > HoloboothBreakpoints.medium) {
characterOffestY = constraints.maxHeight / 6;
characterOffestY = constraints.maxHeight / 5;
} else if (constraints.maxWidth > HoloboothBreakpoints.small) {
characterOffestY = constraints.maxHeight / 10;
characterOffestY = constraints.maxHeight / 5;
} else {
characterOffestY = -300 + constraints.maxWidth / 1.15 / 6;
characterOffestY = -300 + constraints.maxWidth / 6;
}

return Stack(
Expand Down
35 changes: 24 additions & 11 deletions lib/rive/widgets/character_animation.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,17 +8,30 @@ import 'package:platform_helper/platform_helper.dart';
import 'package:rive/rive.dart';

class RiveCharacter {
RiveCharacter.dash([PlatformHelper? platformHelper])
: _riveImageSize = const Size(2400, 2100),
riveFilePath = (platformHelper ?? PlatformHelper()).isMobile
? Assets.animations.dashMobile.path
: Assets.animations.dashDesktop.path;

RiveCharacter.sparky([PlatformHelper? platformHelper])
: _riveImageSize = const Size(2500, 2100),
riveFilePath = (platformHelper ?? PlatformHelper()).isMobile
? Assets.animations.sparkyMobile.path
: Assets.animations.sparkyDesktop.path;
RiveCharacter._({
required this.riveFilePath,
required Size riveImageSize,
}) : _riveImageSize = riveImageSize;

factory RiveCharacter.dash([PlatformHelper? platformHelper]) {
final isMobile = (platformHelper ?? PlatformHelper()).isMobile;
return RiveCharacter._(
riveImageSize: isMobile ? const Size(1250, 1200) : const Size(2500, 2400),
riveFilePath: isMobile
? Assets.animations.dashMobile.path
: Assets.animations.dashDesktop.path,
);
}

factory RiveCharacter.sparky([PlatformHelper? platformHelper]) {
final isMobile = (platformHelper ?? PlatformHelper()).isMobile;
return RiveCharacter._(
riveImageSize: isMobile ? const Size(1400, 1150) : const Size(2800, 2300),
riveFilePath: isMobile
? Assets.animations.sparkyMobile.path
: Assets.animations.sparkyDesktop.path,
);
}

@visibleForTesting
final String riveFilePath;
Expand Down