High performance self-hosted photo and video management solution.
TypeScript backup-toolfluttergoogle-photosgoogle-photos-alternativejavascriptmobile-appnestjsnodejsphoto-galleryphotosphotos-managementself-hostedsveltesveltekittypescriptvideos
refactor(mobile): convert `CropAspectRatio` to an enhanced enum (#31119)
Damiano Ferrarid6dc6dcc3b18
diff --git a/mobile/lib/constants/aspect_ratios.dart b/mobile/lib/constants/aspect_ratios.dartindex 49165e0913..14f02b2451 100644--- a/mobile/lib/constants/aspect_ratios.dart+++ b/mobile/lib/constants/aspect_ratios.dart@@ -1,48 +1,34 @@import 'package:flutter/material.dart';-import 'package:freezed_annotation/freezed_annotation.dart';-part 'aspect_ratios.freezed.dart';+enum CropAspectRatio {+ free(icon: Icons.crop_free),+ original(icon: Icons.crop_original),+ ratio1x1(numerator: 1, denominator: 1),+ ratio16x9(numerator: 16, denominator: 9),+ ratio3x2(numerator: 3, denominator: 2),+ ratio7x5(numerator: 7, denominator: 5),+ ratio4x3(numerator: 4, denominator: 3),+ ratio9x16(numerator: 9, denominator: 16),+ ratio2x3(numerator: 2, denominator: 3),+ ratio5x7(numerator: 5, denominator: 7),+ ratio3x4(numerator: 3, denominator: 4);++ final int? numerator;+ final int? denominator;+ final IconData? icon;++ const CropAspectRatio({this.numerator, this.denominator, this.icon});-@freezed-abstract class CropAspectRatio with _$CropAspectRatio {- const CropAspectRatio._();-- const factory CropAspectRatio({int? numerator, int? denominator, String? customLabel, IconData? icon}) =- _CropAspectRatio;-- static const free = CropAspectRatio(customLabel: "Free", icon: Icons.crop_free);- static const original = CropAspectRatio(customLabel: "Original", icon: Icons.crop_original);-- String get label {- return customLabel ?? (numerator != null && denominator != null ? '$numerator:$denominator' : 'Free');- }-- bool get hasFlippedVariant => numerator != denominator;double? get ratio => (numerator != null && denominator != null) ? numerator! / denominator! : null;-CropAspectRatio get flipped {- return CropAspectRatio(numerator: denominator, denominator: numerator, customLabel: customLabel, icon: icon);+ if (numerator == denominator) {+ return this;+ }+ for (final value in CropAspectRatio.values) {+ if (value.numerator == denominator && value.denominator == numerator) {+ return value;+ }+ }+ return this;}}--const aspectRatioFree = CropAspectRatio.free;-const aspectRatioOriginal = CropAspectRatio.original;--final aspectRatioPresets = [- CropAspectRatio.free,- CropAspectRatio.original,-- const CropAspectRatio(numerator: 1, denominator: 1),-- // lanscape- const CropAspectRatio(numerator: 16, denominator: 9),- const CropAspectRatio(numerator: 3, denominator: 2),- const CropAspectRatio(numerator: 7, denominator: 5),- const CropAspectRatio(numerator: 4, denominator: 3),-- // portrait- const CropAspectRatio(numerator: 16, denominator: 9).flipped,- const CropAspectRatio(numerator: 3, denominator: 2).flipped,- const CropAspectRatio(numerator: 7, denominator: 5).flipped,- const CropAspectRatio(numerator: 4, denominator: 3).flipped,-];diff --git a/mobile/lib/presentation/pages/edit/edit.page.dart b/mobile/lib/presentation/pages/edit/edit.page.dartindex 12d7cddf8f..39ad29748c 100644--- a/mobile/lib/presentation/pages/edit/edit.page.dart+++ b/mobile/lib/presentation/pages/edit/edit.page.dart@@ -183,7 +183,11 @@ class _AspectRatioButton extends StatelessWidget {: Icon(ratio.icon, color: color),onPressed: onPressed,),- Text(ratio.label, style: context.textTheme.displayMedium),+ Text(switch (ratio) {+ CropAspectRatio.free => context.t.crop_aspect_ratio_free,+ CropAspectRatio.original => context.t.crop_aspect_ratio_original,+ _ => '${ratio.numerator}:${ratio.denominator}',+ }, style: context.textTheme.displayMedium),],);}@@ -226,7 +230,7 @@ class _AspectRatioSelector extends ConsumerWidget {return SingleChildScrollView(scrollDirection: Axis.horizontal,child: Row(- children: aspectRatioPresets.map((entry) {+ children: CropAspectRatio.values.map((entry) {return Padding(padding: const EdgeInsets.symmetric(horizontal: 8.0),child: _AspectRatioButton(