فهرست منبع

Moved commonly used user defined function types to a file

ashilkn 2 سال پیش
والد
کامیت
d9b28b43b2

+ 1 - 2
lib/core/error-reporting/super_logging.dart

@@ -14,10 +14,9 @@ import 'package:package_info_plus/package_info_plus.dart';
 import 'package:path/path.dart';
 import 'package:path/path.dart';
 import 'package:path_provider/path_provider.dart';
 import 'package:path_provider/path_provider.dart';
 import 'package:photos/core/error-reporting/tunneled_transport.dart';
 import 'package:photos/core/error-reporting/tunneled_transport.dart';
+import 'package:photos/models/typedefs.dart';
 import 'package:sentry_flutter/sentry_flutter.dart';
 import 'package:sentry_flutter/sentry_flutter.dart';
 
 
-typedef FutureOrVoidCallback = FutureOr<void> Function();
-
 extension SuperString on String {
 extension SuperString on String {
   Iterable<String> chunked(int chunkSize) sync* {
   Iterable<String> chunked(int chunkSize) sync* {
     var start = 0;
     var start = 0;

+ 6 - 0
lib/models/typedefs.dart

@@ -0,0 +1,6 @@
+import 'dart:async';
+
+typedef FutureVoidCallback = Future<void> Function();
+typedef BoolCallBack = bool Function();
+typedef FutureVoidCallbackParamStr = Future<void> Function(String);
+typedef FutureOrVoidCallback = FutureOr<void> Function();

+ 1 - 2
lib/ui/components/button_widget.dart

@@ -1,6 +1,7 @@
 import 'package:flutter/material.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/scheduler.dart';
 import 'package:flutter/scheduler.dart';
 import 'package:photos/models/execution_states.dart';
 import 'package:photos/models/execution_states.dart';
+import 'package:photos/models/typedefs.dart';
 import 'package:photos/theme/colors.dart';
 import 'package:photos/theme/colors.dart';
 import 'package:photos/theme/ente_theme.dart';
 import 'package:photos/theme/ente_theme.dart';
 import 'package:photos/theme/text_style.dart';
 import 'package:photos/theme/text_style.dart';
@@ -23,8 +24,6 @@ enum ButtonAction {
   error;
   error;
 }
 }
 
 
-typedef FutureVoidCallback = Future<void> Function();
-
 class ButtonWidget extends StatelessWidget {
 class ButtonWidget extends StatelessWidget {
   final IconData? icon;
   final IconData? icon;
   final String? labelText;
   final String? labelText;

+ 1 - 2
lib/ui/components/dialog_widget.dart

@@ -2,6 +2,7 @@ import 'dart:math';
 
 
 import 'package:flutter/material.dart';
 import 'package:flutter/material.dart';
 import 'package:photos/core/constants.dart';
 import 'package:photos/core/constants.dart';
+import 'package:photos/models/typedefs.dart';
 import 'package:photos/theme/colors.dart';
 import 'package:photos/theme/colors.dart';
 import 'package:photos/theme/effects.dart';
 import 'package:photos/theme/effects.dart';
 import 'package:photos/theme/ente_theme.dart';
 import 'package:photos/theme/ente_theme.dart';
@@ -10,8 +11,6 @@ import 'package:photos/ui/components/models/button_type.dart';
 import 'package:photos/ui/components/text_input_widget.dart';
 import 'package:photos/ui/components/text_input_widget.dart';
 import 'package:photos/utils/separators_util.dart';
 import 'package:photos/utils/separators_util.dart';
 
 
-typedef FutureVoidCallbackParamStr = Future<void> Function(String);
-
 ///Will return null if dismissed by tapping outside
 ///Will return null if dismissed by tapping outside
 Future<ButtonAction?> showDialogWidget({
 Future<ButtonAction?> showDialogWidget({
   required BuildContext context,
   required BuildContext context,

+ 1 - 2
lib/ui/components/menu_item_widget/menu_item_widget.dart

@@ -1,12 +1,11 @@
 import 'package:expandable/expandable.dart';
 import 'package:expandable/expandable.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/material.dart';
 import 'package:photos/models/execution_states.dart';
 import 'package:photos/models/execution_states.dart';
+import 'package:photos/models/typedefs.dart';
 import 'package:photos/theme/ente_theme.dart';
 import 'package:photos/theme/ente_theme.dart';
 import 'package:photos/ui/components/menu_item_widget/menu_item_child_widgets.dart';
 import 'package:photos/ui/components/menu_item_widget/menu_item_child_widgets.dart';
 import 'package:photos/utils/debouncer.dart';
 import 'package:photos/utils/debouncer.dart';
 
 
-typedef FutureVoidCallback = Future<void> Function();
-
 class MenuItemWidget extends StatefulWidget {
 class MenuItemWidget extends StatefulWidget {
   final Widget captionedTextWidget;
   final Widget captionedTextWidget;
   final bool isExpandable;
   final bool isExpandable;

+ 2 - 2
lib/ui/components/text_input_widget.dart

@@ -1,9 +1,9 @@
 import 'package:flutter/material.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:flutter/services.dart';
 import 'package:photos/models/execution_states.dart';
 import 'package:photos/models/execution_states.dart';
+import 'package:photos/models/typedefs.dart';
 import 'package:photos/theme/ente_theme.dart';
 import 'package:photos/theme/ente_theme.dart';
 import 'package:photos/ui/common/loading_widget.dart';
 import 'package:photos/ui/common/loading_widget.dart';
-import 'package:photos/ui/components/dialog_widget.dart';
 import 'package:photos/utils/debouncer.dart';
 import 'package:photos/utils/debouncer.dart';
 import 'package:photos/utils/separators_util.dart';
 import 'package:photos/utils/separators_util.dart';
 
 
@@ -183,7 +183,7 @@ class _TextInputWidgetState extends State<TextInputWidget> {
         });
         });
       }),
       }),
     );
     );
-    await widget.onSubmit!
+    await widget.onSubmit
         .call(_textController.text)
         .call(_textController.text)
         .onError((error, stackTrace) {
         .onError((error, stackTrace) {
       executionState = ExecutionState.error;
       executionState = ExecutionState.error;

+ 1 - 3
lib/ui/components/toggle_switch_widget.dart

@@ -1,12 +1,10 @@
 import 'package:flutter/material.dart';
 import 'package:flutter/material.dart';
 import 'package:photos/ente_theme_data.dart';
 import 'package:photos/ente_theme_data.dart';
 import 'package:photos/models/execution_states.dart';
 import 'package:photos/models/execution_states.dart';
+import 'package:photos/models/typedefs.dart';
 import 'package:photos/ui/common/loading_widget.dart';
 import 'package:photos/ui/common/loading_widget.dart';
 import 'package:photos/utils/debouncer.dart';
 import 'package:photos/utils/debouncer.dart';
 
 
-typedef FutureVoidCallback = Future<void> Function();
-typedef BoolCallBack = bool Function();
-
 class ToggleSwitchWidget extends StatefulWidget {
 class ToggleSwitchWidget extends StatefulWidget {
   final BoolCallBack value;
   final BoolCallBack value;
   final FutureVoidCallback onChanged;
   final FutureVoidCallback onChanged;

+ 1 - 0
lib/utils/dialog_util.dart

@@ -3,6 +3,7 @@ import 'dart:math';
 import 'package:confetti/confetti.dart';
 import 'package:confetti/confetti.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/material.dart';
 import 'package:photos/core/constants.dart';
 import 'package:photos/core/constants.dart';
+import 'package:photos/models/typedefs.dart';
 import 'package:photos/theme/colors.dart';
 import 'package:photos/theme/colors.dart';
 import 'package:photos/ui/common/loading_widget.dart';
 import 'package:photos/ui/common/loading_widget.dart';
 import 'package:photos/ui/common/progress_dialog.dart';
 import 'package:photos/ui/common/progress_dialog.dart';