Introduce enhanced enums with instance variables and generative const…

…ructors
droibit · Sep 12, 2023 · a976f33 · a976f33
1 parent 095b1bb
commit a976f33
Show file tree

Hide file tree

Showing 2 changed files with 33 additions and 56 deletions.
diff --git a/flutter_custom_tabs_platform_interface/lib/src/custom_tabs_options.dart b/flutter_custom_tabs_platform_interface/lib/src/custom_tabs_options.dart
@@ -118,6 +118,7 @@ class CustomTabsAnimation {
   /// Exit animation for the custom tab.
   final String? endExit;
 
+  @internal
   Map<String, String> toMap() {
     final dest = <String, String>{};
     if (startEnter != null && startExit != null) {
@@ -133,17 +134,13 @@ class CustomTabsAnimation {
 }
 
 /// The position of the close button of Custom Tabs.
-enum CustomTabsCloseButtonPosition { start, end }
-
-extension CustomTabsCloseButtonPositionRawValue
-    on CustomTabsCloseButtonPosition {
-  @visibleForTesting
-  int get rawValue {
-    switch (this) {
-      case CustomTabsCloseButtonPosition.start:
-        return 1;
-      case CustomTabsCloseButtonPosition.end:
-        return 2;
-    }
-  }
-}
+enum CustomTabsCloseButtonPosition {
+  start(1),
+  end(2);
+
+  @internal
+  const CustomTabsCloseButtonPosition(this.rawValue);
+
+  @internal
+  final int rawValue;
+}
diff --git a/flutter_custom_tabs_platform_interface/lib/src/safari_view_controller_options.dart b/flutter_custom_tabs_platform_interface/lib/src/safari_view_controller_options.dart
@@ -80,21 +80,16 @@ class SafariViewControllerOptions {
 ///
 /// * [SFSafariViewController.DismissButtonStyle](https://developer.apple.com/documentation/safariservices/sfsafariviewcontroller/dismissbuttonstyle)
 ///
-enum SafariViewControllerDismissButtonStyle { done, close, cancel }
-
-extension SafariViewControllerDismissButtonStyleRawValue
-    on SafariViewControllerDismissButtonStyle {
-  @visibleForTesting
-  int get rawValue {
-    switch (this) {
-      case SafariViewControllerDismissButtonStyle.done:
-        return 0;
-      case SafariViewControllerDismissButtonStyle.close:
-        return 1;
-      case SafariViewControllerDismissButtonStyle.cancel:
-        return 2;
-    }
-  }
+enum SafariViewControllerDismissButtonStyle {
+  done(0),
+  close(1),
+  cancel(2);
+
+  @internal
+  const SafariViewControllerDismissButtonStyle(this.rawValue);
+
+  @internal
+  final int rawValue;
 }
 
 /// A view presentation style in which the presented view covers the screen.
@@ -106,41 +101,26 @@ extension SafariViewControllerDismissButtonStyleRawValue
 enum ViewControllerModalPresentationStyle {
   /// The default presentation style chosen by the system.
   /// - Availability: iOS13.0+
-  automatic,
+  automatic(-2),
 
   /// A presentation style that indicates no adaptations should be made.
-  none,
+  none(-1),
 
   /// A presentation style in which the presented view covers the screen.
-  fullScreen,
+  fullScreen(0),
 
   /// A presentation style that partially covers the underlying content.
-  pageSheet,
+  pageSheet(1),
 
   /// A presentation style that displays the content centered in the screen.
-  formSheet,
+  formSheet(2),
 
   /// A view presentation style in which the presented view covers the screen.
-  overFullScreen
-}
+  overFullScreen(5);
 
-extension ViewControllerModalPresentationStyleRawValue
-    on ViewControllerModalPresentationStyle {
-  @visibleForTesting
-  int get rawValue {
-    switch (this) {
-      case ViewControllerModalPresentationStyle.automatic:
-        return -2;
-      case ViewControllerModalPresentationStyle.none:
-        return -1;
-      case ViewControllerModalPresentationStyle.fullScreen:
-        return 0;
-      case ViewControllerModalPresentationStyle.pageSheet:
-        return 1;
-      case ViewControllerModalPresentationStyle.formSheet:
-        return 2;
-      case ViewControllerModalPresentationStyle.overFullScreen:
-        return 5;
-    }
-  }
-}
+  @internal
+  const ViewControllerModalPresentationStyle(this.rawValue);
+
+  @internal
+  final int rawValue;
+}