diff --git a/lib/utils/constants.dart b/lib/utils/constants.dart index 902979c8e..58381d2f7 100644 --- a/lib/utils/constants.dart +++ b/lib/utils/constants.dart @@ -22,6 +22,14 @@ class Constants { static const svgBackground = Colors.white; static const svgColorFilter = ColorFilter.mode(svgBackground, BlendMode.dstOver); + static const dialogContentHorizontalPadding = EdgeInsets.symmetric(horizontal: 24); + static const dialogActionsPadding = EdgeInsets.symmetric(horizontal: 8); + static const dialogShape = RoundedRectangleBorder( + borderRadius: BorderRadius.all( + Radius.circular(24), + ), + ); + static const List androidDependencies = [ Dependency( name: 'CWAC-Document', diff --git a/lib/widgets/common/action_delegates/create_album_dialog.dart b/lib/widgets/common/action_delegates/create_album_dialog.dart index 46a440077..a9ebf26c1 100644 --- a/lib/widgets/common/action_delegates/create_album_dialog.dart +++ b/lib/widgets/common/action_delegates/create_album_dialog.dart @@ -1,6 +1,7 @@ import 'dart:io'; import 'package:aves/utils/android_file_utils.dart'; +import 'package:aves/utils/constants.dart'; import 'package:flutter/material.dart'; import 'package:flutter/widgets.dart'; import 'package:path/path.dart'; @@ -16,8 +17,6 @@ class _CreateAlbumDialogState extends State { Set _allVolumes; StorageVolume _primaryVolume, _selectedVolume; - static const EdgeInsets hPadding = EdgeInsets.symmetric(horizontal: 24); - @override void initState() { super.initState(); @@ -42,7 +41,7 @@ class _CreateAlbumDialogState extends State { children: [ if (_allVolumes.length > 1) ...[ Padding( - padding: hPadding, + padding: Constants.dialogContentHorizontalPadding, child: Text('Storage:'), ), ..._allVolumes.map((volume) => RadioListTile( @@ -69,7 +68,7 @@ class _CreateAlbumDialogState extends State { SizedBox(height: 8), ], Padding( - padding: hPadding, + padding: Constants.dialogContentHorizontalPadding, child: ValueListenableBuilder( valueListenable: _existsNotifier, builder: (context, exists, child) { @@ -96,6 +95,8 @@ class _CreateAlbumDialogState extends State { child: Text('Create'.toUpperCase()), ), ], + actionsPadding: Constants.dialogActionsPadding, + shape: Constants.dialogShape, ); } diff --git a/lib/widgets/common/action_delegates/entry_action_delegate.dart b/lib/widgets/common/action_delegates/entry_action_delegate.dart index b54a6ba50..36c36b235 100644 --- a/lib/widgets/common/action_delegates/entry_action_delegate.dart +++ b/lib/widgets/common/action_delegates/entry_action_delegate.dart @@ -4,6 +4,7 @@ import 'package:aves/model/image_entry.dart'; import 'package:aves/model/source/collection_lens.dart'; import 'package:aves/services/android_app_service.dart'; import 'package:aves/services/image_file_service.dart'; +import 'package:aves/utils/constants.dart'; import 'package:aves/widgets/common/action_delegates/feedback.dart'; import 'package:aves/widgets/common/action_delegates/permission_aware.dart'; import 'package:aves/widgets/common/action_delegates/rename_entry_dialog.dart'; @@ -131,6 +132,8 @@ class EntryActionDelegate with FeedbackMixin, PermissionAwareMixin { child: Text('Delete'.toUpperCase()), ), ], + actionsPadding: Constants.dialogActionsPadding, + shape: Constants.dialogShape, ); }, ); diff --git a/lib/widgets/common/action_delegates/permission_aware.dart b/lib/widgets/common/action_delegates/permission_aware.dart index 59702f516..cddbfa92b 100644 --- a/lib/widgets/common/action_delegates/permission_aware.dart +++ b/lib/widgets/common/action_delegates/permission_aware.dart @@ -1,5 +1,6 @@ import 'package:aves/model/image_entry.dart'; import 'package:aves/services/android_file_service.dart'; +import 'package:aves/utils/constants.dart'; import 'package:flutter/material.dart'; mixin PermissionAwareMixin { @@ -35,6 +36,8 @@ mixin PermissionAwareMixin { child: Text('OK'.toUpperCase()), ), ], + actionsPadding: Constants.dialogActionsPadding, + shape: Constants.dialogShape, ); }, ); diff --git a/lib/widgets/common/action_delegates/rename_entry_dialog.dart b/lib/widgets/common/action_delegates/rename_entry_dialog.dart index 2aeeb5291..d7fb28535 100644 --- a/lib/widgets/common/action_delegates/rename_entry_dialog.dart +++ b/lib/widgets/common/action_delegates/rename_entry_dialog.dart @@ -1,4 +1,5 @@ import 'package:aves/model/image_entry.dart'; +import 'package:aves/utils/constants.dart'; import 'package:flutter/material.dart'; class RenameEntryDialog extends StatefulWidget { @@ -43,6 +44,8 @@ class _RenameEntryDialogState extends State { child: Text('Apply'.toUpperCase()), ), ], + actionsPadding: Constants.dialogActionsPadding, + shape: Constants.dialogShape, ); } } diff --git a/lib/widgets/common/action_delegates/selection_action_delegate.dart b/lib/widgets/common/action_delegates/selection_action_delegate.dart index 29bbe53da..67cb50b20 100644 --- a/lib/widgets/common/action_delegates/selection_action_delegate.dart +++ b/lib/widgets/common/action_delegates/selection_action_delegate.dart @@ -8,6 +8,7 @@ import 'package:aves/model/source/collection_lens.dart'; import 'package:aves/model/source/collection_source.dart'; import 'package:aves/services/android_app_service.dart'; import 'package:aves/services/image_file_service.dart'; +import 'package:aves/utils/constants.dart'; import 'package:aves/utils/durations.dart'; import 'package:aves/widgets/album/app_bar.dart'; import 'package:aves/widgets/album/empty.dart'; @@ -200,6 +201,8 @@ class SelectionActionDelegate with FeedbackMixin, PermissionAwareMixin { child: Text('Delete'.toUpperCase()), ), ], + actionsPadding: Constants.dialogActionsPadding, + shape: Constants.dialogShape, ); }, );